July 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : user32: Cache monitor information.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 95be042be3f116db38eb4a255c2667a6b46fcc1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95be042be3f116db38eb4a25… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 1 20:13:38 2019 +0800 user32: Cache monitor information. Multiple applications call EnumDisplayMonitors very frequently. Reduce most of the overhead by caching. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47431 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 181 +++++++++++++++++++++++++++++++----------------- 1 file changed, 116 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95be042be3f116db38eb…

1 0

Jacek Caban : mshtml: Include URL pathname and query in test traces.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 3ea7ef409821ebbc015e33e3dcd420e1822d295f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea7ef409821ebbc015e33e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:49 2019 +0200 mshtml: Include URL pathname and query in test traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 22 +++++++++++----------- dlls/mshtml/tests/winetest.js | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b2a9746..3704d39 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3405,7 +3405,7 @@ static void run_from_path(const char *path, const char *opt) strcat(buf, path); if(opt) - strcat(buf, opt); + sprintf(buf + strlen(buf), "?%s", opt); url = a2bstr(buf); hres = CreateURLMoniker(NULL, url, &mon); SysFreeString(url); @@ -3437,7 +3437,7 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co document_mode ? "\">" : "", script); - run_from_path("/index.html", opt); + run_from_path("/index.html", opt ? opt : script); } static void init_protocol_handler(void) @@ -3481,15 +3481,15 @@ static void run_js_tests(void) run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11"); - run_script_as_http_with_mode("documentmode.js", "?0", NULL); - run_script_as_http_with_mode("documentmode.js", "?5", "5"); - run_script_as_http_with_mode("documentmode.js", "?5", "6"); - run_script_as_http_with_mode("documentmode.js", "?7", "7"); - run_script_as_http_with_mode("documentmode.js", "?8", "8"); - run_script_as_http_with_mode("documentmode.js", "?9", "9"); - run_script_as_http_with_mode("documentmode.js", "?10", "10"); - run_script_as_http_with_mode("documentmode.js", "?11", "11"); - run_script_as_http_with_mode("documentmode.js", "?11", "edge"); + run_script_as_http_with_mode("documentmode.js", "0", NULL); + run_script_as_http_with_mode("documentmode.js", "5", "5"); + run_script_as_http_with_mode("documentmode.js", "5", "6"); + run_script_as_http_with_mode("documentmode.js", "7", "7"); + run_script_as_http_with_mode("documentmode.js", "8", "8"); + run_script_as_http_with_mode("documentmode.js", "9", "9"); + run_script_as_http_with_mode("documentmode.js", "10", "10"); + run_script_as_http_with_mode("documentmode.js", "11", "11"); + run_script_as_http_with_mode("documentmode.js", "11", "edge"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); } diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 0d4e6e4..2af1b33 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -42,11 +42,11 @@ function run_tests() { } function ok(b,m) { - return external.ok(b, m); + return external.ok(b, format_message(m)); } function trace(m) { - external.trace(m); + external.trace(format_message(m)); } function win_skip(m) { @@ -59,10 +59,19 @@ function reportSuccess() { var todo_wine = { ok: function(b,m) { - return external.todo_wine_ok(b,m); + return external.todo_wine_ok(b, format_message(m)); } }; function todo_wine_if(expr) { return expr ? todo_wine : { ok: ok }; } + +var file_prefix = document.location.pathname; +if(document.location.search) + file_prefix += document.location.search; +file_prefix += ": "; + +function format_message(msg) { + return file_prefix + msg; +}

1 0

Nikolay Sivov : mshtml: Add IHTMLDOMRange stub.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: c5d3ff58c637783e3e0ca1c0313de543bc1dce3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d3ff58c637783e3e0ca1c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 15:30:17 2019 +0200 mshtml: Add IHTMLDOMRange stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++++ 6 files changed, 483 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5d3ff58c637783e3e0c…

1 0

