April 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Only pass a newly created HKEY if it is used in later tests.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 559086af62254a1f82c25f4fd4c145d93c60b973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=559086af62254a1f82c25f4f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 16 19:27:15 2021 +1000 reg/tests: Only pass a newly created HKEY if it is used in later tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 13 +++++++++---- programs/reg/tests/delete.c | 8 +++----- programs/reg/tests/export.c | 9 +++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 8357e9ad0bc..e62caeade01 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -126,10 +126,16 @@ void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey) { LONG err; + HKEY new_key; err = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, subkey, NULL); + KEY_READ|KEY_WRITE, NULL, &new_key, NULL); lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); + + if (subkey) + *subkey = new_key; + else + RegCloseKey(new_key); } void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path) @@ -315,7 +321,7 @@ static void test_key_formats(void) static void test_add(void) { - HKEY hkey, hsubkey; + HKEY hkey; DWORD r, dword; run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); @@ -324,8 +330,7 @@ static void test_add(void) open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_WRITE, &hkey); /* Test whether overwriting a registry key modifies existing keys and values */ - add_key(hkey, "Subkey", &hsubkey); - close_key(hsubkey); + add_key(hkey, "Subkey", NULL); add_value(hkey, "Test1", REG_SZ, "Value1", 7); dword = 0x123; add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 77d95d013c9..575c393d2b3 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -21,7 +21,7 @@ static void test_delete(void) { - HKEY hkey, hsubkey; + HKEY hkey; DWORD r; const DWORD deadbeef = 0xdeadbeef; @@ -75,8 +75,7 @@ static void test_delete(void) add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); - add_key(hkey, "subkey", &hsubkey); - close_key(hsubkey); + add_key(hkey, "subkey", NULL); run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -92,8 +91,7 @@ static void test_delete(void) verify_key(hkey, "subkey"); /* Test forward and back slashes */ - add_key(hkey, "https://winehq.org", &hsubkey); - close_key(hsubkey); + add_key(hkey, "https://winehq.org", NULL); add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 4e5ac4c71d9..daf42f66e3e 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -291,10 +291,8 @@ static void test_export(void) /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - add_key(hkey, "Subkey2", &subkey); - close_key(subkey); - add_key(hkey, "Subkey1", &subkey); - close_key(subkey); + add_key(hkey, "Subkey2", NULL); + add_key(hkey, "Subkey1", NULL); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -405,8 +403,7 @@ static void test_export(void) /* Test registry export with forward and back slashes */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - add_key(hkey, "https://winehq.org", &subkey); - close_key(subkey); + add_key(hkey, "https://winehq.org", NULL); add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); close_key(hkey);

1 0

