Module: wine Branch: master Commit: cd6e41dd9a7e3ef9527ec5b6f6ce4a75fae61b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6e41dd9a7e3ef9527ec5b6f6...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Nov 1 16:12:47 2013 +0400
ole32: Use real object CLSID when creating instance from context info.
---
dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8f3f303..fd7cc48 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2873,12 +2873,14 @@ HRESULT WINAPI CoGetClassObject( ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, rclsid, &data)) { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + clsreg.u.actctx.hactctx = data.hActCtx; clsreg.u.actctx.data = data.lpData; clsreg.u.actctx.section = data.lpSectionBase; clsreg.hkey = FALSE;
- hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); + hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); ReleaseActCtx(data.hActCtx); if (release_apt) apartment_release(apt); return hres;