March 2019 - Wine-devel - list.winehq.org

[PATCH v2 6/7] winemac.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 47 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 00ad7738bb..9a9c8695f4 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -75,27 +75,40 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; - memcpy(key, video_path, sizeof(video_path)); + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; - strcat(key, display0); + strcpy(key, substring); - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } @@ -108,7 +121,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) @@ -148,7 +161,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH v2 5/7] winex11.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..e867925c26 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -154,29 +154,43 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; - - strcat(key, display0); - - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; + + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; + + strcpy(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } + static BOOL read_registry_settings(DEVMODEW *dm) { char wine_x11_reg_key[128]; @@ -186,7 +200,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) @@ -225,7 +239,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH] bcrypt: Implement BCRYPT_HASH_REUSABLE_FLAG.
by Hans Leidekker 06 Mar '19

06 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 102 ++++++++++++++++---------- dlls/bcrypt/tests/bcrypt.c | 145 +++++++++++++++++++++++++++---------- include/bcrypt.h | 3 + 3 files changed, 173 insertions(+), 77 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1b84ace8ab..b9c51a1f9f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -366,13 +366,17 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, return STATUS_SUCCESS; } +#define HASH_FLAG_HMAC 0x01 +#define HASH_FLAG_REUSABLE 0x02 struct hash { - struct object hdr; - enum alg_id alg_id; - BOOL hmac; - struct hash_impl outer; - struct hash_impl inner; + struct object hdr; + enum alg_id alg_id; + ULONG flags; + UCHAR *secret; + ULONG secret_len; + struct hash_impl outer; + struct hash_impl inner; }; #define BLOCK_LENGTH_AES 16 @@ -587,19 +591,45 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } +static NTSTATUS prepare_hash( struct hash *hash ) +{ + UCHAR buffer[MAX_HASH_BLOCK_BITS / 8] = {0}; + int block_bytes, i; + NTSTATUS status; + + /* initialize hash */ + if ((status = hash_init( &hash->inner, hash->alg_id ))) return status; + if (!(hash->flags & HASH_FLAG_HMAC)) return STATUS_SUCCESS; + + /* initialize hmac */ + if ((status = hash_init( &hash->outer, hash->alg_id ))) return status; + block_bytes = alg_props[hash->alg_id].block_bits / 8; + if (hash->secret_len > block_bytes) + { + struct hash_impl temp; + if ((status = hash_init( &temp, hash->alg_id ))) return status; + if ((status = hash_update( &temp, hash->alg_id, hash->secret, hash->secret_len ))) return status; + if ((status = hash_finish( &temp, hash->alg_id, buffer, + alg_props[hash->alg_id].hash_length ))) return status; + } + else memcpy( buffer, hash->secret, hash->secret_len ); + + for (i = 0; i < block_bytes; i++) buffer[i] ^= 0x5c; + if ((status = hash_update( &hash->outer, hash->alg_id, buffer, block_bytes ))) return status; + for (i = 0; i < block_bytes; i++) buffer[i] ^= (0x5c ^ 0x36); + return hash_update( &hash->inner, hash->alg_id, buffer, block_bytes ); +} + NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { struct algorithm *alg = algorithm; - UCHAR buffer[MAX_HASH_BLOCK_BITS / 8] = {0}; struct hash *hash; - int block_bytes; NTSTATUS status; - int i; TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen, secret, secretlen, flags ); - if (flags) + if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) { FIXME( "unimplemented flags %08x\n", flags ); return STATUS_NOT_IMPLEMENTED; @@ -608,38 +638,23 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = heap_alloc( sizeof(*hash) ))) return STATUS_NO_MEMORY; + if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - hash->hmac = alg->hmac; - - /* initialize hash */ - if ((status = hash_init( &hash->inner, hash->alg_id ))) goto end; - if (!hash->hmac) goto end; + if (alg->hmac) hash->flags = HASH_FLAG_HMAC; + if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; - /* initialize hmac */ - if ((status = hash_init( &hash->outer, hash->alg_id ))) goto end; - block_bytes = alg_props[hash->alg_id].block_bits / 8; - if (secretlen > block_bytes) - { - struct hash_impl temp; - if ((status = hash_init( &temp, hash->alg_id ))) goto end; - if ((status = hash_update( &temp, hash->alg_id, secret, secretlen ))) goto end; - if ((status = hash_finish( &temp, hash->alg_id, buffer, - alg_props[hash->alg_id].hash_length ))) goto end; - } - else + if (secretlen && !(hash->secret = heap_alloc( secretlen ))) { - memcpy( buffer, secret, secretlen ); + heap_free( hash ); + return STATUS_NO_MEMORY; } - for (i = 0; i < block_bytes; i++) buffer[i] ^= 0x5c; - if ((status = hash_update( &hash->outer, hash->alg_id, buffer, block_bytes ))) goto end; - for (i = 0; i < block_bytes; i++) buffer[i] ^= (0x5c ^ 0x36); - status = hash_update( &hash->inner, hash->alg_id, buffer, block_bytes ); + memcpy( hash->secret, secret, secretlen ); + hash->secret_len = secretlen; -end: - if (status != STATUS_SUCCESS) + if ((status = prepare_hash( hash )) != STATUS_SUCCESS) { + heap_free( hash->secret ); heap_free( hash ); return status; } @@ -664,6 +679,12 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND return STATUS_NO_MEMORY; memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); + if (hash_orig->secret && !(hash_copy->secret = heap_alloc( hash_orig->secret_len ))) + { + heap_free( hash_copy ); + return STATUS_NO_MEMORY; + } + memcpy( hash_copy->secret, hash_orig->secret, hash_orig->secret_len ); *handle_copy = hash_copy; return STATUS_SUCCESS; @@ -677,6 +698,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_PARAMETER; hash->hdr.magic = 0; + heap_free( hash->secret ); heap_free( hash ); return STATUS_SUCCESS; } @@ -705,13 +727,19 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!output) return STATUS_INVALID_PARAMETER; - if (!hash->hmac) - return hash_finish( &hash->inner, hash->alg_id, output, size ); + if (!(hash->flags & HASH_FLAG_HMAC)) + { + if ((status = hash_finish( &hash->inner, hash->alg_id, output, size ))) return status; + if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + return STATUS_SUCCESS; + } hash_length = alg_props[hash->alg_id].hash_length; if ((status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_length ))) return status; if ((status = hash_update( &hash->outer, hash->alg_id, buffer, hash_length ))) return status; - return hash_finish( &hash->outer, hash->alg_id, output, size ); + if ((status = hash_finish( &hash->outer, hash->alg_id, output, size ))) return status; + if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + return STATUS_SUCCESS; } NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5c1a9dc834..a8bc43ce3d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -221,7 +221,9 @@ struct hash_test const char *alg; unsigned hash_size; const char *hash; + const char *hash2; const char *hmac_hash; + const char *hmac_hash2; }; static void test_hash(const struct hash_test *test) @@ -269,6 +271,35 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + hash = NULL; + len = sizeof(buf); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, BCRYPT_HASH_REUSABLE_FLAG); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hash_buf, 0, sizeof(hash_buf)); + ret = pBCryptFinishHash(hash, hash_buf, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hash_buf, test->hash_size, str ); + ok(!strcmp(str, test->hash), "got %s\n", str); + + /* reuse it */ + ret = pBCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hash_buf, 0, sizeof(hash_buf)); + ret = pBCryptFinishHash(hash, hash_buf, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hash_buf, test->hash_size, str ); + ok(!strcmp(str, test->hash2), "got %s\n", str); + + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -298,6 +329,35 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + hash = NULL; + len = sizeof(buf_hmac); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), BCRYPT_HASH_REUSABLE_FLAG); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hmac_hash, 0, sizeof(hmac_hash)); + ret = pBCryptFinishHash(hash, hmac_hash, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hmac_hash, test->hash_size, str ); + ok(!strcmp(str, test->hmac_hash), "got %s\n", str); + + /* reuse it */ + ret = pBCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hmac_hash, 0, sizeof(hmac_hash)); + ret = pBCryptFinishHash(hash, hmac_hash, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hmac_hash, test->hash_size, str ); + ok(!strcmp(str, test->hmac_hash2), "got %s\n", str); + + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); @@ -310,52 +370,57 @@ static void test_hash(const struct hash_test *test) static void test_hashes(void) { - static const struct hash_test tests[] = { - { - "SHA1", - 20, - "961fa64958818f767707072755d7018dcd278e94", - "2472cf65d0e090618d769d3e46f0d9446cf212da" + static const struct hash_test tests[] = + { + { "SHA1", 20, + "961fa64958818f767707072755d7018dcd278e94", + "9314f62ff64197143c91fc86de37e9ae776a3fb8", + "2472cf65d0e090618d769d3e46f0d9446cf212da", + "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { - "SHA256", - 32, - "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", - "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72" + { "SHA256", 32, + "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", + "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", + "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", + "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { - "SHA384", - 48, - "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" - "63eed1e743a692d70e0504b0cfd12ef9", - "4b3e6d6ff2da121790ab7e7b9247583e3a7eed2db5bd4dabc680303b1608f37d" - "fdc836d96a704c03283bc05b4f6c5eb8" + { "SHA384", 48, + "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" + "63eed1e743a692d70e0504b0cfd12ef9", + "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" + "a45177ad055feaf003968cc40ece44c7", + "4b3e6d6ff2da121790ab7e7b9247583e3a7eed2db5bd4dabc680303b1608f37d" + "fdc836d96a704c03283bc05b4f6c5eb8", + "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" + "e6e0be8b214d8508595b17a8c4b4e7db", }, - { - "SHA512", - 64, - "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" - "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", - "415fb6b10018ca03b38a1b1399c42ac0be5e8aceddb9a73103f5e543bf2d888f" - "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513" + { "SHA512", 64, + "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" + "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", + "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" + "3ca9c9ca61d9d7d1fb65ca7665e87f043c1d5bc9f786f8345e951c2d91ac594f", + "415fb6b10018ca03b38a1b1399c42ac0be5e8aceddb9a73103f5e543bf2d888f" + "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513", + "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" + "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { - "MD2", - 16, - "1bb33606ba908912a84221109d29cd7e", - "7f05b0638d77f4a27f3a9c4d353cd648" + { "MD2", 16, + "1bb33606ba908912a84221109d29cd7e", + "b9a6ad9323b17e2d0cd389dddd6ef78a", + "7f05b0638d77f4a27f3a9c4d353cd648", + "05980873e6bfdd05dd7b30078de7e42a", }, - { - "MD4", - 16, - "74b5db93c0b41e36ca7074338fc0b637", - "bc2e8ac4d8248ed21b8d26227a30ea3a" + { "MD4", 16, + "74b5db93c0b41e36ca7074338fc0b637", + "a14a9ff2059a8c28f47b01e6bc48a1bf", + "bc2e8ac4d8248ed21b8d26227a30ea3a", + "b609db0eb4b8669db74f2c20099701e4", }, - { - "MD5", - 16, - "e2a3e68d23ce348b8f68b3079de3d4c9", - "7bda029b93fa8d817fcc9e13d6bdf092" + { "MD5", 16, + "e2a3e68d23ce348b8f68b3079de3d4c9", + "bcdd7ca574342aa9db0e212348eacb16", + "7bda029b93fa8d817fcc9e13d6bdf092", + "dd636ab8e9592c5088e57c37d44c5bb3", } }; unsigned i; diff --git a/include/bcrypt.h b/include/bcrypt.h index ba78c1d9d0..a0b0d52495 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -222,6 +222,9 @@ typedef PVOID BCRYPT_HASH_HANDLE; /* Flags for BCryptEncrypt/BCryptDecrypt */ #define BCRYPT_BLOCK_PADDING 0x00000001 +/* Flags for BCryptCreateHash */ +#define BCRYPT_HASH_REUSABLE_FLAG 0x00000020 + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); -- 2.20.1

