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

Francois Gouget : wined3d: Add a trailing linefeed to a couple of FIXME().
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 7a94687f46c731de3c847ce67597c8da37f90b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a94687f46c731de3c847ce6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:13:58 2021 +0200 wined3d: Add a trailing linefeed to a couple of FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2caad29d369..638d0288e60 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -416,7 +416,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont } if (src_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, src_texture, src_sub_resource_idx, src_location, src_rect, @@ -554,7 +554,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont if (dst_texture != dst_save_texture) { if (dst_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, dst_texture, 0, dst_location, dst_rect,

1 0

Rémi Bernon : user32: Factor GetKeyboardLayoutNameW implementations.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: c4e6d16271f7b05f5d7c88544b049daaa5c7a3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e6d16271f7b05f5d7c8854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:12 2021 +0200 user32: Factor GetKeyboardLayoutNameW implementations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 ------------- dlls/user32/input.c | 20 ++++++++++++++++---- dlls/user32/user_private.h | 1 - dlls/winemac.drv/keyboard.c | 15 --------------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/winex11.drv.spec | 1 - 7 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c213f6ecb10..0d0133fe9f5 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -109,7 +109,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(Beep); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayoutList); - GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); GET_USER_FUNC(RegisterHotKey); @@ -205,11 +204,6 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) return -1; /* use default implementation */ } -static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return FALSE; -} - static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return 0; @@ -422,7 +416,6 @@ static USER_DRIVER null_driver = nulldrv_Beep, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayoutList, - nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, nulldrv_RegisterHotKey, @@ -500,11 +493,6 @@ static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts ) return load_driver()->pGetKeyboardLayoutList( size, layouts ); } -static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return load_driver()->pGetKeyboardLayoutName( name ); -} - static HKL CDECL loaderdrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return load_driver()->pLoadKeyboardLayout( name, flags ); @@ -631,7 +619,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_Beep, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayoutList, - loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, loaderdrv_RegisterHotKey, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index bebdc3e012b..70eca90b425 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1108,14 +1108,26 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) /**************************************************************************** * GetKeyboardLayoutNameW (USER32.@) */ -BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) +BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { - if (!pwszKLID) + DWORD tmp; + HKL layout; + + TRACE_(keyboard)( "name %p\n", name ); + + if (!name) { - SetLastError(ERROR_NOACCESS); + SetLastError( ERROR_NOACCESS ); return FALSE; } - return USER_Driver->pGetKeyboardLayoutName(pwszKLID); + + layout = GetKeyboardLayout( 0 ); + tmp = HandleToUlong( layout ); + if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); + swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); + + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); + return TRUE; } /**************************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 48aea824351..c31281b43e5 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -66,7 +66,6 @@ typedef struct tagUSER_DRIVER { void (CDECL *pBeep)(void); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); - BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index bdf01e115a0..f4b955cd46a 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1327,21 +1327,6 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) return count; } -/*********************************************************************** - * GetKeyboardLayoutName (MACDRV.@) - */ -BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong(GetKeyboardLayout(0)); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - /*********************************************************************** * MapVirtualKeyEx (MACDRV.@) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 18efd03319c..14667011213 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -15,7 +15,6 @@ @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayoutList(long ptr) macdrv_GetKeyboardLayoutList -@ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ce10f6ee1a3..d189f95a7d1 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1566,7 +1566,7 @@ static HKL get_locale_kbd_layout(void) /*********************************************************************** * GetKeyboardLayoutName (X11DRV.@) */ -BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) +static BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) { static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 809105f3b4f..eb5f7cecc6c 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -7,7 +7,6 @@ @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @ cdecl Beep() X11DRV_Beep @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText -@ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx

1 0

Rémi Bernon : user32: Read "Layout Id" from registry in GetKeyboardLayoutNameW.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 8ec1206ba011554608b0ef4448e6a04deaca551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec1206ba011554608b0ef44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:13 2021 +0200 user32: Read "Layout Id" from registry in GetKeyboardLayoutNameW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 70eca90b425..c447cb4b407 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1110,7 +1110,9 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { - DWORD tmp; + WCHAR klid[KL_NAMELENGTH], value[5]; + DWORD value_size, tmp, i = 0; + HKEY hkey; HKL layout; TRACE_(keyboard)( "name %p\n", name ); @@ -1126,6 +1128,25 @@ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", &hkey )) + { + while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) )) + { + value_size = sizeof(value); + if (!RegGetValueW( hkey, klid, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) + tmp = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff); + else + tmp = wcstoul( klid, NULL, 16 ); + + if (HIWORD( layout ) == tmp) + { + lstrcpynW( name, klid, KL_NAMELENGTH ); + break; + } + } + RegCloseKey( hkey ); + } + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); return TRUE; }

1 0

Rémi Bernon : user32: Set keyboard layout preload key on init.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 512112ebd5bc9db55c1e2da6dc1605804a0e5fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=512112ebd5bc9db55c1e2da6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:14 2021 +0200 user32: Set keyboard layout preload key on init. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 19 +++++++++++++++++++ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/keyboard.c | 39 --------------------------------------- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c447cb4b407..2ee1df729a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -114,6 +114,25 @@ static HKL get_locale_kbd_layout(void) } +/********************************************************************** + * keyboard_init + */ +void keyboard_init(void) +{ + WCHAR layout[KL_NAMELENGTH]; + HKEY hkey; + + if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + return; + + if (GetKeyboardLayoutNameW( layout )) + RegSetValueExW( hkey, L"1", 0, REG_SZ, (const BYTE *)layout, sizeof(layout) ); + + RegCloseKey( hkey ); +} + + /********************************************************************** * set_capture_window */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c4c4853c213..303f19accfc 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -331,6 +331,7 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); + keyboard_init(); return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c31281b43e5..1c7ac3355bc 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -242,6 +242,8 @@ struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); extern struct rawinput_thread_data *rawinput_thread_data(void); +extern void keyboard_init(void) DECLSPEC_HIDDEN; + extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d189f95a7d1..7cf2d84ac3c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1563,43 +1563,6 @@ static HKL get_locale_kbd_layout(void) return (HKL)layout; } -/*********************************************************************** - * GetKeyboardLayoutName (X11DRV.@) - */ -static BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong( get_locale_kbd_layout() ); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - -static void set_kbd_layout_preload_key(void) -{ - static const WCHAR preload[] = - {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d',0}; - static const WCHAR one[] = {'1',0}; - - HKEY hkey; - WCHAR layout[KL_NAMELENGTH]; - - if (RegCreateKeyExW(HKEY_CURRENT_USER, preload, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL)) - return; - - if (!RegQueryValueExW(hkey, one, NULL, NULL, NULL, NULL)) - { - RegCloseKey(hkey); - return; - } - if (X11DRV_GetKeyboardLayoutName(layout)) - RegSetValueExW(hkey, one, 0, REG_SZ, (const BYTE *)layout, sizeof(layout)); - - RegCloseKey(hkey); -} /********************************************************************** * X11DRV_InitKeyboard @@ -1634,8 +1597,6 @@ void X11DRV_InitKeyboard( Display *display ) }; int vkey_range; - set_kbd_layout_preload_key(); - EnterCriticalSection( &kbd_section ); XDisplayKeycodes(display, &min_keycode, &max_keycode); if (key_mapping) XFree( key_mapping );

1 0

Rémi Bernon : user32: Adjust ToUnicodeEx control code translation.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: e2cc12132765c41442fc0657927cf2e83ae690c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2cc12132765c41442fc0657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:15 2021 +0200 user32: Adjust ToUnicodeEx control code translation. To match VkKeyScanW and pass corresponding tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2ee1df729a5..adeb4f66804 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1323,8 +1323,11 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, case VK_OEM_4: buffer[0] = 0x1b; break; case VK_OEM_5: buffer[0] = 0x1c; break; case VK_OEM_6: buffer[0] = 0x1d; break; - case VK_SUBTRACT: buffer[0] = 0x1e; break; + case '6': buffer[0] = shift ? 0x1e : 0; break; + case VK_OEM_MINUS: buffer[0] = shift ? 0x1f : 0; break; + case VK_BACK: buffer[0] = 0x7f; break; case VK_RETURN: buffer[0] = shift ? 0 : '\n'; break; + case '2': buffer[0] = shift ? 0xffff : 0xf000; break; case VK_SPACE: buffer[0] = ' '; break; default: if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; @@ -1335,6 +1338,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, else buffer[0] = 0; buffer[1] = 0; len = wcslen( buffer ); + if (buffer[0] == 0xffff) buffer[0] = 0; lstrcpynW( str, buffer, size ); TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) );

