wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Martin Storsjo : ntdll: Handle partial image load config structs.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 2a904d3bb379282831035e76bf9d30d347511bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a904d3bb379282831035e76b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Jul 23 10:36:06 2015 +0300 ntdll: Handle partial image load config structs. --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ff947da..479ca79 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1320,7 +1320,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) + if (loadcfg && + loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); /* set the image protections */

1 0

Daniel Lehman : msvcr110: Add Concurrency::details::_GetConcurrency.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: a7c7bc9180f8ac6e4f1ef9d7a9f53d4eaa5a4e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c7bc9180f8ac6e4f1ef9d7a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 24 00:13:19 2015 -0700 msvcr110: Add Concurrency::details::_GetConcurrency. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 18 ++++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3faca07..51eddfb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -533,7 +533,7 @@ @ stub ?_Get@_CurrentScheduler@details@Concurrency@@SA?AV_Scheduler@23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo@Concurrency@@YAPBU_CONCRT_TRACE_INFO@details@1@XZ @ stub -arch=win64 ?_GetConcRTTraceInfo@Concurrency@@YAPEBU_CONCRT_TRACE_INFO@details@1@XZ -@ stub ?_GetConcurrency@details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency@details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5077a67..c2aacac 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -524,7 +524,7 @@ @ stub ?_Get@_CurrentScheduler@details@Concurrency@@SA?AV_Scheduler@23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo@Concurrency@@YAPBU_CONCRT_TRACE_INFO@details@1@XZ @ stub -arch=win64 ?_GetConcRTTraceInfo@Concurrency@@YAPEBU_CONCRT_TRACE_INFO@details@1@XZ -@ stub ?_GetConcurrency@details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency@details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index d334b51..330c6b1 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -64,6 +64,7 @@ static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wc static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); static wchar_t** (CDECL *p____lc_locale_name_func)(void); +static unsigned int (CDECL *p__GetConcurrency)(void); static BOOL init(void) { @@ -82,6 +83,7 @@ static BOOL init(void) p__dsign = (void*)GetProcAddress(module, "_dsign"); p__fdsign = (void*)GetProcAddress(module, "_fdsign"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); + p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency@details@Concurrency@@YAIXZ"); return TRUE; } @@ -221,10 +223,21 @@ static void test____lc_locale_name_func(void) ok(!lc_names[1], "___lc_locale_name_func()[1] = %s\n", wine_dbgstr_w(lc_names[1])); } +static void test__GetConcurrency(void) +{ + SYSTEM_INFO si; + unsigned int c; + + GetSystemInfo(&si); + c = (*p__GetConcurrency)(); + ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); +} + START_TEST(msvcr120) { if (!init()) return; test_lconv(); test__dsign(); test____lc_locale_name_func(); + test__GetConcurrency(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3ff423d..392c3f7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -522,7 +522,7 @@ @ stub ?_Get@_CurrentScheduler@details@Concurrency@@SA?AV_Scheduler@23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo@Concurrency@@YAPBU_CONCRT_TRACE_INFO@details@1@XZ @ stub -arch=win64 ?_GetConcRTTraceInfo@Concurrency@@YAPEBU_CONCRT_TRACE_INFO@details@1@XZ -@ stub ?_GetConcurrency@details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency@details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency@details@Concurrency@@YAIXZ @ stub -arch=win32 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth@_StackGuard@details@Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 6d903dc..e69e1b9 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -537,6 +537,24 @@ void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock * TRACE("(%p)\n", this); critical_section_unlock(this->cs); } + +/* ?_GetConcurrency@details@Concurrency@@YAIXZ */ +unsigned int __cdecl _GetConcurrency(void) +{ + static unsigned int val = -1; + + TRACE("()\n"); + + if(val == -1) { + SYSTEM_INFO si; + + GetSystemInfo(&si); + val = si.dwNumberOfProcessors; + } + + return val; +} + #endif /**********************************************************************

1 0

Sebastian Lackner : ntdll/tests: Add tests for ThreadQuerySetWin32StartAddress info class.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 22f0611cf9070a6bbff90f5c18328399ccc13dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f0611cf9070a6bbff90f5c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:47 2015 +0200 ntdll/tests: Add tests for ThreadQuerySetWin32StartAddress info class. --- dlls/ntdll/tests/info.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5fff490..83e8757 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1695,6 +1695,61 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static DWORD WINAPI start_address_thread(void *arg) +{ + PRTL_THREAD_START_ROUTINE entry; + NTSTATUS status; + DWORD ret; + + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry == (void *)start_address_thread, "expected %p, got %p\n", start_address_thread, entry); + return 0; +} + +static void test_thread_start_address(void) +{ + PRTL_THREAD_START_ROUTINE entry; + NTSTATUS status; + HANDLE thread; + DWORD ret; + + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry != NULL, "expected non-NULL entry point\n"); + + entry = (void *)0xdeadbeef; + status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry)); + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, /* >= Vista */ + "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08x\n", status); + + if (status == STATUS_SUCCESS) + { + entry = NULL; + ret = 0xdeadbeef; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, + &entry, sizeof(entry), &ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(entry == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", entry); + } + + thread = CreateThread(NULL, 0, start_address_thread, NULL, 0, NULL); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + CloseHandle(thread); +} + START_TEST(info) { char **argv; @@ -1820,5 +1875,10 @@ START_TEST(info) trace("Starting test_affinity()\n"); test_affinity(); + + trace("Starting test_NtGetCurrentProcessorNumber()\n"); test_NtGetCurrentProcessorNumber(); + + trace("Starting test_thread_start_address()\n"); + test_thread_start_address(); }

1 0

Sebastian Lackner : ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtQueryInformationThread.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 845164004b4b6f2e0c64a588fe858d5a26664980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845164004b4b6f2e0c64a588f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:33 2015 +0200 ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtQueryInformationThread. --- dlls/ntdll/thread.c | 18 +++++++++++++++++- include/wine/server_protocol.h | 5 +++-- server/protocol.def | 1 + server/request.h | 11 ++++++----- server/thread.c | 1 + server/trace.c | 1 + 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3e95fd4..0a8a7b9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1086,12 +1086,28 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; return status; } + case ThreadQuerySetWin32StartAddress: + { + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->tid_in = 0; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + PRTL_THREAD_START_ROUTINE entry = wine_server_get_ptr( reply->entry_point ); + if (data) memcpy( data, &entry, min( length, sizeof(entry) ) ); + if (ret_len) *ret_len = min( length, sizeof(entry) ); + } + } + SERVER_END_REQ; + return status; + } case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: - case ThreadQuerySetWin32StartAddress: case ThreadZeroTlsCell: case ThreadPerformanceCount: case ThreadIdealProcessor: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 200b27a..36f6378 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -892,11 +892,12 @@ struct get_thread_info_reply process_id_t pid; thread_id_t tid; client_ptr_t teb; + client_ptr_t entry_point; affinity_t affinity; int exit_code; int priority; int last; - char __pad_44[4]; + char __pad_52[4]; }; @@ -6113,6 +6114,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 483 +#define SERVER_PROTOCOL_VERSION 484 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4279cb6..ffee0c0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -841,6 +841,7 @@ struct rawinput_device process_id_t pid; /* server process id */ thread_id_t tid; /* server thread id */ client_ptr_t teb; /* thread teb pointer */ + client_ptr_t entry_point; /* thread entry point */ affinity_t affinity; /* thread affinity mask */ int exit_code; /* thread exit code */ int priority; /* thread priority level */ diff --git a/server/request.h b/server/request.h index 2ba8b45..10e4c9b 100644 --- a/server/request.h +++ b/server/request.h @@ -768,11 +768,12 @@ C_ASSERT( sizeof(struct get_thread_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, teb) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 40 ); -C_ASSERT( sizeof(struct get_thread_info_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, entry_point) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 44 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 48 ); +C_ASSERT( sizeof(struct get_thread_info_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); diff --git a/server/thread.c b/server/thread.c index f020908..981bcc1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1375,6 +1375,7 @@ DECL_HANDLER(get_thread_info) reply->pid = get_process_id( thread->process ); reply->tid = get_thread_id( thread ); reply->teb = thread->teb; + reply->entry_point = thread->entry_point; reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STATUS_PENDING; reply->priority = thread->priority; reply->affinity = thread->affinity; diff --git a/server/trace.c b/server/trace.c index da4f5b8..3eb8583 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1300,6 +1300,7 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, " pid=%04x", req->pid ); fprintf( stderr, ", tid=%04x", req->tid ); dump_uint64( ", teb=", &req->teb ); + dump_uint64( ", entry_point=", &req->entry_point ); dump_uint64( ", affinity=", &req->affinity ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority );

