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

Jacek Caban : ntoskrnl.exe: Implement KeGetCurrentThread.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Jacek Caban : ntoskrnl.exe: Reimplement PsGetCurrentProcessId and PsGetCurrentThreadId on top of KeGetCurrentThread.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Jacek Caban : server: Return client thread object pointer from get_next_device_request if available.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Józef Kucia : d3d11/tests: Use check_readback_data_color() in test_clear_buffer_unordered_access_view().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: a9b53f5912c22bc9fc01b8322b7a954101eb32a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b53f5912c22bc9fc01b832… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 19:01:26 2019 +0200 d3d11/tests: Use check_readback_data_color() in 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 | 78 ++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9b53f5912c22bc9fc01…

1 0

Józef Kucia : d3d11/tests: Reduce output produced by test_clear_buffer_unordered_access_view().
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Zebediah Figura : qcap/tests: Add some tests for querying AVI compressor pin information.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 181e02259dbb28dbc2ade7f3df3f5c2f3ac69136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=181e02259dbb28dbc2ade7f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:58 2019 -0500 qcap/tests: Add some tests for querying AVI compressor pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 540c343..5c60846 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -224,6 +224,57 @@ static void test_find_pin(IBaseFilter *filter) IEnumPins_Release(enum_pins); } +static void test_pin_info(IBaseFilter *filter) +{ + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); +} + static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { @@ -292,6 +343,7 @@ START_TEST(avico) test_interfaces(filter); test_enum_pins(filter); test_find_pin(filter); + test_pin_info(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Sebastian Lackner : dinput: Avoid deadlock when CS are acquired in different order.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 02f0342833f6a6affced820519003d954681a7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f0342833f6a6affced8205… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 8 03:48:16 2019 +0000 dinput: Avoid deadlock when CS are acquired in different order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43356 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 8 ++++---- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/dinput_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 322c8ac..6c44616 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -994,9 +994,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection(&This->crit); res = This->acquired ? S_FALSE : DI_OK; This->acquired = 1; - if (res == DI_OK) - check_dinput_hooks(iface); LeaveCriticalSection(&This->crit); + if (res == DI_OK) + check_dinput_hooks(iface, TRUE); return res; } @@ -1022,9 +1022,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection(&This->crit); res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; - if (res == DI_OK) - check_dinput_hooks(iface); LeaveCriticalSection(&This->crit); + if (res == DI_OK) + check_dinput_hooks(iface, FALSE); return res; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 66dc6e3..65aaf92 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1834,7 +1834,7 @@ static BOOL check_hook_thread(void) return hook_thread_id != 0; } -void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) +void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) { static HHOOK callwndproc_hook; static ULONG foreground_cnt; @@ -1844,7 +1844,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) if (dev->dwCoopLevel & DISCL_FOREGROUND) { - if (dev->acquired) + if (acquired) foreground_cnt++; else foreground_cnt--; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index abdfbeb..acda6c8 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,7 +71,7 @@ extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; -extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; +extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W, BOOL) DECLSPEC_HIDDEN; extern void check_dinput_events(void) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);

1 0

Sebastian Lackner : user32: Implement CWF_CREATE_ONLY flag for CreateWindowStation.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Nikolay Sivov : include: Add more audio format tags.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: e327a12d6da4bb7acfec88f01c9404bc9a449a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e327a12d6da4bb7acfec88f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:26:51 2019 +0300 include: Add more audio format tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mmreg.h | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 206 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e327a12d6da4bb7acfec…

1 0

Nikolay Sivov : dbgeng: Implement engine options access methods.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: a346e44c7fe931b795eb0a3aa706941f7b894e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a346e44c7fe931b795eb0a3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:35:39 2019 +0300 dbgeng: Implement engine options access methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dbgeng/dbgeng.c | 41 +++++++++++++---- dlls/dbgeng/tests/Makefile.in | 5 ++ dlls/dbgeng/tests/dbgeng.c | 105 ++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 27 +++++++++++ 6 files changed, 171 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a346e44c7fe931b795eb…

1 0