December 2010 - Wine-Commits

Hans Leidekker : uninstaller: Run msiexec if the WindowsInstaller value is set.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: fea5767a025e24d4592eb1e89c6a9a402bc73442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea5767a025e24d4592eb1e89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:09:31 2010 +0100 uninstaller: Run msiexec if the WindowsInstaller value is set. --- programs/uninstaller/main.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 912d23d..f781d3c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -59,6 +59,7 @@ static const WCHAR PathUninstallW[] = { 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'U','n','i','n','s','t','a','l','l',0 }; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; +static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; /** @@ -192,9 +193,24 @@ static int FetchFromRootKey(HKEY root) { lstrcpyW(p, subKeyName); RegOpenKeyExW(root, key_app, 0, KEY_READ, &hkeyApp); - if ((RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen) == ERROR_SUCCESS) - && (RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen) == ERROR_SUCCESS)) + if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { + DWORD value, type; + WCHAR *command; + + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, NULL, &value) && type == REG_DWORD && value == 1) + { + static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; + command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); + wsprintfW(command, fmtW, subKeyName); + } + else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, NULL, NULL, NULL, &uninstlen)) + { + command = HeapAlloc(GetProcessHeap(), 0, uninstlen); + RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + } + else continue; + numentries++; entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); entries[numentries-1].root = root; @@ -202,9 +218,8 @@ static int FetchFromRootKey(HKEY root) lstrcpyW(entries[numentries-1].key, subKeyName); entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)entries[numentries-1].descr, &displen); - entries[numentries-1].command = HeapAlloc(GetProcessHeap(), 0, uninstlen); + entries[numentries-1].command = command; entries[numentries-1].active = 0; - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)entries[numentries-1].command, &uninstlen); WINE_TRACE("allocated entry #%d: %s (%s), %s\n", numentries, wine_dbgstr_w(entries[numentries-1].key), wine_dbgstr_w(entries[numentries-1].descr), wine_dbgstr_w(entries[numentries-1].command)); if(sFilter != NULL && StrStrIW(entries[numentries-1].descr,sFilter)==NULL)

1 0

Hans Leidekker : msi: Don' t flag an error in the InstallServices action if the component does not exist .
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 6625f07ebf7fabb39a93ac995adf2862d8921a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6625f07ebf7fabb39a93ac995… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:08:47 2010 +0100 msi: Don't flag an error in the InstallServices action if the component does not exist. --- dlls/msi/action.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 48e77a3..db3eda8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5525,6 +5525,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) goto done; } + comp = MSI_RecordGetString( rec, 12 ); + if (!get_loaded_component( package, comp )) + goto done; + start_type = MSI_RecordGetInteger(rec, 5); if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) goto done; @@ -5538,7 +5542,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name); deformat_string(package, MSI_RecordGetString(rec, 10), &pass); deformat_string(package, MSI_RecordGetString(rec, 11), &args); - comp = MSI_RecordGetString(rec, 12); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); /* fetch the service path */

1 0

Martin Storsjo : wineconsole: Don' t overwrite the backend selection when parsing --use-event.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 0f3ff8b4b162202e687ebeaa33062b46d56574b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3ff8b4b162202e687ebeaa3… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 22 00:07:51 2010 +0200 wineconsole: Don't overwrite the backend selection when parsing --use-event. --- programs/wineconsole/wineconsole.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 410d163..ca20763 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -758,7 +758,6 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end; - wci->backend = WCUSER_InitBackend; } else if (strncmp(wci->ptr, "--backend=", 10) == 0) {

1 0

Jacek Caban : urlmon: Make protocol tests more verbose.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 467844765b50018af5de256864470d64ce65f492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467844765b50018af5de25686… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 23 14:30:08 2010 +0100 urlmon: Make protocol tests more verbose. --- dlls/urlmon/tests/protocol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 4a410f4..e463737 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); #define CHECK_EXPECT2(func) \ do { \ + trace(#func "\n"); /* temporary debug traces */ \ ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0)

