March 2015 - Wine-commits - list.winehq.org

Piotr Caban : oleacc: Added Client_get_accChild implementation.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 89721ba40dff31f000fc26375c8153fe9772d9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=89721ba40dff31f000fc26375… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:39 2015 +0100 oleacc: Added Client_get_accChild implementation. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index cc7b53a..9456f81 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -144,8 +144,11 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, VARIANT varChildID, IDispatch **ppdispChild) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); + + *ppdispChild = NULL; + return E_INVALIDARG; } static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 4e92c5e..0a091df 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -421,6 +421,19 @@ static void test_default_client_accessible_object(void) V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_I4(&vid) = 1; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str));

1 0

Piotr Caban : oleacc: Added client IEnumVARIANT stub.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 843f463d2eaa81b11e3e34e086b4f600de9e146e URL: http://source.winehq.org/git/wine.git/?a=commit;h=843f463d2eaa81b11e3e34e08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:45 2015 +0100 oleacc: Added client IEnumVARIANT stub. --- dlls/oleacc/client.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9456f81..9409990 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; @@ -51,6 +52,8 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -496,6 +499,68 @@ static const IOleWindowVtbl ClientOleWindowVtbl = { Client_OleWindow_ContextSensitiveHelp }; +static inline Client* impl_from_Client_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Client, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { + Client_EnumVARIANT_QueryInterface, + Client_EnumVARIANT_AddRef, + Client_EnumVARIANT_Release, + Client_EnumVARIANT_Next, + Client_EnumVARIANT_Skip, + Client_EnumVARIANT_Reset, + Client_EnumVARIANT_Clone +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -510,6 +575,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; + client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd;

1 0

Piotr Caban : oleacc: Added window IEnumVARIANT stub.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: ee144b66abfc8a1b3ed81cc13f54713bf646acd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee144b66abfc8a1b3ed81cc13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:52 2015 +0100 oleacc: Added window IEnumVARIANT stub. --- dlls/oleacc/window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index f8090b5..64d7167 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; } Window; @@ -49,6 +50,8 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -346,6 +349,68 @@ static const IOleWindowVtbl WindowOleWindowVtbl = { Window_OleWindow_ContextSensitiveHelp }; +static inline Window* impl_from_Window_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Window, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { + Window_EnumVARIANT_QueryInterface, + Window_EnumVARIANT_AddRef, + Window_EnumVARIANT_Release, + Window_EnumVARIANT_Next, + Window_EnumVARIANT_Skip, + Window_EnumVARIANT_Reset, + Window_EnumVARIANT_Clone +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -360,6 +425,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; + window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Julian Rüger : German translation for release 1.7.39
by Jeremy Newman 23 Mar '15

23 Mar '15

Module: website Branch: master Commit: 5546eb8f3bb008017c69f2ec1272b6e33a5d8a97 URL: http://source.winehq.org/git/website.git/?a=commit;h=5546eb8f3bb008017c69f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Mar 21 11:33:06 2015 +0100 German translation for release 1.7.39 --- news/de/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015032001.xml b/news/de/2015032001.xml new file mode 100644 index 0000000..bcd4184 --- /dev/null +++ b/news/de/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. März 2015</date> +<title>Wine 1.7.39 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.39 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.39">Neuerungen (en)</a> in dieser Version: +<ul> + <li>WinMM Joystick-Unterstützung unter Mac OS X.</li> + <li>Kerning-Unterstützung in DirectWrite.</li> + <li>Unterstützung für DirectX Media Objects-Filter.</li> + <li>Bessere Unterstützung für animierte GIFs in GdiPlus.</li> + <li>Verbesserte Unterstützung für bekannte Ordner in Shell32.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.39
by Jeremy Newman 23 Mar '15

23 Mar '15

Module: website Branch: master Commit: 3d770890d53448dc152162e51c5f0e2720d4f18f URL: http://source.winehq.org/git/website.git/?a=commit;h=3d770890d53448dc152162… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 20 17:33:00 2015 +0200 Ukrainian translation for release 1.7.39 --- news/uk/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2015032001.xml b/news/uk/2015032001.xml new file mode 100644 index 0000000..c92a505 --- /dev/null +++ b/news/uk/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>20 березня 2015</date> +<title>Випущено Wine 1.7.39</title> +<body> + Розробницький реліз Wine 1.7.39 наразі доступний. + <a href="{$root}/announce/1.7.39">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка джойстика WinMM в Mac OS X.</li> + <li>Підтримка кернінгу у DirectWrite.</li> + <li>Підтримка фільтрів DirectX Media Objects.</li> + <li>Краща підтримка анімованих GIF у GdiPlus.</li> + <li>Покращена підтримка Known Folders у Shell32.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.39
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: website Branch: master Commit: 0725adb8692747a6630ad200a9fe8cb3263a8e7a URL: http://source.winehq.org/git/website.git/?a=commit;h=0725adb8692747a6630ad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:43:29 2015 +0900 Wine release 1.7.39 --- news/en/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015032001.xml b/news/en/2015032001.xml new file mode 100644 index 0000000..e87985f --- /dev/null +++ b/news/en/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>March 20, 2015</date> +<title>Wine 1.7.39 Released</title> +<body> + The Wine development release 1.7.39 is now available. + <a href="{$root}/announce/1.7.39">What's new</a> in this release: +<ul> + <li>WinMM joystick support on Mac OS X.</li> + <li>Kerning support in DirectWrite.</li> + <li>Support for DirectX Media Objects filters.</li> + <li>Better support for animated GIFs in GdiPlus.</li> + <li>Improved support for Known Folders in Shell32.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : avifil32: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: cd4a1ea922b244626b67d118128345447aad5db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4a1ea922b244626b67d1181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:15:44 2015 +0300 avifil32: Return interface pointer from QI instead of impl pointer. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/icmstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 845ea16..7bf05d2 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -143,7 +143,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK; diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index eaca594..1b86d00 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -97,7 +97,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK;

1 0

Nikolay Sivov : browseui: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: d7f0a5ff08898be646deb8d108453bc109131906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f0a5ff08898be646deb8d10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:19:22 2015 +0300 browseui: Return interface pointer from QI instead of impl pointer. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/browseui_main.c | 2 +- dlls/browseui/compcatcachedaemon.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index bfb200c..e7edece 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -100,7 +100,7 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) { - *ppvOut = This; + *ppvOut = &This->IEnumString_iface; } else if (IsEqualIID(iid, &IID_IACList)) { diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 8b3530f..aa31d08 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -67,7 +67,7 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IACList2) || IsEqualIID(iid, &IID_IACList)) { - *ppvOut = This; + *ppvOut = &This->IACList2_iface; } if (*ppvOut) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index f509ee5..1b3cecc 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -152,7 +152,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = This; + *ppvOut = &This->IClassFactory_iface; TRACE("Created class factory %p\n", This); InterlockedIncrement(&BROWSEUI_refCount); return S_OK; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5addd2..5ed9f37 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -70,7 +70,7 @@ static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, RE if (IsEqualIID(iid, &IID_IRunnableTask) || IsEqualIID(iid, &IID_IUnknown)) { - *ppvOut = This; + *ppvOut = &This->IRunnableTask_iface; } if (*ppvOut)

