April 2019 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Add ISVGTSpanElement stub implementation.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: c06af48420ff499647c69165a26a744d90315adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06af48420ff499647c69165… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:44 2019 +0200 mshtml: Add ISVGTSpanElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 245 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 21 +++- 3 files changed, 267 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c06af48420ff499647c6…

1 0

Zebediah Figura : msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 3d9363446fad694b6e534d84fce63bfc9dbbf4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9363446fad694b6e534d84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 14 11:53:59 2019 -0500 msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47009 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 46 ++++++++---------- dlls/msi/tests/action.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 29 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index efc7272..8b90254 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -164,11 +164,6 @@ static const WCHAR szUninstall[] = { 'W','i','n','d','o','w','s','\\','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 szUninstall_32node[] = { - 'S','o','f','t','w','a','r','e','\\','W','o','w','6','4','3','2','N','o','d','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - '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 szUserComponents[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; @@ -452,41 +447,38 @@ static WCHAR *get_user_sid(void) UINT MSIREG_OpenUninstallKey(const WCHAR *product, enum platform platform, HKEY *key, BOOL create) { + REGSAM access = KEY_ALL_ACCESS; WCHAR keypath[0x200]; TRACE("%s\n", debugstr_w(product)); - if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); - return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS, key); + access |= KEY_WOW64_64KEY; + strcpyW(keypath, szUninstall); + strcatW(keypath, product); + if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); + return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } UINT MSIREG_DeleteUninstallKey(const WCHAR *product, enum platform platform) { - WCHAR keypath[0x200]; + REGSAM access = KEY_ALL_ACCESS; + HKEY parent; + LONG r; TRACE("%s\n", debugstr_w(product)); - if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); + access |= KEY_WOW64_64KEY; + if ((r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szUninstall, 0, access, &parent))) + return r; + r = RegDeleteTreeW(parent, product); + RegCloseKey(parent); + return r; } UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7750351..60ae92e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -441,8 +441,8 @@ static const char pp_install_exec_seq_dat[] = "ru_immediate\tREGISTER_USER AND ALLUSERS\t6001\n" "ru_deferred\tREGISTER_USER AND ALLUSERS\t6002\n" "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\n" - "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS\t6101\n" - "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS\t6102\n" + "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6101\n" + "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6102\n" "PublishFeatures\tPUBLISH_FEATURES=1 Or FULL=1\t6300\n" "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" @@ -2877,6 +2877,123 @@ todo_wine ok(!res, "got %d\n", res); RegCloseKey(hkey); + if (is_wow64 || is_64bit) + { + DeleteFileA(msifile); + create_database_template(msifile, pp_tables, ARRAY_SIZE(pp_tables), 200, "x64;1033"); + + r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1 RP_TEST64=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(hkey, "InstallDate", date); + CHECK_DEL_REG_STR(hkey, "InstallSource", temp); + CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); + CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(hkey, "Comments", NULL); + CHECK_DEL_REG_STR(hkey, "Contact", NULL); + CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); + CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); + CHECK_DEL_REG_STR(hkey, "Readme", NULL); + CHECK_DEL_REG_STR(hkey, "Size", NULL); + CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(hkey, "Language", 1033); + CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + sprintf(keypath, userdata, "S-1-5-18"); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(path); + RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); + DeleteFileA(path); + RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(props, "InstallDate", date); + CHECK_DEL_REG_STR(props, "InstallSource", temp); + CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "Publisher", "Wine"); + CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(props, "Comments", NULL); + CHECK_DEL_REG_STR(props, "Contact", NULL); + CHECK_DEL_REG_STR(props, "HelpLink", NULL); + CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(props, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(props, "NoModify", 1); + CHECK_DEL_REG_STR(props, "Readme", NULL); + CHECK_DEL_REG_STR(props, "Size", NULL); + CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(props, "Language", 1033); + CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); + RegCloseKey(props); + + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + res = RegDeleteKeyA(usage, ""); + todo_wine + ok(!res, "got %d\n", res); + RegCloseKey(usage); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + } + else + skip("64-bit RegisterProduct tests\n"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus");

1 0

Hans Leidekker : msi: Fix architecture handling in the AppSearch action.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: eb508e5a014f59fbb2c70d9909ba0870ce2b901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb508e5a014f59fbb2c70d99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 18 11:31:59 2019 +0200 msi: Fix architecture handling in the AppSearch action. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/appsearch.c | 7 +++++-- dlls/msi/tests/package.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 047085d..6b1768e 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -372,6 +372,7 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig const WCHAR *keyPath, *valueName; WCHAR *deformatted = NULL, *ptr = NULL, *end; int root, type; + REGSAM access = KEY_READ; HKEY rootKey, key = NULL; DWORD sz = 0, regType; LPBYTE value = NULL; @@ -406,6 +407,8 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig break; case msidbRegistryRootLocalMachine: rootKey = HKEY_LOCAL_MACHINE; + if (type & msidbLocatorType64bit) access |= KEY_WOW64_64KEY; + else access |= KEY_WOW64_32KEY; break; case msidbRegistryRootUsers: rootKey = HKEY_USERS; @@ -415,10 +418,10 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig goto end; } - rc = RegOpenKeyW(rootKey, deformatted, &key); + rc = RegOpenKeyExW( rootKey, deformatted, 0, access, &key ); if (rc) { - TRACE("RegOpenKeyW returned %d\n", rc); + TRACE("RegOpenKeyExW returned %d\n", rc); goto end; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d5f1568..593e254 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4036,6 +4036,8 @@ static void test_appsearch(void) add_appsearch_entry( hdb, "'WEBBROWSERPROG', 'NewSignature1'" ); add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + add_appsearch_entry( hdb, "'32KEYVAL', 'NewSignature4'" ); + add_appsearch_entry( hdb, "'64KEYVAL', 'NewSignature5'" ); create_reglocator_table( hdb ); add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); @@ -4045,7 +4047,26 @@ static void test_appsearch(void) r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); RegCloseKey(hkey); - add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature4", 2, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature5", 2, "Software\\Winetest_msi", "", + msidbLocatorTypeFileName|msidbLocatorType64bit ); create_drlocator_table( hdb ); add_drlocator_entry( hdb, "'NewSignature2', 0, 'c:\\windows\\system32', 0" ); @@ -4054,6 +4075,8 @@ static void test_appsearch(void) add_signature_entry( hdb, "'NewSignature1', 'FileName', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature4', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature5', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4086,10 +4109,22 @@ static void test_appsearch(void) ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "32KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "64KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_32KEY); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_64KEY); } static void test_appsearch_complocator(void)

1 0

Józef Kucia : d3d11: Fix d3d10_device_RSGetScissorRects().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: fcb2784697ca63d47a4262b7f277d904177e9c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb2784697ca63d47a4262b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:23 2019 +0200 d3d11: Fix d3d10_device_RSGetScissorRects(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6b89a64..4f19c03 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5114,6 +5114,8 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock();

1 0

Hans Leidekker : msi: Take architecture into account when accessing the shared dll reference count.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 5b6bf621cdc0b67528e2f0312d0a89d7cdfce5a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b6bf621cdc0b67528e2f031… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:25:30 2019 +0200 msi: Take architecture into account when accessing the shared dll reference count. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 58 +++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5290806..849335e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3317,66 +3317,48 @@ static LPWSTR resolve_keypath( MSIPACKAGE* package, MSICOMPONENT *cmp ) return NULL; } -static HKEY openSharedDLLsKey(void) +static HKEY open_shared_dlls_key( MSICOMPONENT *comp, BOOL create, REGSAM access ) { - HKEY hkey=0; static const WCHAR path[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'S','h','a','r','e','d','D','L','L','s',0}; - - RegCreateKeyW(HKEY_LOCAL_MACHINE,path,&hkey); - return hkey; + return open_key( comp, HKEY_LOCAL_MACHINE, path, create, access ); } -static UINT ACTION_GetSharedDLLsCount(LPCWSTR dll) +static UINT get_shared_dlls_count( MSICOMPONENT *comp ) { - HKEY hkey; - DWORD count=0; - DWORD type; - DWORD sz = sizeof(count); - DWORD rc; - - hkey = openSharedDLLsKey(); - rc = RegQueryValueExW(hkey, dll, NULL, &type, (LPBYTE)&count, &sz); - if (rc != ERROR_SUCCESS) - count = 0; - RegCloseKey(hkey); + DWORD count, type, sz = sizeof(count); + HKEY hkey = open_shared_dlls_key( comp, FALSE, KEY_READ ); + if (RegQueryValueExW( hkey, comp->FullKeypath, NULL, &type, (BYTE *)&count, &sz )) count = 0; + RegCloseKey( hkey ); return count; } -static UINT ACTION_WriteSharedDLLsCount(LPCWSTR path, UINT count) +static void write_shared_dlls_count( MSICOMPONENT *comp, const WCHAR *path, INT count ) { - HKEY hkey; - - hkey = openSharedDLLsKey(); + HKEY hkey = open_shared_dlls_key( comp, TRUE, KEY_SET_VALUE ); if (count > 0) msi_reg_set_val_dword( hkey, path, count ); else - RegDeleteValueW(hkey,path); + RegDeleteValueW( hkey, path ); RegCloseKey(hkey); - return count; } -static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) +static void refcount_component( MSIPACKAGE *package, MSICOMPONENT *comp ) { MSIFEATURE *feature; INT count = 0; BOOL write = FALSE; /* only refcount DLLs */ - if (comp->KeyPath == NULL || - comp->assembly || - comp->Attributes & msidbComponentAttributesRegistryKeyPath || + if (!comp->KeyPath || comp->assembly || comp->Attributes & msidbComponentAttributesRegistryKeyPath || comp->Attributes & msidbComponentAttributesODBCDataSource) write = FALSE; else { - count = ACTION_GetSharedDLLsCount( comp->FullKeypath); + count = get_shared_dlls_count( comp ); write = (count > 0); - if (comp->Attributes & msidbComponentAttributesSharedDllRefCount) write = TRUE; } @@ -3419,18 +3401,18 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { if (file->Component == comp) - ACTION_WriteSharedDLLsCount( file->TargetPath, count ); + write_shared_dlls_count( comp, file->TargetPath, count ); } } - + /* add a count for permanent */ if (comp->Attributes & msidbComponentAttributesPermanent) count ++; - + comp->RefCount = count; if (write) - ACTION_WriteSharedDLLsCount( comp->FullKeypath, comp->RefCount ); + write_shared_dlls_count( comp, comp->FullKeypath, comp->RefCount ); } static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) @@ -3480,7 +3462,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) msi_free( comp->FullKeypath ); comp->FullKeypath = build_full_keypath( package, comp ); - ACTION_RefCountComponent( package, comp ); + refcount_component( package, comp ); if (package->need_rollback) action = comp->Installed; else action = comp->ActionRequest;