1 0

Sebastian Lackner : ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtSetInformationThread.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 6ab494ceb566c105f58ea713ad6f067f4409089f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab494ceb566c105f58ea713a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:31:11 2015 +0200 ntdll: Implement ThreadQuerySetWin32StartAddress info class in NtSetInformationThread. --- dlls/ntdll/thread.c | 16 ++++++++++++++-- include/wine/server_protocol.h | 12 +++++++----- server/protocol.def | 8 +++++--- server/request.h | 5 +++-- server/thread.c | 4 ++++ server/thread.h | 1 + server/trace.c | 1 + 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 2781827..3e95fd4 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1203,14 +1203,26 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadHideFromDebugger: /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS; - + case ThreadQuerySetWin32StartAddress: + { + const PRTL_THREAD_START_ROUTINE *entry = data; + if (length != sizeof(PRTL_THREAD_START_ROUTINE)) return STATUS_INVALID_PARAMETER; + SERVER_START_REQ( set_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->mask = SET_THREAD_INFO_ENTRYPOINT; + req->entry_point = wine_server_client_ptr( *entry ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + return status; case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: - case ThreadQuerySetWin32StartAddress: case ThreadPerformanceCount: case ThreadAmILastThread: case ThreadIdealProcessor: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ac0d2d0..200b27a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -922,16 +922,18 @@ struct set_thread_info_request int mask; int priority; affinity_t affinity; + client_ptr_t entry_point; obj_handle_t token; - char __pad_36[4]; + char __pad_44[4]; }; struct set_thread_info_reply { struct reply_header __header; }; -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 @@ -6111,6 +6113,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 482 +#define SERVER_PROTOCOL_VERSION 483 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 3d7f7be..4279cb6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -863,11 +863,13 @@ struct rawinput_device int mask; /* setting mask (see below) */ int priority; /* priority class */ affinity_t affinity; /* affinity mask */ + client_ptr_t entry_point; /* thread entry point */ obj_handle_t token; /* impersonation token */ @END -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 /* Retrieve information about a module */ diff --git a/server/request.h b/server/request.h index 299b4ad..2ba8b45 100644 --- a/server/request.h +++ b/server/request.h @@ -782,8 +782,9 @@ C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, token) == 32 ); -C_ASSERT( sizeof(struct set_thread_info_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, entry_point) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, token) == 40 ); +C_ASSERT( sizeof(struct set_thread_info_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_dll_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_dll_info_request, base_address) == 16 ); C_ASSERT( sizeof(struct get_dll_info_request) == 24 ); diff --git a/server/thread.c b/server/thread.c index b8c73c6..f020908 100644 --- a/server/thread.c +++ b/server/thread.c @@ -175,6 +175,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->context = NULL; thread->suspend_context = NULL; thread->teb = 0; + thread->entry_point = 0; thread->debug_ctx = NULL; thread->debug_event = NULL; thread->debug_break = 0; @@ -497,6 +498,8 @@ static void set_thread_info( struct thread *thread, } if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); + if (req->mask & SET_THREAD_INFO_ENTRYPOINT) + thread->entry_point = req->entry_point; } /* stop a thread (at the Unix level) */ @@ -1284,6 +1287,7 @@ DECL_HANDLER(init_thread) current->unix_pid = req->unix_pid; current->unix_tid = req->unix_tid; current->teb = req->teb; + current->entry_point = req->entry; if (!process->peb) /* first thread, initialize the process too */ { diff --git a/server/thread.h b/server/thread.h index 996d95b..2821991 100644 --- a/server/thread.h +++ b/server/thread.h @@ -79,6 +79,7 @@ struct thread context_t *context; /* current context if in an exception handler */ context_t *suspend_context; /* current context if suspended */ client_ptr_t teb; /* TEB address (in client address space) */ + client_ptr_t entry_point; /* entry point (in client address space) */ affinity_t affinity; /* affinity mask */ int priority; /* priority level */ int suspend; /* suspend count */ diff --git a/server/trace.c b/server/trace.c index 3aa5271..da4f5b8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1323,6 +1323,7 @@ static void dump_set_thread_info_request( const struct set_thread_info_request * fprintf( stderr, ", mask=%d", req->mask ); fprintf( stderr, ", priority=%d", req->priority ); dump_uint64( ", affinity=", &req->affinity ); + dump_uint64( ", entry_point=", &req->entry_point ); fprintf( stderr, ", token=%04x", req->token ); }

1 0

Sebastian Lackner : server: Use a separate wineserver call to fetch thread times.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 6156cf31342e0aac45a5d15d89642fe6779332c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6156cf31342e0aac45a5d15d8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 18:30:53 2015 +0200 server: Use a separate wineserver call to fetch thread times. --- dlls/ntdll/thread.c | 6 ++---- include/wine/server_protocol.h | 23 +++++++++++++++++++---- server/protocol.def | 11 +++++++++-- server/request.h | 17 +++++++++++------ server/thread.c | 14 +++++++++++++- server/trace.c | 16 ++++++++++++++-- 6 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3696c8e..2781827 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -962,12 +962,10 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadTimes: { KERNEL_USER_TIMES kusrt; - /* We need to do a server call to get the creation time or exit time */ - /* This works on any thread */ - SERVER_START_REQ( get_thread_info ) + + SERVER_START_REQ( get_thread_times ) { req->handle = wine_server_obj_handle( handle ); - req->tid_in = 0; status = wine_server_call( req ); if (status == STATUS_SUCCESS) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8b186fa..ac0d2d0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -893,12 +893,24 @@ struct get_thread_info_reply thread_id_t tid; client_ptr_t teb; affinity_t affinity; - timeout_t creation_time; - timeout_t exit_time; int exit_code; int priority; int last; - char __pad_60[4]; + char __pad_44[4]; +}; + + + +struct get_thread_times_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_thread_times_reply +{ + struct reply_header __header; + timeout_t creation_time; + timeout_t exit_time; }; @@ -5295,6 +5307,7 @@ enum request REQ_get_process_info, REQ_set_process_info, REQ_get_thread_info, + REQ_get_thread_times, REQ_set_thread_info, REQ_get_dll_info, REQ_suspend_thread, @@ -5568,6 +5581,7 @@ union generic_request struct get_process_info_request get_process_info_request; struct set_process_info_request set_process_info_request; struct get_thread_info_request get_thread_info_request; + struct get_thread_times_request get_thread_times_request; struct set_thread_info_request set_thread_info_request; struct get_dll_info_request get_dll_info_request; struct suspend_thread_request suspend_thread_request; @@ -5839,6 +5853,7 @@ union generic_reply struct get_process_info_reply get_process_info_reply; struct set_process_info_reply set_process_info_reply; struct get_thread_info_reply get_thread_info_reply; + struct get_thread_times_reply get_thread_times_reply; struct set_thread_info_reply set_thread_info_reply; struct get_dll_info_reply get_dll_info_reply; struct suspend_thread_reply suspend_thread_reply; @@ -6096,6 +6111,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 481 +#define SERVER_PROTOCOL_VERSION 482 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0ff1a6b..3d7f7be 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -842,14 +842,21 @@ struct rawinput_device thread_id_t tid; /* server thread id */ client_ptr_t teb; /* thread teb pointer */ affinity_t affinity; /* thread affinity mask */ - timeout_t creation_time; /* thread creation time */ - timeout_t exit_time; /* thread exit time */ int exit_code; /* thread exit code */ int priority; /* thread priority level */ int last; /* last thread in process */ @END +/* Retrieve information about thread times */ +@REQ(get_thread_times) + obj_handle_t handle; /* thread handle */ +@REPLY + timeout_t creation_time; /* thread creation time */ + timeout_t exit_time; /* thread exit time */ +@END + + /* Set a thread information */ @REQ(set_thread_info) obj_handle_t handle; /* thread handle */ diff --git a/server/request.h b/server/request.h index 760466c..299b4ad 100644 --- a/server/request.h +++ b/server/request.h @@ -117,6 +117,7 @@ DECL_HANDLER(terminate_thread); DECL_HANDLER(get_process_info); DECL_HANDLER(set_process_info); DECL_HANDLER(get_thread_info); +DECL_HANDLER(get_thread_times); DECL_HANDLER(set_thread_info); DECL_HANDLER(get_dll_info); DECL_HANDLER(suspend_thread); @@ -389,6 +390,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_process_info, (req_handler)req_set_process_info, (req_handler)req_get_thread_info, + (req_handler)req_get_thread_times, (req_handler)req_set_thread_info, (req_handler)req_get_dll_info, (req_handler)req_suspend_thread, @@ -767,12 +769,15 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, teb) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, creation_time) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_time) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 56 ); -C_ASSERT( sizeof(struct get_thread_info_reply) == 64 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 40 ); +C_ASSERT( sizeof(struct get_thread_info_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, exit_time) == 16 ); +C_ASSERT( sizeof(struct get_thread_times_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 ); diff --git a/server/thread.c b/server/thread.c index 8471651..b8c73c6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1374,9 +1374,21 @@ DECL_HANDLER(get_thread_info) reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STATUS_PENDING; reply->priority = thread->priority; reply->affinity = thread->affinity; + reply->last = thread->process->running_threads == 1; + + release_object( thread ); + } +} + +/* fetch information about thread times */ +DECL_HANDLER(get_thread_times) +{ + struct thread *thread; + + if ((thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION ))) + { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time; - reply->last = thread->process->running_threads == 1; release_object( thread ); } diff --git a/server/trace.c b/server/trace.c index 42cff99..3aa5271 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1301,13 +1301,22 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, ", tid=%04x", req->tid ); dump_uint64( ", teb=", &req->teb ); dump_uint64( ", affinity=", &req->affinity ); - dump_timeout( ", creation_time=", &req->creation_time ); - dump_timeout( ", exit_time=", &req->exit_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", last=%d", req->last ); } +static void dump_get_thread_times_request( const struct get_thread_times_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_thread_times_reply( const struct get_thread_times_reply *req ) +{ + dump_timeout( " creation_time=", &req->creation_time ); + dump_timeout( ", exit_time=", &req->exit_time ); +} + static void dump_set_thread_info_request( const struct set_thread_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4256,6 +4265,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_process_info_request, (dump_func)dump_set_process_info_request, (dump_func)dump_get_thread_info_request, + (dump_func)dump_get_thread_times_request, (dump_func)dump_set_thread_info_request, (dump_func)dump_get_dll_info_request, (dump_func)dump_suspend_thread_request, @@ -4525,6 +4535,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_process_info_reply, NULL, (dump_func)dump_get_thread_info_reply, + (dump_func)dump_get_thread_times_reply, NULL, (dump_func)dump_get_dll_info_reply, (dump_func)dump_suspend_thread_reply, @@ -4794,6 +4805,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_process_info", "set_process_info", "get_thread_info", + "get_thread_times", "set_thread_info", "get_dll_info", "suspend_thread",

1 0

Bruno Jesus : ws2_32: Map IPPROTO_IPV6 protocol option.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: b6a095b9000b814ee0eeb9c75dafdc5b0389a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a095b9000b814ee0eeb9c75… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 29 14:48:30 2015 -0300 ws2_32: Map IPPROTO_IPV6 protocol option. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7e5276..b06d7e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -687,6 +687,7 @@ static const int ws_proto_map[][2] = MAP_OPTION( IPPROTO_IP ), MAP_OPTION( IPPROTO_TCP ), MAP_OPTION( IPPROTO_UDP ), + MAP_OPTION( IPPROTO_IPV6 ), MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ),

1 0

Hans Leidekker : wbemprox: Implement Win32_DesktopMonitor.PixelsPerXLogicalInch.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: deaf036992ba6aeb811ee77219ab862ad29ceb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaf036992ba6aeb811ee7721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:39:28 2015 +0200 wbemprox: Implement Win32_DesktopMonitor.PixelsPerXLogicalInch. --- dlls/wbemprox/builtin.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1e5c4a..1c960eb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -60,6 +60,8 @@ static const WCHAR class_compsysproductW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; static const WCHAR class_datafileW[] = {'C','I','M','_','D','a','t','a','F','i','l','e',0}; +static const WCHAR class_desktopmonitorW[] = + {'W','i','n','3','2','_','D','e','s','k','t','o','p','M','o','n','i','t','o','r',0}; static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = @@ -267,6 +269,8 @@ static const WCHAR prop_parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; static const WCHAR prop_physicaladapterW[] = {'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0}; +static const WCHAR prop_pixelsperxlogicalinchW[] = + {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = @@ -406,6 +410,10 @@ static const struct column col_datafile[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_desktopmonitor[] = +{ + { prop_pixelsperxlogicalinchW, CIM_UINT32 } +}; static const struct column col_directory[] = { { prop_accessmaskW, CIM_UINT32 }, @@ -789,6 +797,10 @@ struct record_datafile const WCHAR *name; const WCHAR *version; }; +struct record_desktopmonitor +{ + UINT32 pixelsperxlogicalinch; +}; struct record_directory { UINT32 accessmask; @@ -1658,6 +1670,35 @@ done: return status; } +static UINT32 get_pixelsperxlogicalinch(void) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 96; + ret = GetDeviceCaps( hdc, LOGPIXELSX ); + ReleaseDC( NULL, hdc ); + return ret; +} + +static enum fill_status fill_desktopmonitor( struct table *table, const struct expr *cond ) +{ + struct record_desktopmonitor *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_desktopmonitor *)table->data; + rec->pixelsperxlogicalinch = get_pixelsperxlogicalinch(); + + if (match_row( table, row, cond, &status )) row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static enum fill_status fill_directory( struct table *table, const struct expr *cond ) { static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; @@ -2859,6 +2900,7 @@ static struct table builtin_classes[] = { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, + { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition },

1 0

Hans Leidekker : winspool: Don't fail on empty server name in AddPrinterW.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: ccb19eed6997920d7182252178ac9963b4cc5f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb19eed6997920d718225217… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:39:01 2015 +0200 winspool: Don't fail on empty server name in AddPrinterW. --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8cfedfb..4549034 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3149,7 +3149,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); - if(pName != NULL) { + if(pName && *pName) { ERR("pName = %s - unsupported\n", debugstr_w(pName)); SetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

Hans Leidekker : wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: f7538bfe4734761f1090d079a9d55cef4c33463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7538bfe4734761f1090d079a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:38:39 2015 +0200 wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR. --- dlls/wininet/internet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 74f44b0..ee04f40 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2765,6 +2765,15 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); collect_connections(COLLECT_CONNECTIONS); return ERROR_SUCCESS; + + case INTERNET_OPTION_SUPPRESS_BEHAVIOR: + FIXME("INTERNET_OPTION_SUPPRESS_BEHAVIOR stub\n"); + + if(size != sizeof(ULONG)) + return ERROR_INTERNET_BAD_OPTION_LENGTH; + + FIXME("%08x\n", *(ULONG*)buf); + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
57
Older →

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 July 2015