January 2012 - Wine-Commits

Daniel Lehman : msvcp90: Add num_get<short> stubs.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 015ccccfeb07b047b68df5d852979d2a7dc35f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ccccfeb07b047b68df5d85… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 3 16:16:43 2012 -0800 msvcp90: Add num_get<short> stubs. --- dlls/msvcp90/locale.c | 115 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 130 ++++++++++++++++++++++---------------------- 2 files changed, 180 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=015ccccfeb07b047b68df…

1 0

André Hentschel : d3drm: Add more MeshBuilder tests.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 455edb1870fcf3c38ba71def757158deff00d16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=455edb1870fcf3c38ba71def7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:12:47 2012 +0100 d3drm: Add more MeshBuilder tests. --- dlls/d3drm/tests/Makefile.in | 1 + dlls/d3drm/tests/d3drm.c | 98 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index f403d0e..5393742 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = d3drm.dll +IMPORTS = dxguid C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 267bd2d..b965242 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -80,7 +80,7 @@ static char data_ok[] = "3; 3, 1, 2;;\n" "}\n"; -static void MeshBuilderTest(void) +static void test_MeshBuilder(void) { HRESULT hr; LPDIRECT3DRM pD3DRM; @@ -88,6 +88,7 @@ static void MeshBuilderTest(void) D3DRMLOADMEMORY info; int val; DWORD val1, val2, val3; + D3DVALUE valu, valv; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -122,17 +123,110 @@ static void MeshBuilderTest(void) todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); todo_wine ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 1, valu, valv); + todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + IDirect3DRMMeshBuilder_Release(pMeshBuilder); IDirect3DRM_Release(pD3DRM); } +static void test_MeshBuilder3(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRM3 pD3DRM3; + LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + D3DRMLOADMEMORY info; + int val; + DWORD val1; + D3DVALUE valu, valv; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_QueryInterface(pD3DRM, &IID_IDirect3DRM3, (LPVOID*)&pD3DRM3); + if (FAILED(hr)) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + return; + } + + hr = IDirect3DRM_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + info.lpMemory = data_bad_version; + info.dSize = strlen(data_bad_version); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + + info.lpMemory = data_no_mesh; + info.dSize = strlen(data_no_mesh); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); + + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder3); + todo_wine ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); + + val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder3); + todo_wine ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); + + hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL); + todo_wine ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + todo_wine ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 1, valu, valv); + todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); + todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + + IDirect3DRMMeshBuilder_Release(pMeshBuilder3); + + IDirect3DRM_Release(pD3DRM3); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) return; - MeshBuilderTest(); + test_MeshBuilder(); + test_MeshBuilder3(); FreeLibrary(d3drm_handle); }

1 0

André Hentschel : d3drm: Add more Frame tests.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: d16806e3fb34a5da76b452d2efd470ace0cd2835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16806e3fb34a5da76b452d2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:14:31 2012 +0100 d3drm: Add more Frame tests. --- dlls/d3drm/tests/d3drm.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index b965242..67c6d8c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -220,6 +220,138 @@ static void test_MeshBuilder3(void) IDirect3DRM_Release(pD3DRM3); } +static void test_Frame(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMFRAME pFrameC; + LPDIRECT3DRMFRAME pFrameP1; + LPDIRECT3DRMFRAME pFrameP2; + LPDIRECT3DRMFRAME pFrameTmp; + LPDIRECT3DRMFRAMEARRAY pArray; + DWORD count; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameC); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameC, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + todo_wine ok(pArray != NULL, "pArray = %p\n", pArray); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + /* Add child to first parent */ + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + + /* Add child to second parent */ + hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); + + /* Add child again */ + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 1, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + /* Delete child */ + hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 0, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + IDirect3DRMMeshBuilder_Release(pFrameC); + IDirect3DRMMeshBuilder_Release(pFrameP1); + IDirect3DRMMeshBuilder_Release(pFrameP2); + + IDirect3DRM_Release(pD3DRM); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) @@ -227,6 +359,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); + test_Frame(); FreeLibrary(d3drm_handle); }

1 0

