December 2011 - Wine-Commits

Alex Henrie : user32: If a dialog has no tab-accessible controls, set focus to first control (with tests).
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 59c398b8ed46e0852386ad913c0f0a658a196523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c398b8ed46e0852386ad913… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 2 00:37:01 2011 -0700 user32: If a dialog has no tab-accessible controls, set focus to first control (with tests). --- dlls/user32/dialog.c | 2 ++ dlls/user32/tests/dialog.c | 28 ++++++++++++++++++++++++++-- dlls/user32/tests/resource.rc | 8 ++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b9e739a..c6b2455 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -695,6 +695,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (dlgProc) { HWND focus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)focus, param ) && IsWindow( hwnd ) && ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) { @@ -702,6 +703,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, * WM_INITDIALOG may have changed the tab order, so find the first * tabstop control again. */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!dlgInfo->hwndFocus) dlgInfo->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if( dlgInfo->hwndFocus ) SetFocus( dlgInfo->hwndFocus ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fa14b36..404aeee 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -832,8 +832,7 @@ static void test_initial_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG - * without setting focus to a control. This is not allowed according to - * MSDN, but it is exactly what MFC's CFormView does. + * without setting focus to a control. This is what MFC's CFormView does. * * Since the WM_INITDIALOG handler returns FALSE without setting the focus, * the focus should initially be NULL. Later, when we manually set focus to @@ -915,6 +914,31 @@ static void test_initial_focus(void) DestroyWindow(hDlg); } + + /* Test 4: + * If the dialog has no tab-accessible controls, set focus to first control */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND hLabel; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_2", RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); + g_hwndInitialFocusT1 = GetFocus(); + hLabel = GetDlgItem(hDlg, 200); + ok (hDlg != 0, "Failed to create test dialog.\n"); + + ok ((g_hwndInitialFocusT1 == hLabel), + "Focus should have been set to the first control, expected (%p) got (%p).\n", + hLabel, g_hwndInitialFocusT1); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index cce1478..be47038 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -99,6 +99,14 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +FOCUS_TEST_DIALOG_2 DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Hello world", 200,4,4,50,14 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Frédéric Delanoy : dinput: Clarify a translatable string.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

1 0

Stefan Dösinger : ddraw/tests: Add a IDirect3DDevice7 GetCaps test.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: d4f504c698541826e665034fe2a1d75ae1be9742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f504c698541826e665034fe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:21 2011 +0100 ddraw/tests: Add a IDirect3DDevice7 GetCaps test. --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/d3d.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c48ec1..c978d45 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -459,6 +459,12 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface, TRACE("iface %p, device_desc %p.\n", iface, Desc); + if (!Desc) + { + WARN("Desc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + /* Call the same function used by IDirect3D, this saves code */ return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc); } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d94fd7e..ae057bc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4980,6 +4980,21 @@ static void test_get_caps1(void) ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr); } +static void test_get_caps7(void) +{ + HRESULT hr; + D3DDEVICEDESC7 desc; + + hr = IDirect3DDevice7_GetCaps(lpD3DDevice, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7::GetCaps(NULL) returned hr %#x, expected INVALIDPARAMS.\n", hr); + + memset(&desc, 0, sizeof(desc)); + hr = IDirect3DDevice7_GetCaps(lpD3DDevice, &desc); + ok(hr == D3D_OK, "IDirect3DDevice7::GetCaps(non-NULL) returned hr %#x, expected D3D_OK.\n", hr); + + /* There's no dwSize in D3DDEVICEDESC7 */ +} + START_TEST(d3d) { init_function_pointers(); @@ -5007,6 +5022,7 @@ START_TEST(d3d) SetRenderTargetTest(); VertexBufferLockRest(); z_format_test(); + test_get_caps7(); ReleaseDirect3D(); }

1 0

Stefan Dösinger : ddraw/tests: Update a copyright line .
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: ea151da3cdc23bbbba562d05522b6e5983448443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea151da3cdc23bbbba562d055… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:22 2011 +0100 ddraw/tests: Update a copyright line. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ae057bc..5efe718 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2,7 +2,7 @@ * Some unit tests for d3d functions * * Copyright (C) 2005 Antoine Chavasse - * Copyright (C) 2006 Stefan Dösinger for CodeWeavers + * Copyright (C) 2006,2011 Stefan Dösinger for CodeWeavers * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or

1 0

