June 2013 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d().
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 9d4cbd6195ab2b73113040a449cc4416597b8c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4cbd6195ab2b73113040a44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:11 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d(). --- dlls/d3d10core/texture.c | 18 ++++++++-- dlls/d3d8/texture.c | 15 +++++++- dlls/d3d9/texture.c | 15 +++++++- dlls/ddraw/surface.c | 20 ++++++++++- dlls/wined3d/texture.c | 81 +++++++++++++++++++-------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +-- 7 files changed, 95 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d4cbd6195ab2b7311304…

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube().
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: b23739316c103719f20c89aef5e70c3153789c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23739316c103719f20c89aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:12 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube(). --- dlls/d3d8/texture.c | 17 ++++++++++-- dlls/d3d9/texture.c | 17 ++++++++++-- dlls/ddraw/surface.c | 27 +++++++++---------- dlls/wined3d/texture.c | 62 ++++++++++++++++---------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +-- 6 files changed, 67 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b23739316c103719f20c8…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVIEWPORTARRAY.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 31f9cae2bdc74e00a5883d080e63902728063cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f9cae2bdc74e00a5883d080… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:13 2013 +0200 d3drm: Avoid LPDIRECT3DRMVIEWPORTARRAY. --- dlls/d3drm/device.c | 14 ++++---------- include/d3drmobj.h | 6 +++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e6e0d71..c2458ac 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -319,12 +319,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -751,12 +748,9 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a26427d..ea85d76 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -388,7 +388,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -660,7 +660,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFRAMEARRAY.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 8c882f68190b05c9135b97e57ee9444f533e8874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c882f68190b05c9135b97e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMFRAMEARRAY. --- dlls/d3drm/frame.c | 12 +++---- dlls/d3drm/tests/d3drm.c | 90 +++++++++++++++++++++++----------------------- include/d3drmobj.h | 6 ++-- 3 files changed, 53 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c882f68190b05c9135b9…

1 0

Piotr Caban : server: Don' t create new handle when DUP_HANDLE_CLOSE_SOURCE is used if possible.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 76bfbf43e99d102a2ae701b5e1a9cc9682f2494a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bfbf43e99d102a2ae701b5e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 11:33:17 2013 +0200 server: Don't create new handle when DUP_HANDLE_CLOSE_SOURCE is used if possible. --- dlls/ntdll/om.c | 11 +++-------- server/handle.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 18da18d..8b92f1b 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -332,16 +332,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, if (!(ret = wine_server_call( req ))) { if (dest) *dest = wine_server_ptr_handle( reply->handle ); - if (reply->closed) + if (reply->closed && reply->self) { - if (reply->self) - { - int fd = server_remove_fd_from_cache( source ); - if (fd != -1) close( fd ); - } + int fd = server_remove_fd_from_cache( source ); + if (fd != -1) close( fd ); } - else if (options & DUPLICATE_CLOSE_SOURCE) - WARN( "failed to close handle %p in process %p\n", source, source_process ); } } SERVER_END_REQ; diff --git a/server/handle.c b/server/handle.c index 1d8087b..28c49c2 100644 --- a/server/handle.c +++ b/server/handle.c @@ -531,6 +531,13 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str { if (options & DUP_HANDLE_MAKE_GLOBAL) res = alloc_global_handle_no_access_check( obj, access ); + else if ((options & DUP_HANDLE_CLOSE_SOURCE) && src == dst && + entry && !(entry->access & RESERVED_CLOSE_PROTECT)) + { + if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; + entry->access = access; + res = src_handle; + } else res = alloc_handle_no_access_check( dst, obj, access, attr ); } @@ -581,7 +588,7 @@ DECL_HANDLER(set_handle_info) /* duplicate a handle */ DECL_HANDLER(dup_handle) { - struct process *src, *dst; + struct process *src, *dst = NULL; reply->handle = 0; if ((src = get_process_from_handle( req->src_process, PROCESS_DUP_HANDLE ))) @@ -598,7 +605,8 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if (req->options & DUP_HANDLE_CLOSE_SOURCE) reply->closed = !close_handle( src, req->src_handle ); + if ((req->options & DUP_HANDLE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) + reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); }

1 0

