January 2009 - Wine-Commits

Michael Stefaniuc : dxdiagn: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 89b043744faf61be0f95c5bb40d5926eb10c1bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b043744faf61be0f95c5bb4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:44:36 2009 +0100 dxdiagn: Remove superfluous pointer casts. --- dlls/dxdiagn/provider.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index a55bbb4..398c9ad 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -353,7 +353,7 @@ static HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCon IDxDiagContainer* pDeviceSubCont = NULL; IDxDiagContainer* pDriversCont = NULL; - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDeviceSubCont); + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDeviceSubCont); if (FAILED(hr)) { return hr; } V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDescription, &v); @@ -369,7 +369,7 @@ static HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCon * Drivers Cont contains Files Desc Containers */ /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDriversCont); if (FAILED(hr)) { return hr; } hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); @@ -394,7 +394,7 @@ static HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont IDxDiagContainer* pDiskSubCont = NULL; IDxDiagContainer* pDriversCont = NULL; - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDiskSubCont); + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDiskSubCont); if (FAILED(hr)) { return hr; } hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "" , pDiskSubCont); */ @@ -403,7 +403,7 @@ static HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont * Drivers Cont contains Files Desc Containers */ /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDriversCont); if (FAILED(hr)) { return hr; } hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); */

1 0

