November 2021 - Wine-commits

Eric Pouech : dbghelp: Detect collision by looking at module's base address in SymLoadModuleEx().
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 1465c7de2a533ea6bda9b939c54f969dac29f2bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1465c7de2a533ea6bda9b939… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:43 2021 +0100 dbghelp: Detect collision by looking at module's base address in SymLoadModuleEx(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 73 +++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5c439dd1d3c..64d4e3113d5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -900,7 +900,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam PMODLOAD_DATA Data, DWORD Flags) { struct process* pcs; - struct module* module = NULL; + struct module* module = NULL; + struct module* altmodule; TRACE("(%p %p %s %s %s %08x %p %08x)\n", hProcess, hFile, debugstr_w(wImageName), debugstr_w(wModuleName), @@ -912,16 +913,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!(pcs = process_find_by_handle(hProcess))) return 0; - if (Flags & SLMFLAG_VIRTUAL) - { - if (!wImageName) return 0; - module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0, IMAGE_FILE_MACHINE_UNKNOWN); - if (!module) return 0; - if (wModuleName) module_set_module(module, wModuleName); - module->module.SymType = SymVirtual; - - return module->module.BaseOfImage; - } if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); @@ -930,31 +921,18 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam /* this is a Wine extension to the API just to redo the synchronisation */ if (!wImageName && !hFile) return 0; - /* check if the module is already loaded, or if it's a builtin PE module with - * an containing ELF module - */ - if (wImageName) + if (Flags & SLMFLAG_VIRTUAL) { - module = module_is_already_loaded(pcs, wImageName); - if (module) - { - if (module->module.BaseOfImage == BaseOfDll) - SetLastError(ERROR_SUCCESS); - else - { - /* native allows to load the same module at different addresses - * we don't support this for now - */ - SetLastError(ERROR_INVALID_PARAMETER); - FIXME("Reloading %s at different base address isn't supported\n", debugstr_w(module->modulename)); - } - return 0; - } - if (!module && module_is_container_loaded(pcs, wImageName, BaseOfDll)) - { - /* force the loading of DLL as builtin */ - module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); - } + if (!wImageName) return 0; + module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0, IMAGE_FILE_MACHINE_UNKNOWN); + if (!module) return 0; + module->module.SymType = SymVirtual; + } + /* check if it's a builtin PE module with a containing ELF module */ + else if (wImageName && module_is_container_loaded(pcs, wImageName, BaseOfDll)) + { + /* force the loading of DLL as builtin */ + module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll); } if (!module) { @@ -978,6 +956,31 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam module_set_module(module, wModuleName); if (wImageName) lstrcpynW(module->module.ImageName, wImageName, ARRAY_SIZE(module->module.ImageName)); + + for (altmodule = pcs->lmodules; altmodule; altmodule = altmodule->next) + { + if (altmodule != module && altmodule->type == module->type && + module->module.BaseOfImage >= altmodule->module.BaseOfImage && + module->module.BaseOfImage < altmodule->module.BaseOfImage + altmodule->module.ImageSize) + break; + } + if (altmodule) + { + /* we have a conflict as the new module cannot be found by its base address + * we need to get rid of one on the two modules + */ + /* loading same module at same address... don't change anything */ + if (module->module.BaseOfImage == altmodule->module.BaseOfImage) + { + module_remove(pcs, module); + SetLastError(ERROR_SUCCESS); + return 0; + } + module_remove(pcs, module); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0) module_load_debug(module); return module->module.BaseOfImage;

1 0

Eric Pouech : dbghelp: Improve collision handling in SymLoadModuleEx().
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: b65ef71fc0a7044557e0ba530e3b95497644867c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65ef71fc0a7044557e0ba53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:57 2021 +0100 dbghelp: Improve collision handling in SymLoadModuleEx(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 64d4e3113d5..fe65683c6e1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -969,6 +969,14 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam /* we have a conflict as the new module cannot be found by its base address * we need to get rid of one on the two modules */ + if (lstrcmpW(module->modulename, altmodule->modulename) != 0) + { + /* module overlaps an existing but different module... unload new module and return error */ + WARN("%ls overlaps %ls\n", module->modulename, altmodule->modulename); + module_remove(pcs, module); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } /* loading same module at same address... don't change anything */ if (module->module.BaseOfImage == altmodule->module.BaseOfImage) { @@ -976,9 +984,10 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam SetLastError(ERROR_SUCCESS); return 0; } - module_remove(pcs, module); - SetLastError(ERROR_INVALID_PARAMETER); - return 0; + /* replace old module with new one, which will look like a shift of base address */ + WARN("Shift module %ls from %I64x to %I64x\n", + module->modulename, altmodule->module.BaseOfImage, module->module.BaseOfImage); + module_remove(pcs, altmodule); } if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0)