Piotr Caban : kernet32: Added DuplicateHandle tests with DUPLICATE_CLOSE_SOURCE flag.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: c9dbef3d96b39e4e09aa20b1813d491e4f0238f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9dbef3d96b39e4e09aa20b18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 11:33:29 2013 +0200 kernet32: Added DuplicateHandle tests with DUPLICATE_CLOSE_SOURCE flag. --- dlls/kernel32/tests/process.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9d3e983..1fef8ac 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1963,6 +1963,103 @@ static void test_TerminateProcess(void) CloseHandle(pi.hThread); } +static void test_DuplicateHandle(void) +{ + char path[MAX_PATH], file_name[MAX_PATH]; + HANDLE f, fmin, out; + DWORD info; + BOOL r; + + r = DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), + GetCurrentProcess(), &out, 0, FALSE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == 0, "info = %x\n", info); + ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); + CloseHandle(out); + + r = DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), + GetCurrentProcess(), &out, 0, TRUE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); + CloseHandle(out); + + GetTempPath(MAX_PATH, path); + GetTempFileName(path, "wt", 0, file_name); + f = CreateFile(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (f == INVALID_HANDLE_VALUE) + { + ok(0, "could not create %s\n", file_name); + return; + } + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == 0, "info = %x\n", info); + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + + r = SetHandleInformation(f, HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(r, "SetHandleInformation error %u\n", GetLastError()); + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f != out, "f == out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + r = SetHandleInformation(f, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(r, "SetHandleInformation error %u\n", GetLastError()); + + /* Test if DuplicateHandle allocates first free handle */ + if (f > out) + { + fmin = out; + } + else + { + fmin = f; + f = out; + } + CloseHandle(fmin); + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + CloseHandle(out); + DeleteFile(file_name); + + f = CreateFile("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + if (!is_console(f)) + { + skip("DuplicateHandle on console handle"); + CloseHandle(f); + return; + } + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + todo_wine ok(f != out, "f == out\n"); + CloseHandle(out); +} + START_TEST(process) { int b = init(); @@ -1991,6 +2088,7 @@ START_TEST(process) test_Handles(); test_SystemInfo(); test_RegistryQuota(); + test_DuplicateHandle(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Andrew Eikum : oleaut32: Don't fall back on typelib name for docstring.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: cee0a726ed05b194ed4bf18e0b7a96bf4da1a018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee0a726ed05b194ed4bf18e0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:56:23 2013 -0500 oleaut32: Don't fall back on typelib name for docstring. --- dlls/oleaut32/typelib.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bb3be43..af36a3b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4838,11 +4838,6 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( if(!(*pBstrDocString = SysAllocString(TLB_get_bstr(This->DocString)))) goto memerr2; } - else if (This->Name) - { - if(!(*pBstrDocString = SysAllocString(TLB_get_bstr(This->Name)))) - goto memerr2; - } else *pBstrDocString = NULL; }

1 0

Andrew Eikum : oleaut32: Fix ITypeInfo::GetNames for functions.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 3983bbf7d9a34ae07900eedb8b98ea1282ddb8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3983bbf7d9a34ae07900eedb8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:56:42 2013 -0500 oleaut32: Fix ITypeInfo::GetNames for functions. --- dlls/oleaut32/typelib.c | 51 ++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index af36a3b..02875c3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2392,12 +2392,7 @@ MSFT_DoFuncs(TLBContext* pcx, elemdesc->u.paramdesc.wParamFlags = paraminfo.Flags; /* name */ - if (paraminfo.oName == -1) - /* this occurs for [propput] or [propget] methods, so - * we should just set the name of the parameter to the - * name of the method. */ - ptfd->pParamDesc[j].Name = ptfd->Name; - else + if (paraminfo.oName != -1) ptfd->pParamDesc[j].Name = MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w(TLB_get_bstr(ptfd->pParamDesc[j].Name))); @@ -5959,29 +5954,38 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, const TLBVarDesc *pVDesc; int i; TRACE("(%p) memid=0x%08x Maxname=%d\n", This, memid, cMaxNames); + + if(!rgBstrNames) + return E_INVALIDARG; + + *pcNames = 0; + pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->cFuncs, memid); if(pFDesc) { - /* function found, now return function and parameter names */ - for(i=0; i<cMaxNames && i <= pFDesc->funcdesc.cParams; i++) - { - if(!i) - *rgBstrNames=SysAllocString(TLB_get_bstr(pFDesc->Name)); - else - rgBstrNames[i]=SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i-1].Name)); - } - *pcNames=i; + if(!cMaxNames || !pFDesc->Name) + return S_OK; + + *rgBstrNames = SysAllocString(TLB_get_bstr(pFDesc->Name)); + ++(*pcNames); + + for(i = 0; i < pFDesc->funcdesc.cParams; ++i){ + if(*pcNames >= cMaxNames || !pFDesc->pParamDesc[i].Name) + return S_OK; + rgBstrNames[*pcNames] = SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i].Name)); + ++(*pcNames); + } + return S_OK; + } + + pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->cVars, memid); + if(pVDesc) + { + *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); + *pcNames=1; } else { - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->cVars, memid); - if(pVDesc) - { - *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); - *pcNames=1; - } - else - { if(This->impltypes && (This->typekind==TKIND_INTERFACE || This->typekind==TKIND_DISPATCH)) { /* recursive search */ @@ -6002,7 +6006,6 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, } *pcNames=0; return TYPE_E_ELEMENTNOTFOUND; - } } return S_OK; }

1 0

Andrew Eikum : oleaut32: Always search external references in GetRefTypeInfo.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: d983e6d590e67d73456011c703f0eba64dd48e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d983e6d590e67d73456011c70… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:13 2013 -0500 oleaut32: Always search external references in GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 02875c3..69269f2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7441,8 +7441,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( goto end; } } - result = TYPE_E_ELEMENTNOTFOUND; - goto end; } LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry)

1 0

Andrew Eikum : oleaut32: Use implementation bitflag in href.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 7adad427454e60cf9513d47309a462f71a9b737f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7adad427454e60cf9513d4730… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:33 2013 -0500 oleaut32: Use implementation bitflag in href. --- dlls/oleaut32/typelib.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 69269f2..959c87b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6054,8 +6054,11 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( { if(index >= This->cImplTypes) hr = TYPE_E_ELEMENTNOTFOUND; - else + else{ *pRefType = This->impltypes[index].hRef; + if(This->typekind == TKIND_INTERFACE) + *pRefType |= 0x2; + } } if(TRACE_ON(ole))

1 0