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

Rémi Bernon : user32/tests: Repeat each GetKeyState test a few times.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 53a6b55ff64a49c2409872571ee9d626c5071cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a6b55ff64a49c240987257… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:57 2021 +0200 user32/tests: Repeat each GetKeyState test a few times. As it changes the results on the second and later iterations. This shows for instance that without a thread message queue, the first key press is always missed but then the thread input will follow desktop async keystate updates. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 148 ++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53a6b55ff64a49c24098…

1 0

Rémi Bernon : user32/tests: Factor GetKeyState test checks together.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: c19cba3f0387246b5c88b89e35cdd7c7e558ebe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19cba3f0387246b5c88b89e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:56 2021 +0200 user32/tests: Factor GetKeyState test checks together. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 128 +++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..9540566867f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3739,15 +3739,48 @@ struct get_key_state_thread_params int index; }; +#define check_get_keyboard_state(i, c, x, todo) check_get_keyboard_state_(i, c, x, todo, __LINE__) +static void check_get_keyboard_state_(int i, int c, int x, int todo, int line) +{ + unsigned char keystate[256]; + BOOL ret; + + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); + + /* calling it twice shouldn't change */ + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); +} + +#define check_get_key_state(i, c, x, todo) check_get_key_state_(i, c, x, todo, __LINE__) +static void check_get_key_state_(int i, int c, int x, int todo, int line) +{ + SHORT state; + + state = GetKeyState('X'); + todo_wine_if(todo) ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d: expected that X highest bit is %s, got %#x\n", i, x ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that X undefined bits are unset, got %#x\n", i, state); + + state = GetKeyState('C'); + ok_(__FILE__, line)(!(state & 0x8000) == !c, "%d: expected that C highest bit is %s, got %#x\n", i, c ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, state); +} + static DWORD WINAPI get_key_state_thread(void *arg) { struct get_key_state_thread_params *params = arg; struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; BOOL has_queue; - BOOL ret; + BOOL expect_x; MSG msg; int i = params->index; @@ -3770,67 +3803,21 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - todo_wine_if(!has_queue) - ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + if (!has_queue) expect_x = FALSE; + else expect_x = TRUE; - result = GetKeyState('X'); - if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ !has_queue); + check_get_key_state(i, FALSE, expect_x, /* todo */ TRUE); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ TRUE); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); - - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ has_queue); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); return 0; } @@ -3841,6 +3828,7 @@ static void test_GetKeyState(void) HANDLE thread; DWORD result; BYTE keystate[256]; + BOOL expect_x; HWND hwnd; MSG msg; int i; @@ -3888,13 +3876,19 @@ static void test_GetKeyState(void) keybd_event('X', 0, 0, 0); keystate['C'] = 0xff; SetKeyboardState(keystate); + + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_key_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - result = GetKeyState('X'); - if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + if (test->peek_message_main) expect_x = TRUE; + else expect_x = FALSE; + + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_key_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); @@ -3905,12 +3899,16 @@ static void test_GetKeyState(void) keybd_event('X', 0, KEYEVENTF_KEYUP, 0); keystate['C'] = 0x00; SetKeyboardState(keystate); + + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL);

1 0

