wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Jeremy Newman : WWN 408
by Jeremy Newman 03 Dec '21

03 Dec '21

Module: website Branch: master Commit: a513721d10894df4261dace3feae4baabbc462c3 URL: https://source.winehq.org/git/website.git/?a=commit;h=a513721d10894df4261da… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 3 10:17:52 2021 -0600 WWN 408 --- news/en/2021120301.xml | 12 +++++++++++ wwn/en/wn20211203_408.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/news/en/2021120301.xml b/news/en/2021120301.xml new file mode 100644 index 00000000..3dc6ef00 --- /dev/null +++ b/news/en/2021120301.xml @@ -0,0 +1,12 @@ +<news> + <date>December 3, 2021</date> + <title>World Wine News Issue 408</title> + <body> + <a href="{$root}/wwn/408">WWN Issue 408</a> was released today. + <ul> + <li><a href="{$root}/wwn/408#Tryptophan and Turkey OR The Curious Case of Wine and PE">Tryptophan and Turkey OR The Curious Case of Wine and PE</a></li> + <li><a href="{$root}/wwn/408#Conversion to PE Files">Conversion to PE Files</a></li> + <li><a href="{$root}/wwn/408#Code Freeze">Code Freeze</a></li> + </ul> + </body> +</news> diff --git a/wwn/en/wn20211203_408.xml b/wwn/en/wn20211203_408.xml new file mode 100755 index 00000000..839b839a --- /dev/null +++ b/wwn/en/wn20211203_408.xml @@ -0,0 +1,55 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="408" date="12/03/2021"/> + <intro> + <p> + This is the 408th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, + but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + </p> + </intro> + + + <section title="Tryptophan and Turkey OR The Curious Case of Wine and PE" subject="" archive="" posts=""> + <p> + I realize that the 408th issue of WWN is arriving a week late. I blame Thanksgiving and all that <a href="https://en.wikipedia.org/wiki/Tryptophan#Turkey_meat_and_drowsiness"> + Tryptophan in turkey</a> for missing my deadline last Friday. I don't care that Wikipedia says it is a myth. Why else would I be so tired after eating several plates of + turkey, stuffing, mashed potatoes, corn, and candied yams? + </p> + + <p> + No need to debate, I ate the turkey and I got tired. Seems like a simple case of cause and effect. + </p> + </section> + + <section title="Conversion to PE Files" subject="Wine Overview" archive="" posts=""> + <p> + On Windows, all system libraries are Portable Executable (PE) files. Before version 5.0, Wine provided its implementation of Windows libraries and <i>.so</i> (ELF or MachO) files in such a way that they behaved like PE files. Though effective in many scenarios, a need for a 32on64 solution and some lingering compatibility issues prompted changes to this format. + Beginning in Wine 5.0, most modules were built in PE instead of Executable and Linkable File (ELF) format. The PE binaries were copied into the Wine prefix, not the DLL files, making it look more like a Windows installation. Several core DLLs (e.g., NTDLL, KERNEL32, GDI32, and USER32) were converted to PE in Wine 6.0. + + More closely resembling a Windows installation improves the functionality of applications using Digital Right Management (DRM) schemes that require on-disk system module content to be identical to the in-memory content. However, PE files can't link directly to Unix libraries. For this reason some modules in Wine have both PE and <i>.so</i> libraries. This allows the PE library to call into its <i>.so</i> library, which can then perform the Unix call. This process is like an OS syscall or kernel call, and it's treated as such. + </p> + + <p> + Another class of applications that benefit from this are Windows debuggers, which don't expect non-PE modules. Conversion to PE means that debuggers now understand Wine built-in modules and the execution of native libraries is hidden from the debuggers using syscall interface. + </p> + + <p> + Let's get back to the 32on64 issue. It was a prominent reason for the PE conversion. The goal is for Wine to execute 32-bit code in 64-bit Unix, and not require 32-bit host libraries. In such cases, there will be only the 64-bit versions of Wine Unix libraries, but both 64-bit and 32-bit PE libraries. Whenever a 32-bit application calls a Unix function, it will use a mechanism built around syscall interface to switch between 64-bit and 32-bit mode. This architecture also makes it possible to support other multi-arch scenarios. Furthermore, this architecture will also solver an issue arising when macOS and Windows both attempt to use the %gs base register for threading support. There are hacks currently in place for this, but they are not reliable. A clean separation of Unix and PE code with a syscall interface will potentially make it possible to switch between Unix and Windows %gs base. + </p> + + </section> + + <section title="Code Freeze" subject="Wine Code Freeze" archive="" posts=""> + <p> + Save the date. The Wine code freeze is set to begin on December 10th, 2021. This means Wine 7.0 is just around the corner. Happy Holidays, indeed! + </p> + + <p> + P.S. With Wine 7.0, very few (but tricky!) modules will remain unconverted to PE. + </p> + + </section> +</kc>

