September 2020 - Wine-commits

Alexandre Julliard : ntdll: Use the standard code path to load ntdll.dll.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 7cec3dc28492f2d43d706cde9afa4fcbc4ae87c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cec3dc28492f2d43d706cde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:23 2020 +0200 ntdll: Use the standard code path to load ntdll.dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 20 ++++------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 50 ------------------------------------------ 3 files changed, 4 insertions(+), 67 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b8500b5772..6890a08428 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1438,24 +1438,12 @@ found: static void load_ntdll(void) { NTSTATUS status; + SECTION_IMAGE_INFORMATION info; void *module; - int fd; - char *name = build_path( dll_dir, "ntdll.dll" ); + char *name = build_path( dll_dir, "ntdll.dll.so" ); - if ((fd = open( name, O_RDONLY )) != -1) - { - struct stat st; - fstat( fd, &st ); - if (!(status = virtual_map_ntdll( fd, &module ))) - add_builtin_module( module, NULL, &st ); - close( fd ); - } - else - { - free( name ); - name = build_path( dll_dir, "ntdll.dll.so" ); - status = dlopen_dll( name, &module ); - } + name[strlen(name) - 3] = 0; /* remove .so */ + status = open_builtin_file( name, &module, &info ); if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 88a726d244..f99c13fe2a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -177,7 +177,6 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 336666c358..d79e3de662 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2436,56 +2436,6 @@ void virtual_init(void) } -/*********************************************************************** - * virtual_map_ntdll - * - * Map ntdll, used instead of virtual_map_section() because some things are not initialized yet. - */ -NTSTATUS virtual_map_ntdll( int fd, void **module ) -{ - IMAGE_DOS_HEADER dos; - IMAGE_NT_HEADERS nt; - NTSTATUS status; - SIZE_T size; - void *base; - unsigned int vprot; - struct file_view *view; - - /* load the headers */ - - size = pread( fd, &dos, sizeof(dos), 0 ); - if (size < sizeof(dos)) return STATUS_INVALID_IMAGE_FORMAT; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; - - size = pread( fd, &nt, sizeof(nt), dos.e_lfanew ); - if (size < sizeof(nt)) return STATUS_INVALID_IMAGE_PROTECT; - if (nt.Signature != IMAGE_NT_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; - if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) return STATUS_INVALID_IMAGE_FORMAT; -#ifdef __i386__ - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_I386) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__x86_64__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__arm__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && - nt.FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB && - nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARMNT) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__aarch64__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM64) return STATUS_INVALID_IMAGE_FORMAT; -#endif - - base = (void *)nt.OptionalHeader.ImageBase; - size = ROUND_SIZE( 0, nt.OptionalHeader.SizeOfImage ); - vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; - - status = map_view( &view, base, size, FALSE, vprot, 0 ); - if (status == STATUS_CONFLICTING_ADDRESSES) - ERR( "couldn't load ntdll at preferred address %p\n", base ); - if (status) return status; - *module = view->base; - return map_image_into_view( view, fd, base, nt.OptionalHeader.SizeOfHeaders, 0, -1, FALSE ); -} - - /*********************************************************************** * get_system_affinity_mask */

1 0

Roberto Pungartnik : po: Brazilian Portuguese update.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 2ef75f6acdd4224538a38f5619c85d74c32c9545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef75f6acdd4224538a38f56… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Sep 26 17:48:42 2020 -0300 po: Brazilian Portuguese update. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index e8f5527a5a..9924cca444 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-09-15 21:16-0300\n" +"PO-Revision-Date: 2020-09-25 18:58-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -6945,16 +6945,12 @@ msgid "No Signature found in file.\n" msgstr "Nenhuma Assinatura encontrada no arquivo.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Nível inválido.\n" +msgstr "Chamada inválida.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Valor não disponível.\n" +msgstr "Recurso atualmente não disponível.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30

1 0

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: c1c86f668636776c90af7f5351f7ce2fba26759f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c86f668636776c90af7f53… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Sep 26 17:54:11 2020 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 521 ++++++++++++++++++++++----------------------------------------- 1 file changed, 178 insertions(+), 343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1c86f668636776c90af…

1 0

Chao Long : ole32: Check for NULL parameter in ReleaseStgMedium().
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 3956b5260302926c09f571df79b3431aca0c1479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3956b5260302926c09f571df… Author: Chao Long <longchao(a)uniontech.com> Date: Mon Sep 28 09:31:11 2020 +0100 ole32: Check for NULL parameter in ReleaseStgMedium(). libcef can call ReleaseStgMedium( NULL ) Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 ++ dlls/ole32/tests/ole2.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 15c4f8234f..4464ba0714 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2023,6 +2023,8 @@ found: void WINAPI ReleaseStgMedium( STGMEDIUM* pmedium) { + if (!pmedium) return; + switch (pmedium->tymed) { case TYMED_HGLOBAL: diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index cd7eb83923..42e377f8a6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4610,6 +4610,11 @@ static void test_OleCreateStaticFromData(void) IStorage_Release(storage); } +static void test_ReleaseStgMedium( void ) +{ + ReleaseStgMedium( NULL ); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4661,6 +4666,7 @@ START_TEST(ole2) test_data_cache_save_data(); test_data_cache_contents(); test_OleCreateStaticFromData(); + test_ReleaseStgMedium(); CoUninitialize(); }

1 0

Kevin Puetz : oleaut32/tests: Include [dual] interface in test_dump_typelib.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: e6108e17a55e0889ec9970fe7aa41308c5893b11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6108e17a55e0889ec9970fe… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:50 2020 +0100 oleaut32/tests: Include [dual] interface in test_dump_typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 71 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9c341b4df8..ac17877978 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4345,13 +4345,14 @@ static void test_dump_typelib(const WCHAR *name) ITypeLib *lib; int count; int i; + HREFTYPE hRefType = 0; OLE_CHECK(LoadTypeLib(name, &lib)); printf("/*** Autogenerated data. Do not edit, change the generator above instead. ***/\n"); count = ITypeLib_GetTypeInfoCount(lib); - for (i = 0; i < count; i++) + for (i = 0; i < count;) { TYPEATTR *attr; BSTR name; @@ -4363,6 +4364,13 @@ static void test_dump_typelib(const WCHAR *name) " \"%s\",\n", dump_string(name)); OLE_CHECK(ITypeLib_GetTypeInfo(lib, i, &info)); + if (hRefType) + { + ITypeInfo *refInfo; + OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); + ITypeInfo_Release(info); + info = refInfo; + } OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ -4446,6 +4454,18 @@ static void test_dump_typelib(const WCHAR *name) if (attr->cVars) printf(" },\n"); printf("},\n"); + + if ((attr->typekind == TKIND_DISPATCH) && (attr->wTypeFlags & TYPEFLAG_FDUAL) && + SUCCEEDED(ITypeInfo_GetRefTypeOfImplType(info, -1, &hRefType))) + { + /* next iteration dumps hRefType, the TKIND_INTERFACE reference underneath this [dual] TKIND_DISPATCH */ + } + else + { + i++; /* move to the next item in lib */ + hRefType = 0; + } + ITypeInfo_ReleaseTypeAttr(info, attr); ITypeInfo_Release(info); SysFreeString(name); @@ -4805,6 +4825,27 @@ static const type_info info[] = { }, { /* vars */ }, }, +{ + "IDualIface", + "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {-1, 0, 0} + }, + { /* names */ + "Test", + NULL, + }, + }, + }, + { /* vars */ }, +}, { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", @@ -5271,12 +5312,13 @@ static const type_info info[] = { static void test_dump_typelib(const WCHAR *name) { ITypeLib *typelib; - int ticount = ARRAY_SIZE(info); CUSTDATA cust_data; - int iface, func, var; + int iface = 0, func, var; + HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; TLIBATTR *libattr; + const type_info *ti; ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); @@ -5286,10 +5328,8 @@ static void test_dump_typelib(const WCHAR *name) skip("ignoring VARDESC::oInst, (libattr->syskind expected %d got %d)\n", info_syskind, libattr->syskind); } - expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); - for (iface = 0; iface < ticount; iface++) + for (ti = info; ti != info + ARRAY_SIZE(info); ti++) { - const type_info *ti = &info[iface]; ITypeInfo2 *typeinfo2; ITypeInfo *typeinfo; TYPEATTR *typeattr; @@ -5298,6 +5338,13 @@ static void test_dump_typelib(const WCHAR *name) trace("Interface %s\n", ti->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); + if (hRefType) + { + ITypeInfo *refInfo; + ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); + ITypeInfo_Release(typeinfo); + typeinfo = refInfo; + } ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, &help_ctx, NULL)); expect_wstr_acpval(bstrIfName, ti->name); SysFreeString(bstrIfName); @@ -5438,11 +5485,23 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo_ReleaseVarDesc(typeinfo, desc); } + if ((typeattr->typekind == TKIND_DISPATCH) && (typeattr->wTypeFlags & TYPEFLAG_FDUAL) && + SUCCEEDED(ITypeInfo_GetRefTypeOfImplType(typeinfo, -1, &hRefType))) + { + /* next iteration dumps hRefType, the TKIND_INTERFACE reference underneath this [dual] TKIND_DISPATCH */ + } + else + { + iface++; /* move to the next item in typelib */ + hRefType = 0; + } + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo2_Release(typeinfo2); ITypeInfo_Release(typeinfo); } + expect_eq(ITypeLib_GetTypeInfoCount(typelib), iface, UINT, "%d"); ITypeLib_ReleaseTLibAttr(typelib, libattr); ITypeLib_Release(typelib); }

