wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Zebediah Figura : quartz/tests: Remove a debug trace.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 813ab925abd45d48c811898028fddc1047b0c250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=813ab925abd45d48c8118980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 7 13:43:13 2018 -0600 quartz/tests: Remove a debug trace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 602a6d1..829e89b 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -182,7 +182,6 @@ static void test_fm2_enummatchingfilters(void) ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed: %#x\n", hr); while (!found && IEnumRegFilters_Next(enum_reg, 1, &regfilter, &count) == S_OK) { - trace("%s %s\n", wine_dbgstr_guid(&regfilter->Clsid), wine_dbgstr_w(regfilter->Name)); if (!lstrcmpW(regfilter->Name, wszFilterName1) && IsEqualGUID(&clsidFilter1, &regfilter->Clsid)) found = TRUE; }

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-wmpointer-l1-1-3: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 04ea1d4a9478bc9fcb2b9798ed38ffca45845472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ea1d4a9478bc9fcb2b9798… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:24:56 2018 +0200 api-ms-win-rtcore-ntuser-wmpointer-l1-1-3: 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/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 2e0cbec..e6e1d68 100755 --- a/configure +++ b/configure @@ -1069,6 +1069,7 @@ enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 +enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_3 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18355,6 +18356,7 @@ wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 568c01f..e16cc3a 100644 --- a/configure.ac +++ b/configure.ac @@ -3001,6 +3001,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in new file mode 100644 index 0000000..8dcda0f --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec new file mode 100644 index 0000000..fd5d1ed --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec @@ -0,0 +1 @@ +@ stub GetWindowFeedbackSetting diff --git a/tools/make_specfiles b/tools/make_specfiles index 1f4aec0..31d2f20 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -349,6 +349,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", + "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-wmpointer-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: eb1de172c5b31ca01f68a20fdf9352411c413650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1de172c5b31ca01f68a20f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:24:25 2018 +0200 api-ms-win-rtcore-ntuser-wmpointer-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 + .../Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 30 insertions(+) diff --git a/configure b/configure index 2dc1d37..2e0cbec 100755 --- a/configure +++ b/configure @@ -1068,6 +1068,7 @@ enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 +enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18353,6 +18354,7 @@ wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_p wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 0477c72..568c01f 100644 --- a/configure.ac +++ b/configure.ac @@ -3000,6 +3000,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in new file mode 100644 index 0000000..9ba3a86 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec new file mode 100644 index 0000000..1e9fa50 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stub EnableMouseInPointer +@ stub GetCurrentInputMessageSource +@ stub GetPointerCursorId +@ stub GetPointerDevice +@ stub GetPointerDeviceProperties +@ stub GetPointerDeviceRects +@ stub GetPointerDevices +@ stub GetPointerFrameInfo +@ stub GetPointerFrameInfoHistory +@ stub GetPointerFramePenInfo +@ stub GetPointerFrameTouchInfo +@ stub GetPointerFrameTouchInfoHistory +@ stub GetPointerInfo +@ stub GetPointerInfoHistory +@ stub GetPointerInputTransform +@ stub GetPointerPenInfo +@ stub GetPointerPenInfoHistory +@ stub GetPointerTouchInfo +@ stub GetPointerTouchInfoHistory +@ stub GetPointerType +@ stub GetRawPointerDeviceData +@ stub InitializeTouchInjection +@ stub InjectTouchInput +@ stub IsMouseInPointerEnabled +@ stub SkipPointerFrameMessages diff --git a/tools/make_specfiles b/tools/make_specfiles index 60a9381..1f4aec0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -348,6 +348,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", + "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-winevent-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 0f9b58828b5b6cc52db31159d61d885cbf11f899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f9b58828b5b6cc52db31159… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:23:52 2018 +0200 api-ms-win-rtcore-ntuser-winevent-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/api-ms-win-rtcore-ntuser-winevent-l1-1-0/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-winevent-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index bc23f9c..2dc1d37 100755 --- a/configure +++ b/configure @@ -1067,6 +1067,7 @@ enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 +enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18351,6 +18352,7 @@ wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_powe wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 4dd22a9..0477c72 100644 --- a/configure.ac +++ b/configure.ac @@ -2999,6 +2999,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/Makefile.in new file mode 100644 index 0000000..72ec725 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/api-ms-win-rtcore-ntuser-winevent-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/api-ms-win-rtcore-ntuser-winevent-l1-1-0.spec new file mode 100644 index 0000000..5d91eac --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0/api-ms-win-rtcore-ntuser-winevent-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall IsWinEventHookInstalled(long) user32.IsWinEventHookInstalled +@ stdcall NotifyWinEvent(long long long long) user32.NotifyWinEvent +@ stdcall SetWinEventHook(long long long ptr long long long) user32.SetWinEventHook +@ stdcall UnhookWinEvent(long) user32.UnhookWinEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 3aa0770..60a9381 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -347,6 +347,7 @@ my @dll_groups = "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-window-l1-1-0", + "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: a77e5761f93f53cedb8a3035eb33a34c81a5ddba URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77e5761f93f53cedb8a3035… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:23:17 2018 +0200 api-ms-win-rtcore-ntuser-window-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 + .../Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-window-l1-1-0.spec | 81 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 86 insertions(+) diff --git a/configure b/configure index 03a458b..bc23f9c 100755 --- a/configure +++ b/configure @@ -1066,6 +1066,7 @@ enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18349,6 +18350,7 @@ wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_per wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 35cba6f..4dd22a9 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in new file mode 100644 index 0000000..9641c2a --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-window-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec new file mode 100644 index 0000000..c859189 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec @@ -0,0 +1,81 @@ +@ stdcall AllowSetForegroundWindow(long) user32.AllowSetForegroundWindow +@ stdcall BeginDeferWindowPos(long) user32.BeginDeferWindowPos +@ stdcall CallWindowProcW(ptr long long long long) user32.CallWindowProcW +@ stdcall ChildWindowFromPoint(long int64) user32.ChildWindowFromPoint +@ stdcall ChildWindowFromPointEx(long int64 long) user32.ChildWindowFromPointEx +@ stdcall ClientToScreen(long ptr) user32.ClientToScreen +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DeferWindowPos(long long long long long long long long) user32.DeferWindowPos +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall DispatchMessageW(ptr) user32.DispatchMessageW +@ stdcall EnableWindow(long long) user32.EnableWindow +@ stdcall EndDeferWindowPos(long) user32.EndDeferWindowPos +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumPropsExW(long ptr long) user32.EnumPropsExW +@ stdcall EnumPropsW(long ptr) user32.EnumPropsW +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowExW(long long wstr wstr) user32.FindWindowExW +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetActiveWindow() user32.GetActiveWindow +@ stdcall GetAncestor(long long) user32.GetAncestor +@ stdcall GetClassInfoExW(long wstr ptr) user32.GetClassInfoExW +@ stdcall GetClassInfoW(long wstr ptr) user32.GetClassInfoW +@ stdcall GetClassNameW(long ptr long) user32.GetClassNameW +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetCursorPos(ptr) user32.GetCursorPos +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetFocus() user32.GetFocus +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetMessageExtraInfo() user32.GetMessageExtraInfo +@ stdcall GetMessagePos() user32.GetMessagePos +@ stdcall GetMessageTime() user32.GetMessageTime +@ stdcall GetMessageW(ptr long long long) user32.GetMessageW +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetQueueStatus(long) user32.GetQueueStatus +@ stdcall GetTopWindow(long) user32.GetTopWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stdcall GetWindowLongA(long long) user32.GetWindowLongA +@ stdcall GetWindowLongW(long long) user32.GetWindowLongW +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall InSendMessage() user32.InSendMessage +@ stdcall InSendMessageEx(ptr) user32.InSendMessageEx +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall IsWindowEnabled(long) user32.IsWindowEnabled +@ stdcall IsWindowVisible(long) user32.IsWindowVisible +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MoveWindow(long long long long long long) user32.MoveWindow +@ stdcall PeekMessageW(ptr long long long long) user32.PeekMessageW +@ stdcall PostMessageW(long long long long) user32.PostMessageW +@ stdcall PostQuitMessage(long) user32.PostQuitMessage +@ stdcall PostThreadMessageW(long long long long) user32.PostThreadMessageW +@ stdcall RegisterClassExW(ptr) user32.RegisterClassExW +@ stdcall RegisterClassW(ptr) user32.RegisterClassW +@ stdcall RegisterWindowMessageW(wstr) user32.RegisterWindowMessageW +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall ScreenToClient(long ptr) user32.ScreenToClient +@ stdcall SendMessageCallbackW(long long long long ptr long) user32.SendMessageCallbackW +@ stdcall SendMessageTimeoutW(long long long long long long ptr) user32.SendMessageTimeoutW +@ stdcall SendMessageW(long long long long) user32.SendMessageW +@ stdcall SendNotifyMessageW(long long long long) user32.SendNotifyMessageW +@ stdcall SetActiveWindow(long) user32.SetActiveWindow +@ stdcall SetCursorPos(long long) user32.SetCursorPos +@ stdcall SetFocus(long) user32.SetFocus +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetMessageExtraInfo(long) user32.SetMessageExtraInfo +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetWindowLongA(long long long) user32.SetWindowLongA +@ stdcall SetWindowLongW(long long long) user32.SetWindowLongW +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stdcall TranslateMessage(ptr) user32.TranslateMessage +@ stdcall UnregisterClassW(wstr long) user32.UnregisterClassW +@ stdcall WaitMessage() user32.WaitMessage +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/tools/make_specfiles b/tools/make_specfiles index a0f9e36..3aa0770 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -346,6 +346,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", + "api-ms-win-rtcore-ntuser-window-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : api-ms-win-gdi-dpiinfo-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 50a7ca38c7e277472ebccca8917906a850087306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50a7ca38c7e277472ebccca8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:22:07 2018 +0200 api-ms-win-gdi-dpiinfo-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/api-ms-win-gdi-dpiinfo-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-gdi-dpiinfo-l1-1-0/api-ms-win-gdi-dpiinfo-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index dde1901..03a458b 100755 --- a/configure +++ b/configure @@ -1055,6 +1055,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_legacy_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 +enable_api_ms_win_gdi_dpiinfo_l1_1_0 enable_api_ms_win_mm_joystick_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 @@ -18337,6 +18338,7 @@ wine_fn_config_makefile dlls/api-ms-win-eventing-controller-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-eventing-legacy-l1-1-0 enable_api_ms_win_eventing_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-gdi-dpiinfo-l1-1-0 enable_api_ms_win_gdi_dpiinfo_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-mm-joystick-l1-1-0 enable_api_ms_win_mm_joystick_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 diff --git a/configure.ac b/configure.ac index a3c2fc0..35cba6f 100644 --- a/configure.ac +++ b/configure.ac @@ -2987,6 +2987,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventlog-legacy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-gdi-dpiinfo-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-joystick-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-mme-l1-1-0) diff --git a/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/Makefile.in b/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/Makefile.in new file mode 100644 index 0000000..67949d5 --- /dev/null +++ b/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-gdi-dpiinfo-l1-1-0.dll diff --git a/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/api-ms-win-gdi-dpiinfo-l1-1-0.spec b/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/api-ms-win-gdi-dpiinfo-l1-1-0.spec new file mode 100644 index 0000000..fc60c36 --- /dev/null +++ b/dlls/api-ms-win-gdi-dpiinfo-l1-1-0/api-ms-win-gdi-dpiinfo-l1-1-0.spec @@ -0,0 +1 @@ +@ stub GetCurrentDpiInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 3d62a5b..a0f9e36 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -385,6 +385,7 @@ my @dll_groups = [ "gdi32", "api-ms-win-dx-d3dkmt-l1-1-0", + "api-ms-win-gdi-dpiinfo-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0",

