Kaydet (Commit) c4e37b8e authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

ODK: Fix WError on windows x64 bit

Change-Id: I39534e171806d47e154c82de89b8b9e3883771b4
Reviewed-on: https://gerrit.libreoffice.org/14541Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 2296563c
...@@ -72,7 +72,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -72,7 +72,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
char* value = NULL; char* value = NULL;
char* envstr = NULL; char* envstr = NULL;
char* cmdline = NULL; char* cmdline = NULL;
int size; size_t size;
STARTUPINFO startup_info; STARTUPINFO startup_info;
PROCESS_INFORMATION process_info; PROCESS_INFORMATION process_info;
BOOL bCreate; BOOL bCreate;
...@@ -136,8 +136,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -136,8 +136,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
if (ret != 0) { if (ret != 0) {
char * buf = NULL; char * buf = NULL;
char * tmp; char * tmp;
size_t n = 1000; DWORD n = 1000;
size_t k = 0; DWORD k = 0;
DWORD exitcode; DWORD exitcode;
int path2size; int path2size;
CloseHandle(stdoutWrite); CloseHandle(stdoutWrite);
...@@ -168,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -168,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
} }
k += m; k += m;
if (k >= n) { if (k >= n) {
if (n >= SAL_MAX_SIZE / 2) { if (n >= MAXDWORD / 2) {
writeError( writeError(
"Error: out of memory reading unoinfo output!\n"); "Error: out of memory reading unoinfo output!\n");
closeErrorFile(); closeErrorFile();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment