October 2021 - Wine-Commits

Rémi Bernon : winebus.sys: Keep a separate report buffer for each input report id.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 068511f8cb8620514928ae639d190ea60f007b6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=068511f8cb8620514928ae63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 10:01:24 2021 +0200 winebus.sys: Keep a separate report buffer for each input report id. And use them for IOCTL_HID_GET_INPUT_REPORT ioctls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 541f9052ed3..57a751655cc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -76,6 +76,7 @@ struct device_extension ULONG report_desc_length; HIDP_DEVICE_DESC collection_desc; + BYTE *last_reports[256]; BYTE *last_report; DWORD last_report_size; BOOL last_report_read; @@ -444,6 +445,9 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length ext->last_report_size = length; ext->last_report_read = FALSE; + if (!ext->collection_desc.ReportIDs[0].ReportID) memcpy(ext->last_reports[0], report, length); + else memcpy(ext->last_reports[report[0]], report, length); + if ((irp = pop_pending_read(ext))) { stack = IoGetCurrentIrpStackLocation(irp); @@ -815,6 +819,8 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) struct device_extension *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + HIDP_REPORT_IDS *reports; + ULONG i, size; TRACE("device %p, irp %p, minor function %#x.\n", device, irp, irpsp->MinorFunction); @@ -849,8 +855,14 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) ERR("Failed to parse device %p report descriptor, status %#x\n", device, status); else { - ext->state = DEVICE_STATE_STARTED; status = STATUS_SUCCESS; + reports = ext->collection_desc.ReportIDs; + for (i = 0; i < ext->collection_desc.ReportIDsLength; ++i) + { + if (!(size = reports[i].InputLength)) continue; + if (!(ext->last_reports[reports[i].ReportID] = RtlAllocateHeap(GetProcessHeap(), 0, size))) status = STATUS_NO_MEMORY; + } + if (!status) ext->state = DEVICE_STATE_STARTED; } } RtlLeaveCriticalSection(&ext->cs); @@ -878,6 +890,12 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); + reports = ext->collection_desc.ReportIDs; + for (i = 0; i < ext->collection_desc.ReportIDsLength; ++i) + { + if (!reports[i].InputLength) continue; + RtlFreeHeap(GetProcessHeap(), 0, ext->last_reports[reports[i].ReportID]); + } HidP_FreeCollectionDescription(&ext->collection_desc); RtlFreeHeap(GetProcessHeap(), 0, ext->report_desc); @@ -1020,14 +1038,10 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_GET_INPUT_REPORT: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_GET_INPUT_REPORT\n"); - irp->IoStatus.Status = deliver_last_report(ext, - packet->reportBufferLen, packet->reportBuffer, - &irp->IoStatus.Information); - - if (irp->IoStatus.Status == STATUS_SUCCESS) - packet->reportBufferLen = irp->IoStatus.Information; + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; break; } case IOCTL_HID_READ_REPORT:

1 0

