January 2018 - Wine-commits

Piotr Caban : msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 2149f472eac3408334ce0a372ef170adbc2b9996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2149f472eac3408334ce0a37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:04:24 2018 +0100 msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 211 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 198 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2149f472eac3408334ce…

1 0

Piotr Caban : msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4:: _Internal_push.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 4e863fa7c721ac5aadb36acb8e033938a8223570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e863fa7c721ac5aadb36acb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:04:39 2018 +0100 msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4::_Internal_push. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- include/wine/exception.h | 2 +- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b3e546a..d9fe188 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); struct __Container_proxy; @@ -1397,6 +1398,12 @@ static MSVCP_size_t InterlockedIncrementSizeT(MSVCP_size_t volatile *dest) #define InterlockedIncrementSizeT(dest) InterlockedIncrement((LONG*)dest) #endif +static void CALLBACK queue_push_finally(BOOL normal, void *ctx) +{ + threadsafe_queue *queue = ctx; + InterlockedIncrementSizeT(&queue->tail_pos); +} + static void threadsafe_queue_push(threadsafe_queue *queue, MSVCP_size_t id, void *e, _Concurrent_queue_base_v4 *parent, BOOL copy) { @@ -1430,21 +1437,24 @@ static void threadsafe_queue_push(threadsafe_queue *queue, MSVCP_size_t id, p = queue->tail; } - /* TODO: Add exception handling */ - if(copy) - call__Concurrent_queue_base_v4__Copy_item(parent, p, id-page_id, e); - else - call__Concurrent_queue_base_v4__Move_item(parent, p, id-page_id, e); - p->_Mask |= 1 << (id - page_id); - InterlockedIncrementSizeT(&queue->tail_pos); + __TRY + { + if(copy) + call__Concurrent_queue_base_v4__Copy_item(parent, p, id-page_id, e); + else + call__Concurrent_queue_base_v4__Move_item(parent, p, id-page_id, e); + p->_Mask |= 1 << (id - page_id); + } + __FINALLY_CTX(queue_push_finally, queue); } -static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, +static BOOL threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, void *e, _Concurrent_queue_base_v4 *parent) { MSVCP_size_t page_id = id & ~(parent->alloc_count-1); int spin; _Page *p; + BOOL ret = FALSE; spin = 0; while(queue->tail_pos <= id) @@ -1455,8 +1465,12 @@ static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, spin_wait(&spin); p = queue->head; - /* TODO: Add exception handling */ - call__Concurrent_queue_base_v4__Assign_and_destroy_item(parent, e, p, id-page_id); + if(p->_Mask & (1 << (id-page_id))) + { + /* TODO: Add exception handling */ + call__Concurrent_queue_base_v4__Assign_and_destroy_item(parent, e, p, id-page_id); + ret = TRUE; + } if(id == page_id+parent->alloc_count-1) { @@ -1471,7 +1485,9 @@ static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, /* TODO: Add exception handling */ call__Concurrent_queue_base_v4__Deallocate_page(parent, p); } + InterlockedIncrementSizeT(&queue->head_pos); + return ret; } /* ?_Internal_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXPBX(a)Z */ @@ -1516,11 +1532,14 @@ MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_pop_if_present( do { - id = this->data->head_pos; - if(id == this->data->tail_pos) return FALSE; - } while(InterlockedCompareExchangePointer((void**)&this->data->head_pos, - (void*)(id+1), (void*)id) != (void*)id); - threadsafe_queue_pop(this->data->queues + id % QUEUES_NO, id / QUEUES_NO, e, this); + do + { + id = this->data->head_pos; + if(id == this->data->tail_pos) return FALSE; + } while(InterlockedCompareExchangePointer((void**)&this->data->head_pos, + (void*)(id+1), (void*)id) != (void*)id); + } while(!threadsafe_queue_pop(this->data->queues + id % QUEUES_NO, + id / QUEUES_NO, e, this)); return TRUE; } diff --git a/include/wine/exception.h b/include/wine/exception.h index 8e3f481..3b1a3cf 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -92,7 +92,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE_SETJMP_H) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Jacek Caban : schtasks: Ignore /tr and /ru options.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 23800d67e0732daa5bcb089bc03893b5d1c9051a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23800d67e0732daa5bcb089b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 17:11:20 2018 +0100 schtasks: Ignore /tr and /ru options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 81 +++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index c6b8586..2ac7544 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -31,7 +31,9 @@ static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR ru_optW[] = {'/','r','u',0}; static const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR tr_optW[] = {'/','t','r',0}; static const WCHAR xml_optW[] = {'/','x','m','l',0}; static ITaskFolder *get_tasks_root_folder(void) @@ -133,49 +135,71 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) static int change_command(int argc, WCHAR *argv[]) { - const WCHAR *task_name; + BOOL have_option = FALSE, enable = FALSE; + const WCHAR *task_name = NULL; IRegisteredTask *task; HRESULT hres; - if (!argc) { - FIXME("Missing /tn option\n"); - return 1; - } + while (argc) { + if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else if (!strcmpiW(argv[0], enable_optW)) { + enable = TRUE; + have_option = TRUE; + argc--; + argv++; + }else if (!strcmpiW(argv[0], tr_optW)) { + if (argc < 2) { + FIXME("Missing /tr value\n"); + return 1; + } - if (strcmpiW(argv[0], tn_optW)) { - FIXME("Unsupported %s option\n", debugstr_w(argv[0])); - return 0; + FIXME("Unsupported /tr option %s\n", debugstr_w(argv[1])); + have_option = TRUE; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); + return 1; + } } - if (argc < 2) { - FIXME("Missing /tn value\n"); + if (!task_name) { + FIXME("Missing /tn option\n"); return 1; } - task_name = argv[1]; - argc -= 2; - argv += 2; - if (!argc) { + if (!have_option) { FIXME("Missing change options\n"); return 1; } - if (strcmpiW(argv[0], enable_optW) || argc > 1) { - FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); - return 0; - } - task = get_registered_task(task_name); if (!task) return 1; - hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); - IRegisteredTask_Release(task); - if (FAILED(hres)) { - FIXME("put_Enabled failed: %08x\n", hres); - return 1; + if (enable) { + hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); + if (FAILED(hres)) { + IRegisteredTask_Release(task); + FIXME("put_Enabled failed: %08x\n", hres); + return 1; + } } + IRegisteredTask_Release(task); return 0; } @@ -222,6 +246,15 @@ static int create_command(int argc, WCHAR *argv[]) flags = TASK_CREATE_OR_UPDATE; argc--; argv++; + }else if (!strcmpiW(argv[0], ru_optW)) { + if (argc < 2) { + FIXME("Missing /ru value\n"); + return 1; + } + + FIXME("Unsupported /ru option %s\n", debugstr_w(argv[1])); + argc -= 2; + argv += 2; }else { FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); return 1;