Hugh McMaster : reg/tests: Test key creation and initialization of the Default registry value.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: e9412a8ae020fe614d96d20f20355d53593048cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9412a8ae020fe614d96d20f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 16 19:27:16 2021 +1000 reg/tests: Test key creation and initialization of the Default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index e62caeade01..36b5f821350 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -329,6 +329,46 @@ static void test_add(void) open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_WRITE, &hkey); + /* The Default value is initialized if no parameters are specified */ + todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + todo_wine delete_value(hkey, NULL); + + /* This also occurs when specifying a registry type and passing data */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /d 0x5 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x5; + verify_reg(hkey, NULL, REG_DWORD, &dword, sizeof(dword), 0); + + /* The Default value can also be overwritten as an empty string */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + close_key(hkey); + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Specifying a value name doesn't initialize the Default value in a new key */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test /t REG_SZ /d \"Just me here\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + + verify_reg(hkey, "Test", REG_SZ, "Just me here", 13, 0); + verify_reg_nonexist(hkey, NULL); + + close_key(hkey); + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Adding a registry key via WinAPI doesn't initialize the Default value... */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + verify_reg_nonexist(hkey, NULL); + + /* ... but we can add it without passing [/f] to reg.exe */ + run_reg_exe("reg add HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + todo_wine delete_value(hkey, NULL); + /* Test whether overwriting a registry key modifies existing keys and values */ add_key(hkey, "Subkey", NULL); add_value(hkey, "Test1", REG_SZ, "Value1", 7); @@ -342,6 +382,7 @@ static void test_add(void) verify_key(hkey, "Subkey"); verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); close_key(hkey); delete_tree(HKEY_CURRENT_USER, KEY_BASE);

1 0

Gabriel Ivăncescu : gdi32: Move the loop through each clipped rectangle to the primitive blend funcs.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: d4dc8fd2c29ef7276dbcf14580351cf385fec28d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4dc8fd2c29ef7276dbcf145… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 16 11:11:19 2021 +0100 gdi32: Move the loop through each clipped rectangle to the primitive blend funcs. This is to prepare so we don't recalculate the lookup cache map for color tables on every clipped rect (which is expensive). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 14 +- dlls/gdi32/dibdrv/dibdrv.h | 4 +- dlls/gdi32/dibdrv/primitives.c | 294 +++++++++++++++++++++++------------------ 3 files changed, 171 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4dc8fd2c29ef7276dbc…

1 0

Gabriel Ivăncescu : gdi32: Use a lazy-init lookup cache when converting RGB values to colour table indices.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 02a94ecc860e052b504928dc06e29aa9af93fd74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a94ecc860e052b504928dc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 16 11:11:20 2021 +0100 gdi32: Use a lazy-init lookup cache when converting RGB values to colour table indices. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 57 ++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02a94ecc860e052b5049…

1 0

Huw Davies : wldap32: Remove unnecessary test of sortkey.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 4bdf8f928ac2b85de76f74420dcc8059d25b9422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bdf8f928ac2b85de76f7442… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 16 11:43:42 2021 +0100 wldap32: Remove unnecessary test of sortkey. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 42098fc814a..b012648797c 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -152,7 +152,7 @@ ULONG CDECL ldap_create_sort_controlW( WLDAP32_LDAP *ld, LDAPSortKeyW **sortkey, if (!ld || !sortkey || !control) return WLDAP32_LDAP_PARAM_ERROR; - if (sortkey && !(sortkeyU = sortkeyarrayWtoU( sortkey ))) return WLDAP32_LDAP_NO_MEMORY; + if (!(sortkeyU = sortkeyarrayWtoU( sortkey ))) return WLDAP32_LDAP_NO_MEMORY; ret = map_error( ldap_funcs->ldap_create_sort_control( ld->ld, sortkeyU, critical, &controlU ) ); if (ret == WLDAP32_LDAP_SUCCESS)

1 0

Rémi Bernon : user32: Remove unnecessary device path memory allocation.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: b3111f3a3207933e171c70adee3797ab7217ac59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3111f3a3207933e171c70ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 16 13:48:09 2021 +0200 user32: Remove unnecessary device path memory allocation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index ba11a121bc5..da3824b10ee 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device { - WCHAR *path; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; HANDLE file; RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; @@ -94,7 +94,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; struct device *device; HANDLE file; - WCHAR *path; DWORD size; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, NULL); @@ -113,20 +112,12 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) TRACE("Found HID device %s.\n", debugstr_w(detail->DevicePath)); - if (!(path = heap_strdupW(detail->DevicePath))) - { - ERR("Failed to allocate memory.\n"); - heap_free(detail); - return NULL; - } - heap_free(detail); - - file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, + file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) { - ERR("Failed to open device file %s, error %u.\n", debugstr_w(path), GetLastError()); - heap_free(path); + ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError()); + heap_free(detail); return NULL; } @@ -135,12 +126,12 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { ERR("Failed to allocate memory.\n"); CloseHandle(file); - heap_free(path); + heap_free(detail); return NULL; } device = &rawinput_devices[rawinput_devices_count++]; - device->path = path; + device->detail = detail; device->file = file; device->info.cbSize = sizeof(RID_DEVICE_INFO); @@ -171,7 +162,7 @@ static void find_devices(void) for (idx = 0; idx < rawinput_devices_count; ++idx) { CloseHandle(rawinput_devices[idx].file); - heap_free(rawinput_devices[idx].path); + heap_free(rawinput_devices[idx].detail); } rawinput_devices_count = 0; @@ -681,8 +672,8 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT } else { - *data_size = lstrlenW(device->path) + 1; - to_copy = device->path; + *data_size = lstrlenW(device->detail->DevicePath) + 1; + to_copy = device->detail->DevicePath; } to_copy_bytes = *data_size * sizeof(WCHAR); break;

