March 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Remove unneeded Wow64 checks.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: a0a7a7fc3d5548a1b9b402c4fd46072ea2b53e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a7a7fc3d5548a1b9b402c4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:57 2011 +0200 msi/tests: Remove unneeded Wow64 checks. --- dlls/msi/tests/action.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 70fd066..2643e39 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2546,7 +2546,7 @@ static void test_register_product(void) res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2653,7 +2653,7 @@ static void test_register_product(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, access, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3616,7 +3616,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3699,7 +3699,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3759,7 +3759,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3819,7 +3819,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3902,7 +3902,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4550,7 +4550,7 @@ static void test_write_registry_values(void) ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File installed\n"); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); else res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); @@ -5318,7 +5318,7 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5336,7 +5336,7 @@ static void test_remove_registry_values(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5355,7 +5355,7 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5649,7 +5649,7 @@ static void test_register_class_info(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); else res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); @@ -5667,7 +5667,7 @@ static void test_register_class_info(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); else res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey);

1 0

Hans Leidekker : msi: Accept whitespace-only property values on the command line.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: 8d58ddfe12a1b299c18f683dc93b5df1b0805e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d58ddfe12a1b299c18f683dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:19 2011 +0200 msi: Accept whitespace-only property values on the command line. --- dlls/msi/action.c | 10 +++++----- dlls/msi/tests/install.c | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index abee14c..a5a1e33 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -276,7 +276,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case ' ': state = state_whitespace; - if (!count || !len) goto done; + if (!count) goto done; in_quotes = 1; break; default: @@ -317,7 +317,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) { LPCWSTR ptr, ptr2; - int quotes; + int num_quotes; DWORD len; WCHAR *prop, *val; UINT r; @@ -345,10 +345,10 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, ptr2++; while (*ptr2 == ' ') ptr2++; - quotes = 0; + num_quotes = 0; val = msi_alloc( (strlenW( ptr2 ) + 1) * sizeof(WCHAR) ); - len = parse_prop( ptr2, val, &quotes ); - if (quotes % 2) + len = parse_prop( ptr2, val, &num_quotes ); + if (num_quotes % 2) { WARN("unbalanced quotes\n"); msi_free( val ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9e8535a..1f5ab9c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6282,6 +6282,10 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "P=\" \""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "P=one"; r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);

1 0

Rico Schüller : d3dx9: Remove typedef from ID3DXBufferImpl.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: 62c1fb0941a723b399f6f31e91d4a3cd10eb5574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c1fb0941a723b399f6f31e9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:40 2011 +0200 d3dx9: Remove typedef from ID3DXBufferImpl. --- dlls/d3dx9_36/core.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index c1e9641..26eec9b 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -30,23 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -typedef struct ID3DXBufferImpl +struct ID3DXBufferImpl { ID3DXBuffer ID3DXBuffer_iface; LONG ref; DWORD *buffer; DWORD bufferSize; -} ID3DXBufferImpl; +}; -static inline ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) +static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) { - return CONTAINING_RECORD(iface, ID3DXBufferImpl, ID3DXBuffer_iface); + return CONTAINING_RECORD(iface, struct ID3DXBufferImpl, ID3DXBuffer_iface); } static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) @@ -62,7 +62,7 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); @@ -72,7 +72,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); @@ -87,13 +87,13 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->buffer; } static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->bufferSize; } @@ -108,7 +108,7 @@ const ID3DXBufferVtbl D3DXBuffer_Vtbl = HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { - ID3DXBufferImpl *object; + struct ID3DXBufferImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL)

1 0

Hans Leidekker : msi: Avoid sprintf for simple concatenations.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: 6f552fd2f72d42097e684fb19e5987582b3154a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f552fd2f72d42097e684fb19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:32:39 2011 +0200 msi: Avoid sprintf for simple concatenations. --- dlls/msi/package.c | 5 +- dlls/msi/registry.c | 342 +++++++++++++++++++++----------------------------- 2 files changed, 147 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f552fd2f72d42097e684…