1 0

Nikolay Sivov : d3d10/effect: Use first element when index expression evaluates to out of bounds value.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 27584c14497163dc2a15a9e8db9ddd40d3a516f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27584c14497163dc2a15a9e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 24 16:43:37 2021 +0300 d3d10/effect: Use first element when index expression evaluates to out of bounds value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- dlls/d3d10/tests/effect.c | 194 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 149 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27584c14497163dc2a15…

1 0

Nikolay Sivov : mfplat/tests: Add a test for buffers created for d3d12 resources.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: cabc0454270e12b0e6152bd381cfdb7649008d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cabc0454270e12b0e6152bd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 21:23:43 2021 +0300 mfplat/tests: Add a test for buffers created for d3d12 resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 92 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cec27c2c23f..cee90567084 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6558,6 +6558,8 @@ static ID3D12Device *create_d3d12_device(void) ID3D12Device *device; HRESULT hr; + if (!pD3D12CreateDevice) return NULL; + hr = pD3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); if (FAILED(hr)) return NULL; @@ -6565,7 +6567,7 @@ static ID3D12Device *create_d3d12_device(void) return device; } -static void test_dxgi_surface_buffer(void) +static void test_d3d11_surface_buffer(void) { DWORD max_length, cur_length, length, color; IMFDXGIBuffer *dxgi_buffer; @@ -6791,6 +6793,72 @@ static void test_dxgi_surface_buffer(void) ID3D11Device_Release(device); } +static void test_d3d12_surface_buffer(void) +{ + IMFDXGIBuffer *dxgi_buffer; + D3D12_HEAP_PROPERTIES heap_props; + D3D12_RESOURCE_DESC desc; + ID3D12Resource *resource; + IMFMediaBuffer *buffer; + unsigned int refcount; + ID3D12Device *device; + IUnknown *obj; + HRESULT hr; + + /* d3d12 */ + if (!(device = create_d3d12_device())) + { + skip("Failed to create a D3D12 device, skipping tests.\n"); + return; + } + + memset(&heap_props, 0, sizeof(heap_props)); + heap_props.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&desc, 0, sizeof(desc)); + desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + desc.Alignment = 0; + desc.Width = 32; + desc.Height = 32; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + hr = ID3D12Device_CreateCommittedResource(device, &heap_props, D3D12_HEAP_FLAG_NONE, + &desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); +todo_wine + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D12Resource, (void **)&obj); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + ok(obj == (IUnknown *)resource, "Unexpected resource pointer.\n"); + IUnknown_Release(obj); + + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); +} + ID3D12Resource_Release(resource); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Unexpected device refcount %u.\n", refcount); +} + static void test_sample_allocator_sysmem(void) { IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; @@ -7335,7 +7403,9 @@ static void test_sample_allocator_d3d11(void) static void test_sample_allocator_d3d12(void) { IMFVideoSampleAllocator *allocator; + D3D12_HEAP_PROPERTIES heap_props; IMFDXGIDeviceManager *manager; + D3D12_HEAP_FLAGS heap_flags; IMFDXGIBuffer *dxgi_buffer; IMFMediaType *video_type; ID3D12Resource *resource; @@ -7346,12 +7416,6 @@ static void test_sample_allocator_d3d12(void) IMFSample *sample; HRESULT hr; - if (!pD3D12CreateDevice) - { - skip("Missing d3d12 support, some tests will be skipped.\n"); - return; - } - if (!(device = create_d3d12_device())) { skip("Failed to create a D3D12 device, skipping tests.\n"); @@ -7411,6 +7475,14 @@ todo_wine ok(!desc.Layout, "Unexpected layout %u.\n", desc.Layout); ok(!desc.Flags, "Unexpected flags %#x.\n", desc.Flags); + hr = ID3D12Resource_GetHeapProperties(resource, &heap_props, &heap_flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(heap_props.Type == D3D12_HEAP_TYPE_DEFAULT, "Unexpected heap type %u.\n", heap_props.Type); + ok(heap_props.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, "Unexpected page property %u.\n", + heap_props.CPUPageProperty); + ok(!heap_props.MemoryPoolPreference, "Unexpected pool preference %u.\n", heap_props.MemoryPoolPreference); + ok(heap_flags == D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES, "Unexpected heap flags %#x.\n", heap_flags); + ID3D12Resource_Release(resource); IMFDXGIBuffer_Release(dxgi_buffer); IMFSample_Release(sample); @@ -7656,6 +7728,9 @@ START_TEST(mfplat) if (!pMFCreateVideoSampleAllocatorEx) win_skip("MFCreateVideoSampleAllocatorEx() is not available. Some tests will be skipped.\n"); + if (!pD3D12CreateDevice) + skip("Missing d3d12 support, some tests will be skipped.\n"); + CoInitialize(NULL); test_startup(); @@ -7703,7 +7778,8 @@ START_TEST(mfplat) test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); test_MFMapDXGIFormatToDX9Format(); - test_dxgi_surface_buffer(); + test_d3d11_surface_buffer(); + test_d3d12_surface_buffer(); test_sample_allocator_sysmem(); test_sample_allocator_d3d9(); test_sample_allocator_d3d11();