1 0

Andrey Gusev : api-ms-win-core-largeinteger-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: e3baa09172cca36ea64dc7b786621297d85aea6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3baa09172cca36ea64dc7b7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:20:29 2018 +0200 api-ms-win-core-largeinteger-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/api-ms-win-core-largeinteger-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-largeinteger-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index c1516af..dde1901 100755 --- a/configure +++ b/configure @@ -940,6 +940,7 @@ enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_kernel32_private_l1_1_1 +enable_api_ms_win_core_largeinteger_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 @@ -18221,6 +18222,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_j wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-largeinteger-l1-1-0 enable_api_ms_win_core_largeinteger_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 diff --git a/configure.ac b/configure.ac index b6b66fa..a3c2fc0 100644 --- a/configure.ac +++ b/configure.ac @@ -2872,6 +2872,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-private-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-largeinteger-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-0) diff --git a/dlls/api-ms-win-core-largeinteger-l1-1-0/Makefile.in b/dlls/api-ms-win-core-largeinteger-l1-1-0/Makefile.in new file mode 100644 index 0000000..e99a359 --- /dev/null +++ b/dlls/api-ms-win-core-largeinteger-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-largeinteger-l1-1-0.dll diff --git a/dlls/api-ms-win-core-largeinteger-l1-1-0/api-ms-win-core-largeinteger-l1-1-0.spec b/dlls/api-ms-win-core-largeinteger-l1-1-0/api-ms-win-core-largeinteger-l1-1-0.spec new file mode 100644 index 0000000..8e56304 --- /dev/null +++ b/dlls/api-ms-win-core-largeinteger-l1-1-0/api-ms-win-core-largeinteger-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall MulDiv(long long long) kernel32.MulDiv diff --git a/tools/make_specfiles b/tools/make_specfiles index e9bc1f4..3d62a5b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -233,6 +233,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-kernel32-private-l1-1-1", + "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1", "api-ms-win-core-libraryloader-l1-2-2", "api-ms-win-core-localization-l1-1-0",

