- wine-devel - winehq.org

[PATCH 1/5] mfplat: Fix potential invalid memory access (Coverity).
by Nikolay Sivov 06 Mar '19

06 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 1b9ef38a4e..96dd6dec4d 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -185,6 +185,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) MFASYNC_WORKQUEUE_TYPE queue_type; struct queue_handle *entry; + *ret = NULL; + if (!system_queues[SYS_QUEUE_STANDARD].pool) return MF_E_SHUTDOWN; -- 2.20.1

2 6

[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

[PATCH 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 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 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

2 1

[PATCH 1/3] iccvid: Fix calculation of stride and size
by Vijay Kiran Kamuju 06 Mar '19

06 Mar '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/iccvid/iccvid.c | 10 ++++++--- dlls/msvfw32/tests/msvfw.c | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 78c53b336bc..67967a0fb38 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -169,6 +169,10 @@ int x, y; } } +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} /* ------------------------------------------------------------------------ */ static void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, @@ -450,7 +454,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, break; } - frm_stride = out_width * bpp; + frm_stride = get_stride(out_width, bpp * 8); frm_ptr = output; if(frame.length != size) @@ -835,9 +839,9 @@ static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, L if( out ) { memcpy( out, in, size ); + out->bmiHeader.biBitCount = 24; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) * in->bmiHeader.biHeight; return ICERR_OK; } return size; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 7555015ef15..1791fcf77e6 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -25,6 +25,11 @@ #include "wine/test.h" +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void test_OpenCase(void) { HIC h; @@ -88,6 +93,7 @@ static void test_Locate(void) { static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + BITMAPINFOHEADER tmp = {sizeof(BITMAPINFOHEADER)}; HIC h; DWORD err; @@ -123,6 +129,45 @@ static void test_Locate(void) ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + bi.biWidth = 17; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biWidth = 32; + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biBitCount = bi.biBitCount = 8; -- 2.17.0

1 2

[PATCH 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

2 1

[PATCH v2 2/3] user32: Check device name in EnumDisplayDevicesW().
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 28 ++++++++++++++++++++++++++++ dlls/user32/tests/monitor.c | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a45e1c882..256a26c71b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -276,12 +276,40 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD return TRUE; } +static BOOL is_display_device(LPCWSTR name) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW(name, display_deviceW, ARRAY_SIZE(display_deviceW))) + return FALSE; + + p += ARRAY_SIZE(display_deviceW); + + if (!isdigitW(*p++)) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW(*p)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { + if (lpDevice && !is_display_device(lpDevice)) + { + WARN("Wrong adapter name: %s\n", wine_dbgstr_w(lpDevice)); + return FALSE; + } + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8bf284a5e1..733220a426 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

2 1

[PATCH 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 1/7] explorer: Create primary adapter key if user driver didn't create it.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

This primary adapter key aims to replace the Atom mechanism currently used to store what registry key the primary adapter is using. This way we can let user drivers create the GUIDs for adapters if it's supported without treating primary adapter differently. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/desktop.c | 64 ++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24901..97fc7a219d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -775,6 +775,13 @@ static BOOL get_default_enable_shell( const WCHAR *name ) static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { + 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 device_video_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -793,6 +800,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; + DWORD disposition = 0; char error[80]; if (!driver) @@ -832,25 +840,51 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) + /* Create HKLM\HARDWARE\DEVICEMAP\VIDEO key if user drivers didn't do it */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, + &disposition )) { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + /* User driver did create it. Nothing to do */ + if (disposition != REG_CREATED_NEW_KEY) + { + RegCloseKey( hkey ); + 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] ); + 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); + + TRACE( "primary adapter key %s\n", wine_dbgstr_w(buffer) ); + /* Set \Device\Video0 value data in HKLM\HARDWARE\DEVICEMAP\VIDEO key */ + if (RegSetValueExW( hkey, device_video0W, 0, REG_SZ, + (const BYTE *)(buffer), (strlenW( buffer ) + 1) * sizeof(WCHAR)) ) + { + ERR("Failed to set primary video value, display related functions may not function properly\n"); + RegCloseKey( hkey ); + return module; + } - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, - REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) - { - if (module) - RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); - else - RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); + + /* Create primary adapter key SYSTEM\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, + REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) + { + if (module) + { + GetModuleFileNameW( module, buffer, MAX_PATH ); + 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) ); + } + else + RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen( error ) + 1 ); + RegCloseKey( hkey ); + } } return module; -- 2.20.1

1 0

[PATCH v2 3/3] user32: Improve EnumDisplayDevices stub.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SUBSYS_ should have 8 digits following. Supersede 158956~158958 dlls/user32/driver.c | 44 +++++++++++++++++++++++++++---------- dlls/user32/tests/monitor.c | 10 ++++----- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 483d5552bf..355248d3cc 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -361,25 +361,47 @@ static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISP static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; + static const WCHAR primary_monitor_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; + static const WCHAR nonpnp_monitor_string[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ', + 'M','o','n','i','t','o','r',0}; FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } + else + { + if (strcmpiW(lpDevice, primary_device_name)) + return FALSE; - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + memcpy(lpDisplayDevice->DeviceName, primary_monitor_name, sizeof (primary_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, nonpnp_monitor_string, sizeof(nonpnp_monitor_string)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + lpDisplayDevice->DeviceID[0] = 0; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } return TRUE; } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 733220a426..33c7e24128 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ -- 2.20.1

1 0

[PATCH v2 1/3] user32: Move EnumDisplayDevicesW stub to nulldrv.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 26 +------------------------- dlls/user32/user_private.h | 1 + 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..483d5552bf 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -125,6 +125,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ClipCursor); GET_USER_FUNC(UpdateClipboard); GET_USER_FUNC(ChangeDisplaySettingsEx); + GET_USER_FUNC(EnumDisplayDevicesW); GET_USER_FUNC(EnumDisplayMonitors); GET_USER_FUNC(EnumDisplaySettingsEx); GET_USER_FUNC(GetMonitorInfo); @@ -354,6 +355,35 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } +static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', + 'S','y','s','t','e','m',0}; + static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; + + FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + if (i) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | + DISPLAY_DEVICE_PRIMARY_DEVICE | + DISPLAY_DEVICE_VGA_COMPATIBLE; + + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + + return TRUE; +} + static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { RECT r = {0, 0, 640, 480}; @@ -549,6 +579,7 @@ static USER_DRIVER null_driver = nulldrv_UpdateClipboard, /* display modes */ nulldrv_ChangeDisplaySettingsEx, + nulldrv_EnumDisplayDevicesW, nulldrv_EnumDisplayMonitors, nulldrv_EnumDisplaySettingsEx, nulldrv_GetMonitorInfo, @@ -691,6 +722,11 @@ static LONG CDECL loaderdrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mo return load_driver()->pChangeDisplaySettingsEx( name, mode, hwnd, flags, lparam ); } +static BOOL CDECL loaderdrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + return load_driver()->pEnumDisplayDevicesW( lpDevice, i, lpDisplayDevice, dwFlags ); +} + static BOOL CDECL loaderdrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return load_driver()->pEnumDisplayMonitors( hdc, rect, proc, lp ); @@ -770,6 +806,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, + loaderdrv_EnumDisplayDevicesW, loaderdrv_EnumDisplayMonitors, loaderdrv_EnumDisplaySettingsEx, loaderdrv_GetMonitorInfo, diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd05..1a45e1c882 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -243,12 +243,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -288,25 +282,7 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); - - if (i) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..51b60a4b5c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -86,6 +86,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUpdateClipboard)(void); /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); + BOOL (CDECL *pEnumDisplayDevicesW)(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD); BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (CDECL *pGetMonitorInfo)(HMONITOR,MONITORINFO*); -- 2.20.1

