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

Hugh McMaster : reg/tests: Try importing registry files with escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 1c2b96699973e198e72a01a969af0876387f08e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2b96699973e198e72a01a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:21 2021 +1100 reg/tests: Try importing registry files with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 9b7a90ac99c..f8e7e4b7acb 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1574,22 +1574,22 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); - /* Test with embedded null characters */ + /* Test with escaped null characters */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3126,19 +3126,19 @@ static void test_unicode_import(void) /* Test with embedded null characters */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Try exporting registry values with escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 53fd4df85f004597161a26d86333755e7cbff0ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fd4df85f004597161a26d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:22 2021 +1100 reg/tests: Try exporting registry values with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 32c99e36376..2c7ba88fb59 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -168,6 +168,16 @@ static void test_export(void) "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -402,6 +412,21 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Test escaped null characters */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + 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); + ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(export)

1 0

Aaro Altonen : kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: a7d0198418d6a82e460db4d422d65469edb2fc04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d0198418d6a82e460db4d4… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 10 15:25:09 2021 +0100 kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 24e8cd3f338..951a8a54a86 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -533,6 +533,7 @@ static const struct geoinfo geoinfodata[] = { 161832015, L"BL", L"BLM", 10039880, 652 }, /* Saint Barthélemy */ { 161832256, L"UM", L"UMI", 27114, 581 }, /* U.S. Minor Outlying Islands */ { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832258, L"BG", L"BES", 10039880, 535 }, /* Bonaire, Sint Eustatius and Saba */ }; /* NLS normalization file */

1 0

Nikolay Sivov : winegstreamer: Remove attributes pointer from static registration data.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 773329e3bb0a60b6e6d81878cb1e3d66637977ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=773329e3bb0a60b6e6d81878… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 14:04:44 2021 +0300 winegstreamer: Remove attributes pointer from static registration data. We should store actual key/value pairs in there, if we ever needed this part of registration information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 602fa631a43..68278838458 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -458,7 +458,6 @@ static const struct mft const GUID **input_types; const UINT32 output_types_count; const GUID **output_types; - IMFAttributes *attributes; } mfts[] = { @@ -472,7 +471,6 @@ mfts[] = audio_converter_supported_types, ARRAY_SIZE(audio_converter_supported_types), audio_converter_supported_types, - NULL }, }; @@ -498,7 +496,7 @@ HRESULT mfplat_DllRegisterServer(void) } hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, - input_types, cur->output_types_count, output_types, cur->attributes); + input_types, cur->output_types_count, output_types, NULL); if (FAILED(hr)) {

1 0

Arkadiusz Hiler : dinput8/tests: Make input helper function more versatile.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: d3e7e0426cf5544b0fcec210304cfa6898c06cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e7e0426cf5544b0fcec210… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:08 2021 +0200 dinput8/tests: Make input helper function more versatile. test_device_input() now takes properly sized appdata expected value and can be used to send any keyboard event. It also drains device's queue so it can be called multiple times on a single device instance. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2fc04358cc1..02574961ec1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -80,7 +80,7 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) +static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event( event, DIK_SPACE, 0, 0); + keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -107,7 +107,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO return; } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); /* Check for buffer overflow */ for (i = 0; i < 17; i++) @@ -132,6 +132,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + /* drain device's queue */ + while (data_size == 1) + { + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + if (hr != DI_OK) break; + } + IDirectInputDevice_Unacquire(lpdid); }

1 0

