Fix 64bit crash problem at log dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/ext/gitdll/gitdll.c b/ext/gitdll/gitdll.c
index 0257738..77607b1 100644 (file)
--- a/ext/gitdll/gitdll.c
+++ b/ext/gitdll/gitdll.c
@@ -74,6 +74,11 @@ int git_init()
        char *prefix;\r
        size_t homesize,size,httpsize;\r
 \r
        char *prefix;\r
        size_t homesize,size,httpsize;\r
 \r

+       _fmode = _O_BINARY; \r
+       _setmode(_fileno(stdin), _O_BINARY); \r
+       _setmode(_fileno(stdout), _O_BINARY); \r
+       _setmode(_fileno(stderr), _O_BINARY); \r
+\r

        // set HOME if not set already\r
        getenv_s(&homesize, NULL, 0, "HOME");\r
        if (!homesize)\r
        // set HOME if not set already\r
        getenv_s(&homesize, NULL, 0, "HOME");\r
        if (!homesize)\r

diff --git a/ext/gitdll/gitdll.h b/ext/gitdll/gitdll.h
index c4fbb30..3552e32 100644 (file)
--- a/ext/gitdll/gitdll.h
+++ b/ext/gitdll/gitdll.h
@@ -32,12 +32,12 @@ public:
 \r
 typedef unsigned char GIT_HASH[GIT_HASH_SIZE];\r
 \r
 \r
 typedef unsigned char GIT_HASH[GIT_HASH_SIZE];\r
 \r

-typedef unsigned int  GIT_HANDLE;\r
-typedef unsigned int  GIT_LOG;\r
+typedef void *  GIT_HANDLE;\r
+typedef void *  GIT_LOG;\r

 \r
 \r

-typedef unsigned int GIT_DIFF;\r
-typedef unsigned int GIT_FILE;\r
-typedef unsigned int GIT_COMMIT_LIST;\r
+typedef void * GIT_DIFF;\r
+typedef void * GIT_FILE;\r
+typedef void * GIT_COMMIT_LIST;\r

 \r
 struct GIT_COMMIT_AUTHOR\r
 {\r
 \r
 struct GIT_COMMIT_AUTHOR\r
 {\r

diff --git a/ext/gitdll/gitdll.vcproj b/ext/gitdll/gitdll.vcproj
index e210954..9bd340f 100644 (file)
--- a/ext/gitdll/gitdll.vcproj
+++ b/ext/gitdll/gitdll.vcproj
@@ -248,7 +248,7 @@
                        OutputDirectory="$(SolutionDir)\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        OutputDirectory="$(SolutionDir)\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r

-                       CharacterSet="1"\r
+                       CharacterSet="0"\r

                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r