May 2020 - Wine-commits - list.winehq.org

Jacek Caban : winecrt0: Build exception functions on clang msvc target.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9666ed9c466d803eec868e5db1d63c10b614d4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9666ed9c466d803eec868e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:56 2020 +0200 winecrt0: Build exception functions on clang msvc target. We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3a0ecfef68..137ee2d6ee 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,7 +23,9 @@ #include "wine/exception.h" #include "wine/asm.h" -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) || defined(__clang__) + +#if defined(__i386__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movl 4(%esp),%ecx\n\t" /* jmp_buf */ @@ -62,7 +64,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "call " __ASM_STDCALL("RtlUnwind",16) "\n\t" "call *16(%ebp)" ) -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ @@ -134,7 +136,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, /* we need an extra call to make sure the stack is correctly aligned */ "callq *%rax" ) -#elif defined(__GNUC__) && defined(__arm__) +#elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str r1, [r0]\n\t" /* jmp_buf->Frame */ @@ -196,7 +198,7 @@ void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_ for (;;) target(); } -#elif defined(__GNUC__) && defined(__aarch64__) +#elif defined(__aarch64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str x1, [x0]\n\t" /* jmp_buf->Frame */ @@ -383,3 +385,5 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +#endif /* __GNUC__ || __clang__ */

1 0

Jacek Caban : winecrt0: Add _fltused symbol.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 053f07f602e2ead81d3764ec8cb4279614285e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=053f07f602e2ead81d3764ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:06 2020 +0200 winecrt0: Add _fltused symbol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index bcbd4e3b55..18a116e578 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -2,6 +2,7 @@ MODULE = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ + crt_fltused.c \ debug.c \ delay_load.c \ dll_main.c \ diff --git a/dlls/winecrt0/crt_fltused.c b/dlls/winecrt0/crt_fltused.c new file mode 100644 index 0000000000..f65fc2d96c --- /dev/null +++ b/dlls/winecrt0/crt_fltused.c @@ -0,0 +1,24 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +/* referenced by MSVC to pull crt support for floating points. we don't use it. */ +int _fltused = 0; + +#endif

1 0

Jacek Caban : configure: Assume that -delayload linker argument is supported when -target argument is used.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 3cae9288ea6066fd9dcea1459ad1722e53f8216c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cae9288ea6066fd9dcea145… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:15 2020 +0200 configure: Assume that -delayload linker argument is supported when -target argument is used. In practice, it's present only on clang and it always needs to be used there. mingw and msvc targets have different syntax. We take care of that in winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 83 +++++++++++++++++++----------------------------------------- configure.ac | 3 +-- 3 files changed, 28 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cae9288ea6066fd9dce…

1 0

Jacek Caban : configure: Allow specifying default CROSSTARGET as configure argument.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 583ad67ff0f7290c2e30978d8a16e909a1f24dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583ad67ff0f7290c2e30978d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:30:58 2020 +0200 configure: Allow specifying default CROSSTARGET as configure argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index f730956951..47a2a25219 100755 --- a/configure +++ b/configure @@ -9732,7 +9732,6 @@ enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} -CROSSTARGET="" if test "x$with_mingw" != xno then diff --git a/configure.ac b/configure.ac index 3716f4f46f..103e81e285 100644 --- a/configure.ac +++ b/configure.ac @@ -1023,7 +1023,7 @@ enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl Check for cross compiler to build test programs -AC_SUBST(CROSSTARGET,"") +AC_SUBST(CROSSTARGET) if test "x$with_mingw" != xno then case "x$with_mingw" in

1 0