Huw Davies : ntdll: Return a failure if the unix call funcs don't exist.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 5689ec7bbaecaefde3f7cce9f3408ad607fc3375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5689ec7bbaecaefde3f7cce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 8 11:10:52 2021 +0100 ntdll: Return a failure if the unix call funcs don't exist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 924aa78b306..6db08de6473 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -642,7 +642,7 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) { if (builtin->module != module) continue; *funcs = dlsym( builtin->unix_handle, ptr_name ); - status = STATUS_SUCCESS; + status = *funcs ? STATUS_SUCCESS : STATUS_ENTRYPOINT_NOT_FOUND; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Jacek Caban : gdi32: Rename gdidc.c to dc.c.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 5a66203ba5f1e34c9ac700f626024a0b976a0475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a66203ba5f1e34c9ac700f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 13:34:02 2021 +0200 gdi32: Rename gdidc.c to dc.c. 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/gdi32/Makefile.in | 2 +- dlls/gdi32/{gdidc.c => dc.c} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index c2f1648a172..3e0495f877b 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -5,9 +5,9 @@ IMPORTS = advapi32 win32u DELAYIMPORTS = setupapi C_SRCS = \ + dc.c \ emfdc.c \ enhmetafile.c \ - gdidc.c \ icm.c \ metadc.c \ metafile.c \ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/dc.c similarity index 99% rename from dlls/gdi32/gdidc.c rename to dlls/gdi32/dc.c index 5ea18e58b18..1511c565194 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/dc.c @@ -4,6 +4,7 @@ * Copyright 1993, 1994 Alexandre Julliard * Copyright 1997 Bertho A. Stultiens * 1999 Huw D M Davies + * 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

1 0

Rémi Bernon : winebus.sys: Add a PID set condition output report.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: c263fea14fa13273763a1518f48561157f30b880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c263fea14fa13273763a1518… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 8 09:50:24 2021 +0200 winebus.sys: Add a PID set condition output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 30 +++++++++++++- dlls/winebus.sys/bus_udev.c | 23 ++++++++++- dlls/winebus.sys/hid.c | 91 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 13 ++++++ 4 files changed, 155 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c263fea14fa13273763a…

1 0

Ivo Ivanov : winebus.sys: Fix incorrect length when parsing uevent "HID_NAME=".
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 5d022fd0dceb00f9dfc0360c992911c953f903e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d022fd0dceb00f9dfc0360c… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Oct 8 12:38:46 2021 +0200 winebus.sys: Fix incorrect length when parsing uevent "HID_NAME=". Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index cc54d6490be..2ed9a031af6 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1108,7 +1108,7 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } - if (!strncmp(ptr, "HID_NAME=", 7)) + if (!strncmp(ptr, "HID_NAME=", 9)) { if (desc->product[0]) continue; if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1)

1 0

Ivo Ivanov : winebus.sys: Fix memory leaks in bus_event_queue functions.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 8f37de5149e2440c7da831c083ac54bdbd166b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f37de5149e2440c7da831c0… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Oct 8 12:36:44 2021 +0200 winebus.sys: Fix memory leaks in bus_event_queue functions. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/unixlib.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index ea26094049e..f66fd78d176 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -329,7 +329,11 @@ BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *devi struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_DEVICE_REMOVED; event->device = device; @@ -344,7 +348,11 @@ BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *devi struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_DEVICE_CREATED; event->device = device; @@ -360,7 +368,11 @@ BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_INPUT_REPORT; event->device = device;

1 0

