July 2010 - Wine-commits - list.winehq.org

David Hedberg : shell32: Implement SHCreateItemFromIDList.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 222d2142ef0161cd1a1b380c95b2a3bd248f3262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=222d2142ef0161cd1a1b380c9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Jul 22 20:17:04 2010 +0200 shell32: Implement SHCreateItemFromIDList. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 18 ++++++++++++ dlls/shell32/tests/shlfolder.c | 58 ++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + 4 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bb1796d..cc7744d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -330,6 +330,7 @@ @ stub SHChangeNotifySuspendResume @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) +@ stdcall SHCreateItemFromIDList(ptr ptr ptr) @ stdcall SHCreateItemFromParsingName(wstr ptr ptr ptr) @ stub SHCreateProcessAsUserW @ stdcall SHCreateShellItem(ptr ptr ptr ptr) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 762b13b..84a195f 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -419,3 +419,21 @@ HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, } return ret; } + +HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv) +{ + ShellItem *psiimpl; + HRESULT ret; + + if(!pidl) + return E_INVALIDARG; + + ret = IShellItem_Constructor(NULL, riid, ppv); + if(SUCCEEDED(ret)) + { + psiimpl = (ShellItem*)*ppv; + psiimpl->pidl = ILClone(pidl); + } + + return ret; +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 10838e6..7eda991 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -53,6 +53,7 @@ static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); @@ -70,6 +71,7 @@ static void init_function_pointers(void) #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) MAKEFUNC(SHBindToParent); + MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateShellItem); MAKEFUNC(SHGetFolderPathA); @@ -2079,6 +2081,62 @@ static void test_SHCreateShellItem(void) else win_skip("No SHCreateItemFromParsingName\n"); + + /* SHCreateItemFromIDList */ + if(pSHCreateItemFromIDList) + { + if(0) + { + /* Crashes under win7 */ + ret = pSHCreateItemFromIDList(NULL, &IID_IShellItem, NULL); + } + + ret = pSHCreateItemFromIDList(NULL, &IID_IShellItem, (void**)&shellitem); + ok(ret == E_INVALIDARG, "SHCreateItemFromIDList returned %x\n", ret); + + ret = pSHCreateItemFromIDList(pidl_cwd, &IID_IShellItem, (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemFromIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); + ok(ret == S_OK, "QueryInterface returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IPersistIDList_GetIDList(persistidl, &pidl_test); + ok(ret == S_OK, "GetIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + + ret = pSHCreateItemFromIDList(pidl_testfile, &IID_IShellItem, (void**)&shellitem); + ok(ret == S_OK, "SHCreateItemFromIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); + ok(ret == S_OK, "QueryInterface returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IPersistIDList_GetIDList(persistidl, &pidl_test); + ok(ret == S_OK, "GetIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + } + else + win_skip("No SHCreateItemFromIDList\n"); + DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 60c0f18..d79c932 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -496,6 +496,7 @@ interface IShellItemArray : IUnknown cpp_quote("HRESULT WINAPI SHGetNameFromIDList(PCIDLIST_ABSOLUTE pidl, SIGDN sigdnName, PWSTR *ppszName);") cpp_quote("HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv);") /***************************************************************************** * IShellItemFilter interface

1 0

Michael Stefaniuc : oleaut32/tests: Use IsEqualIID instead of memcmp to compare REFIIDs.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: bd132fed1e64bf77857f7d358268a346787e550b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd132fed1e64bf77857f7d358… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 23 11:30:10 2010 +0200 oleaut32/tests: Use IsEqualIID instead of memcmp to compare REFIIDs. --- dlls/oleaut32/tests/olepicture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 2259437..f00055e 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -939,11 +939,11 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) + if (IsEqualIID(&IID_IUnknown, riid)) { *ppvObject = This; } - else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) + else if (IsEqualIID(&IID_IStream, riid)) { *ppvObject = This; }

1 0