1 0

Vincent Povirk : gdiplus: Optimize clip region transforms.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 989c29870f3bdd3f67ca5bb9a2c5dfd42659f7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=989c29870f3bdd3f67ca5bb9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 7 11:31:01 2018 -0600 gdiplus: Optimize clip region transforms. Testing shows that this affects behavior. Transforming a region turns empty rectangles (with negative width or height) into non-empty rectangles. If an empty rectangle is set, it's treated as non-empty only when there is a world transform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 17 ++++++-- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 06fb89e..acee695 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -332,15 +332,20 @@ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) GpRegion *rgn; GpMatrix transform; GpStatus stat; + BOOL identity; stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceDevice, &transform); if (stat == Ok) + stat = GdipIsMatrixIdentity(&transform, &identity); + + if (stat == Ok) stat = GdipCloneRegion(graphics->clip, &rgn); if (stat == Ok) { - stat = GdipTransformRegion(rgn, &transform); + if (!identity) + stat = GdipTransformRegion(rgn, &transform); if (stat == Ok) stat = GdipGetRegionHRgn(rgn, NULL, hrgn); @@ -6333,9 +6338,12 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, if (status == Ok) { GpMatrix world_to_device; + BOOL identity; get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &world_to_device); - status = GdipTransformRegion(region, &world_to_device); + status = GdipIsMatrixIdentity(&world_to_device, &identity); + if (status == Ok && !identity) + status = GdipTransformRegion(region, &world_to_device); if (status == Ok) status = GdipCombineRegionRegion(graphics->clip, region, mode); @@ -6384,9 +6392,12 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, if (status == Ok) { GpMatrix world_to_device; + BOOL identity; get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &world_to_device); - status = GdipTransformRegion(clip, &world_to_device); + status = GdipIsMatrixIdentity(&world_to_device, &identity); + if (status == Ok && !identity) + status = GdipTransformRegion(clip, &world_to_device); if (status == Ok) status = GdipCombineRegionRegion(graphics->clip, clip, mode); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 96df1a2..6acc656 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2060,6 +2060,97 @@ static void test_get_set_clip(void) ReleaseDC(hwnd, hdc); } +static void test_clip_xform(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpRegion *clip; + COLORREF color; + UINT region_data_size; + struct { + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; + DWORD element_type; + REAL x; + REAL y; + REAL width; + REAL height; + } region_data; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipCreateRegion(&clip); + expect(Ok, status); + + status = GdipGraphicsClear(graphics, 0xff000000); + expect(Ok, status); + + status = GdipSetClipRect(graphics, 10, 10, -10, -10, CombineModeReplace); + expect(Ok, status); + status = GdipGetClip(graphics, clip); + expect(Ok, status); + status = GdipGetRegionData(clip, (BYTE*)&region_data, sizeof(region_data), &region_data_size); + expect(Ok, status); + expect(36, region_data_size); + expect(28, region_data.size); + expect(0, region_data.num_children); + expect(0x10000000 /* RegionDataRect */, region_data.element_type); + expectf(0.0, region_data.x); + expectf(0.0, region_data.y); + expectf(10.0, region_data.width); + expectf(10.0, region_data.height); + + /* No effect with negative width/height */ + status = GdipGraphicsClear(graphics, 0xffff0000); + expect(Ok, status); + color = GetPixel(hdc, 5, 5); + expect(0, color); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGraphicsClear(graphics, 0xffff0000); + expect(Ok, status); + color = GetPixel(hdc, 5, 5); + expect(0, color); + + status = GdipResetClip(graphics); + expect(Ok, status); + status = GdipResetWorldTransform(graphics); + expect(Ok, status); + status = GdipGraphicsClear(graphics, 0xff000000); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipSetClipRect(graphics, 5, 5, -5, -5, CombineModeReplace); + expect(Ok, status); + status = GdipGetClip(graphics, clip); + expect(Ok, status); + status = GdipGetRegionData(clip, (BYTE*)&region_data, sizeof(region_data), &region_data_size); + expect(Ok, status); + expect(36, region_data_size); + expect(28, region_data.size); + expect(0, region_data.num_children); + expect(0x10000000 /* RegionDataRect */, region_data.element_type); + expectf(0.0, region_data.x); + expectf(0.0, region_data.y); + expectf(5.0, region_data.width); + expectf(5.0, region_data.height); + + status = GdipGraphicsClear(graphics, 0xffff0000); + expect(Ok, status); + color = GetPixel(hdc, 5, 5); + expect(0xff, color); + + GdipDeleteGraphics(graphics); + ReleaseDC(hwnd, hdc); +} + static void test_isempty(void) { GpStatus status; @@ -6713,6 +6804,7 @@ START_TEST(graphics) test_BeginContainer2(); test_transformpoints(); test_get_set_clip(); + test_clip_xform(); test_isempty(); test_clear(); test_textcontrast();

