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

Jacek Caban : mshtml/tests: Rename elements.js to dom.js.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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: Include URL pathname and query in test traces.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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

Zhiyi Zhang : winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: cb350fc9798e86bb747f6716c5d0bd35b0df7694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb350fc9798e86bb747f6716… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 1 20:12:30 2019 +0800 winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW. This reduces some search time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f5ef65f..7ddaf1c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -46,6 +46,8 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; @@ -309,7 +311,7 @@ static void prepare_devices(HKEY video_hkey) DWORD i = 0; /* Remove all monitors */ - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiRemoveDevice(devinfo, &device_data)) @@ -326,7 +328,7 @@ static void prepare_devices(HKEY video_hkey) * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain * the same GUID for the same GPU. */ i = 0; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, @@ -344,7 +346,7 @@ static void cleanup_devices(void) DWORD i = 0; BOOL present; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { present = FALSE;

1 0

Zhiyi Zhang : user32: Specify enumerator when calling SetupDiGetClassDevsW.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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

Zhiyi Zhang : user32: Cache monitor information.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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

Alexandre Julliard : kernel32: Move event functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 558e48aafdcc55fb2b184a619dae35f58e4f6601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558e48aafdcc55fb2b184a61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 15:53:28 2019 +0200 kernel32: Move event functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +-- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/sync.c | 195 +---------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.h | 33 +++++ dlls/kernelbase/kernelbase.spec | 20 +-- dlls/kernelbase/security.c | 7 +- dlls/kernelbase/sync.c | 265 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 326 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=558e48aafdcc55fb2b18…

1 0

Alexandre Julliard : kernel32: Move mutex functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 93a5451152ae0a2ab7252bfc422abdabc62d9663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a5451152ae0a2ab7252bfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:05:17 2019 +0200 kernel32: Move mutex functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++--- dlls/kernel32/sync.c | 99 --------------------------------------- dlls/kernelbase/kernelbase.spec | 12 ++--- dlls/kernelbase/sync.c | 100 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93a5451152ae0a2ab725…

1 0

Alexandre Julliard : kernel32: Move semaphore functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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

Alexandre Julliard : kernel32: Move waitable timer functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

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