Henri Verbeet : dxgi: Add a stub IDXGISurface implementation.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 529faa2cd40a9d33166089a1efebd3a5a024e2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529faa2cd40a9d33166089a1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 09:58:44 2009 +0100 dxgi: Add a stub IDXGISurface implementation. --- dlls/dxgi/Makefile.in | 1 + dlls/dxgi/device.c | 33 +++++++++- dlls/dxgi/dxgi_private.h | 8 +++ dlls/dxgi/surface.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 2922473..9215e61 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ dxgi_main.c \ factory.c \ utils.c \ + surface.c \ swapchain.c RC_SRCS = version.rc diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 1b82b2a..69ba3e5 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -141,10 +141,39 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, UINT surface_count, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IDXGISurface **surface) { - FIXME("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p stub!\n", + struct dxgi_surface *object; + HRESULT hr; + UINT i; + + FIXME("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p partial stub!\n", iface, desc, surface_count, usage, shared_resource, surface); - return E_NOTIMPL; + memset(surface, 0, surface_count * sizeof(*surface)); + for (i = 0; i < surface_count; ++i) + { + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate DXGI surface object memory\n"); + hr = E_OUTOFMEMORY; + goto fail; + } + + object->vtbl = &dxgi_surface_vtbl; + object->refcount = 1; + surface[i] = (IDXGISurface *)object; + + TRACE("Created IDXGISurface %p (%u/%u)\n", object, i + 1, surface_count); + } + + return S_OK; + +fail: + for (i = 0; i < surface_count; ++i) + { + HeapFree(GetProcessHeap(), 0, surface[i]); + } + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice *iface, diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1e8ca51..bb2eebe 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -79,6 +79,14 @@ struct dxgi_swapchain LONG refcount; }; +/* IDXGISurface */ +extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl; +struct dxgi_surface +{ + const struct IDXGISurfaceVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c new file mode 100644 index 0000000..82db08b --- /dev/null +++ b/dlls/dxgi/surface.c @@ -0,0 +1,155 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IDXGISurface) + || IsEqualGUID(riid, &IID_IDXGIDeviceSubObject) + || IsEqualGUID(riid, &IID_IDXGIObject) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) +{ + struct dxgi_surface *This = (struct dxgi_surface *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) +{ + struct dxgi_surface *This = (struct dxgi_surface *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IDXGIObject methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, + REFGUID guid, const IUnknown *object) +{ + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) +{ + FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + + return E_NOTIMPL; +} + +/* IDXGIDeviceSubObject methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) +{ + FIXME("iface %p, riid %s, device %p stub!\n", iface, debugstr_guid(riid), device); + + return E_NOTIMPL; +} + +/* IDXGISurface methods */ +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) +{ + FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +const struct IDXGISurfaceVtbl dxgi_surface_vtbl = +{ + /* IUnknown methods */ + dxgi_surface_QueryInterface, + dxgi_surface_AddRef, + dxgi_surface_Release, + /* IDXGIObject methods */ + dxgi_surface_SetPrivateData, + dxgi_surface_SetPrivateDataInterface, + dxgi_surface_GetPrivateData, + dxgi_surface_GetParent, + /* IDXGIDeviceSubObject methods */ + dxgi_surface_GetDevice, + /* IDXGISurface methods */ + dxgi_surface_GetDesc, + dxgi_surface_Map, + dxgi_surface_Unmap, +};

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Texture2D implementation.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: e398a779f7bda8d652fa4a4bbf42db68a4ce4947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e398a779f7bda8d652fa4a4bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 09:58:44 2009 +0100 d3d10core: Add a stub ID3D10Texture2D implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 19 ++++- dlls/d3d10core/texture2d.c | 162 ++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index c45ff3c..fe3ead6 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ d3d10core_main.c \ device.c \ + texture2d.c \ utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 16bb323..965ebf9 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -43,6 +43,14 @@ struct d3d10_device LONG refcount; }; +/* ID3D10Texture2D */ +extern const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl; +struct d3d10_texture2d +{ + const struct ID3D10Texture2DVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 567c93a..437219a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -567,9 +567,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *iface, const D3D10_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture2D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d10_texture2d *object; - return E_NOTIMPL; + FIXME("iface %p, desc %p, data %p, texture %p partial stub!\n", iface, desc, data, texture); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 texture2d object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_texture2d_vtbl; + object->refcount = 1; + *texture = (ID3D10Texture2D *)object; + + TRACE("Created ID3D10Texture2D %p\n", object); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *iface, diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c new file mode 100644 index 0000000..9b57c61 --- /dev/null +++ b/dlls/d3d10core/texture2d.c @@ -0,0 +1,162 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Texture2D) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface) +{ + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) +{ + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10Texture2D *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10Resource methods */ + +static void STDMETHODCALLTYPE d3d10_texture2d_GetType(ID3D10Texture2D *iface, + D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); +} + +static void STDMETHODCALLTYPE d3d10_texture2d_SetEvictionPriority(ID3D10Texture2D *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_texture2d_GetEvictionPriority(ID3D10Texture2D *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Texture2D methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource, + D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE2D *mapped_texture) +{ + FIXME("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p stub!\n", + iface, sub_resource, map_type, map_flags, mapped_texture); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource) +{ + FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource); +} + +static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = +{ + /* IUnknown methods */ + d3d10_texture2d_QueryInterface, + d3d10_texture2d_AddRef, + d3d10_texture2d_Release, + /* ID3D10DeviceChild methods */ + d3d10_texture2d_GetDevice, + d3d10_texture2d_GetPrivateData, + d3d10_texture2d_SetPrivateData, + d3d10_texture2d_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_texture2d_GetType, + d3d10_texture2d_SetEvictionPriority, + d3d10_texture2d_GetEvictionPriority, + /* ID3D10Texture2D methods */ + d3d10_texture2d_Map, + d3d10_texture2d_Unmap, + d3d10_texture2d_GetDesc, +};

1 0

Michael Stefaniuc : msrle32: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 20c70ed85d1fdbc9b2b3d0ff3fad0f0d37cca8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c70ed85d1fdbc9b2b3d0ff3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:45:50 2009 +0100 msrle32: Remove superfluous pointer casts. --- dlls/msrle32/msrle32.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 6fa8e87..b0354b9 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1497,11 +1497,11 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) - MSRLE32_CompressRLE4(pi, lpic->lpbiInput, (LPBYTE)lpic->lpInput, - lpic->lpbiOutput, (LPBYTE)lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, + lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); else - MSRLE32_CompressRLE8(pi, lpic->lpbiInput, (LPBYTE)lpic->lpInput, - lpic->lpbiOutput, (LPBYTE)lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, + lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) @@ -1509,11 +1509,11 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) if ((*lpic->lpdwFlags & ICCOMPRESS_KEYFRAME) == 0) { if (lpic->lpbiOutput->biBitCount == 4) - MSRLE32_CompressRLE4(pi, lpic->lpbiInput, (LPBYTE)lpic->lpInput, - lpic->lpbiOutput, (LPBYTE)lpic->lpOutput, TRUE); + MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, + lpic->lpbiOutput, lpic->lpOutput, TRUE); else - MSRLE32_CompressRLE8(pi, lpic->lpbiInput, (LPBYTE)lpic->lpInput, - lpic->lpbiOutput, (LPBYTE)lpic->lpOutput, TRUE); + MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, + lpic->lpbiOutput, lpic->lpOutput, TRUE); if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) { @@ -1908,7 +1908,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, /* DllMain - library initialization code */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%d,%p)\n",(LPVOID)hModule,dwReason,lpReserved); + TRACE("(%p,%d,%p)\n",hModule,dwReason,lpReserved); switch (dwReason) { case DLL_PROCESS_ATTACH:

