February 2006 - Wine-commits

H. Verbeet : d3d9: Add a test for IDirect3DVertexDeclaration9_GetDeclaration.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 9aa0d88c95bd5b5fdd356cdcd097762259536aa6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9aa0d88c95bd5b5fdd356cd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:27:23 2006 +0100 d3d9: Add a test for IDirect3DVertexDeclaration9_GetDeclaration. --- dlls/d3d9/tests/vertexdeclaration.c | 46 +++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 1d8b0ec..b9e0f2a 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -90,11 +90,55 @@ static void test_get_set_vertex_declarat "Expected hret 0x%lx, current_decl_ptr %p, refcount %d.\n", hret, current_decl_ptr, decl_refcount, D3D_OK, decl_ptr, i); } +static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTEXELEMENT9 *vertex_decl, UINT expected_num_elements) +{ + int i; + UINT num_elements = 0; + D3DVERTEXELEMENT9 *decl = 0; + HRESULT hret = 0; + + /* First test only getting the number of elements */ + num_elements = 0x1337c0de; + hret = IDirect3DVertexDeclaration9_GetDeclaration(decl_ptr, NULL, &num_elements); + ok(hret == D3D_OK && num_elements == expected_num_elements, + "GetDeclaration returned: hret 0x%lx, num_elements %d. " + "Expected hret 0x%lx, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); + + num_elements = 0; + hret = IDirect3DVertexDeclaration9_GetDeclaration(decl_ptr, NULL, &num_elements); + ok(hret == D3D_OK && num_elements == expected_num_elements, + "GetDeclaration returned: hret 0x%lx, num_elements %d. " + "Expected hret 0x%lx, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); + + /* Also test the returned data */ + decl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DVERTEXELEMENT9) * expected_num_elements); + + num_elements = 0x1337c0de; + hret = IDirect3DVertexDeclaration9_GetDeclaration(decl_ptr, decl, &num_elements); + ok(hret == D3D_OK && num_elements == expected_num_elements, + "GetDeclaration returned: hret 0x%lx, num_elements %d. " + "Expected hret 0x%lx, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); + i = memcmp(decl, vertex_decl, sizeof(vertex_decl)); + ok (!i, "Original and returned vertexdeclarations are not the same\n"); + ZeroMemory(decl, sizeof(D3DVERTEXELEMENT9) * expected_num_elements); + + num_elements = 0; + hret = IDirect3DVertexDeclaration9_GetDeclaration(decl_ptr, decl, &num_elements); + ok(hret == D3D_OK && num_elements == expected_num_elements, + "GetDeclaration returned: hret 0x%lx, num_elements %d. " + "Expected hret 0x%lx, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); + i = memcmp(decl, vertex_decl, sizeof(vertex_decl)); + ok (!i, "Original and returned vertexdeclarations are not the same\n"); + + HeapFree(GetProcessHeap(), 0, decl); +} + START_TEST(vertexdeclaration) { static D3DVERTEXELEMENT9 simple_decl[] = { { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, D3DDECL_END()}; + UINT simple_decl_num_elements = sizeof(simple_decl) / sizeof(*simple_decl); IDirect3DDevice9 *device_ptr = 0; IDirect3DVertexDeclaration9 *decl_ptr = 0; @@ -120,4 +164,6 @@ START_TEST(vertexdeclaration) } test_get_set_vertex_declaration(device_ptr, decl_ptr); + + test_get_declaration(decl_ptr, simple_decl, simple_decl_num_elements); }

1 0