1 0

Brendan Shanks : ntdll: Rename THREAD_DESCRIPTION_INFORMATION to THREAD_NAME_INFORMATION.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: e7afddd2c10312d8c6c5e74735b46b614ff96b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7afddd2c10312d8c6c5e747… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 2 09:19:08 2021 -0800 ntdll: Rename THREAD_DESCRIPTION_INFORMATION to THREAD_NAME_INFORMATION. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 30 +++++++++++++++--------------- dlls/kernelbase/thread.c | 16 ++++++++-------- dlls/ntdll/unix/thread.c | 14 +++++++------- dlls/wow64/process.c | 24 ++++++++++++------------ dlls/wow64/struct32.h | 4 ++-- include/winternl.h | 6 +++--- 6 files changed, 47 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7afddd2c10312d8c6c5…

1 0

Brendan Shanks : include: Update the THREADINFOCLASS enumeration.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 4071f6c6f2da3e82025f6ab93e8cc3545a9c9c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4071f6c6f2da3e82025f6ab9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 2 09:19:07 2021 -0800 include: Update the THREADINFOCLASS enumeration. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 73315a0b323..76570246e48 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1869,8 +1869,23 @@ typedef enum _THREADINFOCLASS { ThreadUmsInformation, ThreadCounterProfiling, ThreadIdealProcessorEx, - ThreadSuspendCount = 35, - ThreadNameInformation = 38, + ThreadCpuAccountingInformation, + ThreadSuspendCount, + ThreadHeterogeneousCpuPolicy, + ThreadContainerId, + ThreadNameInformation, + ThreadSelectedCpuSets, + ThreadSystemThreadInformation, + ThreadActualGroupAffinity, + ThreadDynamicCodePolicyInfo, + ThreadExplicitCaseSensitivity, + ThreadWorkOnBehalfTicket, + ThreadSubsystemInformation, + ThreadDbgkWerReportActive, + ThreadAttachContainer, + ThreadManageWritesToExecutableMemory, + ThreadPowerThrottlingState, + ThreadWorkloadClass, MaxThreadInfoClass } THREADINFOCLASS;

1 0

