[Libreoffice-commits] core.git: odk/source

[David Ostrovsky]

 odk/source/unoapploader/win/unoapploader.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c4e37b8ec409333663e7d712e1863ca1e0efffab
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Wed Feb 18 22:12:48 2015 +0100

    ODK: Fix WError on windows x64 bit
    
    Change-Id: I39534e171806d47e154c82de89b8b9e3883771b4
    Reviewed-on: https://gerrit.libreoffice.org/14541
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
old mode 100644
new mode 100755
index ab95399..36ae8ca
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -72,7 +72,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     char* value = NULL;
     char* envstr = NULL;
     char* cmdline = NULL;
-    int size;
+    size_t size;
     STARTUPINFO startup_info;
     PROCESS_INFORMATION process_info;
     BOOL bCreate;
@@ -136,8 +136,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
         if (ret != 0) {
             char * buf = NULL;
             char * tmp;
-            size_t n = 1000;
-            size_t k = 0;
+            DWORD n = 1000;
+            DWORD k = 0;
             DWORD exitcode;
             int path2size;
             CloseHandle(stdoutWrite);
@@ -168,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                 }
                 k += m;
                 if (k >= n) {
-                    if (n >= SAL_MAX_SIZE / 2) {
+                    if (n >= MAXDWORD / 2) {
                         writeError(
                             "Error: out of memory reading unoinfo output!\n");
                         closeErrorFile();