1 0

Zebediah Figura : qedit/tests: Add some tests for sample grabber pin interfaces.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: eb5b2cfbc25632de6e7d7e3cf3668fa5da2d4138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5b2cfbc25632de6e7d7e3c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:50 2019 -0500 qedit/tests: Add some tests for sample grabber pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 5e4ee6e..04b63d3 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -71,7 +71,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_sample_grabber(); + IUnknown *unk; + HRESULT hr; ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -94,6 +97,39 @@ static void test_interfaces(void) check_interface(filter, &IID_ISeekingPassThru, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + /* Queries for IMediaPosition or IMediaSeeking do not seem to increase the + * reference count. */ + hr = IPin_QueryInterface(pin, &IID_IMediaPosition, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IPin_QueryInterface(pin, &IID_IMediaSeeking, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMemInputPin, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); }

1 0

Zebediah Figura : qedit/tests: Clean up and expand aggregation tests.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: a6b00b4db64082f0ab735be680d6b77a9fcb32e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b00b4db64082f0ab735be6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:51 2019 -0500 qedit/tests: Clean up and expand aggregation tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 148 +++++++++++++++++++++++---------------- dlls/qedit/tests/samplegrabber.c | 95 +++++++++++++++++++++++++ dlls/qedit/tests/timeline.c | 108 +++++++++++++++++++++++++++- 3 files changed, 288 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6b00b4db64082f0ab73…

1 0

Zebediah Figura : qedit: Fix return code for requesting aggregation with an interface other than IUnknown.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 96eb82f7012076b60a36ecc542488de38a2ddf7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=96eb82f7012076b60a36ecc5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:52 2019 -0500 qedit: Fix return code for requesting aggregation with an interface other than IUnknown. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 2 +- dlls/qedit/tests/mediadet.c | 2 +- dlls/qedit/tests/samplegrabber.c | 2 +- dlls/qedit/tests/timeline.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a46f3f0..578e9df 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -106,7 +106,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter *ppobj = NULL; if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) - return E_INVALIDARG; + return E_NOINTERFACE; hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); if (SUCCEEDED(hres)) { diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 62685af..34c43fd 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -82,7 +82,7 @@ static void test_aggregation(void) detector = (IMediaDet *)0xdeadbeef; hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (void **)&detector); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!detector, "Got interface %p.\n", detector); hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 76fdfbb..22f6ddb 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -400,7 +400,7 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index a1e38e0..9e24062 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -74,7 +74,7 @@ static void test_aggregation(void) timeline = (IAMTimeline *)0xdeadbeef; hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!timeline, "Got interface %p.\n", timeline); hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,