Jacek Caban : mshtml/tests: Rename elements.js to dom.js.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 9adb62cf8b141287c9911ac3d2741d04189e4ca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9adb62cf8b141287c9911ac3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:27 2019 +0200 mshtml/tests: Rename elements.js to dom.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/{elements.js => dom.js} | 0 dlls/mshtml/tests/rsrc.rc | 4 ++-- dlls/mshtml/tests/script.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/dom.js similarity index 100% rename from dlls/mshtml/tests/elements.js rename to dlls/mshtml/tests/dom.js diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 3ce867e..05bc836 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -49,8 +49,8 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" -/* @makedep: elements.js */ -elements.js HTML "elements.js" +/* @makedep: dom.js */ +dom.js HTML "dom.js" /* @makedep: es5.js */ es5.js HTML "es5.js" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e546649..b2a9746 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3475,7 +3475,7 @@ static void run_js_tests(void) run_script_as_http_with_mode("xhr.js", NULL, "9"); run_script_as_http_with_mode("xhr.js", NULL, "11"); - run_script_as_http_with_mode("elements.js", NULL, "11"); + run_script_as_http_with_mode("dom.js", NULL, "11"); run_script_as_http_with_mode("es5.js", NULL, "11"); run_script_as_http_with_mode("events.js", NULL, "9"); run_script_as_http_with_mode("navigation.js", NULL, NULL);

1 0

Zhiyi Zhang : user32: Specify enumerator when calling SetupDiGetClassDevsW.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: d4115033ef5cd875850b07074bcb483e7a34c632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4115033ef5cd875850b0707… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 1 20:13:13 2019 +0800 user32: Specify enumerator when calling SetupDiGetClassDevsW. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 12225a6..83450ee 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -283,7 +283,8 @@ static const WCHAR BACKSLASH[] = {'\\',0}; static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; -static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR ADAPTER_PREFIX[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -3748,7 +3749,7 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Use SetupAPI to get monitors */ mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) { SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, @@ -3892,7 +3893,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) { mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) { /* Inactive monitors don't get enumerated */ @@ -4062,10 +4063,10 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i else { /* Check adapter name */ - if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + if (strncmpiW( device, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX) )) goto done; - adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + adapter_index = strtolW( device + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW);

1 0

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 2eb40fab19e17f6edc4f0fb2dbda7eec9d4b16d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb40fab19e17f6edc4f0fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:40 2019 +0200 mshtml/tests: Improve tests exception handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/winetest.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index e5fe867..0d4e6e4 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -21,7 +21,12 @@ function guard(f) { try { f(); }catch(e) { - ok(false, "Got exception " + ("message" in e ? e.message : e)); + var msg = "Got exception "; + if(e && typeof(e) == "object" && "message") + msg += e.msg; + else + msg += e; + ok(false, msg); } }; }

1 0

Jacek Caban : mshtml/tests: Merge text range tests.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: daf62df9ecf6c73e421c55bfd41ebf3090879efe URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf62df9ecf6c73e421c55bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:28:16 2019 +0200 mshtml/tests: Merge text range tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c6efd3..7b02700 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -62,10 +62,6 @@ static const char doc_blank_ie9[] = "</html>"; static const char doc_str1[] = "<html><body>test</body></html>"; -static const char range_test_str[] = - "<html><body>test \nabc\t123 it's\r\n \ttext </body></html>"; -static const char range_test2_str[] = - "<html><body>abc<hr />123 <hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style id=\"styleid\">.body { margin-right: 0px; }</style>" "<meta id=\"metaid\" name=\"meta name\" http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" @@ -5675,6 +5671,8 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLElement *body; HRESULT hres; + set_body_html(doc, "test \nabc\t123 it's\r\n \ttext "); + body_range = test_create_body_range(doc); test_disp((IUnknown*)body_range, &IID_IHTMLTxtRange, NULL, "[object]"); @@ -5914,11 +5912,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(body_range); IHTMLElement_Release(body); -} - -static void test_txtrange2(IHTMLDocument2 *doc) -{ - IHTMLTxtRange *range; + set_body_html(doc, "<html><body>abc<hr />123 <hr />def</body></html>"); range = test_create_body_range(doc); @@ -11066,8 +11060,7 @@ START_TEST(dom) run_domtest(doc_str1, test_doc_elem); run_domtest(doc_str1, test_get_set_attr); - run_domtest(range_test_str, test_txtrange); - run_domtest(range_test2_str, test_txtrange2); + run_domtest(doc_blank, test_txtrange); if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2);