1 0

Nikolay Sivov : explorerframe: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 20e302e2032239e0e73089b8d428b8777dbe5fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e302e2032239e0e73089b8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:23:15 2015 +0300 explorerframe: Return interface pointer from QI instead of impl pointer. --- dlls/explorerframe/nstc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 52d74c7..87a7200 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -818,7 +818,7 @@ static HRESULT WINAPI NSTC2_fnQueryInterface(INameSpaceTreeControl2* iface, IsEqualIID(riid, &IID_INameSpaceTreeControl) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = This; + *ppvObject = &This->INameSpaceTreeControl2_iface; } else if(IsEqualIID(riid, &IID_IOleWindow)) {

1 0

Nikolay Sivov : fusion: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: dc5d07f51b27424bda93c9abe581b983e3acfd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5d07f51b27424bda93c9abe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:25:29 2015 +0300 fusion: Return interface pointer from QI instead of impl pointer. --- dlls/fusion/asmcache.c | 4 ++-- dlls/fusion/asmenum.c | 2 +- dlls/fusion/asmname.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index dd84d38..6cc6602 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -172,7 +172,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface, IsEqualIID(riid, &IID_IAssemblyCache)) { IAssemblyCache_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCache_iface; return S_OK; } @@ -601,7 +601,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem * IsEqualIID(riid, &IID_IAssemblyCacheItem)) { IAssemblyCacheItem_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCacheItem_iface; return S_OK; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 76de1bf..4a5dadd 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -72,7 +72,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, IsEqualIID(riid, &IID_IAssemblyEnum)) { IAssemblyEnum_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyEnum_iface; return S_OK; } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f18e622..f892f2b 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -85,7 +85,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, IsEqualIID(riid, &IID_IAssemblyName)) { IAssemblyName_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyName_iface; return S_OK; }

1 0