- Wine-Devel - list.winehq.org

[PATCH 1/2] mfplat/tests: Use CRT allocation functions.
by Nikolay Sivov Dec. 14, 2021

Dec. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..baac5ceffae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,6 @@ #include "evr.h" #include "wine/test.h" -#include "wine/heap.h" #define D3D11_INIT_GUID #include "initguid.h" @@ -4201,7 +4200,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == 8, "Got size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); @@ -4223,7 +4222,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); - heap_free(buffer); + free(buffer); /* Set some attributes of various types. */ IMFAttributes_SetUINT32(attributes, &MF_MT_MAJOR_TYPE, 456); @@ -4238,12 +4237,12 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size > 8, "Got unexpected size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); hr = MFInitAttributesFromBlob(dest, buffer, size); ok(hr == S_OK, "Failed to deserialize, hr %#x.\n", hr); - heap_free(buffer); + free(buffer); hr = IMFAttributes_GetUINT32(dest, &MF_MT_MAJOR_TYPE, &value32); ok(hr == S_OK, "Failed to get get uint32 value, hr %#x.\n", hr); -- 2.33.0

1 1

[PATCH] winegstreamer: Acquire all of the flushing locks in GST_Seeking_SetPositions().
by Zebediah Figura Dec. 14, 2021

Dec. 14, 2021

The current code unintentionally repeatedly acquires the lock for the stream currently being seeked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50906 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index cf284cda668..8532fc1af8b 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1327,8 +1327,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, * ensures the seek is serialized between flushes. */ for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - EnterCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + EnterCriticalSection(&flush_pin->flushing_cs); } SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); @@ -1342,8 +1344,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - IPin_EndFlush(filter->sources[i]->pin.pin.peer); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + IPin_EndFlush(flush_pin->pin.pin.peer); } if (filter->reader) @@ -1353,8 +1357,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, /* Release the flushing locks. */ for (i = filter->source_count - 1; i >= 0; --i) { - if (filter->sources[i]->pin.pin.peer) - LeaveCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + LeaveCriticalSection(&flush_pin->flushing_cs); } return S_OK; -- 2.34.1

1 0

[PATCH] mfplat/tests: Avoid crash by async cancel callback in linux.
by Bernhard Übelacker Dec. 13, 2021

Dec. 13, 2021

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- The cancel in test_scheduled_items puts a work item to the queue by invoke_async_callback. But when this work item is processed the function test_scheduled_items is possibly already left, and the stack memory overwritten by the next test. This testbot run tried to force the crash by invalidating the callback: https://testbot.winehq.org/JobDetails.pl?Key=103981 --- dlls/mfplat/tests/mfplat.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..d1664e81031 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2933,19 +2933,24 @@ static void test_MFHeapAlloc(void) MFHeapFree(res); } +/* Documentation for MFCancelWorkItem mentions that the callback + might still be called, even when MFCancelWorkItem is left. + In Wine implementation the cancel queues a work item + via invoke_async_callback which needs the callback later. */ +static struct test_callback scheduled_items_callback; + static void test_scheduled_items(void) { - struct test_callback callback; IMFAsyncResult *result; MFWORKITEM_KEY key, key2; HRESULT hr; - init_test_callback(&callback); + init_test_callback(&scheduled_items_callback); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); - hr = MFScheduleWorkItem(&callback.IMFAsyncCallback_iface, NULL, -5000, &key); + hr = MFScheduleWorkItem(&scheduled_items_callback.IMFAsyncCallback_iface, NULL, -5000, &key); ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); hr = MFCancelWorkItem(key); @@ -2960,7 +2965,7 @@ static void test_scheduled_items(void) return; } - hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + hr = MFCreateAsyncResult(NULL, &scheduled_items_callback.IMFAsyncCallback_iface, NULL, &result); ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); @@ -2977,7 +2982,7 @@ static void test_scheduled_items(void) IMFAsyncResult_Release(result); - hr = MFScheduleWorkItem(&callback.IMFAsyncCallback_iface, NULL, -5000, &key); + hr = MFScheduleWorkItem(&scheduled_items_callback.IMFAsyncCallback_iface, NULL, -5000, &key); ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); hr = MFCancelWorkItem(key); -- 2.33.0

