January 2012 - Wine-commits

André Hentschel : d3drm: Implement GetVertices for IDirect3DRMMeshBuilder3.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 33c7a865cb9087f2c0fc289211e0d7e216a1aee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c7a865cb9087f2c0fc28921… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:22:04 2012 +0100 d3drm: Implement GetVertices for IDirect3DRMMeshBuilder3. --- dlls/d3drm/meshbuilder.c | 14 ++++++++++---- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 409e659..34a8d4c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1845,14 +1845,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertices(IDirect3DRMMeshBui } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetVertices(IDirect3DRMMeshBuilder3* iface, - DWORD IndexFirst, LPDWORD count, - LPD3DVECTOR vector) + DWORD IndexFirst, LPDWORD vcount, + LPD3DVECTOR vertices) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DWORD count = This->nb_vertices - IndexFirst; - FIXME("(%p)->(%u,%p,%p): stub\n", This, IndexFirst, count, vector); + TRACE("(%p)->(%u,%p,%p)\n", This, IndexFirst, vcount, vertices); - return E_NOTIMPL; + if (vcount) + *vcount = count; + if (vertices && This->nb_vertices) + memcpy(vertices, This->pVertices + IndexFirst, count * sizeof(D3DVECTOR)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetNormals(IDirect3DRMMeshBuilder3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d4bb77d..f021e2c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -208,8 +208,8 @@ static void test_MeshBuilder3(void) 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); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); valu = 1.23f; valv = 3.21f;

1 0

Jörg Höhle : dsound: Vista/ XP SP2 reworked the Speaker Configuration.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 999423d34e896192f7cf57016baa92cbf38bf9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999423d34e896192f7cf57016… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Sep 24 21:11:45 2011 +0200 dsound: Vista/XP SP2 reworked the Speaker Configuration. --- dlls/dsound/dsound.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- include/dsound.h | 5 +++++ include/ksmedia.h | 2 ++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index fbfb4f8..b3475ad 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1172,7 +1172,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ref = 1; device->priolevel = DSSCL_NORMAL; device->state = STATE_STOPPED; - device->speaker_config = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16); + device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); /* 3D listener initial parameters */ device->ds3dl.dwSize = sizeof(DS3DLISTENER); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8e79c6e..0cb7b9b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1206,7 +1206,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 19a505c..5d69e3c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -700,7 +700,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index aaa94ee..89c9adf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -657,7 +657,7 @@ static DWORD get_channel_mask(unsigned int channels) case 7: return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; case 8: - return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/include/dsound.h b/include/dsound.h index 372fabf..cd284aa 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -301,13 +301,18 @@ typedef struct _DSBPOSITIONNOTIFY } DSBPOSITIONNOTIFY,*LPDSBPOSITIONNOTIFY; typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY; +#define DSSPEAKER_DIRECTOUT 0 #define DSSPEAKER_HEADPHONE 1 #define DSSPEAKER_MONO 2 #define DSSPEAKER_QUAD 3 #define DSSPEAKER_STEREO 4 #define DSSPEAKER_SURROUND 5 #define DSSPEAKER_5POINT1 6 +#define DSSPEAKER_5POINT1_BACK 6 #define DSSPEAKER_7POINT1 7 +#define DSSPEAKER_7POINT1_WIDE 7 +#define DSSPEAKER_7POINT1_SURROUND 8 +#define DSSPEAKER_5POINT1_SURROUND 9 #define DSSPEAKER_GEOMETRY_MIN 0x00000005 /* 5 degrees */ #define DSSPEAKER_GEOMETRY_NARROW 0x0000000A /* 10 degrees */ diff --git a/include/ksmedia.h b/include/ksmedia.h index 44834bb..dec2866 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -34,8 +34,10 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0 #define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) #define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +/* 5:1 SIDE or BACK is not distinguished, only 0x3F shall be used (BACK) */ #define KSAUDIO_SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) +/* 7:1 home theater 0x63F */ #define KSAUDIO_SPEAKER_7POINT1_SURROUND (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #ifndef REFERENCE_TIME_DEFINED

1 0

Jörg Höhle : wineoss: Reset accounts for dropped frames in capture mode.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 04cf4dc06ff5d2d1b43d3a7d6f3ccbb07b8c1fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cf4dc06ff5d2d1b43d3a7d6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 23:08:47 2012 +0100 wineoss: Reset accounts for dropped frames in capture mode. --- dlls/wineoss.drv/mmdevdrv.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 89c9adf..8bfb768 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1501,7 +1501,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - This->written_frames = 0; + if(This->dataflow == eRender){ + This->written_frames = 0; + }else{ + This->written_frames += This->held_frames; + } + This->lcl_offs_frames = 0; This->inbuf_frames = 0; This->held_frames = 0;