Henri Verbeet : d3d9/tests: Introduce a vertex shader to the MRT test.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 74015090ae09ca8c79f8bb10a1d3f530a24e72a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74015090ae09ca8c79f8bb10a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:02 2010 +0200 d3d9/tests: Introduce a vertex shader to the MRT test. --- dlls/d3d9/tests/visual.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6ecd624..c8c8962 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9021,20 +9021,31 @@ static void pointsize_test(IDirect3DDevice9 *device) static void multiple_rendertargets_test(IDirect3DDevice9 *device) { + static const DWORD vshader_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD pshader_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ + 0x05000051, 0xa00f0001, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c1, 0.0, 0.0, 1.0, 0.0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ + 0x0000ffff /* end */ + }; + HRESULT hr; + IDirect3DVertexShader9 *vs; IDirect3DPixelShader9 *ps; IDirect3DTexture9 *tex1, *tex2; IDirect3DSurface9 *surf1, *surf2, *backbuf; D3DCAPS9 caps; DWORD color; - DWORD shader_code[] = { - 0xffff0300, /* ps_3_0 */ - 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0, 1, 0, 0 */ - 0x05000051, 0xa00f0001, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c1, 0, 0, 1, 0 */ - 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ - 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ - 0x0000ffff /* END */ - }; float quad[] = { -1.0, -1.0, 0.1, 1.0, -1.0, 0.1, @@ -9068,7 +9079,9 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &ps); + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); + ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &ps); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); @@ -9078,6 +9091,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex2, 0, &surf2); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); @@ -9093,6 +9108,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuf); @@ -9126,6 +9143,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); IDirect3DPixelShader9_Release(ps); + IDirect3DVertexShader9_Release(vs); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2); IDirect3DSurface9_Release(surf1);

1 0

Henri Verbeet : wined3d: Clear all render targets in an MRT setup.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: d374d85055490c37665bc68032dacb1de3e705d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d374d85055490c37665bc6803… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:03 2010 +0200 wined3d: Clear all render targets in an MRT setup. --- dlls/wined3d/context.c | 58 +++++- dlls/wined3d/device.c | 444 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 7 +- dlls/wined3d/wined3d_private.h | 7 +- 4 files changed, 280 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d374d85055490c37665bc…

1 0

Henri Verbeet : d3d9/tests: Add a test for clearing render targets in an MRT.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 0b630e1430e346f77b82ae17a326538a90af2110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b630e1430e346f77b82ae17a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:04 2010 +0200 d3d9/tests: Add a test for clearing render targets in an MRT. --- dlls/d3d9/tests/visual.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c8c8962..8afe67f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9043,7 +9043,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DVertexShader9 *vs; IDirect3DPixelShader9 *ps; IDirect3DTexture9 *tex1, *tex2; - IDirect3DSurface9 *surf1, *surf2, *backbuf; + IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; D3DCAPS9 caps; DWORD color; float quad[] = { @@ -9075,9 +9075,15 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex1, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 16, 16, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex1, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); @@ -9102,6 +9108,32 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0x000000ff, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0x000000ff, got 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); if(SUCCEEDED(hr)) { @@ -9149,6 +9181,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surf1); IDirect3DSurface9_Release(surf2); IDirect3DSurface9_Release(backbuf); + IDirect3DSurface9_Release(readback); } struct formats {

1 0

Henri Verbeet : wined3d: Avoid loading the destination surface in stretch_rect_fbo() if it will be completely overwritten.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 2f028f034044c80e69f59b67ca1bc76e40119690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f028f034044c80e69f59b67c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:05 2010 +0200 wined3d: Avoid loading the destination surface in stretch_rect_fbo() if it will be completely overwritten. --- dlls/wined3d/device.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17a4b83..df9e1d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5743,6 +5743,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } } +static BOOL surface_is_full_rect(IWineD3DSurfaceImpl *surface, const RECT *r) +{ + if ((r->left && r->right) || abs(r->right - r->left) != surface->currentDesc.Width) + return FALSE; + if ((r->top && r->bottom) || abs(r->bottom - r->top) != surface->currentDesc.Height) + return FALSE; + return TRUE; +} + void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect_in, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, const WINED3DTEXTUREFILTERTYPE filter) { @@ -5772,11 +5781,13 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa break; } - /* Make sure the drawables are up-to-date. Note that loading the - * destination surface isn't strictly required if we overwrite the - * entire surface. */ + /* Make sure the drawables are up-to-date. Loading the destination + * surface isn't required if the entire surface is overwritten. (And is + * in fact harmful if we're being called by surface_load_location() with + * the purpose of loading the destination surface.) */ surface_load_location(src_surface, SFLAG_INDRAWABLE, NULL); - surface_load_location(dst_surface, SFLAG_INDRAWABLE, NULL); + if (!surface_is_full_rect(dst_surface, &dst_rect)) + surface_load_location(dst_surface, SFLAG_INDRAWABLE, NULL); if (!surface_is_offscreen(src_surface)) context = context_acquire(device, src_surface); else if (!surface_is_offscreen(dst_surface)) context = context_acquire(device, dst_surface);