1 0

[PATCH 1/6] quartz/tests: Add some tests for AVI decompressor filter interfaces.
by Zebediah Figura 06 Mar '19

06 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/avidec.c | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 dlls/quartz/tests/avidec.c diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 34a111462f..569bbcb8b7 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = quartz.dll IMPORTS = oleaut32 ole32 advapi32 user32 C_SRCS = \ + avidec.c \ avisplit.c \ dsoundrender.c \ filesource.c \ diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c new file mode 100644 index 0000000000..f008fe10ea --- /dev/null +++ b/dlls/quartz/tests/avidec.c @@ -0,0 +1,81 @@ +/* + * AVI decompressor filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static IBaseFilter *create_avi_dec(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AVIDec, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_avi_dec(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + todo_wine check_interface(filter, &IID_IMediaPosition, FALSE); + todo_wine check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + todo_wine check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +START_TEST(avidec) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.20.1

1 5

[PATCH 1/2] bcrypt/tests: Test return on invalid flag passed to BCryptCreateHash.
by Brendan McGrath 05 Mar '19

05 Mar '19

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5c1a9dc8340..92b5a30e9fd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -247,6 +247,12 @@ static void test_hash(const struct hash_test *test) hash = NULL; len = sizeof(buf); + + /* test return on invalid flag */ + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 1); + todo_wine + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); -- 2.17.1

2 10

Discrepancies between Wine and Windows 10 NLS values for English (US)
by Isira Seneviratne 05 Mar '19

05 Mar '19

