July 2021 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : oleaut32: ICreateTypeInfo2::AddVarDesc() should handle failure of allocation and initialization of a variant description.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: d3d6f94ab13af83ce803209450b52ecb7abaf480 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3d6f94ab13af83ce8032094… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 25 13:12:11 2021 +0300 oleaut32: ICreateTypeInfo2::AddVarDesc() should handle failure of allocation and initialization of a variant description. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4669b03d5fc..0526af0abdb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11019,6 +11019,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBVarDesc *var_desc; + HRESULT hr; TRACE("%p %u %p\n", This, index, varDesc); @@ -11044,7 +11045,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); TLBVarDesc_Constructor(var_desc); - TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + hr = TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + if (FAILED(hr)) + return hr; var_desc->vardesc = *var_desc->vardesc_create; ++This->typeattr.cVars;

1 0

Hugh McMaster : reg/tests: Test use of registry views when querying registry values.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 45955658e18b65d3af701885e2cfa58bd0c95ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=45955658e18b65d3af701885… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 1 23:22:49 2021 +1000 reg/tests: Test use of registry views when querying registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index eca392b64d9..dcc98a9a0c4 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -322,6 +322,12 @@ static const char *test9b = "\r\n" " Test4 REG_DWORD 0xabc\r\n" " Wine REG_SZ Second instance\r\n\r\n"; +static const char *test9c = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + static void create_test_key(REGSAM sam) { HKEY hkey, subkey; @@ -367,6 +373,10 @@ static void test_registry_view_win32(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, 0); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); /* Try querying the 64-bit registry view, which doesn't exist on 32-bit Windows */ @@ -380,6 +390,10 @@ static void test_registry_view_win32(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, 0); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); } @@ -407,6 +421,10 @@ static void test_registry_view_win64(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, TODO_REG_COMPARE); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -421,6 +439,10 @@ static void test_registry_view_win64(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, 0); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); } @@ -447,6 +469,10 @@ static void test_registry_view_wow64(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, 0); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, 0); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -461,6 +487,10 @@ static void test_registry_view_wow64(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + read_reg_output("reg query HKLM\\" KEY_BASE " /v Wine /s /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9c, TRUE, TODO_REG_COMPARE); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); }

1 0

Hugh McMaster : reg/tests: Verify key opening and key deletion in delete_tree().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 5115e51adb103f023600269ddc1833386fcc1e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5115e51adb103f023600269d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 1 23:22:47 2021 +1000 reg/tests: Verify key opening and key deletion in delete_tree(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 7 +++++-- programs/reg/tests/reg_test.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 36fa634796d..469f354de39 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -154,7 +154,7 @@ void delete_key_(const char *file, unsigned line, HKEY root, const char *path, R } } -LONG delete_tree(HKEY root, const char *path, REGSAM sam) +LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam) { HKEY hkey; LONG ret; @@ -163,6 +163,7 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) static const char empty[1]; ret = RegOpenKeyExA(root, path, 0, KEY_READ|sam, &hkey); + lok(!ret || ret == ERROR_FILE_NOT_FOUND, "RegOpenKeyExA failed, got error %d\n", ret); if (ret) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, @@ -184,7 +185,7 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) break; if (ret) goto cleanup; - ret = delete_tree(hkey, subkey_name, sam); + ret = delete_tree_(file, line, hkey, subkey_name, sam); if (ret) goto cleanup; } @@ -193,6 +194,8 @@ LONG delete_tree(HKEY root, const char *path, REGSAM sam) else ret = RegDeleteKeyExA(hkey, empty, sam, 0); + lok(!ret, "Failed to delete registry key, got error %d\n", ret); + cleanup: HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index a5d7169beb4..3f64e552a19 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -64,7 +64,8 @@ void add_key_(const char *file, unsigned line, const HKEY root, const char *path #define delete_key(r,p,s) delete_key_(__FILE__,__LINE__,r,p,s) void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); -LONG delete_tree(HKEY root, const char *path, REGSAM sam); +#define delete_tree(r,p,s) delete_tree_(__FILE__,__LINE__,r,p,s) +LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); #define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) void add_value_(const char *file, unsigned line, HKEY hkey, const char *name,

1 0

Alexandre Julliard : kernelbase: Implement ProcessIdToSessionId().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 7995d6869a0b232dfb0956005ba8c863653a0845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7995d6869a0b232dfb095600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:30:48 2021 +0200 kernelbase: Implement ProcessIdToSessionId(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 7296e085382..101d3fa3213 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1024,11 +1024,20 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenProcess( DWORD access, BOOL inherit, DWORD i /*********************************************************************** * ProcessIdToSessionId (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH ProcessIdToSessionId( DWORD procid, DWORD *sessionid ) +BOOL WINAPI DECLSPEC_HOTPATCH ProcessIdToSessionId( DWORD pid, DWORD *id ) { - if (procid != GetCurrentProcessId()) FIXME( "Unsupported for other process %x\n", procid ); - *sessionid = NtCurrentTeb()->Peb->SessionId; - return TRUE; + HANDLE process; + NTSTATUS status; + + if (pid == GetCurrentProcessId()) + { + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; + } + if (!(process = OpenProcess( PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid ))) return FALSE; + status = NtQueryInformationProcess( process, ProcessSessionInformation, id, sizeof(*id), NULL ); + CloseHandle( process ); + return set_ntstatus( status ); }

1 0

Henri Verbeet : dxgi: Implement d3d12_swapchain_GetLastPresentCount().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: d55348d2b168c6e5727bbde5a887d5881bc2e836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55348d2b168c6e5727bbde5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:32 2021 +0200 dxgi: Implement d3d12_swapchain_GetLastPresentCount(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 11 +++++++---- dlls/dxgi/tests/dxgi.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a2a85f75bac..5df483f2615 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2179,10 +2179,9 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } + ++swapchain->frame_number; if ((frame_latency_event = swapchain->frame_latency_event)) { - ++swapchain->frame_number; - if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->frame_latency_fence, swapchain->frame_number))) { @@ -2505,9 +2504,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapCha static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetLastPresentCount(IDXGISwapChain4 *iface, UINT *last_present_count) { - FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); - return E_NOTIMPL; + TRACE("iface %p, last_present_count %p.\n", iface, last_present_count); + + *last_present_count = swapchain->frame_number; + + return S_OK; } /* IDXGISwapChain1 methods */ diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1e5f9d9cb22..7a4204c61b5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7476,29 +7476,28 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!present_count, "Got unexpected present count %u.\n", present_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); @@ -7506,18 +7505,16 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_NORMAL); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) - ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); DestroyWindow(window);