2 4

[PATCH v3] ntdll: Add stub for NtSetDebugFilterState().
by Paul Gofman Dec. 13, 2021

Dec. 13, 2021

Eternal Return benefited from this function present as .spec file stub which was removed by 52202224d9ab8316896370db2af6399a5fb7b916. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix spec entry for ZwSetDebugFilterState. - added description to the patch indicating that it fixes a regression. v3: - add missing return from wow64_NtSetDebugFilterState(). dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f16943aacd9..01302803ea2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long long long) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 63846875c86..e840f5c6e3d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -353,3 +353,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2d6b81ef651..0bb254ba700 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..42e852f4d28 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + return NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -- 2.33.1

1 0

[PATCH v2] ntdll: Add stub for NtSetDebugFilterState().
by Paul Gofman Dec. 13, 2021

Dec. 13, 2021

Eternal Return benefited from this function present as .spec file stub which was removed by 52202224d9ab8316896370db2af6399a5fb7b916. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The game doesn't call it, just queries and hotpatches. v2: - fix spec entry for ZwSetDebugFilterState. - added description to the patch indicating that it fixes a regression. dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f16943aacd9..01302803ea2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long long long) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 63846875c86..e840f5c6e3d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -353,3 +353,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2d6b81ef651..0bb254ba700 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..cae23da8e76 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -- 2.33.1

2 2

[PATCH] ntdll: Add stub for NtSetDebugFilterState().
by Paul Gofman Dec. 13, 2021

Dec. 13, 2021

Eternal Return benefited from this function present as .spec file stub which was removed by 52202224d9ab8316896370db2af6399a5fb7b916. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The game doesn't call it, just queries and hotpatches. v2: - added description to the patch indicating that it fixes a regression. dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f16943aacd9..3dfde915e50 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long ptr) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 63846875c86..e840f5c6e3d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -353,3 +353,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2d6b81ef651..0bb254ba700 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..cae23da8e76 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -- 2.33.1

2 1

[PATCH 0/2] Console woes
by Eric Pouech Dec. 13, 2021

Dec. 13, 2021

This (small) serie: - removes the creation of an extraneous console in the debugger - however, it exhibits an issue in console handling where console is disconnected too late in server, leaving unwanted termios (eg no echo). It modifies the server to disconnect the console when the (unix) process group leader terminates use case: - apply second patch only - run from shell ./wine winedbg notepad - enter 'quit' in winedbg prompt - back to shell prompt, without echo A+ --- Eric Pouech (2): server/console: when a Unix process group leader terminates, disconnect the console programs/winedbg: don't allocate a new console for debuggee (that's no longer needed) programs/winedbg/tgt_active.c | 5 +---- server/console.c | 13 +++++++++++++ server/process.c | 1 + server/process.h | 1 + 4 files changed, 16 insertions(+), 4 deletions(-)

2 3

[PATCH] ntdll: Add stub for NtSetDebugFilterState().
by Paul Gofman Dec. 13, 2021

Dec. 13, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The game doesn't call it, just queries and hotpatches. dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f16943aacd9..3dfde915e50 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long ptr) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 63846875c86..e840f5c6e3d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -353,3 +353,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2d6b81ef651..0bb254ba700 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..cae23da8e76 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -- 2.33.1

2 1

[PATCH] xcopy: Add /k in Syntax message of STRING_HELP string.
by Chilung Chan Dec. 13, 2021

Dec. 13, 2021

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- programs/xcopy/xcopy.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.rc b/programs/xcopy/xcopy.rc index c5bfed37c5c..c61e4da88fd 100644 --- a/programs/xcopy/xcopy.rc +++ b/programs/xcopy/xcopy.rc @@ -50,7 +50,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ -- 2.33.0.windows.2

1 0