Marcus Meissner : ole32: Handle VT_BLOB in PropertyStorage_ReadProperty.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 48ae8e9ced8475127bb83625d62dd641b88b9c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae8e9ced8475127bb83625d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 4 23:52:44 2011 +0100 ole32: Handle VT_BLOB in PropertyStorage_ReadProperty. --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 53c2a99..53f57c1 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1111,6 +1111,22 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, } break; } + case VT_BLOB: + { + DWORD count; + + StorageUtl_ReadDWord(data, 0, &count); + prop->u.blob.cbSize = count; + prop->u.blob.pBlobData = CoTaskMemAlloc(count); + if (prop->u.blob.pBlobData) + { + memcpy(prop->u.blob.pBlobData, data + sizeof(DWORD), count); + TRACE("Read blob value of size %d\n", count); + } + else + hr = STG_E_INSUFFICIENTMEMORY; + break; + } case VT_LPWSTR: { DWORD count;

1 0

Alexandre Julliard : gdi32: Use the DIB engine and PutImage for the null driver triangular gradient implementation .
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 360d4bc548f5a73989a404d832ad4b6d39197e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=360d4bc548f5a73989a404d83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 16:27:28 2011 +0100 gdi32: Use the DIB engine and PutImage for the null driver triangular gradient implementation. --- dlls/gdi32/bitblt.c | 211 +++++++++++++++----------------------------- dlls/gdi32/dibdrv/bitblt.c | 60 ++++++++++++- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 131 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=360d4bc548f5a73989a40…

1 0

Aric Stewart : usp10: Correct issues with LTR logclust indexing after Multiple substitution.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 66736948475bf909cfb3bdfc9ffa428d61909f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66736948475bf909cfb3bdfc9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 5 09:50:10 2011 -0600 usp10: Correct issues with LTR logclust indexing after Multiple substitution. --- dlls/usp10/shape.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 04f0ff4..2189b92 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1360,9 +1360,13 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch int replacing_glyph = -1; int changed = 0; - if (changeCount > 0) - target_glyph = nextIndex - ((changeCount+1)*write_dir); + { + if (write_dir > 0) + target_glyph = nextIndex - changeCount; + else + target_glyph = nextIndex + (changeCount + 1); + } seeking_glyph = target_glyph;

1 0

Alexandre Julliard : gdi32: Use dithering also for 1-bpp gradients.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 7ea59c107fec6ca020dffb500eaf5049109771d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea59c107fec6ca020dffb500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 13:46:23 2011 +0100 gdi32: Use dithering also for 1-bpp gradients. --- dlls/gdi32/dibdrv/primitives.c | 30 +++++++++++++++--------------- dlls/winex11.drv/graphics.c | 4 ++-- dlls/winex11.drv/xrender.c | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 47ba0e1..d0d838b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4491,27 +4491,28 @@ static BOOL gradient_rect_1( const dib_info *dib, const RECT *rc, const TRIVERTE switch (mode) { case GRADIENT_FILL_RECT_H: - for (x = rc->left; x < rc->right; x++) + for (y = rc->top; y < min( rc->top + 16, rc->bottom ); y++, ptr += dib->stride) { - DWORD val = gradient_rgb_24( v, x - v[0].x, v[1].x - v[0].x ); - val = rgb_to_pixel_colortable( dib, val >> 16, val >> 8, val ) ? 0xff : 0; - ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); + for (x = rc->left; x < rc->right; x++) + { + BYTE val = gradient_rgb_8( dib, v, x - v[0].x, v[1].x - v[0].x, x, y ) ? 0xff : 0; + ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); + } } - - for (y = rc->top + 1; y < rc->bottom; y++, ptr += dib->stride) + for ( ; y < rc->bottom; y++, ptr += dib->stride) for (x = rc->left; x < rc->right; x++) - ptr[dib->stride + x / 8] = (ptr[dib->stride + x / 8] & ~pixel_masks_1[x % 8]) | - (ptr[x / 8] & pixel_masks_1[x % 8]); + ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | + (ptr[x / 8 - 16 * dib->stride] & pixel_masks_1[x % 8]); break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride) { - DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); - val = rgb_to_pixel_colortable( dib, val >> 16, val >> 8, val ) ? 0xff : 0; + BYTE values[16]; + for (x = 0; x < 16; x++) + values[x] = gradient_rgb_8( dib, v, y - v[0].y, v[1].y - v[0].y, x, y ) ? 0xff : 0; for (x = rc->left; x < rc->right; x++) - ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); - ptr += dib->stride; + ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | (values[x % 16] & pixel_masks_1[x % 8]); } break; @@ -4522,8 +4523,7 @@ static BOOL gradient_rect_1( const dib_info *dib, const RECT *rc, const TRIVERTE triangle_coords( v, rc, y, &left, &right ); for (x = left; x < right; x++) { - DWORD val = gradient_triangle_24( v, x, y, det ); - val = rgb_to_pixel_colortable( dib, val >> 16, val >> 8, val ) ? 0xff : 0; + BYTE val = gradient_triangle_8( dib, v, x, y, det ) ? 0xff : 0; ptr[x / 8] = (ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); } } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 88e9b0c..f2cf037 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1506,8 +1506,8 @@ BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, unsigned int i; XGCValues val; - /* 4, 8, and 16-bpp use dithering */ - if (physdev->depth >= 4 && physdev->depth <= 16) goto fallback; + /* <= 16-bpp use dithering */ + if (physdev->depth <= 16) goto fallback; switch (mode) { diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bccbe4d..3853cd8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2543,8 +2543,8 @@ static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG n if (!X11DRV_XRender_Installed) goto fallback; if (!pXRenderCreateLinearGradient) goto fallback; - /* 16-bpp uses dithering */ - if (!physdev->pict_format || physdev->pict_format->depth == 16) goto fallback; + /* <= 16-bpp uses dithering */ + if (!physdev->pict_format || physdev->pict_format->depth <= 16) goto fallback; switch (mode) {

1 0

Alexandre Julliard : gdi32: Add more parameter checks in GdiGradientFill.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 8e8cdc78e6af71398414df8416bb7013b00ece34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8cdc78e6af71398414df841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 18:08:09 2011 +0100 gdi32: Add more parameter checks in GdiGradientFill. --- dlls/gdi32/painting.c | 7 +++++-- dlls/gdi32/tests/bitmap.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 75c32c8..d721bd1 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1219,11 +1219,12 @@ POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) * GdiGradientFill (GDI32.@) */ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, - void * grad_array, ULONG ngrad, ULONG mode ) + void *grad_array, ULONG ngrad, ULONG mode ) { DC *dc; PHYSDEV physdev; BOOL ret; + ULONG i; TRACE("%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array, nvert, grad_array, ngrad); @@ -1232,12 +1233,14 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) + if (((ULONG *)grad_array)[i] >= nvert) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pGradientFill ); ret = physdev->funcs->pGradientFill( physdev, vert_array, nvert, grad_array, ngrad, mode ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8b62be6..26c840b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3417,6 +3417,17 @@ static void test_GdiGradientFill(void) ok( !ret, "GdiGradientFill succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, rect, 3, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + rect[2].UpperLeft = rect[2].LowerRight = 1; + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, rect, 3, GRADIENT_FILL_RECT_H ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 1, rect, 1, GRADIENT_FILL_RECT_H ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); ret = pGdiGradientFill( hdc, vt, 1, tri, 0, GRADIENT_FILL_TRIANGLE ); ok( !ret, "GdiGradientFill succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); @@ -3429,6 +3440,24 @@ static void test_GdiGradientFill(void) SetLastError( 0xdeadbeef ); ret = pGdiGradientFill( hdc, vt, 3, tri, 3, GRADIENT_FILL_TRIANGLE ); ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 4, GRADIENT_FILL_TRIANGLE ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + tri[3].Vertex3 = 1; + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 4, GRADIENT_FILL_TRIANGLE ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + tri[3].Vertex3 = 0; + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 4, GRADIENT_FILL_TRIANGLE ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + tri[3].Vertex1 = tri[3].Vertex2 = tri[3].Vertex3 = 1; + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 4, GRADIENT_FILL_TRIANGLE ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); DeleteDC( hdc ); DeleteObject( bmp );

1 0

Stefan Dösinger : ddraw: Size handling fixes for IDirect3DDevice::GetCaps.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: cc06d182fb433c7009dfb640b33d4ecd27bbd4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc06d182fb433c7009dfb640b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:20 2011 +0100 ddraw: Size handling fixes for IDirect3DDevice::GetCaps. --- dlls/ddraw/device.c | 49 ++++++++++++++++++++++++++- dlls/ddraw/tests/d3d.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e9e7744..2c48ec1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -500,21 +500,66 @@ IDirect3DDeviceImpl_7_GetCaps_FPUPreserve(IDirect3DDevice7 *iface, * D3DERR_* if a problem occurs. See WineD3D * *****************************************************************************/ + +/* There are 3 versions of D3DDEVICEDESC. All 3 share the same name because + * Microsoft just expanded the existing structure without naming them + * D3DDEVICEDESC2 and D3DDEVICEDESC3. Which version is used have depends + * on the version of the DirectX SDK. DirectX 6+ and Wine use the latest + * one with 252 bytes. + * + * All 3 versions are allowed as parameters and only the specified amount of + * bytes is written. + * + * Note that Direct3D7 and earlier are not available in native Win64 + * ddraw.dll builds, so possible size differences between 32 bit and + * 64 bit are a non-issue. + */ +static inline BOOL check_d3ddevicedesc_size(DWORD size) +{ + if (size == FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth) /* 172 */ + || size == FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat) /* 204 */ + || size == sizeof(D3DDEVICEDESC) /* 252 */) return TRUE; + return FALSE; +} + static HRESULT WINAPI IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface, D3DDEVICEDESC *HWDesc, D3DDEVICEDESC *HelDesc) { IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface); + D3DDEVICEDESC oldDesc; D3DDEVICEDESC7 newDesc; HRESULT hr; TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc); - hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, HWDesc, &newDesc); + if (!HWDesc) + { + WARN("HWDesc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (!check_d3ddevicedesc_size(HWDesc->dwSize)) + { + WARN("HWDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HWDesc->dwSize); + return DDERR_INVALIDPARAMS; + } + if (!HelDesc) + { + WARN("HelDesc is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (!check_d3ddevicedesc_size(HelDesc->dwSize)) + { + WARN("HelDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HelDesc->dwSize); + return DDERR_INVALIDPARAMS; + } + + hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, &oldDesc, &newDesc); if(hr != D3D_OK) return hr; - *HelDesc = *HWDesc; + DD_STRUCT_COPY_BYSIZE(HWDesc, &oldDesc); + DD_STRUCT_COPY_BYSIZE(HelDesc, &oldDesc); return D3D_OK; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 153d39f..d94fd7e 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4895,6 +4895,91 @@ static void test_coop_level_surf_create(void) IDirectDraw7_Release(ddraw7); } +static void test_get_caps1(void) +{ + D3DDEVICEDESC hw_caps, hel_caps; + HRESULT hr; + unsigned int i; + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hel_caps.dwFlags = 0xdeadc0de; + + /* NULL pointers */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, NULL); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hel caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, NULL, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hw caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + /* Successful call: Both are modified */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with correct size returned hr %#x, expected D3D_OK.\n", hr); + ok(hw_caps.dwFlags != 0xdeadbeef, "hw_caps.dwFlags was not modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags != 0xdeadc0de, "hel_caps.dwFlags was not modified: %#x.\n", hel_caps.dwFlags); + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + /* Keep dwSize at 0 */ + hel_caps.dwFlags = 0xdeadc0de; + + /* If one is invalid the call fails */ + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hel_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + hel_caps.dwSize = sizeof(hel_caps); + hw_caps.dwSize = sizeof(hw_caps) + 1; + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hw_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + for (i = 0; i < 1024; i++) + { + memset(&hw_caps, 0xfe, sizeof(hw_caps)); + memset(&hel_caps, 0xfe, sizeof(hel_caps)); + hw_caps.dwSize = hel_caps.dwSize = i; + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + switch (i) + { + /* D3DDEVICEDESCSIZE in old sdk versions */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth): /* 172, DirectX 3, IDirect3DDevice1 */ + ok(hw_caps.dwMinTextureWidth == 0xfefefefe, "hw_caps.dwMinTextureWidth was modified: %#x.\n", + hw_caps.dwMinTextureWidth); + ok(hel_caps.dwMinTextureWidth == 0xfefefefe, "hel_caps.dwMinTextureWidth was modified: %#x.\n", + hel_caps.dwMinTextureWidth); + /* drop through */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat): /* 204, DirectX 5, IDirect3DDevice2 */ + ok(hw_caps.dwMaxTextureRepeat == 0xfefefefe, "hw_caps.dwMaxTextureRepeat was modified: %#x.\n", + hw_caps.dwMaxTextureRepeat); + ok(hel_caps.dwMaxTextureRepeat == 0xfefefefe, "hel_caps.dwMaxTextureRepeat was modified: %#x.\n", + hel_caps.dwMaxTextureRepeat); + /* drop through */ + case sizeof(D3DDEVICEDESC): /* 252, DirectX 6, IDirect3DDevice3 */ + ok(hr == D3D_OK, "GetCaps with size %u returned hr %#x, expected D3D_OK.\n", i, hr); + break; + + default: + ok(hr == DDERR_INVALIDPARAMS, + "GetCaps with size %u returned hr %#x, expected DDERR_INVALIDPARAMS.\n", i, hr); + break; + } + } + + /* Different valid sizes are OK */ + hw_caps.dwSize = 172; + hel_caps.dwSize = sizeof(D3DDEVICEDESC); + hr = IDirect3DDevice_GetCaps(Direct3DDevice1, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr); +} + START_TEST(d3d) { init_function_pointers(); @@ -4934,6 +5019,7 @@ START_TEST(d3d) FindDevice(); BackBuffer3DCreateSurfaceTest(); BackBuffer3DAttachmentTest(); + test_get_caps1(); D3D1_releaseObjects(); }

1 0