October 2021 - Wine-Commits

Alexandre Julliard : winebuild: Add a more generic way to create directories and sections in fake dlls.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 2f0401c783bb426bc520fcaae18fb2e17fb3318e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f0401c783bb426bc520fcaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 12:47:59 2021 +0200 winebuild: Add a more generic way to create directories and sections in fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 214 +++++++++++++++++++++++++---------------------- 1 file changed, 114 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f0401c783bb426bc520…

1 0

Alexandre Julliard : setupapi: Try to extract 16-bit image also from .fake files.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 6cedb963e8b0951cd35d0af5e93d18185ede2421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cedb963e8b0951cd35d0af5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 14:23:59 2021 +0200 setupapi: Try to extract 16-bit image also from .fake files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 203d7c393ce..8ff29fb4f92 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -253,7 +253,8 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size ) st.st_size - header_size ) == st.st_size - header_size) { *data = file_buffer; - if (lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) + if ((lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) || + (lstrlenW(name) > 7 && !wcscmp( name + lstrlenW(name) - 7, L"16.fake" ))) extract_16bit_image( nt, data, size ); ret = 1; }

1 0

Alexandre Julliard : xaudio: Use the bundled FAudio and build with msvcrt.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: d8be85863fedf6982944d06ebd1ce5904cb3d4e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8be85863fedf6982944d06e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:48:26 2021 +0200 xaudio: Use the bundled FAudio and build with msvcrt. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 173 -------------------------------------- configure.ac | 55 ------------ dlls/x3daudio1_0/Makefile.in | 6 +- dlls/x3daudio1_1/Makefile.in | 6 +- dlls/x3daudio1_2/Makefile.in | 6 +- dlls/x3daudio1_3/Makefile.in | 6 +- dlls/x3daudio1_4/Makefile.in | 6 +- dlls/x3daudio1_5/Makefile.in | 6 +- dlls/x3daudio1_6/Makefile.in | 6 +- dlls/x3daudio1_7/Makefile.in | 6 +- dlls/xactengine2_0/Makefile.in | 7 +- dlls/xactengine2_4/Makefile.in | 7 +- dlls/xactengine2_7/Makefile.in | 7 +- dlls/xactengine2_9/Makefile.in | 7 +- dlls/xactengine3_0/Makefile.in | 7 +- dlls/xactengine3_1/Makefile.in | 7 +- dlls/xactengine3_2/Makefile.in | 7 +- dlls/xactengine3_3/Makefile.in | 7 +- dlls/xactengine3_4/Makefile.in | 7 +- dlls/xactengine3_5/Makefile.in | 7 +- dlls/xactengine3_6/Makefile.in | 7 +- dlls/xactengine3_7/Makefile.in | 7 +- dlls/xactengine3_7/xact_dll.c | 14 ++- dlls/xapofx1_1/Makefile.in | 7 +- dlls/xapofx1_2/Makefile.in | 7 +- dlls/xapofx1_3/Makefile.in | 7 +- dlls/xapofx1_4/Makefile.in | 7 +- dlls/xapofx1_5/Makefile.in | 7 +- dlls/xaudio2_0/Makefile.in | 7 +- dlls/xaudio2_1/Makefile.in | 7 +- dlls/xaudio2_2/Makefile.in | 7 +- dlls/xaudio2_3/Makefile.in | 7 +- dlls/xaudio2_4/Makefile.in | 7 +- dlls/xaudio2_5/Makefile.in | 7 +- dlls/xaudio2_6/Makefile.in | 7 +- dlls/xaudio2_7/Makefile.in | 7 +- dlls/xaudio2_7/compat.c | 42 --------- dlls/xaudio2_7/x3daudio.c | 7 -- dlls/xaudio2_7/xapo.c | 13 --- dlls/xaudio2_7/xapofx.c | 2 - dlls/xaudio2_7/xaudio_allocator.c | 2 - dlls/xaudio2_7/xaudio_dll.c | 79 +---------------- dlls/xaudio2_7/xaudio_private.h | 6 -- dlls/xaudio2_8/Makefile.in | 7 +- dlls/xaudio2_9/Makefile.in | 7 +- include/config.h.in | 19 ----- 46 files changed, 80 insertions(+), 569 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8be85863fedf6982944…