1 0

Lei Zhang : quartz: Add a filtergraph test for mpeg files.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: e9f1aa29b2a440338c1108ea066f62d3dfde34d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f1aa29b2a440338c1108ea0… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 14 10:48:19 2009 -0800 quartz: Add a filtergraph test for mpeg files. --- dlls/quartz/tests/filtergraph.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f56e722..53f39d5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -27,8 +27,9 @@ #include "dshow.h" #include "control.h" -static const CHAR fileA[] = "test.avi"; -static const WCHAR file[] = {'t','e','s','t','.','a','v','i',0}; +#define FILE_LEN 9 +static const char avifileA[FILE_LEN] = "test.avi"; +static const char mpegfileA[FILE_LEN] = "test.mpg"; IGraphBuilder* pgraph; @@ -38,11 +39,14 @@ static int createfiltergraph(void) &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); } -static void renderfile(void) +static void renderfile(const char * fileA) { HRESULT hr; + WCHAR fileW[FILE_LEN]; - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + + hr = IGraphBuilder_RenderFile(pgraph, fileW, NULL); ok(hr==S_OK, "RenderFile returned: %x\n", hr); } @@ -137,7 +141,7 @@ static void releasefiltergraph(void) ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } -static void test_render_run(void) +static void test_render_run(const char * fileA) { HANDLE h; @@ -147,7 +151,7 @@ static void test_render_run(void) h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - renderfile(); + renderfile(fileA); rungraph(); } @@ -1822,7 +1826,8 @@ static void test_render_filter_priority(void) START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_render_run(); + test_render_run(avifileA); + test_render_run(mpegfileA); test_graph_builder(); test_graph_builder_addfilter(); test_mediacontrol();

1 0

Michael Stefaniuc : msi: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 5f3ac30b3c5ec68b186596a3ca2d465c1ca97d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3ac30b3c5ec68b186596a3c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:46:57 2009 +0100 msi: Remove superfluous pointer casts. --- dlls/msi/action.c | 50 +++++++++++++++++++++++++------------------------- dlls/msi/appsearch.c | 3 +-- dlls/msi/classes.c | 10 +++++----- dlls/msi/database.c | 10 +++++----- dlls/msi/dialog.c | 6 +++--- dlls/msi/files.c | 4 ++-- dlls/msi/font.c | 2 +- dlls/msi/handle.c | 2 +- dlls/msi/media.c | 8 ++++---- dlls/msi/msi_main.c | 6 +++--- dlls/msi/package.c | 18 +++++++++--------- dlls/msi/registry.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f3ac30b3c5ec68b18659…

1 0

Michael Stefaniuc : msi/tests: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 9975dcd19e9a7cc10929659340a4db6d0ec5d6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9975dcd19e9a7cc1092965934… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:44:57 2009 +0100 msi/tests: Remove superfluous pointer casts. --- dlls/msi/tests/automation.c | 4 ++-- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/msi.c | 6 +++--- dlls/msi/tests/package.c | 4 ++-- dlls/msi/tests/source.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 1c392cb..f831ef4 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -594,7 +594,7 @@ static void test_dispatch(void) ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); /* Test getting ID of a function name that does exist */ - name = (WCHAR *)szOpenPackage; + name = szOpenPackage; hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); @@ -638,7 +638,7 @@ static void test_dispatch(void) ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); /* Test invoking a read-only property as DISPATCH_PROPERTYPUT or as a DISPATCH_METHOD */ - name = (WCHAR *)szProductState; + name = szProductState; hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index dd5dc29..5360284 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1362,7 +1362,7 @@ static void get_user_sid(LPSTR *usersid) OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); - GetTokenInformation(token, TokenUser, (void *)buf, size, &size); + GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index a52e011..fba584d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -505,7 +505,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + size = StringFromGUID2(&guid, guidW, MAX_PATH); ok(size == 39, "Expected 39, got %d\n", hr); WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); @@ -522,7 +522,7 @@ static void get_user_sid(LPSTR *usersid) OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); - GetTokenInformation(token, TokenUser, (void *)buf, size, &size); + GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); } @@ -794,7 +794,7 @@ static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squash hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + size = StringFromGUID2(&guid, guidW, MAX_PATH); ok(size == 39, "Expected 39, got %d\n", hr); WideCharToMultiByte(CP_ACP, 0, guidW, size, component, MAX_PATH, NULL, NULL); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index aa0b6f3..66ff3f0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -48,7 +48,7 @@ static void get_user_sid(LPSTR *usersid) OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); - GetTokenInformation(token, TokenUser, (void *)buf, size, &size); + GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); } @@ -160,7 +160,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + size = StringFromGUID2(&guid, guidW, MAX_PATH); ok(size == 39, "Expected 39, got %d\n", hr); WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 9248b70..2eb5f18 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -114,7 +114,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + size = StringFromGUID2(&guid, guidW, MAX_PATH); ok(size == 39, "Expected 39, got %d\n", hr); WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); @@ -136,7 +136,7 @@ static int get_user_sid(LPSTR *usersid) if (!rc && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) return 0; size = sizeof(buf); - GetTokenInformation(token, TokenUser, (void *)buf, size, &size); + GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); return 1;

