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

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

12 Mar '18

Module: wine Branch: master Commit: 2e53da7b78709532f53d535040a85ccbee296bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e53da7b78709532f53d5350… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 12 11:35:02 2018 +0200 ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/configure b/configure index b83b6a4..5e938cb 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 6aecf50..627d316 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 0000000..3e6b6e8 --- /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 0000000..7c5ca73 --- /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 dd8e2d9..98011f6 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", ], [

1 0

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

12 Mar '18

Module: wine Branch: master Commit: 30aeb3346e6c6092347bec164efe2a281a5c7797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30aeb3346e6c6092347bec16… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 12 11:35:28 2018 +0200 ext-ms-win-rtcore-ntuser-cursor-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/configure b/configure index 5e938cb..a27057b 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 627d316..b51e546 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 0000000..e88ee90 --- /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 0000000..3eefa4e --- /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 98011f6..add8ab8 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",

1 0

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

12 Mar '18

Module: wine Branch: master Commit: 24b1e3fda0f03c839e7f07388219b3b0947da44c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b1e3fda0f03c839e7f0738… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 12 11:35:56 2018 +0200 ext-ms-win-ntuser-gui-l1-3-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/configure b/configure index a27057b..fa23a80 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 b51e546..665408c 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 0000000..271c480 --- /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 0000000..435aace --- /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 add8ab8..3c426fc 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",

1 0

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

12 Mar '18

Module: wine Branch: master Commit: 80f0572d0e85d95ab301c4c558c2618ce64d0bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80f0572d0e85d95ab301c4c5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 12 11:36:16 2018 +0200 ext-ms-win-ntuser-keyboard-l1-3-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/configure b/configure index fa23a80..e4fcdb9 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 665408c..e725eda 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 0000000..141cf4e --- /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 0000000..b8346ff --- /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 3c426fc..807ec32 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",

1 0

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

12 Mar '18

Module: wine Branch: master Commit: dfae798d98bf7a8b45954e6d788928d067d0772e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfae798d98bf7a8b45954e6d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 12 11:36:34 2018 +0200 ext-ms-win-ntuser-misc-l1-5-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/configure b/configure index e4fcdb9..d3293c4 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 e725eda..fb0014b 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 0000000..51a2657 --- /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 0000000..db4076f --- /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 807ec32..cf685b6 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",

1 0

Nikolay Sivov : wincodecs/tests: Test headers written by BMP encoder.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: c30bf0b6e9818dd7338e45907636b88aba153391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30bf0b6e9818dd7338e4590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 12 17:57:51 2018 +0300 wincodecs/tests: Test headers written by BMP encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 65 ++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 690e787..472bee5 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -632,9 +632,60 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const struct bitmap_data *data) { - /* FIXME */ + BITMAPFILEHEADER bfh; + BITMAPINFOHEADER bih; + HRESULT hr; + ULONG len; + + hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); + ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + + hr = IStream_Read(stream, &bih, sizeof(bih), &len); + ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + + ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); + ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); + ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); + ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + + if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) + || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + { + /* TODO: test with actual palette size */ + ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", + bfh.bfOffBits, wine_dbgstr_guid(data->format)); + } + else + ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", + bfh.bfOffBits, wine_dbgstr_guid(data->format)); + + ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); + ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); +todo_wine + ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); + ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); + + if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) + ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) + ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, + wine_dbgstr_guid(data->format)); + + ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); +todo_wine + ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); + ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", + bih.biXPelsPerMeter); + ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", + bih.biYPelsPerMeter); + + /* FIXME: test actual data */ } static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) @@ -722,7 +773,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) { HRESULT hr; LARGE_INTEGER pos; @@ -732,11 +783,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, format); + check_png_format(stream, dst->format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, format); + check_bmp_format(stream, dst); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, format); + check_tiff_format(stream, dst->format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -972,7 +1023,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]->format); + check_bitmap_format(stream, clsid_encoder, dsts[0]); } if (SUCCEEDED(hr))

1 0

Roderick Colenbrander : winevulkan/winex11: Add Vulkan WSI stubs ( VK_KHR_surface / VK_KHR_swapchain).
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 0cb665423798e796e816f5d94d7d135448f396b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cb665423798e796e816f5d9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:53 2018 +0100 winevulkan/winex11: Add Vulkan WSI stubs (VK_KHR_surface / VK_KHR_swapchain). The WSI APIs are meant for window system integration, so essentially the WGL of Vulkan. Implementation belongs in the graphics drivers as we need to hook into surface and swapchains. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 114 +++++++++++++++++++++++++++++- dlls/winevulkan/vulkan.c | 153 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 12 ++++ dlls/winevulkan/vulkan_thunks.h | 34 +++++++++ dlls/winex11.drv/vulkan.c | 151 ++++++++++++++++++++++++++++++++++++--- include/wine/vulkan.h | 130 ++++++++++++++++++++++++++++++++++ include/wine/vulkan_driver.h | 14 +++- 7 files changed, 597 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0cb665423798e796e816…

1 0