1 0

Rémi Bernon : wineusb.sys: Return STATUS_DELETE_PENDING when device is removed.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 0b9d1d9ffbec57fa0642d33c06a4ff6a5bf54f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9d1d9ffbec57fa0642d33c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 09:51:24 2021 +0200 wineusb.sys: Return STATUS_DELETE_PENDING when device is removed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index a72095409ff..fae297915fc 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -726,9 +726,21 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct usb_device *device = device_obj->DeviceExtension; NTSTATUS status = STATUS_NOT_IMPLEMENTED; + BOOL removed; TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code); + EnterCriticalSection(&wineusb_cs); + removed = device->removed; + LeaveCriticalSection(&wineusb_cs); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + switch (code) { case IOCTL_INTERNAL_USB_SUBMIT_URB:

1 0

Alexandre Julliard : server: Store session id in the process and return it at process init time.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: ad93413c71b8f36c3303988af524230660ebd154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad93413c71b8f36c3303988a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:26:47 2021 +0200 server: Store session id in the process and return it at process init time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/server.c | 1 + include/wine/server_protocol.h | 4 ++-- server/directory.c | 2 +- server/process.c | 1 + server/process.h | 3 +++ server/protocol.def | 1 + server/request.h | 3 ++- server/thread.c | 1 + server/trace.c | 1 + 10 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5d5562e27c0..077c0058c83 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2006,7 +2006,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; - peb->SessionId = 1; if (NtCurrentTeb()->WowTebOffset) { diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5e3d7347a24..567f50d0ad7 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1513,6 +1513,7 @@ size_t server_init_process(void) ret = wine_server_call( req ); pid = reply->pid; tid = reply->tid; + peb->SessionId = reply->session_id; info_size = reply->info_size; server_start_time = reply->server_start; supported_machines_count = wine_server_reply_size( reply ) / sizeof(*supported_machines); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d73f493edd3..32cbc928c76 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -933,9 +933,9 @@ struct init_first_thread_reply process_id_t pid; thread_id_t tid; timeout_t server_start; + unsigned int session_id; data_size_t info_size; /* VARARG(machines,ushorts); */ - char __pad_28[4]; }; @@ -6251,7 +6251,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 720 +#define SERVER_PROTOCOL_VERSION 721 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 30d69459984..ec8187b425a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -462,7 +462,7 @@ void init_directories( struct fd *intl_fd ) /* sessions */ create_session( 0 ); - create_session( 1 ); + create_session( default_session_id ); /* object types */ diff --git a/server/process.c b/server/process.c index 9288bcc27d5..ad79a5ed640 100644 --- a/server/process.c +++ b/server/process.c @@ -686,6 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; + process->session_id = default_session_id; /* Assign a high security label to the token. The default would be medium * but Wine provides admin access to all applications right now so high diff --git a/server/process.h b/server/process.h index 0e1a83859d9..55e4d6dced6 100644 --- a/server/process.h +++ b/server/process.h @@ -51,6 +51,7 @@ struct process struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ process_id_t group_id; /* group id of the process */ + unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ @@ -142,4 +143,6 @@ static inline int is_process_init_done( struct process *process ) return process->startup_state == STARTUP_DONE; } +static const unsigned int default_session_id = 1; + #endif /* __WINE_SERVER_PROCESS_H */ diff --git a/server/protocol.def b/server/protocol.def index 59ed5632503..ae9a54197a1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -911,6 +911,7 @@ typedef struct process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ timeout_t server_start; /* server start time */ + unsigned int session_id; /* process session id */ data_size_t info_size; /* total size of startup info */ VARARG(machines,ushorts); /* array of supported machines */ @END diff --git a/server/request.h b/server/request.h index 63b09358612..342f8d159f1 100644 --- a/server/request.h +++ b/server/request.h @@ -752,7 +752,8 @@ C_ASSERT( sizeof(struct init_first_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, session_id) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 28 ); C_ASSERT( sizeof(struct init_first_thread_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, unix_tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, reply_fd) == 16 ); diff --git a/server/thread.c b/server/thread.c index f9535a7b25b..e0c520ee37c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1431,6 +1431,7 @@ DECL_HANDLER(init_first_thread) reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); + reply->session_id = process->session_id; reply->info_size = get_process_startup_info_size( process ); reply->server_start = server_start_time; set_reply_data( supported_machines, diff --git a/server/trace.c b/server/trace.c index b3eea846453..d5d58c21588 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1530,6 +1530,7 @@ static void dump_init_first_thread_reply( const struct init_first_thread_reply * fprintf( stderr, " pid=%04x", req->pid ); fprintf( stderr, ", tid=%04x", req->tid ); dump_timeout( ", server_start=", &req->server_start ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", info_size=%u", req->info_size ); dump_varargs_ushorts( ", machines=", cur_size ); }

1 0

Alexandre Julliard : ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation).
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: bf4105b731b84c053c20796ad122f229fa3889ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4105b731b84c053c20796a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:29:55 2021 +0200 ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 16 +++++++++++++++- include/wine/server_protocol.h | 5 +++-- server/process.c | 1 + server/protocol.def | 1 + server/request.h | 7 ++++--- server/trace.c | 1 + 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 140e7fc8e0d..90bf01d76fd 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -987,7 +987,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost); UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); - UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation); UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); @@ -1272,6 +1271,21 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessSessionInformation: + len = sizeof(DWORD); + if (size == len) + { + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) + *(DWORD *)info = reply->session_id; + } + SERVER_END_REQ; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case ProcessWow64Information: len = sizeof(ULONG_PTR); if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 32cbc928c76..92ceaf9f8a4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1004,11 +1004,12 @@ struct get_process_info_reply client_ptr_t peb; timeout_t start_time; timeout_t end_time; + unsigned int session_id; int exit_code; int priority; unsigned short machine; /* VARARG(image,pe_image_info); */ - char __pad_58[6]; + char __pad_62[2]; }; @@ -6251,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 721 +#define SERVER_PROTOCOL_VERSION 722 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index ad79a5ed640..8ca19122e74 100644 --- a/server/process.c +++ b/server/process.c @@ -1456,6 +1456,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; + reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) { diff --git a/server/protocol.def b/server/protocol.def index ae9a54197a1..952f5b193b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -957,6 +957,7 @@ typedef struct client_ptr_t peb; /* PEB address in process address space */ timeout_t start_time; /* process start time */ timeout_t end_time; /* process end time */ + unsigned int session_id; /* process session id */ int exit_code; /* process exit code */ int priority; /* priority class */ unsigned short machine; /* process architecture */ diff --git a/server/request.h b/server/request.h index 342f8d159f1..19e5a2a84f1 100644 --- a/server/request.h +++ b/server/request.h @@ -781,9 +781,10 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, affinity) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, peb) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, session_id) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 52 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 60 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index d5d58c21588..dee0a893e77 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1584,6 +1584,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_uint64( ", peb=", &req->peb ); dump_timeout( ", start_time=", &req->start_time ); dump_timeout( ", end_time=", &req->end_time ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", machine=%04x", req->machine );

