ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regsvr32: Move /i command line code to a separate function.

This commit is contained in:
Hugh McMaster 2015-06-15 21:46:06 +10:00 committed by Alexandre Julliard
parent 049a3ba401
commit 00c13a20a6
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
programs/regsvr32/regsvr32.c
View File

@ -202,6 +202,37 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line)
return 0; return 0;
} }
static WCHAR *parse_command_line(char *command_line)
{
WCHAR *ret = NULL;
if (command_line[0] == ':' && command_line[1])
{
int len = strlen(command_line);
command_line++;
len--;
/* remove double quotes */
if (command_line[0] == '"')
{
command_line++;
len--;
if (command_line[0])
{
len--;
command_line[len] = 0;
}
}
if (command_line[0])
{
len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, NULL, 0);
ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
if (ret) MultiByteToWideChar(CP_ACP, 0, command_line, -1, ret, len);
}
}
return ret;
}
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
int i; int i;
@ -227,45 +258,10 @@ int main(int argc, char* argv[])
Silent = TRUE; Silent = TRUE;
else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i"))))
{ {
CHAR* command_line = argv[i] + strlen("/i");
CallInstall = TRUE; CallInstall = TRUE;
if (command_line[0] == ':' && command_line[1]) wsCommandLine = parse_command_line(argv[i] + strlen("/i"));
{ if (!wsCommandLine)
int len = strlen(command_line);
command_line++;
len--;
/* remove double quotes */
if (command_line[0] == '"')
{
command_line++;
len--;
if (command_line[0])
{
len--;
command_line[len] = 0;
}
}
if (command_line[0])
{
len = MultiByteToWideChar(CP_ACP, 0, command_line, -1,
NULL, 0);
wsCommandLine = HeapAlloc(GetProcessHeap(), 0,
len * sizeof(WCHAR));
if (wsCommandLine)
MultiByteToWideChar(CP_ACP, 0, command_line, -1,
wsCommandLine, len);
}
else
{
wsCommandLine = EmptyLine;
}
}
else
{
wsCommandLine = EmptyLine; wsCommandLine = EmptyLine;
}
} }
else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n")))
CallRegister = FALSE; CallRegister = FALSE;