[PATCH v5 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang Dec. 13, 2021

Dec. 13, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: The "inline import" kludge is there since the existing build system does not support generating import libraries for TESTDLLs, and it really didn't seem worth the effort to rewrite makedep to accomodate such rare requirement (also we're in RC). v3 -> v4: - iatgas.h - LLVM(Clang), ARM, ARM64 support - Use __ASM_NAME macro - Don't fail test on MSVC - Don't end asm macros with "\n\t" v4 -> v5: - iatgas.h - mark idata sections as RO - loader.c - test for forward export itself dlls/kernel32/tests/Makefile.in | 10 +- dlls/kernel32/tests/forward1.c | 17 +++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 7 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 7 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/forward4.c | 35 ++++++ dlls/kernel32/tests/forward4.spec | 2 + dlls/kernel32/tests/iatgas.h | 85 +++++++++++++ dlls/kernel32/tests/loader.c | 199 ++++++++++++++++++++++++++++++ 11 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/forward4.c create mode 100644 dlls/kernel32/tests/forward4.spec create mode 100644 dlls/kernel32/tests/iatgas.h diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..7ef3508bad4 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -37,4 +37,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + forward4.c \ + forward4.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..985e193c958 --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,17 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..0ed3885e0df --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,7 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..0ed3885e0df --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,7 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/forward4.c b/dlls/kernel32/tests/forward4.c new file mode 100644 index 00000000000..9ecdbb7228a --- /dev/null +++ b/dlls/kernel32/tests/forward4.c @@ -0,0 +1,35 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#if defined(__GNUC__) || defined(__clang__) +#include "wine/asm.h" +#include "iatgas.h" + +INLINE_IMPORT_BEGIN("forward3.dll") + INLINE_IMPORT_BY_NAME(1, "forward_test_func", __ASM_NAME("forward_test_func")) + INLINE_IMPORT_BY_ORDINAL(2, __ASM_NAME("forward_test_func2")) +INLINE_IMPORT_END() + +DECLSPEC_IMPORT extern unsigned long forward_test_func(void); +DECLSPEC_IMPORT extern unsigned long forward_test_func2(void); + +unsigned long test_func_stub(void) +{ + return forward_test_func() ^ forward_test_func2(); +} + +const char skiptest[] = ""; +#else +unsigned long test_func_stub(void) +{ + /* unimplemented */ + for (;;) DebugBreak(); +} + +const char skiptest[] = "TODO: support building import libraries for TESTDLLs in MSVC"; +#endif + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward4.spec b/dlls/kernel32/tests/forward4.spec new file mode 100644 index 00000000000..5ff2f47469c --- /dev/null +++ b/dlls/kernel32/tests/forward4.spec @@ -0,0 +1,2 @@ +@ cdecl test_func_stub() +@ extern skiptest diff --git a/dlls/kernel32/tests/iatgas.h b/dlls/kernel32/tests/iatgas.h new file mode 100644 index 00000000000..8d0184c9ae0 --- /dev/null +++ b/dlls/kernel32/tests/iatgas.h @@ -0,0 +1,85 @@ +/* + * Inline assembly import library generator + * + * Copyright 2021 Jinoh Kang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_KERNEL_IATGAS_H +#define __WINE_KERNEL_IATGAS_H + +#if defined(_WIN64) +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) line "\n\t.skip 4" +#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) ".skip 4\n\t" line +#else +#error unknown byte order +#endif +#define IATGAS_EMIT_PTRALIGN ".p2align 3" +#define IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal) ".quad (1<<63)|(" #ordinal ")" +#elif defined(_WIN32) +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) line +#define IATGAS_EMIT_PTRALIGN ".p2align 2" +#define IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal) ".long (1<<31)|(" #ordinal ")" +#else +#error unknown pointer size +#endif + +#define INLINE_IMPORT_BEGIN_PROLOG(id) INLINE_IMPORT_BEGIN_PROLOG_(id) +#define INLINE_IMPORT_BEGIN_PROLOG_(id) \ + __asm__( \ + ".section \".idata$2\", \"a\"\n\t" /* IMAGE_IMPORT_DESCRIPTOR */ \ + ".rva .Limport_ilt_" #id "\n\t" /* .OriginalFirstThunk */ \ + ".long 0\n\t" /* .TimeDateStamp */ \ + ".long -1\n\t" /* .ForwarderChain */ \ + ".rva .Limport_dllname_" #id "\n\t" /* .Name */ \ + ".rva .Limport_iat_" #id "\n\t" /* .FirstThunk */ \ + ".p2align 2\n\t" /* (section alignment) */ \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + IATGAS_EMIT_PTRALIGN "\n\t" \ + ".Limport_ilt_" #id ":\n\t" \ + ".section \".idata$5\", \"a\"\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + IATGAS_EMIT_PTRALIGN "\n\t" \ + ".Limport_iat_" #id ":\n\t" \ + ".section \".idata$7\", \"a\"\n\t" \ + ".Limport_dllname_" #id ":\n\t" +#define INLINE_IMPORT_BEGIN(dll_name) INLINE_IMPORT_BEGIN_PROLOG(__COUNTER__) \ + ".asciz \"" dll_name "\"\n\t" +#define INLINE_IMPORT_ENTRY(entry, impsym) \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + entry "\n\t" /* .AddressOfData | .Ordinal */ \ + ".section \".idata$5\", \"a\"\n\t" \ + "__imp_" impsym ":\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + entry "\n\t" /* .AddressOfData | .Ordinal */ +#define INLINE_IMPORT_BY_ORDINAL(ordinal, impsym) \ + INLINE_IMPORT_ENTRY(IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal), impsym) +#define INLINE_IMPORT_BY_NAME(hint, name, impsym) \ + INLINE_IMPORT_ENTRY(IATGAS_ZERO_EXTEND_32_TO_PTR(".rva .Limport_procname_" impsym), impsym) \ + ".section \".idata$6\", \"a\"\n\t" \ + ".Limport_procname_" impsym ":\n\t" /* IMAGE_IMPORT_BY_NAME */ \ + ".short " #hint "\n\t" /* .Hint */ \ + ".asciz \"" name "\"\n\t" /* .Name */ \ + ".p2align 1\n\t" /* (section alignment) */ +#define INLINE_IMPORT_END() \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + IATGAS_ZERO_EXTEND_32_TO_PTR(".long 0") "\n\t" \ + ".section \".idata$5\", \"a\"\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + IATGAS_ZERO_EXTEND_32_TO_PTR(".long 0") "\n\t" \ + ".text" \ + ); + +#endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 308cf1a44a0..e34971d3112 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1641,6 +1641,202 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + 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" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + CHAR forward4_path[MAX_PATH]; + HMODULE forward1, forward2, forward3, forward4; + unsigned long result; + unsigned long (*test_func_stub)(void); + const char *skiptest; + BOOL skiptest_flag = FALSE; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + snprintf( forward4_path, MAX_PATH, "%s\\forward4.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + extract_resource( "forward4.dll", "TESTDLL", forward4_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + forward4 = LoadLibraryA( forward4_path ); + ok( !!forward4, "couldn't find %s: %u\n", forward4_path, GetLastError() ); + + skiptest = (const char *)GetProcAddress( forward4, "skiptest" ); + if (skiptest && *skiptest) + { + skiptest_flag = TRUE; + skip( "forward4: %s\n", skiptest ); + } + else + { + test_func_stub = (void *)GetProcAddress( forward4, "test_func_stub" ); + ok( !!test_func_stub, "forward4!test_func_stub not found\n" ); + result = test_func_stub ? test_func_stub() : -1UL; + ok( result == 0x12345678UL, "forward4!test_func_stub returned %#x (expected %#x)\n", + result, 0x12345678UL ); + } + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + FreeLibrary( forward3 ); + + if (!skiptest_flag) + { + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly unloaded\n" ); + } + + FreeLibrary( forward4 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward4.dll" ), "forward4.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + DeleteFileA( forward4_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4106,6 +4302,9 @@ START_TEST(loader) test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_static_forwarded_import_refs(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); -- 2.34.1

2 2