Roderick Colenbrander : winevulkan: Sanitize VkInstanceCreateInfo before passing to driver.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 8238e73b49007f71fa398cddc14741dc134e79e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8238e73b49007f71fa398cdd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:54 2018 +0100 winevulkan: Sanitize VkInstanceCreateInfo before passing to driver. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 61af8df..fe1f851 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 +/* All Vulkan structures use this structure for the first elements. */ +struct wine_vk_structure_header +{ + VkStructureType sType; + const void *pNext; +}; + static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs = NULL; @@ -74,6 +81,58 @@ static BOOL wine_vk_init(void) return TRUE; } +/* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. + * This function takes care of extensions handled at winevulkan layer, a Wine graphics + * driver is responsible for handling e.g. surface extensions. + */ +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, + VkInstanceCreateInfo *dst) +{ + dst->sType = src->sType; + dst->flags = src->flags; + dst->pApplicationInfo = src->pApplicationInfo; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindy pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: + /* Can be used to register new dispatchable object types + * to the loader. We should ignore it as it will confuse the + * host its loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %d\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader + * filter this data out as well. + */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + /* TODO: convert non-WSI win32 extensions here to host specific ones. */ + dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames; + dst->enabledExtensionCount = src->enabledExtensionCount; + + return VK_SUCCESS; +} + /* Helper function which stores wrapped physical devices in the instance object. */ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) { @@ -229,6 +288,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ const VkAllocationCallbacks *allocator, VkInstance *instance) { struct VkInstance_T *object = NULL; + VkInstanceCreateInfo create_info_host; VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); @@ -245,7 +305,14 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = vk_funcs->p_vkCreateInstance(create_info, NULL /* allocator */, &object->instance); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert instance create info, res=%d\n", res); + goto err; + } + + res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); if (res != VK_SUCCESS) { ERR("Failed to create instance, res=%d\n", res);

1 0

Roderick Colenbrander : winex11: Enable surface support for instances.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 43c71d9916422014be558ca0137b71ec3daf6e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c71d9916422014be558ca0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 15:37:55 2018 +0100 winex11: Enable surface support for instances. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 68 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index fe50d66..11d9f61 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" /* We only want host compatible structures and don't need alignment. */ @@ -74,6 +75,54 @@ LOAD_FUNCPTR(vkGetInstanceProcAddr) return TRUE; } +/* Helper function for converting between win32 and X11 compatible VkInstanceCreateInfo. + * Caller is responsible for allocation and cleanup of 'dst'. + */ +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, + VkInstanceCreateInfo *dst) +{ + unsigned int i; + const char **enabled_extensions = NULL; + + dst->sType = src->sType; + dst->flags = src->flags; + dst->pApplicationInfo = src->pApplicationInfo; + dst->pNext = src->pNext; + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + dst->enabledExtensionCount = 0; + dst->ppEnabledExtensionNames = NULL; + + if (src->enabledExtensionCount > 0) + { + enabled_extensions = heap_calloc(src->enabledExtensionCount, sizeof(*src->ppEnabledExtensionNames)); + if (!enabled_extensions) + { + ERR("Failed to allocate memory for enabled extensions\n"); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + for (i = 0; i < src->enabledExtensionCount; i++) + { + /* Substitute extension with X11 ones else copy. Long-term, when we + * support more extensions, we should store these in a list. + */ + if (!strcmp(src->ppEnabledExtensionNames[i], "VK_KHR_win32_surface")) + { + enabled_extensions[i] = "VK_KHR_xlib_surface"; + } + else + { + enabled_extensions[i] = src->ppEnabledExtensionNames[i]; + } + } + dst->ppEnabledExtensionNames = enabled_extensions; + dst->enabledExtensionCount = src->enabledExtensionCount; + } + + return VK_SUCCESS; +} + static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) { @@ -87,19 +136,28 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swa static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { + VkInstanceCreateInfo create_info_host; + VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - /* TODO: convert win32 to x11 extensions here. */ - if (create_info->enabledExtensionCount > 0) + /* Perform a second pass on converting VkInstanceCreateInfo. Winevulkan + * performed a first pass in which it handles everything except for WSI + * functionality such as VK_KHR_win32_surface. Handle this now. + */ + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) { - FIXME("Extensions are not supported yet, aborting!\n"); - return VK_ERROR_INCOMPATIBLE_DRIVER; + ERR("Failed to convert instance create info, res=%d\n", res); + return res; } - return pvkCreateInstance(create_info, NULL /* allocator */, instance); + res = pvkCreateInstance(&create_info_host, NULL /* allocator */, instance); + + heap_free((void *)create_info_host.ppEnabledExtensionNames); + return res; } static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device,

1 0

Zebediah Figura : kernel32/tests: Fix permission check.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 43c5fe11cbfe8fb16f542ee17ec82e1b6ec0ccd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c5fe11cbfe8fb16f542ee1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 20:03:30 2018 -0500 kernel32/tests: Fix permission check. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 64ffc17..c5c7702 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -956,6 +956,7 @@ static void test_WritePrivateProfileString(void) LPCSTR data; CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + HANDLE file; SetLastError(0xdeadbeef); ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); @@ -1069,12 +1070,14 @@ static void test_WritePrivateProfileString(void) "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); /* Relative paths are relative to X:\\%WINDIR% */ - GetWindowsDirectoryA(temp, MAX_PATH); - GetTempFileNameA(temp, "win", 1, path); - if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) + GetWindowsDirectoryA(path, MAX_PATH); + strcat(path, "\\win1.tmp"); + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("Not allowed to create a file in the Windows directory\n"); else { + CloseHandle(file); DeleteFileA(path); data = "[App]\r\n"

1 0