1 0

Alexandre Julliard : kernel32: Move timer queue functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: d33d05ce273151b980b52939a703fe35bee849fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33d05ce273151b980b52939… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:42:17 2019 +0200 kernel32: Move timer queue functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 ++-- dlls/kernel32/sync.c | 104 +--------------------------------------- dlls/kernelbase/kernelbase.spec | 10 ++-- dlls/kernelbase/sync.c | 61 +++++++++++++++++++++++ 4 files changed, 72 insertions(+), 113 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f371ad7..be9ed3f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -213,7 +213,7 @@ # @ stub CancelThreadpoolIo @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall -import CancelWaitableTimer(long) -@ stdcall ChangeTimerQueueTimer(ptr ptr long long) +@ stdcall -import ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckElevation # @ stub CheckElevationEnabled # @ stub CheckForReadOnlyResource @@ -335,8 +335,8 @@ @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @ stdcall CreateThreadpoolWait(ptr ptr ptr) @ stdcall CreateThreadpoolWork(ptr ptr ptr) -@ stdcall CreateTimerQueue () -@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) +@ stdcall -import CreateTimerQueue() +@ stdcall -import CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) @ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) @@ -369,8 +369,8 @@ # @ stub DisableThreadProfiling @ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback @ stdcall DeleteTimerQueue(long) -@ stdcall DeleteTimerQueueEx (long long) -@ stdcall DeleteTimerQueueTimer(long long long) +@ stdcall -import DeleteTimerQueueEx(long long) +@ stdcall -import DeleteTimerQueueTimer(long long long) @ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) @ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f12234d..5b8eef6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -682,40 +682,6 @@ HANDLE WINAPI OpenWaitableTimerA( DWORD access, BOOL inherit, LPCSTR name ) /*********************************************************************** - * CreateTimerQueue (KERNEL32.@) - */ -HANDLE WINAPI CreateTimerQueue(void) -{ - HANDLE q; - NTSTATUS status = RtlCreateTimerQueue(&q); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return NULL; - } - - return q; -} - - -/*********************************************************************** - * DeleteTimerQueueEx (KERNEL32.@) - */ -BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) -{ - NTSTATUS status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** * DeleteTimerQueue (KERNEL32.@) */ BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) @@ -724,81 +690,13 @@ BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) } /*********************************************************************** - * CreateTimerQueueTimer (KERNEL32.@) - * - * Creates a timer-queue timer. This timer expires at the specified due - * time (in ms), then after every specified period (in ms). When the timer - * expires, the callback function is called. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, - WAITORTIMERCALLBACK Callback, PVOID Parameter, - DWORD DueTime, DWORD Period, ULONG Flags ) -{ - NTSTATUS status = RtlCreateTimer(phNewTimer, TimerQueue, Callback, - Parameter, DueTime, Period, Flags); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** - * ChangeTimerQueueTimer (KERNEL32.@) - * - * Changes the times at which the timer expires. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, - ULONG DueTime, ULONG Period ) -{ - NTSTATUS status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - return TRUE; -} - -/*********************************************************************** * CancelTimerQueueTimer (KERNEL32.@) */ BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) { - FIXME("stub: %p %p\n", queue, timer); - return FALSE; + return DeleteTimerQueueTimer( queue, timer, NULL ); } -/*********************************************************************** - * DeleteTimerQueueTimer (KERNEL32.@) - * - * Cancels a timer-queue timer. - * - * RETURNS - * nonzero on success or zero on failure - */ -BOOL WINAPI DeleteTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, - HANDLE CompletionEvent ) -{ - NTSTATUS status = RtlDeleteTimer(TimerQueue, Timer, CompletionEvent); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} /* diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fb4559d..c81fd0e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -108,7 +108,7 @@ @ stub CancelThreadpoolIo @ stdcall CancelWaitableTimer(long) # @ stub CeipIsOptedIn -@ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer +@ stdcall ChangeTimerQueueTimer(ptr ptr long long) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) @@ -229,8 +229,8 @@ @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork -@ stdcall CreateTimerQueue() kernel32.CreateTimerQueue -@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) kernel32.CreateTimerQueueTimer +@ stdcall CreateTimerQueue() +@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateWaitableTimerExW(ptr wstr long long) @ stdcall CreateWaitableTimerW(ptr long wstr) @ stdcall CreateWellKnownSid(long ptr ptr ptr) @@ -257,8 +257,8 @@ # @ stub DeleteStateContainer # @ stub DeleteStateContainerValue # @ stub DeleteSynchronizationBarrier -@ stdcall DeleteTimerQueueEx(long long) kernel32.DeleteTimerQueueEx -@ stdcall DeleteTimerQueueTimer(long long long) kernel32.DeleteTimerQueueTimer +@ stdcall DeleteTimerQueueEx(long long) +@ stdcall DeleteTimerQueueTimer(long long long) @ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW @ stdcall DestroyPrivateObjectSecurity(ptr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 862dd0f..cd0348d 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -531,3 +531,64 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelWaitableTimer( HANDLE handle ) { return set_ntstatus( NtCancelTimer( handle, NULL )); } + + +/*********************************************************************** + * Timer queues + ***********************************************************************/ + + +/*********************************************************************** + * CreateTimerQueue (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateTimerQueue(void) +{ + HANDLE q; + NTSTATUS status = RtlCreateTimerQueue( &q ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status )); + return NULL; + } + return q; +} + + +/*********************************************************************** + * CreateTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateTimerQueueTimer( PHANDLE timer, HANDLE queue, + WAITORTIMERCALLBACK callback, PVOID arg, + DWORD when, DWORD period, ULONG flags ) +{ + return set_ntstatus( RtlCreateTimer( timer, queue, callback, arg, when, period, flags )); +} + + +/*********************************************************************** + * ChangeTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeTimerQueueTimer( HANDLE queue, HANDLE timer, + ULONG when, ULONG period ) +{ + return set_ntstatus( RtlUpdateTimer( queue, timer, when, period )); +} + + +/*********************************************************************** + * DeleteTimerQueueEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueEx( HANDLE queue, HANDLE event ) +{ + return set_ntstatus( RtlDeleteTimerQueueEx( queue, event )); +} + + +/*********************************************************************** + * DeleteTimerQueueTimer (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueTimer( HANDLE queue, HANDLE timer, HANDLE event ) +{ + return set_ntstatus( RtlDeleteTimer( queue, timer, event )); +}