1 0

Michael Stefaniuc : mciseq: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 24e5816245e01cd3b7335811bad00440398f003a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e5816245e01cd3b7335811b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:44:25 2009 +0100 mciseq: Remove superfluous pointer casts. --- dlls/mciseq/mcimidi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 3ee3fee..47cb792 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -104,8 +104,8 @@ struct SCA { */ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) { - struct SCA* sca = (struct SCA*)arg; - DWORD ret; + struct SCA* sca = arg; + DWORD ret; TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); @@ -403,7 +403,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; } - if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) { + if (mmioRead(wmm->hFile, buf, len) == len) { buf[len] = 0; /* end string in case */ switch (HIBYTE(LOWORD(mmt->dwEventData))) { case 0x02: @@ -1051,7 +1051,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; } - if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) { + if (mmioRead(wmm->hFile, buf, len) == len) { buf[len] = 0; /* end string in case */ TRACE("%s => \"%s\"\n", (idx < 8 ) ? info[idx] : "", buf); } else {

1 0

Michael Stefaniuc : regedit: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 484a53574a566f2f54fdd0612b4fc692590de3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=484a53574a566f2f54fdd0612… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 09:47:14 2009 +0100 regedit: Remove superfluous pointer casts. --- programs/regedit/listview.c | 4 ++-- programs/regedit/treeview.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 65efecb..fb7688f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -179,7 +179,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, break; case REG_BINARY: { unsigned int i; - LPBYTE pData = (LPBYTE)ValBuf; + LPBYTE pData = ValBuf; LPWSTR strBinary = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(WCHAR) * 3 + sizeof(WCHAR)); WCHAR format[] = {'%','0','2','X',' ',0}; for (i = 0; i < dwCount; i++) @@ -476,7 +476,7 @@ HWND CreateListView(HWND hwndParent, UINT id) hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, ListView, WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); + hwndParent, ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; SendMessageW(hwndLV, LVM_SETUNICODEFORMAT, TRUE, 0); SendMessageW(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 20d1b76..e48eb5b 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -672,7 +672,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); + hwndParent, ULongToHandle(id), hInst, NULL); SendMessageW(hwndTV, TVM_SETUNICODEFORMAT, TRUE, 0); /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) {

1 0

Andrey Turkin : ole32: Add IContextCallback interface to context object.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 37d27c38ceffc8aa67eb7ac561ff83373bf7c194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d27c38ceffc8aa67eb7ac56… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 14 20:28:09 2009 +0300 ole32: Add IContextCallback interface to context object. --- dlls/ole32/compobj.c | 112 ++++++++++++++++++++++++++++++++++++-------- dlls/ole32/tests/compobj.c | 4 -- 2 files changed, 92 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d778478..9501473 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -55,6 +55,7 @@ #include "objbase.h" #include "ole2.h" #include "ole2ver.h" +#include "ctxtcall.h" #include "compobj_private.h" @@ -3703,19 +3704,37 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *pChann typedef struct Context { const IComThreadingInfoVtbl *lpVtbl; + const IContextCallbackVtbl *lpCallbackVtbl; LONG refs; APTTYPE apttype; } Context; -static HRESULT WINAPI Context_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) +static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) +{ + return (Context *)((char*)iface - FIELD_OFFSET(Context, lpVtbl)); +} + +static inline Context *impl_from_IContextCallback( IContextCallback *iface ) +{ + return (Context *)((char*)iface - FIELD_OFFSET(Context, lpCallbackVtbl)); +} + +static HRESULT Context_QueryInterface(Context *iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; if (IsEqualIID(riid, &IID_IComThreadingInfo) || IsEqualIID(riid, &IID_IUnknown)) { - *ppv = iface; - IUnknown_AddRef(iface); + *ppv = &iface->lpVtbl; + } else if (IsEqualIID(riid, &IID_IContextCallback)) + { + *ppv = &iface->lpCallbackVtbl; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } @@ -3723,24 +3742,40 @@ static HRESULT WINAPI Context_QueryInterface(IComThreadingInfo *iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI Context_AddRef(IComThreadingInfo *iface) +static ULONG Context_AddRef(Context *This) { - Context *This = (Context *)iface; return InterlockedIncrement(&This->refs); } -static ULONG WINAPI Context_Release(IComThreadingInfo *iface) +static ULONG Context_Release(Context *This) { - Context *This = (Context *)iface; ULONG refs = InterlockedDecrement(&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; } -static HRESULT WINAPI Context_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) +static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_QueryInterface(This, riid, ppv); +} + +static ULONG WINAPI Context_CTI_AddRef(IComThreadingInfo *iface) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_AddRef(This); +} + +static ULONG WINAPI Context_CTI_Release(IComThreadingInfo *iface) +{ + Context *This = impl_from_IComThreadingInfo(iface); + return Context_Release(This); +} + +static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) { - Context *This = (Context *)iface; + Context *This = impl_from_IComThreadingInfo(iface); TRACE("(%p)\n", apttype); @@ -3748,9 +3783,9 @@ static HRESULT WINAPI Context_GetCurrentApartmentType(IComThreadingInfo *iface, return S_OK; } -static HRESULT WINAPI Context_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) +static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) { - Context *This = (Context *)iface; + Context *This = impl_from_IComThreadingInfo(iface); TRACE("(%p)\n", thdtype); @@ -3767,13 +3802,13 @@ static HRESULT WINAPI Context_GetCurrentThreadType(IComThreadingInfo *iface, THD return S_OK; } -static HRESULT WINAPI Context_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) +static HRESULT WINAPI Context_CTI_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) { FIXME("(%p): stub\n", logical_thread_id); return E_NOTIMPL; } -static HRESULT WINAPI Context_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) +static HRESULT WINAPI Context_CTI_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) { FIXME("(%s): stub\n", debugstr_guid(logical_thread_id)); return E_NOTIMPL; @@ -3781,15 +3816,51 @@ static HRESULT WINAPI Context_SetCurrentLogicalThreadId(IComThreadingInfo *iface static const IComThreadingInfoVtbl Context_Threading_Vtbl = { - Context_QueryInterface, - Context_AddRef, - Context_Release, - Context_GetCurrentApartmentType, - Context_GetCurrentThreadType, - Context_GetCurrentLogicalThreadId, - Context_SetCurrentLogicalThreadId + Context_CTI_QueryInterface, + Context_CTI_AddRef, + Context_CTI_Release, + Context_CTI_GetCurrentApartmentType, + Context_CTI_GetCurrentThreadType, + Context_CTI_GetCurrentLogicalThreadId, + Context_CTI_SetCurrentLogicalThreadId }; +static HRESULT WINAPI Context_CC_QueryInterface(IContextCallback *iface, REFIID riid, LPVOID *ppv) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_QueryInterface(This, riid, ppv); +} + +static ULONG WINAPI Context_CC_AddRef(IContextCallback *iface) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_AddRef(This); +} + +static ULONG WINAPI Context_CC_Release(IContextCallback *iface) +{ + Context *This = impl_from_IContextCallback(iface); + return Context_Release(This); +} + +static HRESULT WINAPI Context_CC_ContextCallback(IContextCallback *iface, PFNCONTEXTCALL pCallback, + ComCallData *param, REFIID riid, int method, IUnknown *punk) +{ + Context *This = impl_from_IContextCallback(iface); + + FIXME("(%p/%p)->(%p, %p, %s, %d, %p)\n", This, iface, pCallback, param, debugstr_guid(riid), method, punk); + return E_NOTIMPL; +} + +static const IContextCallbackVtbl Context_Callback_Vtbl = +{ + Context_CC_QueryInterface, + Context_CC_AddRef, + Context_CC_Release, + Context_CC_ContextCallback +}; + + /*********************************************************************** * CoGetObjectContext [OLE32.@] * @@ -3823,6 +3894,7 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) return E_OUTOFMEMORY; context->lpVtbl = &Context_Threading_Vtbl; + context->lpCallbackVtbl = &Context_Callback_Vtbl; context->refs = 1; if (apt->multi_threaded) context->apttype = APTTYPE_MTA; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d74138f..63891b7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1001,9 +1001,7 @@ static void test_CoGetObjectContext(void) ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); - todo_wine { ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - } if (hr == S_OK) { @@ -1030,9 +1028,7 @@ static void test_CoGetObjectContext(void) ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); - todo_wine { ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - } if (hr == S_OK) {

1 0