1 0

Jacek Caban : ole32: Don' t dispatch WM_QUIT messages in CoWaitForMultipleHandles.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 98b44e793aa1cc3ab3c81b95c1a50e28cdfba869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b44e793aa1cc3ab3c81b95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:05:40 2018 +0100 ole32: Don't dispatch WM_QUIT messages in CoWaitForMultipleHandles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 08455bf..d002887 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4559,18 +4559,21 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) { - TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); - TranslateMessage(&msg); - DispatchMessageW(&msg); if (msg.message == WM_QUIT) { - TRACE("resending WM_QUIT to outer message loop\n"); + TRACE("received WM_QUIT message\n"); post_quit = TRUE; exit_code = msg.wParam; /* no longer need to process messages */ message_loop = FALSE; break; } + else + { + TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); + TranslateMessage(&msg); + DispatchMessageW(&msg); + } } continue; }

1 0

Jacek Caban : ole32: Don' t stop processing messages after WM_QUIT in CoWaitForMultipleHandles.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 2e66aa59b22d490081f4fea576305ce1fa5c8174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e66aa59b22d490081f4fea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:05:51 2018 +0100 ole32: Don't stop processing messages after WM_QUIT in CoWaitForMultipleHandles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 3 --- dlls/ole32/tests/compobj.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d002887..598081b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4564,9 +4564,6 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, TRACE("received WM_QUIT message\n"); post_quit = TRUE; exit_code = msg.wParam; - /* no longer need to process messages */ - message_loop = FALSE; - break; } else { diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 83595cb..a36e791 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2971,10 +2971,8 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(success, "PeekMessageA failed, error %u\n", GetLastError()); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(!success, "PeekMessageA succeeded\n"); success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); - todo_wine ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); index = WaitForSingleObject(thread, 200); ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); @@ -2991,7 +2989,6 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(success, "PeekMessageA failed, error %u\n", GetLastError()); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(!success, "PeekMessageA succeeded\n"); success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n");

