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

[PATCH 3/4] kernel32: Always create file with FILE_READ_ATTRIBUTES access in CreateFile.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 5 +++++ dlls/ntdll/tests/pipe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] kernel32: Use proper access flags in CreatePipe.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 6 +++--- dlls/kernel32/tests/pipe.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] ntdll: Allow FileAccessInformation to be queried on files without fds.
by Jacek Caban 20 Aug '18

20 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] user32: Call DefWindowProc() in DesktopWndProc().
by Józef Kucia 20 Aug '18

20 Aug '18

This fixes a regression introduced by commit fc14753dc0188a52a05243d5d82c4062b93daaff. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45485 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Tests included in the next patch show that DesktopWndProc() should not ignore all messages. Unfortunately, an ugly check is needed to skip processing message while the graphics driver is being loaded. It is necessary because WM_NCCALCSIZE initiates loading the graphics driver again. Also, another way to fix the regression is to call DefWindowProc() in winex11.desktop_wndproc_wrapper(), but fixing DesktopWndProc() looks like a more correct solution to me. --- dlls/user32/desktop.c | 6 +++++- dlls/user32/driver.c | 5 +++++ dlls/user32/user_private.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index d22e732fd5b9..68d8ee9116be 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "user_private.h" #include "wine/unicode.h" static HBRUSH hbrushPattern; @@ -128,7 +129,10 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP return TRUE; } default: - return 0; /* all other messages are ignored */ + /* Processing messages may initiate loading a driver recursively. */ + if (!USER_is_driver_loaded()) return 0; + + return DefWindowProcW( hwnd, message, wParam, lParam ); } } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd666..211c3466a7ee 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -190,6 +190,11 @@ void USER_unload_driver(void) HeapFree( GetProcessHeap(), 0, prev ); } +BOOL USER_is_driver_loaded(void) +{ + return USER_Driver != &lazy_load_driver; +} + /********************************************************************** * Null user driver diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a70ae9c433c..4bdfda8d6353 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -118,6 +118,7 @@ typedef struct tagUSER_DRIVER { extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL USER_is_driver_loaded(void) DECLSPEC_HIDDEN; struct received_message_info; -- 2.16.4

1 0

[PATCH v2] dinput8: Share source with dinput.
by Zebediah Figura 20 Aug '18