Matteo Bruni : wined3d: Set depth textures dirty after modifying the underlying surface.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: add5916c773ac89759e5a167de489df91c2bc461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add5916c773ac89759e5a167d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 12 17:05:18 2012 +0100 wined3d: Set depth textures dirty after modifying the underlying surface. --- dlls/wined3d/surface.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bf379f1..64e8646 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5578,6 +5578,16 @@ void surface_modify_ds_location(struct wined3d_surface *surface, if (!(surface->rb_multisample)) location &= ~SFLAG_INRB_MULTISAMPLE; + if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) + || (!(surface->flags & SFLAG_INTEXTURE) && (location & SFLAG_INTEXTURE))) + { + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + { + TRACE("Passing to container.\n"); + wined3d_texture_set_dirty(surface->container.u.texture, TRUE); + } + } + surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; surface->flags &= ~SFLAG_LOCATIONS;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: e70990041b08c8d2978fa481cbed1c5454f4c714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70990041b08c8d2978fa481c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:12 2012 +0100 wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef. --- dlls/d3d8/device.c | 6 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/device.c | 138 ++++++++++++++++++++++++--------------- dlls/ddraw/surface.c | 8 +- dlls/wined3d/device.c | 12 ++-- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/surface.c | 83 ++++++++++++------------ dlls/wined3d/swapchain.c | 8 +- dlls/wined3d/texture.c | 38 ++++++------ dlls/wined3d/utils.c | 24 ++++--- dlls/wined3d/wined3d_private.h | 22 +++--- include/wine/wined3d.h | 29 ++++---- 14 files changed, 207 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70990041b08c8d2978fa…

1 0

Matteo Bruni : d3d8/tests: Add more INTZ tests.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 5604c7ed99f52b55e6725dbe6d9bcd9843592398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5604c7ed99f52b55e6725dbe6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 12 17:05:17 2012 +0100 d3d8/tests: Add more INTZ tests. --- dlls/d3d8/tests/visual.c | 147 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 145 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c221d47..dcaa091 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1854,6 +1854,20 @@ static void intz_test(IDirect3DDevice8 *device) { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, + }, + half_quad_1[] = + { + { -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, + }, + half_quad_2[] = + { + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -1888,6 +1902,11 @@ static void intz_test(IDirect3DDevice8 *device) skip("No pixel shader 1.1 support, skipping INTZ test.\n"); return; } + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + { + skip("No unconditional NP2 texture support, skipping INTZ test.\n"); + return; + } hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); @@ -1907,10 +1926,10 @@ static void intz_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 1024, 1024, 1, + hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_CreateRenderTarget(device, 1024, 1024, D3DFMT_A8R8G8B8, + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_CreatePixelShader(device, ps_code, &ps); @@ -1953,6 +1972,8 @@ static void intz_test(IDirect3DDevice8 *device) hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &ds); ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + + /* Render offscreen, using the INTZ texture as depth buffer */ hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); IDirect3DDevice8_SetPixelShader(device, 0); @@ -1998,6 +2019,128 @@ static void intz_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 1, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + /* Render onscreen while using the INTZ texture as depth buffer */ + hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, + D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &ds); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, ds); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, NULL); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface8_Release(ds); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 1, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Read the depth values back. */ + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 1, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); + + /* Render offscreen, then onscreen, and finally check the INTZ texture in both areas */ + hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, + D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &ds); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, half_quad_1, sizeof(*half_quad_1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, ds); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, half_quad_2, sizeof(*half_quad_2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, NULL); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface8_Release(ds); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 1, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Read the depth values back. */ + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); IDirect3DSurface8_Release(original_ds);

1 0

