wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Sven Baars : msscript.ocx/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 305234e5cde5b79fd93d20afecf3e6666bad05ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=305234e5cde5b79fd93d20af… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 19 20:42:22 2019 +0100 msscript.ocx/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 3110ea2..47ae76d 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -283,8 +283,11 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); IActiveScriptSiteWindow_Release(window); + if (site) + IActiveScriptSite_Release(site); site = pass; IActiveScriptSite_AddRef(site); + return S_OK; } @@ -430,6 +433,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(&IID_IActiveScript, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = &ActiveScript; + site = NULL; return S_OK; } @@ -780,6 +784,8 @@ static void test_Language(void) ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1077,6 +1083,9 @@ static void test_Reset(void) ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close); @@ -1213,6 +1222,9 @@ static void test_AddObject(void) hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptSite); + IActiveScriptSite_Release(site); + init_registry(FALSE); SET_EXPECT(Close);

1 0

Jacek Caban : rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: d73a6bae08644f0e551fd16ac0ed543d1eb871e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d73a6bae08644f0e551fd16a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 14:11:11 2019 +0100 rpcrt4/tests: Run RPC tests in both mixed and fully interpreted mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 6 +- dlls/rpcrt4/tests/server.c | 934 ++++++++++++++++++++++++++++++------ dlls/rpcrt4/tests/server.idl | 228 +++++---- dlls/rpcrt4/tests/server_interp.idl | 25 + 4 files changed, 965 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d73a6bae08644f0e551f…

1 0

Piotr Caban : msvcrt: Optimize toupper function when locale was never changed.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 688671763154c569b286567810d2e0ed3341dbac URL: https://source.winehq.org/git/wine.git/?a=commit;h=688671763154c569b2865678… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:11 2019 +0100 msvcrt: Optimize toupper function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 17b12e2..3b037aa 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -398,6 +398,8 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_toupper(int c) { + if(initial_locale) + return c>='a' && c<='z' ? c-'a'+'A' : c; return MSVCRT__toupper_l(c, NULL); }

1 0

Piotr Caban : msvcrt: Optimize tolower function when locale was never changed.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: e867af3bfeb5fc50d76cf26816d294d5342fe48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e867af3bfeb5fc50d76cf268… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 23 11:59:05 2019 +0100 msvcrt: Optimize tolower function when locale was never changed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 758411a..17b12e2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -458,7 +458,9 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) */ int CDECL MSVCRT_tolower(int c) { - return MSVCRT__tolower_l(c, NULL); + if(initial_locale) + return c>='A' && c<='Z' ? c-'A'+'a' : c; + return MSVCRT__tolower_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e56395..a1e827d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -48,6 +48,7 @@ int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; +BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1780,6 +1781,9 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) _lock_locales(); + if(locale[0] != 'C' || locale[1] != '\0') + initial_locale = FALSE; + if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { locinfo->lc_collate_cp = newlocinfo->lc_collate_cp; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc91066..02b8628 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,6 +283,7 @@ extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; +extern BOOL initial_locale DECLSPEC_HIDDEN; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e80a518..a159132 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2788,13 +2788,19 @@ static void test_tolower(void) errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); - todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(ret == (char)0xD0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + setlocale(LC_ALL, "C"); + errno = 0xdeadbeef; + ret = p_tolower((char)0xF4); + ok(ret == (char)0xF4, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) {

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports the specified hash algorithm.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: ca683382e08d7c2121212774bc73b1a124f0fe04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca683382e08d7c2121212774… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 17:27:44 2019 +0800 crypt32: Make sure that the provider supports the specified hash algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b532936..eb646cd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2195,7 +2195,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = I_CryptGetDefaultCryptProv(0); + hCryptProv = I_CryptGetDefaultCryptProv(Algid); if (!Algid) Algid = CALG_SHA1; if (ret)

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports the specified signature algorithm.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 34a89805e3b3acd43f23944b48ef23aaaf1d57f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a89805e3b3acd43f23944b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 17:27:37 2019 +0800 crypt32: Make sure that the provider supports the specified signature algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d4ce8c..b532936 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2449,7 +2449,7 @@ static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEnco pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) - hCryptProv = I_CryptGetDefaultCryptProv(0); + hCryptProv = I_CryptGetDefaultCryptProv(hashID); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret)