1 0

Alistair Leslie-Hughes : include: Add more DBPROPVAL_ defines.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: b2f12a3424064c8d5f87d7b391de7679153c1558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2f12a3424064c8d5f87d7b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:35 2021 +1100 include: Add more DBPROPVAL_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index cbdb89d23b2..d5b903138d6 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -569,6 +569,15 @@ cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)" cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_RT_FREETHREAD __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_RT_APTMTTHREAD __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_RT_SINGLETHREAD __MSABI_LONG(0x00000004)") + +cpp_quote("#define DBPROPVAL_LM_NONE __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_LM_READ __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_LM_INTENT __MSABI_LONG(0x00000004)") +cpp_quote("#define DBPROPVAL_LM_RITE __MSABI_LONG(0x00000008)") + cpp_quote("#define DB_MODE_READ 0x01") cpp_quote("#define DB_MODE_WRITE 0x02") cpp_quote("#define DB_MODE_READWRITE 0x03")

1 0

Alistair Leslie-Hughes : msdasql: Add ICommandWithParameters to command interface.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 0d29647f07954ede073d5d7fa62dfa46f5936d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d29647f07954ede073d5d7f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:36 2021 +1100 msdasql: Add ICommandWithParameters to command interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 62 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 67 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 82693115b8a..3829f8f946f 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -426,6 +426,7 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; + ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -455,6 +456,11 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } +static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -483,6 +489,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &rowset->ICommandWithParameters_iface; + } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -791,6 +801,57 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) @@ -810,6 +871,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; + msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b0e13b72589..37230be04cb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -193,12 +193,17 @@ static void test_command_interfaces(IUnknown *cmd) ICommandStream *commandstream; IColumnsInfo *colinfo; IMultipleResults *multiple; + ICommandWithParameters *cmdwithparams; IUnknown *unk; hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); ICommandProperties_Release(commandProp); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandWithParameters, (void**)&cmdwithparams); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandWithParameters_Release(cmdwithparams); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); ok(hr == S_OK, "got 0x%08x\n", hr); ICommandText_Release(comand_text);

1 0