Brendan Shanks : ntdll: Rename ThreadDescription to ThreadNameInformation.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 65dd060a67c2f511ea8231a53125af11b8cf485e URL: https://source.winehq.org/git/wine.git/?a=commit;h=65dd060a67c2f511ea8231a5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 2 09:19:06 2021 -0800 ntdll: Rename ThreadDescription to ThreadNameInformation. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 22 +++++++++++----------- dlls/kernelbase/thread.c | 6 +++--- dlls/ntdll/unix/thread.c | 4 ++-- dlls/wow64/process.c | 4 ++-- include/winternl.h | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f33e05741a2..b84f1eb2b6b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2378,7 +2378,7 @@ static void test_thread_description(void) LocalFree(ptr); len = 0; - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, NULL, 0, &len); ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); @@ -2386,7 +2386,7 @@ static void test_thread_description(void) thread_desc->Description.Length = 1; thread_desc->Description.MaximumLength = 0; thread_desc->Description.Buffer = (WCHAR *)thread_desc; - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, len, &len2); ok(!status, "Failed to get thread info, status %#x.\n", status); ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); ok(!thread_desc->Description.Length, "Unexpected description length %#x.\n", thread_desc->Description.Length); @@ -2406,12 +2406,12 @@ static void test_thread_description(void) LocalFree(ptr); len = 0; - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, NULL, 0, &len); ok(status == STATUS_BUFFER_TOO_SMALL, "Failed to get thread info, status %#x.\n", status); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); len = 0; - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, sizeof(buff), &len); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, buff, sizeof(buff), &len); ok(!status, "Failed to get thread info.\n"); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); @@ -2423,11 +2423,11 @@ static void test_thread_description(void) /* Partial results. */ len = 0; - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, NULL, 0, &len); ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); - status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, len - sizeof(WCHAR), &len); + status = pNtQueryInformationThread(GetCurrentThread(), ThreadNameInformation, buff, len - sizeof(WCHAR), &len); ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); @@ -2435,7 +2435,7 @@ static void test_thread_description(void) thread_desc->Description.Length = thread_desc->Description.MaximumLength = 8; lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); - status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc)); ok(status == STATUS_SUCCESS, "Failed to set thread description, status %#x.\n", status); ptr = NULL; @@ -2444,14 +2444,14 @@ static void test_thread_description(void) ok(!lstrcmpW(ptr, L"desc"), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); - status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc) - 1); + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc) - 1); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); - status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); + status = NtSetInformationThread(GetCurrentThread(), ThreadNameInformation, NULL, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); thread_desc->Description.Buffer = NULL; - status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); hr = pSetThreadDescription(GetCurrentThread(), NULL); @@ -2468,7 +2468,7 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); memset(thread_desc, 0, sizeof(*thread_desc)); - status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc)); ok(!status, "Failed to set thread description, status %#x.\n", status); ptr = NULL; diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 9b97c4a8914..aa95fa0db15 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -430,7 +430,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des info.Description.Length = info.Description.MaximumLength = length; info.Description.Buffer = (WCHAR *)description; - return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadDescription, &info, sizeof(info) )); + return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadNameInformation, &info, sizeof(info) )); } /*********************************************************************** @@ -447,14 +447,14 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetThreadDescription( HANDLE thread, WCHAR **de *description = NULL; length = 0; - status = NtQueryInformationThread( thread, ThreadDescription, NULL, 0, &length ); + status = NtQueryInformationThread( thread, ThreadNameInformation, NULL, 0, &length ); if (status != STATUS_BUFFER_TOO_SMALL) return HRESULT_FROM_NT(status); if (!(info = heap_alloc( length ))) return HRESULT_FROM_NT(STATUS_NO_MEMORY); - status = NtQueryInformationThread( thread, ThreadDescription, info, length, &length ); + status = NtQueryInformationThread( thread, ThreadNameInformation, info, length, &length ); if (!status) { if (!(*description = LocalAlloc( 0, info->Description.Length + sizeof(WCHAR)))) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 57d355e96d2..2ccaaefa841 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2035,7 +2035,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; return status; - case ThreadDescription: + case ThreadNameInformation: { THREAD_DESCRIPTION_INFORMATION *info = data; data_size_t len, desc_len = 0; @@ -2228,7 +2228,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, return status; } - case ThreadDescription: + case ThreadNameInformation: { const THREAD_DESCRIPTION_INFORMATION *info = data; diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 50562390860..504f5c213fd 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -934,7 +934,7 @@ NTSTATUS WINAPI wow64_NtQueryInformationThread( UINT *args ) return status; } - case ThreadDescription: /* THREAD_DESCRIPTION_INFORMATION */ + case ThreadNameInformation: /* THREAD_DESCRIPTION_INFORMATION */ { THREAD_DESCRIPTION_INFORMATION *info; THREAD_DESCRIPTION_INFORMATION32 *info32 = ptr; @@ -1190,7 +1190,7 @@ NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) } else return STATUS_INVALID_PARAMETER; - case ThreadDescription: /* THREAD_DESCRIPTION_INFORMATION */ + case ThreadNameInformation: /* THREAD_DESCRIPTION_INFORMATION */ if (len == sizeof(THREAD_DESCRIPTION_INFORMATION32)) { THREAD_DESCRIPTION_INFORMATION32 *info32 = ptr; diff --git a/include/winternl.h b/include/winternl.h index 5b6ba98be42..73315a0b323 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1870,7 +1870,7 @@ typedef enum _THREADINFOCLASS { ThreadCounterProfiling, ThreadIdealProcessorEx, ThreadSuspendCount = 35, - ThreadDescription = 38, + ThreadNameInformation = 38, MaxThreadInfoClass } THREADINFOCLASS;

