April 2019 - Wine-Commits - list.winehq.org

Jacek Caban : server: Return client thread object pointer from get_next_device_request if available.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 2ee040382f1ae505b1109ee9c236a871f272a4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee040382f1ae505b1109ee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:43 2019 +0200 server: Return client thread object pointer from get_next_device_request if available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + include/wine/server_protocol.h | 5 ++--- server/device.c | 4 ++-- server/protocol.def | 2 +- server/request.h | 8 ++++---- server/trace.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 11c9f4a..d570a61 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -981,6 +981,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) client_tid = reply->client_tid; in_size = reply->in_size; out_size = reply->out_size; + NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); } else { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 60b02f7..88b933c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5240,12 +5240,11 @@ struct get_next_device_request_reply struct reply_header __header; irp_params_t params; obj_handle_t next; - process_id_t client_pid; thread_id_t client_tid; + client_ptr_t client_thread; data_size_t in_size; data_size_t out_size; /* VARARG(next_data,bytes); */ - char __pad_52[4]; }; @@ -6647,6 +6646,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 577 +#define SERVER_PROTOCOL_VERSION 578 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 7ee10cb..c798694 100644 --- a/server/device.c +++ b/server/device.c @@ -866,8 +866,8 @@ DECL_HANDLER(get_next_device_request) irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); if (irp->thread) { - reply->client_pid = get_process_id( irp->thread->process ); - reply->client_tid = get_thread_id( irp->thread ); + reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); + reply->client_tid = get_thread_id( irp->thread ); } reply->params = irp->params; iosb = irp->iosb; diff --git a/server/protocol.def b/server/protocol.def index 5adc83d..b6ad514 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3618,8 +3618,8 @@ struct handle_info @REPLY irp_params_t params; /* irp parameters */ obj_handle_t next; /* handle to the next irp */ - process_id_t client_pid; /* pid of process calling irp */ thread_id_t client_tid; /* tid of thread calling irp */ + client_ptr_t client_thread; /* pointer to thread object of calling irp */ data_size_t in_size; /* total needed input size */ data_size_t out_size; /* needed output size */ VARARG(next_data,bytes); /* input data of the next irp */ diff --git a/server/request.h b/server/request.h index b10ccd9..a3e9513 100644 --- a/server/request.h +++ b/server/request.h @@ -2287,10 +2287,10 @@ C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, params) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_pid) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 44 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_thread) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 52 ); C_ASSERT( sizeof(struct get_next_device_request_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_ptr_request, manager) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_ptr_request, handle) == 16 ); diff --git a/server/trace.c b/server/trace.c index 3562823..d4d0c3e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4285,8 +4285,8 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req { dump_irp_params( " params=", &req->params ); fprintf( stderr, ", next=%04x", req->next ); - fprintf( stderr, ", client_pid=%04x", req->client_pid ); fprintf( stderr, ", client_tid=%04x", req->client_tid ); + dump_uint64( ", client_thread=", &req->client_thread ); fprintf( stderr, ", in_size=%u", req->in_size ); fprintf( stderr, ", out_size=%u", req->out_size ); dump_varargs_bytes( ", next_data=", cur_size );

1 0