1 0

Rémi Bernon : user32: Use malloc/realloc/free instead of heap_* helpers.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 95c5654c34e9fdf00e4b6af2d9e7267abc77aed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c5654c34e9fdf00e4b6af2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 16 13:48:10 2021 +0200 user32: Use malloc/realloc/free instead of heap_* helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index da3824b10ee..19b4007bdb9 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -80,7 +80,7 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; @@ -102,7 +102,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) ERR("Failed to get device path, error %#x.\n", GetLastError()); return FALSE; } - if (!(detail = heap_alloc(size))) + if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); return FALSE; @@ -117,7 +117,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) if (file == INVALID_HANDLE_VALUE) { ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError()); - heap_free(detail); + free(detail); return NULL; } @@ -126,7 +126,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { ERR("Failed to allocate memory.\n"); CloseHandle(file); - heap_free(detail); + free(detail); return NULL; } @@ -162,7 +162,7 @@ static void find_devices(void) for (idx = 0; idx < rawinput_devices_count; ++idx) { CloseHandle(rawinput_devices[idx].file); - heap_free(rawinput_devices[idx].detail); + free(rawinput_devices[idx].detail); } rawinput_devices_count = 0;

1 0

Rémi Bernon : user32: Free rawinput devices preparsed data on reset.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 17540b9d7fded8293e3c86fd0f0f16b379aefb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17540b9d7fded8293e3c86fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 16 13:48:11 2021 +0200 user32: Free rawinput devices preparsed data on reset. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 19b4007bdb9..a8e10cfb0ca 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -134,6 +134,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device->detail = detail; device->file = file; device->info.cbSize = sizeof(RID_DEVICE_INFO); + device->data = NULL; return device; } @@ -161,6 +162,7 @@ static void find_devices(void) /* destroy previous list */ for (idx = 0; idx < rawinput_devices_count; ++idx) { + HidD_FreePreparsedData(rawinput_devices[idx].data); CloseHandle(rawinput_devices[idx].file); free(rawinput_devices[idx].detail); }

1 0

Rémi Bernon : user32: Use wcslen instead of lstrlenW.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: ed3460571d7bd859e8dd032bee925c88467a2bbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3460571d7bd859e8dd032b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 16 13:48:12 2021 +0200 user32: Use wcslen instead of lstrlenW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a8e10cfb0ca..7796a65641e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -674,7 +674,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT } else { - *data_size = lstrlenW(device->detail->DevicePath) + 1; + *data_size = wcslen(device->detail->DevicePath) + 1; to_copy = device->detail->DevicePath; } to_copy_bytes = *data_size * sizeof(WCHAR);

1 0

Nikolay Sivov : mfplay: Raise MFP_EVENT_TYPE_ERROR events on pipeline errors.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 2b4715142a2b1b7c3da39531c9156bad95908737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b4715142a2b1b7c3da39531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 15:36:07 2021 +0300 mfplay: Raise MFP_EVENT_TYPE_ERROR events on pipeline errors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index b098d880461..e57db8e107d 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1571,6 +1571,12 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MEError: + + media_event_create(player, MFP_EVENT_TYPE_ERROR, event_status, NULL, &event); + + break; + default: ; }

1 0