August 2012 - Wine-commits - list.winehq.org

Józef Kucia : d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 17d92f3b8f508a37163c8d0e91c456594c17f3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d92f3b8f508a37163c8d0e9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:39 2012 +0200 d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap. --- dlls/d3dx9_36/render.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 180 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 97a2916..cca6b44 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -416,6 +416,14 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, } +enum render_state +{ + INITIAL, + + CUBE_BEGIN, + CUBE_FACE +}; + struct render_to_envmap { ID3DXRenderToEnvMap ID3DXRenderToEnvMap_iface; @@ -423,8 +431,33 @@ struct render_to_envmap IDirect3DDevice9 *device; D3DXRTE_DESC desc; + + enum render_state state; + struct device_state previous_device_state; + + D3DCUBEMAP_FACES face; + DWORD filter; + + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + + IDirect3DCubeTexture9 *dst_cube_texture; }; +static void copy_render_target_to_cube_texture_face(IDirect3DCubeTexture9 *cube_texture, + D3DCUBEMAP_FACES face, IDirect3DSurface9 *render_target, DWORD filter) +{ + HRESULT hr; + IDirect3DSurface9 *cube_surface; + + IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, face, 0, &cube_surface); + + hr = D3DXLoadSurfaceFromSurface(cube_surface, NULL, NULL, render_target, NULL, NULL, filter, 0); + if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr); + + IDirect3DSurface9_Release(cube_surface); +} + static inline struct render_to_envmap *impl_from_ID3DXRenderToEnvMap(ID3DXRenderToEnvMap *iface) { return CONTAINING_RECORD(iface, struct render_to_envmap, ID3DXRenderToEnvMap_iface); @@ -469,6 +502,13 @@ static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface) if (!ref) { + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + + device_state_release(&render->previous_device_state); + IDirect3DDevice9_Release(render->device); HeapFree(GetProcessHeap(), 0, render); @@ -507,8 +547,52 @@ static HRESULT WINAPI D3DXRenderToEnvMap_GetDesc(ID3DXRenderToEnvMap *iface, static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface, IDirect3DCubeTexture9 *texture) { - FIXME("(%p)->(%p): stub\n", iface, texture); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + D3DSURFACE_DESC level_desc; + + TRACE("(%p)->(%p)\n", iface, texture); + + if (!texture) return D3DERR_INVALIDCALL; + + if (render->state != INITIAL) return D3DERR_INVALIDCALL; + + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + if (level_desc.Format != render->desc.Format || level_desc.Width != render->desc.Size) + return D3DERR_INVALIDCALL; + + if (!(level_desc.Usage & D3DUSAGE_RENDERTARGET)) + { + hr = IDirect3DDevice9_CreateRenderTarget(render->device, level_desc.Width, level_desc.Height, + level_desc.Format, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->render_target, NULL); + if (FAILED(hr)) goto cleanup; + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + } + + if (render->desc.DepthStencil) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(render->device, level_desc.Width, level_desc.Height, + render->desc.DepthStencilFormat, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->depth_stencil, NULL); + if (FAILED(hr)) goto cleanup; + } + + IDirect3DCubeTexture9_AddRef(texture); + render->dst_cube_texture = texture; + render->state = CUBE_BEGIN; + return D3D_OK; + +cleanup: + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_BeginSphere(ID3DXRenderToEnvMap *iface, @@ -538,17 +622,94 @@ static HRESULT WINAPI D3DXRenderToEnvMap_Face(ID3DXRenderToEnvMap *iface, D3DCUBEMAP_FACES face, DWORD filter) { - FIXME("(%p)->(%u, %#x): stub\n", iface, face, filter); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + unsigned int i; + + TRACE("(%p)->(%u, %#x)\n", iface, face, filter); + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + + render->state = CUBE_BEGIN; + } + else if (render->state != CUBE_BEGIN) + return D3DERR_INVALIDCALL; + + device_state_capture(render->device, &render->previous_device_state); + + for (i = 1; i < render->previous_device_state.num_render_targets; i++) + IDirect3DDevice9_SetRenderTarget(render->device, i, NULL); + + if (!render->render_target) + { + IDirect3DSurface9 *render_target; + IDirect3DCubeTexture9_GetCubeMapSurface(render->dst_cube_texture, face, 0, &render_target); + hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render_target); + IDirect3DSurface9_Release(render_target); + } + else hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render->render_target); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_SetDepthStencilSurface(render->device, render->depth_stencil); + if (FAILED(hr)) goto cleanup; + + render->state = CUBE_FACE; + render->face = face; + render->filter = filter; + return IDirect3DDevice9_BeginScene(render->device); + +cleanup: + device_state_restore(render->device, &render->previous_device_state); + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface, DWORD filter) { - FIXME("(%p)->(%#x): stub\n", iface, filter); - return E_NOTIMPL; -} + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + + TRACE("(%p)->(%#x)\n", iface, filter); + if (render->state == INITIAL) return D3DERR_INVALIDCALL; + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + } + + D3DXFilterTexture((IDirect3DBaseTexture9 *)render->dst_cube_texture, NULL, 0, filter); + + if (render->render_target) + { + IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + } + + if (render->depth_stencil) + { + IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + } + + IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + render->state = INITIAL; + return D3D_OK; +} static HRESULT WINAPI D3DXRenderToEnvMap_OnLostDevice(ID3DXRenderToEnvMap *iface) { @@ -613,6 +774,18 @@ HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, render->desc.DepthStencil = depth_stencil; render->desc.DepthStencilFormat = depth_stencil_format; + render->state = INITIAL; + render->render_target = NULL; + render->depth_stencil = NULL; + render->dst_cube_texture = NULL; + + hr = device_state_init(device, &render->previous_device_state); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, render); + return hr; + } + IDirect3DDevice9_AddRef(device); render->device = device;

