October 2021 - Wine-Commits

Rémi Bernon : winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: de7032816bd71d0edda30a78721e79b5b6af735c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de7032816bd71d0edda30a78… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 09:59:12 2021 +0200 winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field. These contain the bluetooth dongle VID / PID instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2ed9a031af6..b857ba25df8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1085,12 +1085,12 @@ static const struct hid_device_vtbl lnxev_device_vtbl = }; #endif /* HAS_PROPER_INPUT_HEADER */ -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc, + int *bus) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[MAX_PATH]; - DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1121,16 +1121,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || desc->vid || desc->pid) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); + if (*bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", bus, &desc->vid, &desc->pid); } - if (!strncmp(ptr, "PRODUCT=", 8)) + if (!strncmp(ptr, "PRODUCT=", 8) && *bus != BUS_BLUETOOTH) { if (desc->version) continue; if (!strcmp(subsystem, "usb")) sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", bus, &desc->vid, &desc->pid, &desc->version); } } } @@ -1154,7 +1154,7 @@ static void udev_add_device(struct udev_device *dev) struct base_device *impl; const char *subsystem; const char *devnode; - int fd; + int fd, bus = 0; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1176,9 +1176,9 @@ static void udev_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &desc); - get_device_subsystem_info(dev, "input", &desc); - get_device_subsystem_info(dev, "usb", &desc); + get_device_subsystem_info(dev, "hid", &desc, &bus); + get_device_subsystem_info(dev, "input", &desc, &bus); + get_device_subsystem_info(dev, "usb", &desc, &bus); subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw"))

1 0

Jacek Caban : ntdll: Move error mapping to a header file.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 116cf7dfcbc2957f46c860f66b86243f2ab4426a URL: https://source.winehq.org/git/wine.git/?a=commit;h=116cf7dfcbc2957f46c860f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:30:48 2021 +0200 ntdll: Move error mapping to a header file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 1656 +---------------------------------------------- dlls/ntdll/error.h | 1672 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/make_errors | 2 +- 3 files changed, 1674 insertions(+), 1656 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=116cf7dfcbc2957f46c8…

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLDocument's toString using dispex_to_string.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 6f78047199ca709724427e4a68d715ae01965da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f78047199ca709724427e4a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 8 20:30:54 2021 +0300 mshtml: Implement HTMLDocument's toString using dispex_to_string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 12fce6d3015..d2caaef2741 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1703,12 +1703,7 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(L"[object]"); - return *String ? S_OK : E_OUTOFMEMORY; - + return dispex_to_string(&This->doc_node->node.event_target.dispex, String); } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2c11744c848..7f7fe879662 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -210,6 +210,7 @@ sync_test("builtin_toString", function() { if(clientRects) test("clientRect", clientRects[0], "ClientRect"); if(clientRects) test("clientRects", clientRects, "ClientRectList"); if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties"); + if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument"); test("elements", document.getElementsByTagName("body"), "HTMLCollection"); test("history", window.history, "History"); test("implementation", document.implementation, "DOMImplementation");

1 0

Rémi Bernon : dinput8/tests: Add some more polled read tests.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 12dc52cd4aeadfebe6021d0762b04eedd4c01a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dc52cd4aeadfebe6021d07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:22 2021 +0200 dinput8/tests: Add some more polled read tests. Showing that we should probably not queue reports in this mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cdb19808fcd..7f933df3b06 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2174,6 +2174,40 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + value = 10; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &value, sizeof(ULONG), NULL, NULL ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + todo_wine + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); }

1 0