1 0

Alexandre Julliard : ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: b20cbd0d571302e33ab602fa6670a131ae4353ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20cbd0d571302e33ab602fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:15:26 2021 +0200 ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 1 + include/wine/server_protocol.h | 4 ++-- server/process.c | 1 + server/protocol.def | 2 +- server/trace.c | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 0e601beec15..6bd642c30d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2294,6 +2294,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, nt_process->dwBasePriority = server_process->priority; nt_process->UniqueProcessId = UlongToHandle(server_process->pid); nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->SessionId = server_process->session_id; nt_process->HandleCount = server_process->handle_count; get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 92ceaf9f8a4..d6815b7e349 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2010,9 +2010,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; }; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 722 +#define SERVER_PROTOCOL_VERSION 723 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 8ca19122e74..c2131a2d7e2 100644 --- a/server/process.c +++ b/server/process.c @@ -1874,6 +1874,7 @@ DECL_HANDLER(list_processes) process_info->priority = process->priority; process_info->pid = process->id; process_info->parent_pid = process->parent_id; + process_info->session_id = process->session_id; process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); diff --git a/server/protocol.def b/server/protocol.def index 952f5b193b2..8eb7e3e99ca 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1609,9 +1609,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; /* VARARG(name,unicode_str,name_len); */ /* VARARG(threads,struct thread_info,thread_count); */ }; diff --git a/server/trace.c b/server/trace.c index dee0a893e77..f27cc47170b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1220,9 +1220,9 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); dump_timeout( "{start_time=", &process->start_time ); - fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", + fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,session_id=%08x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, - process->parent_pid, process->handle_count, process->unix_pid ); + process->parent_pid, process->session_id, process->handle_count, process->unix_pid ); pos += sizeof(*process); pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size );

