wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 508721 - fixing a bug in argument passing in WinCE build tools, r=blassey

Browse Source
This commit is contained in:
Alex Pakhotin 2009-09-10 14:32:32 -07:00
parent 71d5ed8b0d
commit 591a372cf3
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/wince/tools/arm-wince-as.c
View File

@ -7,7 +7,9 @@ main(int argc, char **argv)
int i = 0;
args[i++] = ASM_PATH;
args[i++] = "-I\"" WCE_INC "\"";
// armasm.exe requires a space between -I and the path. See bug 508721
args[i++] = "-I \"" WCE_INC "\"";
i += argpath_conv(&argv[1], &args[i]);

31
build/wince/tools/toolspath.c
View File

@ -188,7 +188,7 @@ DWORD run(char** args)
STARTUPINFO si;
PROCESS_INFORMATION pi;
char theArgs[1024*32] = {'\0'};
char theCmdLine[1024*32] = {'\0'};
int totalLen = 0;
int i, j;
@ -202,16 +202,6 @@ DWORD run(char** args)
_putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" OGLES_SDK_INC ";" WCE_INC);
_putenv("LIB=" WCE_LIB ";" OGLES_SDK_LIB ";" WCE_CRT);
for (j=1; args[j]; j++)
{
int len = strlen(args[j]);
strcat(&theArgs[totalLen], args[j]);
totalLen += len;
strcat(&theArgs[totalLen], " ");
totalLen++;
}
i = strlen(args[0]);
for (j=0; j<i; j++)
{
@ -219,12 +209,27 @@ DWORD run(char** args)
args[0][j] = '\\';
}
for (j=0; args[j]; j++)
{
int len = strlen(args[j]);
strcat(&theCmdLine[totalLen], args[j]);
totalLen += len;
strcat(&theCmdLine[totalLen], " ");
totalLen++;
}
ZeroMemory( &si, sizeof(si) );
si.cb = sizeof(si);
ZeroMemory( &pi, sizeof(pi));
CreateProcess(args[0],
theArgs,
// See bug 508721.
// lpApplicationName (first parameter) when provided conflicts with
// the first token in the lpCommandLine (second parameter).
// So we pass the whole command line including the EXE in lpCommandLine.
// See http://support.microsoft.com/kb/175986 for more info.
CreateProcess(NULL,
theCmdLine,
NULL,
NULL,
0,

10
build/wince/tools/toolspath.h
View File

@ -25,11 +25,11 @@
#define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
#endif
#define ASM_PATH WCE_BIN "armasm.exe"
#define CL_PATH WCE_BIN "cl.exe"
#define LIB_PATH WCE_BIN "lib.exe"
#define LINK_PATH WCE_BIN "link.exe"
#define RC_PATH WCE_RC_BIN "rc.exe"
#define ASM_PATH "\"" WCE_BIN "armasm.exe\""
#define CL_PATH "\"" WCE_BIN "cl.exe\""
#define LIB_PATH "\"" WCE_BIN "lib.exe\""
#define LINK_PATH "\"" WCE_BIN "link.exe\""
#define RC_PATH "\"" WCE_RC_BIN "rc.exe\""
#define MAX_NOLEAK_BUFFERS 1000
char noleak_buffers[MAX_NOLEAK_BUFFERS][1024];