February 2020 - Wine-Commits

Akihiro Sagawa : shlwapi: Fix wnsprintfW/wvnsprintfW %S conversion.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: 6f8ae18cd78f4779dc459664fe53777e63391363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8ae18cd78f4779dc459664… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 9 20:51:38 2020 +0900 shlwapi: Fix wnsprintfW/wvnsprintfW %S conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/wsprintf.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 9d4088cc25..f2e5f0ace1 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -258,8 +258,22 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, return (format->precision = 1); case WPR_STRING: if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; - for (len = 0; !format->precision || (len < format->precision); len++) - if (!*(arg->lpcstr_view + len)) break; + if (dst_is_wide) + { + LPCSTR p = arg->lpcstr_view; + for (len = 0; (!format->precision || len < format->precision) && *p; p++) + { + /* This isn't applicable for UTF-8 and UTF-7 */ + if (IsDBCSLeadByte( *p )) p++; + len++; + if (!*p) break; + } + } + else + { + for (len = 0; !format->precision || (len < format->precision); len++) + if (!*(arg->lpcstr_view + len)) break; + } if (len > maxlen) len = maxlen; return (format->precision = len); case WPR_WSTRING: @@ -506,7 +520,14 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; + for (i = 0; i < len; i++) + { + WCHAR buf[2]; /* for LeadByte + NUL case, we need 2 WCHARs. */ + int ret, mb_len = IsDBCSLeadByte( *ptr ) ? 2 : 1; + ret = MultiByteToWideChar( CP_ACP, 0, ptr, mb_len, buf, ARRAY_SIZE( buf )); + *p++ = buf[ret - 1]; + ptr += mb_len; + } } break; case WPR_WSTRING:

1 0

