wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Alexandre Julliard : ntdll: Move fd cache functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1a743c9af39d0224b65ae504ae7e24d9fad56c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a743c9af39d0224b65ae504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:35:16 2020 +0200 ntdll: Move fd cache functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/directory.c | 10 +- dlls/ntdll/file.c | 46 +++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 3 - dlls/ntdll/om.c | 4 +- dlls/ntdll/serial.c | 4 +- dlls/ntdll/server.c | 226 +--------------------------------- dlls/ntdll/tape.c | 2 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 6 +- dlls/ntdll/unix/server.c | 271 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 10 +- dlls/ntdll/unixlib.h | 11 +- dlls/ntdll/virtual.c | 6 +- 15 files changed, 335 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a743c9af39d0224b65a…

1 0

Alexandre Julliard : ntdll: Move server initialization functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 8a63b688ac49f19c259066fd100407edf3747f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a63b688ac49f19c259066fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 14:17:55 2020 +0200 ntdll: Move server initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 578 +------------------------------ dlls/ntdll/thread.c | 4 +- dlls/ntdll/unix/loader.c | 16 +- dlls/ntdll/unix/server.c | 748 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 14 + dlls/ntdll/unixlib.h | 13 +- 9 files changed, 792 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a63b688ac49f19c2590…

1 0

Alexandre Julliard : ntdll: Don't include ntdll_misc.h from the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e6e2f2325a0a4eb14f10dd6df319b068761e9600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6e2f2325a0a4eb14f10dd6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:48:44 2020 +0200 ntdll: Don't include ntdll_misc.h from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 5 ++++- dlls/ntdll/unix/unix_private.h | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 7bc7787c9d..12e9cdd36d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -33,8 +33,11 @@ # include <unistd.h> #endif +#include "windef.h" +#include "winnt.h" +#include "winternl.h" +#include "unix_private.h" #include "wine/debug.h" -#include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 663036a699..749f9add57 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,33 @@ #include "unixlib.h" +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1024]; /* buffer for temporary strings */ + char output[1024]; /* current output line */ +}; + +/* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ +struct ntdll_thread_data +{ + struct debug_info *debug_info; /* info for debugstr functions */ + void *start_stack; /* stack for thread startup */ + int request_fd; /* fd for sending server requests */ + int reply_fd; /* fd for receiving server replies */ + int wait_fd[2]; /* fd for sleeping server requests */ + BOOL wow64_redir; /* Wow64 filesystem redirection flag */ + pthread_t pthread_id; /* pthread thread id */ +}; + +C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); + +static inline struct ntdll_thread_data *ntdll_get_thread_data(void) +{ + return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; +} + void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Create user shared data section in the server, and initialize it in wineboot.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e854ea34cc481658ec61f4603d0438e075608c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e854ea34cc481658ec61f460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:26:57 2020 +0200 ntdll: Create user shared data section in the server, and initialize it in wineboot. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 3 -- dlls/ntdll/thread.c | 92 ++---------------------------------------- include/wine/server_protocol.h | 4 +- programs/wineboot/wineboot.c | 88 ++++++++++++++++++++++++++++++++++++++++ server/directory.c | 10 ++++- server/file.h | 6 +-- server/mapping.c | 39 +++++++++--------- server/process.c | 8 ---- server/protocol.def | 1 - server/request.h | 3 +- server/trace.c | 1 - 13 files changed, 128 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e854ea34cc481658ec61…

1 0