1 0

Vincent Povirk : gdiplus: Transform region rects as rects when possible.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 2329a2fa3d0e3583db1369f8c42b3f06f3493212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2329a2fa3d0e3583db1369f8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 7 11:31:00 2018 -0600 gdiplus: Transform region rects as rects when possible. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/region.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 8eb3ff3..470bcd2 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1398,10 +1398,46 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr return Ok; case RegionDataRect: { - /* We can't transform a rectangle, so convert it to a path. */ GpRegion *new_region; GpPath *path; + if (matrix->matrix[1] == 0.0 && matrix->matrix[2] == 0.0) + { + GpPointF points[2]; + + points[0].X = element->elementdata.rect.X; + points[0].Y = element->elementdata.rect.Y; + points[1].X = element->elementdata.rect.X + element->elementdata.rect.Width; + points[1].Y = element->elementdata.rect.Y + element->elementdata.rect.Height; + + stat = GdipTransformMatrixPoints(matrix, points, 2); + if (stat != Ok) + return stat; + + if (points[0].X > points[1].X) + { + REAL temp; + temp = points[0].X; + points[0].X = points[1].X; + points[1].X = temp; + } + + if (points[0].Y > points[1].Y) + { + REAL temp; + temp = points[0].Y; + points[0].Y = points[1].Y; + points[1].Y = temp; + } + + element->elementdata.rect.X = points[0].X; + element->elementdata.rect.Y = points[0].Y; + element->elementdata.rect.Width = points[1].X - points[0].X; + element->elementdata.rect.Height = points[1].Y - points[0].Y; + return Ok; + } + + /* We can't rotate/shear a rectangle, so convert it to a path. */ stat = GdipCreatePath(FillModeAlternate, &path); if (stat == Ok) { diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 86a2e40..c2cbff0 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1441,6 +1441,22 @@ static void test_translate(void) ReleaseDC(0, hdc); } +static DWORD get_region_type(GpRegion *region) +{ + DWORD *data; + DWORD size; + DWORD result; + DWORD status; + status = GdipGetRegionDataSize(region, &size); + expect(Ok, status); + data = GdipAlloc(size); + status = GdipGetRegionData(region, (BYTE*)data, size, NULL); + ok(status == Ok || status == InsufficientBuffer, "unexpected status 0x%x\n", status); + result = data[4]; + GdipFree(data); + return result; +} + static void test_transform(void) { GpRegion *region, *region2; @@ -1451,6 +1467,7 @@ static void test_transform(void) GpStatus status; HDC hdc = GetDC(0); BOOL res; + DWORD type; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); @@ -1483,6 +1500,8 @@ static void test_transform(void) status = GdipIsEqualRegion(region, region2, graphics, &res); expect(Ok, status); ok(res, "Expected to be equal.\n"); + type = get_region_type(region); + expect(0x10000003 /* RegionDataInfiniteRect */, type); /* empty */ status = GdipSetEmpty(region); @@ -1497,6 +1516,8 @@ static void test_transform(void) status = GdipIsEqualRegion(region, region2, graphics, &res); expect(Ok, status); ok(res, "Expected to be equal.\n"); + type = get_region_type(region); + expect(0x10000002 /* RegionDataEmptyRect */, type); /* rect */ rectf.X = 10.0; @@ -1516,6 +1537,8 @@ static void test_transform(void) status = GdipIsEqualRegion(region, region2, graphics, &res); expect(Ok, status); ok(res, "Expected to be equal.\n"); + type = get_region_type(region); + expect(0x10000000 /* RegionDataRect */, type); /* path */ status = GdipAddPathEllipse(path, 0.0, 10.0, 100.0, 150.0); @@ -1534,6 +1557,21 @@ static void test_transform(void) status = GdipIsEqualRegion(region, region2, graphics, &res); expect(Ok, status); ok(res, "Expected to be equal.\n"); + type = get_region_type(region); + expect(0x10000001 /* RegionDataPath */, type); + + /* rotated rect -> path */ + rectf.X = 10.0; + rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + expect(Ok, status); + status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipTransformRegion(region, matrix); + expect(Ok, status); + type = get_region_type(region); + expect(0x10000001 /* RegionDataPath */, type); status = GdipDeleteRegion(region); expect(Ok, status);

1 0

Hans Leidekker : kernel32: Don' t return an error from TransactNamedPipe if an overlapped pointer is passed.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: bd7fb5b59e880d5c2da178763a9620e1d72abbae URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7fb5b59e880d5c2da17876… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 7 16:59:40 2018 +0100 kernel32: Don't return an error from TransactNamedPipe if an overlapped pointer is passed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 972dbcc..4e85aed 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1731,10 +1731,7 @@ BOOL WINAPI TransactNamedPipe( read_size, bytes_read, overlapped); if (overlapped) - { FIXME("Doesn't support overlapped operation as yet\n"); - return FALSE; - } r = WriteFile(handle, write_buf, write_size, &count, NULL); if (r)

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018