Dmitry Timoshkov : gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: 5ca9da2c0197ac1260975c1b7b643dbd11185715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca9da2c0197ac1260975c1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 18:31:38 2020 +0800 gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c52fa65445..8f3272b281 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4775,7 +4775,7 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, /* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + TRACE("(%p, %p)\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -4783,6 +4783,13 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; + if (graphics->image->type == ImageTypeBitmap) + { + GpBitmap *bitmap = (GpBitmap *)graphics->image; + if (IsIndexedPixelFormat(bitmap->format)) + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + } + return Ok; }

1 0

Alistair Leslie-Hughes : include: Add more x3daudio defines.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: ec86f3eb00de14f17759b53a0e65b4db7b09ea25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec86f3eb00de14f17759b53a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 7 00:41:03 2020 +0000 include: Add more x3daudio defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/x3daudio.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index 0fd9a30092..26e2d1df72 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -97,6 +97,51 @@ typedef struct X3DAUDIO_DSP_SETTINGS { #define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 #define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 +#ifndef _SPEAKER_POSITIONS_ +#define _SPEAKER_POSITIONS_ +#define SPEAKER_FRONT_LEFT 0x00000001 +#define SPEAKER_FRONT_RIGHT 0x00000002 +#define SPEAKER_FRONT_CENTER 0x00000004 +#define SPEAKER_LOW_FREQUENCY 0x00000008 +#define SPEAKER_BACK_LEFT 0x00000010 +#define SPEAKER_BACK_RIGHT 0x00000020 +#define SPEAKER_FRONT_LEFT_OF_CENTER 0x00000040 +#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x00000080 +#define SPEAKER_BACK_CENTER 0x00000100 +#define SPEAKER_SIDE_LEFT 0x00000200 +#define SPEAKER_SIDE_RIGHT 0x00000400 +#define SPEAKER_TOP_CENTER 0x00000800 +#define SPEAKER_TOP_FRONT_LEFT 0x00001000 +#define SPEAKER_TOP_FRONT_CENTER 0x00002000 +#define SPEAKER_TOP_FRONT_RIGHT 0x00004000 +#define SPEAKER_TOP_BACK_LEFT 0x00008000 +#define SPEAKER_TOP_BACK_CENTER 0x00010000 +#define SPEAKER_TOP_BACK_RIGHT 0x00020000 +#define SPEAKER_RESERVED 0x7ffc0000 +#define SPEAKER_ALL 0x80000000 +#endif + +#ifndef SPEAKER_MONO +#define SPEAKER_MONO SPEAKER_FRONT_CENTER +#define SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define SPEAKER_2POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY) +#define SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define SPEAKER_4POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | \ + SPEAKER_BACK_RIGHT) +#define SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_FRONT_LEFT_OF_CENTER | \ + SPEAKER_FRONT_RIGHT_OF_CENTER) +#define SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#define SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#endif + +#define X3DAUDIO_SPEED_OF_SOUND 343.5f + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE];

1 0

Jacek Caban : oleaut32: Move TKIND_DISPATCH logic to ITypeInfoImpl_GetInternalFuncDesc.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: af905ffec9103deab5cb33f5b481d0cc65d037a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af905ffec9103deab5cb33f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 14:56:45 2020 +0100 oleaut32: Move TKIND_DISPATCH logic to ITypeInfoImpl_GetInternalFuncDesc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 89d3940980..d2393c9c08 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5880,17 +5880,6 @@ static void TLB_FreeVarDesc(VARDESC *var_desc) SysFreeString((BSTR)var_desc); } -HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) -{ - ITypeInfoImpl *This = impl_from_ITypeInfo(iface); - - if (index >= This->typeattr.cFuncs) - return TYPE_E_ELEMENTNOTFOUND; - - *ppFuncDesc = &This->funcdescs[index].funcdesc; - return S_OK; -} - /* internal function to make the inherited interfaces' methods appear * part of the interface */ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, @@ -5932,8 +5921,27 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, if (index < implemented_funcs) return E_INVALIDARG; - return ITypeInfoImpl_GetInternalFuncDesc(iface, index - implemented_funcs, - ppFuncDesc); + index -= implemented_funcs; + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + *ppFuncDesc = &This->funcdescs[index].funcdesc; + return S_OK; +} + +static HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **func_desc, UINT *hrefoffset ) +{ + ITypeInfoImpl *This = impl_from_ITypeInfo(iface); + + if (This->typeattr.typekind == TKIND_DISPATCH) + return ITypeInfoImpl_GetInternalDispatchFuncDesc(iface, index, func_desc, NULL, hrefoffset); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + *func_desc = &This->funcdescs[index].funcdesc; + return S_OK; } static inline void ITypeInfoImpl_ElemDescAddHrefOffset( LPELEMDESC pElemDesc, UINT hrefoffset) @@ -5989,13 +5997,8 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, if (This->needs_layout) ICreateTypeInfo2_LayOut(&This->ICreateTypeInfo2_iface); - if (This->typeattr.typekind == TKIND_DISPATCH) - hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, - &internal_funcdesc, NULL, - &hrefoffset); - else - hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, - &internal_funcdesc); + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, + &internal_funcdesc, &hrefoffset); if (FAILED(hr)) { WARN("description for function %d not found\n", index);

1 0

Kevin Puetz : oleaut32: Fix handling resource IDs in paths when registering typelib helpdir.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: 5ecd6e4807d4b145a06e653dc1bb2f16678d0c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ecd6e4807d4b145a06e653d… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 10 14:56:39 2020 +0100 oleaut32: Fix handling resource IDs in paths when registering typelib helpdir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a65f432af0..89d3940980 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -722,17 +722,26 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W KEY_WRITE, NULL, &subKey, &disposition) == ERROR_SUCCESS) { BSTR freeHelpDir = NULL; - OLECHAR* pIndexStr; + WCHAR *file_name; /* if we created a new key, and helpDir was null, set the helpdir to the directory which contains the typelib. However, if we just opened an existing key, we leave the helpdir alone */ if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { szHelpDir = freeHelpDir = SysAllocString(szFullPath); - pIndexStr = wcsrchr(szHelpDir, '\\'); - if (pIndexStr) { - *pIndexStr = 0; + file_name = wcsrchr(szHelpDir, '\\'); + if (file_name && file_name[0]) { + /* possible remove a numeric \index (resource-id) */ + WCHAR *end_ptr = file_name + 1; + while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++; + if (!*end_ptr) + { + *file_name = 0; + file_name = wcsrchr(szHelpDir, '\\'); + } } + if (file_name) + *file_name = 0; } /* if we have an szHelpDir, set it! */

1 0

Kevin Puetz : oleaut32: Search cache for requested typeinfo in GetRefTypeInfo.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: dc96f63f3f87ff18425c0b11dfc989ca5431da3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc96f63f3f87ff18425c0b11… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 10 14:56:28 2020 +0100 oleaut32: Search cache for requested typeinfo in GetRefTypeInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 788d853f63..a65f432af0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7981,21 +7981,49 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_AddRef(pTLib); result = S_OK; } else { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; - struct search_res_tlb_params params; - BSTR libnam; + /* Search in cached typelibs */ + ITypeLibImpl *entry; - TRACE("typeinfo in imported typelib that isn't already loaded\n"); + EnterCriticalSection(&cache_section); + LIST_FOR_EACH_ENTRY(entry, &tlb_cache, ITypeLibImpl, entry) + { + if (entry->guid + && IsEqualIID(&entry->guid->guid, TLB_get_guid_null(ref_type->pImpTLInfo->guid)) + && entry->ver_major == ref_type->pImpTLInfo->wVersionMajor + && entry->ver_minor == ref_type->pImpTLInfo->wVersionMinor + && entry->set_lcid == ref_type->pImpTLInfo->lcid) + { + TRACE("got cached %p\n", entry); + pTLib = (ITypeLib*)&entry->ITypeLib2_iface; + ITypeLib_AddRef(pTLib); + result = S_OK; + break; + } + } + LeaveCriticalSection(&cache_section); - /* Search in resource table */ - params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); - params.pTLib = NULL; - EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); - pTLib = params.pTLib; - result = S_OK; + if (!pTLib) + { + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; + struct search_res_tlb_params params; + + TRACE("typeinfo in imported typelib that isn't already loaded\n"); + + /* Search in resource table */ + params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); + params.pTLib = NULL; + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + if(params.pTLib) + { + pTLib = params.pTLib; + result = S_OK; + } + } if (!pTLib) { + BSTR libnam; + /* Search on disk */ result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), ref_type->pImpTLInfo->wVersionMajor,