H. Verbeet : d3d9: Reorganise the vertexdeclaration tests.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: d8d70370dd319b6bca68bb1820bbd298c67911ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8d70370dd319b6bca68bb1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:26:59 2006 +0100 d3d9: Reorganise the vertexdeclaration tests. - Split the test for getting and setting vertexdeclaration into one for creating the declaration and one for the actual getting and setting. - Add traces for when creating the device or vertexdeclaration fails. --- dlls/d3d9/tests/vertexdeclaration.c | 45 ++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 5118b55..1d8b0ec 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -55,23 +55,25 @@ static int get_refcount(IUnknown *object return IUnknown_Release(object); } -static void test_get_set_vertex_declaration(IDirect3DDevice9 *device_ptr) +static IDirect3DVertexDeclaration9 *test_create_vertex_declaration(IDirect3DDevice9 *device_ptr, D3DVERTEXELEMENT9 *vertex_decl) { - static D3DVERTEXELEMENT9 simple_decl[] = { - { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, - D3DDECL_END()}; - IDirect3DVertexDeclaration9 *decl_ptr = 0; + HRESULT hret = 0; + + hret = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, vertex_decl, &decl_ptr); + ok(hret == D3D_OK && decl_ptr != NULL, "CreateVertexDeclaration returned: hret 0x%lx, decl_ptr %p. " + "Expected hret 0x%lx, decl_ptr != %p. Aborting.\n", hret, decl_ptr, D3D_OK, NULL); + + return decl_ptr; +} + +static void test_get_set_vertex_declaration(IDirect3DDevice9 *device_ptr, IDirect3DVertexDeclaration9 *decl_ptr) +{ IDirect3DVertexDeclaration9 *current_decl_ptr = 0; HRESULT hret = 0; int decl_refcount = 0; int i = 0; - hret = IDirect3DDevice9_CreateVertexDeclaration(device_ptr, simple_decl, &decl_ptr); - ok(hret == D3D_OK && decl_ptr != NULL, "CreateVertexDeclaration returned: hret 0x%lx, decl_ptr %p. " - "Expected hret 0x%lx, decl_ptr != %p. Aborting.\n", hret, decl_ptr, D3D_OK, NULL); - if (hret != D3D_OK || decl_ptr == NULL) return; - /* SetVertexDeclaration should not touch the declaration's refcount. */ i = get_refcount((IUnknown *)decl_ptr); hret = IDirect3DDevice9_SetVertexDeclaration(device_ptr, decl_ptr); @@ -90,7 +92,11 @@ static void test_get_set_vertex_declarat START_TEST(vertexdeclaration) { - IDirect3DDevice9 *device_ptr; + static D3DVERTEXELEMENT9 simple_decl[] = { + { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, + D3DDECL_END()}; + IDirect3DDevice9 *device_ptr = 0; + IDirect3DVertexDeclaration9 *decl_ptr = 0; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -100,7 +106,18 @@ START_TEST(vertexdeclaration) } device_ptr = init_d3d9(); - if (!device_ptr) return; - - test_get_set_vertex_declaration(device_ptr); + if (!device_ptr) + { + trace("Failed to initialise d3d9, aborting test.\n"); + return; + } + + decl_ptr = test_create_vertex_declaration(device_ptr, simple_decl); + if (!decl_ptr) + { + trace("Failed to create a vertex declaration, aborting test.\n"); + return; + } + + test_get_set_vertex_declaration(device_ptr, decl_ptr); }

1 0

H. Verbeet : wined3d: Always return the number of elements in the vertex
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: ff08986d014c81a90f72e757627ab120e11b49a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff08986d014c81a90f72e75… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:26:34 2006 +0100 wined3d: Always return the number of elements in the vertex declaration in IWineD3DVertexDeclarationImpl_GetDeclaration9. --- dlls/wined3d/vertexdeclaration.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index de27935..5d216af 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -479,29 +479,19 @@ static HRESULT WINAPI IWineD3DVertexDecl HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration9(IWineD3DVertexDeclaration* iface, D3DVERTEXELEMENT9* pData, DWORD* pNumElements) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; - if (NULL == pData) { - *pNumElements = This->declaration9NumElements; - TRACE("(%p) : Returning numElements %ld\n", iface, *pNumElements); - return D3D_OK; - } - /* The Incredibles and Teenage Mutant Ninja Turtles require this for NumElements == 0, - TODO: this needs to be tested against windows */ - if(*pNumElements == 0) { - TRACE("(%p) : Requested the vertex declaration without specefying the size of the return buffer\n", This); - *pNumElements = This->declaration9NumElements; - memcpy(pData, This->pDeclaration9, *pNumElements * sizeof(*pData)); + TRACE("(This %p, pData %p, pNumElements %p)\n", This, pData, pNumElements); + + TRACE("Setting *pNumElements to %d\n", This->declaration9NumElements); + *pNumElements = This->declaration9NumElements; + + /* Passing a NULL pData is used to just retrieve the number of elements */ + if (!pData) { + TRACE("NULL pData passed. Returning D3D_OK.\n"); return D3D_OK; } - /* just in case there's a similar problem to The Incredibles and Teenage Mutant Ninja Turtles without pNumElements = 0 */ - if (*pNumElements < This->declaration9NumElements) { - *pNumElements = This->declaration9NumElements; - FIXME("(%p) : Returning D3DERR_MOREDATA numElements %ld expected %u\n", iface, *pNumElements, This->declaration9NumElements); - memcpy(pData, This->pDeclaration9, *pNumElements * sizeof(*pData)); - return D3DERR_MOREDATA; - } - TRACE("(%p) : GetVertexDeclaration9 copying to %p\n", This, pData); + TRACE("Copying %p to %p\n", This->pDeclaration9, pData); memcpy(pData, This->pDeclaration9, This->declaration9NumElements * sizeof(*pData)); return D3D_OK; }

1 0

H. Verbeet : wined3d: Don' t set the container to the device for standalone surfaces.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 1c4a94b0babeebbdc99d04da0208bdde0dd6f1e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c4a94b0babeebbdc99d04d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:26:26 2006 +0100 wined3d: Don't set the container to the device for standalone surfaces. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 635dd5b..f814973 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -725,7 +725,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat /** Create and initialise the surface resource **/ D3DCREATERESOURCEOBJECTINSTANCE(object,Surface,D3DRTYPE_SURFACE, Size) - IWineD3DSurface_SetContainer((IWineD3DSurface *)object, (IWineD3DBase *)This); + /* "Standalone" surface */ + IWineD3DSurface_SetContainer((IWineD3DSurface *)object, NULL); object->currentDesc.Width = Width; object->currentDesc.Height = Height;

1 0

H. Verbeet : wined3d/d3d9: Cleanup GetContainer for volumes.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: b994d057ace77f5171a2bc17091820cacb1fba0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b994d057ace77f5171a2bc1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:26:10 2006 +0100 wined3d/d3d9: Cleanup GetContainer for volumes. --- dlls/d3d9/volume.c | 34 +++++++++++++++++++++++++++------- dlls/wined3d/volume.c | 18 ++++++++++++++---- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index d16b2ee..4e53b2a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -92,18 +92,38 @@ HRESULT WINAPI IDirect3DVolume9Impl_Free HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID riid, void** ppContainer) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; + IWineD3DBase *wineD3DContainer = NULL; + IUnknown *wineD3DContainerParent = NULL; HRESULT res; - IUnknown *IWineContainer = NULL; - TRACE("(%p) Relay\n", This); - res = IWineD3DVolume_GetContainer(This->wineD3DVolume, riid, (void **)&IWineContainer); + TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - /* If this works, the only valid container is a child of resource (volumetexture) */ - if (res == D3D_OK && NULL != ppContainer) { - IWineD3DResource_GetParent((IWineD3DResource *)IWineContainer, (IUnknown **)ppContainer); - IWineD3DResource_Release((IWineD3DResource *)IWineContainer); + if (!ppContainer) { + ERR("Called without a valid ppContainer.\n"); } + /* Get the WineD3D container. */ + res = IWineD3DVolume_GetContainer(This->wineD3DVolume, &IID_IWineD3DBase, (void **)&wineD3DContainer); + if (res != D3D_OK) return res; + + if (!wineD3DContainer) { + ERR("IWineD3DSurface_GetContainer should never return NULL\n"); + } + + /* Get the parent */ + IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); + IUnknown_Release(wineD3DContainer); + + if (!wineD3DContainerParent) { + ERR("IWineD3DBase_GetParent should never return NULL\n"); + } + + /* Now, query the interface of the parent for the riid */ + res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); + IUnknown_Release(wineD3DContainerParent); + + TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); + return res; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index df9ca85..3108662 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -105,10 +105,20 @@ D3DRESOURCETYPE WINAPI IWineD3DVolumeImp ******************************************* */ HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - TRACE("(%p) : returning %p\n", This, This->container); - *ppContainer = This->container; - IUnknown_AddRef(This->container); - return D3D_OK; + + TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + + if (!ppContainer) { + ERR("Called without a valid ppContainer.\n"); + } + + /* Although surfaces can be standalone, volumes can't */ + if (!This->container) { + ERR("Volume without an container. Should not happen.\n"); + } + + TRACE("Relaying to QueryInterface\n"); + return IUnknown_QueryInterface(This->container, riid, ppContainer); } HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) {

1 0

H. Verbeet : wined3d/d3d9: Cleanup GetContainer for surfaces.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 2200f3e2ca1b336b1512e68dcda3d919b90af583 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2200f3e2ca1b336b1512e68… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 7 12:25:59 2006 +0100 wined3d/d3d9: Cleanup GetContainer for surfaces. --- dlls/d3d9/surface.c | 63 +++++++++++++++++++++--------------------------- dlls/wined3d/surface.c | 22 +++++++++++------ 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 6ea2d01..62c99c7 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -114,47 +114,38 @@ D3DRESOURCETYPE WINAPI IDirect3DSurface9 /* IDirect3DSurface9 Interface follow: */ HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + IWineD3DBase *wineD3DContainer = NULL; + IUnknown *wineD3DContainerParent = NULL; HRESULT res; - IUnknown *IWineContainer = NULL; - TRACE("(%p) Relay\n", This); + TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - /* The container returned from IWineD3DSurface_GetContainer is either an IWineD3DDevice, - one of the subclasses of IWineD3DBaseTexture or an IWineD3DSwapChain */ - /* Get the IUnknown container. */ - res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IUnknown, (void **)&IWineContainer); - if (res == D3D_OK && IWineContainer != NULL) { - - /* Now find out what kind of container it is (so that we can get its parent)*/ - IUnknown *IUnknownParent = NULL; - IUnknown *myContainer = NULL; - if(D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DDevice, (void **)&myContainer)){ - IWineD3DDevice_GetParent((IWineD3DDevice *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - } else - if(D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DBaseTexture, (void **)&myContainer)){ - IWineD3DBaseTexture_GetParent((IWineD3DBaseTexture *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - } else - if(D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DSwapChain, (void **)&myContainer)){ - IWineD3DSwapChain_GetParent((IWineD3DSwapChain *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - }else{ - FIXME("Container is of unknown interface\n"); - } - /* Tidy up.. */ - IUnknown_Release((IWineD3DDevice *)IWineContainer); - - /* Now, query the interface of the parent for the riid */ - if(IUnknownParent != NULL){ - res = IUnknown_QueryInterface(IUnknownParent, riid, ppContainer); - /* Tidy up.. */ - IUnknown_Release(IUnknownParent); - } - + if (!ppContainer) { + ERR("Called without a valid ppContainer\n"); } - TRACE("(%p) : returning %p\n", This, *ppContainer); + /* Get the WineD3D container. */ + res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IWineD3DBase, (void **)&wineD3DContainer); + if (res != D3D_OK) return res; + + if (!wineD3DContainer) { + ERR("IWineD3DSurface_GetContainer should never return NULL\n"); + } + + /* Get the parent */ + IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); + IUnknown_Release(wineD3DContainer); + + if (!wineD3DContainerParent) { + ERR("IWineD3DBase_GetParent should never return NULL\n"); + } + + /* Now, query the interface of the parent for the riid */ + res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); + IUnknown_Release(wineD3DContainerParent); + + TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); + return res; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c928a5..722816a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,19 +175,27 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetPa HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - HRESULT hr; - if (ppContainer == NULL) { - ERR("Get container called witout a null ppContainer\n"); - return E_NOINTERFACE; + IWineD3DBase *container = 0; + + TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + + if (!ppContainer) { + ERR("Called without a valid ppContainer.\n"); } - TRACE("(%p) : Relaying to queryInterface %p %p\n", This, ppContainer, *ppContainer); + /** From MSDN: * If the surface is created using CreateImageSurface/CreateOffscreenPlainSurface, CreateRenderTarget, * or CreateDepthStencilSurface, the surface is considered stand alone. In this case, * GetContainer will return the Direct3D device used to create the surface. */ - hr = IUnknown_QueryInterface(This->container, riid, ppContainer); - return hr; + if (This->container) { + container = This->container; + } else { + IWineD3DSurface_GetDevice(iface, (IWineD3DDevice **)&container); + } + + TRACE("Relaying to QueryInterface\n"); + return IUnknown_QueryInterface(container, riid, ppContainer); } HRESULT WINAPI IWineD3DSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) {

1 0

Dmitry Timoshkov : quartz: Register some of the interfaces.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 78904aab2dde6eeb724519d0ccfb0218229b12ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78904aab2dde6eeb724519d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 12:25:35 2006 +0100 quartz: Register some of the interfaces. --- dlls/quartz/regsvr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 385120b..6a3bb5b 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -840,6 +840,10 @@ static LONG recursive_delete_keyW(HKEY b return res; } + +static GUID const CLSID_PSFactoryBuffer = { + 0x92a3a302, 0xda7c, 0x4a1f, {0xba,0x7e,0x18,0x02,0xbb,0x5d,0x2d,0x02} }; + /*********************************************************************** * coclass list */ @@ -936,6 +940,56 @@ static struct regsvr_coclass const cocla */ static struct regsvr_interface const interface_list[] = { + { &IID_IFilterGraph, + "IFilterGraph", + NULL, + 11, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFilterGraph2, + "IFilterGraph2", + NULL, + 21, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFilterMapper, + "IFilterMapper", + NULL, + 11, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFilterMapper2, + "IFilterMapper2", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + /* FIXME: + { &IID_SeekingPassThru, + "ISeekingPassThru", + NULL, + 4, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_AsyncReader, + "IAsyncReader", + NULL, + 11, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_WAVEParser, + "IWAVEParser", + NULL, + 11, + NULL, + &CLSID_PSFactoryBuffer + },*/ { NULL } /* list terminator */ };

1 0

Robert Millan : configure: For sys/mount.h, sys/statfs.h and sys/vfs.h, always include
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 55b74483def62ef10c4e13dd88d72ffafcf6e045 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55b74483def62ef10c4e13d… Author: Robert Millan <rmh(a)aybabtu.com> Date: Mon Feb 6 21:53:27 2006 +0100 configure: For sys/mount.h, sys/statfs.h and sys/vfs.h, always include them if present. --- configure | 417 +++++++++------------------------------------ configure.ac | 86 +-------- dlls/ntdll/file.c | 16 +- include/config.h.in | 9 - libs/port/fstatvfs.c | 16 +- libs/port/statvfs.c | 16 +- tools/winapi/winapi_check | 3 7 files changed, 113 insertions(+), 450 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=55b74483def62ef10c4…

1 0

Alexandre Julliard : w32skrnl: No need for an import library.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: c19b470f956561e027af4c5b610bd4093887fb45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c19b470f956561e027af4c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 6 21:46:46 2006 +0100 w32skrnl: No need for an import library. --- dlls/Makefile.in | 8 -------- dlls/win32s/.gitignore | 1 - dlls/win32s/Makefile.in | 1 - 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index ce226fc..da5b4ea 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -1070,7 +1070,6 @@ IMPORT_SYMLINKS = \ libolecli32.$(IMPLIBEXT) \ libolesvr32.$(IMPLIBEXT) \ libuser32.$(IMPLIBEXT) \ - libw32skrnl.$(IMPLIBEXT) \ libwinnls32.$(IMPLIBEXT) \ libwnaspi32.$(IMPLIBEXT) \ libws2_32.$(IMPLIBEXT) \ @@ -1179,7 +1178,6 @@ IMPORT_LIBS = \ uxtheme/libuxtheme.$(IMPLIBEXT) \ vdmdbg/libvdmdbg.$(IMPLIBEXT) \ version/libversion.$(IMPLIBEXT) \ - win32s/libw32skrnl.$(IMPLIBEXT) \ wined3d/libwined3d.$(IMPLIBEXT) \ winedos/libwinedos.$(IMPLIBEXT) \ wininet/libwininet.$(IMPLIBEXT) \ @@ -1485,9 +1483,6 @@ vdmdbg/libvdmdbg.$(IMPLIBEXT): vdmdbg/vd version/libversion.$(IMPLIBEXT): version/version.spec $(WINEBUILD) @cd version && $(MAKE) libversion.$(IMPLIBEXT) -win32s/libw32skrnl.$(IMPLIBEXT): win32s/w32skrnl.spec $(WINEBUILD) - @cd win32s && $(MAKE) libw32skrnl.$(IMPLIBEXT) - wined3d/libwined3d.$(IMPLIBEXT): wined3d/wined3d.spec $(WINEBUILD) @cd wined3d && $(MAKE) libwined3d.$(IMPLIBEXT) @@ -1560,9 +1555,6 @@ libolesvr32.$(IMPLIBEXT): olesvr/liboles libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT) $(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@ -libw32skrnl.$(IMPLIBEXT): win32s/libw32skrnl.$(IMPLIBEXT) - $(RM) $@ && $(LN_S) win32s/libw32skrnl.$(IMPLIBEXT) $@ - libwinnls32.$(IMPLIBEXT): winnls/libwinnls32.$(IMPLIBEXT) $(RM) $@ && $(LN_S) winnls/libwinnls32.$(IMPLIBEXT) $@ diff --git a/dlls/win32s/.gitignore b/dlls/win32s/.gitignore index 4d0e928..f3c7a7c 100644 --- a/dlls/win32s/.gitignore +++ b/dlls/win32s/.gitignore @@ -1,2 +1 @@ Makefile -libw32skrnl.def diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in index 0dd96b2..e3788b6 100644 --- a/dlls/win32s/Makefile.in +++ b/dlls/win32s/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = w32skrnl.dll -IMPORTLIB = libw32skrnl.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \

1 0

Alexandre Julliard : rsabase: No need for an import library.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 7837a1ef59f1b85952bf9936d0075a78376706fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7837a1ef59f1b85952bf993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 6 21:46:17 2006 +0100 rsabase: No need for an import library. --- dlls/Makefile.in | 4 ---- dlls/rsabase/.gitignore | 1 - dlls/rsabase/Makefile.in | 1 - 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2a80ea2..ce226fc 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -1159,7 +1159,6 @@ IMPORT_LIBS = \ rasapi32/librasapi32.$(IMPLIBEXT) \ riched20/libriched20.$(IMPLIBEXT) \ rpcrt4/librpcrt4.$(IMPLIBEXT) \ - rsabase/librsabase.$(IMPLIBEXT) \ rsaenh/librsaenh.$(IMPLIBEXT) \ secur32/libsecur32.$(IMPLIBEXT) \ sensapi/libsensapi.$(IMPLIBEXT) \ @@ -1426,9 +1425,6 @@ riched20/libriched20.$(IMPLIBEXT): riche rpcrt4/librpcrt4.$(IMPLIBEXT): rpcrt4/rpcrt4.spec $(WINEBUILD) @cd rpcrt4 && $(MAKE) librpcrt4.$(IMPLIBEXT) -rsabase/librsabase.$(IMPLIBEXT): rsabase/rsabase.spec $(WINEBUILD) - @cd rsabase && $(MAKE) librsabase.$(IMPLIBEXT) - rsaenh/librsaenh.$(IMPLIBEXT): rsaenh/rsaenh.spec $(WINEBUILD) @cd rsaenh && $(MAKE) librsaenh.$(IMPLIBEXT) diff --git a/dlls/rsabase/.gitignore b/dlls/rsabase/.gitignore index 2f01b80..f3c7a7c 100644 --- a/dlls/rsabase/.gitignore +++ b/dlls/rsabase/.gitignore @@ -1,2 +1 @@ Makefile -librsabase.def diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in index a6d7b6f..a49185e 100644 --- a/dlls/rsabase/Makefile.in +++ b/dlls/rsabase/Makefile.in @@ -4,7 +4,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rsabase.dll -IMPORTLIB = librsabase.$(IMPLIBEXT) IMPORTS = rsaenh kernel32 SUBDIRS = tests

1 0