Jacek Caban : ntoskrnl.exe: Implement KeGetCurrentThread.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: f680eda832bdbd910f8916ea657bc2934669c8e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f680eda832bdbd910f8916ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:07 2019 +0200 ntoskrnl.exe: Implement KeGetCurrentThread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45844 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver.c | 24 +++++++++++++++--------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a02dc1c..403c398 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -961,6 +961,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { + NtCurrentTeb()->Reserved5[1] = NULL; if (!in_buff && !(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -2506,8 +2507,22 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - FIXME("() stub\n"); - return NULL; + struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + + if (!thread) + { + HANDLE handle = GetCurrentThread(); + + /* FIXME: we shouldn't need it, GetCurrentThread() should be client thread already */ + if (GetCurrentThreadId() == request_thread) handle = OpenThread( 0, FALSE, client_tid ); + + kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); + if (handle != GetCurrentThread()) NtClose( handle ); + + NtCurrentTeb()->Reserved5[1] = thread; + } + + return thread; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ac6568f..81baffa 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -210,15 +210,6 @@ static void *get_proc_address(const char *name) return ret; } -static void test_currentprocess(void) -{ - PEPROCESS current; - - current = IoGetCurrentProcess(); -todo_wine - ok(current != NULL, "Expected current process to be non-NULL\n"); -} - static FILE_OBJECT *last_created_file; static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) @@ -316,6 +307,21 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) return ZwWaitForSingleObject(handle, FALSE, &integer); } +static void test_currentprocess(void) +{ + PEPROCESS current; + PETHREAD thread; + NTSTATUS ret; + + current = IoGetCurrentProcess(); +todo_wine + ok(current != NULL, "Expected current process to be non-NULL\n"); + + thread = PsGetCurrentThread(); + ret = wait_single( thread, 0 ); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); +} + static void run_thread(PKSTART_ROUTINE proc, void *arg) { OBJECT_ATTRIBUTES attr = {0};

1 0

Piotr Caban : dbghelp: Don't use strcasecmp.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 061f65f9aaa5e6c9e34f407293906a2cc9033f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=061f65f9aaa5e6c9e34f4072… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:40 2019 +0200 dbghelp: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index adb66d6..54fbe36 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2684,7 +2684,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!strcasecmp(pdb_lookup->filename, imp->filename)) + if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index c077c07..58530e7 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -127,7 +127,7 @@ BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!strcasecmp(sectname, name)) + if (!_strnicmp(sectname, name, -1)) { ism->fmap = fmap; ism->sidx = i;

1 0

Józef Kucia : d3d11/tests: Reduce output produced by test_clear_buffer_unordered_access_view().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 18883a76762afab3e18e1279a9666240e19d4d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18883a76762afab3e18e1279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 19:01:27 2019 +0200 d3d11/tests: Reduce output produced by test_clear_buffer_unordered_access_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 64729d5..3d6cbf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14524,31 +14524,36 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { + const struct uvec4 *data = NULL; + BOOL all_match; + uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); const struct uvec4 broken_result = {uvec4.x, uvec4.x, uvec4.x, uvec4.x}; /* Intel */ - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + data = get_readback_uvec4(&rb, x, 0); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); struct uvec4 broken_result; + data = get_readback_uvec4(&rb, x, 0); uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; broken_result.x = broken_result.y = broken_result.z = broken_result.w = uvec4.x; - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); } @@ -14574,17 +14579,16 @@ static void test_clear_buffer_unordered_access_view(void) uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); - } + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement, 0, 0), &fe_uvec4); release_resource_readback(&rb); }

1 0

Jacek Caban : ntoskrnl.exe: Reimplement PsGetCurrentProcessId and PsGetCurrentThreadId on top of KeGetCurrentThread.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: d9d55bb1d02f81d61f56bea511939508dd245275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9d55bb1d02f81d61f56bea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:29 2019 +0200 ntoskrnl.exe: Reimplement PsGetCurrentProcessId and PsGetCurrentThreadId on top of KeGetCurrentThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 403c398..11c9f4a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -93,9 +93,8 @@ static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', /* tid of the thread running client request */ static DWORD request_thread; -/* pid/tid of the client thread */ +/* tid of the client thread */ static DWORD client_tid; -static DWORD client_pid; struct wine_driver { @@ -980,7 +979,6 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) irp = wine_server_ptr_handle( reply->next ); irp_params = reply->params; client_tid = reply->client_tid; - client_pid = reply->client_pid; in_size = reply->in_size; out_size = reply->out_size; } @@ -2482,12 +2480,17 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) static void *create_thread_object( HANDLE handle ) { + THREAD_BASIC_INFORMATION info; struct _KTHREAD *thread; if (!(thread = alloc_kernel_object( PsThreadType, handle, sizeof(*thread), 0 ))) return NULL; thread->header.Type = 6; thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + + if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) + thread->id = info.ClientId; + return thread; } @@ -2971,9 +2974,7 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, */ HANDLE WINAPI PsGetCurrentProcessId(void) { - if (GetCurrentThreadId() == request_thread) - return UlongToHandle(client_pid); - return UlongToHandle(GetCurrentProcessId()); + return KeGetCurrentThread()->id.UniqueProcess; } @@ -2982,9 +2983,7 @@ HANDLE WINAPI PsGetCurrentProcessId(void) */ HANDLE WINAPI PsGetCurrentThreadId(void) { - if (GetCurrentThreadId() == request_thread) - return UlongToHandle(client_tid); - return UlongToHandle(GetCurrentThreadId()); + return KeGetCurrentThread()->id.UniqueThread; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 4b58182..f5a7628 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -31,6 +31,7 @@ struct _OBJECT_TYPE struct _KTHREAD { DISPATCHER_HEADER header; + CLIENT_ID id; }; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Don' t use a shared mono install with no drive letter.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 30baa2a833a0bbd744425a85b6ce57529aa29b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30baa2a833a0bbd744425a85… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 8 11:03:56 2019 -0500 mscoree: Don't use a shared mono install with no drive letter. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 50d43b3..1b2abd2 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -712,6 +712,7 @@ static BOOL get_mono_path_registry(LPWSTR path) static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) { + static const WCHAR unix_prefix[] = {'\\','\\','?','\\','u','n','i','x','\\'}; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); LPWSTR dos_dir; WCHAR mono_dll_path[MAX_PATH]; @@ -728,6 +729,13 @@ static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) if (!dos_dir) return FALSE; + if (memcmp(dos_dir, unix_prefix, sizeof(unix_prefix)) == 0) + { + /* No drive letter for this directory */ + heap_free(dos_dir); + return FALSE; + } + ret = find_mono_dll(dos_dir, mono_dll_path); if (ret) strcpyW(path, dos_dir);