Hi, I queried several NLS values for English (US) on both Windows 10 and Wine using the attached code, and I found that some of these values did not match each other. These are the values that did not match Wine's on Windows 10: LOCALE_FONTSIGNATURE: lsUsb: 3 0 0 80000000 lsCsbSupported: 19f dfd70000 LOCALE_IDEFAULTUNIXCODEPAGE: 10000 Should the Wine NLS file be updated? And if so, how should the LOCALE_FONTSIGNATURE string be formatted? Isira

1 0

[PATCH 1/2] kernel32: Use Latin-3 codepage for Esperanto
by Alex Henrie 05 Mar '19

05 Mar '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Esperanto's circumflex characters are not representable in Latin-1. --- dlls/kernel32/nls/eox.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 0dc82fe3a7..d6713730e2 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -49,7 +49,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IDEFAULTANSICODEPAGE "0" LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "" - LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTEBCDICCODEPAGE "28593" LOCALE_IDEFAULTLANGUAGE "048f" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDEFAULTUNIXCODEPAGE "65001" -- 2.21.0

3 6

[PATCH 8/8] d3dx9: Merge the d3dx_effect_GetTechnique() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 126916d022..6a0b262b7a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1157,19 +1157,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) -{ - if (index >= base->technique_count) - { - WARN("Invalid argument specified.\n"); - return NULL; - } - - TRACE("Returning technique %p.\n", &base->techniques[index]); - - return get_technique_handle(&base->techniques[index]); -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3356,7 +3343,15 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index TRACE("iface %p, index %u.\n", iface, index); - return d3dx9_base_effect_get_technique(&effect->base_effect, index); + if (index >= effect->base_effect.technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]); + + return get_technique_handle(&effect->base_effect.techniques[index]); } static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) -- 2.20.1

2 1

[PATCH 7/8] d3dx9: Merge the d3dx_effect_GetTechniqueByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 473bb930df..126916d022 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1170,22 +1170,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base return get_technique_handle(&base->techniques[index]); } -static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effect *base, const char *name) -{ - struct d3dx_technique *tech = get_technique_by_name(base, name); - - if (tech) - { - D3DXHANDLE t = get_technique_handle(tech); - TRACE("Returning technique %p\n", t); - return t; - } - - WARN("Technique not found.\n"); - - return NULL; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3378,10 +3362,20 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_technique_by_name(&effect->base_effect, name); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); + if (tech) + { + D3DXHANDLE t = get_technique_handle(tech); + TRACE("Returning technique %p\n", t); + return t; + } + + WARN("Technique not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) -- 2.20.1

2 1

[PATCH 6/8] d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The "struct d3dx_technique *tech = technique ? ..." line will fall under 120 chars after the cleanup is finished. So no reason to split it up now. dlls/d3dx9_36/effect.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eaaae0456e..473bb930df 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1014,24 +1014,6 @@ static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *ba return D3D_OK; } -static HRESULT d3dx9_base_effect_get_technique_desc(struct d3dx9_base_effect *base, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) -{ - struct d3dx_technique *tech = technique ? get_valid_technique(base, technique) : &base->techniques[0]; - - if (!desc || !tech) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = tech->name; - desc->Passes = tech->pass_count; - desc->Annotations = tech->annotation_count; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -3208,10 +3190,21 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); - return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) -- 2.20.1

2 1

[PATCH 5/8] d3dx9: Merge the d3dx_effect_GetPassByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 47 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c9aeb87a4b..eaaae0456e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,32 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE technique, const char *name) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && name) - { - unsigned int i; - - for (i = 0; i < tech->pass_count; ++i) - { - struct d3dx_pass *pass = &tech->passes[i]; - - if (!strcmp(pass->name, name)) - { - TRACE("Returning pass %p\n", pass); - return get_pass_handle(pass); - } - } - } - - WARN("Pass not found.\n"); - - return NULL; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3438,10 +3412,29 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); - return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); + if (tech && name) + { + unsigned int i; + + for (i = 0; i < tech->pass_count; ++i) + { + struct d3dx_pass *pass = &tech->passes[i]; + + if (!strcmp(pass->name, name)) + { + TRACE("Returning pass %p\n", pass); + return get_pass_handle(pass); + } + } + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) -- 2.20.1

2 1