1 0

Jacek Caban : oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in a few more places.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: db498b3bf2a17e4e66845bd0988a7aaac780cfd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db498b3bf2a17e4e66845bd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 14:57:04 2020 +0100 oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7020f68ba7..68c31e1d88 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5264,7 +5264,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( return result; } -static HRESULT TLB_copy_all_custdata(struct list *custdata_list, CUSTDATA *pCustData) +static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA *pCustData) { TLBCustData *pCData; unsigned int ct; @@ -8418,14 +8418,17 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( VARIANT *pVarVal) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + const TLBFuncDesc *pFDesc; TLBCustData *pCData; - TLBFuncDesc *pFDesc = &This->funcdescs[indexFunc]; + UINT hrefoffset; + HRESULT hr; TRACE("%p %u %u %s %p\n", This, indexFunc, indexParam, debugstr_guid(guid), pVarVal); - if(indexFunc >= This->typeattr.cFuncs) - return TYPE_E_ELEMENTNOTFOUND; + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, indexFunc, &pFDesc, &hrefoffset); + if (FAILED(hr)) + return hr; if(indexParam >= pFDesc->funcdesc.cParams) return TYPE_E_ELEMENTNOTFOUND; @@ -8587,12 +8590,15 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData( CUSTDATA *pCustData) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - TLBFuncDesc *pFDesc = &This->funcdescs[index]; + const TLBFuncDesc *pFDesc; + UINT hrefoffset; + HRESULT hr; TRACE("%p %u %p\n", This, index, pCustData); - if(index >= This->typeattr.cFuncs) - return TYPE_E_ELEMENTNOTFOUND; + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &pFDesc, &hrefoffset); + if (FAILED(hr)) + return hr; return TLB_copy_all_custdata(&pFDesc->custdata_list, pCustData); } @@ -8606,12 +8612,15 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, UINT indexFunc, UINT indexParam, CUSTDATA *pCustData) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - TLBFuncDesc *pFDesc = &This->funcdescs[indexFunc]; + const TLBFuncDesc *pFDesc; + UINT hrefoffset; + HRESULT hr; TRACE("%p %u %u %p\n", This, indexFunc, indexParam, pCustData); - if(indexFunc >= This->typeattr.cFuncs) - return TYPE_E_ELEMENTNOTFOUND; + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, indexFunc, &pFDesc, &hrefoffset); + if (FAILED(hr)) + return hr; if(indexParam >= pFDesc->funcdesc.cParams) return TYPE_E_ELEMENTNOTFOUND;