1 0

Hans Leidekker : msi: Explicitly pass product code and platform to MSIREG_OpenUninstallKey and MSIREG_DeleteUninstallKey .
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: e4d19fc47b37ad6c375171811a18a4eae082884d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d19fc47b37ad6c375171811… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:04 2011 +0200 msi: Explicitly pass product code and platform to MSIREG_OpenUninstallKey and MSIREG_DeleteUninstallKey. --- dlls/msi/action.c | 4 ++-- dlls/msi/msipriv.h | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/registry.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a21f234..abee14c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5286,7 +5286,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (!msi_check_publish(package)) return ERROR_SUCCESS; - rc = MSIREG_OpenUninstallKey(package, &hkey, TRUE); + rc = MSIREG_OpenUninstallKey(package->ProductCode, package->platform, &hkey, TRUE); if (rc != ERROR_SUCCESS) return rc; @@ -5366,7 +5366,7 @@ static UINT msi_unpublish_product(MSIPACKAGE *package, WCHAR *remove) MSIREG_DeleteProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode); - MSIREG_DeleteUninstallKey(package); + MSIREG_DeleteUninstallKey(package->ProductCode, package->platform); MSIREG_DeleteLocalClassesProductKey(package->ProductCode); MSIREG_DeleteLocalClassesFeaturesKey(package->ProductCode); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7af99a6..19e9be8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -829,8 +829,8 @@ extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out); extern BOOL squash_guid(LPCWSTR in, LPWSTR out); extern BOOL encode_base85_guid(GUID *,LPWSTR); extern BOOL decode_base85_guid(LPCWSTR,GUID*); -extern UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create); -extern UINT MSIREG_DeleteUninstallKey(MSIPACKAGE *package); +extern UINT MSIREG_OpenUninstallKey(const WCHAR *, enum platform, HKEY *, BOOL); +extern UINT MSIREG_DeleteUninstallKey(const WCHAR *, enum platform); extern UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY* key, BOOL create); extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 00ed9f8..88cf34d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -449,7 +449,7 @@ static UINT set_installed_prop( MSIPACKAGE *package ) HKEY hkey = 0; UINT r; - r = MSIREG_OpenUninstallKey( package, &hkey, FALSE ); + r = MSIREG_OpenUninstallKey( package->ProductCode, package->platform, &hkey, FALSE ); if (r == ERROR_SUCCESS) { RegCloseKey( hkey ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index e146d82..60deeb9 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -525,17 +525,17 @@ static WCHAR *get_user_sid(void) return ret; } -UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create) +UINT MSIREG_OpenUninstallKey(const WCHAR *product, enum platform platform, HKEY *key, BOOL create) { UINT rc; WCHAR keypath[0x200]; - TRACE("%s\n", debugstr_w(package->ProductCode)); + TRACE("%s\n", debugstr_w(product)); - if (is_64bit && package->platform == PLATFORM_INTEL) - sprintfW(keypath, szUninstall_32node_fmt, package->ProductCode); + if (is_64bit && platform == PLATFORM_INTEL) + sprintfW(keypath, szUninstall_32node_fmt, product); else - sprintfW(keypath, szUninstall_fmt, package->ProductCode); + sprintfW(keypath, szUninstall_fmt, product); if (create) rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); @@ -545,16 +545,16 @@ UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create) return rc; } -UINT MSIREG_DeleteUninstallKey(MSIPACKAGE *package) +UINT MSIREG_DeleteUninstallKey(const WCHAR *product, enum platform platform) { WCHAR keypath[0x200]; - TRACE("%s\n", debugstr_w(package->ProductCode)); + TRACE("%s\n", debugstr_w(product)); - if (is_64bit && package->platform == PLATFORM_INTEL) - sprintfW(keypath, szUninstall_32node_fmt, package->ProductCode); + if (is_64bit && platform == PLATFORM_INTEL) + sprintfW(keypath, szUninstall_32node_fmt, product); else - sprintfW(keypath, szUninstall_fmt, package->ProductCode); + sprintfW(keypath, szUninstall_fmt, product); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); }