1 0

Rémi Bernon : user32: Return success in nulldrv cursor callbacks.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: a64861fb66be722f3a93ab73152c5d477ba3bd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64861fb66be722f3a93ab73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:16 2021 +0200 user32: Return success in nulldrv cursor callbacks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 0d0133fe9f5..36438fa44c8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -249,17 +249,17 @@ static void CDECL nulldrv_SetCursor( HCURSOR cursor ) static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) { - return FALSE; + return TRUE; } static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { - return FALSE; + return TRUE; } static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) { - return FALSE; + return TRUE; } static void CDECL nulldrv_UpdateClipboard(void)

1 0

Henri Verbeet : d3d11/tests: Add some tests for copying between depth/stencil and colour formats.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: a1bcc9b7ad6284d8c4cce5ef5963147754e7ec7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1bcc9b7ad6284d8c4cce5ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:16 2021 +0200 d3d11/tests: Add some tests for copying between depth/stencil and colour formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index df13d446de5..989347ccac5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28184,6 +28184,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -28213,6 +28215,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, TRUE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -28235,7 +28241,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -28247,7 +28252,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -28258,6 +28264,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -28282,10 +28289,11 @@ static void test_format_compatibility(void) x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); - expected = test_data[i].success && x >= texel_dwords && y - ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + expected = test_data[i].success && !test_data[i].src_ds && !test_data[i].dst_ds + && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + todo_wine_if((test_data[i].src_ds || test_data[i].dst_ds) && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -28298,8 +28306,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0

Henri Verbeet : d3d10core/tests: Add some tests for copying between depth/stencil and colour formats.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: dfb6c307541efb6144b720775728cd980023bbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb6c307541efb6144b72077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:17 2021 +0200 d3d10core/tests: Add some tests for copying between depth/stencil and colour formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d23857a14bf..def80870fd5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16112,6 +16112,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -16140,6 +16142,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, FALSE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, FALSE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -16161,7 +16167,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -16172,7 +16177,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D10_USAGE_DEFAULT : D3D10_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -16183,6 +16189,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -16201,7 +16208,9 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + /* While partial depth/stencil <-> colour copies are unsupported in + * d3d11, they're just broken in d3d10. */ + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !test_data[i].src_ds; ++j) { x = j % 4; y = j / 4; @@ -16222,8 +16231,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0

Henri Verbeet : wined3d: Reject blits between depth/stencil and colour resources in the raw blitter.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 769e2be52ff7893b0dd97a3eaf6bb4582b327080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769e2be52ff7893b0dd97a3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:18 2021 +0200 wined3d: Reject blits between depth/stencil and colour resources in the raw blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 7 ++++--- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/texture.c | 11 +++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index def80870fd5..6c381f62840 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16217,8 +16217,9 @@ static void test_format_compatibility(void) colour = get_readback_color(&rb, x, y); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].dst_ds && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -16231,7 +16232,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds) + todo_wine_if(test_data[i].dst_ds || test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 989347ccac5..6dcc98e0ac4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28306,7 +28306,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + todo_wine_if(!test_data[i].dst_ds && test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1d1b64ad60d..24ff5874841 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6082,12 +6082,19 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; + bool src_ds, dst_ds; DWORD location; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it - * to copy the resource contents to the texture anyway. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT + * to copy the resource contents to the texture anyway. + * + * We also can't copy between depth/stencil and colour resources, since + * the formats are considered incompatible in OpenGL. */ + if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)))))

1 0

Henri Verbeet : wined3d: Reject blits between depth/stencil and colour attachments in the FBO blitter.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 850f465c67994f2f54101eeff991ace5d6cb8fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850f465c67994f2f54101eef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:19 2021 +0200 wined3d: Reject blits between depth/stencil and colour attachments in the FBO blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 24ff5874841..2caad29d369 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -269,6 +269,7 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win { const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; + bool src_ds, dst_ds; if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return false; @@ -280,6 +281,16 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return false; + /* We can't copy between depth/stencil and colour attachments. One notable + * way we can end up here is when copying between typeless resources with + * formats like R16_TYPELESS, which can end up using either a + * depth/stencil or a colour format on the OpenGL side, depending on the + * resource's bind flags. */ + src_ds = src_format->depth_size || src_format->stencil_size; + dst_ds = dst_format->depth_size || dst_format->stencil_size; + if (src_ds != dst_ds) + return false; + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT:

1 0