Alexandre Julliard : ntdll: Don't call terminate_thread request if not necessary.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 42bd67b576027ea6e7c53bccbd9476a2a97472cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bd67b576027ea6e7c53bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:25:16 2020 +0200 ntdll: Don't call terminate_thread request if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 18 ++++++++++-------- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/request.h | 1 - server/thread.c | 8 +------- server/trace.c | 1 - 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3d370f7a98..52f8b6ec61 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -738,17 +738,19 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self; + BOOL self = (handle == GetCurrentThread()); - SERVER_START_REQ( terminate_thread ) + if (!self || exit_code) { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; + SERVER_START_REQ( terminate_thread ) + { + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; } - SERVER_END_REQ; - if (self) abort_thread( exit_code ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e205d4165..1fb345bc5f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -938,7 +938,7 @@ struct terminate_thread_reply { struct reply_header __header; int self; - int last; + char __pad_12[4]; }; @@ -6685,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 604 +#define SERVER_PROTOCOL_VERSION 605 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 86efb01cc3..600113ff02 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -896,7 +896,6 @@ struct rawinput_device int exit_code; /* thread exit code */ @REPLY int self; /* suicide? */ - int last; /* last thread in this process? */ @END diff --git a/server/request.h b/server/request.h index 7a7feb3cf9..4a65296eb5 100644 --- a/server/request.h +++ b/server/request.h @@ -814,7 +814,6 @@ C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, exit_code) == 16 ); C_ASSERT( sizeof(struct terminate_thread_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, self) == 8 ); -C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, last) == 12 ); C_ASSERT( sizeof(struct terminate_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_info_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index ea545d5c30..e2bfa50c7b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1489,17 +1489,11 @@ DECL_HANDLER(terminate_thread) { struct thread *thread; - reply->self = 0; - reply->last = 0; if ((thread = get_thread_from_handle( req->handle, THREAD_TERMINATE ))) { thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); - else - { - reply->self = 1; - reply->last = (thread->process->running_threads == 1); - } + else reply->self = 1; release_object( thread ); } } diff --git a/server/trace.c b/server/trace.c index c5c006ce41..1f0e71f1b6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1368,7 +1368,6 @@ static void dump_terminate_thread_request( const struct terminate_thread_request static void dump_terminate_thread_reply( const struct terminate_thread_reply *req ) { fprintf( stderr, " self=%d", req->self ); - fprintf( stderr, ", last=%d", req->last ); } static void dump_get_process_info_request( const struct get_process_info_request *req )

1 0

Gijs Vermeulen : wtsapi32: Improve WTSQuerySessionInformationW stub.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 116890da122da856c49dc66643bda5cd8360339b URL: https://source.winehq.org/git/wine.git/?a=commit;h=116890da122da856c49dc666… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:27 2020 +0200 wtsapi32: Improve WTSQuerySessionInformationW stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 19 +++++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index f45598f548..c9312cd97c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -97,6 +97,25 @@ static void test_WTSQuerySessionInformation(void) char *buf2; DWORD count; + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 0ba05abf2c..ef3e0d10a0 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -341,6 +341,12 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (!Buffer || !BytesReturned) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (WTSInfoClass == WTSUserName) { WCHAR *username; @@ -354,6 +360,11 @@ BOOL WINAPI WTSQuerySessionInformationW( *BytesReturned = count * sizeof(WCHAR); return TRUE; } + else + { + *Buffer = NULL; + *BytesReturned = 0; + } return FALSE; }

1 0

Gijs Vermeulen : wtsapi32: Implement WTSQuerySessionInformationA.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1db2b563360c48d6697b4f538b2c843ad4762db5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db2b563360c48d6697b4f53… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:26 2020 +0200 wtsapi32: Implement WTSQuerySessionInformationA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49178 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/wtsapi32/wtsapi32.c | 46 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..f45598f548 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,19 +90,47 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } -static void test_WTSQuerySessionInformationW(void) +static void test_WTSQuerySessionInformation(void) { BOOL ret; - WCHAR *buf; + WCHAR *buf1; + char *buf2; DWORD count; count = 0; - buf = NULL; - ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); ok(ret, "got %u\n", GetLastError()); - ok(buf != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); - WTSFreeMemory(buf); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) @@ -118,6 +146,6 @@ static void test_WTSQueryUserToken(void) START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); - test_WTSQuerySessionInformationW(); + test_WTSQuerySessionInformation(); test_WTSQueryUserToken(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 026e7f4369..0ba05abf2c 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -287,18 +288,43 @@ HANDLE WINAPI WTSOpenServerW(LPWSTR pServerName) /************************************************************ * WTSQuerySessionInformationA (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationA( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, char **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + WCHAR *bufferW = NULL; - return FALSE; + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); + + if (!buffer || !count) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) + return FALSE; + + *count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (!*count) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*buffer = heap_alloc(*count))) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) + { + WTSFreeMemory(bufferW); + heap_free(*buffer); + return FALSE; + } + + WTSFreeMemory(bufferW); + return TRUE; } /************************************************************

1 0

Paul Gofman : ntoskrnl.exe: Call load image notify routines for driver modules.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 5d92cf7dbf11038c08eb35a042958faab3ef5b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d92cf7dbf11038c08eb35a0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:12 2020 +0300 ntoskrnl.exe: Call load image notify routines for driver modules. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 ++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 60 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 94733ec60a..fbf6262b3e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3673,6 +3673,30 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); + + if (module && load_image_notify_routine_count) + { + UNICODE_STRING module_name; + IMAGE_NT_HEADERS *nt; + IMAGE_INFO info; + unsigned int i; + + RtlInitUnicodeString(&module_name, str); + nt = RtlImageNtHeader(module); + memset(&info, 0, sizeof(info)); + info.u.s.ImageAddressingMode = IMAGE_ADDRESSING_MODE_32BIT; + info.u.s.SystemModeImage = TRUE; + info.ImageSize = nt->OptionalHeader.SizeOfImage; + info.ImageBase = module; + + for (i = 0; i < load_image_notify_routine_count; ++i) + { + TRACE("Calling image load notify %p.\n", load_image_notify_routines[i]); + load_image_notify_routines[i](&module_name, NULL, &info); + TRACE("Called image load notify %p.\n", load_image_notify_routines[i]); + } + } + HeapFree( GetProcessHeap(), 0, path ); return module; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f6cc442bab..ba2b4d6ac8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -308,21 +308,79 @@ static const WCHAR driver2_path[] = { '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 }; +static IMAGE_INFO test_image_info; +static int test_load_image_notify_count; +static WCHAR test_load_image_name[MAX_PATH]; + +static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, + IMAGE_INFO *image_info) +{ + if (test_load_image_notify_count == -1 + || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + { + ++test_load_image_notify_count; + test_image_info = *image_info; + wcscpy(test_load_image_name, image_name->Buffer); + } +} + static void test_load_driver(void) { - UNICODE_STRING name; + static WCHAR image_path_key_name[] = L"ImagePath"; + RTL_QUERY_REGISTRY_TABLE query_table[2]; + UNICODE_STRING name, image_path; NTSTATUS ret; + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + /* Routine gets registered twice on Windows. */ + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + RtlInitUnicodeString(&image_path, NULL); + memset(query_table, 0, sizeof(query_table)); + query_table[0].QueryRoutine = NULL; + query_table[0].Name = image_path_key_name; + query_table[0].EntryContext = &image_path; + query_table[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_TYPECHECK; + query_table[0].DefaultType = REG_EXPAND_SZ << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT; + + ret = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, driver2_path, query_table, NULL, NULL); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ok(!!image_path.Buffer, "image_path.Buffer is NULL.\n"); + RtlInitUnicodeString(&name, driver2_path); ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ok(test_load_image_notify_count == 2, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + ok(test_image_info.ImageAddressingMode == IMAGE_ADDRESSING_MODE_32BIT, + "Got unexpected ImageAddressingMode %#x.\n", test_image_info.ImageAddressingMode); + ok(test_image_info.SystemModeImage, + "Got unexpected SystemModeImage %#x.\n", test_image_info.SystemModeImage); + ok(!wcscmp(test_load_image_name, image_path.Buffer), "Image path names do not match.\n"); + + test_load_image_notify_count = -1; + ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); + + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); + + ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + RtlFreeUnicodeString(&image_path); } static NTSTATUS wait_single(void *obj, ULONGLONG timeout)

