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

Carlo Bramini : include: mimeole.idl: Fix typo in ADDRESSPROPS structure.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 8e4acd81aaf6a2e413391606c1e8c67479567007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4acd81aaf6a2e413391606c… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Mon Apr 2 22:19:37 2012 +0200 include: mimeole.idl: Fix typo in ADDRESSPROPS structure. --- include/mimeole.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index d74cdb5..ab1239f 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -611,7 +611,7 @@ cpp_quote("#endif") DWORD dwCookie; DWORD dwReserved1; DWORD dwReserved2; - } ADRESSPROPS, *LPADDRESSPROPS; + } ADDRESSPROPS, *LPADDRESSPROPS; typedef struct tagADDRESSLIST {

1 0

Henri Verbeet : ddraw: The various D3D device interfaces can' t be queried from version 7 surfaces.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 75aa0b38f7bf305a924597fe93f7681a4c19972d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75aa0b38f7bf305a924597fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:19 2012 +0200 ddraw: The various D3D device interfaces can't be queried from version 7 surfaces. --- dlls/ddraw/surface.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 860a80d..f2c707a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -198,32 +198,30 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return E_NOINTERFACE; } - if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) - || IsEqualGUID(riid, &IID_IDirect3DHALDevice) - || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)) + if (This->version != 7) { - IDirect3DDevice7 *d3d; - IDirect3DDeviceImpl *device_impl; + if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) + || IsEqualGUID(riid, &IID_IDirect3DHALDevice) + || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)) + { + IDirect3DDeviceImpl *device_impl; + IDirect3DDevice7 *device; + HRESULT hr; - /* Call into IDirect3D7 for creation */ - IDirect3D7_CreateDevice(&This->ddraw->IDirect3D7_iface, riid, &This->IDirectDrawSurface7_iface, - &d3d); + hr = IDirect3D7_CreateDevice(&This->ddraw->IDirect3D7_iface, riid, + &This->IDirectDrawSurface7_iface, &device); + if (FAILED(hr)) + { + WARN("Failed to create device, hr %#x.\n", hr); + return hr; + } - if (d3d) - { - device_impl = impl_from_IDirect3DDevice7(d3d); + device_impl = impl_from_IDirect3DDevice7(device); device_impl->from_surface = TRUE; *obj = &device_impl->IDirect3DDevice_iface; - TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); return S_OK; } - WARN("Unable to create a IDirect3DDevice instance, returning E_NOINTERFACE\n"); - return E_NOINTERFACE; - } - - if (This->version != 7) - { if (IsEqualGUID(&IID_IDirect3DTexture2, riid)) { IDirect3DTexture2_AddRef(&This->IDirect3DTexture2_iface);

1 0

Henri Verbeet : ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface ().
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: ecd1c78c4820c0892b0e7cbe431ae52ceadb4bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd1c78c4820c0892b0e7cbe4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:20 2012 +0200 ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface(). --- dlls/ddraw/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f2c707a..d5b57c0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -239,6 +239,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + if (This->version != 7) + return E_INVALIDARG; + return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw/tests: Add some QueryInterface() tests for surfaces.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: cdd2d7f258c4230145a1afd00969842103992ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd2d7f258c4230145a1afd00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 11:14:10 2012 +0200 ddraw/tests: Add some QueryInterface() tests for surfaces. --- dlls/ddraw/tests/ddraw1.c | 137 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 137 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 118 ----------------------------------- 5 files changed, 556 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd2d7f258c4230145a1a…

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface ().
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: f47267ad55214784f9cb63f117283c87b6d64dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47267ad55214784f9cb63f11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:22 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface(). --- dlls/d3d9/device.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ab96d79..bec3c4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,38 +186,39 @@ static inline IDirect3DDevice9Impl *impl_from_IDirect3DDevice9Ex(IDirect3DDevice return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface); } -static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, - void **ppobj) +static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { + if (IsEqualGUID(riid, &IID_IDirect3DDevice9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DDevice9Ex_AddRef(iface); - *ppobj = This; - TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj); + *out = iface; return S_OK; - } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { + } + + if (IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) + { + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. * It doesn't matter with which function the device was created. */ - - if (This->d3d_parent->extended) + if (!device->d3d_parent->extended) { - *ppobj = iface; - IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); - TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj); - return S_OK; - } else { - WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n"); - *ppobj = NULL; + WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n"); + *out = NULL; return E_NOINTERFACE; } + + IDirect3DDevice9Ex_AddRef(iface); + *out = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DCubeTexture9Impl_QueryInterface ().
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 9d5413012862a3f4c008d911f36d4fff57859c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5413012862a3f4c008d911f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 2 22:42:23 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DCubeTexture9Impl_QueryInterface(). --- dlls/d3d9/cubetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 349f790..e7df0e1 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -34,20 +34,20 @@ static inline IDirect3DCubeTexture9Impl *impl_from_IDirect3DCubeTexture9(IDirect static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(IDirect3DCubeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DCubeTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Michael Stefaniuc : devenum: COM cleanup for ICreateDevEnum.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 1e40dea125b3361c28a6c87f298a49cac8f9cbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e40dea125b3361c28a6c87f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:15:31 2012 +0200 devenum: COM cleanup for ICreateDevEnum. --- dlls/devenum/createdevenum.c | 18 +++++++++--------- dlls/devenum/devenum_private.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 615305d..266e1d8 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -59,24 +59,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( - ICreateDevEnum * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, + void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICreateDevEnum)) { - *ppvObj = iface; + *ppv = iface; DEVENUM_ICreateDevEnum_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -463,9 +463,9 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( HKEY hkey; HKEY hbasekey; HRESULT hr; - CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass), + ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); if (!ppEnumMoniker) return E_POINTER; @@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; +CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 7515877..0c1800e 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -62,7 +62,7 @@ typedef struct typedef struct { - const ICreateDevEnumVtbl *lpVtbl; + ICreateDevEnum ICreateDevEnum_iface; } CreateDevEnumImpl; typedef struct

1 0

Michael Stefaniuc : devenum: COM cleanup for IEnumMoniker.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 201b72e8b600cceb0435d2053c48acd0056be17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=201b72e8b600cceb0435d2053… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:16:52 2012 +0200 devenum: COM cleanup for IEnumMoniker. --- dlls/devenum/devenum_private.h | 8 ---- dlls/devenum/mediacatenum.c | 70 ++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 0c1800e..811c4b8 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -72,14 +72,6 @@ typedef struct typedef struct { - const IEnumMonikerVtbl *lpVtbl; - LONG ref; - DWORD index; - HKEY hkey; -} EnumMonikerImpl; - -typedef struct -{ const IMonikerVtbl *lpVtbl; LONG ref; HKEY hkey; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 7b44c13..6a1cf2d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -30,12 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface); static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface); static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); typedef struct { + IEnumMoniker IEnumMoniker_iface; + LONG ref; + DWORD index; + HKEY hkey; +} EnumMonikerImpl; + +typedef struct +{ IPropertyBag IPropertyBag_iface; LONG ref; HKEY hkey; @@ -706,54 +713,48 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) return pMoniker; } -/********************************************************************** - * DEVENUM_IEnumMoniker_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( - LPENUMMONIKER iface, - REFIID riid, - LPVOID *ppvObj) +static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); +} - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); +static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface(IEnumMoniker *iface, REFIID riid, + void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - if (This == NULL || ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumMoniker)) { - *ppvObj = iface; - DEVENUM_IEnumMoniker_AddRef(iface); + *ppv = iface; + IEnumMoniker_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IEnumMoniker_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface) +static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); + TRACE("(%p) ref=%d\n", This, ref); return ref; } -/********************************************************************** - * DEVENUM_IEnumMoniker_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) +static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->() Release from %d\n", iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -765,13 +766,14 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) return ref; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, IMoniker **rgelt, + ULONG *pceltFetched) { + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; LONG res; ULONG fetched = 0; MediaCatMoniker * pMoniker; - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -808,9 +810,9 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); DWORD subKeys; TRACE("(%p)->(%d)\n", iface, celt); @@ -831,9 +833,9 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(IEnumMoniker *iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->()\n", iface); @@ -842,7 +844,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMoniker ** ppenum) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(IEnumMoniker *iface, IEnumMoniker **ppenum) { FIXME("(%p)->(%p): stub\n", iface, ppenum); @@ -869,12 +871,12 @@ HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) if (!pEnumMoniker) return E_OUTOFMEMORY; - pEnumMoniker->lpVtbl = &IEnumMoniker_Vtbl; + pEnumMoniker->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; - *ppEnumMoniker = (IEnumMoniker *)pEnumMoniker; + *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; DEVENUM_LockModule();

1 0

Michael Stefaniuc : devenum: COM cleanup for IMoniker (MediaCatMoniker).
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 25aa60b33cf53c85a5b2955989f672bfd1f8576f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25aa60b33cf53c85a5b295598… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:18:39 2012 +0200 devenum: COM cleanup for IMoniker (MediaCatMoniker). --- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/mediacatenum.c | 180 ++++++++++++++------------------------- dlls/devenum/parsedisplayname.c | 4 +- 3 files changed, 68 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25aa60b33cf53c85a5b29…

1 0

Michael Stefaniuc : devenum: Don' t use DEVENUM_IPropertyBag_AddRef method directly.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 91203006e171a584edc6036e7f4f0505ad85d22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91203006e171a584edc6036e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:19:59 2012 +0200 devenum: Don't use DEVENUM_IPropertyBag_AddRef method directly. --- dlls/devenum/mediacatenum.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 3562a69..1ff06df 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); - typedef struct { IEnumMoniker IEnumMoniker_iface; @@ -68,7 +66,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( IsEqualGUID(riid, &IID_IPropertyBag)) { *ppvObj = iface; - DEVENUM_IPropertyBag_AddRef(iface); + IPropertyBag_AddRef(iface); return S_OK; }

1 0