June 2022 - Wine-Commits - list.winehq.org

Piotr Caban : d3dx10: Don't ignore HRESULT parameter in D3DX10CreateTextureFromMemory.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 56debb4918380ba5de3502cece966d971ddbd89f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56debb4918380ba5de3502ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 19:44:35 2022 +0200 d3dx10: Don't ignore HRESULT parameter in D3DX10CreateTextureFromMemory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 5 +++++ dlls/d3dx10_43/texture.c | 32 +++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 0c6c4e5c8ce..560bc7a8f17 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2172,6 +2172,11 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromMemory tests */ + resource = (ID3D10Resource *)0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(NULL, test_bmp_1bpp, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 9c7762bc617..d5066b9793b 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -581,7 +581,9 @@ HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *sr TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_a(src_file), load_info, pump, texture, hresult); - if (!src_file || !texture) + if (!device) + return E_INVALIDARG; + if (!src_file) return E_FAIL; if (!(str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0))) @@ -608,11 +610,17 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_w(src_file), load_info, pump, texture, hresult); - if (!src_file || !texture) + if (!device) + return E_INVALIDARG; + if (!src_file) return E_FAIL; if (FAILED((hr = load_file(src_file, &buffer, &size)))) + { + if (hresult) + *hresult = hr; return hr; + } hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); @@ -631,8 +639,8 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE mo TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_a(resource), load_info, pump, texture, hresult); - if (!resource || !texture) - return D3DX10_ERR_INVALID_DATA; + if (!device) + return E_INVALIDARG; hr = load_resourceA(module, resource, &buffer, &size); if (FAILED(hr)) @@ -651,8 +659,8 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE mo TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_w(resource), load_info, pump, texture, hresult); - if (!resource || !texture) - return D3DX10_ERR_INVALID_DATA; + if (!device) + return E_INVALIDARG; hr = load_resourceW(module, resource, &buffer, &size); if (FAILED(hr)) @@ -684,7 +692,9 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s TRACE("device %p, src_data %p, src_data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n", device, src_data, src_data_size, load_info, pump, texture, hresult); - if (!src_data || !src_data_size || !texture) + if (!device) + return E_INVALIDARG; + if (!src_data) return E_FAIL; if (load_info) FIXME("load_info is ignored.\n"); @@ -692,10 +702,16 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s FIXME("Thread pump is not supported yet.\n"); if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) + { + if (hresult) + *hresult = E_FAIL; return E_FAIL; + } if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) { FIXME("Cube map is not supported.\n"); + if (hresult) + *hresult = E_FAIL; return E_FAIL; } @@ -807,5 +823,7 @@ end: if (factory) IWICImagingFactory_Release(factory); + if (hresult) + *hresult = hr; return hr; }

1 0