Arkadiusz Hiler : dinput: Clear action mapping with SetDataFormat().
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 542f6134563b491030737831f8c6da2aa530c9bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=542f6134563b491030737831… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:09 2021 +0200 dinput: Clear action mapping with SetDataFormat(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 18 ++++++++++++------ dlls/dinput8/tests/device.c | 12 ++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 198e903fc2e..14c47dd3c7d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -833,6 +833,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; unsigned int offset = 0; + ActionMap *action_map; if (This->acquired) return DIERR_ACQUIRED; @@ -848,15 +849,12 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L if (num_actions == 0) return DI_NOEFFECT; - This->num_actions = num_actions; - /* Construct the dataformat and actionmap */ obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; - HeapFree(GetProcessHeap(), 0, This->action_map); - This->action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); for (i = 0; i < lpdiaf->dwNumActions; i++) { @@ -873,8 +871,8 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L memcpy(&obj_df[action], obj, df->dwObjSize); - This->action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; - This->action_map[action].offset = offset; + action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + action_map[action].offset = offset; obj_df[action].dwOfs = offset; offset += (type & DIDFT_BUTTON) ? 1 : 4; @@ -884,6 +882,9 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L IDirectInputDevice8_SetDataFormat(iface, &data_format); + This->action_map = action_map; + This->num_actions = num_actions; + HeapFree(GetProcessHeap(), 0, obj_df); /* Set the device properties according to the action format */ @@ -962,6 +963,7 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim This->data_queue[This->queue_head].dwData = data; This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; + This->data_queue[This->queue_head].uAppData = -1; /* Set uAppData by means of action mapping */ if (This->num_actions > 0) @@ -1063,6 +1065,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac EnterCriticalSection(&This->crit); + HeapFree(GetProcessHeap(), 0, This->action_map); + This->action_map = NULL; + This->num_actions = 0; + release_DataFormat(&This->data_format); res = create_DataFormat(df, &This->data_format); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 02574961ec1..4a766280982 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -362,6 +362,18 @@ static void test_action_mapping(void) /* Test keyboard input */ test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* setting format should reset action map */ + hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); + ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + + /* back to action map */ + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); + ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* Test BuildActionMap with no suitable actions for a device */ IDirectInputDevice_Unacquire(data.keyboard); af.dwDataSize = 4 * DITEST_KEYBOARDSPACE;

1 0

Arkadiusz Hiler : include: Add DIPROPPOINTER definition.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: fb56afae15c99fdb6735021aca3a8bd706e88612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb56afae15c99fdb6735021a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:10 2021 +0200 include: Add DIPROPPOINTER definition. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index 92c6255cf37..2d183bbc944 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -876,6 +876,12 @@ typedef struct DIPROPSTRING { } DIPROPSTRING, *LPDIPROPSTRING; typedef const DIPROPSTRING *LPCDIPROPSTRING; +typedef struct DIPROPPOINTER { + DIPROPHEADER diph; + UINT_PTR uData; +} DIPROPPOINTER, *LPDIPROPPOINTER; +typedef const DIPROPPOINTER *LPCDIPROPPOINTER; + /* special property GUIDs */ #ifdef __cplusplus #define MAKEDIPROP(prop) (*(const GUID *)(prop))

1 0

Arkadiusz Hiler : dinput: Implement DIPROP_APPDATA.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 8d206333fd50347cb45a8db72ecb191aa787ddb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d206333fd50347cb45a8db7… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:11 2021 +0200 dinput: Implement DIPROP_APPDATA. This fixes not working analog inputs on game controllers in Slay the Spire. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++ dlls/dinput8/tests/device.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d206333fd50347cb45a…

1 0

Alexandre Julliard : user32/tests: Remove todo from a test that seems to succeed reliably now.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 0d017b12cf27d86607d25a114ab044601434b1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d017b12cf27d86607d25a11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 10 20:44:47 2021 +0100 user32/tests: Remove todo from a test that seems to succeed reliably now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eecccb70001..dbb5f4ce5b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3075,7 +3075,6 @@ todo_wine old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); -todo_wine ok( GetFocus() == child, "Focus should be on child %p, not %p\n", child, GetFocus() ); SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc);

1 0

Gabriel Ivăncescu : jscript: Check for null instance prototype.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 580413032c61bc142078d08efb1d1167fe385a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580413032c61bc142078d08e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 5 18:59:41 2021 +0200 jscript: Check for null instance prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index efe8741f3c1..f3eba68b9a4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1853,7 +1853,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val)) + if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 753b4ee595e..211ae2f0373 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1864,6 +1864,21 @@ ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); tmp = Object(nullDisp).toString(); ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); +function testNullPrototype() { + this.x = 13; +} +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); +testNullPrototype.prototype.y = 10; +ok("y" in tmp, "tmp does not have 'y' property"); +tmp = new testNullPrototype(); +ok(tmp.y === 10, "tmp.y !== 10"); +testNullPrototype.prototype = nullDisp; +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon();

1 0