wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Alexandre Julliard : user32/tests: Add some tests for UpdateLayeredWindow.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b9fa73a798a6f8735a91d993b1eea58defbf76fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fa73a798a6f8735a91d993b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:57 2012 +0200 user32/tests: Add some tests for UpdateLayeredWindow. --- dlls/user32/tests/msg.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11830ad..0b63799 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1721,6 +1721,7 @@ static BOOL (WINAPI *pTrackMouseEvent)(TRACKMOUSEEVENT*); static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1744,6 +1745,7 @@ static void init_procs(void) GET_PROC(user32, UnhookWinEvent) GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) + GET_PROC(user32, UpdateLayeredWindow) GET_PROC(kernel32, GetCPInfoExA) @@ -13772,6 +13774,131 @@ todo_wine CloseHandle(hthread); } +static const struct message WmSetLayeredStyle[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { 0 } +}; + +static const struct message WmSetLayeredStyle2[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|optional|defwinproc|wparam, 0 }, + { WM_SIZE, sent|optional|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + +static void test_layered_window(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP bmp; + BOOL ret; + SIZE size; + POINT pos, src; + RECT rect, client; + + if (!pUpdateLayeredWindow) + { + win_skip( "UpdateLayeredWindow not supported\n" ); + return; + } + + hdc = CreateCompatibleDC( 0 ); + bmp = CreateCompatibleBitmap( hdc, 300, 300 ); + SelectObject( hdc, bmp ); + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_CAPTION | WS_THICKFRAME | WS_SYSMENU, + 100, 100, 300, 300, 0, 0, 0, NULL); + ok( hwnd != 0, "failed to create window\n" ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + GetWindowRect( hwnd, &rect ); + GetClientRect( hwnd, &client ); + ok( client.right < rect.right - rect.left, "wrong client area\n" ); + ok( client.bottom < rect.bottom - rect.top, "wrong client area\n" ); + + src.x = src.y = 0; + pos.x = pos.y = 300; + size.cx = size.cy = 250; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 50 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 150; + pos.y = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 150 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + SetWindowLong( hwnd, GWL_STYLE, + GetWindowLong(hwnd, GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU) ); + ok_sequence( WmSetLayeredStyle2, "WmSetLayeredStyle2", FALSE ); + + size.cx = 200; + pos.x = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 0; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, + "wrong error %u\n", GetLastError() ); + size.cx = 1; + size.cy = -1; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + DestroyWindow( hwnd ); + DeleteDC( hdc ); + DeleteObject( bmp ); +} + START_TEST(msg) { char **test_argv; @@ -13884,6 +14011,7 @@ START_TEST(msg) test_clipboard_viewers(); test_keyflags(); test_hotkey(); + test_layered_window(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Alexandre Julliard : user32: Refresh the frame when the style bits of a layered window are changed.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b0fce2a02b5b3b5dda61b6fe1a653b2fe994de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fce2a02b5b3b5dda61b6fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:34 2012 +0200 user32: Refresh the frame when the style bits of a layered window are changed. --- dlls/user32/defwnd.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 0ac308c..af566bf 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -719,6 +719,16 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; + case WM_STYLECHANGED: + if (wParam == GWL_STYLE && (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) + { + STYLESTRUCT *style = (STYLESTRUCT *)lParam; + if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) + SetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); + } + break; + case WM_APPCOMMAND: { HWND parent = GetParent(hwnd);

1 0

Alexandre Julliard : user32: Don' t send messages on position changes in UpdateLayeredWindow.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 9f29dcdc2e39368870873eee62e5c8da95096734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f29dcdc2e39368870873eee6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:15 2012 +0200 user32: Don't send messages on position changes in UpdateLayeredWindow. --- dlls/user32/win.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2a0848e..95c5c4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3594,23 +3594,38 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF if (!(info->dwFlags & ULW_EX_NORESIZE) && (info->pptDst || info->psize)) { - int x = 0, y = 0, cx = 0, cy = 0; - DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSENDCHANGING; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE; + RECT window_rect, client_rect; + SIZE offset; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); if (info->pptDst) { - x = info->pptDst->x; - y = info->pptDst->y; + offset.cx = info->pptDst->x - window_rect.left; + offset.cy = info->pptDst->y - window_rect.top; + OffsetRect( &client_rect, offset.cx, offset.cy ); + OffsetRect( &window_rect, offset.cx, offset.cy ); flags &= ~SWP_NOMOVE; } if (info->psize) { - cx = info->psize->cx; - cy = info->psize->cy; + if (info->psize->cx <= 0 || info->psize->cy <= 0) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + offset.cx = info->psize->cx - (window_rect.right - window_rect.left); + offset.cy = info->psize->cy - (window_rect.bottom - window_rect.top); + client_rect.right += offset.cx; + client_rect.bottom += offset.cy; + window_rect.right += offset.cx; + window_rect.bottom += offset.cy; flags &= ~SWP_NOSIZE; } - TRACE( "moving window %p pos %d,%d %dx%d\n", hwnd, x, y, cx, cy ); - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + TRACE( "moving window %p win %s client %s\n", hwnd, + wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); + set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); } if (info->hdcSrc)