Jacek Caban : win32u: Move process default layout handling from user32.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 07f2cc9dda1c71a845e901f3270cc19fca9dbed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f2cc9dda1c71a845e901f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 01:49:12 2022 +0200 win32u: Move process default layout handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 4 ++++ dlls/user32/win.c | 20 ++++---------------- dlls/win32u/sysparams.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 1 + include/ntuser.h | 12 ++++++++++++ 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 620477f1b14..76e2688bb82 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -309,6 +309,8 @@ static void load_uxtheme(void) */ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { + DWORD layout; + register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); @@ -322,6 +324,8 @@ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, register_builtin( &STATIC_builtin_class ); register_builtin( &IME_builtin_class ); + GetProcessDefaultLayout( &layout ); /* make sure that process layout is initialized */ + /* Load uxtheme.dll so that standard scrollbars and dialogs are hooked for theming support */ load_uxtheme(); return TRUE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 99753791f09..9d19376fe44 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -static DWORD process_layout = ~0u; - /*********************************************************************** * get_user_handle_ptr @@ -626,15 +624,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - /* FIXME: move to win32u */ - if (!cs->hwndParent && className != (const WCHAR *)DESKTOP_CLASS_ATOM && - (IS_INTRESOURCE(className) || wcsicmp( className, L"Message" ))) - { - DWORD layout; - GetProcessDefaultLayout( &layout ); - if (layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; - } - menu = cs->hMenu; if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); @@ -1610,7 +1599,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) SetLastError( ERROR_NOACCESS ); return FALSE; } - if (process_layout == ~0u) + *layout = NtUserGetProcessDefaultLayout(); + if (*layout == ~0u) { WCHAR *str, buffer[MAX_PATH]; DWORD i, version_layout = 0; @@ -1640,9 +1630,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) done: HeapFree( GetProcessHeap(), 0, data ); - process_layout = version_layout; + NtUserSetProcessDefaultLayout( *layout = version_layout ); } - *layout = process_layout; return TRUE; } @@ -1654,8 +1643,7 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) */ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) { - process_layout = layout; - return TRUE; + return NtUserSetProcessDefaultLayout( layout ); } #ifdef _WIN64 diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1c1d9ddc621..d4ab352ccbd 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -360,6 +360,7 @@ union sysparam_all_entry static UINT system_dpi; static RECT work_area; +DWORD process_layout = ~0u; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; @@ -4714,6 +4715,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetInputState: return get_input_state(); + case NtUserCallNoParam_GetProcessDefaultLayout: + return process_layout; + case NtUserCallNoParam_ReleaseCapture: return release_capture(); @@ -4805,6 +4809,10 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_SetCaretBlinkTime: return set_caret_blink_time( arg ); + case NtUserCallOneParam_SetProcessDefaultLayout: + process_layout = arg; + return TRUE; + /* temporary exports */ case NtUserCallHooks: { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d1bc382f031..23343c413dc 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -424,6 +424,7 @@ extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; +extern DWORD process_layout DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 5575b9a0381..431686bdcaa 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5126,6 +5126,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, (class_name->Length != sizeof(messageW) || wcsnicmp( class_name->Buffer, messageW, ARRAYSIZE(messageW) ))) { + if (process_layout & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; parent = get_desktop_window(); } } diff --git a/include/ntuser.h b/include/ntuser.h index cf8a909493b..1f3cc2f2e7e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -725,6 +725,7 @@ enum NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetDialogBaseUnits, NtUserCallNoParam_GetInputState, + NtUserCallNoParam_GetProcessDefaultLayout, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -751,6 +752,11 @@ static inline BOOL NtUserGetInputState(void) return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); } +static inline DWORD NtUserGetProcessDefaultLayout(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_GetProcessDefaultLayout ); +} + static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture ); @@ -780,6 +786,7 @@ enum NtUserCallOneParam_MessageBeep, NtUserCallOneParam_RealizePalette, NtUserCallOneParam_SetCaretBlinkTime, + NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ NtUserCallHooks, NtUserGetDeskPattern, @@ -898,6 +905,11 @@ static inline UINT NtUserRealizePalette( HDC hdc ) return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_RealizePalette ); } +static inline UINT NtUserSetProcessDefaultLayout( DWORD layout ) +{ + return NtUserCallOneParam( layout, NtUserCallOneParam_SetProcessDefaultLayout ); +} + /* NtUserCallTwoParam codes, not compatible with Windows */ enum {

1 0