1 0

Alexandre Julliard : server: Store the session id in the process token.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 2b5cefc92e1bc78b9e5d73a54454a3cba771b19f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5cefc92e1bc78b9e5d73a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:20:08 2021 +0200 server: Store the session id in the process token. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 4 ++-- server/security.h | 3 ++- server/token.c | 19 +++++++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/server/process.c b/server/process.c index c2131a2d7e2..15387a2affa 100644 --- a/server/process.c +++ b/server/process.c @@ -664,7 +664,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla if (!parent) { process->handles = alloc_handle_table( process, 0 ); - process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull ); + process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull, default_session_id ); process->affinity = ~0; } else @@ -686,7 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; - process->session_id = default_session_id; + process->session_id = token_get_session_id( process->token ); /* Assign a high security label to the token. The default would be medium * but Wine provides admin access to all applications right now so high diff --git a/server/security.h b/server/security.h index f7e644aa1b7..5388bc9c419 100644 --- a/server/security.h +++ b/server/security.h @@ -54,7 +54,7 @@ extern const PSID security_high_label_sid; /* token functions */ extern struct token *get_token_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation ); +extern struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation, unsigned int session_id ); extern int token_assign_label( struct token *token, PSID label ); extern struct token *token_duplicate( struct token *src_token, unsigned primary, int impersonation_level, const struct security_descriptor *sd, @@ -66,6 +66,7 @@ extern int token_check_privileges( struct token *token, int all_required, extern const ACL *token_get_default_dacl( struct token *token ); extern const SID *token_get_user( struct token *token ); extern const SID *token_get_primary_group( struct token *token ); +extern unsigned int token_get_session_id( struct token *token ); extern int token_sid_present( struct token *token, const SID *sid, int deny); static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace ) diff --git a/server/token.c b/server/token.c index fed7d93753e..9c72c2a6bed 100644 --- a/server/token.c +++ b/server/token.c @@ -122,7 +122,8 @@ struct token SID *user; /* SID of user this token represents */ SID *owner; /* SID of owner (points to user or one of groups) */ SID *primary_group; /* SID of user's primary group (points to one of groups) */ - unsigned primary; /* is this a primary or impersonation token? */ + unsigned int primary; /* is this a primary or impersonation token? */ + unsigned int session_id; /* token session id */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ int impersonation_level; /* impersonation level this token is capable of if non-primary token */ @@ -537,7 +538,7 @@ static void token_destroy( struct object *obj ) * modified_id may be NULL, indicating that a new modified_id luid should be * allocated. */ -static struct token *create_token( unsigned primary, const SID *user, +static struct token *create_token( unsigned int primary, unsigned int session_id, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, @@ -557,6 +558,7 @@ static struct token *create_token( unsigned primary, const SID *user, list_init( &token->privileges ); list_init( &token->groups ); token->primary = primary; + token->session_id = session_id; /* primary tokens don't have impersonation levels */ if (primary) token->impersonation_level = -1; @@ -677,7 +679,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } - token = create_token( primary, src_token->user, NULL, 0, + token = create_token( primary, src_token->session_id, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, impersonation_level, src_token->elevation ); @@ -830,7 +832,7 @@ struct token *get_token_obj( struct process *process, obj_handle_t handle, unsig return (struct token *)get_handle_obj( process, handle, access, &token_ops ); } -struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation ) +struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation, unsigned int session_id ) { struct token *token = NULL; static const SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; @@ -890,7 +892,7 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( primary, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), + token = create_token( primary, session_id, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, admin_source, NULL, impersonation_level, elevation ); /* we really need a primary group */ @@ -1197,6 +1199,11 @@ const SID *token_get_primary_group( struct token *token ) return token->primary_group; } +unsigned int token_get_session_id( struct token *token ) +{ + return token->session_id; +} + int check_object_access(struct token *token, struct object *obj, unsigned int *access) { generic_map_t mapping; @@ -1669,7 +1676,7 @@ DECL_HANDLER(create_linked_token) release_object( token ); return; } - if ((linked = token_create_admin( FALSE, SecurityIdentification, elevation ))) + if ((linked = token_create_admin( FALSE, SecurityIdentification, elevation, token->session_id ))) { reply->linked = alloc_handle( current->process, linked, TOKEN_ALL_ACCESS, 0 ); release_object( linked );

1 0