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

[PATCH 5/6] mshtml: Add ISVGTSpanElement stub implementation.
by Jacek Caban April 18, 2019

April 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 245 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 21 ++- 3 files changed, 267 insertions(+), 4 deletions(-)

1 0

[PATCH 4/6] mshtml: Add ISVGCircleElement stub implementation.
by Jacek Caban April 18, 2019

April 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/svg.c | 172 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 175 insertions(+)

1 0

[PATCH 3/6] mshtml: Add ISVGSVGElement stub implementation.
by Jacek Caban April 18, 2019

April 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/svg.c | 558 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 562 insertions(+), 1 deletion(-)

1 0

[PATCH 2/6] mshtml: Add ISVGElement stub implementation.
by Jacek Caban April 18, 2019

April 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 24 ++-- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 225 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 16 ++- include/mshtml.idl | 16 +++ 6 files changed, 276 insertions(+), 11 deletions(-) create mode 100644 dlls/mshtml/svg.c

1 0

[PATCH 1/6] mshtml/tests: Properly release elem2 in test_elem_bounding_client_rect.
by Jacek Caban April 18, 2019

April 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] wintrust: use enhanced crypto provider in VerifyImageHash
by Vijay Kiran Kamuju April 18, 2019

April 18, 2019

From: Marko Friedemann <marko(a)friedemann.email> Softpub VerifyImageHash uses the default crypto provider and fails for certificates using SHA256 et al. with NTE_BAD_ALGID (80090008). Fixes startup cert error with SWTOR launcher as-of 2017-08-01. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47034 From: Marko Friedemann <marko(a)friedemann.email> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wintrust/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1273a58f9dc..475f55a7507 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -328,7 +328,7 @@ static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; } -- 2.17.0

1 0

[PATCH] wine.inf: Create CurrentControlSet\Control\Video in registry.
by Vijay Kiran Kamuju April 18, 2019

April 18, 2019

Based on a suggestion from Zhiyi Zhang and a patch from Michael Müller Registry key System\CurrentControlSet\Control\Video should be non-volatile From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93c359..14814daf93f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -694,6 +694,7 @@ HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" +HKLM,System\CurrentControlSet\Control\Video,,16 HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKLM,System\Select,"Current",0x10003,1 -- 2.17.0

1 0

[PATCH 1/2] mfreadwrite: Output warning for uninitialized stream descriptor.
by Nikolay Sivov April 18, 2019

April 18, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index fd9062f648..7625669ddb 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -727,7 +727,13 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor { hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + if (FAILED(hr)) + { + WARN("Failed to get stream major type, hr %#x.\n", hr); + continue; + } + + if (IsEqualGUID(&guid, major)) { return i; } -- 2.20.1

1 1

[PATCH] msi: Fix architecture handling in the AppSearch action.
by Hans Leidekker April 18, 2019

April 18, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 047085d1f3..6b1768e8af 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 d5f156825d..593e254405 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) -- 2.20.1

2 1

[PATCH 1/3] msi: Use KEY_WOW64_* flags in ACTION_Register/UnregisterClassInfo.
by Hans Leidekker April 18, 2019

April 18, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 293aa1063b..7b0a4a4d0e 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 dbab8e2292..8354882e80 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}; -- 2.20.1

3 6