1 0

Alexandre Julliard : kernel32: Move waitable timer functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 8c63d02d5f743ed07a2894b1d40ad1a08e0524ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c63d02d5f743ed07a2894b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:21:37 2019 +0200 kernel32: Move waitable timer functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++--- dlls/kernel32/sync.c | 105 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 12 ++--- dlls/kernelbase/sync.c | 98 +++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c63d02d5f743ed07a28…

1 0

Alexandre Julliard : kernel32: Move semaphore functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 591266881c4c14b913ac840ed0ae03c7e516e3d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591266881c4c14b913ac840e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:08:22 2019 +0200 kernel32: Move semaphore functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 ++--- dlls/kernel32/sync.c | 66 -------------------------------------- dlls/kernelbase/kernelbase.spec | 8 ++--- dlls/kernelbase/sync.c | 70 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 74 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4868df8..1b5a0ae 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -320,8 +320,8 @@ @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreExA(ptr long long str long long) -@ stdcall CreateSemaphoreExW(ptr long long wstr long long) -@ stdcall CreateSemaphoreW(ptr long long wstr) +@ stdcall -import CreateSemaphoreExW(ptr long long wstr long long) +@ stdcall -import CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() @ stdcall CreateSymbolicLinkA(str str long) # @ stub CreateSymbolicLinkTransactedA @@ -1128,7 +1128,7 @@ # @ stub OpenProcessToken @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) -@ stdcall OpenSemaphoreW(long long wstr) +@ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) # @ stub OpenThreadToken @ stdcall -i386 OpenVxDHandle(long) @@ -1258,7 +1258,7 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall -import ReleaseMutex(long) @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) ntdll.TpCallbackReleaseMutexOnCompletion -@ stdcall ReleaseSemaphore(long long ptr) +@ stdcall -import ReleaseSemaphore(long long ptr) @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6bfcfee..1303ea4 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -453,15 +453,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG /*********************************************************************** - * CreateSemaphoreW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCWSTR name ) -{ - return CreateSemaphoreExW( sa, initial, max, name, 0, SEMAPHORE_ALL_ACCESS ); -} - - -/*********************************************************************** * CreateSemaphoreExA (KERNEL32.@) */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, @@ -481,28 +472,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LON /*********************************************************************** - * CreateSemaphoreExW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, - LPCWSTR name, DWORD flags, DWORD access ) -{ - HANDLE ret = 0; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - get_create_object_attributes( &attr, &nameW, sa, name ); - - status = NtCreateSemaphore( &ret, access, &attr, initial, max ); - if (status == STATUS_OBJECT_NAME_EXISTS) - SetLastError( ERROR_ALREADY_EXISTS ); - else - SetLastError( RtlNtStatusToDosError(status) ); - return ret; -} - - -/*********************************************************************** * OpenSemaphoreA (KERNEL32.@) */ HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name ) @@ -520,41 +489,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreA( DWORD access, BOOL inherit, LPCS } -/*********************************************************************** - * OpenSemaphoreW (KERNEL32.@) - */ -HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) -{ - HANDLE ret; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - if (!is_version_nt()) access = SEMAPHORE_ALL_ACCESS; - - if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; - - status = NtOpenSemaphore( &ret, access, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - - -/*********************************************************************** - * ReleaseSemaphore (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous ) -{ - NTSTATUS status = NtReleaseSemaphore( handle, count, (PULONG)previous ); - if (status) SetLastError( RtlNtStatusToDosError(status) ); - return !status; -} - - /* * Jobs */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f0c87ae..dca79c4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -214,8 +214,8 @@ @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) -@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW -@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) +@ stdcall CreateSemaphoreW(ptr long long wstr) # @ stub CreateStateAtom # @ stub CreateStateChangeNotification # @ stub CreateStateContainer @@ -994,7 +994,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) @ stub OpenRegKey -@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenSemaphoreW(long long wstr) # @ stub OpenState # @ stub OpenStateAtom # @ stub OpenStateExplicit @@ -1328,7 +1328,7 @@ @ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns @ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared -@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ReleaseSemaphore(long long ptr) @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns # @ stub ReleaseStateLock @ stdcall RemapPredefinedHandleInternal(long long) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index ebbb209..58d62ed 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -363,3 +363,73 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReleaseMutex( HANDLE handle ) { return set_ntstatus( NtReleaseMutant( handle, NULL )); } + + +/*********************************************************************** + * Semaphores + ***********************************************************************/ + + +/*********************************************************************** + * CreateSemaphoreW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, + LONG max, LPCWSTR name ) +{ + return CreateSemaphoreExW( sa, initial, max, name, 0, SEMAPHORE_ALL_ACCESS ); +} + + +/*********************************************************************** + * CreateSemaphoreExW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, + LPCWSTR name, DWORD flags, DWORD access ) +{ + HANDLE ret = 0; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + get_create_object_attributes( &attr, &nameW, sa, name ); + + status = NtCreateSemaphore( &ret, access, &attr, initial, max ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); + return ret; +} + + +/*********************************************************************** + * OpenSemaphoreW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) +{ + HANDLE ret; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + if (!is_version_nt()) access = SEMAPHORE_ALL_ACCESS; + + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; + + status = NtOpenSemaphore( &ret, access, &attr ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + return ret; +} + + +/*********************************************************************** + * ReleaseSemaphore (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous ) +{ + return set_ntstatus( NtReleaseSemaphore( handle, count, (PULONG)previous )); +}

1 0