1 0

Józef Kucia : d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 5a99be321bbffb168c0403de1aa472aacd7db2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a99be321bbffb168c0403de1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:40 2012 +0200 d3dx9/tests: Add basic tests for ID3DXRenderToEnvMap. --- dlls/d3dx9_36/tests/core.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index eb1e769..92c114a 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1084,6 +1084,48 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); } +static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) +{ + HRESULT hr; + ID3DXRenderToEnvMap *render; + + hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + if (SUCCEEDED(hr)) + { + ULONG ref_count; + IDirect3DDevice9 *out_device; + + hr = ID3DXRenderToEnvMap_GetDesc(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDesc returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_GetDevice(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + ref_count = get_ref((IUnknown *)device); + hr = ID3DXRenderToEnvMap_GetDevice(render, &out_device); + ok(hr == D3D_OK, "ID3DXRenderToEnvMap::GetDevice returned %#x, expected %#x\n", hr, D3D_OK); + ok(out_device == device, "ID3DXRenderToEnvMap::GetDevice returned different device\n"); + check_release((IUnknown *)device, ref_count); + + hr = ID3DXRenderToEnvMap_End(render, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::End returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXRenderToEnvMap_BeginCube(render, NULL); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginCube returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginHemisphere(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginHemisphere returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginParabolic(render, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginParabolic returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXRenderToEnvMap_BeginSphere(render, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, exected %#x\n", hr, D3DERR_INVALIDCALL); + + check_release((IUnknown *)render, 0); + } else skip("Failed to create ID3DXRenderToEnvMap\n"); +} + START_TEST(core) { HWND wnd; @@ -1121,6 +1163,7 @@ START_TEST(core) test_D3DXCreateRenderToSurface(device); test_ID3DXRenderToSurface(device); test_D3DXCreateRenderToEnvMap(device); + test_ID3DXRenderToEnvMap(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Rico Schüller : d3dx9/tests: Check all elements in the effect parameter value test.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: c178b61bb9ae777d4ffaaba4930cdb179897ee7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c178b61bb9ae777d4ffaaba49… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Aug 8 17:02:13 2012 +0200 d3dx9/tests: Check all elements in the effect parameter value test. --- dlls/d3dx9_36/tests/effect.c | 199 ++++++++++++++++++++++------------------- 1 files changed, 107 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c178b61bb9ae777d4ffaa…

1 0

Francois Gouget : winmm: MMDRV_GetRelated() is not used anymore so remove it.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: eabbe5ab58f19b2f1910201c64e9873e7f004649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabbe5ab58f19b2f1910201c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:14:35 2012 +0200 winmm: MMDRV_GetRelated() is not used anymore so remove it. --- dlls/winmm/lolvldrv.c | 18 ------------------ dlls/winmm/winemm.h | 1 - 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 7081a86..f387323 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -282,24 +282,6 @@ LPWINE_MLD MMDRV_Get(HANDLE _hndl, UINT type, BOOL bCanBeID) } /************************************************************************** - * MMDRV_GetRelated [internal] - */ -LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, - BOOL bSrcCanBeID, UINT dstType) -{ - LPWINE_MLD mld; - TRACE("(%p, %04x, %c, %04x)\n", - hndl, srcType, bSrcCanBeID ? 'Y' : 'N', dstType); - - if ((mld = MMDRV_Get(hndl, srcType, bSrcCanBeID)) != NULL) { - WINE_MM_DRIVER_PART* part = &MMDrvs[mld->mmdIndex].parts[dstType]; - if (part->nIDMin < part->nIDMax) - return MMDRV_GetByID(part->nIDMin, dstType); - } - return NULL; -} - -/************************************************************************** * MMDRV_PhysicalFeatures [internal] */ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 93c2627..d7bab0f 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -140,7 +140,6 @@ void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; -LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped) DECLSPEC_HIDDEN; DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN;

1 0

Francois Gouget : dsound/tests: Clarify some skip() traces.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: ed7faad1ed51c7c4322a487d779f348b6d233a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7faad1ed51c7c4322a487d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:15:33 2012 +0200 dsound/tests: Clarify some skip() traces. --- dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 4 ++-- dlls/dsound/tests/dsound.c | 2 +- dlls/dsound/tests/dsound8.c | 4 ++-- dlls/dsound/tests/duplex.c | 4 ++-- dlls/dsound/tests/propset.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 96fb417..3d81194 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -742,14 +742,14 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (!hDsound) { - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); return; } pDirectSoundCaptureCreate = (void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); pDirectSoundCaptureEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundCaptureEnumerateA"); if (!pDirectSoundCaptureCreate || !pDirectSoundCaptureEnumerateA) { - skip("capture test skipped\n"); + skip("DirectSoundCapture{Create,Enumerate} missing - skipping all tests\n"); return; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 86099bf..dc25f25 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1331,7 +1331,7 @@ START_TEST(ds3d) FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 41de792..e90057d 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1151,12 +1151,12 @@ START_TEST(ds3d8) if (pDirectSoundCreate8) ds3d8_tests(); else - skip("ds3d8 test skipped\n"); + skip("DirectSoundCreate8 missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 894079d..f86464b 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1605,7 +1605,7 @@ START_TEST(dsound) FreeLibrary(hDsound); } else - win_skip("dsound.dll not found!\n"); + win_skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index d4f07ff..ae2f7a7 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1189,12 +1189,12 @@ START_TEST(dsound8) test_first_device(); } else - skip("dsound8 test skipped\n"); + skip("DirectSoundCreate8 missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 0f8d6d1..055bf09 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -238,12 +238,12 @@ START_TEST(duplex) if (pDirectSoundFullDuplexCreate) IDirectSoundFullDuplex_tests(); else - skip("duplex test skipped\n"); + skip("DirectSoundFullDuplexCreate missing - skipping all tests\n"); FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); } diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fb902a4..e85924d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -743,7 +743,7 @@ START_TEST(propset) FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + skip("dsound.dll not found - skipping all tests\n"); CoUninitialize(); }

1 0

Francois Gouget : dsound/tests: Trace the number of tested DirectSound drivers.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 4d24132ea4a6887c39f84935702af2c274f2a7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d24132ea4a6887c39f849357… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 13 00:16:13 2012 +0200 dsound/tests: Trace the number of tested DirectSound drivers. --- dlls/dsound/tests/ds3d.c | 4 ++++ dlls/dsound/tests/ds3d8.c | 4 ++++ dlls/dsound/tests/propset.c | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index dc25f25..36e59c9 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1258,11 +1258,14 @@ return DSERR_GENERIC; return rc; } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc = test_for_driver(lpGuid); if (rc == DSERR_NODRIVER) { @@ -1309,6 +1312,7 @@ static void ds3d_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index e90057d..c432d35 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1081,11 +1081,14 @@ return DSERR_GENERIC; return rc; } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc = test_for_driver8(lpGuid); if (rc == DSERR_NODRIVER) { @@ -1132,6 +1135,7 @@ static void ds3d8_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d8) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index e85924d..6324a3f 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -553,6 +553,8 @@ static void propset_private_tests(void) IKsPropertySet_Release(pps); } +static unsigned driver_count = 0; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { @@ -564,6 +566,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, int ref; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + driver_count++; rc=pDirectSoundCreate(lpGuid,&dso,NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, @@ -710,6 +713,7 @@ static void propset_buffer_tests(void) HRESULT rc; rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(propset)

1 0

Jacek Caban : mshtml: Test contentWindow interfaces of frame and iframe elements.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 0ec75b1a5f4dd71f5ae62f20a634e5661d975eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec75b1a5f4dd71f5ae62f20a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:02 2012 +0200 mshtml: Test contentWindow interfaces of frame and iframe elements. --- dlls/mshtml/tests/dom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 561af14..760580e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4975,6 +4975,7 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) HRESULT hres; content_window = get_frame_content_window(frame_elem); + test_ifaces((IUnknown*)content_window, window_iids); window_doc = get_window_doc(content_window); IHTMLWindow2_Release(content_window); @@ -5025,6 +5026,7 @@ static void test_iframe_elem(IHTMLElement *elem) test_framebase((IUnknown*)elem); content_window = get_frame_content_window((IUnknown*)elem); + test_ifaces((IUnknown*)content_window, window_iids); test_window_length(content_window, 0); content_doc = get_window_doc(content_window);

1 0

Jacek Caban : mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 156e212715991e52d7d5fc3e28ecb537ec9abcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=156e212715991e52d7d5fc3e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:13 2012 +0200 mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b2f5b81..a3ac623 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -985,9 +985,14 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return E_FAIL; } - hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); - - IDispatch_Release(V_DISPATCH(&v)); + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); + IDispatch_Release(V_DISPATCH(&v)); + }else if(res) { + *res = v; + }else { + IDispatch_Release(V_DISPATCH(&v)); + } } }