1 0

[PATCH] advapi32: Add a stub implementation of SaferIdentifyLevel.
by Hans Leidekker 06 Mar '19

06 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 11 +++++++++++ include/winsafer.h | 30 ++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d3e2..eb1f546335 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -717,7 +717,7 @@ @ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) -# @ stub SaferIdentifyLevel +@ stdcall SaferIdentifyLevel(long ptr ptr ptr) # @ stub SaferRecordEventLogEntry @ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da40e7..6891feea2a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6184,6 +6184,17 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class return FALSE; } +/****************************************************************************** + * SaferIdentifyLevel [ADVAPI32.@] + */ +BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, SAFER_LEVEL_HANDLE *handle, + void *reserved) +{ + FIXME("(%u %p %p %p) stub\n", count, properties, handle, reserved); + *handle = (SAFER_LEVEL_HANDLE)0xdeadbeef; + return TRUE; +} + /****************************************************************************** * SaferSetLevelInformation [ADVAPI32.@] */ diff --git a/include/winsafer.h b/include/winsafer.h index 4855f53bda..25654846d9 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,32 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_MAX_HASH_SIZE 64 + +#include <pshpack8.h> +typedef struct _SAFER_CODE_PROPERTIES_V2 { + DWORD cbSize; + DWORD dwCheckFlags; + LPCWSTR ImagePath; + HANDLE hImageFileHandle; + DWORD UrlZoneId; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + DWORD dwImageHashSize; + LARGE_INTEGER ImageSize; + ALG_ID HashAlgorithm; + LPBYTE pByteBlock; + HWND hWndParent; + DWORD dwWVTUIChoice; + LPCWSTR PackageMoniker; + LPCWSTR PackagePublisher; + LPCWSTR PackageName; + ULONG64 PackageVersion; + BOOL PackageIsFramework; +} SAFER_CODE_PROPERTIES_V2, *PSAFER_CODE_PROPERTIES_V2; + +typedef SAFER_CODE_PROPERTIES_V2 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#include <poppack.h> + #define SAFER_SCOPEID_MACHINE 1 #define SAFER_SCOPEID_USER 2 @@ -41,8 +67,6 @@ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); #define SAFER_LEVEL_OPEN 1 -WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); - typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyLevelList = 1, SaferPolicyEnableTransparentEnforcement, @@ -70,7 +94,9 @@ typedef enum _SAFER_OBJECT_INFO_CLASS { SaferObjectExtendedError } SAFER_OBJECT_INFO_CLASS; +WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferIdentifyLevel(DWORD,PSAFER_CODE_PROPERTIES,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus -- 2.20.1