1 0

Zebediah Figura : widl: Correctly set the import library offset for all imported types.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 6c64d02117ecb9b259a55237f145fc9d5e70cdad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c64d02117ecb9b259a55237… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 17 00:14:55 2019 -0500 widl: Correctly set the import library offset for all imported types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47031 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index afca4c0..1177c1a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -497,6 +497,7 @@ struct _importinfo_t { }; struct _importlib_t { + int offset; char *name; int version; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cb4f0f3..4dcbc03 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -702,15 +702,15 @@ static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo) guid_idx = ctl2_alloc_guid(typelib, &guid); - alloc_importfile(typelib, guid_idx, importlib->version&0xffff, - importlib->version>>16, importlib->name); + importlib->offset = alloc_importfile(typelib, guid_idx, importlib->version & 0xffff, + importlib->version >> 16, importlib->name); } if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) { MSFT_ImpInfo impinfo; impinfo.flags = importinfo->flags; - impinfo.oImpFile = 0; + impinfo.oImpFile = importlib->offset; if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_GuidEntry guid;

1 0

Hans Leidekker : msi: Use KEY_WOW64_* flags in ACTION_Register/ UnregisterClassInfo.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 70732e273eb52821bfd725f3b1ea1919b8c0e3b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70732e273eb52821bfd725f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:25:28 2019 +0200 msi: Use KEY_WOW64_* flags in ACTION_Register/UnregisterClassInfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 25 ++++++++++++------------- dlls/msi/msipriv.h | 1 - 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 293aa10..7b0a4a4 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -747,7 +747,7 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) { static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; HKEY hkey, hkey2, hkey3; MSICLASS *cls; @@ -760,12 +760,12 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegCreateKeyW(HKEY_CLASSES_ROOT, keypath, &hkey) != ERROR_SUCCESS) + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) @@ -873,7 +873,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (cls->DefInprocHandler32) msi_reg_set_subkey_val( hkey2, szInprocHandler32, NULL, cls->DefInprocHandler32 ); - RegCloseKey(hkey2); /* if there is a FileTypeMask, register the FileType */ @@ -902,7 +901,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) index ++; } } - + uirow = MSI_CreateRecord(1); MSI_RecordSetStringW( uirow, 1, cls->clsid ); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); @@ -915,7 +914,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR szFileType[] = {'F','i','l','e','T','y','p','e','\\',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; MSICLASS *cls; HKEY hkey, hkey2; @@ -928,13 +927,13 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegOpenKeyW( HKEY_CLASSES_ROOT, keypath, &hkey ) != ERROR_SUCCESS) - return ERROR_SUCCESS; + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) + return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbab8e2..8354882 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1207,7 +1207,6 @@ static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szARM64[] = {'A','r','m','6','4',0}; -static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};

1 0