1 0

Kevin Puetz : oleaut32: FUNC_DISPATCH from dispinterface should have oVft == 0.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 03b1b3920c666807aab4c143ba8209442d38ccee URL: https://source.winehq.org/git/wine.git/?a=commit;h=03b1b3920c666807aab4c143… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:51 2020 +0100 oleaut32: FUNC_DISPATCH from dispinterface should have oVft == 0. A dispinterface has no vtbl beyond IDispatch itself. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 06667850a3..540d91f2eb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2465,7 +2465,10 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; ptfd->funcdesc.cParams = pFuncRec->nrargs ; ptfd->funcdesc.cParamsOpt = pFuncRec->nroargs ; - ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if (ptfd->funcdesc.funckind == FUNC_DISPATCH) + ptfd->funcdesc.oVft = 0; + else + ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -4179,7 +4182,10 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, pFuncDesc->funcdesc.callconv = pFunc->nacc & 0x7; pFuncDesc->funcdesc.cParams = pFunc->nacc >> 3; pFuncDesc->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if (pFuncDesc->funcdesc.funckind == FUNC_DISPATCH) + pFuncDesc->funcdesc.oVft = 0; + else + pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags;

1 0

Kevin Puetz : oleaut32: Overwrite return type when rewriting FUNCDESC to FUNC_DISPATCH.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 9bc78976d943e625a4933193693b211f47fc1353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc78976d943e625a4933193… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:52 2020 +0100 oleaut32: Overwrite return type when rewriting FUNCDESC to FUNC_DISPATCH. A [retval] parameter overwrites any return type, not just HRESULT. But HRESULT is special even without a [retval] to replace it; it's translated into pExcepInfo and so the return type becomes void. This rewriting should occur only for functions not originally defined as FUNC_DISPACH (e.g. inherited or [dual]). A FUNCDESC originally declared as a dispinterface is left as-is, and might e.g. return HRESULT. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 540d91f2eb..eaff9be77f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5855,11 +5855,13 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt } else dest->lprgelemdescParam = NULL; - /* special treatment for dispinterfaces: this makes functions appear - * to return their [retval] value when it is really returning an - * HRESULT */ - if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + /* special treatment for dispinterface FUNCDESC based on an interface FUNCDESC. + * This accounts for several arguments that are separate in the signature of + * IDispatch::Invoke, rather than passed in DISPPARAMS::rgvarg[] */ + if (dispinterface && (src->funckind != FUNC_DISPATCH)) { + /* functions that have a [retval] parameter return this value into pVarResult. + * [retval] is always the last parameter (if present) */ if (dest->cParams && (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) { @@ -5872,17 +5874,17 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return E_UNEXPECTED; } - /* copy last parameter to the return value. we are using a flat - * buffer so there is no danger of leaking memory in - * elemdescFunc */ + /* the type pointed to by this [retval] becomes elemdescFunc, + * i.e. the function signature's return type. + * We are using a flat buffer so there is no danger of leaking memory */ dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; /* remove the last parameter */ dest->cParams--; } - else - /* otherwise this function is made to appear to have no return - * value */ + else if (dest->elemdescFunc.tdesc.vt == VT_HRESULT) + /* Even if not otherwise replaced HRESULT is returned in pExcepInfo->scode, + * not pVarResult. So the function signature should show no return value. */ dest->elemdescFunc.tdesc.vt = VT_VOID; }

