January 2017 - Wine-Commits

Józef Kucia : d3d9: Reject render target surfaces created for other devices.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: c1aba7cd8b35f100e594805956964b962dc30a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1aba7cd8b35f100e59480595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:32 2017 +0100 d3d9: Reject render target surfaces created for other devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 10 ++++++++-- dlls/d3d9/surface.c | 7 +++++++ dlls/d3d9/tests/device.c | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 3317e9c..20c4c5c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -230,6 +230,7 @@ struct d3d9_surface struct d3d9_texture *texture; }; +struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dab19ab..d47c705 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1523,8 +1523,14 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO if (!idx && !surface_impl) { - WARN("Trying to set render target 0 to NULL.\n"); - return D3DERR_INVALIDCALL; + WARN("Trying to set render target 0 to NULL.\n"); + return D3DERR_INVALIDCALL; + } + + if (surface_impl && d3d9_surface_get_device(surface_impl) != device) + { + WARN("Render target surface does not match device.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index be68682..12e0f39 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -389,6 +389,13 @@ static const struct wined3d_parent_ops d3d9_view_wined3d_parent_ops = view_wined3d_object_destroyed, }; +struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) +{ + IDirect3DDevice9Ex *device; + device = surface->texture ? surface->texture->parent_device : surface->parent_device; + return impl_from_IDirect3DDevice9Ex(device); +} + struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) { HRESULT hr; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fbae9d6..aa266a5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11375,7 +11375,7 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(surface); @@ -11383,13 +11383,13 @@ static void test_render_target_device_mismatch(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - todo_wine ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); + ok(surface == rt, "Got unexpected render target %p, expected %p.\n", surface, rt); IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(rt);

1 0

Józef Kucia : d3d10core/tests: Add test for render target device mismatch.
by Alexandre Julliard Jan. 3, 2017

Jan. 3, 2017

Module: wine Branch: master Commit: 6c490d14689f0544db2b06a4d688c88c422f0864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c490d14689f0544db2b06a4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 3 13:46:29 2017 +0100 d3d10core/tests: Add test for render target device mismatch. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e3d170a..0b38265 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10223,6 +10223,35 @@ static void test_primitive_restart(void) release_test_context(&test_context); } +static void test_render_target_device_mismatch(void) +{ + struct d3d10core_test_context test_context; + ID3D10RenderTargetView *rtv; + ID3D10Device *device; + ULONG refcount; + + if (!init_test_context(&test_context)) + return; + + device = create_device(); + ok(!!device, "Failed to create device.\n"); + + rtv = (ID3D10RenderTargetView *)0xdeadbeef; + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(!rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + + rtv = NULL; + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10281,4 +10310,5 @@ START_TEST(device) test_stencil_separate(); test_sm4_ret_instruction(); test_primitive_restart(); + test_render_target_device_mismatch(); }

1 0

Pierre Schweitzer : mpr: Enumerate connections capability before looking for functions entry points.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 96a93ee608b2919d1a8f583002e8262ef54a6743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a93ee608b2919d1a8f58300… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:17:27 2016 +0100 mpr: Enumerate connections capability before looking for functions entry points. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 50f71d2..cbbc1bd 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -178,6 +178,7 @@ static void _tryLoadProvider(PCWSTR provider) TRACE("loaded lib %p\n", hLib); if (getCaps) { + DWORD connectCap; PWNetProvider provider = &providerTable->table[providerTable->numProviders]; @@ -211,9 +212,13 @@ static void _tryLoadProvider(PCWSTR provider) WARN("Couldn't load enumeration functions\n"); } } - provider->addConnection = MPR_GETPROC(NPAddConnection); - provider->addConnection3 = MPR_GETPROC(NPAddConnection3); - provider->cancelConnection = MPR_GETPROC(NPCancelConnection); + connectCap = getCaps(WNNC_CONNECTION); + if (connectCap & WNNC_CON_ADDCONNECTION) + provider->addConnection = MPR_GETPROC(NPAddConnection); + if (connectCap & WNNC_CON_ADDCONNECTION3) + provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + if (connectCap & WNNC_CON_CANCELCONNECTION) + provider->cancelConnection = MPR_GETPROC(NPCancelConnection); TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); TRACE("NPCancelConnection %p\n", provider->cancelConnection);

