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

Francois Gouget : testbot/WineTest: Pass the full path to winetest.exe.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: tools Branch: master Commit: f8d4bd7769365a023c73ca9058be228917b84c1a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8d4bd7769365a023c73ca9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 13:05:38 2021 +0100 testbot/WineTest: Pass the full path to winetest.exe. It is not installed in the wineprefix and thus is not in %PATH%. So Wine needs its full path to find it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index dd41fcf..498b8af 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,7 +86,8 @@ sub WineTestSuite($$$$) # there are test failures. my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -96,7 +97,7 @@ sub WineTestSuite($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "winetest.exe", + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -142,7 +143,8 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $BaseName = SetupTest("the tests", $Mission); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report")

1 0

Francois Gouget : testbot/TestWTBS: Fix a couple of typos in the documentation.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: tools Branch: master Commit: 4bd805aad4d35dd070009c4d618db588f74c74ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bd805aad4d35dd070009c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 17:13:36 2021 +0100 testbot/TestWTBS: Fix a couple of typos in the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index b76aad5..8067a62 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -675,8 +675,8 @@ there is no error one would declare an empty group such as below, though a g 0 tests.report.kernel32 Finally, note that while the error directives are inherited by subcategories, -they are not merged. So if if both win and win32 have error-matching -directives, win32 will not inherit anything from the win category. +they are not merged. So if both win and win32 have error-matching directives, +win32 will not inherit anything from the win category. =item <tasks.(report|log|testbot).Errors> @@ -873,8 +873,8 @@ Checks that the TestBot applied the patch and did not find it necessary to run make_requests and make_opengl. Finally, note that while the Grep* directives are inherited by subcategories, -they are not merged. So if if both win and win32 have Grep directives, win32 -will not inherit anything from the win category. +they are not merged. So if both win and win32 have Grep directives, win32 will +not inherit anything from the win category. =cut

1 0