1 0

Alexandre Julliard : server: Don' t trigger repaints on position changes for layered windows.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 84fd7de0f7c0146b73f7b8d9cd364c9e6a7f3096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd7de0f7c0146b73f7b8d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:47:03 2012 +0200 server: Don't trigger repaints on position changes for layered windows. --- server/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 47b94e2..a5a8853 100644 --- a/server/window.c +++ b/server/window.c @@ -2136,6 +2136,9 @@ DECL_HANDLER(set_window_pos) if (previous == win) flags |= SWP_NOZORDER; /* nothing to do */ } + /* windows that use UpdateLayeredWindow don't trigger repaints */ + if ((win->ex_style & WS_EX_LAYERED) && !win->is_layered) flags |= SWP_NOREDRAW; + /* window rectangle must be ordered properly */ if (req->window.right < req->window.left || req->window.bottom < req->window.top) {

1 0

Alexandre Julliard : winex11: Don' t use a window surface for embedded windows.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 0682355af23f2f7c6939f491ccd48c8cb1aeb2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682355af23f2f7c6939f491c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:31:52 2012 +0200 winex11: Don't use a window surface for embedded windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 00c86b9..3f94758 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1992,6 +1992,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag /* create the window surface if necessary */ if (!data->whole_window) return; + if (data->embedded) return; if (swp_flags & SWP_HIDEWINDOW) return; if (data->whole_window == root_window) return; if (has_gl_drawable( hwnd )) return;

1 0

Jacek Caban : oaidl.idl: Added REFVARIANT declaration.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 22bcb1a7f437d2e26a1bcd6a8cc7420b85bf78c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bcb1a7f437d2e26a1bcd6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 09:37:59 2012 +0200 oaidl.idl: Added REFVARIANT declaration. --- include/oaidl.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/oaidl.idl b/include/oaidl.idl index 0dc4c05..37da734 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -230,6 +230,17 @@ typedef VARIANT *LPVARIANT; typedef VARIANT VARIANTARG; typedef VARIANTARG *LPVARIANTARG; +cpp_quote("#if 0") +typedef const VARIANT *REFVARIANT; +cpp_quote("#elif !defined(_REFVARIANT_DEFINED)") +cpp_quote("#define _REFVARIANT_DEFINED") +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFVARIANT const VARIANT &") +cpp_quote("#else") +cpp_quote("#define REFVARIANT const VARIANT *__MIDL_CONST") +cpp_quote("#endif") +cpp_quote("#endif") + struct _wireBRECORD { ULONG fFlags; ULONG clSize;

1 0

Henri Verbeet : server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 54efd8a430e52d6fd8977d169bfc01df0385f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54efd8a430e52d6fd8977d169… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:17 2012 +0200 server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set. --- server/queue.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index f290c0b..7aa9b14 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1888,7 +1888,8 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, /* find a hardware message for the given queue */ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user_handle_t filter_win, - unsigned int first, unsigned int last, struct get_message_reply *reply ) + unsigned int first, unsigned int last, unsigned int flags, + struct get_message_reply *reply ) { struct thread_input *input = thread->queue->input; struct thread *win_thread; @@ -1968,7 +1969,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (msg->msg == WM_INPUT) release_hardware_message( current->queue, data->hw_id, 1, 0 ); + if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) + release_hardware_message( current->queue, data->hw_id, 1, 0 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2405,7 +2407,7 @@ DECL_HANDLER(get_message) /* then check for any raw hardware message */ if ((filter & QS_INPUT) && filter_contains_hw_range( req->get_first, req->get_last ) && - get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, reply )) + get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply )) return; /* now check for WM_PAINT */