Alistair Leslie-Hughes : msdasql: Support NULL dialect in GetCommandText.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 5f8e3a0c74ac4a9289a4a75720e463c684e88e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8e3a0c74ac4a9289a4a757… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:37 2021 +1100 msdasql: Support NULL dialect in GetCommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 2 +- dlls/msdasql/tests/provider.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3829f8f946f..196fd1c6b81 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -910,7 +910,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (dialect && !IsEqualGUID(&DBGUID_DEFAULT, dialect)) { *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 37230be04cb..a0b11194f2b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -265,6 +265,12 @@ if (0) hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, NULL, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + /* dialect empty value */ hr = ICommandText_GetCommandText(comand_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : Revert "oleaut32: Implement TLB dependencies lookup in resources."
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: f0f985b38c66a525ce543fe2adc0658b246a9481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f985b38c66a525ce543fe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 10:12:40 2021 +0100 Revert "oleaut32: Implement TLB dependencies lookup in resources." This reverts commit 9e4590ff671f7357c7574599ca163fed5e180661. The tests don't confirm it. The real issue is probably addressed by the typelib cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 55 ------------------------------------------------- 1 file changed, 55 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e050726a4ee..97b6786feff 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7878,44 +7878,6 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, return E_FAIL; } -struct search_res_tlb_params -{ - const GUID *guid; - ITypeLib *pTLib; -}; - -static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) -{ - struct search_res_tlb_params *params = (LPVOID)lParam; - WCHAR szPath[MAX_PATH+1]; - ITypeLib *pTLib = NULL; - HRESULT ret; - DWORD len; - - if (IS_INTRESOURCE(lpszName) == FALSE) - return TRUE; - - if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) - return TRUE; - - if (swprintf(szPath + len, ARRAY_SIZE(szPath) - len, L"\\%d", LOWORD(lpszName)) < 0) - return TRUE; - - ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); - if (SUCCEEDED(ret)) - { - ITypeLibImpl *impl = impl_from_ITypeLib(pTLib); - if (IsEqualGUID(params->guid, impl->guid)) - { - params->pTLib = pTLib; - return FALSE; /* stop enumeration */ - } - ITypeLib_Release(pTLib); - } - - return TRUE; -} - /* ITypeInfo::GetRefTypeInfo * * If a type description references other type descriptions, it retrieves @@ -8033,23 +7995,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( } LeaveCriticalSection(&cache_section); - if (!pTLib) - { - 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, L"TYPELIB", search_res_tlb, (LONG_PTR)&params); - if(params.pTLib) - { - pTLib = params.pTLib; - result = S_OK; - } - } - if (!pTLib) { BSTR libnam;

1 0

Alexandre Julliard : oleaut32/tests: Use TYPELIB resource type for all typelibs.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 20eabdf4e9c95a673baa22b11659d77533b7fdfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=20eabdf4e9c95a673baa22b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 10:18:12 2021 +0100 oleaut32/tests: Use TYPELIB resource type for all typelibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.rc | 2 +- dlls/oleaut32/tests/typelib.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.rc b/dlls/oleaut32/tests/tmarshal.rc index 8ddfd8a5295..dbe0b0e28f2 100644 --- a/dlls/oleaut32/tests/tmarshal.rc +++ b/dlls/oleaut32/tests/tmarshal.rc @@ -37,4 +37,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 3 TYPELIB test_reg.tlb /* @makedep: test_simple.tlb */ -4 TL test_simple.tlb +4 TYPELIB test_simple.tlb diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index fd83c3abb8a..ed830f44a94 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -768,7 +768,7 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } -static void write_typelib(int res_no, const WCHAR *filename, const WCHAR *type) +static void write_typelib(int res_no, const WCHAR *filename) { DWORD written; HANDLE file; @@ -778,8 +778,8 @@ static void write_typelib(int res_no, const WCHAR *filename, const WCHAR *type) 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 = FindResourceW( GetModuleHandleA(NULL), (const WCHAR *)MAKEINTRESOURCE(res_no), type ); - ok( res != 0, "couldn't find resource %d %s\n", res_no, debugstr_w(type) ); + res = FindResourceW( GetModuleHandleA(NULL), (const WCHAR *)MAKEINTRESOURCE(res_no), L"TYPELIB" ); + ok( res != 0, "couldn't find typelib resource %d\n", res_no ); 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" ); @@ -813,12 +813,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, const WCHAR *type) +static WCHAR *create_test_typelib(int res_no) { static WCHAR filename[MAX_PATH]; GetTempFileNameW(L".", L"tlb", 0, filename); - write_typelib(res_no, filename, type); + write_typelib(res_no, filename); return filename; } @@ -1025,7 +1025,7 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); - filename = create_test_typelib(3, L"TYPELIB"); + filename = create_test_typelib(3); hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -6702,7 +6702,7 @@ static void test_register_typelib(BOOL system_registration) if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - filename = create_test_typelib(3, L"TYPELIB"); + filename = create_test_typelib(3); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(hr == S_OK, "got %08x\n", hr); @@ -7665,8 +7665,8 @@ static void test_LoadRegTypeLib(void) DeleteFileA("main.manifest"); /* create typelib file */ - write_typelib(1, L"test_actctx_tlb.tlb", L"TYPELIB"); - write_typelib(3, L"test_actctx_tlb2.tlb", L"TYPELIB"); + write_typelib(1, L"test_actctx_tlb.tlb"); + write_typelib(3, L"test_actctx_tlb2.tlb"); hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); @@ -8266,7 +8266,7 @@ static void test_dep(void) { trace("Starting typelib dependency tests\n"); - refFilename = create_test_typelib(4, L"TL"); + refFilename = create_test_typelib(4); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); @@ -8345,7 +8345,7 @@ static void test_dep(void) { hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); ok(hr == TYPE_E_CANTLOADLIBRARY, "got: %x\n", hr); - refFilename = create_test_typelib(4, L"TL"); + refFilename = create_test_typelib(4); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); @@ -8561,7 +8561,7 @@ START_TEST(typelib) test_SetDocString(); test_FindName(); - if ((filename = create_test_typelib(2, L"TYPELIB"))) + if ((filename = create_test_typelib(2))) { test_dump_typelib( filename ); DeleteFileW( filename );

1 0

Alexandre Julliard : makefiles: Directly generate resources also for non-registered typelibs.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 04d8725080fdc1c97fcd04065acf6b30f42057a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d8725080fdc1c97fcd0406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 10:22:51 2021 +0100 makefiles: Directly generate resources also for non-registered typelibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml.rc | 3 --- dlls/mshtml/tests/rsrc.rc | 3 --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 2 +- dlls/msi/tests/rsrc.rc | 22 ---------------------- dlls/oleaut32/tests/test_reg.idl | 1 + dlls/oleaut32/tests/test_simple.idl | 5 ++++- dlls/oleaut32/tests/test_tlb.idl | 10 ++++++---- dlls/oleaut32/tests/tmarshal.rc | 12 ------------ programs/wscript/Makefile.in | 3 --- programs/wscript/rsrc.rc | 20 -------------------- tools/makedep.c | 28 +++------------------------- tools/widl/widl.c | 1 + tools/widl/write_msft.c | 3 ++- 14 files changed, 18 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04d8725080fdc1c97fcd…

1 0

Alexandre Julliard : winebuild: Escape invalid characters in the dll name for static import libraries.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 32cfdb549634dbd8ccf4b36a822905af4cc2c6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cfdb549634dbd8ccf4b36a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 16:41:16 2021 +0100 winebuild: Escape invalid characters in the dll name for static import libraries. This is necessary for things like vulkan-1.dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 94 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7972fc7b1d9..8e285b19872 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -212,6 +212,64 @@ static inline ORDDEF *find_export( const char *name, ORDDEF **table, int size ) return res ? *res : NULL; } +static const char valid_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_."; + +/* encode a dll name into a linker-compatible name */ +static char *encode_dll_name( const char *name ) +{ + char *p, *ret; + int len = strlen(name); + + if (strendswith( name, ".dll" )) len -= 4; + if (strspn( name, valid_chars ) >= len) return strmake( "%.*s", len, name ); + + ret = p = xmalloc( len * 4 + 1 ); + for ( ; len > 0; len--, name++) + { + if (!strchr( valid_chars, *name )) p += sprintf( p, "$x%02x", *name ); + else *p++ = *name; + } + *p = 0; + return ret; +} + +/* decode a linker-compatible dll name */ +static char *decode_dll_name( const char **name ) +{ + const char *src = *name; + char *p, *ret; + + ret = p = xmalloc( strlen( src ) + 5 ); + for ( ; *src; src++, p++) + { + if (*src != '$') + { + *p = *src; + } + else if (src[1] == 'x') /* hex escape */ + { + int val = 0; + src += 2; + if (*src >= '0' && *src <= '9') val += *src - '0'; + else if (*src >= 'A' && *src <= 'F') val += *src - 'A' + 10; + else if (*src >= 'a' && *src <= 'f') val += *src - 'a' + 10; + else return NULL; + val *= 16; + src++; + if (*src >= '0' && *src <= '9') val += *src - '0'; + else if (*src >= 'A' && *src <= 'F') val += *src - 'A' + 10; + else if (*src >= 'a' && *src <= 'f') val += *src - 'a' + 10; + else return NULL; + *p = val; + } + else break; /* end of dll name */ + } + *p = 0; + if (!strchr( ret, '.' )) strcpy( p, ".dll" ); + *name = src; + return ret; +} + /* free an import structure */ static void free_imports( struct import *imp ) { @@ -385,21 +443,20 @@ void add_extra_ld_symbol( const char *name ) } /* retrieve an imported dll, adding one if necessary */ -struct import *add_static_import_dll( const char *name ) +static struct import *add_static_import_dll( const char *name ) { struct import *import; - char *dll_name = get_dll_name( name, NULL ); - if ((import = find_import_dll( dll_name ))) return import; + if ((import = find_import_dll( name ))) return import; import = xmalloc( sizeof(*import) ); memset( import, 0, sizeof(*import) ); - import->dll_name = dll_name; - import->full_name = xstrdup( dll_name ); - import->c_name = make_c_identifier( dll_name ); + import->dll_name = xstrdup( name ); + import->full_name = xstrdup( name ); + import->c_name = make_c_identifier( name ); - if (is_delayed_import( dll_name )) + if (is_delayed_import( name )) list_add_tail( &dll_delayed, &import->entry ); else list_add_tail( &dll_imports, &import->entry ); @@ -426,21 +483,21 @@ static void add_import_func( struct import *imp, const char *name, const char *e /* add an import for an undefined function of the form __wine$func$ */ static void add_undef_import( const char *name, int is_ordinal ) { - char *p, *dll_name = xstrdup( name ); + char *dll_name = decode_dll_name( &name ); int ordinal = 0; struct import *import; - if (!(p = strchr( dll_name, '$' ))) return; - *p++ = 0; - while (*p >= '0' && *p <= '9') ordinal = 10 * ordinal + *p++ - '0'; - if (*p != '$') return; - p++; + if (!dll_name) return; + if (*name++ != '$') return; + while (*name >= '0' && *name <= '9') ordinal = 10 * ordinal + *name++ - '0'; + if (*name++ != '$') return; import = add_static_import_dll( dll_name ); if (is_ordinal) - add_import_func( import, NULL, xstrdup( p ), ordinal, 0 ); + add_import_func( import, NULL, xstrdup( name ), ordinal, 0 ); else - add_import_func( import, xstrdup( p ), NULL, ordinal, 0 ); + add_import_func( import, xstrdup( name ), NULL, ordinal, 0 ); + free( dll_name ); } /* check if the spec file exports any stubs */ @@ -1670,14 +1727,9 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) /* create a Unix-style import library */ static void build_unix_import_lib( DLLSPEC *spec ) { - static const char valid_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._@"; int i, total; const char *name, *prefix; - char *dll_name = xstrdup( spec->file_name ); - - if (strendswith( dll_name, ".dll" )) dll_name[strlen(dll_name) - 4] = 0; - if (strspn( dll_name, valid_chars ) < strlen( dll_name )) - fatal_error( "%s contains invalid characters\n", spec->file_name ); + char *dll_name = encode_dll_name( spec->file_name ); /* entry points */

1 0

Alexandre Julliard : makefiles: Use static importlibs on all platforms.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: a9b5bb326a1514e2c4185633ab34b22c9bbc9863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b5bb326a1514e2c4185633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 16:57:04 2021 +0100 makefiles: Use static importlibs on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 78 ++++++++++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d5412eccfa4..9ea46aed8d8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,19 +2189,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - { - if (is_cross || !*dll_ext || submakes[j]->staticimplib) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - { - strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); - if (needs_implib_symlink( submakes[j] )) - strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); - } - break; - } - - if ((lib = get_static_lib( submakes[j], name ))) break; + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + lib = get_static_lib( submakes[j], name ); + if (lib) break; } if (lib) @@ -2588,12 +2579,8 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[4]; - int i, count = 0; - - ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; - if (crosstarget) ext[count++] = "cross.a"; - if (needs_delay_lib( make )) ext[count++] = "delay.a"; + const char *lib, *dst, *ext[2] = { "a", "cross.a" }; + int i, count = 1 + !!crosstarget; for (i = 0; i < count; i++) { @@ -3320,42 +3307,27 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - if (*dll_ext && !make->implib_objs.count) - { - strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); - output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.def", make->importlib ), - strmake( "d%s/lib%s.def", so_dir, make->importlib )); - } - else + + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) { - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) - { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); - } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); + if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" );

1 0