1 0

Hans Leidekker : msi: Return INSTALLSTATE_UNKNOWN from MsiGetComponentState if the component is disabled .
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 7bc7d091097854148473cdcc67055e8d3d92f533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc7d091097854148473cdcc6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:07:13 2010 +0100 msi: Return INSTALLSTATE_UNKNOWN from MsiGetComponentState if the component is disabled. --- dlls/msi/install.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e2fe863..d34de8c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1181,13 +1181,22 @@ UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent, return ERROR_UNKNOWN_COMPONENT; if (piInstalled) - *piInstalled = comp->Installed; + { + if (comp->Enabled) + *piInstalled = comp->Installed; + else + *piInstalled = INSTALLSTATE_UNKNOWN; + } if (piAction) - *piAction = comp->Action; + { + if (comp->Enabled) + *piAction = comp->Action; + else + *piAction = INSTALLSTATE_UNKNOWN; + } TRACE("states (%i, %i)\n", comp->Installed, comp->Action ); - return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Add some traces.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 9e30f77568ded311a6c3141f9b9b27951d8e441e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e30f77568ded311a6c3141f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:08:10 2010 +0100 msi: Add some traces. --- dlls/msi/msi.c | 8 ++++++-- dlls/msi/registry.c | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 0fe8ea0..e66585c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1942,6 +1942,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, *pdwState = INSTALLSTATE_LOCAL; } + TRACE("-> %d\n", *pdwState); return ERROR_SUCCESS; } @@ -2018,6 +2019,7 @@ done: RegCloseKey(prodkey); RegCloseKey(userdata); + TRACE("-> %d\n", state); return state; } @@ -2725,7 +2727,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) else r = INSTALLSTATE_LOCAL; - TRACE("%s %s -> %d\n", debugstr_w(szProduct), debugstr_w(szFeature), r); + TRACE("-> %d\n", r); return r; } @@ -3666,8 +3668,10 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, handle = CreateFileW( szFilePath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL ); if (handle == INVALID_HANDLE_VALUE) + { + WARN("can't open file %u\n", GetLastError()); return ERROR_FILE_NOT_FOUND; - + } length = GetFileSize( handle, NULL ); mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 0a063e4..926c90d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1549,10 +1549,11 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) sz = SQUISH_GUID_SIZE; r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); if( r == ERROR_SUCCESS ) + { unsquash_guid(szValName, szProduct); - + TRACE("-> %s\n", debugstr_w(szProduct)); + } RegCloseKey(hkeyComp); - return r; }

1 0