1 0

Jacek Caban : ole32/tests: Added more CoWaitForMultipleHandles tests.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: de90cca586b6a04340907ebefd31ede38f6894fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=de90cca586b6a04340907ebe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:06:03 2018 +0100 ole32/tests: Added more CoWaitForMultipleHandles tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 182 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index a36e791..aef1037 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -938,6 +938,7 @@ static DWORD WINAPI MessageFilter_MessagePending( DWORD dwPendingType) { trace("MessagePending\n"); + todo_wine ok(0, "unexpected call\n"); return PENDINGMSG_WAITNOPROCESS; } @@ -2632,6 +2633,15 @@ static DWORD CALLBACK send_message_thread(LPVOID arg) return 0; } +static DWORD CALLBACK send_and_post_user_message_thread(void *arg) +{ + HWND hwnd = arg; + Sleep(30); + SendMessageA(hwnd, WM_USER, 0, 0); + PostMessageA(hwnd, WM_USER, 0, 0); + return 0; +} + static DWORD CALLBACK post_message_thread(LPVOID arg) { HWND hWnd = arg; @@ -2641,11 +2651,98 @@ static DWORD CALLBACK post_message_thread(LPVOID arg) } static const char cls_name[] = "cowait_test_class"; + +static UINT cowait_msgs[100], cowait_msgs_first, cowait_msgs_last; + +static void cowait_msgs_reset(void) +{ + cowait_msgs_first = cowait_msgs_last = 0; +} + +#define cowait_msgs_expect_empty() _cowait_msgs_expect_empty(__LINE__) +static void _cowait_msgs_expect_empty(unsigned line) +{ + while(cowait_msgs_first < cowait_msgs_last) { + ok_(__FILE__,line)(0, "unexpected message %u\n", cowait_msgs[cowait_msgs_first]); + cowait_msgs_first++; + } + cowait_msgs_reset(); +} + +#define cowait_msgs_expect_notified(a) _cowait_msgs_expect_notified(__LINE__,a) +static void _cowait_msgs_expect_notified(unsigned line, UINT expected_msg) +{ + if(cowait_msgs_first == cowait_msgs_last) { + ok_(__FILE__,line)(0, "expected message %u, received none\n", expected_msg); + }else { + ok_(__FILE__,line)(cowait_msgs[cowait_msgs_first] == expected_msg, + "expected message %u, received %u \n", + expected_msg, cowait_msgs[cowait_msgs_first]); + cowait_msgs_first++; + } +} + +#define cowait_msgs_expect_queued(a,b) _cowait_msgs_expect_queued(__LINE__,a,b) +static void _cowait_msgs_expect_queued(unsigned line, HWND hwnd, UINT expected_msg) +{ + MSG msg; + BOOL success; + + success = PeekMessageA(&msg, hwnd, expected_msg, expected_msg, PM_REMOVE); + ok_(__FILE__,line)(success, "PeekMessageA failed: %u\n", GetLastError()); + if(success) + ok_(__FILE__,line)(msg.message == expected_msg, "unexpected message %u, expected %u\n", + msg.message, expected_msg); +} + +static void flush_messages(void) +{ + MSG msg; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )); +} + +static LRESULT CALLBACK cowait_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(cowait_msgs_last < sizeof(cowait_msgs)/sizeof(*cowait_msgs)) + cowait_msgs[cowait_msgs_last++] = msg; + if(msg == WM_DDE_FIRST) + return 6; + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD CALLBACK cowait_unmarshal_thread(void *arg) +{ + IStream *stream = arg; + IEnumOLEVERB *enum_verb; + LARGE_INTEGER zero; + IUnknown *unk; + HRESULT hr; + + CoInitialize(NULL); + + zero.QuadPart = 0; + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Seek failed: %08x\n", hr); + + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "CoUnmarshalInterface failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IEnumOLEVERB, (void**)&enum_verb); + ok(hr == S_OK, "QueryInterface failed: %08x\n", hr); + + IEnumOLEVERB_Release(enum_verb); + IUnknown_Release(unk); + + CoUninitialize(); + return 0; +} + static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) { - HANDLE *handles = arg; + HANDLE *handles = arg, event, thread; + IStream *stream; BOOL success; - DWORD index; + DWORD index, tid; HRESULT hr; HWND hWnd; UINT uMSG = 0xc065; @@ -2693,6 +2790,39 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DestroyWindow(hWnd); CoUninitialize(); + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + + hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + PostQuitMessage(66); + PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); + + hr = CoRegisterMessageFilter(&MessageFilter, NULL); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + + thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 50, 1, &event, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + hr = CoRegisterMessageFilter(NULL, NULL); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + + IStream_Release(stream); + + CloseHandle(event); + CoUninitialize(); return 0; } @@ -2716,7 +2846,7 @@ static void test_CoWaitForMultipleHandles(void) wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = NULL; wc.lpszClassName = cls_name; - wc.lpfnWndProc = DefWindowProcA; + wc.lpfnWndProc = cowait_window_proc; success = RegisterClassExA(&wc) != 0; ok(success, "RegisterClassExA failed %u\n", GetLastError()); @@ -2891,6 +3021,29 @@ static void test_CoWaitForMultipleHandles(void) ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); + cowait_msgs_reset(); + PostMessageA(hWnd, 0, 0, 0); + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_USER+1, 0, 0); + PostMessageA(hWnd, WM_DDE_FIRST+1, 0, 0); + thread = CreateThread(NULL, 0, send_and_post_user_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + + cowait_msgs_expect_notified(WM_DDE_FIRST); + cowait_msgs_expect_notified(WM_DDE_FIRST+1); + cowait_msgs_expect_notified(WM_USER); + cowait_msgs_expect_empty(); + cowait_msgs_expect_queued(hWnd, WM_USER); + cowait_msgs_expect_queued(hWnd, WM_USER+1); + flush_messages(); + + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + /* test behaviour of WM_QUIT (semaphores are still locked) */ PostMessageA(hWnd, WM_QUIT, 40, 0); @@ -2902,6 +3055,29 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); ok(!success, "PeekMessageA succeeded\n"); + cowait_msgs_reset(); + PostMessageA(hWnd, WM_QUIT, 40, 0); + PostMessageA(hWnd, 0, 0, 0); + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_USER+1, 0, 0); + PostMessageA(hWnd, WM_DDE_FIRST+1, 0, 0); + thread = CreateThread(NULL, 0, send_and_post_user_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + + cowait_msgs_expect_notified(WM_DDE_FIRST); + cowait_msgs_expect_notified(WM_DDE_FIRST+1); + cowait_msgs_expect_notified(WM_USER); + cowait_msgs_expect_empty(); + cowait_msgs_expect_queued(hWnd, WM_USER); + flush_messages(); + + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); PostMessageA(hWnd, WM_QUIT, 41, 0);