Jacek Caban : win32u: Move WM_NCHITTEST implementation from user32.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 80ef8832aa697c4e7e16f640f5e722ade6a43fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ef8832aa697c4e7e16f640… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 02:01:54 2022 +0200 win32u: Move WM_NCHITTEST implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 8 --- dlls/win32u/defwnd.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 8 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6f2c3013aaa..8f32594fd34 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -165,14 +165,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); - case WM_NCHITTEST: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - return NC_HandleNCHitTest( hwnd, pt ); - } - case WM_WINDOWPOSCHANGED: DEFWND_HandleWindowPosChanged( hwnd, (const WINDOWPOS *)lParam ); break; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 3705cbf8022..6ec27fc6725 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1621,6 +1621,175 @@ static void handle_nc_calc_size( HWND hwnd, WPARAM wparam, RECT *win_rect ) } } +static LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) +{ + RECT rect, client_rect; + DWORD style, ex_style; + + TRACE( "hwnd %p pt %d,%d\n", hwnd, pt.x, pt.y ); + + get_window_rects( hwnd, COORDS_SCREEN, &rect, &client_rect, get_thread_dpi() ); + if (!PtInRect( &rect, pt )) return HTNOWHERE; + + style = get_window_long( hwnd, GWL_STYLE ); + ex_style = get_window_long( hwnd, GWL_EXSTYLE ); + + if (PtInRect( &client_rect, pt )) return HTCLIENT; + + /* Check borders */ + if (has_thick_frame( style, ex_style )) + { + InflateRect( &rect, -get_system_metrics( SM_CXFRAME ), -get_system_metrics( SM_CYFRAME )); + if (!PtInRect( &rect, pt )) + { + /* Check top sizing border */ + if (pt.y < rect.top) + { + if (pt.x < rect.left + get_system_metrics( SM_CXSIZE )) return HTTOPLEFT; + if (pt.x >= rect.right - get_system_metrics( SM_CXSIZE )) return HTTOPRIGHT; + return HTTOP; + } + /* Check bottom sizing border */ + if (pt.y >= rect.bottom) + { + if (pt.x < rect.left + get_system_metrics( SM_CXSIZE )) return HTBOTTOMLEFT; + if (pt.x >= rect.right - get_system_metrics( SM_CXSIZE )) return HTBOTTOMRIGHT; + return HTBOTTOM; + } + /* Check left sizing border */ + if (pt.x < rect.left) + { + if (pt.y < rect.top + get_system_metrics( SM_CYSIZE )) return HTTOPLEFT; + if (pt.y >= rect.bottom - get_system_metrics( SM_CYSIZE )) return HTBOTTOMLEFT; + return HTLEFT; + } + /* Check right sizing border */ + if (pt.x >= rect.right) + { + if (pt.y < rect.top + get_system_metrics( SM_CYSIZE )) return HTTOPRIGHT; + if (pt.y >= rect.bottom-get_system_metrics( SM_CYSIZE )) return HTBOTTOMRIGHT; + return HTRIGHT; + } + } + } + else /* No thick frame */ + { + if (has_dialog_frame( style, ex_style )) + InflateRect( &rect, -get_system_metrics( SM_CXDLGFRAME ), + -get_system_metrics( SM_CYDLGFRAME )); + else if (has_thin_frame( style )) + InflateRect(&rect, -get_system_metrics( SM_CXBORDER ), + -get_system_metrics( SM_CYBORDER )); + if (!PtInRect( &rect, pt )) return HTBORDER; + } + + /* Check caption */ + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (ex_style & WS_EX_TOOLWINDOW) + rect.top += get_system_metrics( SM_CYSMCAPTION ) - 1; + else + rect.top += get_system_metrics( SM_CYCAPTION ) - 1; + if (!PtInRect( &rect, pt )) + { + BOOL min_or_max_box = (style & WS_SYSMENU) && (style & (WS_MINIMIZEBOX | WS_MAXIMIZEBOX)); + if (ex_style & WS_EX_LAYOUTRTL) + { + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && + get_nc_icon_for_window( hwnd )) + { + rect.right -= get_system_metrics( SM_CYCAPTION ) - 1; + if (pt.x > rect.right) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.left += get_system_metrics( SM_CYCAPTION ); + if (pt.x < rect.left) return HTCLOSE; + } + + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + /* Check maximize box */ + rect.left += get_system_metrics( SM_CXSIZE ); + if (pt.x < rect.left) return HTMAXBUTTON; + + /* Check minimize box */ + rect.left += get_system_metrics( SM_CXSIZE ); + if (pt.x < rect.left) return HTMINBUTTON; + } + } + else + { + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && + get_nc_icon_for_window( hwnd )) + { + rect.left += get_system_metrics( SM_CYCAPTION ) - 1; + if (pt.x < rect.left) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.right -= get_system_metrics( SM_CYCAPTION ); + if (pt.x > rect.right) return HTCLOSE; + } + + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + /* Check maximize box */ + rect.right -= get_system_metrics( SM_CXSIZE ); + if (pt.x > rect.right) return HTMAXBUTTON; + + /* Check minimize box */ + rect.right -= get_system_metrics( SM_CXSIZE ); + if (pt.x > rect.right) return HTMINBUTTON; + } + } + return HTCAPTION; + } + } + + /* Check menu bar */ + if (has_menu( hwnd, style ) && (pt.y < client_rect.top) && + (pt.x >= client_rect.left) && (pt.x < client_rect.right)) + return HTMENU; + + /* Check vertical scroll bar */ + if (ex_style & WS_EX_LAYOUTRTL) ex_style ^= WS_EX_LEFTSCROLLBAR; + if (style & WS_VSCROLL) + { + if (ex_style & WS_EX_LEFTSCROLLBAR) + client_rect.left -= get_system_metrics( SM_CXVSCROLL ); + else + client_rect.right += get_system_metrics( SM_CXVSCROLL ); + if (PtInRect( &client_rect, pt )) return HTVSCROLL; + } + + /* Check horizontal scroll bar */ + if (style & WS_HSCROLL) + { + client_rect.bottom += get_system_metrics( SM_CYHSCROLL ); + if (PtInRect( &client_rect, pt )) + { + /* Check size box */ + if ((style & WS_VSCROLL) && + ((ex_style & WS_EX_LEFTSCROLLBAR) + ? (pt.x <= client_rect.left + get_system_metrics( SM_CXVSCROLL )) + : (pt.x >= client_rect.right - get_system_metrics( SM_CXVSCROLL )))) + return HTSIZE; + return HTHSCROLL; + } + } + + /* Has to return HTNOWHERE if nothing was found + Could happen when a window has a customized non client area */ + return HTNOWHERE; +} + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -1652,6 +1821,14 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, handle_nc_calc_size( hwnd, wparam, (RECT *)lparam ); break; + case WM_NCHITTEST: + { + POINT pt; + pt.x = (short)LOWORD( lparam ); + pt.y = (short)HIWORD( lparam ); + return handle_nc_hit_test( hwnd, pt ); + } + case WM_NCPAINT: return handle_nc_paint( hwnd, (HRGN)wparam );