1 0

Hans Leidekker : msi/tests: Allocate the user token dynamically and unify implementations.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: 419496d0c8156e1cbf864c0d64a36301bbde653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=419496d0c8156e1cbf864c0d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:35 2011 +0200 msi/tests: Allocate the user token dynamically and unify implementations. --- dlls/msi/tests/action.c | 34 +++++++++++++++++----------------- dlls/msi/tests/msi.c | 44 ++++++++++++++++++++++---------------------- dlls/msi/tests/package.c | 26 +++++++++++++------------- dlls/msi/tests/source.c | 45 ++++++++++++++++++++++++--------------------- 4 files changed, 76 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419496d0c8156e1cbf864…

1 0

Hans Leidekker : msi/tests: Get rid of workarounds for win9x test failures.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: c505c0fe985e769e3eb5a410480ec331b0d43c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c505c0fe985e769e3eb5a4104… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:17 2011 +0200 msi/tests: Get rid of workarounds for win9x test failures. --- dlls/msi/tests/automation.c | 28 +++------ dlls/msi/tests/db.c | 16 +---- dlls/msi/tests/install.c | 130 +++++++------------------------------------ dlls/msi/tests/msi.c | 4 +- dlls/msi/tests/package.c | 31 ++--------- 5 files changed, 40 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c505c0fe985e769e3eb5a…

1 0

Hans Leidekker : msi: Allocate the user token dynamically.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: 6ad992c40722cd385e378e18835156e0799029d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad992c40722cd385e378e188… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:49 2011 +0200 msi: Allocate the user token dynamically. --- dlls/msi/registry.c | 156 +++++++++++++++++++++----------------------------- 1 files changed, 66 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad992c40722cd385e378…

1 0

