wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Józef Kucia : wined3d: Add support for WINED3DFMT_BC5_UNORM format.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: cb6237c01830218f05491fa3a58f93d442c423fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6237c01830218f05491fa3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:15 2016 +0100 wined3d: Add support for WINED3DFMT_BC5_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 60ff776..8e3d64a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -242,6 +242,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, @@ -296,6 +297,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, @@ -1060,6 +1062,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC4_UNORM format.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 24b951389efdd741f3af75ccf93866ea7adba697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b951389efdd741f3af75ccf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:14 2016 +0100 wined3d: Add support for WINED3DFMT_BC4_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4e33f86..60ff776 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -241,6 +241,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC2_UNORM, WINED3DFMT_BC2_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, + {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, @@ -294,6 +295,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, @@ -1053,6 +1055,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, + {WINED3DFMT_BC4_UNORM, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0,

1 0

Michael Stefaniuc : shell32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: fba64b5cacc58e28a7dd83c96be1daef2e136aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba64b5cacc58e28a7dd83c96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 10:00:18 2016 +0100 shell32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/ebrowser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 7a01d56..3b22ffb 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -881,7 +881,7 @@ static void test_initialization(void) /* empty rectangle */ ebrowser_instantiate(&peb); - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -1101,7 +1101,7 @@ static void test_basics(void) ebrowser_initialize(peb); /* SetRect */ - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr);

1 0

Michael Stefaniuc : user32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 3a74fd3f724d882fe33acecda1b84f505d9d4453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a74fd3f724d882fe33acecda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:59:46 2016 +0100 user32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 10 +++++----- dlls/user32/tests/win.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index df8d3ee..0352d66 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -315,16 +315,16 @@ static void test_DrawTextCalcRect(void) dtp.cbSize = sizeof(dtp); dtp.iLeftMargin = 0; dtp.iRightMargin = 0; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); textlen = rect.right; /* Width without margin */ dtp.iLeftMargin = 8; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); ok(rect.right==dtp.iLeftMargin+textlen ,"Incorrect left margin calculated rc(%d,%d)\n", rect.left, rect.right); dtp.iLeftMargin = 0; dtp.iRightMargin = 8; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); ok(rect.right==dtp.iRightMargin+textlen ,"Incorrect right margin calculated rc(%d,%d)\n", rect.left, rect.right); @@ -535,7 +535,7 @@ static void test_DrawTextCalcRect(void) } /* More test cases from bug 12226 */ - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); ok(textheight, "DrawTextA error %u\n", GetLastError()); ok(0 == rect.left, "expected 0, got %d\n", rect.left); @@ -543,7 +543,7 @@ static void test_DrawTextCalcRect(void) ok(0 == rect.top, "expected 0, got %d\n", rect.top); ok(rect.bottom, "rect.bottom should not be 0\n"); - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); if (!textheight && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4a09e39..44f0557 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5687,7 +5687,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); expected_cx = expected_cy = -10; - SetRect( &expected_rect, 0, 0, 0, 0 ); + SetRectEmpty(&expected_rect); SetRect( &broken_rect, 0, 0, -10, -10 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); @@ -5697,7 +5697,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); expected_cx = expected_cy = -200000; - SetRect( &expected_rect, 0, 0, 0, 0 ); + SetRectEmpty(&expected_rect); SetRect( &broken_rect, 0, 0, -200000, -200000 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); @@ -6249,7 +6249,7 @@ static void test_GetUpdateRect(void) flush_events( TRUE ); ShowWindow(hchild, SW_HIDE); - SetRect(&rc2, 0, 0, 0, 0); + SetRectEmpty(&rc2); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", @@ -6313,7 +6313,7 @@ static void test_GetUpdateRect(void) ShowWindow(hchild, SW_HIDE); - SetRect(&rc2, 0, 0, 0, 0); + SetRectEmpty(&rc2); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n",

1 0

Michael Stefaniuc : comctl32: Use SetRectEmty() instead of open coding it.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: d49201138d7f4740b1d0cc0190a572d7d8637091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49201138d7f4740b1d0cc019… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:58:40 2016 +0100 comctl32: Use SetRectEmty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 419a823..b467b36 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10061,7 +10061,7 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); ReleaseCapture(); - SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); + SetRectEmpty(&infoPtr->marqueeRect); infoPtr->bMarqueeSelect = FALSE; infoPtr->bScrolling = FALSE; @@ -10330,8 +10330,8 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT ReleaseCapture(); } - SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); - SetRect(&infoPtr->marqueeDrawRect, 0, 0, 0, 0); + SetRectEmpty(&infoPtr->marqueeRect); + SetRectEmpty(&infoPtr->marqueeDrawRect); infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE;