Zebediah Figura : ntoskrnl/tests: Skip all tests under WoW64.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: eb5ff50276ee6c388cd277aaa2e8154f135b4a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5ff50276ee6c388cd277aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:40 2021 -0500 ntoskrnl/tests: Skip all tests under WoW64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c3ebe5b8ee1..e65dac38cec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -43,6 +43,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static HRESULT (WINAPI *pSignerSign)(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, SIGNER_SIGNATURE_INFO *signature, SIGNER_PROVIDER_INFO *provider, @@ -939,16 +940,23 @@ START_TEST(ntoskrnl) WCHAR filename[MAX_PATH], filename2[MAX_PATH]; struct testsign_context ctx; SC_HANDLE service, service2; + BOOL ret, is_wow64; DWORD written; - BOOL ret; pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlFreeUnicodeString"); pCancelIoEx = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "CancelIoEx"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); pSignerSign = (void *)GetProcAddress(LoadLibraryA("mssign32"), "SignerSign"); + if (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64) + { + skip("Running in WoW64.\n"); + return; + } + if (!testsign_create_cert(&ctx)) return;

1 0

Nikolay Sivov : mfreadwrite/reader: Improve decoder output samples handling.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: b50b65ab9360c9bd17d51425b93ac84559a43841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b50b65ab9360c9bd17d51425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 2 21:35:00 2021 +0300 mfreadwrite/reader: Improve decoder output samples handling. Equivalent of 706fd3dcce52c0deec7c98143d715a1d9016d3ad, but for the reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index d3df7abd9fc..ffe91f5d265 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -667,7 +667,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s { memset(&out_buffer, 0, sizeof(out_buffer)); - if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) { if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break;

1 0

Jacek Caban : jscript: Add Object.isFrozen and Object.isSealed implementation.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 1f49903e66b0a401e47e5951634c804a4b0d242c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f49903e66b0a401e47e5951… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 2 20:24:37 2021 +0200 jscript: Add Object.isFrozen and Object.isSealed implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 20 ++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 46 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b62fcee0b04..188de659c4a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2646,6 +2646,26 @@ void jsdisp_freeze(jsdisp_t *obj, BOOL seal) obj->extensible = FALSE; } +BOOL jsdisp_is_frozen(jsdisp_t *obj, BOOL sealed) +{ + unsigned int i; + + if(obj->extensible) + return FALSE; + + for(i = 0; i < obj->prop_cnt; i++) { + if(obj->props[i].type == PROP_JSVAL) { + if(!sealed && (obj->props[i].flags & PROPF_WRITABLE)) + return FALSE; + }else if(obj->props[i].type != PROP_ACCESSOR) + continue; + if(obj->props[i].flags & PROPF_CONFIGURABLE) + return FALSE; + } + + return TRUE; +} + HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) { dispex_prop_t *prop = get_prop(obj, id); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ec5001af117..3c870a68a54 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -318,6 +318,7 @@ HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DEC HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); void jsdisp_freeze(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; +BOOL jsdisp_is_frozen(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 86c656a719a..b957ea58bdf 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -760,6 +760,50 @@ static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } +static HRESULT Object_isFrozen(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, + jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + WARN("argument is not an object\n"); + return JS_E_OBJECT_EXPECTED; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) *r = jsval_bool(jsdisp_is_frozen(obj, FALSE)); + return S_OK; +} + +static HRESULT Object_isSealed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, + jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + WARN("argument is not an object\n"); + return JS_E_OBJECT_EXPECTED; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) *r = jsval_bool(jsdisp_is_frozen(obj, TRUE)); + return S_OK; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, @@ -768,6 +812,8 @@ static const builtin_prop_t ObjectConstr_props[] = { {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, {L"isExtensible", Object_isExtensible, PROPF_ES5|PROPF_METHOD|1}, + {L"isFrozen", Object_isFrozen, PROPF_ES5|PROPF_METHOD|1}, + {L"isSealed", Object_isSealed, PROPF_ES5|PROPF_METHOD|1}, {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1}, {L"preventExtensions", Object_preventExtensions, PROPF_ES5|PROPF_METHOD|1}, {L"seal", Object_seal, PROPF_ES5|PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 9227fa7e5a5..474c09d3bd7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1104,6 +1104,74 @@ sync_test("seal", function() { ok(o.length === 1, "o.length = " + o.length); }); +sync_test("isFrozen", function() { + ok(Object.isFrozen.length === 1, "Object.isFrozen.length = " + Object.isFrozen.length); + ok(Object.isSealed.length === 1, "Object.isSealed.length = " + Object.isSealed.length); + + var o = Object.freeze({}); + ok(Object.isFrozen(o) === true, "o is not frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + ok(Object.isFrozen({}) === false, "{} is frozen"); + ok(Object.isSealed({}) === false, "{} is sealed"); + + o = Object.preventExtensions({}); + ok(Object.isFrozen(o) === true, "o is not frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = Object.preventExtensions({ prop: 1 }); + ok(Object.isFrozen(o) === false, "o is frozen"); + ok(Object.isSealed(o) === false, "o is sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = Object.freeze({ prop: 1 }); + ok(Object.isFrozen(o) === true, "o is not frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = Object.seal({ prop: 1 }); + ok(Object.isFrozen(o) === false, "o is frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = {}; + Object.defineProperty(o, "prop", { value: 1 }); + Object.preventExtensions(o); + ok(Object.isFrozen(o) === true, "o is not frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = {}; + Object.defineProperty(o, "prop", { value: 1, writable: true }); + Object.preventExtensions(o); + ok(Object.isFrozen(o) === false, "o is frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = {}; + Object.defineProperty(o, "prop", { value: 1, writable: true, configurable: true }); + Object.preventExtensions(o); + ok(Object.isFrozen(o) === false, "o is frozen"); + ok(Object.isSealed(o) === false, "o is sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = {}; + Object.defineProperty(o, "prop", { value: 1, configurable: true }); + Object.preventExtensions(o); + ok(Object.isFrozen(o) === false, "o is frozen"); + ok(Object.isSealed(o) === false, "o is sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); + + o = {}; + Object.defineProperty(o, "prop", { get: function() {}, set: function() {} }); + Object.preventExtensions(o); + ok(Object.isFrozen(o) === true, "o is not frozen"); + ok(Object.isSealed(o) === true, "o is not sealed"); + ok(Object.isExtensible(o) === false, "o is extensible"); +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head));

1 0

Jacek Caban : jscript: Throw error when trying to add a property to non-extensible objects in jsdisp_propput_idx.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 380ae426a4ad40595d4cee51dee7e4b0805de717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380ae426a4ad40595d4cee51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 2 20:24:18 2021 +0200 jscript: Throw error when trying to add a property to non-extensible objects in jsdisp_propput_idx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 12 +++++++----- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/mshtml/tests/es5.js | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ca404f92fe5..38055fe4cfa 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2145,7 +2145,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } -HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t val) +HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, BOOL throw, jsval_t val) { dispex_prop_t *prop; HRESULT hres; @@ -2153,16 +2153,18 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va if(obj->extensible) hres = ensure_prop_name(obj, name, flags, &prop); else - hres = find_prop_name_prot(obj, string_hash(name), name, &prop); - if(FAILED(hres) || !prop) + hres = find_prop_name(obj, string_hash(name), name, &prop); + if(FAILED(hres)) return hres; + if(!prop || (prop->type == PROP_DELETED && !obj->extensible)) + return throw ? JS_E_INVALID_ACTION : S_OK; return prop_put(obj, prop, val); } HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); + return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, FALSE, val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) @@ -2170,7 +2172,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) WCHAR buf[12]; swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); - return jsdisp_propput_name(obj, buf, val); + return jsdisp_propput(obj, buf, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, TRUE, val); } HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7a6dd4b61f3..318d6be6da7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -206,7 +206,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) hres = jsdisp_define_data_property(&args->jsdisp, L"callee", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_obj(&args->function->function.dispex)); if(SUCCEEDED(hres)) - hres = jsdisp_propput(frame->base_scope->jsobj, L"arguments", PROPF_WRITABLE, jsval_obj(&args->jsdisp)); + hres = jsdisp_propput(frame->base_scope->jsobj, L"arguments", PROPF_WRITABLE, TRUE, jsval_obj(&args->jsdisp)); if(FAILED(hres)) { jsdisp_release(&args->jsdisp); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3999f04a970..ec5001af117 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -303,7 +303,7 @@ HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT disp_propput_name(script_ctx_t*,IDispatch*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,BOOL,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6099c4090f3..f81eefdfd47 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -979,6 +979,23 @@ sync_test("preventExtensions", function() { ok(e.name === "TypeError", "got " + e.name + " exception"); } + o = []; + Object.preventExtensions(o); + try { + o.push(1); + ok(false, "exception expected on o.push"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + ok(!("0" in o), "0 is in o"); + ok(o.length === 0, "o.length = " + o.length); + + o = [1]; + Object.preventExtensions(o); + o.pop(); + ok(!("0" in o), "0 is in o"); + ok(o.length === 0, "o.length = " + o.length); + ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); ok(Object.isExtensible.length === 1, "Object.isExtensible.length = " + Object.isExtensible.length); }); @@ -1022,6 +1039,19 @@ sync_test("freeze", function() { ok(r === 2, "r = " + r); r = 3; ok(o.accprop === 3, "o.accprop = " + o.accprop); + + o = [1]; + Object.freeze(o); + try { + o.pop(); + todo_wine. + ok(false, "exception expected on o.pop"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + ok(o[0] === 1, "o[0] = " + o[0]); + todo_wine. + ok(o.length === 1, "o.length = " + o.length); }); sync_test("seal", function() { @@ -1063,6 +1093,19 @@ sync_test("seal", function() { ok(r === 2, "r = " + r); r = 3; ok(o.accprop === 3, "o.accprop = " + o.accprop); + + o = [1]; + Object.seal(o); + try { + o.pop(); + todo_wine. + ok(false, "exception expected on o.pop"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + ok(o[0] === 1, "o[0] = " + o[0]); + todo_wine. + ok(o.length === 1, "o.length = " + o.length); }); sync_test("head_setter", function() {

1 0

Mark Harmstone : shcore: Add names for stubs.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 5bc629a3e1ac1ee1231dd54f57906a32dcdaf241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc629a3e1ac1ee1231dd54f… Author: Mark Harmstone <mark(a)harmstone.com> Date: Fri Apr 2 13:02:53 2021 +0100 shcore: Add names for stubs. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/shcore.spec | 211 ++++++++++++++++++++++++++---------------------- 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 368fab19541..3f81c340c6f 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -1,4 +1,4 @@ -1 stub @ +1 stub -noname SHCreateReadOnlySharedMemoryStream @ stdcall CommandLineToArgvW(wstr ptr) @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @@ -9,6 +9,8 @@ @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent +# @ stub GetFeatureEnabledState +# @ stub GetFeatureVariant @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stdcall GetScaleFactorForDevice(long) @@ -26,6 +28,10 @@ @ stdcall IUnknown_Set(ptr ptr) @ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) +# @ stub IsProcessInIsolatedContainer +# @ stub IsProcessInWDAGContainer +# @ stub RecordFeatureError +# @ stub RecordFeatureUsage @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications @@ -75,107 +81,118 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) +# @ stub SHTaskPoolAllowThreadReuse +# @ stub SHTaskPoolDoNotWaitForMoreTasks +# @ stub SHTaskPoolGetCurrentThreadLifetime +# @ stub SHTaskPoolGetUniqueContext +# @ stub SHTaskPoolQueueTask +# @ stub SHTaskPoolSetThreadReuseAllowed @ stdcall SHUnicodeToAnsi(wstr ptr ptr) @ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) +# @ stub SubscribeFeatureStateChangeNotification @ stub UnregisterScaleChangeEvent +# @ stub UnsubscribeFeatureStateChangeNotification -100 stub @ -101 stub @ -102 stub @ -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -115 stub @ -116 stub @ -117 stub @ -120 stub @ -121 stub @ +100 stub -noname SHManagedCreateStreamOnFile +101 stub -noname SHManagedCreateFile +102 stub -noname SHIsEmptyStream +103 stub -noname MapWin32ErrorToSTG +104 stub -noname ModeToCreateFileFlags +105 stub -noname CreateTempStreamName +106 stub -noname StreamCopyTo +107 stub -noname IStream_ReadStrLong +108 stub -noname IStream_WriteStrLong +109 stub -noname SHCreateStreamOnModuleResourceW +110 stub -noname SHCreateStreamOnDllResourceW +111 stub -noname CreateWritableSharedMemoryStream +115 stub -noname CreateRandomAccessStreamOnFileWithOptions +116 stub -noname RandomAccessStreamCopyAsync +117 stub -noname CreateRandomAccessStreamOnPlaceholderFile +120 stub -noname SHRegGetCLSIDKey +121 stub -noname SHRegSetValue 122 stub SHRegGetValueFromHKCUHKLM -123 stub @ -124 stub @ -125 stub @ -126 stub @ -127 stub @ -130 stub @ -131 stub @ -132 stub @ -133 stub @ -140 stub @ -141 stub @ -142 stub @ -143 stub @ -144 stub @ -145 stub @ -150 stub @ -151 stub @ -152 stub @ -153 stub @ -160 stub @ -161 stub @ -162 stub @ -170 stub @ -171 stub @ -172 stub @ -173 stub @ -181 stub @ -182 stub @ -183 stub @ -184 stub @ -185 stub @ -186 stub @ -187 stub @ -188 stub @ -190 stub @ -191 stub @ -192 stub @ -193 stub @ -200 stub @ -220 stub @ -221 stub @ -222 stub @ -223 stub @ -224 stub @ -225 stub @ -226 stub @ -227 stub @ -228 stub @ -230 stub @ -231 stub @ -232 stub @ -233 stub @ -234 stub @ -240 stub @ -241 stub @ -242 stub @ -243 stub @ -244 stub @ -245 stub @ -246 stub @ -247 stub @ -248 stub @ -250 stub @ -251 stub @ -252 stub @ -253 stub @ -254 stub @ -255 stub @ -260 stub @ -261 stub @ -270 stub @ -280 stub @ -281 stub @ -282 stub @ -283 stub @ -284 stub @ -290 stub @ -291 stub @ -292 stub @ +123 stub -noname SHRegGetBoolValueFromHKCUHKLM +124 stub -noname SHGetValueGoodBootA +125 stub -noname SHGetValueGoodBootW +126 stub -noname SHLoadRegUIStringW +127 stub -noname QuerySourceCreateFromKeyEx +130 stub -noname SHGlobalCounterGetValue +131 stub -noname SHGlobalCounterIncrement +132 stub -noname SHGlobalCounterDecrement +133 stub -noname SHGlobalCounterSetValue +140 stub -noname IUnknown_ProfferService +141 stub -noname IUnknown_RemoveBackReferences +142 stub -noname IUnknown_GetClassID +143 stub -noname StrRetToStrW +144 stub -noname StrRetToBSTR +145 stub -noname StrRetToBufW +150 stub -noname SHAnsiToUnicodeCP +151 stub -noname SHUnicodeToAnsiCP +152 stub -noname SHUnicodeToAnsiCPAlloc +153 stub -noname SHAnsiToUnicodeCPAlloc +160 stub -noname SHWaitForSendMessageThread +161 stub -noname SHWaitForThreadWithWakeMask +162 stub -noname SHQueueUserWorkItem +170 stub -noname PathIsNetworkPathW +171 stub -noname PathIsNetworkPathA +172 stub -noname PathBuildRootW +173 stub -noname PathBuildRootA +174 stub -noname DriveType +175 stub -noname IsNetDrive +181 stub -noname SHMapHandle +182 stub -noname SHAllocShared +183 stub -noname SHLockSharedEx +184 stub -noname SHLockShared +185 stub -noname SHGetSizeShared +186 stub -noname SHUnlockShared +187 stub -noname SHFreeShared +188 stub -noname SHCreateWorkerWindowW +189 stub -noname SHCreateOplockProvider +190 stub -noname SHWindowsPolicy +191 stub -noname SHWindowsPolicyGetValue +192 stub -noname IsAppCompatModeEnabled +193 stub -noname SHGetObjectCompatFlags +200 stub -noname GUIDFromStringW +220 stub -noname GetPhysicalDpiForDevice +222 stub -noname ScaleRelativePixelsForDevice +223 stub -noname PhysicalRectFromScaledRect +224 stub -noname ScaleAndMapRelativeRectForDevice +225 stub -noname CanOverrideScaleFactor +226 stub -noname GetScalingOverride +227 stub -noname RegisterScaleChangeSink +228 stub -noname SetDesignModeScaleFactor +229 stub -noname GetProposedScaleFactorForWindow +230 stub -noname SHSetWindowSubclass +231 stub -noname SHGetWindowSubclassData +232 stub -noname SHRemoveWindowSubclass +233 stub -noname SHDefSubclassProc +234 stub -noname SHRegisterClassW +240 stub -noname RegisterScaleChangeSinkForWindow +241 stub -noname ScaleAndMapRelativeRect +242 stub -noname RelativeRectFromPhysicalRectWithScale +244 stub -noname GetScaleFactorForWindow +245 stub -noname RegisterScaleChangeNotificationsForWindow +246 stub -noname RevokeScaleChangeNotificationsForWindow +247 stub -noname GetOverrideScaleFactorForWindow +248 stub -noname GetSystemScaleFactorForWindow +249 stub -noname UpdateScalingInfoCache +250 stub -noname RegisterCurrentWindowChangeListener +251 stub -noname RegisterWindowMonitorChangeListener +252 stub -noname UnregisterCurrentWindowChangeListener +253 stub -noname UnregisterWindowMonitorChangeListener +254 stub -noname AddCurrentWindowCandidate +255 stub -noname GetCurrentWindow +260 stub -noname PhysicalRectFromRelativeRectWithScales +261 stub -noname RelativeRectFromPhysicalRectWithScales +270 stub -noname SHCreateMemoryStreamOnSharedBuffer +280 stub -noname _CreateDirectoryHelper +281 stub -noname Win32CreateDirectory +282 stub -noname SuspendSHNotify +283 stub -noname ResumeSHNotify +284 stub -noname IsNotifySuspended +290 stub -noname SHCreateDirectoryExW +291 stub -noname SHCreateDirectoryExA +292 stub -noname SHCreateDirectory

1 0

Zebediah Figura : ntoskrnl/tests: Add a basic PnP test driver.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: c4986ee2d5a31980d6b879b1fa0d1a6931b53813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4986ee2d5a31980d6b879b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:41 2021 -0500 ntoskrnl/tests: Add a basic PnP test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 6 +- dlls/ntoskrnl.exe/tests/driver_pnp.c | 143 ++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver_pnp.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 226 ++++++++++++++++++++++++++++++++ 4 files changed, 375 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4986ee2d5a31980d6b8…

1 0

Zebediah Figura : ntoskrnl: Store root PnP devices per driver.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 6977b81807009883c3fb1bfde0c02541a095007d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6977b81807009883c3fb1bfd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:33 2021 -0500 ntoskrnl: Store root PnP devices per driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 52 +++++++++++++++++++----------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 26 ++++++++++++++++++ dlls/ntoskrnl.exe/pnp.c | 37 ++++++++++--------------- dlls/ntoskrnl.exe/sync.c | 13 +-------- 4 files changed, 68 insertions(+), 60 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 685f7d4345b..1ddd3f4d4f0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -21,34 +21,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winsvc.h" -#include "winternl.h" +#include "ntoskrnl_private.h" #include "excpt.h" -#include "winioctl.h" -#include "winbase.h" #include "winreg.h" #include "ntsecapi.h" #include "ddk/csq.h" -#include "ddk/ntddk.h" -#include "ddk/ntifs.h" -#include "ddk/wdm.h" #include "wine/server.h" -#include "wine/debug.h" #include "wine/heap.h" -#include "wine/rbtree.h" #include "wine/svcctl.h" -#include "ntoskrnl_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -90,14 +76,6 @@ static void *ldr_notify_cookie; static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; static unsigned int load_image_notify_routine_count; -struct wine_driver -{ - DRIVER_OBJECT driver_obj; - DRIVER_EXTENSION driver_extension; - SERVICE_STATUS_HANDLE service_handle; - struct wine_rb_entry entry; -}; - static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -110,6 +88,24 @@ static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; DECLARE_CRITICAL_SECTION(drivers_cs); +struct wine_driver *get_driver( const WCHAR *name ) +{ + static const WCHAR driverW[] = L"\\Driver\\"; + struct wine_rb_entry *entry; + UNICODE_STRING drv_name; + + drv_name.Length = (wcslen( driverW ) + wcslen( name )) * sizeof(WCHAR); + if (!(drv_name.Buffer = malloc( drv_name.Length + sizeof(WCHAR) ))) + return NULL; + wcscpy( drv_name.Buffer, driverW ); + wcscat( drv_name.Buffer, name ); + entry = wine_rb_get( &wine_drivers, &drv_name ); + free( drv_name.Buffer ); + + if (entry) return WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + return NULL; +} + static HANDLE get_device_manager(void) { static HANDLE device_manager; @@ -902,6 +898,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) HANDLE manager = get_device_manager(); struct dispatch_context context; NTSTATUS status = STATUS_SUCCESS; + struct wine_driver *driver; HANDLE handles[2]; context.handle = NULL; @@ -983,9 +980,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) done: /* Native PnP drivers expect that all of their devices will be removed when - * their unload routine is called, so we must stop the PnP manager first. */ - pnp_manager_stop(); + * their unload routine is called. Moreover, we cannot unload a module + * until we have removed devices for all lower drivers, so we have to stop + * all devices first, and then unload all drivers. */ + WINE_RB_FOR_EACH_ENTRY( driver, &wine_drivers, struct wine_driver, entry ) + pnp_manager_stop_driver( driver ); wine_rb_destroy( &wine_drivers, unload_driver, NULL ); + pnp_manager_stop(); return status; } @@ -1486,6 +1487,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) build_driver_keypath( driver->driver_obj.DriverName.Buffer, &driver->driver_extension.ServiceKeyName ); for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) driver->driver_obj.MajorFunction[i] = unhandled_irp; + list_init( &driver->root_pnp_devices ); EnterCriticalSection( &drivers_cs ); if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index a1e1b892e8c..c0b588f3135 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -21,7 +21,21 @@ #ifndef __WINE_NTOSKRNL_PRIVATE_H #define __WINE_NTOSKRNL_PRIVATE_H +#include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winbase.h" +#include "winsvc.h" +#include "winternl.h" +#include "ddk/ntifs.h" +#include "ddk/wdm.h" + #include "wine/asm.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/rbtree.h" static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { @@ -76,12 +90,24 @@ extern POBJECT_TYPE SeTokenObjectType; 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; +struct wine_driver +{ + DRIVER_OBJECT driver_obj; + DRIVER_EXTENSION driver_extension; + SERVICE_STATUS_HANDLE service_handle; + struct wine_rb_entry entry; + struct list root_pnp_devices; +}; + void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) DECLSPEC_HIDDEN; void pnp_manager_start(void) DECLSPEC_HIDDEN; +void pnp_manager_stop_driver( struct wine_driver *driver ) DECLSPEC_HIDDEN; void pnp_manager_stop(void) DECLSPEC_HIDDEN; +struct wine_driver *get_driver( const WCHAR *name ) DECLSPEC_HIDDEN; + static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e', '\\','S','y','s','t','e','m', diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 913a63e8f0d..dce6bb90c68 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -20,31 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define NONAMELESSUNION -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winioctl.h" +#include "ntoskrnl_private.h" #include "winreg.h" #include "winuser.h" -#include "winsvc.h" -#include "winternl.h" #include "setupapi.h" #include "cfgmgr32.h" #include "dbt.h" -#include "ddk/wdm.h" -#include "ddk/ntifs.h" -#include "wine/debug.h" #include "wine/exception.h" #include "wine/heap.h" -#include "wine/rbtree.h" -#include "wine/list.h" -#include "ntoskrnl_private.h" #include "plugplay.h" #include "initguid.h" @@ -928,13 +914,11 @@ struct root_pnp_device DEVICE_OBJECT *device; }; -static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); - -static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) +static struct root_pnp_device *find_root_pnp_device( struct wine_driver *driver, const WCHAR *id ) { struct root_pnp_device *device; - LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + LIST_FOR_EACH_ENTRY( device, &driver->root_pnp_devices, struct root_pnp_device, entry ) { if (!wcsicmp( id, device->id )) return device; @@ -1049,12 +1033,16 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -void pnp_manager_stop(void) +void pnp_manager_stop_driver( struct wine_driver *driver ) { struct root_pnp_device *device, *next; - LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + LIST_FOR_EACH_ENTRY_SAFE( device, next, &driver->root_pnp_devices, struct root_pnp_device, entry ) remove_device( device->device ); +} + +void pnp_manager_stop(void) +{ IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1066,6 +1054,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(driverW)], id[MAX_DEVICE_ID_LEN]; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; struct root_pnp_device *pnp_device; + struct wine_driver *driver; DEVICE_OBJECT *device; NTSTATUS status; unsigned int i; @@ -1073,6 +1062,8 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) TRACE("Searching for new root-enumerated devices for driver %s.\n", debugstr_w(driver_name)); + driver = get_driver( driver_name ); + set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES ); if (set == INVALID_HANDLE_VALUE) { @@ -1091,7 +1082,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (find_root_pnp_device( id )) + if (find_root_pnp_device( driver, id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1106,7 +1097,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - list_add_tail( &root_pnp_devices, &pnp_device->entry ); + list_add_tail( &driver->root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2aa60a0f2a0..445c8d890ab 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -19,24 +19,13 @@ */ #include <limits.h> -#include <stdarg.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winternl.h" +#include "ntoskrnl_private.h" #include "ddk/ntddk.h" -#include "ddk/wdm.h" -#include "ddk/ntifs.h" -#include "wine/asm.h" -#include "wine/debug.h" #include "wine/heap.h" #include "wine/server.h" -#include "ntoskrnl_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); enum object_type

1 0

Zebediah Figura : setupapi: Reënumerate root PnP devices in SetupDiInstallDevice().
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 304b094d1633361d7a6ea69451b48b48d88686f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=304b094d1633361d7a6ea694… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:37 2021 -0500 setupapi: Reënumerate root PnP devices in SetupDiInstallDevice(). If the service is already running, starting it has no effect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index de0413e74f5..0a396cc8464 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -104,6 +104,8 @@ static const WCHAR AddInterface[] = {'A','d','d','I','n','t','e','r','f','a','c' static const WCHAR backslashW[] = {'\\',0}; static const WCHAR emptyW[] = {0}; +#define SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES 128 + struct driver { WCHAR inf_path[MAX_PATH]; @@ -5123,13 +5125,20 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (!wcsnicmp(device->instanceId, rootW, lstrlenW(rootW)) && svc_name[0] && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) { - if ((service = OpenServiceW(manager, svc_name, SERVICE_START))) + if ((service = OpenServiceW(manager, svc_name, SERVICE_START | SERVICE_USER_DEFINED_CONTROL))) { + SERVICE_STATUS status; + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { ERR("Failed to start service %s for device %s, error %u.\n", debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); } + if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status)) + { + ERR("Failed to control service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } CloseServiceHandle(service); } else

1 0