1 0

Nikolay Sivov : msxml3: Use IUri API to load documents.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: cdaf5625d13457489e1a9e673471d2c19f34471d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdaf5625d13457489e1a9e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 11:27:54 2018 +0300 msxml3: Use IUri API to load documents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 25 ++++++++-- dlls/msxml3/domdoc.c | 49 ++++++++---------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 118 ++++++++++++++++++++++++++++---------------- 4 files changed, 118 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cdaf5625d13457489e1a…

1 0

Nikolay Sivov : msxml3: Implement custom document importing callback.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 92513a9edd0d4cab1583dee4f69366d90250ba67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92513a9edd0d4cab1583dee4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 11:27:55 2018 +0300 msxml3: Implement custom document importing callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 1 + dlls/msxml3/main.c | 6 ++ dlls/msxml3/msxml_private.h | 12 ++- dlls/msxml3/node.c | 189 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 204 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 87a167e..ddd7565 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2308,6 +2308,7 @@ static HRESULT WINAPI domdoc_load( This->error = E_FAIL; else { + get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); This->properties->uri = uri; hr = This->error = S_OK; *isSuccessful = VARIANT_TRUE; diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1905f57..311fd66 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -39,6 +39,7 @@ # include <libxslt/xsltutils.h> # include <libxslt/variables.h> # include <libxslt/xsltInternals.h> +# include <libxslt/documents.h> # endif #endif @@ -176,6 +177,7 @@ DECL_FUNCPTR(xsltNextImport); DECL_FUNCPTR(xsltParseStylesheetDoc); DECL_FUNCPTR(xsltQuoteUserParams); DECL_FUNCPTR(xsltSaveResultTo); +DECL_FUNCPTR(xsltSetLoaderFunc); # undef DECL_FUNCPTR #endif @@ -202,10 +204,14 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); LOAD_FUNCPTR(xsltQuoteUserParams, 1); LOAD_FUNCPTR(xsltSaveResultTo, 1); + LOAD_FUNCPTR(xsltSetLoaderFunc, 1); #undef LOAD_FUNCPTR if (pxsltInit) pxsltInit(); + + pxsltSetLoaderFunc(xslt_doc_default_loader); + return; sym_not_found: diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8d7833b..1c05215 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -379,6 +379,12 @@ extern BSTR EnsureCorrectEOL(BSTR) DECLSPEC_HIDDEN; extern xmlChar* tagName_to_XPath(const BSTR tagName) DECLSPEC_HIDDEN; +#ifdef SONAME_LIBXSLT +# include <libxslt/documents.h> +extern xmlDocPtr xslt_doc_default_loader(const xmlChar *uri, xmlDictPtr dict, int options, + void *_ctxt, xsltLoadType type) DECLSPEC_HIDDEN; +#endif /* SONAME_LIBXSLT */ + static inline BSTR bstr_from_xmlChar(const xmlChar *str) { BSTR ret = NULL; @@ -395,12 +401,12 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) return ret; } -static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) +static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars, BOOL use_xml_alloc) { xmlChar *xmlstr; DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, nchars, NULL, 0, NULL, NULL ); - xmlstr = heap_alloc( len+1 ); + xmlstr = use_xml_alloc ? xmlMalloc( len + 1 ) : heap_alloc( len + 1 ); if ( xmlstr ) { WideCharToMultiByte( CP_UTF8, 0, str, nchars, (LPSTR) xmlstr, len+1, NULL, NULL ); @@ -411,7 +417,7 @@ static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) { - return xmlchar_from_wcharn(str, -1); + return xmlchar_from_wcharn(str, -1, FALSE); } static inline xmlChar *heap_strdupxmlChar(const xmlChar *str) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ece82ef..bcb4181 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -26,6 +26,7 @@ #ifdef HAVE_LIBXML2 # include <libxml/parser.h> +# include <libxml/parserInternals.h> # include <libxml/xmlerror.h> # include <libxml/HTMLtree.h> # ifdef SONAME_LIBXSLT @@ -39,6 +40,7 @@ # include <libxslt/variables.h> # include <libxslt/xsltutils.h> # include <libxslt/xsltInternals.h> +# include <libxslt/documents.h> # endif #endif @@ -1313,7 +1315,192 @@ static HRESULT node_transform_write_to_stream(xsltStylesheetPtr style, xmlDocPtr return hr; } -#endif +struct import_buffer +{ + char *data; + int cur; + int len; +}; + +static int XMLCALL import_loader_io_read(void *context, char *out, int len) +{ + struct import_buffer *buffer = (struct import_buffer *)context; + + TRACE("%p, %p, %d\n", context, out, len); + + if (buffer->cur == buffer->len) + return 0; + + len = min(len, buffer->len - buffer->cur); + memcpy(out, &buffer->data[buffer->cur], len); + buffer->cur += len; + + TRACE("read %d\n", len); + + return len; +} + +static int XMLCALL import_loader_io_close(void * context) +{ + struct import_buffer *buffer = (struct import_buffer *)context; + + TRACE("%p\n", context); + + heap_free(buffer->data); + heap_free(buffer); + return 0; +} + +static HRESULT import_loader_onDataAvailable(void *ctxt, char *ptr, DWORD len) +{ + xmlParserInputPtr *input = (xmlParserInputPtr *)ctxt; + xmlParserInputBufferPtr inputbuffer; + struct import_buffer *buffer; + + buffer = heap_alloc(sizeof(*buffer)); + + buffer->data = heap_alloc(len); + memcpy(buffer->data, ptr, len); + buffer->cur = 0; + buffer->len = len; + + inputbuffer = xmlParserInputBufferCreateIO(import_loader_io_read, import_loader_io_close, buffer, + XML_CHAR_ENCODING_NONE); + *input = xmlNewIOInputStream(ctxt, inputbuffer, XML_CHAR_ENCODING_NONE); + if (!*input) + xmlFreeParserInputBuffer(inputbuffer); + + return *input ? S_OK : E_FAIL; +} + +static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType type, IUri **doc_uri) +{ + xsltStylesheetPtr style = (xsltStylesheetPtr)_ctxt; + IUri *href_uri; + HRESULT hr; + BSTR uriW; + + *doc_uri = NULL; + + uriW = bstr_from_xmlChar(uri); + hr = CreateUri(uriW, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &href_uri); + SysFreeString(uriW); + if (FAILED(hr)) + { + WARN("Failed to create href uri, %#x.\n", hr); + return hr; + } + + if (type == XSLT_LOAD_STYLESHEET && style->doc && style->doc->name) + { + IUri *base_uri; + BSTR baseuriW; + + baseuriW = bstr_from_xmlChar((xmlChar *)style->doc->name); + hr = CreateUri(baseuriW, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &base_uri); + SysFreeString(baseuriW); + if (FAILED(hr)) + { + WARN("Failed to create base uri, %#x.\n", hr); + return hr; + } + + hr = CoInternetCombineIUri(base_uri, href_uri, 0, doc_uri, 0); + IUri_Release(base_uri); + if (FAILED(hr)) + WARN("Failed to combine uris, %#x.\n", hr); + } + else + { + *doc_uri = href_uri; + IUri_AddRef(*doc_uri); + } + + IUri_Release(href_uri); + + return hr; +} + +xmlDocPtr xslt_doc_default_loader(const xmlChar *uri, xmlDictPtr dict, int options, + void *_ctxt, xsltLoadType type) +{ + IUri *import_uri = NULL; + xmlParserInputPtr input; + xmlParserCtxtPtr pctxt; + xmlDocPtr doc = NULL; + IMoniker *moniker; + HRESULT hr; + bsc_t *bsc; + BSTR uriW; + + TRACE("%s, %p, %#x, %p, %d\n", debugstr_a((const char *)uri), dict, options, _ctxt, type); + + pctxt = xmlNewParserCtxt(); + if (!pctxt) + return NULL; + + if (dict && pctxt->dict) + { + xmlDictFree(pctxt->dict); + pctxt->dict = NULL; + } + + if (dict) + { + pctxt->dict = dict; + xmlDictReference(pctxt->dict); + } + + xmlCtxtUseOptions(pctxt, options); + + hr = xslt_doc_get_uri(uri, _ctxt, type, &import_uri); + if (FAILED(hr)) + goto failed; + + hr = CreateURLMonikerEx2(NULL, import_uri, &moniker, 0); + if (FAILED(hr)) + goto failed; + + hr = bind_url(moniker, import_loader_onDataAvailable, &input, &bsc); + IMoniker_Release(moniker); + if (FAILED(hr)) + goto failed; + + if (FAILED(detach_bsc(bsc))) + goto failed; + + if (!input) + goto failed; + + inputPush(pctxt, input); + xmlParseDocument(pctxt); + + if (pctxt->wellFormed) + { + doc = pctxt->myDoc; + /* Set imported uri, to give nested imports a chance. */ + if (IUri_GetPropertyBSTR(import_uri, Uri_PROPERTY_ABSOLUTE_URI, &uriW, 0) == S_OK) + { + doc->name = (char *)xmlchar_from_wcharn(uriW, SysStringLen(uriW), TRUE); + SysFreeString(uriW); + } + } + else + { + doc = NULL; + xmlFreeDoc(pctxt->myDoc); + pctxt->myDoc = NULL; + } + +failed: + xmlFreeParserCtxt(pctxt); + if (import_uri) + IUri_Release(import_uri); + + return doc; +} + +#endif /* SONAME_LIBXSLT */ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, ISequentialStream *stream, const struct xslprocessor_params *params)

1 0

Nikolay Sivov : msxml3: Register msxsl:node-set() extension function.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 5e947df1fe433ab69a1f90e8186411d8ae858ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e947df1fe433ab69a1f90e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 11:27:56 2018 +0300 msxml3: Register msxsl:node-set() extension function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 311fd66..0d056ea 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -40,6 +40,8 @@ # include <libxslt/variables.h> # include <libxslt/xsltInternals.h> # include <libxslt/documents.h> +# include <libxslt/extensions.h> +# include <libxslt/extra.h> # endif #endif @@ -172,10 +174,12 @@ DECL_FUNCPTR(xsltApplyStylesheetUser); DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltFreeStylesheet); DECL_FUNCPTR(xsltFreeTransformContext); +DECL_FUNCPTR(xsltFunctionNodeSet); DECL_FUNCPTR(xsltNewTransformContext); DECL_FUNCPTR(xsltNextImport); DECL_FUNCPTR(xsltParseStylesheetDoc); DECL_FUNCPTR(xsltQuoteUserParams); +DECL_FUNCPTR(xsltRegisterExtModuleFunction); DECL_FUNCPTR(xsltSaveResultTo); DECL_FUNCPTR(xsltSetLoaderFunc); # undef DECL_FUNCPTR @@ -199,10 +203,12 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltCleanupGlobals, 1); LOAD_FUNCPTR(xsltFreeStylesheet, 1); LOAD_FUNCPTR(xsltFreeTransformContext, 1); + LOAD_FUNCPTR(xsltFunctionNodeSet, 1); LOAD_FUNCPTR(xsltNewTransformContext, 1); LOAD_FUNCPTR(xsltNextImport, 1); LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); LOAD_FUNCPTR(xsltQuoteUserParams, 1); + LOAD_FUNCPTR(xsltRegisterExtModuleFunction, 1); LOAD_FUNCPTR(xsltSaveResultTo, 1); LOAD_FUNCPTR(xsltSetLoaderFunc, 1); #undef LOAD_FUNCPTR @@ -211,6 +217,10 @@ static void init_libxslt(void) pxsltInit(); pxsltSetLoaderFunc(xslt_doc_default_loader); + pxsltRegisterExtModuleFunction( + (const xmlChar *)"node-set", + (const xmlChar *)"urn:schemas-microsoft-com:xslt", + pxsltFunctionNodeSet); return;

1 0

Hans Leidekker : crypt32: Add a stub implementation of CertUnregisterPhysicalStore.
by Alexandre Julliard 23 Jan '18

23 Jan '18

Module: wine Branch: master Commit: 9bafbe10861149b117104f748c329b21eee97bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bafbe10861149b117104f74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 23 09:43:49 2018 +0100 crypt32: Add a stub implementation of CertUnregisterPhysicalStore. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 7 +++++++ include/wincrypt.h | 3 +++ 3 files changed, 11 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 00a2d62..fc0955e 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -92,6 +92,7 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) +@ stdcall CertUnregisterPhysicalStore(ptr long wstr) @ stdcall CertUnregisterSystemStore(ptr long) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 19eca22..91a3cbc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1384,6 +1384,13 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName) +{ + FIXME("(%p, %08x, %s): stub\n", pvSystemStore, dwFlags, debugstr_w(pwszStoreName)); + return TRUE; +} + BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 83db673..6986bd8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4090,6 +4090,9 @@ BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved); +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName); + BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags);

1 0