1 0

Kevin Puetz : oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in ITypeInfo2_fnGetFuncCustData.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: af2edc175cae6e23bc24b618b0087510ad7edb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af2edc175cae6e23bc24b618… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 10 14:56:54 2020 +0100 oleaut32: Use ITypeInfoImpl_GetInternalFuncDesc in ITypeInfo2_fnGetFuncCustData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4d8bd256be..6375dc3de0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1727,7 +1727,7 @@ static inline TLBVarDesc *TLB_get_vardesc_by_name(ITypeInfoImpl *typeinfo, const return NULL; } -static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, REFGUID guid) +static inline TLBCustData *TLB_get_custdata_by_guid(const struct list *custdata_list, REFGUID guid) { TLBCustData *cust_data; LIST_FOR_EACH_ENTRY(cust_data, custdata_list, TLBCustData, entry) @@ -8388,14 +8388,20 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); TLBCustData *pCData; - TLBFuncDesc *pFDesc = &This->funcdescs[index]; + const TLBFuncDesc *desc; + UINT hrefoffset; + HRESULT hr; TRACE("%p %u %s %p\n", This, index, debugstr_guid(guid), pVarVal); - if(index >= This->typeattr.cFuncs) - return TYPE_E_ELEMENTNOTFOUND; + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &desc, &hrefoffset); + if (FAILED(hr)) + { + WARN("description for function %d not found\n", index); + return hr; + } - pCData = TLB_get_custdata_by_guid(&pFDesc->custdata_list, guid); + pCData = TLB_get_custdata_by_guid(&desc->custdata_list, guid); if(!pCData) return TYPE_E_ELEMENTNOTFOUND;

1 0