1 0

Alexandre Julliard : ntdll: Avoid using DPRINTF().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a184ce483bfe70e9fa8fb95f6a6f2a2062842ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a184ce483bfe70e9fa8fb95f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:09 2019 +0200 ntdll: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index bdadc79..cccaaee 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -340,13 +340,13 @@ static void HEAP_Dump( HEAP *heap ) SUBHEAP *subheap; char *ptr; - DPRINTF( "Heap: %p\n", heap ); - DPRINTF( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); - LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) DPRINTF( " %p", subheap ); + TRACE( "Heap: %p\n", heap ); + TRACE( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) TRACE( " %p", subheap ); - DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); + TRACE( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - DPRINTF( "%p free %08lx prev=%p next=%p\n", + TRACE( "%p free %08lx prev=%p next=%p\n", &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), @@ -355,17 +355,17 @@ static void HEAP_Dump( HEAP *heap ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { SIZE_T freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; - DPRINTF( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", + TRACE( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", subheap, subheap->base, subheap->size, subheap->commitSize ); - DPRINTF( "\n Block Arena Stat Size Id\n" ); + TRACE( "\n Block Arena Stat Size Id\n" ); ptr = (char *)subheap->base + subheap->headerSize; while (ptr < (char *)subheap->base + subheap->size) { if (*(DWORD *)ptr & ARENA_FLAG_FREE) { ARENA_FREE *pArena = (ARENA_FREE *)ptr; - DPRINTF( "%p %08x free %08x prev=%p next=%p\n", + TRACE( "%p %08x free %08x prev=%p next=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ), @@ -377,7 +377,7 @@ static void HEAP_Dump( HEAP *heap ) else if (*(DWORD *)ptr & ARENA_FLAG_PREV_FREE) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x Used %08x back=%p\n", + TRACE( "%p %08x Used %08x back=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); @@ -386,7 +386,7 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x %s %08x\n", + TRACE( "%p %08x %s %08x\n", pArena, pArena->magic, pArena->magic == ARENA_INUSE_MAGIC ? "used" : "pend", pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); @@ -394,7 +394,7 @@ static void HEAP_Dump( HEAP *heap ) usedSize += pArena->size & ARENA_SIZE_MASK; } } - DPRINTF( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", + TRACE( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", subheap->size, subheap->commitSize, freeSize, usedSize, arenaSize, (arenaSize * 100) / subheap->size ); }

1 0

Sebastian Lackner : user32: Implement CWF_CREATE_ONLY flag for CreateWindowStation.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: c02407e9a3ea57fe51e88f0fc40d9552927fc634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02407e9a3ea57fe51e88f0f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 8 05:37:30 2019 +0000 user32: Implement CWF_CREATE_ONLY flag for CreateWindowStation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 11 ++++++----- include/winuser.h | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 673917c..4f53b43 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -83,26 +83,26 @@ static HANDLE get_winstations_dir_handle(void) /*********************************************************************** * CreateWindowStationA (USER32.@) */ -HWINSTA WINAPI CreateWindowStationA( LPCSTR name, DWORD reserved, ACCESS_MASK access, +HWINSTA WINAPI CreateWindowStationA( LPCSTR name, DWORD flags, ACCESS_MASK access, LPSECURITY_ATTRIBUTES sa ) { WCHAR buffer[MAX_PATH]; - if (!name) return CreateWindowStationW( NULL, reserved, access, sa ); + if (!name) return CreateWindowStationW( NULL, flags, access, sa ); if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) { SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } - return CreateWindowStationW( buffer, reserved, access, sa ); + return CreateWindowStationW( buffer, flags, access, sa ); } /*********************************************************************** * CreateWindowStationW (USER32.@) */ -HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD reserved, ACCESS_MASK access, +HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK access, LPSECURITY_ATTRIBUTES sa ) { HANDLE ret; @@ -117,7 +117,8 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD reserved, ACCESS_MASK a { req->flags = 0; req->access = access; - req->attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | + req->attributes = OBJ_CASE_INSENSITIVE | + ((flags & CWF_CREATE_ONLY) ? 0 : OBJ_OPENIF) | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); req->rootdir = wine_server_obj_handle( get_winstations_dir_handle() ); wine_server_add_data( req, name, len * sizeof(WCHAR) ); diff --git a/include/winuser.h b/include/winuser.h index 3cffaa1..28b9b1f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -101,6 +101,8 @@ typedef void* HPOWERNOTIFY; #define WSF_VISIBLE 1 #define DF_ALLOWOTHERACCOUNTHOOK 1 +#define CWF_CREATE_ONLY 0x01 + typedef struct tagUSEROBJECTFLAGS { BOOL fInherit; BOOL fReserved;

1 0

Józef Kucia : wined3d: Implement adapter_vk_get_wined3d_caps().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: f32ea05821a34602aa2b9398becccfe50b7e7ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32ea05821a34602aa2b9398… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:33 2019 +0200 wined3d: Implement adapter_vk_get_wined3d_caps(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 125 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/directx.c | 6 +- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 117 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f32ea05821a34602aa2b…

1 0

Józef Kucia : wined3d: Initialise driver and device UUID for Vulkan adapters.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 806c97a6152743114cc539ee7c801ac7a8969595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=806c97a6152743114cc539ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:34 2019 +0200 wined3d: Initialise driver and device UUID for Vulkan adapters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 47 ++++++++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_vk.h | 8 +++++++- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8ef0aea..2c6ea25 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -29,6 +29,12 @@ static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); } +static const char *debug_vk_version(uint32_t version) +{ + return wine_dbg_sprintf("%u.%u.%u", + VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -226,10 +232,12 @@ static unsigned int wined3d_get_wine_vk_version(void) static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; VkApplicationInfo app_info; + uint32_t api_version = 0; char app_name[MAX_PATH]; VkResult vr; @@ -242,13 +250,23 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + vk_info->api_version = VK_API_VERSION_1_0; + if ((pfn_vkEnumerateInstanceVersion = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"))) + && pfn_vkEnumerateInstanceVersion(&api_version) == VK_SUCCESS) + { + TRACE("Vulkan instance API version %s.\n", debug_vk_version(api_version)); + + if (api_version >= VK_API_VERSION_1_1) + vk_info->api_version = VK_API_VERSION_1_1; + } + memset(&app_info, 0, sizeof(app_info)); app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) app_info.pApplicationName = app_name; app_info.pEngineName = "Damavand"; app_info.engineVersion = wined3d_get_wine_vk_version(); - app_info.apiVersion = VK_API_VERSION_1_0; + app_info.apiVersion = vk_info->api_version; memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -267,11 +285,15 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) WARN("Could not get instance proc addr for '" #name "'.\n"); \ goto fail; \ } +#define LOAD_INSTANCE_OPT_PFN(name) \ + vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)); #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN +#define VK_INSTANCE_EXT_PFN LOAD_INSTANCE_OPT_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN VK_INSTANCE_FUNCS() VK_DEVICE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN vk_info->instance = instance; @@ -324,8 +346,7 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(properties->apiVersion), - VK_VERSION_MINOR(properties->apiVersion), VK_VERSION_PATCH(properties->apiVersion)); + TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) return description; @@ -342,7 +363,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -359,16 +381,27 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; - VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties)); - adapter_vk->device_limits = properties.limits; + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; - if (!(gpu_description = get_vulkan_gpu_description(&properties))) + if (vk_info->api_version >= VK_API_VERSION_1_1) + VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); + adapter_vk->device_limits = properties2.properties.limits; + + if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); + memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); + if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 784dd0c..10c706a 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -38,7 +38,9 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ - VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) \ + /* Vulkan 1.1 */ \ + VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) #define VK_DEVICE_FUNCS() \ VK_DEVICE_PFN(vkAllocateCommandBuffers) \ @@ -167,10 +169,12 @@ struct vulkan_ops { #define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN VK_DEVICE_FUNCS() VK_INSTANCE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN PFN_vkCreateInstance vkCreateInstance; @@ -182,6 +186,8 @@ struct wined3d_vk_info VkInstance instance; struct vulkan_ops vk_ops; + unsigned int api_version; + #ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; #endif

1 0