1 0

Michael Stefaniuc : wined3d: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: a29a3c8a0bc2971ca5ff10f22f3d0fa9c7e73381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29a3c8a0bc2971ca5ff10f22… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:31:52 2016 +0100 wined3d: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 90a3978..e126961 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1651,10 +1651,8 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un else if (flags & WINEDDOVER_HIDE) { /* Tests show that the rectangles are erased on hide. */ - surface->overlay_srcrect.left = 0; surface->overlay_srcrect.top = 0; - surface->overlay_srcrect.right = 0; surface->overlay_srcrect.bottom = 0; - surface->overlay_destrect.left = 0; surface->overlay_destrect.top = 0; - surface->overlay_destrect.right = 0; surface->overlay_destrect.bottom = 0; + SetRectEmpty(&surface->overlay_srcrect); + SetRectEmpty(&surface->overlay_destrect); surface->overlay_dest = NULL; }

1 0

Michael Stefaniuc : ddraw: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 3db08a49e170109ece767596b97ddf68fb12bfd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db08a49e170109ece767596b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:26:06 2016 +0100 ddraw: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/d3d.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e9c9c65..d133e7e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1436,7 +1436,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons } else { - SetRect(&src_rect, 0, 0, 0, 0); + SetRectEmpty(&src_rect); wined3d_src_texture = NULL; src_sub_resource_idx = 0; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 06f16f3..d877020 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1832,10 +1832,7 @@ static void DeviceLoadTest(void) /* First test some broken coordinates. */ loadpoint.x = loadpoint.y = 0; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 0; - loadrect.bottom = 0; + SetRectEmpty(&loadrect); hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr);

1 0

Nikolay Sivov : d3drm: Implement AddDestroyCallback/ DeleteDestroyCallback for a viewport.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 45743b4d9fb792d836e502c01f07a75a1814a602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45743b4d9fb792d836e502c01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:10:21 2016 +0300 d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_main.c | 70 ++++++++++++++++++++++++++++++++-- dlls/d3drm/d3drm_private.h | 8 ++++ dlls/d3drm/tests/d3drm.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 29 +++++++++----- 4 files changed, 190 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45743b4d9fb792d836e50…

1 0

Nikolay Sivov : d3drm: Support IDirect3DRMObject in viewport QI.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: b54afbc3a1667576683fcfb0c4c33ae8989304e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54afbc3a1667576683fcfb0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:10:20 2016 +0300 d3drm: Support IDirect3DRMObject in viewport QI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 16f0913..23193bf 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1221,6 +1221,7 @@ static void test_Viewport(void) IDirect3DRMFrame *frame; IDirect3DRMViewport *viewport; IDirect3DRMViewport2 *viewport2; + IDirect3DRMObject *obj, *obj2; GUID driver; HWND window; RECT rc; @@ -1249,6 +1250,22 @@ static void test_Viewport(void) hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj); + ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2); + + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMObject_Release(obj); + IDirect3DRMObject_Release(obj2); + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); hr = IDirect3DRMViewport_GetClassName(viewport, NULL, NULL); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 34c6fb4..e092559 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -57,6 +57,7 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMViewport) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &viewport->IDirect3DRMViewport_iface;

1 0

Hugh McMaster : reg/tests: Add more tests for all supported data types.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 9af841ea3951e216add98c0dac8d127f2c297734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af841ea3951e216add98c0da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 3 22:32:13 2016 +1100 reg/tests: Add more tests for all supported data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 93de7ec..af28a43 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -149,6 +149,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE|TODO_REG_TYPE|TODO_REG_DATA); + /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -181,6 +185,14 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -202,6 +214,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -242,6 +258,10 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, TODO_REG_DATA|TODO_REG_SIZE); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -310,6 +330,10 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -324,6 +348,17 @@ static void test_add(void) /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE2 /t REG_DWORD_BIG_ENDIAN /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -401,6 +436,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE|TODO_REG_DATA|TODO_REG_TYPE); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
73
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 March 2016