1 0

Jacek Caban : win32u: Move WM_NCRBUTTONDOWN implementation from user32.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 389832e0d965b086d268cee88539eba12ecce8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389832e0d965b086d268cee8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 13:26:18 2022 +0200 win32u: Move WM_NCRBUTTONDOWN implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 3 --- dlls/user32/nonclient.c | 34 ---------------------------------- dlls/win32u/defwnd.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index eec6a4babe2..d4e8ccd7b08 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -123,7 +123,6 @@ extern HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSetCursor( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 0c783666b7e..a0d6ca44ecb 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -181,9 +181,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCLBUTTONDBLCLK: return NC_HandleNCLButtonDblClk( hwnd, wParam, lParam ); - case WM_NCRBUTTONDOWN: - return NC_HandleNCRButtonDown( hwnd, wParam, lParam ); - case WM_RBUTTONUP: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 128f633fa33..174f6e46977 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -717,40 +717,6 @@ static void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt ) } -/*********************************************************************** - * NC_HandleNCRButtonDown - * - * Handle a WM_NCRBUTTONDOWN message. Called from DefWindowProc(). - */ -LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) -{ - MSG msg; - INT hittest = wParam; - - switch (hittest) - { - case HTCAPTION: - case HTSYSMENU: - NtUserSetCapture( hwnd ); - for (;;) - { - if (!GetMessageW( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST )) break; - if (NtUserCallMsgFilter( &msg, MSGF_MAX )) continue; - if (msg.message == WM_RBUTTONUP) - { - hittest = NC_HandleNCHitTest( hwnd, msg.pt ); - break; - } - } - ReleaseCapture(); - if (hittest == HTCAPTION || hittest == HTSYSMENU) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(msg.pt.x, msg.pt.y)); - break; - } - return 0; -} - - /*********************************************************************** * NC_HandleNCLButtonDblClk * diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 780570b5ad4..7126d492c78 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1961,6 +1961,34 @@ static LRESULT handle_nc_lbutton_down( HWND hwnd, WPARAM wparam, LPARAM lparam ) return 0; } +static LRESULT handle_nc_rbutton_down( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + int hittest = wparam; + MSG msg; + + switch (hittest) + { + case HTCAPTION: + case HTSYSMENU: + NtUserSetCapture( hwnd ); + for (;;) + { + if (!NtUserGetMessage( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST )) break; + if (NtUserCallMsgFilter( &msg, MSGF_MAX )) continue; + if (msg.message == WM_RBUTTONUP) + { + hittest = handle_nc_hit_test( hwnd, msg.pt ); + break; + } + } + release_capture(); + if (hittest == HTCAPTION || hittest == HTSYSMENU) + send_message( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM( msg.pt.x, msg.pt.y )); + break; + } + return 0; +} + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -2009,6 +2037,9 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_NCLBUTTONDOWN: return handle_nc_lbutton_down( hwnd, wparam, lparam ); + case WM_NCRBUTTONDOWN: + return handle_nc_rbutton_down( hwnd, wparam, lparam ); + case WM_WINDOWPOSCHANGING: return handle_window_pos_changing( hwnd, (WINDOWPOS *)lparam );

1 0

Jacek Caban : win32u: Use NtUserCallHwnd for NtUserSetForegroundWindow.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 76a0108c594ec9ac6d52a196c15d8181e89fb350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a0108c594ec9ac6d52a196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 13:30:32 2022 +0200 win32u: Use NtUserCallHwnd for NtUserSetForegroundWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/focus.c | 2 +- dlls/win32u/window.c | 6 +++--- dlls/winemac.drv/window.c | 8 ++++---- dlls/winex11.drv/event.c | 6 +++--- include/ntuser.h | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 7e1536ab802..bf80777ca97 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -37,7 +37,7 @@ */ BOOL WINAPI SetForegroundWindow( HWND hwnd ) { - return NtUserSetForegroundWindow( hwnd, FALSE ); + return NtUserSetForegroundWindow( hwnd ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 431686bdcaa..42274905d5b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5403,6 +5403,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_IsWindowVisible: return is_window_visible( hwnd ); + case NtUserCallHwnd_SetForegroundWindow: + return set_foreground_window( hwnd, FALSE ); + default: FIXME( "invalid code %u\n", code ); return 0; @@ -5489,9 +5492,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_ScreenToClient: return screen_to_client( hwnd, (POINT *)param ); - case NtUserCallHwndParam_SetForegroundWindow: - return set_foreground_window( hwnd, param ); - case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d778f427b0..22c250c1d18 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2350,7 +2350,7 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd); - NtUserSetForegroundWindow(hwnd, FALSE); + NtUserSetForegroundWindow(hwnd); return; } } @@ -2375,7 +2375,7 @@ void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) { send_message(hwnd, WM_CANCELMODE, 0, 0); if (hwnd == NtUserGetForegroundWindow()) - NtUserSetForegroundWindow(NtUserGetDesktopWindow(), FALSE); + NtUserSetForegroundWindow(NtUserGetDesktopWindow()); } } @@ -2404,7 +2404,7 @@ void macdrv_app_deactivated(void) if (get_active_window() == NtUserGetForegroundWindow()) { TRACE("setting fg to desktop\n"); - NtUserSetForegroundWindow(NtUserGetDesktopWindow(), FALSE); + NtUserSetForegroundWindow(NtUserGetDesktopWindow()); } } @@ -2573,7 +2573,7 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd); - NtUserSetForegroundWindow(hwnd, FALSE); + NtUserSetForegroundWindow(hwnd); } } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f81d2338faf..cbfb228ea09 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -596,7 +596,7 @@ static void set_focus( Display *display, HWND hwnd, Time time ) GUITHREADINFO threadinfo; TRACE( "setting foreground window to %p\n", hwnd ); - NtUserSetForegroundWindow( hwnd, FALSE ); + NtUserSetForegroundWindow( hwnd ); threadinfo.cbSize = sizeof(threadinfo); NtUserGetGUIThreadInfo( 0, &threadinfo ); @@ -812,7 +812,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!hwnd) hwnd = x11drv_thread_data()->last_focus; if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); } - else NtUserSetForegroundWindow( hwnd, FALSE ); + else NtUserSetForegroundWindow( hwnd ); return TRUE; } @@ -858,7 +858,7 @@ static void focus_out( Display *display , HWND hwnd ) if (hwnd == NtUserGetForegroundWindow()) { TRACE( "lost focus, setting fg to desktop\n" ); - NtUserSetForegroundWindow( NtUserGetDesktopWindow(), FALSE ); + NtUserSetForegroundWindow( NtUserGetDesktopWindow() ); } } } diff --git a/include/ntuser.h b/include/ntuser.h index 1f3cc2f2e7e..0904aadff0f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -983,6 +983,7 @@ enum NtUserCallHwnd_IsWindowEnabled, NtUserCallHwnd_IsWindowUnicode, NtUserCallHwnd_IsWindowVisible, + NtUserCallHwnd_SetForegroundWindow, }; static inline UINT NtUserArrangeIconicWindows( HWND parent ) @@ -1041,6 +1042,11 @@ static inline BOOL NtUserIsWindowVisible( HWND hwnd ) return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowVisible ); } +static inline BOOL NtUserSetForegroundWindow( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_SetForegroundWindow ); +} + /* NtUserCallHwndParam codes, not compatible with Windows */ enum { @@ -1067,7 +1073,6 @@ enum NtUserCallHwndParam_MirrorRgn, NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, - NtUserCallHwndParam_SetForegroundWindow, NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, @@ -1207,11 +1212,6 @@ static inline BOOL NtUserScreenToClient( HWND hwnd, POINT *pt ) return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserCallHwndParam_ScreenToClient ); } -static inline BOOL NtUserSetForegroundWindow( HWND hwnd, BOOL mouse ) -{ - return NtUserCallHwndParam( hwnd, mouse, NtUserCallHwndParam_SetForegroundWindow ); -} - static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) { return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId );

1 0

Piotr Caban : d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 547c292a80ad6eaecde2e31413a7646a1e0531e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547c292a80ad6eaecde2e314… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 19:54:18 2022 +0200 d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index d5066b9793b..bba08f11beb 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -714,6 +714,13 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s *hresult = E_FAIL; return E_FAIL; } + if (img_info.ArraySize != 1) + { + FIXME("img_info.ArraySize = %u not supported.\n", img_info.ArraySize); + if (hresult) + *hresult = E_NOTIMPL; + return E_NOTIMPL; + } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end;

1 0

Nikolay Sivov : d3d11/tests: Add some tests for IDXGIResource support.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: bf8171a3a93ea91fa6aa494359866bcf7e24c307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8171a3a93ea91fa6aa4943… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 13:43:05 2022 +0300 d3d11/tests: Add some tests for IDXGIResource support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a43e2bb0cc5..9c72de054c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2499,6 +2499,63 @@ static void test_create_texture1d(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +#define test_dxgi_resource(a) test_dxgi_resource_(__LINE__, a) +static void test_dxgi_resource_(unsigned int line, void *iface) +{ + IDXGIResource *resource, *resource2; + IDXGISurface *surface, *surface2; + IUnknown *object = iface, *unk; + DWORD data; + HRESULT hr; + UINT size; + + hr = IUnknown_QueryInterface(object, &IID_IDXGIResource, (void **)&resource); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (FAILED(hr)) return; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IDXGISurface, (void **)&surface))) + { + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIDeviceSubObject, (void **)&unk); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)((IUnknown *)resource == unk, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIObject, (void **)&unk); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)((IUnknown *)resource == unk, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIResource, (void **)&resource2); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(resource2 == resource, "Unexpected resource pointer.\n"); + IDXGIResource_Release(resource2); + + hr = IDXGIResource_QueryInterface(resource, &IID_IDXGISurface, (void **)&surface2); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(surface2 == surface, "Unexpected surface pointer.\n"); + IDXGISurface_Release(surface2); + + hr = IDXGISurface_GetParent(surface, &IID_IDXGIResource, (void **)&resource2); + ok_(__FILE__, line)(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIResource_GetParent(resource, &IID_IDXGISurface, (void **)&surface2); + ok_(__FILE__, line)(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + + data = 123; + hr = IDXGIResource_SetPrivateData(resource, &IID_IUnknown, sizeof(data), &data); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + size = sizeof(data); + data = 0; + hr = IDXGISurface_GetPrivateData(surface, &IID_IUnknown, &size, &data); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(data == 123, "Unexpected data %#lx.\n", data); + + IDXGISurface_Release(surface); + } + + IDXGIResource_Release(resource); +} + static void test_texture1d_interfaces(void) { ID3D10Texture1D *d3d10_texture; @@ -2548,7 +2605,7 @@ static void test_texture1d_interfaces(void) } desc.Width = 512; - desc.MipLevels = 0; + desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.Usage = D3D11_USAGE_DEFAULT; @@ -2558,7 +2615,18 @@ static void test_texture1d_interfaces(void) hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + test_dxgi_resource(texture); + ID3D11Texture1D_Release(texture); + + desc.MipLevels = 0; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + test_dxgi_resource(texture); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); hr = check_interface(texture, &IID_ID3D10Texture1D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture1D_Release(texture); if (FAILED(hr)) @@ -2934,7 +3002,7 @@ static void test_texture2d_interfaces(void) desc.Width = 512; desc.Height = 512; - desc.MipLevels = 0; + desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 1; @@ -2944,9 +3012,23 @@ static void test_texture2d_interfaces(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 0; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture2D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture2D_Release(texture); if (FAILED(hr)) @@ -3211,6 +3293,10 @@ static void test_texture3d_interfaces(void) hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture3D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture3D_Release(texture); if (FAILED(hr)) @@ -3526,6 +3612,9 @@ static void test_create_buffer(void) continue; } + todo_wine + check_interface(buffer, &IID_IDXGIResource, TRUE, FALSE); + if (!(desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)) desc.StructureByteStride = 0;

1 0

Nikolay Sivov : d3d11: Always use dxgi resource private store for 1D and 2D textures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 9b220b8079f882cca80351ec5ee1dd8c153d1950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b220b8079f882cca80351ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 20:00:59 2022 +0300 d3d11: Always use dxgi resource private store for 1D and 2D textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/texture.c | 78 ++++++++++++++++++---------------------------- 2 files changed, 30 insertions(+), 50 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4e4efcae098..cc236699871 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -129,7 +129,6 @@ struct d3d_texture1d ID3D10Texture1D ID3D10Texture1D_iface; LONG refcount; - struct wined3d_private_store private_store; IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE1D_DESC desc; @@ -148,7 +147,6 @@ struct d3d_texture2d ID3D10Texture2D ID3D10Texture2D_iface; LONG refcount; - struct wined3d_private_store private_store; IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE2D_DESC desc; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 513a656aebe..775b7df43f1 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -115,60 +115,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_GetPrivateData(ID3D11Texture1D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateData(ID3D11Texture1D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateDataInterface(ID3D11Texture1D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return hr; } static void STDMETHODCALLTYPE d3d11_texture1d_GetType(ID3D11Texture1D *iface, @@ -258,7 +252,6 @@ static void STDMETHODCALLTYPE d3d_texture1d_wined3d_object_released(void *parent if (texture->dxgi_resource) IUnknown_Release(texture->dxgi_resource); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); } @@ -460,7 +453,6 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE texture->ID3D11Texture1D_iface.lpVtbl = &d3d11_texture1d_vtbl; texture->ID3D10Texture1D_iface.lpVtbl = &d3d10_texture1d_vtbl; texture->refcount = 1; - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(desc->Width) + 1; texture->desc.MipLevels = levels; @@ -489,7 +481,6 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) @@ -605,60 +596,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return hr; } static void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface, @@ -762,7 +747,6 @@ static void STDMETHODCALLTYPE d3d_texture2d_wined3d_object_released(void *parent struct d3d_texture2d *texture = parent; if (texture->dxgi_resource) IUnknown_Release(texture->dxgi_resource); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); } @@ -994,7 +978,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; texture->refcount = 1; wined3d_mutex_lock(); - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; @@ -1022,7 +1005,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE texture, &d3d_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL)