[PATCH 4/8] d3dx9: Merge the d3dx_effect_GetPass() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c621b21562..c9aeb87a4b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base, - D3DXHANDLE technique, UINT index) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && index < tech->pass_count) - { - TRACE("Returning pass %p\n", &tech->passes[index]); - return get_pass_handle(&tech->passes[index]); - } - - WARN("Pass not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, D3DXHANDLE technique, const char *name) { @@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); - return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); + if (tech && index < tech->pass_count) + { + TRACE("Returning pass %p\n", &tech->passes[index]); + return get_pass_handle(&tech->passes[index]); + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) -- 2.20.1

2 1

[PATCH 3/8] d3dx9: Pass a struct d3dx_effect to get_annotation_from_object()
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e7b8b86eb3..c621b21562 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static UINT get_annotation_from_object(struct d3dx9_base_effect *base, - D3DXHANDLE object, struct d3dx_parameter **annotations) +static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, + struct d3dx_parameter **annotations) { + struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(base, object); @@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, object %p, index %u.\n", iface, object, index); - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); if (index < annotation_count) { @@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D return NULL; } - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); if (annotation) -- 2.20.1

2 1

[PATCH 2/8] d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea3563128f..e7b8b86eb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,33 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE object, const char *name) -{ - struct d3dx_parameter *annotation = NULL; - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - if (!name) - { - WARN("Invalid argument specified\n"); - return NULL; - } - - annotation_count = get_annotation_from_object(base, object, &annotations); - - annotation = get_annotation_by_name(base, annotation_count, annotations, name); - if (annotation) - { - TRACE("Returning parameter %p\n", annotation); - return get_parameter_handle(annotation); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, void *data) { @@ -3516,10 +3489,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotation = NULL; + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); - return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); + if (!name) + { + WARN("Invalid argument specified\n"); + return NULL; + } + + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + if (annotation) + { + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); + } + + WARN("Annotation not found.\n"); + + return NULL; } static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/8] d3dx9: Merge the d3dx_effect_GetAnnotation() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dda460d17c..ea3563128f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,25 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation(struct d3dx9_base_effect *base, - D3DXHANDLE object, UINT index) -{ - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - annotation_count = get_annotation_from_object(base, object, &annotations); - - if (index < annotation_count) - { - TRACE("Returning parameter %p\n", &annotations[index]); - return get_parameter_handle(&annotations[index]); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, D3DXHANDLE object, const char *name) { @@ -3513,10 +3494,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, index %u.\n", iface, object, index); - return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + if (index < annotation_count) + { + TRACE("Returning parameter %p\n", &annotations[index]); + return get_parameter_handle(&annotations[index]); + } + + WARN("Annotation not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, -- 2.20.1

2 1

[PATCH] kernel32: Show that PAGE_WRITECOPY permission changes only on modified pages.
by Piotr Caban 05 Mar '19

05 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

2 1

[PATCH v2 1/7] quartz/waveparser: Fix source pin name.
by Zebediah Figura 05 Mar '19

05 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/waveparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 609f192820..2ea3dc0427 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; +static const WCHAR outputW[] = {'o','u','t','p','u','t',0}; typedef struct WAVEParserImpl { @@ -256,7 +256,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; - lstrcpynW(piOutput.achName, wcsOutputPinName, ARRAY_SIZE(piOutput.achName)); + lstrcpynW(piOutput.achName, outputW, ARRAY_SIZE(piOutput.achName)); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list); -- 2.20.1

2 8

[PATCH 1/5] mf: Add a stub for default presentation clock.
by Nikolay Sivov 05 Mar '19

05 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 381 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 63 ++++++++ include/mferror.h | 2 + include/mfidl.idl | 58 ++++++- 5 files changed, 504 insertions(+), 2 deletions(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 7ec8e57c1f..2d02ef8fec 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -45,7 +45,7 @@ @ stub MFCreatePMPHost @ stub MFCreatePMPMediaSession @ stub MFCreatePMPServer -@ stub MFCreatePresentationClock +@ stdcall MFCreatePresentationClock(ptr) @ stub MFCreatePresentationDescriptorFromASFProfile @ stub MFCreateProxyLocator @ stub MFCreateRemoteDesktopPlugin diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b576a0f184..2961abe879 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "mfidl.h" #include "mfapi.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" @@ -38,11 +39,43 @@ struct media_session IMFMediaEventQueue *event_queue; }; +struct presentation_clock +{ + IMFPresentationClock IMFPresentationClock_iface; + IMFRateControl IMFRateControl_iface; + IMFTimer IMFTimer_iface; + IMFShutdown IMFShutdown_iface; + LONG refcount; + IMFPresentationTimeSource *time_source; + MFCLOCK_STATE state; + CRITICAL_SECTION cs; +}; + static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) { return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); } +static struct presentation_clock *impl_from_IMFPresentationClock(IMFPresentationClock *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFPresentationClock_iface); +} + +static struct presentation_clock *impl_from_IMFRateControl(IMFRateControl *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFRateControl_iface); +} + +static struct presentation_clock *impl_from_IMFTimer(IMFTimer *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFTimer_iface); +} + +static struct presentation_clock *impl_from_IMFShutdown(IMFShutdown *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFShutdown_iface); +} + static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) { struct media_session *session = impl_from_IMFMediaSession(iface); @@ -251,3 +284,351 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses return S_OK; } + +static HRESULT WINAPI present_clock_QueryInterface(IMFPresentationClock *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFPresentationClock) || + IsEqualIID(riid, &IID_IMFClock) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &clock->IMFPresentationClock_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *out = &clock->IMFRateControl_iface; + } + else if (IsEqualIID(riid, &IID_IMFTimer)) + { + *out = &clock->IMFTimer_iface; + } + else if (IsEqualIID(riid, &IID_IMFShutdown)) + { + *out = &clock->IMFShutdown_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI present_clock_AddRef(IMFPresentationClock *iface) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + ULONG refcount = InterlockedIncrement(&clock->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + ULONG refcount = InterlockedDecrement(&clock->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (clock->time_source) + IMFPresentationTimeSource_Release(clock->time_source); + DeleteCriticalSection(&clock->cs); + heap_free(clock); + } + + return refcount; +} + +static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *iface, DWORD reserved, + LONGLONG *clock_time, MFTIME *system_time) +{ + FIXME("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetContinuityKey(IMFPresentationClock *iface, DWORD *key) +{ + TRACE("%p, %p.\n", iface, key); + + *key = 0; + + return S_OK; +} + +static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD reserved, MFCLOCK_STATE *state) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + + TRACE("%p, %#x, %p.\n", iface, reserved, state); + + EnterCriticalSection(&clock->cs); + *state = clock->state; + LeaveCriticalSection(&clock->cs); + + return S_OK; +} + +static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, MFCLOCK_PROPERTIES *props) +{ + FIXME("%p, %p.\n", iface, props); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_SetTimeSource(IMFPresentationClock *iface, + IMFPresentationTimeSource *time_source) +{ + FIXME("%p, %p.\n", iface, time_source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, + IMFPresentationTimeSource **time_source) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, time_source); + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + { + *time_source = clock->time_source; + IMFPresentationTimeSource_AddRef(*time_source); + } + else + hr = MF_E_CLOCK_NO_TIME_SOURCE; + LeaveCriticalSection(&clock->cs); + + return hr; +} + +static HRESULT WINAPI present_clock_GetTime(IMFPresentationClock *iface, MFTIME *time) +{ + FIXME("%p, %p.\n", iface, time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *iface, IMFClockStateSink *state_sink) +{ + FIXME("%p, %p.\n", iface, state_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *iface, + IMFClockStateSink *state_sink) +{ + FIXME("%p, %p.\n", iface, state_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG start_offset) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Pause(IMFPresentationClock *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFPresentationClockVtbl presentationclockvtbl = +{ + present_clock_QueryInterface, + present_clock_AddRef, + present_clock_Release, + present_clock_GetClockCharacteristics, + present_clock_GetCorrelatedTime, + present_clock_GetContinuityKey, + present_clock_GetState, + present_clock_GetProperties, + present_clock_SetTimeSource, + present_clock_GetTimeSource, + present_clock_GetTime, + present_clock_AddClockStateSink, + present_clock_RemoveClockStateSink, + present_clock_Start, + present_clock_Stop, + present_clock_Pause, +}; + +static HRESULT WINAPI present_clock_rate_control_QueryInterface(IMFRateControl *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_rate_control_AddRef(IMFRateControl *iface) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_rate_control_Release(IMFRateControl *iface) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_rate_SetRate(IMFRateControl *iface, BOOL thin, float rate) +{ + FIXME("%p, %d, %f.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_rate_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) +{ + FIXME("%p, %p, %p.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static const IMFRateControlVtbl presentclockratecontrolvtbl = +{ + present_clock_rate_control_QueryInterface, + present_clock_rate_control_AddRef, + present_clock_rate_control_Release, + present_clock_rate_SetRate, + present_clock_rate_GetRate, +}; + +static HRESULT WINAPI present_clock_timer_QueryInterface(IMFTimer *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_timer_AddRef(IMFTimer *iface) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_timer_Release(IMFTimer *iface) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, LONGLONG time, + IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_key) +{ + FIXME("%p, %#x, %s, %p, %p, %p.\n", iface, flags, wine_dbgstr_longlong(time), callback, state, cancel_key); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_timer_CancelTimer(IMFTimer *iface, IUnknown *cancel_key) +{ + FIXME("%p, %p.\n", iface, cancel_key); + + return E_NOTIMPL; +} + +static const IMFTimerVtbl presentclocktimervtbl = +{ + present_clock_timer_QueryInterface, + present_clock_timer_AddRef, + present_clock_timer_Release, + present_clock_timer_SetTimer, + present_clock_timer_CancelTimer, +}; + +static HRESULT WINAPI present_clock_shutdown_QueryInterface(IMFShutdown *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_shutdown_AddRef(IMFShutdown *iface) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_shutdown_Release(IMFShutdown *iface) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_shutdown_Shutdown(IMFShutdown *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_shutdown_GetShutdownStatus(IMFShutdown *iface, MFSHUTDOWN_STATUS *status) +{ + FIXME("%p, %p.\n", iface, status); + + return E_NOTIMPL; +} + +static const IMFShutdownVtbl presentclockshutdownvtbl = +{ + present_clock_shutdown_QueryInterface, + present_clock_shutdown_AddRef, + present_clock_shutdown_Release, + present_clock_shutdown_Shutdown, + present_clock_shutdown_GetShutdownStatus, +}; + +/*********************************************************************** + * MFCreatePresentationClock (mf.@) + */ +HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) +{ + struct presentation_clock *object; + + TRACE("%p.\n", clock); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFPresentationClock_iface.lpVtbl = &presentationclockvtbl; + object->IMFRateControl_iface.lpVtbl = &presentclockratecontrolvtbl; + object->IMFTimer_iface.lpVtbl = &presentclocktimervtbl; + object->IMFShutdown_iface.lpVtbl = &presentclockshutdownvtbl; + object->refcount = 1; + InitializeCriticalSection(&object->cs); + + *clock = &object->IMFPresentationClock_iface; + + return S_OK; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2d005547b7..9fa0bda839 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -735,6 +735,68 @@ static void test_MFShutdownObject(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_presentation_clock(void) +{ + IMFPresentationTimeSource *time_source; + IMFRateControl *rate_control; + IMFPresentationClock *clock; + MFCLOCK_PROPERTIES props; + IMFShutdown *shutdown; + LONGLONG clock_time; + MFCLOCK_STATE state; + IMFTimer *timer; + MFTIME systime; + DWORD value; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + + hr = IMFPresentationClock_GetTimeSource(clock, &time_source); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + value = 1; + hr = IMFPresentationClock_GetContinuityKey(clock, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 0, "Unexpected value %u.\n", value); + + hr = IMFPresentationClock_GetProperties(clock, &props); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &clock_time, &systime); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); + ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + IMFRateControl_Release(rate_control); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFTimer, (void **)&timer); + ok(hr == S_OK, "Failed to get timer interface, hr %#x.\n", hr); + IMFTimer_Release(timer); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Failed to get shutdown interface, hr %#x.\n", hr); + IMFShutdown_Release(shutdown); + + IMFPresentationClock_Release(clock); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); @@ -743,4 +805,5 @@ START_TEST(mf) test_MFCreateSequencerSource(); test_media_session(); test_MFShutdownObject(); + test_presentation_clock(); } diff --git a/include/mferror.h b/include/mferror.h index 54f09fefdc..be35e6e20f 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -82,4 +82,6 @@ #define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) #define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) +#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) + #endif /* __WINE_MFERROR_H */ diff --git a/include/mfidl.idl b/include/mfidl.idl index be8795c854..48d7c8e501 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -70,6 +70,37 @@ interface IMFClock : IUnknown HRESULT GetProperties([out] MFCLOCK_PROPERTIES *props); } +[ + object, + uuid(88ddcd21-03c3-4275-91ed-55ee3929328f) +] +interface IMFRateControl : IUnknown +{ + HRESULT SetRate( + [in] BOOL thin, + [in] float rate); + HRESULT GetRate( + [in, out, unique] BOOL *thin, + [in, out, unique] float *rate); +} + +[ + object, + uuid(e56e4cbd-8f70-49d8-a0f8-edb3d6ab9bf2), + local +] +interface IMFTimer : IUnknown +{ + HRESULT SetTimer( + [in] DWORD flags, + [in] LONGLONG time, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state, + [out] IUnknown **key); + HRESULT CancelTimer( + [in] IUnknown *key); +} + [ object, uuid(83cf873a-f6da-4bc8-823f-bacfd55dc430), @@ -319,6 +350,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") +cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") @@ -360,7 +392,31 @@ interface IMFMediaSource : IMFMediaEventGenerator } interface IMFStreamSink; -interface IMFPresentationClock; + +[ + object, + uuid(7ff12cce-f76f-41c2-863b-1666c8e5e139) +] +interface IMFPresentationTimeSource : IMFClock +{ + HRESULT GetUnderlyingClock([out] IMFClock **clock); +} + +[ + object, + uuid(868ce85c-8ea9-4f55-ab82-b009a910a805) +] +interface IMFPresentationClock : IMFClock +{ + HRESULT SetTimeSource([in] IMFPresentationTimeSource *time_source); + HRESULT GetTimeSource([out] IMFPresentationTimeSource **time_source); + HRESULT GetTime([out] MFTIME *time); + HRESULT AddClockStateSink([in] IMFClockStateSink *state_sink); + HRESULT RemoveClockStateSink([in] IMFClockStateSink *state_sink); + HRESULT Start([in] LONGLONG start_offset); + HRESULT Stop(); + HRESULT Pause(); +} [ object, -- 2.20.1

2 6

[PATCH 1/8] include/commctrl: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions
by Gabriel Ivăncescu 05 Mar '19

05 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 73bb9fa..9b86bdb 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -216,11 +216,13 @@ typedef struct tagNMCHAR #define CDRF_DODEFAULT 0x0 #define CDRF_NEWFONT 0x00000002 #define CDRF_SKIPDEFAULT 0x00000004 +#define CDRF_DOERASE 0x00000008 #define CDRF_NOTIFYPOSTPAINT 0x00000010 #define CDRF_NOTIFYITEMDRAW 0x00000020 #define CDRF_NOTIFYSUBITEMDRAW 0x00000020 #define CDRF_NOTIFYPOSTERASE 0x00000040 #define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ +#define CDRF_SKIPPOSTPAINT 0x00000100 /* drawstage flags */ -- 2.20.1

2 14

[PATCH 1/2] kernel32/tests: Length of sort keys must be equal with and without dest.
by Brendan McGrath 05 Mar '19

05 Mar '19

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernel32/tests/locale.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2627fc5de84..e11fe1beb01 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2362,6 +2362,13 @@ static void test_LCMapStringA(void) ok(ret == ret2, "lengths of sort keys must be equal\n"); ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); + /* test we get the same length when no dest buffer is provided */ + ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, + upper_case, lstrlenA(upper_case), NULL, 0); + ok(ret2, "LCMapStringA must succeed\n"); + todo_wine + ok(ret == ret2, "lengths of sort keys must be equal (%d vs %d)\n", ret, ret2); + /* test LCMAP_SORTKEY | NORM_IGNORECASE */ ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY | NORM_IGNORECASE, upper_case, -1, buf, sizeof(buf)); -- 2.17.1