1 0

Jacek Caban : win32u: Move NtUserChangeDisplaySettings implementation from user32.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 3867d253ed548985e481a117771002f652651702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3867d253ed548985e481a117… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:35 2021 +0100 win32u: Move NtUserChangeDisplaySettings implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 8 +- dlls/user32/sysparams.c | 198 +------------------------------------------ dlls/win32u/driver.c | 7 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 167 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 2 + 9 files changed, 190 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3867d253ed548985e481…

1 0

Jacek Caban : win32u: Introduce get_virtual_screen_rect.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 8731afe70f2e6efb5576604c502798e71921f96c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8731afe70f2e6efb5576604c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:12 2021 +0100 win32u: Introduce get_virtual_screen_rect. And use it in nulldrv_GetDeviceCaps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 20 ++++++-------------- dlls/win32u/ntgdi_private.h | 24 ++++++++++++++++++++++++ dlls/win32u/sysparams.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 3 ++- dlls/win32u/wrappers.c | 9 --------- 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 881e11116df..03594aa58d0 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -331,25 +331,17 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return 1; } case DESKTOPHORZRES: - if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && user_callbacks) + if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { - DPI_AWARENESS_CONTEXT context; - UINT ret; - context = user_callbacks->pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - ret = user_callbacks->pGetSystemMetrics( SM_CXVIRTUALSCREEN ); - user_callbacks->pSetThreadDpiAwarenessContext( context ); - if (ret) return ret; + RECT rect = get_virtual_screen_rect(); + return rect.right - rect.left; } return NtGdiGetDeviceCaps( dev->hdc, HORZRES ); case DESKTOPVERTRES: - if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && user_callbacks) + if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { - DPI_AWARENESS_CONTEXT context; - UINT ret; - context = user_callbacks->pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - ret = user_callbacks->pGetSystemMetrics( SM_CYVIRTUALSCREEN ); - user_callbacks->pSetThreadDpiAwarenessContext( context ); - if (ret) return ret; + RECT rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; } return NtGdiGetDeviceCaps( dev->hdc, VERTRES ); case BLTALIGNMENT: return 0; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index df7fb5e8f4e..8aaf8ba231d 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -594,6 +594,30 @@ static inline void reset_bounds( RECT *bounds ) bounds->right = bounds->bottom = INT_MIN; } +static inline void union_rect( RECT *dest, const RECT *src1, const RECT *src2 ) +{ + if (is_rect_empty( src1 )) + { + if (is_rect_empty( src2 )) + { + reset_bounds( dest ); + return; + } + else *dest = *src2; + } + else + { + if (is_rect_empty( src2 )) *dest = *src1; + else + { + dest->left = min( src1->left, src2->left ); + dest->right = max( src1->right, src2->right ); + dest->top = min( src1->top, src2->top ); + dest->bottom = max( src1->bottom, src2->bottom ); + } + } +} + static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) { if (is_rect_empty( rect )) return; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 195756acea1..2da659aa3e5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1215,6 +1215,22 @@ static void unlock_display_devices(void) pthread_mutex_unlock( &display_lock ); } +RECT get_virtual_screen_rect(void) +{ + struct monitor *monitor; + RECT rect = {0}; + + if (!lock_display_devices()) return rect; + + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + union_rect( &rect, &rect, &monitor->rc_monitor ); + } + + unlock_display_devices(); + return rect; +} + /********************************************************************** * NtUserGetDisplayConfigBufferSizes (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bebf4b531b6..159d2a722d0 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -39,7 +39,6 @@ struct user_callbacks BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); BOOL (WINAPI *pEnumDisplayMonitors)( HDC, LPRECT, MONITORENUMPROC, LPARAM ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)( DPI_AWARENESS_CONTEXT ); HWND (WINAPI *pWindowFromDC)( HDC ); }; @@ -242,6 +241,8 @@ struct unix_funcs UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); +extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; + extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index ccf70190431..f51ed303b8b 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -845,14 +845,6 @@ static BOOL WINAPI call_RedrawWindow( HWND hwnd, const RECT *rect, HRGN rgn, UIN return pRedrawWindow && pRedrawWindow( hwnd, rect, rgn, flags ); } -static DPI_AWARENESS_CONTEXT WINAPI call_SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT ctx ) -{ - static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)( DPI_AWARENESS_CONTEXT ); - if (!pSetThreadDpiAwarenessContext) - pSetThreadDpiAwarenessContext = get_user_proc( "SetThreadDpiAwarenessContext", FALSE ); - return pSetThreadDpiAwarenessContext ? pSetThreadDpiAwarenessContext( ctx ) : 0; -} - static HWND WINAPI call_WindowFromDC( HDC hdc ) { static HWND (WINAPI *pWindowFromDC)( HDC ); @@ -870,7 +862,6 @@ static const struct user_callbacks user_funcs = call_GetWindowRect, call_EnumDisplayMonitors, call_RedrawWindow, - call_SetThreadDpiAwarenessContext, call_WindowFromDC, };

1 0

Jacek Caban : win32u: Handle invisible winstations in lock_display_devices.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: c4b258eff75d54fdc0eb9b1843db5f77318f836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b258eff75d54fdc0eb9b18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:04 2021 +0100 win32u: Handle invisible winstations in lock_display_devices. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 139 ++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 59 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d0eda54cde7..195756acea1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -224,6 +224,17 @@ static struct list monitors = LIST_INIT(monitors); static INT64 last_query_display_time; static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER; +static struct monitor virtual_monitor = +{ + .handle = NULLDRV_DEFAULT_HMONITOR, + .flags = MONITORINFOF_PRIMARY, + .rc_monitor.right = 1024, + .rc_monitor.bottom = 768, + .rc_work.right = 1024, + .rc_work.bottom = 768, + .dev.state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, +}; + static HANDLE get_display_device_init_mutex( void ) { static const WCHAR display_device_initW[] = @@ -1045,6 +1056,32 @@ static void release_display_manager_ctx( struct device_manager_ctx *ctx ) if (ctx->gpu_count) cleanup_devices(); } +static void clear_display_devices(void) +{ + struct adapter *adapter; + struct monitor *monitor; + + if (list_head( &monitors ) == &virtual_monitor.entry) + { + list_init( &monitors ); + return; + } + + while (!list_empty( &monitors )) + { + monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); + list_remove( &monitor->entry ); + free( monitor ); + } + + while (!list_empty( &adapters )) + { + adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); + list_remove( &adapter->entry ); + free( adapter ); + } +} + static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, monitor_count = 0, size; @@ -1069,19 +1106,7 @@ static BOOL update_display_cache_from_registry(void) mutex = get_display_device_init_mutex(); pthread_mutex_lock( &display_lock ); - while (!list_empty( &monitors )) - { - monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); - list_remove( &monitor->entry ); - free( monitor ); - } - - while (!list_empty( &adapters )) - { - adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); - list_remove( &adapter->entry ); - free( adapter ); - } + clear_display_devices(); for (adapter_id = 0;; adapter_id++) { @@ -1161,8 +1186,27 @@ static BOOL update_display_cache(void) static BOOL lock_display_devices(void) { - if (!update_display_cache()) return FALSE; + USEROBJECTFLAGS flags; + HWINSTA winstation; + pthread_mutex_lock( &display_lock ); + + /* Report physical monitor information only if window station has visible display surfaces */ + winstation = NtUserGetProcessWindowStation(); + if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && + (flags.dwFlags & WSF_VISIBLE)) + { + pthread_mutex_unlock( &display_lock ); + if (!update_display_cache()) return FALSE; + pthread_mutex_lock( &display_lock ); + } + else + { + clear_display_devices(); + list_add_tail( &monitors, &virtual_monitor.entry ); + last_query_display_time = 0; + } + return TRUE; } @@ -1334,46 +1378,30 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc struct monitor_enum_info enum_buf[8], *enum_info = enum_buf; struct enum_display_monitor_params params; struct monitor *monitor; - ULONG count = 0, i; - USEROBJECTFLAGS flags; - HWINSTA winstation; + unsigned int count = 0, i; BOOL ret = TRUE; - /* Report physical monitor information only if window station has visible display surfaces */ - winstation = NtUserGetProcessWindowStation(); - if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && - (flags.dwFlags & WSF_VISIBLE)) - { - if (!lock_display_devices()) return FALSE; - - count = list_count( &monitors ); - if (!count || (count > ARRAYSIZE(enum_buf) && - !(enum_info = malloc( count * sizeof(*enum_info) )))) - { - unlock_display_devices(); - return FALSE; - } - - count = 0; - LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) - { - if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - enum_info[count].handle = monitor->handle; - enum_info[count].rect = monitor->rc_monitor; - count++; - } + if (!lock_display_devices()) return FALSE; + count = list_count( &monitors ); + if (!count || (count > ARRAYSIZE(enum_buf) && + !(enum_info = malloc( count * sizeof(*enum_info) )))) + { unlock_display_devices(); - if (!count) return FALSE; + return FALSE; } - else + + count = 0; + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if (!(enum_info = malloc( sizeof(*enum_info) ))) return FALSE; - enum_info->handle = NULLDRV_DEFAULT_HMONITOR; - SetRect( &enum_info->rect, 0, 0, 1024, 768 ); - count = 1; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + enum_info[count].handle = monitor->handle; + enum_info[count].rect = monitor->rc_monitor; + count++; } + unlock_display_devices(); + params.proc = proc; params.hdc = hdc; params.lparam = lparam; @@ -1397,18 +1425,6 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; - /* Fallback to report one monitor */ - if (handle == NULLDRV_DEFAULT_HMONITOR) - { - RECT default_rect = {0, 0, 1024, 768}; - info->rcMonitor = default_rect; - info->rcWork = default_rect; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); - return TRUE; - } - if (!lock_display_devices()) return FALSE; LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) @@ -1421,7 +1437,12 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) info->rcWork = monitor->rc_work; info->dwFlags = monitor->flags; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + { + if (monitor->adapter) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + else + asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); + } unlock_display_devices(); return TRUE; }

1 0

Jacek Caban : win32u: Move NtUserEnumDisplayMonitors implementation from user32.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 318673405c6296342ef49177de26440f69a4b0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=318673405c6296342ef49177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:13:55 2021 +0100 win32u: Move NtUserEnumDisplayMonitors implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 --- dlls/user32/sysparams.c | 187 ++++--------------------------------------- dlls/user32/user_main.c | 8 ++ dlls/user32/user_private.h | 6 +- dlls/win32u/driver.c | 9 +-- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 71 ++++++++++++++++ dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/wrappers.c | 5 ++ include/ntuser.h | 17 ++++ include/wine/gdi_driver.h | 3 +- 12 files changed, 133 insertions(+), 199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=318673405c6296342ef4…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021