1 0

Henri Verbeet : wined3d: wined3d_device_set_base_vertex_index() never fails .
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b8feef883375d973b48d31b0f421619113d0749f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8feef883375d973b48d31b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:16 2012 +0200 wined3d: wined3d_device_set_base_vertex_index() never fails. --- dlls/wined3d/device.c | 16 +--------------- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0ce4c4..e5cf69b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,25 +2260,11 @@ struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined return device->stateBlock->state.index_buffer; } -/* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ -HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) +void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) { TRACE("device %p, base_index %d.\n", device, base_index); - if (device->updateStateBlock->state.base_vertex_index == base_index) - { - TRACE("Application is setting the old value over, nothing to do\n"); - return WINED3D_OK; - } - device->updateStateBlock->state.base_vertex_index = base_index; - - if (device->isRecordingState) - { - TRACE("Recording... not performing anything\n"); - return WINED3D_OK; - } - return WINED3D_OK; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15aeb57..478abe0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,7 +2189,7 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); -HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); +void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView().
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 9235336894bc05f119a7738bf42789894bb0a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9235336894bc05f119a7738bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:15 2012 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView(). --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e9ade68..6b40d73 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -202,6 +202,42 @@ static void test_create_texture3d(ID3D10Device *device) ID3D10Texture3D_Release(texture); } +static void test_create_depthstencil_view(ID3D10Device *device) +{ + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + HRESULT hr; + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x\n", hr); + + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); +} + static void test_create_rendertarget_view(ID3D10Device *device) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -409,6 +445,7 @@ START_TEST(device) test_device_interfaces(device); test_create_texture2d(device); test_create_texture3d(device); + test_create_depthstencil_view(device); test_create_rendertarget_view(device); test_create_shader(device);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetDesc().
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 05d1fbb392c71b4fd81c30d58961a49f9242119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1fbb392c71b4fd81c30d58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:14 2012 +0200 d3d10core: Implement d3d10_depthstencil_view_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 115 +++++++++++++++++++++++++++++++++++- 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f45fd34..25fda7c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -129,11 +129,12 @@ struct d3d10_depthstencil_view ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d184c02..e6c26c2 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -803,7 +803,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_depthstencil_view_init(object, resource))) + if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 9bf4fcb..40712fc 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -45,6 +45,101 @@ static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *r } } +static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10Texture1D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1D; + desc->u.Texture1D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE1DARRAY; + desc->u.Texture1DArray.MipSlice = 0; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = 1; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + desc->u.Texture2D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DARRAY; + desc->u.Texture2DArray.MipSlice = 0; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = 1; + } + else + { + desc->ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = 1; + } + } + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + case D3D10_RESOURCE_DIMENSION_BUFFER: + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return E_INVALIDARG; + } +} + static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -269,7 +364,11 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthSte static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDesc(ID3D10DepthStencilView *iface, D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = @@ -290,11 +389,23 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = }; HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, - ID3D10Resource *resource) + ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { + HRESULT hr; + view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; + if (!desc) + { + if (FAILED(hr = set_dsdesc_from_resource(&view->desc, resource))) + return hr; + } + else + { + view->desc = *desc; + } + view->resource = resource; ID3D10Resource_AddRef(resource);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012