1 0

Matteo Bruni : d3d8/tests: Add more INTZ tests.
by Alexandre Julliard 13 Jan '12

13 Jan '12

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: Set depth textures dirty after modifying the underlying surface.
by Alexandre Julliard 13 Jan '12

13 Jan '12

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

Matteo Bruni : wined3d: Modify depth-stencil location flags only after allocating the new location .
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: cbf641e9e03b993b121f523ed397acc8c1b5dfc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf641e9e03b993b121f523ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 12 17:05:19 2012 +0100 wined3d: Modify depth-stencil location flags only after allocating the new location. --- dlls/wined3d/device.c | 16 +++++++++------- dlls/wined3d/drawprim.c | 13 ++++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e60439..8633c65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -600,7 +600,7 @@ static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw } static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context *context, - DWORD location, const RECT *draw_rect, UINT rect_count, const RECT *clear_rect) + DWORD location, const RECT *draw_rect, UINT rect_count, const RECT *clear_rect, RECT *out_rect) { RECT current_rect, r; @@ -615,7 +615,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (EqualRect(&r, draw_rect)) { /* current_rect ⊇ draw_rect, modify only. */ - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); return; } @@ -626,7 +626,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (!clear_rect) { /* Full clear, modify only. */ - surface_modify_ds_location(ds, location, draw_rect->right, draw_rect->bottom); + *out_rect = *draw_rect; return; } @@ -634,14 +634,14 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (EqualRect(&r, draw_rect)) { /* clear_rect ⊇ draw_rect, modify only. */ - surface_modify_ds_location(ds, location, draw_rect->right, draw_rect->bottom); + *out_rect = *draw_rect; return; } } /* Full load. */ surface_load_ds_location(ds, context, location); - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } /* Do not call while under the GL lock. */ @@ -656,6 +656,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count GLbitfield clear_mask = 0; BOOL render_offscreen; unsigned int i; + RECT ds_rect; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -701,7 +702,8 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (!render_offscreen && fb->depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, fb->depth_stencil); - prepare_ds_clear(fb->depth_stencil, context, location, draw_rect, rect_count, clear_rect); + prepare_ds_clear(fb->depth_stencil, context, location, + draw_rect, rect_count, clear_rect, &ds_rect); } if (!context_apply_clear_state(context, device, rt_count, fb)) @@ -732,7 +734,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; - surface_modify_location(fb->depth_stencil, location, TRUE); + surface_modify_ds_location(fb->depth_stencil, location, ds_rect.right, ds_rect.bottom); glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 707e364..a5e81db 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -634,11 +634,6 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) surface_load_ds_location(ds, context, location); - - if (state->render_states[WINED3D_RS_ZWRITEENABLE]) - { - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - } } } @@ -649,6 +644,14 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId return; } + if (device->fb.depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + { + struct wined3d_surface *ds = device->fb.depth_stencil; + DWORD location = context->render_offscreen ? ds->draw_binding : SFLAG_INDRAWABLE; + + surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + } + if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0] || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) && context->render_offscreen

1 0

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

13 Jan '12

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 13 Jan '12

13 Jan '12

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

André Hentschel : setupapi: Add stub for CM_Get_Class_Registry_PropertyA.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 0309066f15f2a6fa40f362f3b431f1869af580d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0309066f15f2a6fa40f362f3b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 12 21:05:01 2012 +0100 setupapi: Add stub for CM_Get_Class_Registry_PropertyA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 ++ dlls/setupapi/setupapi.spec | 2 ++ dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 24c4cf3..69b35f6 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -52,6 +52,8 @@ @ stub CM_Get_Class_NameW @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyA +@ stub CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index eceef49..5c8fd80 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -63,6 +63,8 @@ @ stub CM_Get_Class_NameW @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) +@ stub CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1617f71..41f6d2f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -388,6 +388,16 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) } /*********************************************************************** + * CM_Get_Class_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULONG regdatatype, + PVOID buf, ULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len,

1 0

André Hentschel : setupapi: Add stub for CM_Get_Class_Registry_PropertyW.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 88baa9e700027b4d57cc8c5589c3a4e8843b31c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88baa9e700027b4d57cc8c558… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 12 21:05:08 2012 +0100 setupapi: Add stub for CM_Get_Class_Registry_PropertyW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 69b35f6..3d687b3 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -53,7 +53,7 @@ @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyA -@ stub CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5c8fd80..d3825d9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -64,7 +64,7 @@ @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) -@ stub CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 41f6d2f..ba437b7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -398,6 +398,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULON } /*********************************************************************** + * CM_Get_Class_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULONG regdatatype, + PVOID buf, ULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len,

1 0