1 0

Hugh McMaster : regedit: Import files using 'rb' mode.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 56959b18085ea22050d0226f669f112abfb37850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56959b18085ea22050d0226f6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 30 10:00:12 2016 +0000 regedit: Import files using 'rb' mode. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b1611cf..ed3ea9f 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -334,10 +334,10 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) static BOOL import_registry_filename(LPWSTR filename) { - static const WCHAR mode_r[] = {'r',0}; + static const WCHAR rb_mode[] = {'r','b',0}; BOOL Success; - FILE* reg_file = _wfopen(filename, mode_r); + FILE* reg_file = _wfopen(filename, rb_mode); if(!reg_file) return FALSE;

1 0

Jarkko Korpi : wined3d: Add Amd Rx 480 binary driver.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 7912563f7f3f3bb0d13f225bd570aa289eb67d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7912563f7f3f3bb0d13f225bd… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Mon Dec 26 07:31:44 2016 +0200 wined3d: Add Amd Rx 480 binary driver. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1aae20d..2d81a6d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1966,6 +1966,7 @@ cards_nvidia_binary[] = * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ cards_amd_binary[] = { + {"RX 480", CARD_AMD_RADEON_RX_480}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, {"HD 7800", CARD_AMD_RADEON_HD7800},

1 0

Andrew Eikum : dsound: Fix rolloff factor calculation.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 1671a83f55bee46ee57cc0c8869e943d67f14ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1671a83f55bee46ee57cc0c88… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 28 14:02:54 2016 -0600 dsound: Fix rolloff factor calculation. We should treat the rolloff factor as a factor of the distance of the buffer. For example, a rolloff factor of 2 should treat the buffer as if it were twice as far away from the listener as it is. The previous calculation would instead double the decibels of attenuation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/sound3d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index b416cdc..4f07125 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -205,9 +205,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flDistance < dsb->ds3db_ds3db.flMinDistance) flDistance = dsb->ds3db_ds3db.flMinDistance; + + flDistance = dsb->ds3db_ds3db.flMinDistance + (flDistance - dsb->ds3db_ds3db.flMinDistance) * dsb->device->ds3dl.flRolloffFactor; /* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ - lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000 * dsb->device->ds3dl.flRolloffFactor; + lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); /* conning */

1 0

Louis Lenders : wine.inf: Add Drivers32 registry key.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: a5d9d29721c2f1165863e20457c4fa0675338ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d9d29721c2f1165863e2045… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jan 2 00:15:15 2017 +0100 wine.inf: Add Drivers32 registry key. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1ffd037..b79a6c3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -506,6 +506,7 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 +HKLM,%CurrentVersionNT%\Drivers32,,16 HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16

1 0

Nikolay Sivov : user32/tests: Added some tests for FindWindow().
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: d437d61c57e8181c35034b46b4a9a233f87652e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d437d61c57e8181c35034b46b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 11:59:44 2017 +0300 user32/tests: Added some tests for FindWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ca99de4..4640109 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7978,6 +7978,16 @@ static void test_FindWindowEx(void) ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "ClassThatDoesntExist", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "ClassThatDoesntExist", NULL ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); @@ -8016,6 +8026,62 @@ static void test_FindWindowEx(void) ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); } +static void test_FindWindow(void) +{ + HWND hwnd, found; + + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + num_gettext_msgs = 0; + found = FindWindowA( "ClassThatDoesntExist", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "ClassThatDoesntExist", NULL ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", NULL ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "caption" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + DestroyWindow( hwnd ); + + hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", NULL ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + DestroyWindow( hwnd ); + + /* test behaviour with a window title that is an empty character */ + found = FindWindowA( "Shell_TrayWnd", "" ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); + found = FindWindowA( "Shell_TrayWnd", NULL ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); +} + static void test_GetLastActivePopup(void) { HWND hwndOwner, hwndPopup1, hwndPopup2; @@ -9500,6 +9566,7 @@ START_TEST(win) /* make sure that these tests are executed first */ test_FindWindowEx(); + test_FindWindow(); test_SetParent(); hwndMain2 = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window 2",

1 0

Alexandre Julliard : Update copyright info for 2017.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 1f8974e6e8720b887d2221bcfbb157d003c0eb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8974e6e8720b887d2221bcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 16:05:08 2017 +0100 Update copyright info for 2017. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index c35515e..1065ca6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 8dbb85b..eb36403 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index fcf1385..76ddabf 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alexandre Julliard : ole32/tests: Add a test for WM_DRAWCLIPBOARD during OleSetClipboard.
by Alexandre Julliard Jan. 2, 2017

Jan. 2, 2017

Module: wine Branch: master Commit: 526b19551b89d21b3a536d3ee205c734b24a889d URL: http://source.winehq.org/git/wine.git/?a=commit;h=526b19551b89d21b3a536d3ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 12:13:28 2017 +0100 ole32/tests: Add a test for WM_DRAWCLIPBOARD during OleSetClipboard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index bf93628..a30796c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -945,6 +945,104 @@ static void test_set_clipboard(void) OleUninitialize(); } +static LPDATAOBJECT clip_data; +static HWND next_wnd; +static UINT wm_drawclipboard; + +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + LRESULT ret; + + switch (msg) + { + case WM_DRAWCLIPBOARD: + wm_drawclipboard++; + if (clip_data) + { + /* if this is the WM_DRAWCLIPBOARD of a previous change, the data isn't current yet */ + /* this demonstrates an issue in Qt where it will free the data while it's being set */ + HRESULT hr = OleIsCurrentClipboard( clip_data ); + ok( hr == (wm_drawclipboard > 1) ? S_OK : S_FALSE, + "OleIsCurrentClipboard returned %x\n", hr ); + } + break; + case WM_CHANGECBCHAIN: + if (next_wnd == (HWND)wp) next_wnd = (HWND)lp; + else if (next_wnd) SendMessageA( next_wnd, msg, wp, lp ); + break; + case WM_USER: + ret = wm_drawclipboard; + wm_drawclipboard = 0; + return ret; + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static DWORD CALLBACK set_clipboard_thread(void *arg) +{ + OpenClipboard( GetDesktopWindow() ); + EmptyClipboard(); + SetClipboardData( CF_WAVE, 0 ); + CloseClipboard(); + return 0; +} + +/* test that WM_DRAWCLIPBOARD can be delivered for a previous change during OleSetClipboard */ +static void test_set_clipboard_DRAWCLIPBOARD(void) +{ + LPDATAOBJECT data; + HRESULT hr; + WNDCLASSA cls; + HWND viewer; + int ret; + HANDLE thread; + + hr = DataObjectImpl_CreateText("data", &data); + ok(hr == S_OK, "Failed to create data object: 0x%08x\n", hr); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "clipboard_test"; + RegisterClassA(&cls); + + viewer = CreateWindowA("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(viewer != NULL, "CreateWindow failed: %d\n", GetLastError()); + next_wnd = SetClipboardViewer( viewer ); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 1, "%u WM_DRAWCLIPBOARD received\n", ret ); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( !ret, "%u WM_DRAWCLIPBOARD received\n", ret ); + + thread = CreateThread(NULL, 0, set_clipboard_thread, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed (%d)\n", GetLastError()); + ret = WaitForSingleObject(thread, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + clip_data = data; + hr = OleSetClipboard(data); + ok(hr == S_OK, "failed to set clipboard to data, hr = 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 2, "%u WM_DRAWCLIPBOARD received\n", ret ); + + clip_data = NULL; + hr = OleFlushClipboard(); + ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); + ret = IDataObject_Release(data); + ok(ret == 0, "got %d\n", ret); + + OleUninitialize(); + ChangeClipboardChain( viewer, next_wnd ); + DestroyWindow( viewer ); +} + static inline ULONG count_refs(IDataObject *d) { IDataObject_AddRef(d); @@ -1594,6 +1692,7 @@ START_TEST(clipboard) { test_get_clipboard_uninitialized(); test_set_clipboard(); + test_set_clipboard_DRAWCLIPBOARD(); test_consumer_refs(); test_flushed_getdata(); test_nonole_clipboard();

1 0