2 4

[PATCH 1/5] quartz/waveparser: Fix source pin name.
by Zebediah Figura 05 Mar '19

05 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/waveparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 609f192820..2ea3dc0427 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; +static const WCHAR outputW[] = {'o','u','t','p','u','t',0}; typedef struct WAVEParserImpl { @@ -256,7 +256,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; - lstrcpynW(piOutput.achName, wcsOutputPinName, ARRAY_SIZE(piOutput.achName)); + lstrcpynW(piOutput.achName, outputW, ARRAY_SIZE(piOutput.achName)); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list); -- 2.20.1

2 5

Wine staging 4.3 release
by Alistair Leslie-Hughes 05 Mar '19

05 Mar '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.3 (790 patches are applied to wine vanilla) NOTE: All FAudio patches has been reverted due to the lack of official package support. This will allow games that require XAudio2 support to still run. Upstreamed (Either directly from staging or fixed with a similar patch). * server: Improve handling of cursor position clipping for empty rectangle. * user32/tests: Add tests for GetWindowPlacement() and SetWindowPlacement(). * user32/tests: Add tests for maximizing and minimizing owned windows. * user32/tests: Add tests for maximizing and minimizing child windows. * user32/tests: Add tests for maximizing and minimizing MDI child windows. * user32/tests: Add tests for ArrangeIconicWindows(). * windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter. * windowscodecs: Fix 32bppRGB to 32bppRGBA conversion. * oleaut32: Support VT_DECIMAL in VarRound. * user32: SetWindowPos() shouldn't change the client rect of a minimized window. * user32: Correctly calculate the client size of a minimized window. * user32: Use the C[XY]MINIMIZED rather than C[XY]ICON size for minimized windows. * user32: AdjustWindowRect() shouldn't ignore WS_MINIMIZE. * user32: Reimplement ArrangeIconicWindows() using minimized metrics. * user32: Correctly place minimized windows. * user32: Paint title bars for minimized windows. * user32: Allow clicking the restore and maximize boxes for on minimized windows. * user32: Get rid of icon titles. * mf: Implement MFCreateSequencerSource * user32: Move iconic windows as their border instead of their icon. * windowscodecs/tests: Add a test for 8bpp indexed TIFF format. * windowscodecs/tests: Make the test for 8bpp indexed TIFF format run under XP. * windowscodecs: Fix the SupportsTransparency flag value for various pixel formats. * windowscodecs: Fail earlier in TIFF decoder's Initialize method for unsupported pixel formats. * windowscodecs: Avoid redundant checks when reading a TIFF tile. * windowscodecs: Add support for CMYK to BGR conversion. * server: Add type Token. * server: Add type Process. * server: Add type Thread. * windowscodecs: Move JPEG frame image data initialization from Frame::CopyPixels to Decoder::Initialize. Added: * [35841] wmvcore: Implement WMCreateSyncReader. * [45667] League of Legends 8.15+ fails due to missing implementation of NtQueryVirtualMemory(MemoryWorkingSetExInformation). * [45819] Symantec Eraser Control Driver 'eeCtrl64.sys' (Norton 360) fails in driver entry point due to 'ntoskrnl.exe.ExInitializeResourceLite' stub (needs STATUS_SUCCESS) * [8051] wined3d: Sims 2 demo exits prematurely * [35815] dinput: Allow remapping of joystick buttons. * [34297] dinput: Allow reconnecting to disconnected joysticks. * [14750] comctl32: Fixed rebar behaviour when there's capture and no drag. Updated: * httpapi-HttpCreateServerSession * wined3d-Indexed_Vertex_Blending Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