1 0

[PATCH] bthprops.cpl: add BluetoothFindDeviceClose stub
by Louis Lenders 06 Mar '19

06 Mar '19

Wine bug: https://bugs.winehq.org/show_bug.cgi?id=46706 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index ed80b0e265..626b3857c5 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -11,7 +11,7 @@ @ stub BluetoothEnumerateInstalledServicesEx @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId @ stdcall BluetoothFindFirstDevice(ptr ptr) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index d670f2e358..67eab76d07 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -60,3 +60,13 @@ BOOL WINAPI BluetoothFindRadioClose(HBLUETOOTH_RADIO_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindDeviceClose + */ +BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) +{ + FIXME("(%p): stub!\n", find); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.20.1

1 0

[PATCH v2 7/7] explorer: Remove setting primary adapter key via Atoms.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

The Atom mechanism is no longer used to store primary adapter key. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 23 +---------------------- programs/explorer/desktop.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..bb958b5225 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -98,33 +98,12 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; - switch (message) { case WM_NCCREATE: { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); - } return TRUE; } case WM_NCCALCSIZE: diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 97fc7a219d..df5fb7f6aa 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -773,7 +773,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver ) { static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -796,6 +796,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; + GUID guid; WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; @@ -851,9 +852,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) return module; } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + /* Create a GUID for primary adapter */ + UuidCreate( &guid ); + TRACE( "primary adapter guid %s\n", debugstr_guid(&guid) ); + sprintfW( key, device_keyW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); strcpyW( buffer, device_video_prefixW ); strcatW( buffer, key); @@ -877,7 +881,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (module) { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + TRACE( "display %s driver %s\n", debugstr_guid(&guid), debugstr_w(buffer) ); RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); } @@ -946,7 +950,6 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -998,13 +1001,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + graphics_driver = load_graphics_driver( driver ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, 0 ); if (hwnd) { -- 2.20.1

1 0

[PATCH v2 4/7] wintab32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wintab32/wintab32.c | 60 +++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index fe535fa1af..d9325899be 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -72,30 +72,58 @@ static VOID TABLET_Unregister(void) UnregisterClassW(WC_TABLETCLASSNAME, NULL); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - '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','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key ))) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

1 0

[PATCH v2 3/7] user32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 63 +++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..548fe362af 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -41,37 +41,68 @@ static char driver_load_error[80]; static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key( WCHAR *key, int len ) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW( HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size )) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW( value_prefixW ); + if (strncmpiW( buffer, value_prefixW, length )) + goto fail; + + substring = buffer + length; + length = strlenW( substring ); + if (len < length + 1) + goto fail; + + strcpyW( key, substring ); + + ret = TRUE; + TRACE( "primary adapter key %s\n", wine_dbgstr_w(key) ); +fail: + if (!ret) + ERR( "Failed to get primary adapter registry key\n" ); + return ret; +} + static HMODULE load_desktop_driver( HWND hwnd ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - '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','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + WCHAR key[MAX_PATH]; + BOOL result; + result = get_primary_adapter_key( key, ARRAY_SIZE(key) ); USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - if (!guid_atom) + if (!result) { SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + get_primary_adapter_key( key, ARRAY_SIZE(key) ); } - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) -- 2.20.1

1 0

[PATCH v2 2/7] imm32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/imm32/imm.c | 60 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f355..cca0744de5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -289,30 +289,58 @@ static void IMM_FreeThreadData(void) LeaveCriticalSection(&threaddata_cs); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - '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','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key) )) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

1 0

[PATCH 7/7] explorer: Remove setting primary adapter key via Atoms.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

The Atom mechanism is no longer used to store primary adapter key. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 23 +---------------------- programs/explorer/desktop.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..bb958b5225 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -98,33 +98,12 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; - switch (message) { case WM_NCCREATE: { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); - } return TRUE; } case WM_NCCALCSIZE: diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 97fc7a219d..df5fb7f6aa 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -773,7 +773,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver ) { static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -796,6 +796,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; + GUID guid; WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; @@ -851,9 +852,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) return module; } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + /* Create a GUID for primary adapter */ + UuidCreate( &guid ); + TRACE( "primary adapter guid %s\n", debugstr_guid(&guid) ); + sprintfW( key, device_keyW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); strcpyW( buffer, device_video_prefixW ); strcatW( buffer, key); @@ -877,7 +881,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (module) { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + TRACE( "display %s driver %s\n", debugstr_guid(&guid), debugstr_w(buffer) ); RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); } @@ -946,7 +950,6 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -998,13 +1001,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + graphics_driver = load_graphics_driver( driver ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, 0 ); if (hwnd) { -- 2.20.1

2 1