March 2018 - Wine-devel - list.winehq.org

[PATCH] ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.
by Alistair Leslie-Hughes 12 Mar '18

12 Mar '18

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 10f69baac1..44aac92f6b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -611,9 +611,9 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) /*********************************************************************** * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) */ -void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) +void WINAPI IoReleaseCancelSpinLock(KIRQL irql) { - FIXME("(%p): stub\n", irql); + FIXME("(%u): stub\n", irql); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ebf1705729..e9a42d6b86 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -434,7 +434,7 @@ @ stub IoRegisterLastChanceShutdownNotification @ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) -@ stdcall IoReleaseCancelSpinLock(ptr) +@ stdcall IoReleaseCancelSpinLock(long) @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 61374a7ed4..4de7b6fe53 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1306,6 +1306,7 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); -- 2.16.1

1 0

[PATCH] ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.
by Alistair Leslie-Hughes 12 Mar '18

12 Mar '18

From: Alexander Morozov <amorozov(a)etersoft.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 10f69baac1..1a47f45075 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2257,6 +2257,19 @@ static void ObReferenceObject( void *obj ) } +/*********************************************************************** + * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, + POBJECT_TYPE type, + KPROCESSOR_MODE mode) +{ + FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode); + + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * ObDereferenceObject (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ebf1705729..9967d1619b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -815,7 +815,7 @@ @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) -@ stub ObReferenceObjectByPointer +@ stdcall ObReferenceObjectByPointer(ptr long ptr long) @ stub ObReferenceSecurityDescriptor @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 61374a7ed4..b75ef9d56d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1336,6 +1336,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); +NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); -- 2.16.1

1 0

[PATCH] wined3d: Recognize GTX 1050 Ti card with NVIDIA driver.
by Kai Krakow 12 Mar '18

12 Mar '18

Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73966afec..18bc92432b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1394,6 +1394,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1892,6 +1893,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c4c3ef2b4..d8b36d9b22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2394,6 +2394,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, + CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, -- 2.16.1

2 1

[PATCH 01/10] wined3d: Restore the correct sub resource in texture2d_load_fb_texture().
by Matteo Bruni 12 Mar '18

12 Mar '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Ideally this should be squashed into 142935. dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa25b03748..e98541c429 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single -- 2.13.6

4 20

[PATCH] ext-ms-win-ntuser-misc-l1-5-1: Add dll.
by Andrey Gusev 12 Mar '18

12 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-5-1/Makefile.in | 1 + .../ext-ms-win-ntuser-misc-l1-5-1.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-misc-l1-5-1/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-misc-l1-5-1/ext-ms-win-ntuser-misc-l1-5-1.spec diff --git a/configure b/configure index e4fcdb9b6f..d3293c4716 100755 --- a/configure +++ b/configure @@ -1253,6 +1253,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 @@ -18614,6 +18615,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index e725eda971..fb0014be40 100644 --- a/configure.ac +++ b/configure.ac @@ -3250,6 +3250,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-5-1/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-5-1/Makefile.in new file mode 100644 index 0000000000..51a2657f43 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-5-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-misc-l1-5-1.dll diff --git a/dlls/ext-ms-win-ntuser-misc-l1-5-1/ext-ms-win-ntuser-misc-l1-5-1.spec b/dlls/ext-ms-win-ntuser-misc-l1-5-1/ext-ms-win-ntuser-misc-l1-5-1.spec new file mode 100644 index 0000000000..db4076f4d9 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-5-1/ext-ms-win-ntuser-misc-l1-5-1.spec @@ -0,0 +1,8 @@ +@ stub CloseGestureInfoHandle +@ stdcall GetGestureConfig(long long long ptr ptr long) user32.GetGestureConfig +@ stdcall GetGestureInfo(long ptr) user32.GetGestureInfo +@ stdcall GetScrollBarInfo(long long ptr) user32.GetScrollBarInfo +@ stdcall GetScrollInfo(long long ptr) user32.GetScrollInfo +@ stdcall GetScrollPos(long long) user32.GetScrollPos +@ stdcall IsTouchWindow(long ptr) user32.IsTouchWindow +@ stdcall SetScrollPos(long long long long) user32.SetScrollPos diff --git a/tools/make_specfiles b/tools/make_specfiles index 807ec32c28..cf685b6b85 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -359,6 +359,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", -- 2.13.6

1 0

[PATCH] ext-ms-win-ntuser-keyboard-l1-3-0: Add dll.
by Andrey Gusev 12 Mar '18

12 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-keyboard-l1-3-0/Makefile.in | 1 + .../ext-ms-win-ntuser-keyboard-l1-3-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-keyboard-l1-3-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-keyboard-l1-3-0/ext-ms-win-ntuser-keyboard-l1-3-0.spec diff --git a/configure b/configure index fa23a80cc0..e4fcdb9b6f 100755 --- a/configure +++ b/configure @@ -1251,6 +1251,7 @@ enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 +enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -18611,6 +18612,7 @@ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_e wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 665408c641..e725eda971 100644 --- a/configure.ac +++ b/configure.ac @@ -3248,6 +3248,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/Makefile.in b/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/Makefile.in new file mode 100644 index 0000000000..141cf4e0b8 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-keyboard-l1-3-0.dll diff --git a/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/ext-ms-win-ntuser-keyboard-l1-3-0.spec b/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/ext-ms-win-ntuser-keyboard-l1-3-0.spec new file mode 100644 index 0000000000..b8346ffe02 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-keyboard-l1-3-0/ext-ms-win-ntuser-keyboard-l1-3-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetAsyncKeyState(long) user32.GetAsyncKeyState +@ stdcall MapVirtualKeyW(long long) user32.MapVirtualKeyW +@ stdcall SendInput(long ptr long) user32.SendInput +@ stdcall SetKeyboardState(ptr) user32.SetKeyboardState diff --git a/tools/make_specfiles b/tools/make_specfiles index 3c426fcc6c..807ec32c28 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -357,6 +357,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", + "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- 2.13.6

1 0

[PATCH] ext-ms-win-ntuser-gui-l1-3-0: Add dll.
by Andrey Gusev 12 Mar '18

12 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-gui-l1-3-0/Makefile.in | 1 + dlls/ext-ms-win-ntuser-gui-l1-3-0/ext-ms-win-ntuser-gui-l1-3-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-gui-l1-3-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-gui-l1-3-0/ext-ms-win-ntuser-gui-l1-3-0.spec diff --git a/configure b/configure index a27057b326..fa23a80cc0 100755 --- a/configure +++ b/configure @@ -1250,6 +1250,7 @@ enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 +enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -18609,6 +18610,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index b51e546fed..665408c641 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-gui-l1-3-0/Makefile.in b/dlls/ext-ms-win-ntuser-gui-l1-3-0/Makefile.in new file mode 100644 index 0000000000..271c480af6 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-3-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-gui-l1-3-0.dll diff --git a/dlls/ext-ms-win-ntuser-gui-l1-3-0/ext-ms-win-ntuser-gui-l1-3-0.spec b/dlls/ext-ms-win-ntuser-gui-l1-3-0/ext-ms-win-ntuser-gui-l1-3-0.spec new file mode 100644 index 0000000000..435aace992 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-3-0/ext-ms-win-ntuser-gui-l1-3-0.spec @@ -0,0 +1,4 @@ +@ stdcall FillRect(long ptr long) user32.FillRect +@ stdcall GetPhysicalCursorPos(ptr) user32.GetPhysicalCursorPos +@ stdcall GetSysColorBrush(long) user32.GetSysColorBrush +@ stdcall SetPhysicalCursorPos(long long) user32.SetPhysicalCursorPos diff --git a/tools/make_specfiles b/tools/make_specfiles index add8ab8ffe..3c426fcc6c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -356,6 +356,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", + "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- 2.13.6

1 0

[PATCH] ext-ms-win-rtcore-ntuser-cursor-l1-1-0: Add dll.
by Andrey Gusev 12 Mar '18

12 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-cursor-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) create mode 100644 dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.spec diff --git a/configure b/configure index 5e938cb207..a27057b326 100755 --- a/configure +++ b/configure @@ -1262,6 +1262,7 @@ enable_ext_ms_win_ras_rasapi32_l1_1_0 enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +enable_ext_ms_win_rtcore_ntuser_cursor_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 @@ -18620,6 +18621,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ra wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0 enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0 enable_ext_ms_win_rtcore_ntuser_cursor_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 diff --git a/configure.ac b/configure.ac index 627d316694..b51e546fed 100644 --- a/configure.ac +++ b/configure.ac @@ -3259,6 +3259,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/Makefile.in new file mode 100644 index 0000000000..e88ee909c6 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-cursor-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.spec new file mode 100644 index 0000000000..3eefa4e861 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall LoadCursorW(long wstr) user32.LoadCursorW +@ stdcall SetCursor(long) user32.SetCursor diff --git a/tools/make_specfiles b/tools/make_specfiles index 98011f6f47..add8ab8ffe 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -364,6 +364,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", + "ext-ms-win-rtcore-ntuser-cursor-l1-1-0", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0", -- 2.13.6

1 0

[PATCH] ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
by Andrey Gusev 12 Mar '18

12 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec diff --git a/configure b/configure index b83b6a455f..5e938cb207 100755 --- a/configure +++ b/configure @@ -1264,6 +1264,7 @@ enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 +enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 @@ -18621,6 +18622,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_w wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 diff --git a/configure.ac b/configure.ac index 6aecf50de4..627d316694 100644 --- a/configure.ac +++ b/configure.ac @@ -3261,6 +3261,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in new file mode 100644 index 0000000000..3e6b6e8f0e --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec new file mode 100644 index 0000000000..7c5ca736e0 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall GetSysColor(long) user32.GetSysColor diff --git a/tools/make_specfiles b/tools/make_specfiles index dd8e2d91c3..98011f6f47 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -366,6 +366,7 @@ my @dll_groups = "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", + "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ], [ -- 2.13.6

1 0

[PATCH 7/7] wined3d: Pass a wined3d_context structure to texture2d_depth_blt_fbo().
by Henri Verbeet 12 Mar '18

12 Mar '18

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58f39d047af..2c55b17532b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -259,13 +259,12 @@ static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsign return TRUE; } -static void texture2d_depth_blt_fbo(const struct wined3d_device *device, +static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + const struct wined3d_gl_info *gl_info = context->gl_info; DWORD src_mask, dst_mask; GLbitfield gl_mask; @@ -298,14 +297,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, if (src_mask & WINED3DFMT_FLAG_STENCIL) gl_mask |= GL_STENCIL_BUFFER_BIT; - context = context_acquire(device, NULL, 0); - if (!context->valid) - { - context_release(context); - WARN("Invalid context, skipping blit.\n"); - return; - } - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); @@ -314,8 +305,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, 0, &src_texture->resource, src_sub_resource_idx, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); @@ -351,8 +340,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, if (wined3d_settings.strict_draw_ordering) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); } static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) @@ -2422,7 +2409,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_DEPTH_BLIT) { TRACE("Depth/stencil blit.\n"); - texture2d_depth_blt_fbo(device, src_surface->container, surface_get_sub_resource_idx(src_surface), + texture2d_depth_blt_fbo(device, context, src_surface->container, surface_get_sub_resource_idx(src_surface), src_location, src_rect, dst_surface->container, surface_get_sub_resource_idx(dst_surface), dst_location, dst_rect); return dst_location; -- 2.11.0

1 0