Hans Leidekker : msi: Ignore invalid upgrade codes in the PublishProduct action.
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: e82a4896f39bea9d5d31de93813ba7b9d468bc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82a4896f39bea9d5d31de938… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:29:59 2011 +0200 msi: Ignore invalid upgrade codes in the PublishProduct action. --- dlls/msi/action.c | 19 +++------ dlls/msi/tests/install.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2f0b739..a21f234 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4364,26 +4364,21 @@ static UINT msi_publish_upgrade_code(MSIPACKAGE *package) return ERROR_SUCCESS; if (package->Context == MSIINSTALLCONTEXT_MACHINE) - { r = MSIREG_OpenClassesUpgradeCodesKey(upgrade, &hkey, TRUE); - if (r != ERROR_SUCCESS) - goto done; - } else - { r = MSIREG_OpenUserUpgradeCodesKey(upgrade, &hkey, TRUE); - if (r != ERROR_SUCCESS) - goto done; - } + if (r != ERROR_SUCCESS) + { + WARN("failed to open upgrade code key\n"); + msi_free(upgrade); + return ERROR_SUCCESS; + } squash_guid(package->ProductCode, squashed_pc); msi_reg_set_val_str(hkey, squashed_pc, NULL); - RegCloseKey(hkey); - -done: msi_free(upgrade); - return r; + return ERROR_SUCCESS; } static BOOL msi_check_publish(MSIPACKAGE *package) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index deff5f7..fb71f9d 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1191,6 +1191,53 @@ static const CHAR cl_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallValidate\t\t1400\n" "InstallFinalize\t\t5000\n"; +static const CHAR uc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "upgradecode.txt\tupgradecode\tupgradecode.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR uc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "upgradecode\t\t\tupgradecode feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR uc_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "upgradecode\tupgradecode\n"; + +static const CHAR uc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "upgradecode\t{6952B732-2FCB-4E47-976F-989FCBD7EDFB}\tMSITESTDIR\t0\t\tupgradecode.txt\n"; + +static const CHAR uc_property_dat[] = "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "INSTALLLEVEL\t3\n" + "ProductCode\t{E5FB1241-F547-4BA7-A60E-8E75797268D4}\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t#UPGEADECODE#\n" + "MSIFASTINSTALL\t1\n"; + +static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallInitialize\t\t500\n" + "ProcessComponents\t\t600\n" + "InstallValidate\t\t700\n" + "RemoveFiles\t\t800\n" + "InstallFiles\t\t900\n" + "RegisterProduct\t\t1000\n" + "PublishFeatures\t\t1100\n" + "PublishProduct\t\t1200\n" + "InstallFinalize\t\t1300\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1870,6 +1917,18 @@ static const msi_table cl_tables[] = ADD_TABLE(property) }; +static const msi_table uc_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(uc_component), + ADD_TABLE(uc_feature), + ADD_TABLE(uc_feature_comp), + ADD_TABLE(uc_file), + ADD_TABLE(uc_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(uc_property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6373,6 +6432,38 @@ static void test_command_line_parsing(void) RemoveDirectory("msitest"); } +static void test_upgrade_code(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\upgradecode.txt", 1000); + create_database(msifile, uc_tables, sizeof(uc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\upgradecode.txt"), "file not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\upgradecode.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\upgradecode.txt"); + RemoveDirectoryA("msitest"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -6463,6 +6554,7 @@ START_TEST(install) test_sourcedir_props(); test_package_validation(); test_command_line_parsing(); + test_upgrade_code(); DeleteFileA(log_file);

1 0

Jörg Höhle : winmm: PlaySound concurrency cleanup .
by Alexandre Julliard March 30, 2011

March 30, 2011

Module: wine Branch: master Commit: e0dcc2cd7d4495b7056a47ada1af74cc7c318ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dcc2cd7d4495b7056a47ada… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 28 22:34:02 2011 +0200 winmm: PlaySound concurrency cleanup. --- dlls/winmm/playsound.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 3624124..02e24e8 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -44,7 +44,6 @@ typedef struct tagWINE_PLAYSOUND LPCWSTR pszSound; HMODULE hMod; DWORD fdwSound; - HANDLE hThread; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -215,7 +214,6 @@ static void PlaySound_Free(WINE_PLAYSOUND* wps) if (PlaySoundList == NULL) SetEvent(psLastEvent); LeaveCriticalSection(&WINMM_cs); if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); - if (wps->hThread) CloseHandle(wps->hThread); HeapFree(GetProcessHeap(), 0, wps); } @@ -258,7 +256,8 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, return wps; oom_error: - PlaySound_Free(wps); + if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); + HeapFree(GetProcessHeap(), 0, wps); return NULL; } @@ -377,6 +376,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + if (!lpWaveFormat) + goto errCleanUp; if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; @@ -398,6 +399,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!s.hEvent) + goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -407,6 +410,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) bufsize = (((lpWaveFormat->nAvgBytesPerSec / 3) - 1) / lpWaveFormat->nBlockAlign + 1) * lpWaveFormat->nBlockAlign; waveHdr = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WAVEHDR) + 2 * bufsize); + if (!waveHdr) + goto errCleanUp; waveHdr[0].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR); waveHdr[1].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR) + bufsize; waveHdr[0].dwUser = waveHdr[1].dwUser = 0L; @@ -458,10 +463,10 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); - CloseHandle(s.hEvent); - HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + CloseHandle(s.hEvent); + HeapFree(GetProcessHeap(), 0, waveHdr); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -509,16 +514,15 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo PlaySoundList = wps; LeaveCriticalSection(&WINMM_cs); - if (!pszSound || (fdwSound & SND_PURGE)) return TRUE; + if (!wps) return TRUE; if (fdwSound & SND_ASYNC) { - DWORD id; HANDLE handle; wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; - if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, &id)) != 0) { - wps->hThread = handle; + if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) { SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); return TRUE; } }

1 0