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

Refactor some other code in msiexec.

This commit is contained in:
Vincent Béron 2004-07-30 04:23:37 +00:00 committed by Alexandre Julliard
parent 02aa8d50af
commit b0da80eda1
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
programs/msiexec/msiexec.c
View File

@ -67,7 +67,7 @@ static void ShowUsage(int ExitCode)
ExitProcess(ExitCode);
}
static BOOL GetProductCode(LPCSTR str, LPGUID guid)
static BOOL GetProductCode(LPCSTR str, LPCSTR *PackageName, LPGUID *ProductCode)
{
BOOL ret = FALSE;
int len = 0;
@ -77,11 +77,18 @@ static BOOL GetProductCode(LPCSTR str, LPGUID guid)
{
len = MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, 0);
wstr = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR));
ret = (CLSIDFromString(wstr, guid) == NOERROR);
ret = (CLSIDFromString(wstr, *ProductCode) == NOERROR);
HeapFree(GetProcessHeap(), 0, wstr);
wstr = NULL;
}
if(!ret)
{
HeapFree(GetProcessHeap(), 0, *ProductCode);
*ProductCode = NULL;
*PackageName = str;
}
return ret;
}
@ -174,7 +181,7 @@ int main(int argc, char *argv[])
BOOL FunctionDllUnregisterServer = FALSE;
BOOL GotProductCode = FALSE;
LPSTR PackageName = NULL;
LPCSTR PackageName = NULL;
LPGUID ProductCode = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID));
LPSTR Properties = HeapAlloc(GetProcessHeap(), 0, 1);
@ -209,13 +216,7 @@ int main(int argc, char *argv[])
if(i >= argc)
ShowUsage(1);
WINE_TRACE("argv[%d] = %s\n", i, argv[i]);
GotProductCode = GetProductCode(argv[i], ProductCode);
if(!GotProductCode)
{
HeapFree(GetProcessHeap(), 0, ProductCode);
ProductCode = NULL;
PackageName = argv[i];
}
GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode);
}
else if(!strcasecmp(argv[i], "/a"))
{
@ -295,13 +296,7 @@ int main(int argc, char *argv[])
if(i >= argc)
ShowUsage(1);
WINE_TRACE("argv[%d] = %s\n", i, argv[i]);
GotProductCode = GetProductCode(argv[i], ProductCode);
if(!GotProductCode)
{
HeapFree(GetProcessHeap(), 0, ProductCode);
ProductCode = NULL;
PackageName = argv[i];
}
GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode);
}
else if(!strcasecmp(argv[i], "/x"))
{
@ -310,13 +305,7 @@ int main(int argc, char *argv[])
if(i >= argc)
ShowUsage(1);
WINE_TRACE("argv[%d] = %s\n", i, argv[i]);
GotProductCode = GetProductCode(argv[i], ProductCode);
if(!GotProductCode)
{
HeapFree(GetProcessHeap(), 0, ProductCode);
ProductCode = NULL;
PackageName = argv[i];
}
GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode);
StringListAppend(&Properties, RemoveAll);
}
else if(!strncasecmp(argv[i], "/j", 2))
@ -559,13 +548,7 @@ int main(int argc, char *argv[])
else
{
FunctionInstall = TRUE;
GotProductCode = GetProductCode(argv[i], ProductCode);
if(!GotProductCode)
{
HeapFree(GetProcessHeap(), 0, ProductCode);
ProductCode = NULL;
PackageName = argv[i];
}
GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode);
}
}