Kirill Smelkov : kernel32: Support deleting resources in UpdateResource.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: d5cb11a45a3aab5ac372e571b55e1fc35709f13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5cb11a45a3aab5ac372e571b… Author: Kirill Smelkov <kirr(a)landau.phys.spbu.ru> Date: Tue Dec 21 17:23:11 2010 +0300 kernel32: Support deleting resources in UpdateResource. --- dlls/kernel32/resource.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 5091804..81f600e 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -706,7 +706,8 @@ static void res_free_str( LPWSTR str ) } static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, - struct resource_data *resdata, BOOL overwrite_existing ) + LANGID Lang, struct resource_data *resdata, + BOOL overwrite_existing ) { struct resource_dir_entry *restype, *resname; struct resource_data *existing; @@ -736,7 +737,7 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N * If there's an existing resource entry with matching (Type,Name,Language) * it needs to be removed before adding the new data. */ - existing = find_resource_data( &resname->children, resdata->lang ); + existing = find_resource_data( &resname->children, Lang ); if (existing) { if (!overwrite_existing) @@ -745,7 +746,8 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N HeapFree( GetProcessHeap(), 0, existing ); } - add_resource_data_entry( &resname->children, resdata ); + if (resdata) + add_resource_data_entry( &resname->children, resdata ); return TRUE; } @@ -1007,7 +1009,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE ); if (resdata) { - if (!update_add_resource( updates, Type, Name, resdata, FALSE )) + if (!update_add_resource( updates, Type, Name, Lang, resdata, FALSE )) HeapFree( GetProcessHeap(), 0, resdata ); } } @@ -1697,10 +1699,17 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName, updates = GlobalLock(hUpdate); if (updates) { - struct resource_data *data; - data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); - if (data) - ret = update_add_resource( updates, lpType, lpName, data, TRUE ); + if (lpData == NULL && cbData == 0) /* remove resource */ + { + ret = update_add_resource( updates, lpType, lpName, wLanguage, NULL, TRUE ); + } + else + { + struct resource_data *data; + data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); + if (data) + ret = update_add_resource( updates, lpType, lpName, wLanguage, data, TRUE ); + } GlobalUnlock(hUpdate); } return ret;

1 0

Hans Leidekker : msi: Global and local win32 assembly names are formatted differently.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 5f9dd9df1f0ed3fe6007022b7ace19cef946f943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9dd9df1f0ed3fe6007022b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:08:32 2010 +0100 msi: Global and local win32 assembly names are formatted differently. --- dlls/msi/assembly.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index b1a7ee0..49431aa 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -176,6 +176,10 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',',',' ', 'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=','%','s',0}; + static const WCHAR fmt_sxs_localW[] = { + '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', + 'c','u','l','t','u','r','e','=','%','s',',',' ', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR queryW[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','M','s','i','A','s','s','e','m','b','l','y','N','a','m','e','`',' ', @@ -198,18 +202,36 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI if (assembly->attributes == msidbAssemblyAttributesWin32) { - if (!name.type || !name.name || !name.version || !name.token || !name.arch) + if (!assembly->application) { - WARN("invalid win32 assembly name\n"); - goto done; + if (!name.type || !name.name || !name.version || !name.token || !name.arch) + { + WARN("invalid global win32 assembly name\n"); + goto done; + } + len = strlenW( fmt_sxsW ); + len += strlenW( name.name ); + len += strlenW( name.version ); + len += strlenW( name.token ); + len += strlenW( name.arch ); + if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; + sprintfW( display_name, fmt_sxsW, name.name, name.version, name.token, name.arch ); + } + else + { + if (!name.name || !name.version || !name.culture || !name.token) + { + WARN("invalid local win32 assembly name\n"); + goto done; + } + len = strlenW( fmt_sxs_localW ); + len += strlenW( name.name ); + len += strlenW( name.version ); + len += strlenW( name.culture ); + len += strlenW( name.token ); + if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; + sprintfW( display_name, fmt_sxs_localW, name.name, name.version, name.culture, name.token ); } - len = strlenW( fmt_sxsW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.token ); - len += strlenW( name.arch ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_sxsW, name.name, name.version, name.token, name.arch ); } else {

1 0

Hans Leidekker : msi: Rewrite command line parsing to handle quoted values correctly.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 489f82e9b43029fa644718f8c941381c6113672d URL: http://source.winehq.org/git/wine.git/?a=commit;h=489f82e9b43029fa644718f8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:07:55 2010 +0100 msi: Rewrite command line parsing to handle quoted values correctly. --- dlls/msi/action.c | 196 +++++++++++++++++++++++++++++++++------------- dlls/msi/tests/install.c | 173 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=489f82e9b43029fa64471…

1 0

Jacek Caban : mshtml: Get rid of no longer used GECKO_DATADIR.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 75c7d564652fb9fbe8e5a4116a1080e7f3237fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c7d564652fb9fbe8e5a4116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 23 14:26:13 2010 +0100 mshtml: Get rid of no longer used GECKO_DATADIR. --- dlls/mshtml/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index d805c74..58ef16c 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H -DGECKO_DATADIR="\"$(datadir)\"" +EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet C_SRCS = \

1 0