1 0

Paul Gofman : include: Update struct _LDR_DDAG_NODE definition.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: a04db0814a4b59728e039ff40007de66dc12fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a04db0814a4b59728e039ff4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 21 15:47:25 2021 +0300 include: Update struct _LDR_DDAG_NODE definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON

1 0

Bernhard Kölbl : oleaut32: Allow the registration of 64bit typelibs from a 32bit context.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: c159f5438aab5eeb795955d9270892e5c2d38cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c159f5438aab5eeb795955d9… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Oct 20 16:21:38 2021 +0200 oleaut32: Allow the registration of 64bit typelibs from a 32bit context. Windows allows the registration of 64bit typelibs from 32bit programs even on a pure Win32 install. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51864 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 180 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 4 - 2 files changed, 180 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 825851c948e..78290c94dfe 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6848,6 +6848,185 @@ static void test_register_typelib(BOOL system_registration) DeleteFileW(filename); } +static void test_register_typelib_64(void) +{ + ICreateTypeInfo *createti, *createti_co; + ELEMDESC elemdesc[5], elemdesc2[5]; + FUNCDESC funcdesc, funcdesc2; + ITypeInfo *unknown, *tinfo; + ITypeLib *stdole, *typelib; + ICreateTypeLib2 *createtl; + WCHAR filename[MAX_PATH]; + HREFTYPE hreftype; + HRESULT hr; + + static const WCHAR wszStdOle2[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + + static OLECHAR typelibW[] = { 'W','i','n','e','T','e','s','t','T','y','p','e','L','i','b',0}; + static OLECHAR helpfileW[] = { 'C',':','\\','b','o','g','u','s','.','h','l','p',0 }; + static OLECHAR dllfileW[] = { 'C',':','\\','b','o','g','u','s','.','d','l','l',0 }; + static OLECHAR interface1W[] = { 'I','T','e','s','t','W','i','n','e','6', '4', 0}; + static OLECHAR coclassW[] = {'W','i','n','e','T','e','s','t','C','o','c','l','a','s','s',0 }; + static OLECHAR func1W[] = { 'f','u','n','c','1',0 }; + static OLECHAR func2W[] = { 'f','u','n','c','2',0 }; + static OLECHAR param1W[] = { 'p','a','r','a','m','1',0 }; + static OLECHAR param2W[] = { 'p','a','r','a','m','2',0 }; + static OLECHAR *names1[] = { func1W, param1W, param2W }; + static OLECHAR *names2[] = { func2W, param1W }; + static const GUID tlcustguid = { 0x512d2fec,0xcaf6,0x4c33,{0xbc,0x38,0x84,0x2f,0x2e,0x37,0x0d,0x7b} }; + static const GUID coclassguid = { 0x317cd4dd,0x0ce0,0x4525,{0x8d,0x33,0x68,0x14,0x4c,0x53,0x60,0xe9} }; + static const GUID interfaceguid = { 0x35cc5cea,0x11cc,0x4bca,{0x89,0x8c,0xf8,0x92,0x8e,0xb8,0xda,0x24} }; + + static const SYSKIND sys = SYS_WIN64; + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &unknown); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameW(L".", L"tlb", 0, filename); + + hr = CreateTypeLib2(sys, filename, &createtl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetName(createtl, typelibW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpStringDll(createtl, dllfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(createtl, &tlcustguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetVersion(createtl, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_LayOut(createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVersion(createti, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc[0].tdesc.vt = VT_UINT; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; + + elemdesc[1].tdesc.vt = VT_DECIMAL; + U(elemdesc[1]).idldesc.dwReserved = 0; + U(elemdesc[1]).idldesc.wIDLFlags = IDLFLAG_FIN; + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc.cParams = 2; + funcdesc.memid = 0x1; + funcdesc.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc.lprgelemdescParam = elemdesc; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc2[0].tdesc.vt = VT_UINT; + U(elemdesc2[0]).idldesc.dwReserved = 0; + U(elemdesc2[0]).idldesc.wIDLFlags = IDLFLAG_FIN | IDLFLAG_FOUT; + + memset(&funcdesc2, 0, sizeof(FUNCDESC)); + funcdesc2.funckind = FUNC_PUREVIRTUAL; + funcdesc2.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc2.cParams = 1; + funcdesc2.memid = 0x2; + funcdesc2.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc2.lprgelemdescParam = elemdesc2; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 3); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, names2, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FNONEXTENSIBLE | TYPEFLAG_FDUAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&tinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti_co, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti_co, tinfo, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti_co, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetImplTypeFlags(createti_co, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_Release(createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(createtl); + + trace("TypeLib to load: %ls\n", filename); + hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); + ok(hr == S_OK, "got: %08x\n", hr); + + if(typelib) + { + hr = RegisterTypeLib(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileW(filename); + return; + } + ok(hr == S_OK, "got: %08x\n", hr); + + ITypeLib_Release(typelib); + } + + DeleteFileW(filename); +} + static void test_LoadTypeLib(void) { ITypeLib *tl; @@ -8351,6 +8530,7 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); + test_register_typelib_64(); test_create_typelibs(); test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 70f15679811..ef546379174 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -629,10 +629,6 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifndef _WIN64 - if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; -#endif - get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK;

1 0

Paul Gofman : kernel32/tests: Add test for DDAG node dependencies structure.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 231542b39e8b17878fe1b9e6c75d7e095f192945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=231542b39e8b17878fe1b9e6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 21 15:47:26 2021 +0300 kernel32/tests: Add test for DDAG node dependencies structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 103 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 10 ++++- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 60654754302..fd369ff33e9 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1329,6 +1329,108 @@ static void test_LdrGetDllFullName(void) wine_dbgstr_w(expected_path), wine_dbgstr_w(path_buffer) ); } +static void test_ddag_node(void) +{ + static const struct + { + const WCHAR *dllname; + BOOL optional; + } + expected_exe_dependencies[] = + { + { L"advapi32.dll" }, + { L"msvcrt.dll", TRUE }, + { L"user32.dll", TRUE }, + }; + LDR_DDAG_NODE *node, *dep_node, *prev_node; + LDR_DATA_TABLE_ENTRY *mod, *mod2; + SINGLE_LIST_ENTRY *se, *se2; + LDR_DEPENDENCY *dep, *dep2; + NTSTATUS status; + unsigned int i; + HMODULE hexe; + + hexe = GetModuleHandleW( NULL ); + ok( !!hexe, "Got NULL exe handle.\n" ); + + status = LdrFindEntryForAddress( hexe, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + + if (!(node = mod->DdagNode)) + { + skip( "DdagNode is NULL, skipping tests.\n" ); + return; + } + + ok( !!node->Modules.Flink, "Got NULL module link.\n" ); + mod2 = CONTAINING_RECORD(node->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink); + ok( mod2 == mod || broken( (void **)mod2 == (void **)mod - 1 ), "Got unexpected mod2 %p, expected %p.\n", + mod2, mod ); + if (mod2 != mod) + { + win_skip( "Old LDR_DATA_TABLE_ENTRY structure, skipping tests.\n" ); + return; + } + ok( node->Modules.Flink->Flink == &node->Modules, "Expected one element in list.\n" ); + + ok( !node->IncomingDependencies.Tail, "Expected empty incoming dependencies list.\n" ); + + /* node->Dependencies.Tail is NULL on Windows 10 1507-1607 32 bit test, maybe due to broken structure layout. */ + ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail), + "Expected nonempty dependencies list.\n" ); + if (!node->Dependencies.Tail) + { + win_skip( "Empty dependencies list.\n" ); + return; + } + ok( node->LoadCount == -1, "Got unexpected LoadCount %d.\n", node->LoadCount ); + + prev_node = NULL; + se = node->Dependencies.Tail; + for (i = 0; i < ARRAY_SIZE(expected_exe_dependencies); ++i) + { + winetest_push_context( "Dep %u (%s)", i, debugstr_w(expected_exe_dependencies[i].dllname) ); + + se = se->Next; + + ok( !!se, "Got NULL list element.\n" ); + dep = CONTAINING_RECORD(se, LDR_DEPENDENCY, dependency_to_entry); + ok( dep->dependency_from == node, "Got unexpected dependency_from %p.\n", dep->dependency_from ); + ok( !!dep->dependency_to, "Got null dependency_to.\n" ); + dep_node = dep->dependency_to; + ok( !!dep_node, "Got NULL dep_node.\n" ); + + if (dep_node == prev_node && expected_exe_dependencies[i].optional) + { + win_skip( "Module is not directly referenced.\n" ); + winetest_pop_context(); + prev_node = dep_node; + continue; + } + + mod2 = CONTAINING_RECORD(dep_node->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink); + ok( !lstrcmpW( mod2->BaseDllName.Buffer, expected_exe_dependencies[i].dllname ), + "Got unexpected module %s.\n", debugstr_w(mod2->BaseDllName.Buffer)); + + se2 = dep_node->IncomingDependencies.Tail; + ok( !!se2, "Got empty incoming dependencies list.\n" ); + do + { + se2 = se2->Next; + dep2 = CONTAINING_RECORD(se2, LDR_DEPENDENCY, dependency_from_entry); + } + while (dep2 != dep && se2 != dep_node->IncomingDependencies.Tail); + ok( dep2 == dep, "Dependency not found in incoming deps list.\n" ); + + ok( dep_node->LoadCount > 0 || broken(!dep_node->LoadCount) /* Win8 */, + "Got unexpected LoadCount %d.\n", dep_node->LoadCount ); + + winetest_pop_context(); + prev_node = dep_node; + } + ok( se == node->Dependencies.Tail, "Expected end of the list.\n" ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -1363,4 +1465,5 @@ START_TEST(module) test_SetDefaultDllDirectories(); test_LdrGetDllHandleEx(); test_LdrGetDllFullName(); + test_ddag_node(); } diff --git a/include/winternl.h b/include/winternl.h index 097dea4601a..e53914b600f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3260,6 +3260,14 @@ typedef struct _LDRP_CSLIST SINGLE_LIST_ENTRY *Tail; } LDRP_CSLIST, *PLDRP_CSLIST; +typedef struct _LDR_DEPENDENCY +{ + LDRP_CSLIST dependency_to_entry; + struct _LDR_DDAG_NODE *dependency_to; + LDRP_CSLIST dependency_from_entry; + struct _LDR_DDAG_NODE *dependency_from; +} LDR_DEPENDENCY, *PLDR_DEPENDENCY; + typedef enum _LDR_DDAG_STATE { LdrModulesMerged = -5, @@ -3283,7 +3291,7 @@ typedef struct _LDR_DDAG_NODE { LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; - ULONG LoadCount; + LONG LoadCount; ULONG LoadWhileUnloadingCount; ULONG LowestLink; LDRP_CSLIST Dependencies;

1 0

Zebediah Figura : quartz: Avoid accessing the advise_sink structure after it is queued.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: e22e34ecf4db9e2959f67b5fb9ae9e11c61d3cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e22e34ecf4db9e2959f67b5f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 21 12:41:12 2021 -0500 quartz: Avoid accessing the advise_sink structure after it is queued. It could already have been removed and freed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 56ad217c76a..f579ae754ea 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -206,6 +206,7 @@ static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, sink->due_time = due_time; sink->period = period; sink->cookie = InterlockedIncrement(&cookie_counter); + *cookie = sink->cookie; EnterCriticalSection(&clock->cs); list_add_tail(&clock->sinks, &sink->entry); @@ -217,7 +218,6 @@ static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, } WakeConditionVariable(&clock->cv); - *cookie = sink->cookie; return S_OK; }

1 0

Zebediah Figura : quartz: Use the performance counter for the system clock.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: bf5b35f19b841e6352c32ca7c6671d9172636871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5b35f19b841e6352c32ca7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 21 12:41:11 2021 -0500 quartz: Use the performance counter for the system clock. Native probably uses timeGetTime() as a source. That doesn't actually match the performance counter on Windows, but it does on Wine, and accessing the counter directly is slightly more efficient anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51684 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 14 ++++++++++++-- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/systemclock.c | 9 +-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cebe4846f04..56ad217c76a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -44,6 +44,7 @@ struct system_clock BOOL thread_created, thread_stopped; HANDLE thread; + LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -51,6 +52,14 @@ struct system_clock struct list sinks; }; +static REFERENCE_TIME get_current_time(const struct system_clock *clock) +{ + LARGE_INTEGER time; + + QueryPerformanceCounter(&time); + return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; +} + static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct system_clock, IUnknown_inner); @@ -145,7 +154,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = GetTickCount64() * 10000; + current_time = get_current_time(clock); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -240,7 +249,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = GetTickCount64() * 10000; + ret = get_current_time(clock); EnterCriticalSection(&clock->cs); @@ -336,6 +345,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index b4a372d4d3e..423abc78ef6 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid +IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index be5472ed6e1..3b39d2aadb4 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -22,8 +22,6 @@ #include "dshow.h" #include "wine/test.h" -static ULONGLONG (WINAPI *pGetTickCount64)(void); - static IReferenceClock *create_system_clock(void) { IReferenceClock *clock = NULL; @@ -178,10 +176,7 @@ static void test_get_time(void) ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); - if (pGetTickCount64) - ticks = pGetTickCount64() * 10000; - else - ticks = (REFERENCE_TIME)GetTickCount() * 10000; + ticks = (REFERENCE_TIME)timeGetTime() * 10000; hr = IReferenceClock_GetTime(clock, &time2); ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); @@ -291,8 +286,6 @@ START_TEST(systemclock) { CoInitialize(NULL); - pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); - test_interfaces(); test_aggregation(); test_get_time();

1 0

Alexandre Julliard : libs: Import upstream code from mpg123 1.29.1.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: bafb747d2df70b2ce30ec099c78d3a19ab7bda0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bafb747d2df70b2ce30ec099… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:39:48 2021 +0200 libs: Import upstream code from mpg123 1.29.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/mpg123/AUTHORS | 176 + libs/mpg123/LICENSE | 19 + libs/mpg123/Makefile.in | 31 + libs/mpg123/config.h | 529 +++ libs/mpg123/src/compat/compat.c | 508 +++ libs/mpg123/src/compat/compat.h | 301 ++ libs/mpg123/src/compat/compat_str.c | 105 + libs/mpg123/src/compat/wpathconv.h | 120 + libs/mpg123/src/intsym.h | 370 ++ libs/mpg123/src/libmpg123/abi_align.h | 41 + libs/mpg123/src/libmpg123/costabs.h | 81 + libs/mpg123/src/libmpg123/dct64.c | 175 + libs/mpg123/src/libmpg123/debug.h | 132 + libs/mpg123/src/libmpg123/decode.h | 292 ++ libs/mpg123/src/libmpg123/dither.c | 3 + libs/mpg123/src/libmpg123/dither.h | 23 + libs/mpg123/src/libmpg123/dither_impl.h | 119 + libs/mpg123/src/libmpg123/equalizer.c | 17 + libs/mpg123/src/libmpg123/fmt123.h | 159 + libs/mpg123/src/libmpg123/format.c | 776 ++++ libs/mpg123/src/libmpg123/frame.c | 1066 ++++++ libs/mpg123/src/libmpg123/frame.h | 431 +++ libs/mpg123/src/libmpg123/gapless.h | 119 + libs/mpg123/src/libmpg123/getbits.h | 103 + libs/mpg123/src/libmpg123/getcpuflags.h | 101 + libs/mpg123/src/libmpg123/huffman.h | 340 ++ libs/mpg123/src/libmpg123/icy.c | 34 + libs/mpg123/src/libmpg123/icy.h | 38 + libs/mpg123/src/libmpg123/icy2utf8.c | 440 +++ libs/mpg123/src/libmpg123/icy2utf8.h | 10 + libs/mpg123/src/libmpg123/id3.c | 1470 +++++++ libs/mpg123/src/libmpg123/id3.h | 43 + libs/mpg123/src/libmpg123/index.c | 132 + libs/mpg123/src/libmpg123/index.h | 59 + libs/mpg123/src/libmpg123/l12tabs.h | 1224 ++++++ libs/mpg123/src/libmpg123/l2tables.h | 167 + libs/mpg123/src/libmpg123/l3bandgain.h | 94 + libs/mpg123/src/libmpg123/l3tabs.h | 5285 ++++++++++++++++++++++++++ libs/mpg123/src/libmpg123/layer1.c | 250 ++ libs/mpg123/src/libmpg123/layer2.c | 380 ++ libs/mpg123/src/libmpg123/layer3.c | 1943 ++++++++++ libs/mpg123/src/libmpg123/lfs_wrap.c | 781 ++++ libs/mpg123/src/libmpg123/libmpg123.c | 1879 +++++++++ libs/mpg123/src/libmpg123/mpeghead.h | 89 + libs/mpg123/src/libmpg123/mpg123.h | 2001 ++++++++++ libs/mpg123/src/libmpg123/mpg123lib_intern.h | 342 ++ libs/mpg123/src/libmpg123/newhuffman.h | 824 ++++ libs/mpg123/src/libmpg123/ntom.c | 148 + libs/mpg123/src/libmpg123/optimize.c | 1164 ++++++ libs/mpg123/src/libmpg123/optimize.h | 388 ++ libs/mpg123/src/libmpg123/parse.c | 1385 +++++++ libs/mpg123/src/libmpg123/parse.h | 25 + libs/mpg123/src/libmpg123/reader.h | 140 + libs/mpg123/src/libmpg123/readers.c | 1257 ++++++ libs/mpg123/src/libmpg123/sample.h | 195 + libs/mpg123/src/libmpg123/stringbuf.c | 250 ++ libs/mpg123/src/libmpg123/swap_bytes_impl.h | 103 + libs/mpg123/src/libmpg123/synth.c | 1192 ++++++ libs/mpg123/src/libmpg123/synth.h | 196 + libs/mpg123/src/libmpg123/synth_8bit.c | 142 + libs/mpg123/src/libmpg123/synth_8bit.h | 86 + libs/mpg123/src/libmpg123/synth_mono.h | 64 + libs/mpg123/src/libmpg123/synth_ntom.h | 213 ++ libs/mpg123/src/libmpg123/synth_real.c | 585 +++ libs/mpg123/src/libmpg123/synth_s32.c | 598 +++ libs/mpg123/src/libmpg123/synths.h | 52 + libs/mpg123/src/libmpg123/tabinit.c | 345 ++ libs/mpg123/src/libmpg123/true.h | 15 + 70 files changed, 32193 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bafb747d2df70b2ce30e…

1 0

Rémi Bernon : winebus.sys: Map SDL joystick axes the same way as UDEV evdev.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 25bc9092837ace3bfd56e6f45f982d101f62c73a URL: https://source.winehq.org/git/wine.git/?a=commit;h=25bc9092837ace3bfd56e6f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:27:43 2021 +0200 winebus.sys: Map SDL joystick axes the same way as UDEV evdev. And increase the arbitrary absolute axis count limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 64 ++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 403c4821f24..fe3a960649c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -227,33 +227,47 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { - static const USAGE joystick_usages[] = + static const USAGE_AND_PAGE absolute_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + }; + static const USAGE_AND_PAGE relative_usages[] = + { + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); - if (axis_count > 6) + if (axis_count > ARRAY_SIZE(absolute_usages)) { - FIXME("Clamping joystick to 6 axis\n"); - axis_count = 6; + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); + axis_count = ARRAY_SIZE(absolute_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) + if (ball_count > ARRAY_SIZE(relative_usages) / 2) { - FIXME("Capping ball + axis at 9\n"); - ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); + ball_count = ARRAY_SIZE(relative_usages) / 2; } hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); @@ -265,13 +279,19 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_begin_input_report(iface)) return STATUS_NO_MEMORY; - if (axis_count && !hid_device_add_axes(iface, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, -32768, 32767)) - return STATUS_NO_MEMORY; + for (i = 0; i < axis_count; i++) + { + if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, + &absolute_usages[i].Usage, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; + } - if (ball_count && !hid_device_add_axes(iface, ball_count * 2, HID_USAGE_PAGE_GENERIC, - &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) - return STATUS_NO_MEMORY; + for (i = 0; i < ball_count; i++) + { + if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, + &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + return STATUS_NO_MEMORY; + } if (hat_count && !hid_device_add_hatswitch(iface, hat_count)) return STATUS_NO_MEMORY;

1 0