Daniel Lehman : ntoskrnl.exe: Fix use-after-free when freeing IRP.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: de0e9ad9654f7ba568e2b7f81727bdfcc7327d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0e9ad9654f7ba568e2b7f8… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 7 10:02:33 2021 -0700 ntoskrnl.exe: Fix use-after-free when freeing IRP. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f2fb0a6d66e..ec297e7d64a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1011,8 +1011,9 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { if (context.irp_data->complete) { - IoCompleteRequest( context.irp_data->irp, IO_NO_INCREMENT ); + IRP *irp = context.irp_data->irp; free_dispatch_irp( context.irp_data ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); } else {

1 0

Jacek Caban : user32: Link directly to win32u.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 80df54a407680859ea777ae0b60aef6f8f378719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80df54a407680859ea777ae0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 13:34:21 2021 +0200 user32: Link directly to win32u. 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/gdi32/gdi32.spec | 6 ------ dlls/user32/Makefile.in | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 94a5cefdfa4..74e452c9b67 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -547,8 +547,6 @@ ################################################################ # Wine extensions: Win16 functions that are needed by other dlls # -@ stdcall GetDCHook(long ptr) -@ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) ################################################################ @@ -558,12 +556,8 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # GDI objects -@ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) -# Graphics drivers -@ cdecl __wine_set_display_driver(long) - # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 50bba8c1786..38ce2aad997 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase +IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase win32u EXTRAINCL = $(PNG_CFLAGS) DELAYIMPORTS = hid imm32

1 0

Jacek Caban : gdi32: Don't export Wine extensions.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: c166e9694eac3aa5124e1c2039248ac6d063dccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c166e9694eac3aa5124e1c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 13:34:42 2021 +0200 gdi32: Don't export Wine extensions. Link directly to win32u instead. 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/d3d12/Makefile.in | 2 +- dlls/dxgi/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/gdi32/gdi32.spec | 20 -------------------- dlls/opengl32/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 2 +- dlls/winevulkan/Makefile.in | 2 +- 8 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 71c2c879f4b..64930ac442e 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = dxgi dxguid gdi32 user32 uuid +IMPORTS = dxgi dxguid gdi32 user32 uuid win32u EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 7460d5098b6..3a28d0462de 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,6 +1,6 @@ MODULE = dxgi.dll IMPORTLIB = dxgi -IMPORTS = gdi32 dxguid uuid wined3d user32 +IMPORTS = gdi32 dxguid uuid wined3d user32 win32u EXTRAINCL = $(VKD3D_CFLAGS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 312641cd513..21850e2e660 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -1,5 +1,5 @@ MODULE = gdi.exe16 -IMPORTS = user32 advapi32 gdi32 +IMPORTS = user32 advapi32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520 diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 74e452c9b67..c6fe436b7c9 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -543,23 +543,3 @@ @ extern pfnRealizePalette @ extern pfnSelectPalette @ stub pstackConnect - -################################################################ -# Wine extensions: Win16 functions that are needed by other dlls -# -@ stdcall SetHookFlags(long long) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. - -# GDI objects -@ cdecl __wine_set_visible_region(long long ptr ptr ptr) - -# OpenGL -@ cdecl __wine_get_wgl_driver(long long) - -# Vulkan -@ cdecl __wine_get_vulkan_driver(long long) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 2e8fe657f40..fc27b481df3 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,7 +1,7 @@ MODULE = opengl32.dll EXTRADEFS = -D_OPENGL32_ IMPORTLIB = opengl32 -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 win32u DELAYIMPORTS = glu32 EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 -mcygwin diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 5a82b7590cd..7e2438d033f 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,5 +1,5 @@ MODULE = user.exe16 -IMPORTS = mpr user32 gdi32 +IMPORTS = mpr user32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 C_SRCS = \ diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 1d1782855de..41e129b24f6 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,6 +1,6 @@ MODULE = wined3d.dll IMPORTLIB = wined3d -IMPORTS = opengl32 user32 gdi32 advapi32 +IMPORTS = opengl32 user32 gdi32 advapi32 win32u EXTRAINCL = $(VKD3D_SHADER_CFLAGS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index bb5248c8f73..52b397e4242 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 advapi32 setupapi +IMPORTS = user32 gdi32 advapi32 setupapi win32u EXTRALIBS = $(PTHREAD_LIBS) C_SRCS = \

1 0

Jacek Caban : gdi32: Use DLL forwarding for D3DKMT functions.
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: master Commit: 2cc52c6e454ffa5846f8e5bdd1979ee2a8844467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc52c6e454ffa5846f8e5bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 13:34:55 2021 +0200 gdi32: Use DLL forwarding for D3DKMT 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/gdi32/gdi32.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index c6fe436b7c9..d0ffe827539 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -73,20 +73,20 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) NtGdiDdDDICheckVidPnExclusiveOwnership -@ stdcall D3DKMTCloseAdapter(ptr) NtGdiDdDDICloseAdapter -@ stdcall D3DKMTCreateDCFromMemory(ptr) NtGdiDdDDICreateDCFromMemory -@ stdcall D3DKMTCreateDevice(ptr) NtGdiDdDDICreateDevice -@ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory -@ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice -@ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape -@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) NtGdiDdDDIOpenAdapterFromDeviceName +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) win32u.NtGdiDdDDICheckVidPnExclusiveOwnership +@ stdcall D3DKMTCloseAdapter(ptr) win32u.NtGdiDdDDICloseAdapter +@ stdcall D3DKMTCreateDCFromMemory(ptr) win32u.NtGdiDdDDICreateDCFromMemory +@ stdcall D3DKMTCreateDevice(ptr) win32u.NtGdiDdDDICreateDevice +@ stdcall D3DKMTDestroyDCFromMemory(ptr) win32u.NtGdiDdDDIDestroyDCFromMemory +@ stdcall D3DKMTDestroyDevice(ptr) win32u.NtGdiDdDDIDestroyDevice +@ stdcall D3DKMTEscape(ptr) win32u.NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) win32u.NtGdiDdDDIOpenAdapterFromDeviceName @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) -@ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc -@ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid -@ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics -@ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit -@ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) win32u.NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTOpenAdapterFromLuid(ptr) win32u.NtGdiDdDDIOpenAdapterFromLuid +@ stdcall D3DKMTQueryStatistics(ptr) win32u.NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTSetQueuedLimit(ptr) win32u.NtGdiDdDDISetQueuedLimit +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) win32u.NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long)

1 0