Jacek Caban : configure: Explicitly specify subsystem when using msvc target.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: c8905b2880aff43ce4660e751d54ecfc55deab2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8905b2880aff43ce4660e75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:31:19 2020 +0200 configure: Explicitly specify subsystem when using msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14 +++++++++----- configure.ac | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 47a2a25219..3c6c360a44 100755 --- a/configure +++ b/configure @@ -9847,6 +9847,7 @@ $as_echo "$wine_cv_crosscc" >&6; } done llvm_target=$CROSSTARGET + llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $host_cpu in @@ -9854,16 +9855,19 @@ $as_echo "$wine_cv_crosscc" >&6; } *) llvm_target=$host_cpu-windows-gnu ;; esac fi - as_ac_var=`$as_echo "ac_cv_crosscflags_-target $llvm_target -fuse-ld=lld" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld" >&5 -$as_echo_n "checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld... " >&6; } + case $llvm_target in + *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + esac + as_ac_var=`$as_echo "ac_cv_crosscflags_-target $llvm_target $llvm_cflags" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -target $llvm_target $llvm_cflags" >&5 +$as_echo_n "checking whether the cross-compiler supports -target $llvm_target $llvm_cflags... " >&6; } if eval \${$as_ac_var+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved_cc=$CC ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -target $llvm_target -fuse-ld=lld" +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -target $llvm_target $llvm_cflags" CC="$CROSSCC" ac_exeext=".exe" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9889,7 +9893,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" DELAYLOADFLAG="-Wl,-delayload," - CFLAGS="$CFLAGS -fuse-ld=lld" + CFLAGS="$CFLAGS $llvm_cflags" fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 diff --git a/configure.ac b/configure.ac index 103e81e285..d4a92d3cbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1057,6 +1057,7 @@ then dnl Check if cross compiler supports -target argument llvm_target=$CROSSTARGET + llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $host_cpu in @@ -1064,11 +1065,14 @@ then *) llvm_target=$host_cpu-windows-gnu ;; esac fi - WINE_TRY_CROSSCFLAGS([-target $llvm_target -fuse-ld=lld], + case $llvm_target in + *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + esac + WINE_TRY_CROSSCFLAGS([-target $llvm_target $llvm_cflags], [CROSSTARGET=$llvm_target EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"]) - CFLAGS="$CFLAGS -fuse-ld=lld"]) + CFLAGS="$CFLAGS $llvm_cflags"]) fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options

1 0

Derek Lesho : mf: Add missing ::Release of clock timer.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1962a1f969e110b3effe6776fc03af68301c1d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1962a1f969e110b3effe6776… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue May 5 09:59:00 2020 -0500 mf: Add missing ::Release of clock timer. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4d..d6b881218b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4289,6 +4289,7 @@ static HRESULT WINAPI present_clock_timer_callback_Invoke(IMFAsyncCallback *ifac EnterCriticalSection(&clock->cs); list_remove(&timer->entry); + IUnknown_Release(&timer->IUnknown_iface); LeaveCriticalSection(&clock->cs); IMFAsyncCallback_Invoke(timer->callback, timer->result);

1 0

Zebediah Figura : ddraw/tests: Add more tests for EnumSurfaces().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 2389fae064cc34ba1e87fdfc2b46691414817541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2389fae064cc34ba1e87fdfc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:06 2020 -0500 ddraw/tests: Add more tests for EnumSurfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 168 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 169 ++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 636 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2389fae064cc34ba1e87…

1 0

Zebediah Figura : ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8e8e0f48c42587af372c0dcc7f0e98ee3ae506d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8e0f48c42587af372c0dcc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:07 2020 -0500 ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b7e7e6514a..afd2875ea2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3213,7 +3213,7 @@ static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, +static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD flags, DDSURFACEDESC2 *DDSD, void *Context, LPDDENUMSURFACESCALLBACK7 Callback) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); @@ -3223,10 +3223,10 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, struct list *entry, *entry2; TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n", - iface, Flags, DDSD, Context, Callback); + iface, flags, DDSD, Context, Callback); - all = Flags & DDENUMSURFACES_ALL; - nomatch = Flags & DDENUMSURFACES_NOMATCH; + all = flags & DDENUMSURFACES_ALL; + nomatch = !!(flags & DDENUMSURFACES_NOMATCH); if (!Callback) return DDERR_INVALIDPARAMS; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0e1de7909d..4a1818af6a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12229,7 +12229,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8d38344520..03615c61ce 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13205,7 +13205,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3a3983639d..ce6c8aaf22 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15793,7 +15793,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bf31d3915b..466fcc544a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15203,7 +15203,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0;

1 0

Zebediah Figura : ddraw: Implement DDENUMSURFACES_CANBECREATED.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 616585d7fbd7cd447a9e66a86f5dc8272584bb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=616585d7fbd7cd447a9e66a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:08 2020 -0500 ddraw: Implement DDENUMSURFACES_CANBECREATED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17233 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 137 +++++++++++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw1.c | 16 +++--- dlls/ddraw/tests/ddraw2.c | 16 +++--- dlls/ddraw/tests/ddraw4.c | 16 +++--- dlls/ddraw/tests/ddraw7.c | 16 +++--- 5 files changed, 142 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=616585d7fbd7cd447a9e…

1 0

Zhiyi Zhang : dxgi/tests: Fix a possible test failure on D3D12.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 58486350eb202f8c570a630a5d18f1a028c2512a URL: https://source.winehq.org/git/wine.git/?a=commit;h=58486350eb202f8c570a630a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:45:52 2020 +0800 dxgi/tests: Fix a possible test failure on D3D12. Calling d3d12_swapchain_Present() right after switching to full screen mode may fail because the swapchain window may be in the animation of becoming full screen and vkQueuePresentKHR() returns VK_ERROR_OUT_OF_DATE_KHR, even after d3d12_swapchain_present() tried to recreate the swapchain. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 32aae2567f..4ca0b952f8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -129,6 +129,24 @@ static void get_virtual_rect(RECT *rect) rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + int diff = 200; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -4276,6 +4294,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } + flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4427,6 +4446,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); + flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4903,24 +4923,6 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -/* try to make sure pending X events have been processed before continuing */ -static void flush_events(void) -{ - int diff = 200; - DWORD time; - MSG msg; - - time = GetTickCount() + diff; - while (diff > 0) - { - if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) - break; - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - DispatchMessageA(&msg); - diff = time - GetTickCount(); - } -} - struct adapter_info { const WCHAR *name;

1 0