Jacek Caban : oleaut32: Return missing function custom data as VT_EMPTY.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: cdb72b091eec4075cbf2a95732237a069e612c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb72b091eec4075cbf2a957… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 14:56:58 2020 +0100 oleaut32: Return missing function custom data as VT_EMPTY. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 24 ++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 79861dd46f..e8956fb3b1 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4798,13 +4798,17 @@ static void test_dump_typelib(const WCHAR *name) { ITypeLib *typelib; int ticount = ARRAY_SIZE(info); + CUSTDATA cust_data; int iface, func; + VARIANT v; + HRESULT hr; ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); for (iface = 0; iface < ticount; iface++) { const type_info *ti = &info[iface]; + ITypeInfo2 *typeinfo2; ITypeInfo *typeinfo; TYPEATTR *typeattr; BSTR bstrIfName; @@ -4845,6 +4849,9 @@ static void test_dump_typelib(const WCHAR *name) if (hr == S_OK) ITypeInfo_Release(typeinfo2); } + hr = ITypeInfo_QueryInterface(typeinfo, &IID_ITypeInfo2, (void**)&typeinfo2); + ok(hr == S_OK, "Could not get ITypeInfo2: %08x\n", hr); + for (func = 0; func < typeattr->cFuncs; func++) { const function_info *fn_info = &ti->funcs[func]; @@ -4893,10 +4900,27 @@ static void test_dump_typelib(const WCHAR *name) } expect_int(fn_info->params[desc->cParams].vt, (VARTYPE)-1); + V_VT(&v) = VT_ERROR; + hr = ITypeInfo2_GetFuncCustData(typeinfo2, func, &IID_NULL, &v); + ok(hr == S_OK, "GetFuncCustData failed: %08x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hr = ITypeInfo2_GetFuncCustData(typeinfo2, func, &IID_IBaseIface, &v); + ok(hr == S_OK, "GetFuncCustData failed: %08x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + + memset(&cust_data, 0, sizeof(cust_data)); + hr = ITypeInfo2_GetAllCustData(typeinfo2, &cust_data); ITypeInfo_ReleaseFuncDesc(typeinfo, desc); + ClearCustData(&cust_data); } ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + + ITypeInfo2_Release(typeinfo2); ITypeInfo_Release(typeinfo); } ITypeLib_Release(typelib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6375dc3de0..7020f68ba7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8387,8 +8387,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( VARIANT *pVarVal) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - TLBCustData *pCData; const TLBFuncDesc *desc; + TLBCustData *data; UINT hrefoffset; HRESULT hr; @@ -8401,14 +8401,9 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( return hr; } - pCData = TLB_get_custdata_by_guid(&desc->custdata_list, guid); - if(!pCData) - return TYPE_E_ELEMENTNOTFOUND; - VariantInit(pVarVal); - VariantCopy(pVarVal, &pCData->data); - - return S_OK; + data = TLB_get_custdata_by_guid(&desc->custdata_list, guid); + return data ? VariantCopy(pVarVal, &data->data) : S_OK; } /* ITypeInfo2::GetParamCustData

1 0

Jacek Caban : oleaut32/tests: Add test of reference typelib caching.
by Alexandre Julliard Feb. 10, 2020

Feb. 10, 2020

Module: wine Branch: master Commit: 2822b577d8a7eaece0623ce5fc55adde286ce8c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2822b577d8a7eaece0623ce5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 14:56:33 2020 +0100 oleaut32/tests: Add test of reference typelib caching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/Makefile.in | 1 + dlls/oleaut32/tests/test_simple.idl | 34 ++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.rc | 3 +++ dlls/oleaut32/tests/typelib.c | 53 ++++++++++++++++++++++++++++--------- 4 files changed, 78 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 036c63d67d..098ea9deef 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -17,5 +17,6 @@ RC_SRCS = tmarshal.rc IDL_SRCS = \ test_reg.idl \ + test_simple.idl \ test_tlb.idl \ tmarshal.idl diff --git a/dlls/oleaut32/tests/test_simple.idl b/dlls/oleaut32/tests/test_simple.idl new file mode 100644 index 0000000000..fa0a08cad9 --- /dev/null +++ b/dlls/oleaut32/tests/test_simple.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2020 Jacek Caban 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 + */ + +#pragma makedep ident +#pragma makedep typelib + +import "oaidl.idl"; /* needed by widl */ + +[uuid(8b05fe77-4a6c-4133-b9cd-8f00007af786)] +library base +{ + importlib("stdole2.tlb"); + + [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0004)] + interface IBaseIface : IDispatch + { + HRESULT simple_test(); + } +} diff --git a/dlls/oleaut32/tests/tmarshal.rc b/dlls/oleaut32/tests/tmarshal.rc index cbb3b18959..8ddfd8a529 100644 --- a/dlls/oleaut32/tests/tmarshal.rc +++ b/dlls/oleaut32/tests/tmarshal.rc @@ -35,3 +35,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: test_reg.tlb */ 3 TYPELIB test_reg.tlb + +/* @makedep: test_simple.tlb */ +4 TL test_simple.tlb diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2a84cd92e9..79861dd46f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -41,6 +41,7 @@ #include "test_reg.h" #include "test_tlb.h" +#include "test_simple.h" #define expect_eq(expr, value, type, format) { type _ret = (expr); ok((value) == _ret, #expr " expected " format " got " format "\n", value, _ret); } #define expect_int(expr, value) expect_eq(expr, (int)(value), int, "%d") @@ -775,7 +776,7 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } -static void write_typelib(int res_no, const WCHAR *filename) +static void write_typelib(int res_no, const WCHAR *filename, const WCHAR *type) { DWORD written; HANDLE file; @@ -785,8 +786,8 @@ static void write_typelib(int res_no, const WCHAR *filename) file = CreateFileW( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); if (file == INVALID_HANDLE_VALUE) return; - res = FindResourceA( GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(res_no), "TYPELIB" ); - ok( res != 0, "couldn't find resource\n" ); + res = FindResourceW( GetModuleHandleA(NULL), (const WCHAR *)MAKEINTRESOURCE(res_no), type ); + ok( res != 0, "couldn't find resource %d %s\n", res_no, debugstr_w(type) ); ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); @@ -820,12 +821,12 @@ static void test_invoke_func(ITypeInfo *typeinfo) ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres); } -static WCHAR *create_test_typelib(int res_no) +static WCHAR *create_test_typelib(int res_no, const WCHAR *type) { static WCHAR filename[MAX_PATH]; GetTempFileNameW(L".", L"tlb", 0, filename); - write_typelib(res_no, filename); + write_typelib(res_no, filename, type); return filename; } @@ -1028,7 +1029,7 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); - filename = create_test_typelib(3); + filename = create_test_typelib(3, L"TYPELIB"); hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5036,7 +5037,7 @@ static void test_register_typelib(BOOL system_registration) if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - filename = create_test_typelib(3); + filename = create_test_typelib(3, L"TYPELIB"); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(hr == S_OK, "got %08x\n", hr); @@ -5787,8 +5788,8 @@ static void test_LoadRegTypeLib(void) DeleteFileA("main.manifest"); /* create typelib file */ - write_typelib(1, L"test_actctx_tlb.tlb"); - write_typelib(3, L"test_actctx_tlb2.tlb"); + write_typelib(1, L"test_actctx_tlb.tlb", L"TYPELIB"); + write_typelib(3, L"test_actctx_tlb2.tlb", L"TYPELIB"); hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); @@ -6388,11 +6389,11 @@ static void test_dep(void) { trace("Starting typelib dependency tests\n"); - refFilename = create_test_typelib(2); + refFilename = create_test_typelib(4, L"TL"); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); - hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_ISimpleIface, &preftInfo); + hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_IBaseIface, &preftInfo); ok(hr == S_OK, "got %08x\n", hr); GetTempFileNameA(".", "tlb", 0, filename); @@ -6448,13 +6449,39 @@ static void test_dep(void) { ok(hr == S_OK, "got: %x\n", hr); hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); - ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + ok(hr == TYPE_E_CANTLOADLIBRARY, "got: %x\n", hr); ITypeInfo_Release(ptInfo); if(ptInfoExt) ITypeInfo_Release(ptInfoExt); ITypeLib_Release(ptLib); + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &ptLib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfo(ptLib, 0, &ptInfo); + ok(hr == S_OK, "GetTypeInfo failed: %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(ptInfo, 0, &refType); + ok(hr == S_OK, "GetRefTypeOfImplType failed: %08x\n", hr); + + hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); + ok(hr == TYPE_E_CANTLOADLIBRARY, "got: %x\n", hr); + + refFilename = create_test_typelib(4, L"TL"); + hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); + ok(hr == S_OK, "got: %x\n", hr); + ITypeInfo_Release(ptInfoExt); + + ITypeLib_Release(preftLib); + DeleteFileW(refFilename); + + ITypeInfo_Release(ptInfo); + ITypeLib_Release(ptLib); + DeleteFileW(filenameW); } @@ -6580,7 +6607,7 @@ START_TEST(typelib) test_SetDocString(); test_FindName(); - if ((filename = create_test_typelib(2))) + if ((filename = create_test_typelib(2, L"TYPELIB"))) { test_dump_typelib( filename ); DeleteFileW( filename );

1 0