Francois Gouget : testbot/TestWTBS: Don't expect CVS revisions on the test report start lines.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: tools Branch: master Commit: 83da6130c431dc501324faa996907eba07368d1f URL: https://source.winehq.org/git/tools.git/?a=commit;h=83da6130c431dc501324faa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 04:19:34 2021 +0100 testbot/TestWTBS: Don't expect CVS revisions on the test report start lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 81b56c4..b76aad5 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -495,7 +495,7 @@ sub GetReportTestUnits($) { foreach my $Line (<$LogFile>) { - if ($Line =~ m%^([_.a-z0-9-]+:[_a-z0-9]*) start (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)%) + if ($Line =~ m%^([_.a-z0-9-]+:[_a-z0-9]*) start (?:-|[/_.a-z0-9-]+)%) { $TestUnits->{$1} = 1; }

1 0

Nikolay Sivov : rtworkq: Partially implement shared queues.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: d1d1e3f56ffa1beab271fcd5b2e4c7a18294a772 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d1e3f56ffa1beab271fcd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 19:06:19 2021 +0300 rtworkq: Partially implement shared queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/queue.c | 34 ++++++++++++++++++++++++++++++++-- include/mfapi.h | 1 + 4 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7d014e334c8..cbda9404aa9 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -132,6 +132,7 @@ @ stub MFJoinIoPort @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform +@ stdcall MFLockSharedWorkQueue(wstr long ptr ptr) rtworkq.RtwqLockSharedWorkQueue @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue @ stdcall MFMapDX9FormatToDXGIFormat(long) @ stdcall MFMapDXGIFormatToDX9Format(long) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 18361d4d721..1b24dce2fe0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -240,6 +240,7 @@ static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **all static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); +static HRESULT (WINAPI *pMFLockSharedWorkQueue)(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); static HWND create_window(void) { @@ -907,6 +908,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFLockSharedWorkQueue); X(MFMapDX9FormatToDXGIFormat); X(MFMapDXGIFormatToDX9Format); X(MFPutWaitingWorkItem); @@ -7016,6 +7018,49 @@ done: DestroyWindow(window); } +static void test_MFLockSharedWorkQueue(void) +{ + DWORD taskid, queue, queue2; + HRESULT hr; + + if (!pMFLockSharedWorkQueue) + { + win_skip("MFLockSharedWorkQueue() is not available.\n"); + return; + } + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = pMFLockSharedWorkQueue(NULL, 0, &taskid, &queue); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = pMFLockSharedWorkQueue(NULL, 0, NULL, &queue); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + taskid = 0; + hr = pMFLockSharedWorkQueue(L"", 0, &taskid, &queue); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + queue = 0; + hr = pMFLockSharedWorkQueue(L"", 0, NULL, &queue); + ok(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + queue2 = 0; + hr = pMFLockSharedWorkQueue(L"", 0, NULL, &queue2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(queue == queue2, "Unexpected queue %#x.\n", queue2); + + hr = MFUnlockWorkQueue(queue2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { char **argv; @@ -7044,6 +7089,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); + test_MFLockSharedWorkQueue(); test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index f4e9f10d3f0..6817b06f284 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -58,6 +58,7 @@ static struct queue_handle user_queues[MAX_USER_QUEUE_HANDLES]; static struct queue_handle *next_free_user_queue; static struct queue_handle *next_unused_user_queue = user_queues; static WORD queue_generation; +static DWORD shared_mt_queue; static CRITICAL_SECTION queues_section; static CRITICAL_SECTION_DEBUG queues_critsect_debug = @@ -217,6 +218,7 @@ static HRESULT unlock_user_queue(DWORD queue) { if (--entry->refcount == 0) { + if (shared_mt_queue == queue) shared_mt_queue = 0; shutdown_queue((struct queue *)entry->obj); heap_free(entry->obj); entry->obj = next_free_user_queue; @@ -1438,9 +1440,37 @@ HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, DWORD *taskid, DWORD *queue) { - FIXME("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + struct queue_desc desc; + HRESULT hr; + + TRACE("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + + if (!usageclass) + return E_POINTER; + + if (!*usageclass && taskid) + return E_INVALIDARG; + + if (*usageclass) + FIXME("Class name is ignored.\n"); + + EnterCriticalSection(&queues_section); - return RtwqAllocateWorkQueue(RTWQ_STANDARD_WORKQUEUE, queue); + if (shared_mt_queue) + hr = lock_user_queue(shared_mt_queue); + else + { + desc.queue_type = RTWQ_MULTITHREADED_WORKQUEUE; + desc.ops = &pool_queue_ops; + desc.target_queue = 0; + hr = alloc_user_queue(&desc, &shared_mt_queue); + } + + *queue = shared_mt_queue; + + LeaveCriticalSection(&queues_section); + + return hr; } HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request) diff --git a/include/mfapi.h b/include/mfapi.h index d6969984da7..c1cf766c005 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -553,6 +553,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 * HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFLockSharedWorkQueue(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format); DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format); HRESULT WINAPI MFPutWaitingWorkItem(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key);

1 0

Mark Harmstone : ntdll: Add error mapping for MUI statuses.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 9ea1134eea7a0834a4efeafa380d1ed03eb271db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea1134eea7a0834a4efeafa… Author: Mark Harmstone <mark(a)harmstone.com> Date: Thu Mar 25 01:56:21 2021 +0000 ntdll: Add error mapping for MUI statuses. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 18 +++++++++++++----- dlls/ntdll/make_errors | 7 +++++++ dlls/ntdll/tests/error.c | 7 +++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index fb630fa9864..738f55b42dc 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -143,7 +143,7 @@ void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( NTSTATUS status ) /* conversion table, generated by ./make_errors */ -static const DWORD error_map[1579] = +static const DWORD error_map[1586] = { ERROR_WAIT_1, /* 00000001 (STATUS_WAIT_1) */ ERROR_WAIT_2, /* 00000002 (STATUS_WAIT_2) */ @@ -1544,6 +1544,13 @@ static const DWORD error_map[1579] = ERROR_CTX_SECURITY_LAYER_ERROR, /* c00a0038 (STATUS_CTX_SECURITY_LAYER_ERROR) */ ERROR_TS_INCOMPATIBLE_SESSIONS, /* c00a0039 (STATUS_TS_INCOMPATIBLE_SESSIONS) */ ERROR_TS_VIDEO_SUBSYSTEM_ERROR, /* c00a003a (STATUS_TS_VIDEO_SUBSYSTEM_ERROR) */ + ERROR_MUI_FILE_NOT_FOUND, /* c00b0001 (STATUS_MUI_FILE_NOT_FOUND) */ + ERROR_MUI_INVALID_FILE, /* c00b0002 (STATUS_MUI_INVALID_FILE) */ + ERROR_MUI_INVALID_RC_CONFIG, /* c00b0003 (STATUS_MUI_INVALID_RC_CONFIG) */ + ERROR_MUI_INVALID_LOCALE_NAME, /* c00b0004 (STATUS_MUI_INVALID_LOCALE_NAME) */ + ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME, /* c00b0005 (STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME) */ + ERROR_MUI_FILE_NOT_LOADED, /* c00b0006 (STATUS_MUI_FILE_NOT_LOADED) */ + ERROR_RESOURCE_ENUM_USER_STOP, /* c00b0007 (STATUS_RESOURCE_ENUM_USER_STOP) */ ERROR_CLUSTER_INVALID_NODE, /* c0130001 (STATUS_CLUSTER_INVALID_NODE) */ ERROR_CLUSTER_NODE_EXISTS, /* c0130002 (STATUS_CLUSTER_NODE_EXISTS) */ ERROR_CLUSTER_JOIN_IN_PROGRESS, /* c0130003 (STATUS_CLUSTER_JOIN_IN_PROGRESS) */ @@ -1726,7 +1733,7 @@ static const DWORD error_map[1579] = ERROR_VOLMGR_RAID5_NOT_SUPPORTED, /* c038005c (STATUS_VOLMGR_RAID5_NOT_SUPPORTED) */ }; -static const struct { ULONG start, end, offset; } table[42] = +static const struct { ULONG start, end, offset; } table[43] = { { 0x00000001, 0x00000003, 0 }, { 0x0000003f, 0x0000003f, 3 }, @@ -1767,9 +1774,10 @@ static const struct { ULONG start, end, offset; } table[42] = { 0xc0030059, 0xc0030061, 1341 }, { 0xc00a0001, 0xc00a0018, 1350 }, { 0xc00a0022, 0xc00a003a, 1374 }, - { 0xc0130001, 0xc0130031, 1399 }, - { 0xc0150001, 0xc0150027, 1448 }, - { 0xc0380001, 0xc038005c, 1487 }, + { 0xc00b0001, 0xc00b0007, 1399 }, + { 0xc0130001, 0xc0130031, 1406 }, + { 0xc0150001, 0xc0150027, 1455 }, + { 0xc0380001, 0xc038005c, 1494 }, }; static ULONG map_status( NTSTATUS status ) diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index bedce57fe7a..5b7885e0427 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -1314,6 +1314,13 @@ my %error_map = qw( STATUS_CTX_SECURITY_LAYER_ERROR ERROR_CTX_SECURITY_LAYER_ERROR STATUS_TS_INCOMPATIBLE_SESSIONS ERROR_TS_INCOMPATIBLE_SESSIONS STATUS_TS_VIDEO_SUBSYSTEM_ERROR ERROR_TS_VIDEO_SUBSYSTEM_ERROR + STATUS_MUI_FILE_NOT_FOUND ERROR_MUI_FILE_NOT_FOUND + STATUS_MUI_INVALID_FILE ERROR_MUI_INVALID_FILE + STATUS_MUI_INVALID_RC_CONFIG ERROR_MUI_INVALID_RC_CONFIG + STATUS_MUI_INVALID_LOCALE_NAME ERROR_MUI_INVALID_LOCALE_NAME + STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME + STATUS_MUI_FILE_NOT_LOADED ERROR_MUI_FILE_NOT_LOADED + STATUS_RESOURCE_ENUM_USER_STOP ERROR_RESOURCE_ENUM_USER_STOP STATUS_CLUSTER_INVALID_NODE ERROR_CLUSTER_INVALID_NODE STATUS_CLUSTER_NODE_EXISTS ERROR_CLUSTER_NODE_EXISTS STATUS_CLUSTER_JOIN_IN_PROGRESS ERROR_CLUSTER_JOIN_IN_PROGRESS diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..c812aa779cc 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -1455,6 +1455,13 @@ static void run_error_tests(void) cmp2(STATUS_CTX_SECURITY_LAYER_ERROR, ERROR_CTX_SECURITY_LAYER_ERROR); cmp2(STATUS_TS_INCOMPATIBLE_SESSIONS, ERROR_TS_INCOMPATIBLE_SESSIONS); cmp2(STATUS_TS_VIDEO_SUBSYSTEM_ERROR, ERROR_TS_VIDEO_SUBSYSTEM_ERROR); + cmp2(STATUS_MUI_FILE_NOT_FOUND, ERROR_MUI_FILE_NOT_FOUND); + cmp2(STATUS_MUI_INVALID_FILE, ERROR_MUI_INVALID_FILE); + cmp2(STATUS_MUI_INVALID_RC_CONFIG, ERROR_MUI_INVALID_RC_CONFIG); + cmp2(STATUS_MUI_INVALID_LOCALE_NAME, ERROR_MUI_INVALID_LOCALE_NAME); + cmp2(STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME, ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME); + cmp2(STATUS_MUI_FILE_NOT_LOADED, ERROR_MUI_FILE_NOT_LOADED); + cmp2(STATUS_RESOURCE_ENUM_USER_STOP, ERROR_RESOURCE_ENUM_USER_STOP); cmp2(STATUS_CLUSTER_NO_NET_ADAPTERS, ERROR_CLUSTER_NO_NET_ADAPTERS); cmp2(STATUS_CLUSTER_POISONED, ERROR_CLUSTER_POISONED); cmp2(STATUS_CLUSTER_NON_CSV_PATH, ERROR_NON_CSV_PATH);

1 0

Jacek Caban : mshtml: Support onload handlers in script elements.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 34dd3dd21762b69fed684f37c741768ec6b904ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=34dd3dd21762b69fed684f37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:21 2021 +0100 mshtml: Support onload handlers in script elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 24 +++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8f2c7f598ea..c52c62f56d9 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -723,12 +723,22 @@ static void dispatch_script_readystatechange_event(HTMLScriptElement *script) DOMEvent *event; HRESULT hres; - hres = create_document_event(script->element.node.doc, EVENTID_READYSTATECHANGE, &event); - if(FAILED(hres)) - return; + if(script->readystate != READYSTATE_LOADED || + dispex_compat_mode(&script->element.node.event_target.dispex) < COMPAT_MODE_IE10) { + hres = create_document_event(script->element.node.doc, EVENTID_READYSTATECHANGE, &event); + if(SUCCEEDED(hres)) { + dispatch_event(&script->element.node.event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + } - dispatch_event(&script->element.node.event_target, event); - IDOMEvent_Release(&event->IDOMEvent_iface); + if(script->readystate == READYSTATE_LOADED) { + hres = create_document_event(script->element.node.doc, EVENTID_LOAD, &event); + if(SUCCEEDED(hres)) { + dispatch_event(&script->element.node.event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + } } typedef struct { @@ -758,6 +768,10 @@ static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTAT { script_elem->readystate = readystate; + if(readystate != READYSTATE_LOADED && + dispex_compat_mode(&script_elem->element.node.event_target.dispex) >= COMPAT_MODE_IE11) + return; + if(readystate != READYSTATE_INTERACTIVE) { if(!script_elem->element.node.doc->window->parser_callback_cnt) { fire_readystatechange_task_t *task; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d61d3658151..b079042afff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -323,3 +323,40 @@ sync_test("conditional_comments", function() { test_version(7); test_version(8); }); + +var ready_states; + +async_test("script_load", function() { + var v = document.documentMode; + if(v < 9) { + next_test(); + return; + } + + var elem = document.createElement("script"); + ready_states = ""; + + elem.onreadystatechange = guard(function() { + ok(v < 11, "unexpected onreadystatechange call"); + ready_states += elem.readyState + ","; + }); + + elem.onload = guard(function() { + switch(v) { + case 9: + ok(ready_states === "loading,exec,loaded,", "ready_states = " + ready_states); + break; + case 10: + ok(ready_states === "loading,exec,", "ready_states = " + ready_states); + break; + case 11: + ok(ready_states === "exec,", "ready_states = " + ready_states); + break; + } + next_test(); + }); + + document.body.appendChild(elem); + elem.src = "jsstream.php?simple"; + external.writeStream("simple", "ready_states += 'exec,';"); +});

1 0

Jacek Caban : mshtml/tests: Use winetest.js helpers in asyncscriptload.js.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: da30fa03574816cbd69c636ab39452ee9fe2882f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da30fa03574816cbd69c636a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:04 2021 +0100 mshtml/tests: Use winetest.js helpers in asyncscriptload.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/asyncscriptload.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/asyncscriptload.js b/dlls/mshtml/tests/asyncscriptload.js index a73e5e849e8..6dc333afdf4 100644 --- a/dlls/mshtml/tests/asyncscriptload.js +++ b/dlls/mshtml/tests/asyncscriptload.js @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var tests = []; var head = document.getElementsByTagName("head")[0]; /* Dynamically created script element is downloaded as soon as src property is set, @@ -24,7 +25,7 @@ var detached_elem_executed = false; var detached_elem = document.createElement("script"); detached_elem.src = "jsstream.php?detached_script"; -function test_detached_script_elem() { +async_test("detached_script_elem", function() { var oncomplete_called = false; detached_elem.onreadystatechange = guard(function() { if(detached_elem.readyState == "complete") { @@ -44,7 +45,7 @@ function test_detached_script_elem() { }); external.writeStream("detached_script", 'detached_elem_executed = true;'); -} +}); /* Dynamically created script elements are evaluated as soon as they are loaded, no matter * how they are ordered in the tree. */ @@ -58,7 +59,7 @@ var attached_elem2 = document.createElement("script"); attached_elem2.src = "jsstream.php?attached_script2"; head.appendChild(attached_elem2); -function test_attached_script_elem() { +async_test("attached_script_elem", function() { attached_elem1.onreadystatechange = guard(function() { ok(attached_elem1.readyState == "loaded", "attached_elem1.readyState = " + attached_elem2.readyState); ok(attached_elem1_executed, "attached element 1 not executed before readyState complete"); @@ -73,9 +74,9 @@ function test_attached_script_elem() { }); external.writeStream("attached_script2", 'attached_elem2_executed = true;'); -} +}); -function test_dynamic_element() { +async_test("append_script", function() { var elem = document.createElement("script"); var ready_states = ""; @@ -88,10 +89,4 @@ function test_dynamic_element() { document.body.appendChild(elem); elem.src = "jsstream.php?simple"; external.writeStream("simple", " "); -} - -var tests = [ - test_detached_script_elem, - test_attached_script_elem, - test_dynamic_element -]; +});

1 0

Mark Harmstone : ntstatus.h: Add MUI statuses.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 4ccf44bb92239d3ad560fe08f7fd5e31825dc076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccf44bb92239d3ad560fe08… Author: Mark Harmstone <mark(a)harmstone.com> Date: Thu Mar 25 01:56:20 2021 +0000 ntstatus.h: Add MUI statuses. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index f0110659f0c..e049be0bdbd 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1330,6 +1330,14 @@ #define STATUS_TS_INCOMPATIBLE_SESSIONS ((NTSTATUS) 0xC00A0039) #define STATUS_TS_VIDEO_SUBSYSTEM_ERROR ((NTSTATUS) 0xC00A003A) +#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001) +#define STATUS_MUI_INVALID_FILE ((NTSTATUS)0xC00B0002) +#define STATUS_MUI_INVALID_RC_CONFIG ((NTSTATUS)0xC00B0003) +#define STATUS_MUI_INVALID_LOCALE_NAME ((NTSTATUS)0xC00B0004) +#define STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME ((NTSTATUS)0xC00B0005) +#define STATUS_MUI_FILE_NOT_LOADED ((NTSTATUS)0xC00B0006) +#define STATUS_RESOURCE_ENUM_USER_STOP ((NTSTATUS)0xC00B0007) + #define STATUS_CLUSTER_INVALID_NODE ((NTSTATUS) 0xC0130001) #define STATUS_CLUSTER_NODE_EXISTS ((NTSTATUS) 0xC0130002) #define STATUS_CLUSTER_JOIN_IN_PROGRESS ((NTSTATUS) 0xC0130003)

1 0

Jacek Caban : urlmon: Make default user agent compatible with IE11.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 266dc7e8e94f1602ec273b38351d6a32db468178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266dc7e8e94f1602ec273b38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:33:51 2021 +0100 urlmon: Make default user agent compatible with IE11. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 5154bdb61f8..764f52c5630 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -528,7 +528,7 @@ static void ensure_useragent(void) else os_type = L""; - swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 8.0; Windows %s%d.%d; %sTrident/5.0", + swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = lstrlenW(buf);

1 0

Jacek Caban : urlmon: Directly use otain_user_agent in ObtainUserAgentString.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 8efbff575a8388fdee4d2b07cfe8620544ccb50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efbff575a8388fdee4d2b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:08 2021 +0100 urlmon: Directly use otain_user_agent in ObtainUserAgentString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 6084ae94b11..b74d56166d9 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -510,10 +510,18 @@ static size_t obtain_user_agent(WCHAR *ret, size_t size) OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; DWORD res, idx=0; + size_t len = 0; BOOL is_wow; - size_t len; HKEY key; + EnterCriticalSection(&session_cs); + if(user_agent) { + len = wcslen(user_agent) + 1; + memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + } + LeaveCriticalSection(&session_cs); + if(len) return len; + GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; @@ -685,33 +693,25 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf /************************************************************************** * ObtainUserAgentString (URLMON.@) */ -HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) +HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) { - DWORD size; - HRESULT hres = E_FAIL; + DWORD size, len; + WCHAR buf[1024]; + HRESULT hres = S_OK; - TRACE("(%d %p %p)\n", dwOption, pcszUAOut, cbSize); + TRACE("(%d %p %p)\n", option, ret, ret_size); - if(!pcszUAOut || !cbSize) + if(!ret || !ret_size) return E_INVALIDARG; - EnterCriticalSection(&session_cs); - - ensure_user_agent(); - if(user_agent) { - size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); - - if(size <= *cbSize) { - WideCharToMultiByte(CP_ACP, 0, user_agent, -1, pcszUAOut, *cbSize, NULL, NULL); - hres = S_OK; - }else { - hres = E_OUTOFMEMORY; - } - - *cbSize = size; - } + len = obtain_user_agent(buf, ARRAY_SIZE(buf)); + size = WideCharToMultiByte(CP_ACP, 0, buf, len, NULL, 0, NULL, NULL); + if(size <= *ret_size) + WideCharToMultiByte(CP_ACP, 0, buf, len, ret, *ret_size+1, NULL, NULL); + else + hres = E_OUTOFMEMORY; - LeaveCriticalSection(&session_cs); + *ret_size = size; return hres; }

1 0