1 0

Nikolay Sivov : d3d11: Create dxgi resource object for 3D textures.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 204126ec4c2bf25e8e9e86793e09be05e4ed3717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=204126ec4c2bf25e8e9e8679… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 20:44:15 2022 +0300 d3d11: Create dxgi resource object for 3D textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/tests/d3d11.c | 2 -- dlls/d3d11/texture.c | 70 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cc236699871..8b3f1ab5717 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -170,7 +170,7 @@ struct d3d_texture3d ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; - struct wined3d_private_store private_store; + IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE3D_DESC desc; ID3D11Device2 *device; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0c741283da5..3628a0bd573 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3286,9 +3286,7 @@ static void test_texture3d_interfaces(void) hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); - todo_wine check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); - todo_wine test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture3D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture3D_Release(texture); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 775b7df43f1..fb4c1cdc597 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -1044,6 +1044,7 @@ static inline struct d3d_texture3d *impl_from_ID3D11Texture3D(ID3D11Texture3D *i static HRESULT STDMETHODCALLTYPE d3d11_texture3d_QueryInterface(ID3D11Texture3D *iface, REFIID riid, void **object) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + HRESULT hr; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -1065,10 +1066,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture3d_QueryInterface(ID3D11Texture3D return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + TRACE("Forwarding to dxgi resource.\n"); - *object = NULL; - return E_NOINTERFACE; + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, riid, object))) + { + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *object = NULL; + } + + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) @@ -1091,7 +1097,8 @@ static void STDMETHODCALLTYPE d3d_texture3d_wined3d_object_released(void *parent { struct d3d_texture3d *texture = parent; - wined3d_private_store_cleanup(&texture->private_store); + if (texture->dxgi_resource) + IUnknown_Release(texture->dxgi_resource); heap_free(parent); } @@ -1129,30 +1136,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateData(ID3D11Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateDataInterface(ID3D11Texture3D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&texture->private_store, guid, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static void STDMETHODCALLTYPE d3d11_texture3d_GetType(ID3D11Texture3D *iface, @@ -1251,10 +1282,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture3d_GetPrivateData(&texture->ID3D11Texture3D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, @@ -1262,10 +1292,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture3d_SetPrivateData(&texture->ID3D11Texture3D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, @@ -1275,7 +1304,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10T TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return d3d11_texture3d_SetPrivateDataInterface(&texture->ID3D11Texture3D_iface, guid, data); } static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface, @@ -1413,7 +1442,6 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; wined3d_mutex_lock(); - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; @@ -1439,12 +1467,22 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); wined3d_mutex_unlock(); if (hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; return hr; } + + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_texture_get_resource(texture->wined3d_texture), (IUnknown *)&texture->ID3D10Texture3D_iface, + FALSE, &texture->dxgi_resource); + if (FAILED(hr)) + { + ERR("Failed to create DXGI resource, returning %#.lx\n", hr); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + return hr; + } wined3d_mutex_unlock(); texture->desc.MipLevels = levels;

1 0

Nikolay Sivov : d3d11: Create dxgi resource objects for buffers.
by Alexandre Julliard June 15, 2022

June 15, 2022

Module: wine Branch: master Commit: 5beba20e8f2168dd998f2a8d205cfcdc3ed80fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beba20e8f2168dd998f2a8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 21:47:49 2022 +0300 d3d11: Create dxgi resource objects for buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/buffer.c | 61 +++++++++++++++++++++++++++++++++++++--------- dlls/d3d11/d3d11_private.h | 4 ++- dlls/d3d11/tests/d3d11.c | 1 - dlls/d3d11/texture.c | 2 +- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 352559322d7..6447c3c7a53 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -31,6 +31,7 @@ static inline struct d3d_buffer *impl_from_ID3D11Buffer(ID3D11Buffer *iface) static HRESULT STDMETHODCALLTYPE d3d11_buffer_QueryInterface(ID3D11Buffer *iface, REFIID riid, void **out) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + HRESULT hr; TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -53,10 +54,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_buffer_QueryInterface(ID3D11Buffer *iface return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + if (FAILED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, riid, out))) + { + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *out = NULL; + } - *out = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) @@ -109,30 +113,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface REFGUID guid, UINT *data_size, void *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&buffer->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateData(ID3D11Buffer *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&buffer->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateDataInterface(ID3D11Buffer *iface, REFGUID guid, const IUnknown *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&buffer->private_store, guid, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static void STDMETHODCALLTYPE d3d11_buffer_GetType(ID3D11Buffer *iface, @@ -246,7 +274,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&buffer->private_store, guid, data_size, data); + return d3d11_buffer_GetPrivateData(&buffer->ID3D11Buffer_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, @@ -257,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&buffer->private_store, guid, data_size, data); + return d3d11_buffer_SetPrivateData(&buffer->ID3D11Buffer_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, @@ -267,7 +295,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buff TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&buffer->private_store, guid, data); + return d3d11_buffer_SetPrivateDataInterface(&buffer->ID3D11Buffer_iface, guid, data); } /* ID3D10Resource methods */ @@ -367,7 +395,7 @@ static void STDMETHODCALLTYPE d3d_buffer_wined3d_object_released(void *parent) { struct d3d_buffer *buffer = parent; - wined3d_private_store_cleanup(&buffer->private_store); + if (buffer->dxgi_resource) IUnknown_Release(buffer->dxgi_resource); heap_free(parent); } @@ -446,14 +474,23 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; wined3d_mutex_lock(); - wined3d_private_store_init(&buffer->private_store); if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d buffer, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&buffer->private_store); + wined3d_mutex_unlock(); + return hr; + } + + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_buffer_get_resource(buffer->wined3d_buffer), (IUnknown *)&buffer->ID3D10Buffer_iface, + FALSE, &buffer->dxgi_resource); + if (FAILED(hr)) + { + ERR("Failed to create DXGI resource, returning %#.lx\n", hr); + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); return hr; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8b3f1ab5717..6728f36a473 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -72,6 +72,8 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; +HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, + IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; @@ -188,7 +190,7 @@ struct d3d_buffer ID3D10Buffer ID3D10Buffer_iface; LONG refcount; - struct wined3d_private_store private_store; + IUnknown *dxgi_resource; struct wined3d_buffer *wined3d_buffer; D3D11_BUFFER_DESC desc; ID3D11Device2 *device; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3628a0bd573..345a87c4194 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3603,7 +3603,6 @@ static void test_create_buffer(void) continue; } - todo_wine check_interface(buffer, &IID_IDXGIResource, TRUE, FALSE); if (!(desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index fb4c1cdc597..7be689d1f0f 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -413,7 +413,7 @@ static const struct wined3d_parent_ops d3d_texture1d_wined3d_parent_ops = d3d_texture1d_wined3d_object_released, }; -static HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, +HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) { IWineDXGIDevice *wine_device;

1 0