Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 455381 - WinCE XPCOM Explicit Unicode API Calls, Wide Char CheckVersion Function nsCommonProcess changes. relanding after backout. r=bsmedberg

Browse Source
This commit is contained in:
Brad Lassey 2008-12-11 11:50:24 -08:00
parent 24e11f581f
commit b1850969b0
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xpcom/threads/nsProcessCommon.cpp
View File

@ -106,10 +106,11 @@ nsProcess::Init(nsIFile* executable)
#if defined(XP_WIN)
static int assembleCmdLine(char *const *argv, char **cmdLine)
// Out param `wideCmdLine` must be PR_Freed by the caller.
static int assembleCmdLine(char *const *argv, PRUnichar **wideCmdLine)
{
char *const *arg;
char *p, *q;
char *p, *q, *cmdLine;
int cmdLineSize;
int numBackslashes;
int i;
@ -131,7 +132,7 @@ static int assembleCmdLine(char *const *argv, char **cmdLine)
+ 2 /* we quote every argument */
+ 1; /* space in between, or final null */
}
p = *cmdLine = (char *) PR_MALLOC(cmdLineSize);
p = cmdLine = (char *) PR_MALLOC(cmdLineSize*sizeof(char));
if (p == NULL) {
return -1;
}
@ -205,6 +206,10 @@ static int assembleCmdLine(char *const *argv, char **cmdLine)
}
*p = '\0';
PRInt32 numChars = MultiByteToWideChar(CP_ACP, 0, cmdLine, -1, NULL, 0);
*wideCmdLine = (PRUnichar *) PR_MALLOC(numChars*sizeof(PRUnichar));
MultiByteToWideChar(CP_ACP, 0, cmdLine, -1, *wideCmdLine, numChars);
PR_Free(cmdLine);
return 0;
}
#endif
@ -237,10 +242,10 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count,
my_argv[count+1] = NULL;
#if defined(XP_WIN) && !defined (WINCE) /* wince uses nspr */
STARTUPINFO startupInfo;
STARTUPINFOW startupInfo;
PROCESS_INFORMATION procInfo;
BOOL retVal;
char *cmdLine;
PRUnichar *cmdLine;
if (assembleCmdLine(my_argv, &cmdLine) == -1) {
nsMemory::Free(my_argv);
@ -256,20 +261,20 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count,
* not have any effect on non-console applications.
*/
retVal = CreateProcess(NULL,
// const_cast<char*>(mTargetPath.get()),
cmdLine,
NULL, /* security attributes for the new
* process */
NULL, /* security attributes for the primary
* thread in the new process */
FALSE, /* inherit handles */
CREATE_NO_WINDOW, /* creation flags */
NULL, /* env */
NULL, /* current drive and directory */
&startupInfo,
&procInfo
);
retVal = CreateProcessW(NULL,
// const_cast<char*>(mTargetPath.get()),
cmdLine,
NULL, /* security attributes for the new
* process */
NULL, /* security attributes for the primary
* thread in the new process */
FALSE, /* inherit handles */
CREATE_NO_WINDOW, /* creation flags */
NULL, /* env */
NULL, /* current drive and directory */
&startupInfo,
&procInfo
);
PR_Free( cmdLine );
if (blocking) {