Matteo Bruni : wined3d: Handle discarded depth-stencil surfaces with SFLAG_LOST.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: c6c5c6905e87fefffd00c7d8e68df22879aefe55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c5c6905e87fefffd00c7d8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 12 17:05:20 2012 +0100 wined3d: Handle discarded depth-stencil surfaces with SFLAG_LOST. SFLAG_INSYSMEM is already set by surface_add_dirty_rect() for all surfaces anyway. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++-------------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ---- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8633c65..563a924 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4937,7 +4937,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || prev->flags & SFLAG_DISCARD) { - surface_modify_ds_location(prev, SFLAG_DS_DISCARDED, + surface_modify_ds_location(prev, SFLAG_LOST, prev->resource.width, prev->resource.height); if (prev == device->onscreen_depth_stencil) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 64e8646..3b21f87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -764,7 +764,8 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) return WINED3DERR_INVALIDCALL; } - surface->flags |= SFLAG_INSYSMEM; + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + surface->flags |= SFLAG_LOST; return WINED3D_OK; } @@ -5568,16 +5569,9 @@ void surface_modify_ds_location(struct wined3d_surface *surface, { TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - if (location & ~SFLAG_LOCATIONS) + if (location & ~(SFLAG_LOCATIONS | SFLAG_LOST)) FIXME("Invalid location (%#x) specified.\n", location); - if (!(surface->flags & SFLAG_ALLOCATED)) - location &= ~SFLAG_INTEXTURE; - if (!(surface->rb_resolved)) - location &= ~SFLAG_INRB_RESOLVED; - if (!(surface->rb_multisample)) - location &= ~SFLAG_INRB_MULTISAMPLE; - if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) || (!(surface->flags & SFLAG_INTEXTURE) && (location & SFLAG_INTEXTURE))) { @@ -5590,7 +5584,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - surface->flags &= ~SFLAG_LOCATIONS; + surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_LOST); surface->flags |= location; } @@ -5631,13 +5625,32 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } + if (surface->flags & SFLAG_LOST) + { + TRACE("Surface was discarded, no need copy data.\n"); + switch (location) + { + case SFLAG_INTEXTURE: + surface_prepare_texture(surface, context, FALSE); + break; + case SFLAG_INRB_MULTISAMPLE: + surface_prepare_rb(surface, context->gl_info, TRUE); + break; + case SFLAG_INDRAWABLE: + /* Nothing to do */ + break; + default: + FIXME("Unhandled location %#x", location); + } + surface->flags &= ~SFLAG_LOST; + surface->flags |= location; + surface->ds_current_size.cx = surface->resource.width; + surface->ds_current_size.cy = surface->resource.height; + return; + } + if (!(surface->flags & SFLAG_LOCATIONS)) { - /* This mostly happens when a depth / stencil is used without being - * cleared first. In principle we could upload from sysmem, or - * explicitly clear before first usage. For the moment there don't - * appear to be a lot of applications depending on this, so a FIXME - * should do. */ FIXME("No up to date depth stencil location.\n"); surface->flags |= location; surface->ds_current_size.cx = surface->resource.width; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index feefc98..d363b63 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -641,7 +641,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R if (swapchain->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || fb->depth_stencil->flags & SFLAG_DISCARD) { - surface_modify_ds_location(fb->depth_stencil, SFLAG_DS_DISCARDED, + surface_modify_ds_location(fb->depth_stencil, SFLAG_LOST, fb->depth_stencil->resource.width, fb->depth_stencil->resource.height); if (fb->depth_stencil == swapchain->device->onscreen_depth_stencil) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80162b2..cc881d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2179,11 +2179,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_INRB_MULTISAMPLE | \ SFLAG_INRB_RESOLVED) -#define SFLAG_DS_DISCARDED (SFLAG_INTEXTURE | \ - SFLAG_INDRAWABLE | \ - SFLAG_INRB_MULTISAMPLE | \ - SFLAG_INRB_RESOLVED) - typedef enum { NO_CONVERSION, CONVERT_PALETTED,

1 0

Nikolay Sivov : msxml3: Leading space chars are allowed in SelectionNamespaces value string.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 0f658d9dc8232e7a5e7beb545eea875cb8f859f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f658d9dc8232e7a5e7beb545… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 12 23:31:22 2012 +0300 msxml3: Leading space chars are allowed in SelectionNamespaces value string. --- dlls/msxml3/domdoc.c | 45 ++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 79 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 102 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4bb4fa4..47ce60d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2767,14 +2767,11 @@ static HRESULT WINAPI domdoc_setProperty( } else if (lstrcmpiW(p, PropertySelectionNamespacesW) == 0) { + xmlChar *nsStr = (xmlChar*)This->properties->selectNsStr; + struct list *pNsList; VARIANT varStr; HRESULT hr; BSTR bstr; - xmlChar *pTokBegin, *pTokEnd, *pTokInner; - xmlChar *nsStr = (xmlChar*)This->properties->selectNsStr; - xmlXPathContextPtr ctx; - struct list *pNsList; - select_ns_entry* pNsEntry = NULL; V_VT(&varStr) = VT_EMPTY; if (V_VT(&var) != VT_BSTR) @@ -2793,20 +2790,30 @@ static HRESULT WINAPI domdoc_setProperty( heap_free(nsStr); nsStr = xmlchar_from_wchar(bstr); - TRACE("Setting SelectionNamespaces property to: %s\n", nsStr); + TRACE("property value: \"%s\"\n", debugstr_w(bstr)); This->properties->selectNsStr = nsStr; This->properties->selectNsStr_len = xmlStrlen(nsStr); if (bstr && *bstr) { + xmlChar *pTokBegin, *pTokEnd, *pTokInner; + select_ns_entry* ns_entry = NULL; + xmlXPathContextPtr ctx; + ctx = xmlXPathNewContext(This->node.node->doc); pTokBegin = nsStr; + + /* skip leading spaces */ + while (*pTokBegin == ' ' || *pTokBegin == '\n' || + *pTokBegin == '\t' || *pTokBegin == '\r') + ++pTokBegin; + for (; *pTokBegin; pTokBegin = pTokEnd) { - if (pNsEntry != NULL) - memset(pNsEntry, 0, sizeof(select_ns_entry)); + if (ns_entry) + memset(ns_entry, 0, sizeof(select_ns_entry)); else - pNsEntry = heap_alloc_zero(sizeof(select_ns_entry)); + ns_entry = heap_alloc_zero(sizeof(select_ns_entry)); while (*pTokBegin == ' ') ++pTokBegin; @@ -2831,7 +2838,7 @@ static HRESULT WINAPI domdoc_setProperty( } else if (*pTokBegin == ':') { - pNsEntry->prefix = ++pTokBegin; + ns_entry->prefix = ++pTokBegin; for (pTokInner = pTokBegin; pTokInner != pTokEnd && *pTokInner != '='; ++pTokInner) ; @@ -2843,7 +2850,7 @@ static HRESULT WINAPI domdoc_setProperty( continue; } - pNsEntry->prefix_end = *pTokInner; + ns_entry->prefix_end = *pTokInner; *pTokInner = 0; ++pTokInner; @@ -2851,25 +2858,25 @@ static HRESULT WINAPI domdoc_setProperty( ((*pTokInner == '\'' && *(pTokEnd-1) == '\'') || (*pTokInner == '"' && *(pTokEnd-1) == '"'))) { - pNsEntry->href = ++pTokInner; - pNsEntry->href_end = *(pTokEnd-1); + ns_entry->href = ++pTokInner; + ns_entry->href_end = *(pTokEnd-1); *(pTokEnd-1) = 0; - list_add_tail(pNsList, &pNsEntry->entry); + list_add_tail(pNsList, &ns_entry->entry); /*let libxml figure out if they're valid from here ;)*/ - if (xmlXPathRegisterNs(ctx, pNsEntry->prefix, pNsEntry->href) != 0) + if (xmlXPathRegisterNs(ctx, ns_entry->prefix, ns_entry->href) != 0) { hr = E_FAIL; } - pNsEntry = NULL; + ns_entry = NULL; continue; } else { WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokInner, pTokEnd-pTokInner)); - list_add_tail(pNsList, &pNsEntry->entry); + list_add_tail(pNsList, &ns_entry->entry); - pNsEntry = NULL; + ns_entry = NULL; hr = E_FAIL; continue; } @@ -2880,7 +2887,7 @@ static HRESULT WINAPI domdoc_setProperty( continue; } } - heap_free(pNsEntry); + heap_free(ns_entry); xmlXPathFreeContext(ctx); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a4e5ab1..0041763 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5480,8 +5480,41 @@ static void test_whitespace(void) free_bstrs(); } -static void test_XPath(void) +typedef struct { + const GUID *clsid; + const char *name; + const char *ns; + HRESULT hr; +} selection_ns_t; + +/* supposed to be tested with szExampleXML */ +static const selection_ns_t selection_ns_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument, "CLSID_DOMDocument", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument, "CLSID_DOMDocument", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + + { NULL } +}; + +void test_XPath(void) { + const selection_ns_t *ptr = selection_ns_data; VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; @@ -5498,7 +5531,8 @@ static void test_XPath(void) doc = create_document(&IID_IXMLDOMDocument2); if (!doc) return; - ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b)); + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "failed to load XML string\n"); /* switch to XPath */ @@ -5711,8 +5745,47 @@ static void test_XPath(void) IXMLDOMNode_Release(rootNode); IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc2); - IXMLDOMDocument2_Release(doc); + + while (ptr->clsid) + { + hr = CoCreateInstance(ptr->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc); + if (hr != S_OK) + { + win_skip("can't create instance of %s\n", ptr->name); + ptr++; + continue; + } + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load, %s\n", ptr->name); + + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath")); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(ptr->ns); + + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), var); + ok(hr == ptr->hr, "got 0x%08x, for %s, %s\n", hr, ptr->name, ptr->ns); + + V_VT(&var) = VT_EMPTY; + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var); + EXPECT_HR(hr, S_OK); + ok(V_VT(&var) == VT_BSTR, "got wrong property type %d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), _bstr_(ptr->ns)), "got wrong value %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root//test:c"), &list); + EXPECT_HR(hr, S_OK); + if (hr == S_OK) + expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); + + IXMLDOMDocument2_Release(doc); + ptr++; + } + free_bstrs(); }

1 0

Nikolay Sivov : shell32: Rearrange code to avoid forward declarations.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 881299c6a8e806577d639970c5cc4ffc9c6bfbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=881299c6a8e806577d639970c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 13 00:14:14 2012 +0300 shell32: Rearrange code to avoid forward declarations. --- dlls/shell32/shlfsbind.c | 169 +++++++++++++++++++++------------------------ 1 files changed, 79 insertions(+), 90 deletions(-) diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 5988290..53a1d3b 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -44,86 +44,31 @@ typedef struct IFileSystemBindData IFileSystemBindData_iface; LONG ref; WIN32_FIND_DATAW findFile; -} IFileSystemBindDataImpl; +} FileSystemBindData; -static inline IFileSystemBindDataImpl *impl_from_IFileSystemBindData(IFileSystemBindData *iface) +static inline FileSystemBindData *impl_from_IFileSystemBindData(IFileSystemBindData *iface) { - return CONTAINING_RECORD(iface, IFileSystemBindDataImpl, IFileSystemBindData_iface); + return CONTAINING_RECORD(iface, FileSystemBindData, IFileSystemBindData_iface); } -static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *, REFIID, LPVOID*); -static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *); -static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *); -static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *, WIN32_FIND_DATAW *); -static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *, const WIN32_FIND_DATAW *); - -static const IFileSystemBindDataVtbl sbvt = -{ - IFileSystemBindData_fnQueryInterface, - IFileSystemBindData_fnAddRef, - IFileSystemBindData_fnRelease, - IFileSystemBindData_fnSetFindData, - IFileSystemBindData_fnGetFindData, -}; - -static const WCHAR wFileSystemBindData[] = { - 'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; - -HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV) +static HRESULT WINAPI FileSystemBindData_QueryInterface( + IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) { - IFileSystemBindDataImpl *sb; - HRESULT ret = E_OUTOFMEMORY; - - TRACE("%p, %p\n", pfd, ppV); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); - if (!ppV) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppV); *ppV = NULL; - sb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IFileSystemBindDataImpl)); - if (!sb) - return ret; - - sb->IFileSystemBindData_iface.lpVtbl = &sbvt; - sb->ref = 1; - IFileSystemBindData_fnSetFindData(&sb->IFileSystemBindData_iface, pfd); - - ret = CreateBindCtx(0, ppV); - if (SUCCEEDED(ret)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IFileSystemBindData)) { - BIND_OPTS bindOpts; - - bindOpts.cbStruct = sizeof(BIND_OPTS); - bindOpts.grfFlags = 0; - bindOpts.grfMode = STGM_CREATE; - bindOpts.dwTickCountDeadline = 0; - IBindCtx_SetBindOptions(*ppV, &bindOpts); - IBindCtx_RegisterObjectParam(*ppV, (LPOLESTR)wFileSystemBindData, (LPUNKNOWN)sb); - - IFileSystemBindData_Release(&sb->IFileSystemBindData_iface); + *ppV = &This->IFileSystemBindData_iface; } - else - HeapFree(GetProcessHeap(), 0, sb); - return ret; -} - -static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( - IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) -{ - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p)->(\n\tIID:\t%s, %p)\n", This, debugstr_guid(riid), ppV); - - *ppV = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppV = This; - else if (IsEqualIID(riid, &IID_IFileSystemBindData)) - *ppV = This; if (*ppV) { - IUnknown_AddRef((IUnknown*)(*ppV)); + IFileSystemBindData_AddRef(iface); TRACE("-- Interface: (%p)->(%p)\n", ppV, *ppV); return S_OK; } @@ -131,36 +76,32 @@ static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) +static ULONG WINAPI FileSystemBindData_AddRef(IFileSystemBindData *iface) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%i)\n", This, refCount - 1); - - return refCount; + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } -static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) +static ULONG WINAPI FileSystemBindData_Release(IFileSystemBindData *iface) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%i)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, ref); - if (!refCount) - { - TRACE(" destroying ISFBindPidl(%p)\n",This); + if (!ref) HeapFree(GetProcessHeap(), 0, This); - } - return refCount; + + return ref; } -static HRESULT WINAPI IFileSystemBindData_fnGetFindData( - IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) +static HRESULT WINAPI FileSystemBindData_GetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p), %p\n", This, pfd); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + + TRACE("(%p)->(%p)\n", This, pfd); if (!pfd) return E_INVALIDARG; @@ -169,11 +110,11 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( return S_OK; } -static HRESULT WINAPI IFileSystemBindData_fnSetFindData( - IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd) +static HRESULT WINAPI FileSystemBindData_SetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p), %p\n", This, pfd); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + + TRACE("(%p)->(%p)\n", This, pfd); if (pfd) This->findFile = *pfd; @@ -181,3 +122,51 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); return S_OK; } + +static const IFileSystemBindDataVtbl FileSystemBindDataVtbl = { + FileSystemBindData_QueryInterface, + FileSystemBindData_AddRef, + FileSystemBindData_Release, + FileSystemBindData_SetFindData, + FileSystemBindData_GetFindData, +}; + +HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *find_data, LPBC *ppV) +{ + FileSystemBindData *This; + HRESULT ret; + + TRACE("(%p %p)\n", find_data, ppV); + + if (!ppV) + return E_INVALIDARG; + + *ppV = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IFileSystemBindData_iface.lpVtbl = &FileSystemBindDataVtbl; + This->ref = 1; + IFileSystemBindData_SetFindData(&This->IFileSystemBindData_iface, find_data); + + ret = CreateBindCtx(0, ppV); + if (SUCCEEDED(ret)) + { + static const WCHAR nameW[] = { + 'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; + BIND_OPTS bindOpts; + + bindOpts.cbStruct = sizeof(BIND_OPTS); + bindOpts.grfFlags = 0; + bindOpts.grfMode = STGM_CREATE; + bindOpts.dwTickCountDeadline = 0; + IBindCtx_SetBindOptions(*ppV, &bindOpts); + IBindCtx_RegisterObjectParam(*ppV, (WCHAR*)nameW, (IUnknown*)&This->IFileSystemBindData_iface); + + IFileSystemBindData_Release(&This->IFileSystemBindData_iface); + } + else + HeapFree(GetProcessHeap(), 0, This); + return ret; +}

1 0

Henri Verbeet : ddraw: Implement width and height changes in ddraw_surface7_SetSurfaceDesc().
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: afb64506ba0eb958af72d8535d8c5473f7fcc06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb64506ba0eb958af72d8535… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:08 2012 +0100 ddraw: Implement width and height changes in ddraw_surface7_SetSurfaceDesc(). --- dlls/ddraw/surface.c | 66 +++++++++++++++++++++++++++++-------- dlls/ddraw/tests/dsurface.c | 8 ++-- dlls/wined3d/device.c | 75 +++++------------------------------------- dlls/wined3d/surface.c | 64 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 ++ 6 files changed, 133 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb64506ba0eb958af72d…

1 0