1 0

Paul Gofman : include: Add RTL_QUERY_REGISTRY_TYPECHECK defines.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9e8b44ac5c8aefbd43f256fcfae367a8ab8977ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8b44ac5c8aefbd43f256fc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:11 2020 +0300 include: Add RTL_QUERY_REGISTRY_TYPECHECK defines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index b70460f314..f362790dbc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1988,6 +1988,9 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 #define RTL_QUERY_REGISTRY_DIRECT 0x00000020 #define RTL_QUERY_REGISTRY_DELETE 0x00000040 +#define RTL_QUERY_REGISTRY_TYPECHECK 0x00000100 + +#define RTL_QUERY_REGISTRY_TYPECHECK_SHIFT 24 typedef NTSTATUS (WINAPI *PRTL_QUERY_REGISTRY_ROUTINE)( PCWSTR ValueName, ULONG ValueType,

1 0

Paul Gofman : ntoskrnl.exe: Implement image load notify routines registration.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 26fbff05a1e39a3c910ff778e2229c674a0569c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26fbff05a1e39a3c910ff778… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:10 2020 +0300 ntoskrnl.exe: Implement image load notify routines registration. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++++++++---- include/ddk/ntddk.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9c35cf7e3..94733ec60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -85,6 +85,9 @@ static DWORD client_tid; static HANDLE ntoskrnl_heap; +static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; +static unsigned int load_image_notify_routine_count; + struct wine_driver { DRIVER_OBJECT driver_obj; @@ -3001,10 +3004,21 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ - NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME( "stub: %p\n", NotifyRoutine ); - return STATUS_SUCCESS; + unsigned int i; + + TRACE("routine %p.\n", routine); + + for (i = 0; i < load_image_notify_routine_count; ++i) + if (load_image_notify_routines[i] == routine) + { + --load_image_notify_routine_count; + memmove(&load_image_notify_routines[i], &load_image_notify_routines[i + 1], + sizeof(*load_image_notify_routines) * (load_image_notify_routine_count - i)); + return STATUS_SUCCESS; + } + return STATUS_PROCEDURE_NOT_FOUND; } @@ -3160,7 +3174,13 @@ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_b */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME("(%p) stub\n", routine); + FIXME("routine %p, semi-stub.\n", routine); + + if (load_image_notify_routine_count == ARRAY_SIZE(load_image_notify_routines)) + return STATUS_INSUFFICIENT_RESOURCES; + + load_image_notify_routines[load_image_notify_routine_count++] = routine; + return STATUS_SUCCESS; } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e3c9124023..2b05fda711 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -231,6 +231,7 @@ BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE);

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 May 2020