1 0

Rico Schüller : d3d10: Add the ID3D10ShaderReflectionType interface.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 63d52a3811aba6cdb2ea0a631d167254f3f3e943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d52a3811aba6cdb2ea0a631… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 21 20:44:32 2010 +0200 d3d10: Add the ID3D10ShaderReflectionType interface. --- include/d3d10shader.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 582a1c9..3fc1b6b 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,6 +130,29 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +typedef struct _D3D10_SHADER_TYPE_DESC +{ + D3D10_SHADER_VARIABLE_CLASS Class; + D3D10_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; +} D3D10_SHADER_TYPE_DESC; + +DEFINE_GUID(IID_ID3D10ShaderReflectionType, 0xc530ad7d, 0x9b16, 0x4395, 0xa9, 0x79, 0xba, 0x2e, 0xcf, 0xf8, 0x3a, 0xdd); + +#define INTERFACE ID3D10ShaderReflectionType +DECLARE_INTERFACE(ID3D10ShaderReflectionType) +{ + STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE; +}; +#undef INTERFACE + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Rico Schüller : d3d10: Add the ID3D10ShaderReflectionVariable interface.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 5daf7fef9679fd52d5c815049cc23fe5169a0aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf7fef9679fd52d5c815049… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 21 20:44:43 2010 +0200 d3d10: Add the ID3D10ShaderReflectionVariable interface. --- include/d3d10shader.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 3fc1b6b..862810f 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,6 +130,15 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +typedef struct _D3D10_SHADER_VARIABLE_DESC +{ + LPCSTR Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + LPVOID DefaultValue; +} D3D10_SHADER_VARIABLE_DESC; + typedef struct _D3D10_SHADER_TYPE_DESC { D3D10_SHADER_VARIABLE_CLASS Class; @@ -153,6 +162,16 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionType) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, 0x1bf63c95, 0x2650, 0x405d, 0x99, 0xc1, 0x36, 0x36, 0xbd, 0x1d, 0xa0, 0xa1); + +#define INTERFACE ID3D10ShaderReflectionVariable +DECLARE_INTERFACE(ID3D10ShaderReflectionVariable) +{ + STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetType)(THIS) PURE; +}; +#undef INTERFACE + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Hans Leidekker : msi/tests: Initialize a string buffer and fix some leaks.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 148887082c7e611b2516d6833489f264b1a68850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148887082c7e611b2516d6833… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:41:49 2010 +0200 msi/tests: Initialize a string buffer and fix some leaks. --- dlls/msi/tests/db.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 17c5c1f..5c87e3f 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8886,6 +8886,7 @@ static void test_createtable(void) size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + MsiCloseHandle( hrec ); res = MsiViewClose( htab ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -8915,10 +8916,12 @@ static void test_createtable(void) res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + buffer[0] = 0; size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + MsiCloseHandle( hrec ); res = MsiViewClose( htab ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -8942,6 +8945,7 @@ static void test_createtable(void) res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + buffer[0] = 0; size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Hans Leidekker : msi/tests: Properly contruct the icon path for win9x.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: ac924566fb72cf8325f9037a81f2666605ffa8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac924566fb72cf8325f9037a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:42:06 2010 +0200 msi/tests: Properly contruct the icon path for win9x. --- dlls/msi/tests/install.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1d27658..fb78cb4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -10045,10 +10045,10 @@ static void test_icon_table(void) /* win9x with MSI 2.0 installs the icon to a different folder, same as above */ lstrcpyA(win9xpath, APP_DATA_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, "Microsoft\\Installer\\"); - lstrcatA(path, prodcode); - lstrcatA(path, "\\testicon"); + lstrcatA(win9xpath, "\\"); + lstrcatA(win9xpath, "Microsoft\\Installer\\"); + lstrcatA(win9xpath, prodcode); + lstrcatA(win9xpath, "\\testicon"); lstrcpyA(path, WINDOWS_DIR); lstrcatA(path, "\\");

1 0