mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ODK: Fix WError on windows x64 bit

Browse Source 
Change-Id: I39534e171806d47e154c82de89b8b9e3883771b4
Reviewed-on: https://gerrit.libreoffice.org/14541
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2015-02-18 22:12:48 +01:00
committed by Michael Stahl
parent 2296563c86
commit c4e37b8ec4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
odk/source/unoapploader/win/unoapploader.c Normal file → Executable file
View File

@@ -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,
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,
} }
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();