4 5

[PATCH] vbscript: Handle carriage return in more places.
by Zebediah Figura 04 Mar '19

04 Mar '19

This fixes a regression introduced by 5800c9ed23a5c720843445d91c8547925493df8a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/vbscript/lex.c | 9 ++++++--- dlls/vbscript/tests/run.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index fa467f04dc..739f3acd18 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) int len = 0; while(ctx->ptr < ctx->end) { - if(*ctx->ptr == '\n') { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { FIXME("newline inside string literal\n"); return 0; } @@ -497,11 +497,14 @@ int parser_lex(void *lval, parser_ctx_t *ctx) ret = parse_next_token(lval, ctx); if(ret == '_') { skip_spaces(ctx); - if(*ctx->ptr != '\n') { + if(*ctx->ptr != '\n' && *ctx->ptr != '\r') { FIXME("'_' not followed by newline\n"); return 0; } - ctx->ptr++; + if(*ctx->ptr == '\r') + ctx->ptr++; + if(*ctx->ptr == '\n') + ctx->ptr++; continue; } if(ret != tNL || ctx->last_token != tNL) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 191f5a79a0..e3439e0df7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2397,6 +2397,9 @@ static void run_tests(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); parse_script_a("' comment\r" + "x = _\r3\r" + "x = _\n3\r" + "x = _\r\n3\r" "Sub testsub(arg)\r" "If arg = 1 Then\r\r" "Call reportSuccess()\n\n" -- 2.20.1

2 1

[PATCH] wmvcore: add stub WMCreateBackupRestorer functions
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37325 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/wmvcore.spec | 4 ++-- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 66e5f20e0b..65e0807b61 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,10 +1,10 @@ @ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) -@ stub WMCreateBackupRestorerPrivate +@ stdcall WMCreateBackupRestorerPrivate(ptr ptr) WMCreateBackupRestorer @ stub WMIsAvailableOffline @ stub WMValidateData @ stdcall -private DllRegisterServer() -@ stub WMCreateBackupRestorer +@ stdcall WMCreateBackupRestorer(ptr ptr) @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index d7eb1ebb5f..10ed18afa1 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -74,6 +74,18 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } +HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **licBackup) +{ + FIXME("(%p %p): stub\n", callback, licBackup); + + if (!callback) + return E_INVALIDARG; + + *licBackup = NULL; + + return E_NOTIMPL; +} + typedef struct { IWMProfileManager IWMProfileManager_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 8798f2256e..4ee166a9d4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1893,6 +1893,10 @@ cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") +cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") +cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") -- 2.21.0

1 0

[PATCH v3 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 04 Mar '19

04 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - remove non working file flags reset. dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..dd84557238 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,28 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

2 14

wine-mono 4.8.0 build
by Michael Cronenworth 04 Mar '19

04 Mar '19

Hi, The 4.8.0 wine-mono release cannot be built from source on Fedora. There seems to be something missing from the build root or not compiling during the build and I cannot see what it is. Can I borrow another set of eyes to look at the build output? Build log: https://kojipkgs.fedoraproject.org//work/tasks/7904/33137904/build.log Koji task: https://koji.fedoraproject.org/koji/taskinfo?taskID=33137904 Thanks, Michael

2 5

[PATCH v4 5/5] Add tests in kernel32 for new NtAllocateVirtualMemory ZeroBits behavior
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 4/5] Fix handling of ZeroBits argument in NtAllocateVirtualMemory and friends
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 3/5] Don't use ZeroBits argument in NtAllocateVirtualMemory as alignment
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 2/5] Add comment explaining what ZeroBits argument of NtMapViewOfSection is for
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

1 0

[PATCH 3/7] d3dx9: Merge the d3dx_effect_GetParameter() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22f098ead6..41636ed286 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!parameter) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (param && !param->element_count && index < param->member_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *semantic) { @@ -3436,10 +3409,30 @@ static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); + if (!parameter) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

3 4

[PATCH 5/7] d3dx9: Merge the d3dx_effect_GetParameterElement() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4af6f7f1b9..1703afa067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (index < param->element_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) { if (index >= base->technique_count) @@ -3463,10 +3436,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); + if (!param) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (index < param->element_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index) -- 2.20.1

3 4

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-devel