1 0

Alex Henrie : shell32: Rename SHELL32_714 to PathIsTemporaryW.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 8bace09cb8f78dce88f68f8b54a1de40e1d4bf89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bace09cb8f78dce88f68f8b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 22 22:48:45 2019 -0700 shell32: Rename SHELL32_714 to PathIsTemporaryW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bf8b512..771f5e3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -260,7 +260,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long) - 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 714 stdcall -noname PathIsTemporaryW(wstr) 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6ed0c90..b04a56e 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1623,12 +1623,12 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) } /************************************************************************* - * @ [SHELL32.714] + * PathIsTemporaryW [SHELL32.714] */ -DWORD WINAPI SHELL32_714(LPVOID x) +BOOL WINAPI PathIsTemporaryW(const WCHAR *path) { - FIXME("(%s)stub\n", debugstr_w(x)); - return 0; + FIXME("(%s) stub\n", debugstr_w(path)); + return FALSE; } typedef struct _PSXA

1 0

Zebediah Figura : setupapi: Also remove the driver key in remove_device().
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 7e4c1a20740c8b2e2a46c3bd906d07213598aa41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4c1a20740c8b2e2a46c3bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 22:10:32 2019 -0600 setupapi: Also remove the driver key in remove_device(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 ++ dlls/setupapi/tests/devinst.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e577f83..36c1854 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -656,6 +656,8 @@ static void remove_device(struct device *device) struct device_iface *iface; HKEY enum_key; + delete_driver_key(device); + LIST_FOR_EACH_ENTRY(iface, &device->interfaces, struct device_iface, entry) { remove_device_iface(iface); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ca29a3f..74fa545 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -828,15 +828,22 @@ todo_wine { ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); - RegCloseKey(class_key); + key = SetupDiCreateDevRegKeyW(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Failed to create device key, error %#x.\n", GetLastError()); + RegCloseKey(key); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); + res = RegOpenKeyA(class_key, driver_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + /* Vista+ deletes the key automatically. */ res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, class_key_path); ok(!res || res == ERROR_FILE_NOT_FOUND, "Failed to delete class key, error %u.\n", res); + + RegCloseKey(class_key); } static void test_register_device_iface(void)

1 0

Zebediah Figura : setupapi/tests: Create the setup class key before trying to create the driver key.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: 00c8c270321f75d34c08f77300bd7082df761e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c8c270321f75d34c08f773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 22:10:31 2019 -0600 setupapi/tests: Create the setup class key before trying to create the driver key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 88 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index e90f416..ca29a3f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -699,12 +699,8 @@ static void test_device_iface_detail(void) static void test_device_key(void) { - static const WCHAR classKey[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','C','l','a','s','s','\\', - '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', - '1','1','d','b','-','b','7','0','4','-', - '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + static const char class_key_path[] = "System\\CurrentControlSet\\Control\\Class" + "\\{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', @@ -778,66 +774,68 @@ static void test_device_key(void) ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, class_key_path, &key); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); RegCloseKey(key); + /* Vista+ will fail the following call to SetupDiCreateDevKeyW() if the + * class key doesn't exist. */ + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, class_key_path, &key); + ok(!res, "Failed to create class key, error %u.\n", res); + RegCloseKey(key); + key = SetupDiCreateDevRegKeyW(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); - ok(key != INVALID_HANDLE_VALUE || GetLastError() == ERROR_KEY_DOES_NOT_EXIST, /* Vista+ */ - "Failed to create device key, error %#x.\n", GetLastError()); - if (key != INVALID_HANDLE_VALUE) - { - RegCloseKey(key); + ok(key != INVALID_HANDLE_VALUE, "Failed to create device key, error %#x.\n", GetLastError()); + RegCloseKey(key); - ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), "Key should exist.\n"); - RegCloseKey(key); + ok(!RegOpenKeyA(HKEY_LOCAL_MACHINE, class_key_path, &key), "Key should exist.\n"); + RegCloseKey(key); - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", &class_key); - ok(!res, "Failed to open class key, error %u.\n", res); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", &class_key); + ok(!res, "Failed to open class key, error %u.\n", res); - ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, - (BYTE *)driver_path, sizeof(driver_path), NULL); - ok(ret, "Failed to get driver property, error %#x.\n", GetLastError()); - res = RegOpenKeyA(class_key, driver_path, &key); - ok(!res, "Failed to open driver key, error %u.\n", res); - RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); - RegCloseKey(key); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DRIVER, NULL, + (BYTE *)driver_path, sizeof(driver_path), NULL); + ok(ret, "Failed to get driver property, error %#x.\n", GetLastError()); + res = RegOpenKeyA(class_key, driver_path, &key); + ok(!res, "Failed to open driver key, error %u.\n", res); + RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); + RegCloseKey(key); - SetLastError(0xdeadbeef); - key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); todo_wine { - ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); - ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_ACCESS_DENIED, /* win2k3 */ - "Got unexpected error %#x.\n", GetLastError()); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_ACCESS_DENIED, /* win2k3 */ + "Got unexpected error %#x.\n", GetLastError()); } - key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); - ok(key != INVALID_HANDLE_VALUE, "Failed to open device key, error %#x.\n", GetLastError()); - size = sizeof(data); - res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); - ok(!res, "Failed to get value, error %u.\n", res); - ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); - RegCloseKey(key); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); + ok(key != INVALID_HANDLE_VALUE, "Failed to open device key, error %#x.\n", GetLastError()); + size = sizeof(data); + res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); + ok(!res, "Failed to get value, error %u.\n", res); + ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); + RegCloseKey(key); - ret = SetupDiDeleteDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV); - ok(ret, "Failed to delete device key, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV); + ok(ret, "Failed to delete device key, error %#x.\n", GetLastError()); - res = RegOpenKeyA(class_key, driver_path, &key); - ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + res = RegOpenKeyA(class_key, driver_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); - key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); - ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); - ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); - RegCloseKey(class_key); - } + RegCloseKey(class_key); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); /* Vista+ deletes the key automatically. */ - res = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, class_key_path); ok(!res || res == ERROR_FILE_NOT_FOUND, "Failed to delete class key, error %u.\n", res); }

1 0

Zebediah Figura : setupapi: Don't use the devnode to allocate driver keys.
by Alexandre Julliard 23 Jan '19

23 Jan '19

Module: wine Branch: master Commit: dca175b2565353e4ec99822f0590d4dabedf05b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca175b2565353e4ec99822f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 22 22:10:30 2019 -0600 setupapi: Don't use the devnode to allocate driver keys. The devnode is a local handle, but driver keys should be unique to the device. (Note that MSDN, confusingly, refers to this number as a "device instance ID".) Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 855fa92..e577f83 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -527,7 +527,9 @@ static HKEY create_driver_key(struct device *device) static const WCHAR formatW[] = {'%','0','4','u',0}; static const WCHAR slash[] = { '\\',0 }; HKEY class_key, key; + unsigned int i = 0; WCHAR path[50]; + DWORD dispos; LONG l; if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) @@ -543,12 +545,20 @@ static HKEY create_driver_key(struct device *device) SETUPDI_GuidToString(&device->class, path); strcatW(path, slash); - sprintfW(path + strlenW(path), formatW, device->devnode); - if (!(l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL))) + /* Allocate a new driver key, by finding the first integer value that's not + * already taken. */ + for (;;) { - RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR)); - RegCloseKey(class_key); - return key; + sprintfW(path + 39, formatW, i++); + if ((l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, &dispos))) + break; + else if (dispos == REG_CREATED_NEW_KEY) + { + RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR)); + RegCloseKey(class_key); + return key; + } + RegCloseKey(key); } ERR("Failed to create driver key, error %u.\n", l); RegCloseKey(class_key);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019