20 Aug '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Based on a patch by Andrew Wesie. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45568 --- v2: remove unnecessary #ifs, clean up formatting dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput_main.c | 62 ++++++++++- dlls/dinput8/Makefile.in | 17 ++- dlls/dinput8/dinput8_main.c | 247 -------------------------------------------- 4 files changed, 77 insertions(+), 250 deletions(-) delete mode 100644 dlls/dinput8/dinput8_main.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 5d287a3..b1107ee 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,7 @@ MODULE = dinput.dll IMPORTLIB = dinput IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) C_SRCS = \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e4538a0..32eedf1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -165,6 +165,63 @@ HRESULT WINAPI DirectInputCreateEx( } /****************************************************************************** + * DirectInput8Create (DINPUT8.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, + DWORD version, REFIID iid, void **out, IUnknown *outer) +{ + IDirectInputImpl *This; + HRESULT hr; + + TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", + hinst, version, debugstr_guid(iid), out, outer); + + if (!out) + return E_POINTER; + + if (!IsEqualGUID(&IID_IDirectInput8A, iid) && + !IsEqualGUID(&IID_IDirectInput8W, iid) && + !IsEqualGUID(&IID_IUnknown, iid)) + { + *out = NULL; + return DIERR_NOINTERFACE; + } + + hr = create_directinput_instance(iid, out, &This); + + if (FAILED(hr)) + { + ERR("Failed to create DirectInput, hr %#x.\n", hr); + return hr; + } + + /* When aggregation is used, the application needs to manually call Initialize(). */ + if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8A_iface); + *out = NULL; + return hr; + } + } + + if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8W_iface); + *out = NULL; + return hr; + } + } + + return S_OK; +} + +/****************************************************************************** * DirectInputCreateA (DINPUT.@) */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) @@ -1519,7 +1576,10 @@ static HRESULT WINAPI DICF_CreateInstance( IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) ) { + IsEqualGUID( &IID_IDirectInput7W, riid ) || + IsEqualGUID( &IID_IDirectInput8A, riid ) || + IsEqualGUID( &IID_IDirectInput8W, riid ) ) + { return create_directinput_instance(riid, ppobj, NULL); } diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 26672ae..6b62969 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,9 +1,22 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = uuid dxguid dinput ole32 advapi32 +IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 +EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) +PARENTSRC = ../dinput C_SRCS = \ - dinput8_main.c + config.c \ + data_formats.c \ + device.c \ + dinput_main.c \ + effect_linuxinput.c \ + joystick.c \ + joystick_linux.c \ + joystick_linuxinput.c \ + joystick_osx.c \ + keyboard.c \ + mouse.c IDL_SRCS = dinput8.idl diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c deleted file mode 100644 index 9824c76..0000000 --- a/dlls/dinput8/dinput8_main.c +++ /dev/null @@ -1,247 +0,0 @@ -/* DirectInput 8 - * - * Copyright 2002 TransGaming Technologies Inc. - * Copyright 2006 Roderick Colenbrander - * - * 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 - */ - -#include "config.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "dinput.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - -static HINSTANCE instance; -static LONG dll_count; - -/* - * Dll lifetime tracking declaration - */ -static void LockModule(void) -{ - InterlockedIncrement(&dll_count); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&dll_count); -} - -/****************************************************************************** - * DirectInput8Create (DINPUT8.@) - */ -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - IDirectInputA *pDI; - HRESULT hr, hrCo; - - TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); - - if (!ppDI) - return E_POINTER; - - if (!IsEqualGUID(&IID_IDirectInput8A, riid) && - !IsEqualGUID(&IID_IDirectInput8W, riid) && - !IsEqualGUID(&IID_IUnknown, riid)) - { - *ppDI = NULL; - return DIERR_NOINTERFACE; - } - - hrCo = CoInitialize(NULL); - - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); - - /* Ensure balance of calls. */ - if (SUCCEEDED(hrCo)) - CoUninitialize(); - - if (FAILED(hr)) { - ERR("CoCreateInstance failed with hr = 0x%08x\n", hr); - return hr; - } - - hr = IDirectInput_QueryInterface(pDI, riid, ppDI); - IDirectInput_Release(pDI); - - if (FAILED(hr)) - return hr; - - /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ - if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) { - IDirectInput8A *DI = *ppDI; - - hr = IDirectInput8_Initialize(DI, hinst, dwVersion); - if (FAILED(hr)) - { - IDirectInput8_Release(DI); - *ppDI = NULL; - return hr; - } - } - - if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) { - IDirectInput8W *DI = *ppDI; - - hr = IDirectInput8_Initialize(DI, hinst, dwVersion); - if (FAILED(hr)) - { - IDirectInput8_Release(DI); - *ppDI = NULL; - return hr; - } - } - - return S_OK; -} - -/******************************************************************************* - * DirectInput8 ClassFactory - */ -typedef struct -{ - /* IUnknown fields */ - IClassFactory IClassFactory_iface; -} IClassFactoryImpl; - -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); -} - -static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI DI8CF_AddRef(LPCLASSFACTORY iface) { - LockModule(); - return 2; -} - -static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) { - UnlockModule(); - return 1; -} - -static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) { - IDirectInputA *ppDI; - HRESULT hr; - - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&ppDI); - if (FAILED(hr)) - return hr; - - hr = IDirectInput_QueryInterface(ppDI, riid, ppobj); - IDirectInput_Release(ppDI); - - return hr; - } - - ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static HRESULT WINAPI DI8CF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%p)->(%d)\n", iface, dolock); - - if(dolock) - LockModule(); - else - UnlockModule(); - - return S_OK; -} - -static const IClassFactoryVtbl DI8CF_Vtbl = { - DI8CF_QueryInterface, - DI8CF_AddRef, - DI8CF_Release, - DI8CF_CreateInstance, - DI8CF_LockServer -}; -static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } }; - - -/*********************************************************************** - * DllCanUnloadNow (DINPUT8.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_count == 0 ? S_OK : S_FALSE; -} - -/*********************************************************************** - * DllGetClassObject (DINPUT8.@) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = &DINPUT8_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; -} - -/*********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - -/*********************************************************************** - * DllRegisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources( instance ); -} - -/*********************************************************************** - * DllUnregisterServer (DINPUT8.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources( instance ); -} -- 2.7.4

2 4