Gabriel Ivăncescu : mshtml/tests: Add tests for mimeTypes and plugins objects' names.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 671fe6f62a7ece621a239a93e03fdf4698174d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=671fe6f62a7ece621a239a93… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 8 20:30:55 2021 +0300 mshtml/tests: Add tests for mimeTypes and plugins objects' names. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7f7fe879662..3307f2c1848 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -216,10 +216,12 @@ sync_test("builtin_toString", function() { test("implementation", document.implementation, "DOMImplementation"); if(localStorage) test("localStorage", localStorage, "Storage"); test("location", window.location, "Object", window.location.href); + if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray"); test("navigator", window.navigator, "Navigator"); test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); test("performanceTiming", window.performance.timing, "PerformanceTiming"); + if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray"); test("screen", window.screen, "Screen"); test("sessionStorage", window.sessionStorage, "Storage"); test("style", document.body.style, "MSStyleCSSProperties");

1 0

Jacek Caban : ntdll: Export RtlNtStatusToDosError from Unix lib.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 8f31eb1edb06edc1efc81d3c39426aab3b31cbb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f31eb1edb06edc1efc81d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:32:12 2021 +0200 ntdll: Export RtlNtStatusToDosError from Unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 13bf85d2eb6..24f4fa5a588 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -59,6 +59,7 @@ #include "wine/condrv.h" #include "wine/debug.h" #include "unix_private.h" +#include "error.h" WINE_DEFAULT_DEBUG_CHANNEL(environ); @@ -2461,16 +2462,25 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) return STATUS_SUCCESS; } +/********************************************************************** + * RtlUpcaseUnicodeChar (ntdll.so) + */ WCHAR WINAPI RtlUpcaseUnicodeChar( WCHAR wch ) { return ntdll_towupper( wch ); } +/********************************************************************** + * RtlDowncaseUnicodeChar (ntdll.so) + */ WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) { return ntdll_towlower( wch ); } +/********************************************************************** + * RtlUTF8ToUnicodeN (ntdll.so) + */ NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) { unsigned int res, len; @@ -2527,3 +2537,20 @@ NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, cons *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); return status; } + +/********************************************************************** + * RtlNtStatusToDosError (ntdll.so) + */ +ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) +{ + NtCurrentTeb()->LastStatusValue = status; + + if (!status || (status & 0x20000000)) return status; + if ((status & 0xf0000000) == 0xd0000000) status &= ~0x10000000; + + /* now some special cases */ + if (HIWORD(status) == 0xc001 || HIWORD(status) == 0x8007 || HIWORD(status) == 0xc007) + return LOWORD( status ); + + return map_status( status ); +}

1 0

David Kahurani : winedump: Remove a FIXME.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 3dea31ed06df6c402d4e5645517f2ebd2778ca79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dea31ed06df6c402d4e5645… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Oct 12 15:31:17 2021 +0300 winedump: Remove a FIXME. It is not considered worthwhile freeing memory in short-lived programs Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msmangle.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d22f4715937..ee7b033f757 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -531,7 +531,6 @@ static char *demangle_datatype (char **str, compound_type *ct, if (*iter == '6') { int sub_expressions = 0; - /* FIXME: there are tons of memory leaks here */ /* FIXME: this is still broken in some cases and it has to be * merged with the function prototype parsing above... */

1 0

Jacek Caban : win32u/tests: Add NtUserCloseWindowStation test.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: c05704c7130370c54b85c1c387a6da30bc16c7eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05704c7130370c54b85c1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:33:30 2021 +0200 win32u/tests: Add NtUserCloseWindowStation test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/win32u/tests/Makefile.in | 5 +++++ dlls/win32u/tests/win32u.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/configure b/configure index 7f863aa38c0..d9dfe3e9c89 100755 --- a/configure +++ b/configure @@ -20773,6 +20773,7 @@ wine_fn_config_makefile dlls/wiaservc/tests enable_tests wine_fn_config_makefile dlls/wimgapi enable_wimgapi wine_fn_config_makefile dlls/win32s16.dll16 enable_win16 wine_fn_config_makefile dlls/win32u enable_win32u +wine_fn_config_makefile dlls/win32u/tests enable_tests wine_fn_config_makefile dlls/win87em.dll16 enable_win16 wine_fn_config_makefile dlls/winaspi.dll16 enable_win16 wine_fn_config_makefile dlls/windebug.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 1821feefa49..44f8a1e2af6 100644 --- a/configure.ac +++ b/configure.ac @@ -3659,6 +3659,7 @@ WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) WINE_CONFIG_MAKEFILE(dlls/wimgapi) WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win32u) +WINE_CONFIG_MAKEFILE(dlls/win32u/tests) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in new file mode 100644 index 00000000000..c0fa70e4e08 --- /dev/null +++ b/dlls/win32u/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = win32u.dll +IMPORTS = user32 win32u + +C_SRCS = \ + win32u.c diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c new file mode 100644 index 00000000000..2f5014b80b4 --- /dev/null +++ b/dlls/win32u/tests/win32u.c @@ -0,0 +1,42 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +#include "winbase.h" +#include "ntuser.h" + + +static void test_NtUserCloseWindowStation(void) +{ + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = NtUserCloseWindowStation( 0 ); + ok( !ret && GetLastError() == ERROR_INVALID_HANDLE, + "NtUserCloseWindowStation returned %x %u\n", ret, GetLastError() ); +} + + +START_TEST(win32u) +{ + /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ + GetDesktopWindow(); + + test_NtUserCloseWindowStation(); +}

1 0

Jacek Caban : win32u: Move NtUserCloseWindowStation from user32.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: d7ae3591ec29a86b263f376c05311edd48a5d812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ae3591ec29a86b263f376c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 16:42:35 2021 +0200 win32u: Move NtUserCloseWindowStation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/winstation.c | 16 ---------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/Makefile.in | 3 ++- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 35 +++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntuser.h | 27 +++++++++++++++++++++++++++ 13 files changed, 119 insertions(+), 22 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6f0f58a5f3f..7e6b660b8af 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4335,7 +4335,7 @@ static BOOL CALLBACK bcast_winsta( LPWSTR winsta, LPARAM lp ) return TRUE; ((BroadcastParm *)lp)->winsta = hwinsta; ret = EnumDesktopsW( hwinsta, bcast_desktop, lp ); - CloseWindowStation( hwinsta ); + NtUserCloseWindowStation( hwinsta ); TRACE("-->%d\n", ret); return ret; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d5f1bc4145..21b45c911d1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -77,7 +77,7 @@ @ stdcall CloseDesktop(long) @ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) -@ stdcall CloseWindowStation(long) +@ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @ stdcall CopyAcceleratorTableW(long ptr long) @ stdcall CopyIcon(long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0be02919bbe..5c01006565c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" +#include "ntuser.h" #include "winreg.h" #include "winternl.h" #include "hidusage.h" diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 95a9eb85099..057f0d75cb8 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -203,22 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces } -/*********************************************************************** - * CloseWindowStation (USER32.@) - */ -BOOL WINAPI CloseWindowStation( HWINSTA handle ) -{ - BOOL ret; - SERVER_START_REQ( close_winstation ) - { - req->handle = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /****************************************************************************** * GetProcessWindowStation (USER32.@) */ diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 38109f8bc11..feb1e6a3eb2 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -37,6 +37,7 @@ C_SRCS = \ syscall.c \ vertical.c \ vulkan.c \ + winstation.c \ wrappers.c font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index eaff8cb639a..596ec6bbba3 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winnt.h" #include "ntgdi_private.h" +#include "ntuser.h" #include "wine/unixlib.h" @@ -93,6 +94,7 @@ static void * const syscalls[] = NtGdiSetVirtualResolution, NtGdiSwapBuffers, NtGdiTransformPoints, + NtUserCloseWindowStation, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 396b67ede5a..92f9a143800 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -795,7 +795,7 @@ @ stub NtUserClipCursor @ stub NtUserCloseClipboard @ stub NtUserCloseDesktop -@ stub NtUserCloseWindowStation +@ stdcall -syscall NtUserCloseWindowStation(long) @ stub NtUserCompositionInputSinkLuidFromPoint @ stub NtUserCompositionInputSinkViewInstanceIdFromPoint @ stub NtUserConfigureActivationObject diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c new file mode 100644 index 00000000000..f50464f856d --- /dev/null +++ b/dlls/win32u/winstation.c @@ -0,0 +1,45 @@ +/* + * Window stations and desktops + * + * Copyright 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntuser.h" +#include "winternl.h" +#include "wine/server.h" + +/*********************************************************************** + * NtUserCloseWindowStation (win32u.@) + */ +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ) +{ + BOOL ret; + SERVER_START_REQ( close_winstation ) + { + req->handle = wine_server_obj_handle( handle ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index 9445182af5c..99301c4edf1 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -5,4 +5,5 @@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f200000 C_SRCS = \ gdi.c \ - syscall.c + syscall.c \ + user.c diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 880c840ea02..276c83474fe 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -80,6 +80,7 @@ SYSCALL_ENTRY( NtGdiSetTextJustification ) \ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ - SYSCALL_ENTRY( NtGdiTransformPoints ) + SYSCALL_ENTRY( NtGdiTransformPoints ) \ + SYSCALL_ENTRY( NtUserCloseWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c new file mode 100644 index 00000000000..7370a3d4940 --- /dev/null +++ b/dlls/wow64win/user.c @@ -0,0 +1,35 @@ +/* + * WoW64 User functions + * + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "ntuser.h" +#include "wow64win_private.h" + +NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) +{ + HWINSTA handle = get_handle( &args ); + + return NtUserCloseWindowStation( handle ); +} diff --git a/include/Makefile.in b/include/Makefile.in index eac1c2e0570..ef4a6d55558 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -551,6 +551,7 @@ SOURCES = \ ntsecapi.h \ ntsecpkg.h \ ntstatus.h \ + ntuser.h \ oaidl.idl \ objbase.h \ objectarray.idl \ diff --git a/include/ntuser.h b/include/ntuser.h new file mode 100644 index 00000000000..8b09f732ecd --- /dev/null +++ b/include/ntuser.h @@ -0,0 +1,27 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTUSER_ +#define _NTUSER_ + +#include <winuser.h> +#include <winternl.h> + +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); + +#endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Use syscall interface for some path functions.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 3d978e4c4e2d39cac7ad1fa1221548fe4cd3c492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d978e4c4e2d39cac7ad1fa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:28:52 2021 +0200 win32u: Use syscall interface for some path functions. 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/win32u/gdiobj.c | 3 --- dlls/win32u/syscall.c | 3 +++ dlls/win32u/win32u.spec | 6 +++--- dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 15 --------------- dlls/wow64win/gdi.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 3 +++ 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4a6af99c94a..4f6304ad883 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1107,7 +1107,6 @@ static struct unix_funcs unix_funcs = NtGdiExtSelectClipRgn, NtGdiFillPath, NtGdiFillRgn, - NtGdiFlattenPath, NtGdiFontIsLinked, NtGdiFrameRgn, NtGdiGetAndSetDCDword, @@ -1126,7 +1125,6 @@ static struct unix_funcs unix_funcs = NtGdiGetKerningPairs, NtGdiGetNearestColor, NtGdiGetOutlineTextMetricsInternalW, - NtGdiGetPath, NtGdiGetPixel, NtGdiGetRandomRgn, NtGdiGetRasterizerCaps, @@ -1147,7 +1145,6 @@ static struct unix_funcs unix_funcs = NtGdiOffsetClipRgn, NtGdiOpenDCW, NtGdiPatBlt, - NtGdiPathToRegion, NtGdiPlgBlt, NtGdiPolyDraw, NtGdiPolyPolyDraw, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 99db48f27ec..e1c94b0c210 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -55,6 +55,7 @@ static void * const syscalls[] = NtGdiEqualRgn, NtGdiExtCreateRegion, NtGdiExtGetObjectW, + NtGdiFlattenPath, NtGdiFlush, NtGdiGetBitmapBits, NtGdiGetBitmapDimension, @@ -63,12 +64,14 @@ static void * const syscalls[] = NtGdiGetFontFileData, NtGdiGetFontFileInfo, NtGdiGetNearestPaletteIndex, + NtGdiGetPath, NtGdiGetRegionData, NtGdiGetRgnBox, NtGdiGetSystemPaletteUse, NtGdiGetTransform, NtGdiHfontCreate, NtGdiOffsetRgn, + NtGdiPathToRegion, NtGdiPtInRegion, NtGdiRectInRegion, NtGdiRemoveFontMemResourceEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8bd29d33f8b..a2b864f65bb 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -435,7 +435,7 @@ @ stub NtGdiFONTOBJ_vGetInfo @ stdcall NtGdiFillPath(long) @ stdcall NtGdiFillRgn(long long long) -@ stdcall NtGdiFlattenPath(long) +@ stdcall -syscall NtGdiFlattenPath(long) @ stdcall -syscall NtGdiFlush() @ stdcall NtGdiFontIsLinked(long) @ stub NtGdiForceUFIMapping @@ -497,7 +497,7 @@ @ stub NtGdiGetOPMRandomNumber @ stub NtGdiGetObjectBitmapHandle @ stdcall NtGdiGetOutlineTextMetricsInternalW(long long ptr long) -@ stdcall NtGdiGetPath(long ptr ptr long) +@ stdcall -syscall NtGdiGetPath(long ptr ptr long) @ stub NtGdiGetPerBandInfo @ stub NtGdiGetPhysicalMonitorDescription @ stub NtGdiGetPhysicalMonitors @@ -554,7 +554,7 @@ @ stub NtGdiPATHOBJ_vEnumStartClipLines @ stub NtGdiPATHOBJ_vGetBounds @ stdcall NtGdiPatBlt(long long long long long long) -@ stdcall NtGdiPathToRegion(long) +@ stdcall -syscall NtGdiPathToRegion(long) @ stdcall NtGdiPlgBlt(long ptr long long long long long long long long long) @ stdcall NtGdiPolyDraw(long ptr ptr long) @ stub NtGdiPolyPatBlt diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1cf7c66b1b0..e7bfe13b2df 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -99,7 +99,6 @@ struct unix_funcs INT (WINAPI *pNtGdiExtSelectClipRgn)( HDC hdc, HRGN region, INT mode ); BOOL (WINAPI *pNtGdiFillPath)( HDC hdc ); BOOL (WINAPI *pNtGdiFillRgn)( HDC hdc, HRGN hrgn, HBRUSH hbrush ); - BOOL (WINAPI *pNtGdiFlattenPath)( HDC hdc ); BOOL (WINAPI *pNtGdiFontIsLinked)( HDC hdc ); BOOL (WINAPI *pNtGdiFrameRgn)( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height ); BOOL (WINAPI *pNtGdiGetAndSetDCDword)( HDC hdc, UINT method, DWORD value, DWORD *result ); @@ -126,7 +125,6 @@ struct unix_funcs COLORREF (WINAPI *pNtGdiGetNearestColor)( HDC hdc, COLORREF color ); UINT (WINAPI *pNtGdiGetOutlineTextMetricsInternalW)( HDC hdc, UINT cbData, OUTLINETEXTMETRICW *otm, ULONG opts ); - INT (WINAPI *pNtGdiGetPath)( HDC hdc, POINT *points, BYTE *types, INT size ); COLORREF (WINAPI *pNtGdiGetPixel)( HDC hdc, INT x, INT y ); INT (WINAPI *pNtGdiGetRandomRgn)( HDC hdc, HRGN region, INT code ); BOOL (WINAPI *pNtGdiGetRasterizerCaps)( RASTERIZER_STATUS *status, UINT size ); @@ -153,7 +151,6 @@ struct unix_funcs UNICODE_STRING *output, ULONG type, BOOL is_display, HANDLE hspool, DRIVER_INFO_2W *driver_info, void *pdev ); BOOL (WINAPI *pNtGdiPatBlt)( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); - HRGN (WINAPI *pNtGdiPathToRegion)( HDC hdc ); BOOL (WINAPI *pNtGdiPlgBlt)( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e4bfe6f172f..957646dc7c3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -195,11 +195,6 @@ BOOL WINAPI NtGdiFillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) return unix_funcs->pNtGdiFillRgn( hdc, hrgn, hbrush ); } -BOOL WINAPI NtGdiFlattenPath( HDC hdc ) -{ - return unix_funcs->pNtGdiFlattenPath( hdc ); -} - BOOL WINAPI NtGdiFontIsLinked( HDC hdc ) { return unix_funcs->pNtGdiFontIsLinked( hdc ); @@ -299,11 +294,6 @@ UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, return unix_funcs->pNtGdiGetOutlineTextMetricsInternalW( hdc, cbData, otm, opts ); } -INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ) -{ - return unix_funcs->pNtGdiGetPath( hdc, points, types, size ); -} - COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ) { return unix_funcs->pNtGdiGetPixel( hdc, x, y ); @@ -412,11 +402,6 @@ BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWOR return unix_funcs->pNtGdiPatBlt( hdc, left, top, width, height, rop ); } -HRGN WINAPI NtGdiPathToRegion( HDC hdc ) -{ - return unix_funcs->pNtGdiPathToRegion( hdc ); -} - BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 5f32a65c2fd..daba653f214 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -511,6 +511,30 @@ NTSTATUS WINAPI wow64_NtGdiSetMagicColors( UINT *args ) return NtGdiSetMagicColors( hdc, magic, index ); } +NTSTATUS WINAPI wow64_NtGdiGetPath( UINT *args ) +{ + HDC hdc = get_handle( &args ); + POINT *points = get_ptr( &args ); + BYTE *types = get_ptr( &args ); + INT size = get_ulong( &args ); + + return NtGdiGetPath( hdc, points, types, size ); +} + +NTSTATUS WINAPI wow64_NtGdiPathToRegion( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return HandleToUlong( NtGdiPathToRegion( hdc )); +} + +NTSTATUS WINAPI wow64_NtGdiFlattenPath( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return NtGdiFlattenPath( hdc ); +} + NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) { return NtGdiFlush(); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 143fd1f97ae..a5a38548f5e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -43,6 +43,7 @@ SYSCALL_ENTRY( NtGdiEqualRgn ) \ SYSCALL_ENTRY( NtGdiExtCreateRegion ) \ SYSCALL_ENTRY( NtGdiExtGetObjectW ) \ + SYSCALL_ENTRY( NtGdiFlattenPath ) \ SYSCALL_ENTRY( NtGdiFlush ) \ SYSCALL_ENTRY( NtGdiGetBitmapBits ) \ SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \ @@ -51,12 +52,14 @@ SYSCALL_ENTRY( NtGdiGetFontFileData ) \ SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \ SYSCALL_ENTRY( NtGdiGetNearestPaletteIndex ) \ + SYSCALL_ENTRY( NtGdiGetPath ) \ SYSCALL_ENTRY( NtGdiGetRegionData ) \ SYSCALL_ENTRY( NtGdiGetRgnBox ) \ SYSCALL_ENTRY( NtGdiGetSystemPaletteUse ) \ SYSCALL_ENTRY( NtGdiGetTransform ) \ SYSCALL_ENTRY( NtGdiHfontCreate ) \ SYSCALL_ENTRY( NtGdiOffsetRgn ) \ + SYSCALL_ENTRY( NtGdiPathToRegion ) \ SYSCALL_ENTRY( NtGdiPtInRegion ) \ SYSCALL_ENTRY( NtGdiRectInRegion ) \ SYSCALL_ENTRY( NtGdiRemoveFontMemResourceEx ) \

1 0