wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

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

21 Oct '21

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

Rémi Bernon : dinput: Set high DIK bit for extended scancodes.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 7c67ebfd568eaf56f5289596fc03caecba98f6fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c67ebfd568eaf56f5289596… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 18:07:46 2021 +0200 dinput: Set high DIK bit for extended scancodes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51910 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fb6cf33b911..fd8e9e8fd12 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -80,7 +80,8 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers break; } } - return scanCode; + if (scanCode & 0x100) scanCode |= 0x80; + return (BYTE)scanCode; } int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) @@ -89,6 +90,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -105,9 +107,9 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, - This->base.dinput->dwVersion ); - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80;

1 0

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

21 Oct '21

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

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

21 Oct '21

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

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

21 Oct '21

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 : winebuild: Wrap 16-bit fake dlls in a PE module.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 5a8f7d1f745d3fb8fd48d577103ac5068d3c1746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8f7d1f745d3fb8fd48d577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 12:50:13 2021 +0200 winebuild: Wrap 16-bit fake dlls in a PE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 3 +- tools/winebuild/spec16.c | 13 +++++---- tools/winebuild/spec32.c | 75 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 45e21f8c462..1a9be3c7ae7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -727,8 +727,7 @@ int main(int argc, char **argv) if (fake_module) { - if (spec->type == SPEC_WIN16) output_fake_module16( spec ); - else output_fake_module( spec ); + output_fake_module( spec ); break; } if (!is_pe()) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index e82f5f81d9a..8d4f96ea323 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -829,7 +829,8 @@ void output_fake_module16( DLLSPEC *spec ) const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; const unsigned int segtab = lfanew + 0x40; - unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata; + unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata, rsrc_size = 0; + void *rsrc_ptr = NULL; init_output_buffer(); @@ -843,6 +844,10 @@ void output_fake_module16( DLLSPEC *spec ) restab += output_buffer_pos; free( output_buffer ); init_output_buffer(); + output_bin_res16_data( spec ); + rsrc_ptr = output_buffer; + rsrc_size = output_buffer_pos; + init_output_buffer(); } namelen = strlen( spec->dll_name ); @@ -874,7 +879,7 @@ void output_fake_module16( DLLSPEC *spec ) put_dword( 0 ); put_word( 0 ); /* e_oemid */ put_word( 0 ); /* e_oeminfo */ - put_dword( 0 ); /* e_res2 */ + put_dword( rsrcdata + rsrc_size ); /* e_res2 */ put_dword( 0 ); put_dword( 0 ); put_dword( 0 ); @@ -953,7 +958,5 @@ void output_fake_module16( DLLSPEC *spec ) put_data( data_segment, sizeof(data_segment) ); /* resource data */ - output_bin_res16_data( spec ); - - flush_output_buffer(); + put_data( rsrc_ptr, rsrc_size ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7a28777fb77..513778ad10c 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -790,13 +790,21 @@ struct dir_data unsigned int size; }; +struct exp_data +{ + unsigned int rva; + const char *name; +}; + static struct { unsigned int section_align; unsigned int file_align; unsigned int sec_count; + unsigned int exp_count; struct dir_data dir[16]; struct sec_data sec[8]; + struct exp_data exp[8]; } pe; static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) @@ -805,6 +813,13 @@ static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) pe.dir[idx].size = size; } +static void add_export( unsigned int rva, const char *name ) +{ + pe.exp[pe.exp_count].rva = rva; + pe.exp[pe.exp_count].name = name; + pe.exp_count++; +} + static unsigned int current_rva(void) { if (!pe.sec_count) return pe.section_align; @@ -864,16 +879,68 @@ void output_fake_module( DLLSPEC *spec ) else put_data( exe_code_section, sizeof(exe_code_section) ); flush_output_to_section( ".text", -1, 0x60000020 /* CNT_CODE|MEM_EXECUTE|MEM_READ */ ); + if (spec->type == SPEC_WIN16) + { + add_export( current_rva(), "__wine_spec_dos_header" ); + + /* .rodata section */ + output_fake_module16( spec ); + if (spec->main_module) + { + add_export( current_rva() + output_buffer_pos, "__wine_spec_main_module" ); + put_data( spec->main_module, strlen(spec->main_module) + 1 ); + } + flush_output_to_section( ".rodata", -1, 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + + if (pe.exp_count) + { + /* .edata section */ + unsigned int exp_rva = current_rva() + 40; /* sizeof(IMAGE_EXPORT_DIRECTORY) */ + unsigned int pos, str_rva = exp_rva + 10 * pe.exp_count; + + put_dword( 0 ); /* Characteristics */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ + put_word( 0 ); /* MajorVersion */ + put_word( 0 ); /* MinorVersion */ + put_dword( str_rva ); /* Name */ + put_dword( 1 ); /* Base */ + put_dword( pe.exp_count ); /* NumberOfFunctions */ + put_dword( pe.exp_count ); /* NumberOfNames */ + put_dword( exp_rva ); /* AddressOfFunctions */ + put_dword( exp_rva + 4 * pe.exp_count ); /* AddressOfNames */ + put_dword( exp_rva + 8 * pe.exp_count ); /* AddressOfNameOrdinals */ + + /* functions */ + for (i = 0; i < pe.exp_count; i++) put_dword( pe.exp[i].rva ); + /* names */ + for (i = 0, pos = str_rva + strlen(spec->file_name) + 1; i < pe.exp_count; i++) + { + put_dword( pos ); + pos += strlen( pe.exp[i].name ) + 1; + } + /* ordinals */ + for (i = 0; i < pe.exp_count; i++) put_word( i ); + /* strings */ + put_data( spec->file_name, strlen(spec->file_name) + 1 ); + for (i = 0; i < pe.exp_count; i++) put_data( pe.exp[i].name, strlen(pe.exp[i].name) + 1 ); + flush_output_to_section( ".edata", 0 /* IMAGE_DIRECTORY_ENTRY_EXPORT */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + /* .reloc section */ put_dword( 0 ); /* VirtualAddress */ put_dword( 0 ); /* Size */ flush_output_to_section( ".reloc", 5 /* IMAGE_DIRECTORY_ENTRY_BASERELOC */, 0x42000040 /* CNT_INITIALIZED_DATA|MEM_DISCARDABLE|MEM_READ */ ); - /* .rsrc section */ - output_bin_resources( spec, current_rva() ); - flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, - 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + if (spec->type == SPEC_WIN32) + { + /* .rsrc section */ + output_bin_resources( spec, current_rva() ); + flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } put_word( 0x5a4d ); /* e_magic */ put_word( 0x40 ); /* e_cblp */

1 0

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

21 Oct '21

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 : xaudio: Use the bundled FAudio and build with msvcrt.
by Alexandre Julliard 21 Oct '21

21 Oct '21

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

Alexandre Julliard : libs: Import code from upstream FAudio 21.10.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 6b45777121fcd50d9b7d5b649c6710063b549892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b45777121fcd50d9b7d5b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:45:51 2021 +0200 libs: Import code from upstream FAudio 21.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/faudio/LICENSE | 25 + libs/faudio/Makefile.in | 22 + libs/faudio/include/F3DAudio.h | 262 ++ libs/faudio/include/FACT.h | 814 +++++ libs/faudio/include/FACT3D.h | 127 + libs/faudio/include/FAPO.h | 207 ++ libs/faudio/include/FAPOBase.h | 264 ++ libs/faudio/include/FAPOFX.h | 178 + libs/faudio/include/FAudio.h | 1322 +++++++ libs/faudio/include/FAudioFX.h | 308 ++ libs/faudio/src/F3DAudio.c | 1563 ++++++++ libs/faudio/src/FACT.c | 3021 ++++++++++++++++ libs/faudio/src/FACT3D.c | 172 + libs/faudio/src/FACT_internal.c | 3336 +++++++++++++++++ libs/faudio/src/FACT_internal.h | 644 ++++ libs/faudio/src/FAPOBase.c | 451 +++ libs/faudio/src/FAPOFX.c | 89 + libs/faudio/src/FAPOFX_echo.c | 248 ++ libs/faudio/src/FAPOFX_eq.c | 257 ++ libs/faudio/src/FAPOFX_masteringlimiter.c | 247 ++ libs/faudio/src/FAPOFX_reverb.c | 247 ++ libs/faudio/src/FAudio.c | 3201 +++++++++++++++++ libs/faudio/src/FAudioFX_reverb.c | 1969 ++++++++++ libs/faudio/src/FAudioFX_volumemeter.c | 281 ++ libs/faudio/src/FAudio_internal.c | 1967 ++++++++++ libs/faudio/src/FAudio_internal.h | 913 +++++ libs/faudio/src/FAudio_internal_simd.c | 1616 +++++++++ libs/faudio/src/FAudio_operationset.c | 777 ++++ libs/faudio/src/FAudio_platform_win32.c | 1583 ++++++++ libs/faudio/src/matrix_defaults.inl | 147 + libs/faudio/src/stb.h | 406 +++ libs/faudio/src/stb_vorbis.h | 5572 +++++++++++++++++++++++++++++ 34 files changed, 32264 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b45777121fcd50d9b7d…

1 0

Alexandre Julliard : l3codeca.acm: Use the bundled mpg123 and build with msvcrt.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 5329da61ac51995f7a690edffbbc57d955566a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5329da61ac51995f7a690edf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:41:21 2021 +0200 l3codeca.acm: Use the bundled mpg123 and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 ------------------------------------------ configure.ac | 19 -------- dlls/l3codeca.acm/Makefile.in | 7 +-- dlls/l3codeca.acm/mpegl3.c | 6 --- include/config.h.in | 3 -- 5 files changed, 2 insertions(+), 143 deletions(-) diff --git a/configure b/configure index 4e64db49eed..8d4ca1ac653 100755 --- a/configure +++ b/configure @@ -637,8 +637,6 @@ VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS -MPG123_LIBS -MPG123_CFLAGS JPEG_LIBS JPEG_CFLAGS GSSAPI_LIBS @@ -874,7 +872,6 @@ with_jpeg with_krb5 with_ldap with_mingw -with_mpg123 with_netapi with_openal with_opencl @@ -1992,8 +1989,6 @@ GSSAPI_CFLAGS GSSAPI_LIBS JPEG_CFLAGS JPEG_LIBS -MPG123_CFLAGS -MPG123_LIBS NETAPI_CFLAGS NETAPI_LIBS VKD3D_CFLAGS @@ -2665,7 +2660,6 @@ Optional Packages: --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP --without-mingw do not use the MinGW cross-compiler - --without-mpg123 do not use the mpg123 library --without-netapi do not use the Samba NetAPI library --without-openal do not use OpenAL --without-opencl do not use OpenCL @@ -2818,9 +2812,6 @@ Some influential environment variables: GSSAPI_LIBS Linker flags for krb5-gssapi, overriding pkg-config JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config - MPG123_CFLAGS - C compiler flags for libmpg123, overriding pkg-config - MPG123_LIBS Linker flags for libmpg123, overriding pkg-config NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config @@ -4133,12 +4124,6 @@ if test "${with_mingw+set}" = set; then : fi -# Check whether --with-mpg123 was given. -if test "${with_mpg123+set}" = set; then : - withval=$with_mpg123; -fi - - # Check whether --with-netapi was given. if test "${with_netapi+set}" = set; then : withval=$with_netapi; @@ -15416,99 +15401,6 @@ esac fi -if test "x$with_mpg123" != "xno" -then - if ${MPG123_CFLAGS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_CFLAGS=`$PKG_CONFIG --cflags libmpg123 2>/dev/null` -fi -fi - -if ${MPG123_LIBS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_LIBS=`$PKG_CONFIG --libs libmpg123 2>/dev/null` -fi -fi - -MPG123_LIBS=${MPG123_LIBS:-"-lmpg123"} -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 cflags: $MPG123_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 libs: $MPG123_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $MPG123_CFLAGS" -for ac_header in mpg123.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default" -if test "x$ac_cv_header_mpg123_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MPG123_H 1 -_ACEOF - -fi - -done - - if test "$ac_cv_header_mpg123_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 -$as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; } -if ${ac_cv_lib_mpg123_mpg123_feed+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpg123 $MPG123_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char mpg123_feed (); -int -main () -{ -return mpg123_feed (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpg123_mpg123_feed=yes -else - ac_cv_lib_mpg123_mpg123_feed=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5 -$as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; } -if test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes; then : - : -else - MPG123_LIBS="" -fi - - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi -CPPFLAGS=$ac_save_CPPFLAGS - -fi -if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes; then : - case "x$with_mpg123" in - x) as_fn_append wine_notices "|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; - xno) ;; - *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. -This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; -esac -enable_l3codeca_acm=${enable_l3codeca_acm:-no} -fi -test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} - if test "$ac_cv_header_AL_al_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lopenal" >&5 @@ -18935,8 +18827,6 @@ GSSAPI_CFLAGS = $GSSAPI_CFLAGS GSSAPI_LIBS = $GSSAPI_LIBS JPEG_CFLAGS = $JPEG_CFLAGS JPEG_LIBS = $JPEG_LIBS -MPG123_CFLAGS = $MPG123_CFLAGS -MPG123_LIBS = $MPG123_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS diff --git a/configure.ac b/configure.ac index 047e2b82638..63bf4f25162 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerbero AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) -AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) @@ -1722,24 +1721,6 @@ fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) -dnl **** Check for mpg123 **** -if test "x$with_mpg123" != "xno" -then - WINE_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123],,, - [AC_CHECK_HEADERS([mpg123.h]) - if test "$ac_cv_header_mpg123_h" = "yes" - then - AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS]) - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi]) -fi -WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes], - [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], - [enable_l3codeca_acm]) -test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} - dnl **** Check for OpenAL 1.1 **** if test "$ac_cv_header_AL_al_h" = "yes" then diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index e527ec28675..451794b2624 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,9 +1,6 @@ MODULE = l3codeca.acm -IMPORTS = winmm user32 -EXTRAINCL = $(MPG123_CFLAGS) -EXTRALIBS = $(MPG123_LIBS) - -EXTRADLLFLAGS = -mcygwin +IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase +EXTRAINCL = $(MPG123_PE_CFLAGS) C_SRCS = \ mpegl3.c diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fa9f38258e5..336e706bb83 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -19,13 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> - #include <mpg123.h> #include "windef.h" @@ -212,14 +208,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) instance->dwDriver = (DWORD_PTR)handle; mpg123_open_feed(handle); -#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); -#endif return MMSYSERR_NOERROR; } diff --git a/include/config.h.in b/include/config.h.in index 2a408c3e74f..9493574d2d7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -327,9 +327,6 @@ /* Define to 1 if you have the <mntent.h> header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if you have the <mpg123.h> header file. */ -#undef HAVE_MPG123_H - /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021