Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-14 08:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- sync msiexec to Wine 1.0-rc1

Browse source 
- change module type to win32cui inset of win32gui

svn path=/trunk/; revision=33518
This commit is contained in:
Marc Piulachs 2008-05-14 17:25:57 +00:00
parent fe11b99061
commit 7fd8e1f35f
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
reactos/base/system/msiexec/msiexec.c
View file

@ -139,7 +139,7 @@ static LPWSTR build_properties(struct string_list *property_list)
for(list = property_list; list; list = list->next) for(list = property_list; list; list = list->next)
len += lstrlenW(list->str) + 3; len += lstrlenW(list->str) + 3;
ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
/* add a space before each string, and quote the value */ /* add a space before each string, and quote the value */
p = ret; p = ret;
@ -183,7 +183,7 @@ static LPWSTR build_transforms(struct string_list *transform_list)
for(list = transform_list; list; list = list->next) for(list = transform_list; list; list = list->next)
len += lstrlenW(list->str) + 1; len += lstrlenW(list->str) + 1;
ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
/* add all the transforms with a semicolon between each one */ /* add all the transforms with a semicolon between each one */
p = ret; p = ret;
@ -215,7 +215,7 @@ static DWORD msi_atou(LPCWSTR str)
static LPWSTR msi_strdup(LPCWSTR str) static LPWSTR msi_strdup(LPCWSTR str)
{ {
DWORD len = lstrlenW(str)+1; DWORD len = lstrlenW(str)+1;
LPWSTR ret = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
lstrcpyW(ret, str); lstrcpyW(ret, str);
return ret; return ret;
} }
@ -231,7 +231,7 @@ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2)
return FALSE; return FALSE;
if( lstrlenW(str1) != (len-1) ) if( lstrlenW(str1) != (len-1) )
return FALSE; return FALSE;
strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len);
HeapFree(GetProcessHeap(), 0, strW); HeapFree(GetProcessHeap(), 0, strW);
@ -259,7 +259,7 @@ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2)
return FALSE; return FALSE;
if( lstrlenW(str1) < (len-1) ) if( lstrlenW(str1) < (len-1) )
return FALSE; return FALSE;
strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1);
HeapFree(GetProcessHeap(), 0, strW); HeapFree(GetProcessHeap(), 0, strW);
@ -454,7 +454,7 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
int i, n; int i, n;
n = chomp( p ); n = chomp( p );
argv = (WCHAR**) HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1));
for( i=0; i<n; i++ ) for( i=0; i<n; i++ )
{ {
argv[i] = p; argv[i] = p;
@ -480,7 +480,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz);
if(r == ERROR_SUCCESS && type == REG_SZ) if(r == ERROR_SUCCESS && type == REG_SZ)
{ {
buf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sz); buf = HeapAlloc(GetProcessHeap(), 0, sz);
r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz);
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
@ -663,10 +663,10 @@ int main(int argc, char **argv)
PackageName = argvW[i]+2; PackageName = argvW[i]+2;
if (!PackageName[0]) if (!PackageName[0])
{ {
i++; i++;
if(i >= argc) if (i >= argc)
ShowUsage(1); ShowUsage(1);
PackageName = argvW[i]; PackageName = argvW[i];
} }
WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName));
StringListAppend(&property_list, RemoveAll); StringListAppend(&property_list, RemoveAll);
@ -821,7 +821,7 @@ int main(int argc, char **argv)
LogFileName = argvW[i]; LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{ {
fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", fprintf(stderr, "Logging in %s (0x%08x, %u) failed\n",
wine_dbgstr_w(LogFileName), LogMode, LogAttributes); wine_dbgstr_w(LogFileName), LogMode, LogAttributes);
ExitProcess(1); ExitProcess(1);
} }
@ -852,23 +852,23 @@ int main(int argc, char **argv)
} }
else if(msi_strequal(argvW[i]+2, "f")) else if(msi_strequal(argvW[i]+2, "f"))
{ {
InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG); InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG;
} }
else if(msi_strequal(argvW[i]+2, "n+")) else if(msi_strequal(argvW[i]+2, "n+"))
{ {
InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG); InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG;
} }
else if(msi_strequal(argvW[i]+2, "b+")) else if(msi_strequal(argvW[i]+2, "b+"))
{ {
InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG;
} }
else if(msi_strequal(argvW[i]+2, "b-")) else if(msi_strequal(argvW[i]+2, "b-"))
{ {
InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY); InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY;
} }
else if(msi_strequal(argvW[i]+2, "b+!")) else if(msi_strequal(argvW[i]+2, "b+!"))
{ {
InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG;
WINE_FIXME("Unknown modifier: !\n"); WINE_FIXME("Unknown modifier: !\n");
} }
else else

2
reactos/base/system/msiexec/msiexec.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> <module name="msiexec" type="win32cui" installbase="system32" installname="msiexec.exe" allowwarnings="true">
<include base="msiexec">.</include> <include base="msiexec">.</include>
<include base="ReactOS">include/wine</include> <include base="ReactOS">include/wine</include>
<define name="_WIN32_IE">0x501</define> <define name="_WIN32_IE">0x501</define>