1 0

Jacek Caban : mshtml: Default to previous script type if not given.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 1b2525d1bf964fa4934705cb3cf0530fcbcbb35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2525d1bf964fa4934705cb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:27 2012 +0200 mshtml: Default to previous script type if not given. --- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/script.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dd25263..b5117f1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2626,6 +2626,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); + window->current_script_guid = CLSID_JScript; *ret = window; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bc9d4a..b0f00d3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -385,6 +385,7 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; struct list script_hosts; + GUID current_script_guid; IHTMLEventObj *event; @@ -982,6 +983,9 @@ DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58); +DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8); + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 55c7872..0fe4f5a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -63,11 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR windowW[] = {'w','i','n','d','o','w',0}; static const WCHAR emptyW[] = {0}; -static const CLSID CLSID_JScript = - {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; -static const CLSID CLSID_VBScript = - {0xb54f3741,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}}; - struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll_iface; @@ -646,6 +641,8 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); + script_host->window->current_script_guid = script_host->guid; + VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -758,7 +755,7 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) return TRUE; } -static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) +static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { nsAString attr_str, val_str; BOOL ret = FALSE; @@ -793,7 +790,7 @@ static BOOL get_script_guid(nsIDOMHTMLScriptElement *nsscript, GUID *guid) if(*language) { ret = get_guid_from_language(language, guid); }else { - *guid = CLSID_JScript; + *guid = window->current_script_guid; ret = TRUE; } }else { @@ -822,7 +819,7 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip ScriptHost *script_host; GUID guid; - if(!get_script_guid(nsscript, &guid)) { + if(!get_script_guid(window, nsscript, &guid)) { WARN("Could not find script GUID\n"); return; } @@ -844,13 +841,15 @@ void doc_insert_script(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscrip IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) { ScriptHost *script_host; - GUID guid = CLSID_JScript; + GUID guid; const WCHAR *ptr; IDispatch *disp; HRESULT hres; static const WCHAR delimiterW[] = {'\"',0}; + TRACE("%s\n", debugstr_w(text)); + for(ptr = text; isalnumW(*ptr); ptr++); if(*ptr == ':') { LPWSTR language; @@ -872,6 +871,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) ptr++; }else { ptr = text; + guid = window->current_script_guid; } if(IsEqualGUID(&CLSID_JScript, &guid) @@ -880,6 +880,8 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) return NULL; } + window->current_script_guid = guid; + script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL; @@ -921,6 +923,8 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan return E_FAIL; } + window->current_script_guid = guid; + memset(&ei, 0, sizeof(ei)); TRACE(">>>\n"); hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei);

1 0

Jacek Caban : vbscript: Ignore fdexNameCaseSensitive flag.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: fe7533df49979653516131fd697c0558c599aa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7533df49979653516131fd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:03:46 2012 +0200 vbscript: Ignore fdexNameCaseSensitive flag. --- dlls/vbscript/tests/run.c | 14 ++++++++++++++ dlls/vbscript/vbdisp.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 099126d..d77c6cb 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -355,6 +355,20 @@ static void test_disp(IDispatch *disp) SysFreeString(str); ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + id = 0xdeadbeef; + str = a2bstr("publicProp"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + + id = 0xdeadbeef; + str = a2bstr("publicprop"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + ok(id == public_prop_id, "id = %d, expected %d\n", id, public_prop_id); + IDispatchEx_Release(dispex); } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f9d70a..022ac1d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -333,7 +333,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->desc) return E_UNEXPECTED; - if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive)) { + /* Tests show that fdexNameCaseSensitive is ignored */ + + if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive|fdexNameCaseSensitive)) { FIXME("unsupported flags %x\n", grfdex); return E_NOTIMPL; }

1 0