1 0

Kevin Puetz : oleaut32: Omit [lcid] parameter when rewriting FUNCDESC to FUNC_DISPATCH.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 269207e6fdfcf89091107e0192cc2304e765a2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=269207e6fdfcf89091107e01… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:53 2020 +0100 oleaut32: Omit [lcid] parameter when rewriting FUNCDESC to FUNC_DISPATCH. [lcid] parameters are supplied from IDispatch::Invoke's parameters, rather than via DISPPARAMS::rgvargs[] and should also be removed from the FUNC_DISPATCH translation. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eaff9be77f..54d020b7e9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5887,6 +5887,10 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt * not pVarResult. So the function signature should show no return value. */ dest->elemdescFunc.tdesc.vt = VT_VOID; + /* The now-last (except [retval], removed above) parameter might be labeled [lcid]. + * If so it will be supplied from Invoke(lcid), so also not via DISPPARAMS::rgvarg */ + if (dest->cParams && (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FLCID)) + dest->cParams--; } *dest_ptr = dest;

1 0

Kevin Puetz : oleaut32: Make GetNames omit same parameters as GetFuncDesc.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 477fc581de1196bb8359f7e32bc994e7f355ac79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477fc581de1196bb8359f7e3… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:54 2020 +0100 oleaut32: Make GetNames omit same parameters as GetFuncDesc. GetFuncDesc removes parameters which are handled specially by Invoke; GetNames should also consistently omit their names. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 110 +++++++++++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 44 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 54d020b7e9..989340de9c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6117,76 +6117,98 @@ static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, return TLB_AllocAndInitVarDesc(&pVDesc->vardesc, ppVarDesc); } -/* ITypeInfo_GetNames - * - * Retrieves the variable with the specified member ID (or the name of the - * property or method and its parameters) that correspond to the specified - * function ID. - */ -static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, - BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) +/* internal function to make the inherited interfaces' methods appear + * part of the interface, remembering if the top-level was dispinterface */ +static HRESULT typeinfo_getnames( ITypeInfo *iface, MEMBERID memid, BSTR *names, + UINT max_names, UINT *num_names, BOOL dispinterface) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - const TLBFuncDesc *pFDesc; - const TLBVarDesc *pVDesc; + ITypeInfoImpl *This = impl_from_ITypeInfo(iface); + const TLBFuncDesc *func_desc; + const TLBVarDesc *var_desc; int i; - TRACE("(%p) memid=0x%08x Maxname=%d\n", This, memid, cMaxNames); - if(!rgBstrNames) - return E_INVALIDARG; + *num_names = 0; - *pcNames = 0; - - pFDesc = TLB_get_funcdesc_by_memberid(This, memid); - if(pFDesc) + func_desc = TLB_get_funcdesc_by_memberid(This, memid); + if (func_desc) { - if(!cMaxNames || !pFDesc->Name) + UINT params = func_desc->funcdesc.cParams; + if (!max_names || !func_desc->Name) return S_OK; - *rgBstrNames = SysAllocString(TLB_get_bstr(pFDesc->Name)); - ++(*pcNames); + *names = SysAllocString(TLB_get_bstr(func_desc->Name)); + ++(*num_names); + + if (dispinterface && (func_desc->funcdesc.funckind != FUNC_DISPATCH)) + { + /* match the rewriting of special trailing parameters in TLB_AllocAndInitFuncDesc */ + if ((params > 0) && (func_desc->funcdesc.lprgelemdescParam[params - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + --params; /* Invoke(pVarResult) supplies the [retval] parameter, so it's hidden from DISPPARAMS */ + if ((params > 0) && (func_desc->funcdesc.lprgelemdescParam[params - 1].u.paramdesc.wParamFlags & PARAMFLAG_FLCID)) + --params; /* Invoke(lcid) supplies the [lcid] parameter, so it's hidden from DISPPARAMS */ + } - for(i = 0; i < pFDesc->funcdesc.cParams; ++i){ - if(*pcNames >= cMaxNames || !pFDesc->pParamDesc[i].Name) + for (i = 0; i < params; i++) + { + if (*num_names >= max_names || !func_desc->pParamDesc[i].Name) return S_OK; - rgBstrNames[*pcNames] = SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i].Name)); - ++(*pcNames); + names[*num_names] = SysAllocString(TLB_get_bstr(func_desc->pParamDesc[i].Name)); + ++(*num_names); } return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This, memid); - if(pVDesc) + var_desc = TLB_get_vardesc_by_memberid(This, memid); + if (var_desc) { - *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); - *pcNames=1; + *names = SysAllocString(TLB_get_bstr(var_desc->Name)); + *num_names = 1; } else { - if(This->impltypes && - (This->typeattr.typekind == TKIND_INTERFACE || This->typeattr.typekind == TKIND_DISPATCH)) { - /* recursive search */ - ITypeInfo *pTInfo; - HRESULT result; - result = ITypeInfo2_GetRefTypeInfo(iface, This->impltypes[0].hRef, &pTInfo); - if(SUCCEEDED(result)) - { - result=ITypeInfo_GetNames(pTInfo, memid, rgBstrNames, cMaxNames, pcNames); - ITypeInfo_Release(pTInfo); - return result; - } - WARN("Could not search inherited interface!\n"); + if (This->impltypes && + (This->typeattr.typekind == TKIND_INTERFACE || This->typeattr.typekind == TKIND_DISPATCH)) + { + /* recursive search */ + ITypeInfo *parent; + HRESULT result; + result = ITypeInfo_GetRefTypeInfo(iface, This->impltypes[0].hRef, &parent); + if (SUCCEEDED(result)) + { + result = typeinfo_getnames(parent, memid, names, max_names, num_names, dispinterface); + ITypeInfo_Release(parent); + return result; + } + WARN("Could not search inherited interface!\n"); } else { - WARN("no names found\n"); + WARN("no names found\n"); } - *pcNames=0; + *num_names = 0; return TYPE_E_ELEMENTNOTFOUND; } return S_OK; } +/* ITypeInfo_GetNames + * + * Retrieves the variable with the specified member ID (or the name of the + * property or method and its parameters) that correspond to the specified + * function ID. + */ +static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, + BSTR *names, UINT max_names, UINT *num_names) +{ + ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + + TRACE("(%p) memid 0x%08x max_names %d\n", This, memid, max_names); + + if (!names) return E_INVALIDARG; + + return typeinfo_getnames((ITypeInfo *)iface, memid, names, max_names, num_names, + This->typeattr.typekind == TKIND_DISPATCH); +} /* ITypeInfo::GetRefTypeOfImplType *

1 0

Kevin Puetz : oleaut32/tests: Add tests for rewriting FUNCDESC to FUNC_DISPATCH.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 10b3bbe138ae59cc96ca7f94183767f0aa84401f URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b3bbe138ae59cc96ca7f94… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:55 2020 +0100 oleaut32/tests: Add tests for rewriting FUNCDESC to FUNC_DISPATCH. Add examples in test_tlb which exercise FUNCDESC rewriting in: 1. dispinterface FUNC_DISPATCH declarations 2. dual interface 3. dispinterface which implements another interface Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 36 +++ dlls/oleaut32/tests/typelib.c | 653 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 689 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10b3bbe138ae59cc96ca…

1 0