[PATCH 3/3] d3d10core/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8c95ee35c394..569c8eed51ac 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9241,6 +9241,92 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data[4]; + D3D10_TEXTURE1D_DESC texture1d_desc; + D3D10_TEXTURE2D_DESC texture2d_desc; + struct resource_readback rb; + ID3D10Texture1D *texture1d; + ID3D10Texture2D *texture2d; + ID3D10Device *device; + unsigned int i, j; + D3D10_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D10_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D10Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D10_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)texture2d, 0, + 0, i, 0, (ID3D10Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D10Texture1D_Release(texture1d); + ID3D10Texture2D_Release(texture2d); + release_test_context(&test_context); +} + #define check_buffer_cpu_access(a, b, c, d) check_buffer_cpu_access_(__LINE__, a, b, c, d) static void check_buffer_cpu_access_(unsigned int line, ID3D10Buffer *buffer, D3D10_USAGE usage, UINT bind_flags, UINT cpu_access) @@ -17112,6 +17198,7 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); + test_copy_subresource_region_1d(); test_resource_access(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); -- 2.16.4

2 1

[PATCH 1/3] wined3d: Allow multisample resolve for typeless resources.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> It may perform an undesired format conversion in rare cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39754 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This fixes black screen in a lot of Direct3D 11 games. The proper fix probably won't appear anytime soon. --- dlls/d3d10core/tests/device.c | 30 +++++++++++++++--------------- dlls/d3d11/tests/d3d11.c | 30 +++++++++++++++--------------- dlls/wined3d/device.c | 4 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f3c3d86ce178..8c95ee35c394 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16862,12 +16862,12 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, @@ -16877,69 +16877,69 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, }; if (!init_test_context(&test_context)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 60c88f4a24ce..bc2a53ed5840 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27295,12 +27295,12 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, @@ -27310,69 +27310,69 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xffe1bc89}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00, TRUE}, + &green, 0xff00ff00}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40, TRUE}, + &color, 0xffbf7f40}, }; if (!init_test_context(&test_context, NULL)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5079113120eb..0f7ef67bc96d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4293,10 +4293,10 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, if (wined3d_format_is_typeless(dst_resource->format) || wined3d_format_is_typeless(src_resource->format)) { - FIXME("Unhandled multisample resolve, dst_format %s, src_format %s, format %s.\n", + FIXME("Multisample resolve is not fully supported for typeless formats " + "(dst_format %s, src_format %s, format %s).\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id), debug_d3dformat(format_id)); - return; } if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) { -- 2.16.4

2 1

[PATCH 2/3] d3d11/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Józef Kucia 20 Aug '18

20 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bc2a53ed5840..e43b2f34f3b4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11908,6 +11908,94 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE1D_DESC texture1d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture1D *texture1d; + ID3D11Texture2D *texture2d; + ID3D11Device *device; + unsigned int i, j; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D11_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)texture2d, 0, + 0, i, 0, (ID3D11Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11Texture1D_Release(texture1d); + ID3D11Texture2D_Release(texture2d); + release_test_context(&test_context); +} + static void test_copy_subresource_region_3d(void) { ID3D11ShaderResourceView *dst_srv, *src_srv; @@ -28075,6 +28163,7 @@ START_TEST(d3d11) queue_test(test_fragment_coords); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_1d); queue_test(test_copy_subresource_region_3d); queue_test(test_resource_map); queue_for_each_feature_level(test_resource_access); -- 2.16.4

2 1

[PATCH v8 2/2] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng 20 Aug '18

20 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 9 ++++++++ dlls/riched20/tests/txtsrv.c | 41 +++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..8f35342b8e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,6 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; + const CHARFORMATW *host_cf; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -76,6 +77,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) style = ME_MakeStyle(&cf); text->pDefaultStyle = style; + if (ITextHost_TxGetCharFormat(editor->texthost, &host_cf) == S_OK) + { + ZeroMemory(&cf, sizeof(cf)); + cf.cbSize = sizeof(cf); + cfany_to_cf2w(&cf, (CHARFORMAT2W *)host_cf); + ME_SetDefaultCharFormat(editor, &cf); + } + eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca2cd..4dee5fd269 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + const CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, &host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.18.0

2 1

[PATCH v8 1/2] riched20: Initialize style_list before ME_MakeFirstParagraph().
by Jactry Zeng 20 Aug '18

20 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8020117fd2..12f1fa67c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3047,6 +3047,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ + list_init( &ed->style_list ); ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -3146,7 +3147,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; - list_init( &ed->style_list ); list_init( &ed->reobj_list ); OleInitialize(NULL); -- 2.18.0

2 1