- wine-devel - winehq.org

[PATCH 1/5] win32u: Move NtUserShowCursor implementation from user32.
by Jacek Caban 03 Dec '21

03 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 27 ---------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/cursoricon.c | 63 ++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++ 9 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 dlls/win32u/cursoricon.c

1 0

[PATCH] winevulkan: Fix concurrent modification in struct decoupling.
by Georg Lehmann 02 Dec '21

02 Dec '21

This fixes the huge diffs generated by trivial winevulkan updates. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7a9bac7e55e..ea7e9cad2f7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1895,7 +1895,8 @@ class VkStruct(Sequence): decoupled_structs = [] while (len(tmp_structs) > 0): - for struct in tmp_structs: + # Iterate over a copy because we want to modify the list inside the loop. + for struct in list(tmp_structs): dependends = False if not struct.required: -- 2.34.1

1 0

[PATCH 3/3] scrrun: use more context for MultiByteToWideChar in Read test.
by Robert Wilhelm 02 Dec '21

02 Dec '21

Second byte of BOM (0xfe) is LeadByte in Asian locales. Therefore chars after BOM matter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/tests/filesystem.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8dc08d7487e..376cad2d4ed 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1820,8 +1820,10 @@ static void test_ReadAll(void) static void test_Read(void) { + static const WCHAR firstlineW[] = L"first"; static const WCHAR secondlineW[] = L"second"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; + char buffA[MAX_PATH]; ITextStream *stream; BSTR nameW; HRESULT hr; @@ -1838,8 +1840,10 @@ static void test_Read(void) hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_WriteLine(stream, nameW); + str = SysAllocString(firstlineW); + hr = ITextStream_WriteLine(stream, str); ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); @@ -1884,9 +1888,10 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + lstrcpyA(buffA, utf16bom); + lstrcatA(buffA, "first"); + MultiByteToWideChar(CP_ACP, 0, buffA, -1, buffW, ARRAY_SIZE(buffW)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, expected %s, %d\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW), SysStringLen(str)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1895,7 +1900,7 @@ static void test_Read(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n"); @@ -1941,7 +1946,7 @@ static void test_Read(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n"); -- 2.31.1

1 0

[PATCH 2/3] scrrun: use more context for MultiByteToWideChar in ReadAll test.
by Robert Wilhelm 02 Dec '21

02 Dec '21

Second byte of BOM (0xfe) is LeadByte in Asian locales. Therefore chars after BOM matter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/tests/filesystem.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index dba8c067d63..8dc08d7487e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1687,9 +1687,11 @@ static void test_WriteLine(void) static void test_ReadAll(void) { + static const WCHAR firstlineW[] = L"first"; static const WCHAR secondlineW[] = L"second"; static const WCHAR aW[] = L"A"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; + char buffA[MAX_PATH]; ITextStream *stream; BSTR nameW; HRESULT hr; @@ -1706,8 +1708,10 @@ static void test_ReadAll(void) hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_WriteLine(stream, nameW); + str = SysAllocString(firstlineW); + hr = ITextStream_WriteLine(stream, str); ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); @@ -1735,7 +1739,9 @@ static void test_ReadAll(void) hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + lstrcpyA(buffA, utf16bom); + lstrcatA(buffA, "first"); + MultiByteToWideChar(CP_ACP, 0, buffA, -1, buffW, ARRAY_SIZE(buffW)); ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1744,7 +1750,7 @@ static void test_ReadAll(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n"); @@ -1775,7 +1781,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadLine(stream, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); - ok(!wcscmp(str, nameW), "got %s\n", wine_dbgstr_w(str)); + ok(!wcscmp(str, firstlineW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); lstrcpyW(buffW, secondlineW); -- 2.31.1

1 0

[PATCH 1/3] scrrun: check file contents using ReadFile in CreateTextFile test.
by Robert Wilhelm 02 Dec '21

02 Dec '21

This is less fragile then former MultiByteToWideChar method because second byte of BOM (0xfe) is LeadByte in Asian locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/tests/filesystem.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 91729bb047f..dba8c067d63 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1462,12 +1462,13 @@ static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) static void test_CreateTextFile(void) { - WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10], buff2W[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; HRESULT hr; BOOL ret; + DWORD r; get_temp_filepath(testfileW, pathW, dirW); @@ -1517,18 +1518,18 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); - /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode - treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r == 2, "read %d, got %d, %d\n", r, ret, GetLastError()); + buffW[r/sizeof(WCHAR)] = 0; - hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - SysFreeString(str); - ITextStream_Release(stream); + buff2W[0] = 0xfeff; + buff2W[1] = 0; + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); DeleteFileW(nameW); RemoveDirectoryW(dirW); -- 2.31.1

1 0

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

02 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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(); -- 2.33.0

1 0

[PATCH v2 1/3] ntdll: Rename ThreadDescription to ThreadNameInformation.
by Brendan Shanks 02 Dec '21

02 Dec '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is declared starting with the Windows 10.0.20348.0 SDK. v2: Added patch 3. 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 fbe501ed034..676ed20f3f4 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -930,7 +930,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; @@ -1186,7 +1186,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 5c2a1c07aeb..b07a259765a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1869,7 +1869,7 @@ typedef enum _THREADINFOCLASS { ThreadCounterProfiling, ThreadIdealProcessorEx, ThreadSuspendCount = 35, - ThreadDescription = 38, + ThreadNameInformation = 38, MaxThreadInfoClass } THREADINFOCLASS; -- 2.30.1 (Apple Git-130)

1 2

[PATCH] winemac: Include dlfcn.h in vulkan.c.
by Stefan Dösinger 02 Dec '21

02 Dec '21

For RTLD_LAZY. Needed to build against the 10.15 SDK. --- dlls/winemac.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3665e0023b7..ca70db7a689 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <dlfcn.h> #include "macdrv.h" #include "wine/debug.h" -- 2.21.1 (Apple Git-122.3)

1 0

[PATCH 1/2] ntdll: Rename ThreadDescription to ThreadNameInformation.
by Brendan Shanks 02 Dec '21

02 Dec '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Undocumented, but this is the name listed by Geoff Chappell and elsewhere online. 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 fbe501ed034..676ed20f3f4 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -930,7 +930,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; @@ -1186,7 +1186,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 5c2a1c07aeb..b07a259765a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1869,7 +1869,7 @@ typedef enum _THREADINFOCLASS { ThreadCounterProfiling, ThreadIdealProcessorEx, ThreadSuspendCount = 35, - ThreadDescription = 38, + ThreadNameInformation = 38, MaxThreadInfoClass } THREADINFOCLASS; -- 2.30.1 (Apple Git-130)

2 3

[PATCH v12 1/7] mshtml: Restructure element setAttribute.
by Gabriel Ivăncescu 02 Dec '21

02 Dec '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Will be needed for IE8 to fallback to the gecko attribute nodes under certain conditions. dlls/mshtml/htmlelem.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3f7c60b..16357de 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1086,34 +1086,36 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr VARIANT AttributeValue, LONG lFlags) { HTMLElement *This = impl_from_IHTMLElement(iface); + compat_mode_t compat_mode = dispex_compat_mode(&This->node.event_target.dispex); + nsAString name_str, value_str; + nsresult nsres; DISPID dispid; HRESULT hres; TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); - if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { - nsAString name_str, value_str; - nsresult nsres; - - hres = variant_to_nsstr(&AttributeValue, FALSE, &value_str); + if(compat_mode < COMPAT_MODE_IE8 || !This->dom_element) { + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, + (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; - nsAString_InitDepend(&name_str, strAttributeName); - nsres = nsIDOMElement_SetAttribute(This->dom_element, &name_str, &value_str); - nsAString_Finish(&name_str); - nsAString_Finish(&value_str); - if(NS_FAILED(nsres)) - WARN("SetAttribute failed: %08x\n", nsres); - return map_nsresult(nsres); + return set_elem_attr_value_by_dispid(This, dispid, &AttributeValue); } - hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, - (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); + hres = variant_to_nsstr(&AttributeValue, FALSE, &value_str); if(FAILED(hres)) return hres; - return set_elem_attr_value_by_dispid(This, dispid, &AttributeValue); + nsAString_InitDepend(&name_str, strAttributeName); + nsres = nsIDOMElement_SetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) + WARN("SetAttribute failed: %08x\n", nsres); + hres = map_nsresult(nsres); + + return hres; } HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) -- 2.31.1

3 23

[PATCH 1/2] dsound: Add secondarybuffer_is_audible().
by Florian Will 02 Dec '21

02 Dec '21

Signed-off-by: Florian Will <florian.will(a)gmail.com> --- dlls/dsound/buffer.c | 15 +++++++++++++++ dlls/dsound/dsound_private.h | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index c595b19dd63..3d848053842 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1197,6 +1197,21 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) TRACE("(%p) released\n", This); } +/* Check if anything is audible. Even if this returns false, the lVolume of this buffer might not + * actually be DSBVOLUME_MIN. Setting the volume close to DSBVOLUME_MIN will lead to a + * dwTotalAmpFactor of 0, too. This function will return false in these cases because the effect is + * the same as setting the volume to DSBVOLUME_MIN, i.e. this buffer is not audible. */ +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) +{ + UINT i; + for (i = 0; i < This->device->pwfx->nChannels; i++) { + if (This->volpan.dwTotalAmpFactor[i] != 0) + return TRUE; + } + + return FALSE; +} + HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9ec96504a50..18dc369db5c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -193,6 +193,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; -- 2.32.0

1 1

[PATCH vkd3d 1/3] vkd3d: Initialise root signature descriptor offset buffer to NULL.
by Conor McCarthy 02 Dec '21

02 Dec '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index cb3f99ad..7c9575f6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1141,6 +1141,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->parameters = NULL; root_signature->flags = desc->Flags; root_signature->descriptor_mapping = NULL; + root_signature->descriptor_offsets = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; root_signature->device = device; -- 2.33.0

1 2

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

02 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- dlls/d3d10/tests/effect.c | 194 +++++++++++++++++++++++++++++--------- 2 files changed, 149 insertions(+), 47 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd6a3cfb238..190ad19a5f1 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -774,7 +774,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende { WARN("Expression evaluated to invalid index value %u, array %s of size %u.\n", variable_idx, debugstr_a(v->name), v->type->element_count); - return; + variable_idx = 0; } /* Ignoring destination index here, there are no object typed array properties. */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index eae0036c0b6..ddc24d66e20 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -7807,10 +7807,16 @@ float4 g_var2; PixelShader ps_array[2]; VertexShader vs_array[2]; GeometryShader gs_array[2]; +BlendState bs_array[2] +{ + { BlendEnable[0] = true; SrcBlend = inv_src_color; }, + { BlendEnable[0] = true; SrcBlend = src_color; } +}; technique10 tech { pass p0 { + SetBlendState( bs_array[g_var.w], float4(0.0f, 0.0f, 0.0f, 0.0f), 0xffff ); SetPixelShader( ps_array[g_var.z] ); SetVertexShader( vs_array[g_var.x + 0.1f] ); SetGeometryShader( gs_array[g_var2.y] ); @@ -7819,9 +7825,9 @@ technique10 tech #endif static DWORD fx_test_index_expression[] = { - 0x43425844, 0xef7cea81, 0x5103f059, 0x9011e9d4, 0xa8ed3607, 0x00000001, 0x00000564, 0x00000001, - 0x00000024, 0x30315846, 0x00000538, 0xfeff1001, 0x00000001, 0x00000002, 0x00000003, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x85cafff9, 0xf7f791b5, 0xfc973931, 0x1de9cde1, 0x00000001, 0x00000778, 0x00000001, + 0x00000024, 0x30315846, 0x0000074c, 0xfeff1001, 0x00000001, 0x00000002, 0x00000004, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000588, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x78695000, 0x68536c65, 0x72656461, @@ -7829,49 +7835,75 @@ static DWORD fx_test_index_expression[] = 0x61727261, 0x65560079, 0x78657472, 0x64616853, 0x6e007265, 0x02000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x06000000, 0x76000000, 0x72615f73, 0x00796172, 0x6d6f6547, 0x79727465, 0x64616853, 0xa0007265, 0x02000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x07000000, - 0x67000000, 0x72615f73, 0x00796172, 0x68636574, 0x00307000, 0x000000ec, 0x43425844, 0xe6990a97, - 0x7ed17834, 0x9f40de47, 0x01f476a7, 0x00000001, 0x000000ec, 0x00000003, 0x0000002c, 0x000000a8, - 0x000000b4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, + 0x67000000, 0x72615f73, 0x00796172, 0x6e656c42, 0x61745364, 0xd4006574, 0x02000000, 0x02000000, + 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x62000000, 0x72615f73, 0x00796172, 0x00000001, + 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000004, 0x00000001, 0x00000004, 0x00000001, + 0x00000001, 0x00000002, 0x00000003, 0x68636574, 0x00307000, 0x00000004, 0x00000001, 0x00000000, + 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000003, + 0x0000ffff, 0x000000ec, 0x43425844, 0xc647666b, 0x92d327e5, 0x82d21ef6, 0xc31dc0cf, 0x00000001, + 0x000000ec, 0x00000003, 0x0000002c, 0x000000a8, 0x000000b4, 0x42415443, 0x00000074, 0x0000001c, + 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, + 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xabab0072, 0x00030001, 0x00040001, 0x00000001, + 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, 0x434c5846, + 0x00000030, 0x00000001, 0x13300001, 0x00000001, 0x00000000, 0x00000002, 0x00000003, 0x00000000, + 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x000000fb, 0x0000016c, 0x000000ec, + 0x43425844, 0xe6990a97, 0x7ed17834, 0x9f40de47, 0x01f476a7, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x000000a8, 0x000000b4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, + 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, 0x00000001, 0x00000038, + 0x00000000, 0x61765f67, 0xabab0072, 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x4d007874, + 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, + 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, 0x434c5846, 0x00000030, 0x00000001, + 0x13300001, 0x00000001, 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000004, 0x00000000, + 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000065, 0x00000264, 0x00000128, 0x43425844, 0x7a78de2e, + 0xcd31414e, 0xb6f69158, 0x92416c97, 0x00000001, 0x00000128, 0x00000003, 0x0000002c, 0x000000a8, + 0x000000c4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xabab0072, 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, - 0x34494c43, 0x00000004, 0x00000000, 0x434c5846, 0x00000030, 0x00000001, 0x13300001, 0x00000001, - 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, - 0x0000ffff, 0x00000065, 0x000000dc, 0x00000128, 0x43425844, 0x7a78de2e, 0xcd31414e, 0xb6f69158, - 0x92416c97, 0x00000001, 0x00000128, 0x00000003, 0x0000002c, 0x000000a8, 0x000000c4, 0x42415443, - 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, - 0x00000030, 0x00000002, 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xabab0072, 0x00030001, - 0x00040001, 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, - 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000014, - 0x00000004, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, 0x434c5846, 0x0000005c, 0x00000002, - 0x20400001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x00000000, 0x00000007, 0x00000000, 0x13300001, 0x00000001, 0x00000000, 0x00000007, 0x00000000, - 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000097, 0x000001d4, - 0x000000ec, 0x43425844, 0x90e93368, 0x6c8d5166, 0x276e99ab, 0x25ccef44, 0x00000001, 0x000000ec, - 0x00000003, 0x0000002c, 0x000000a8, 0x000000b4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, - 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, 0x00000001, - 0x00000038, 0x00000000, 0x61765f67, 0xab003272, 0x00030001, 0x00040001, 0x00000001, 0x00000000, - 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, - 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, 0x434c5846, 0x00000030, - 0x00000001, 0x13300001, 0x00000001, 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000004, - 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x000000cb, 0x00000308, 0x00000004, 0x00000020, - 0x00000000, 0x00000002, 0xffffffff, 0x00000000, 0x00000030, 0x00000014, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000036, 0x00000014, 0x00000000, 0x00000010, 0x00000000, - 0x00000000, 0x00000000, 0x00000065, 0x00000049, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, - 0x00000000, 0x00000097, 0x0000007b, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, - 0x000000cb, 0x000000af, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x000000d4, - 0x00000001, 0x00000000, 0x000000d9, 0x00000003, 0x00000000, 0x00000007, 0x00000000, 0x00000005, - 0x000001cc, 0x00000006, 0x00000000, 0x00000005, 0x00000300, 0x00000008, 0x00000000, 0x00000005, - 0x000003f8, + 0x34494c43, 0x00000014, 0x00000004, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, 0x434c5846, + 0x0000005c, 0x00000002, 0x20400001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, 0x13300001, 0x00000001, 0x00000000, + 0x00000007, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + 0x00000097, 0x0000035c, 0x000000ec, 0x43425844, 0x90e93368, 0x6c8d5166, 0x276e99ab, 0x25ccef44, + 0x00000001, 0x000000ec, 0x00000003, 0x0000002c, 0x000000a8, 0x000000b4, 0x42415443, 0x00000074, + 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, + 0x00000002, 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xab003272, 0x00030001, 0x00040001, + 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, + 0x434c5846, 0x00000030, 0x00000001, 0x13300001, 0x00000001, 0x00000000, 0x00000002, 0x00000001, + 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x000000cb, 0x00000490, + 0x00000004, 0x00000020, 0x00000000, 0x00000002, 0xffffffff, 0x00000000, 0x00000030, 0x00000014, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, 0x00000014, 0x00000000, + 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000065, 0x00000049, 0x00000000, 0xffffffff, + 0x00000000, 0x00000000, 0x00000000, 0x00000097, 0x0000007b, 0x00000000, 0xffffffff, 0x00000000, + 0x00000000, 0x00000000, 0x000000cb, 0x000000af, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, + 0x00000000, 0x000000fb, 0x000000df, 0x00000000, 0xffffffff, 0x00000002, 0x00000025, 0x00000000, + 0x00000001, 0x00000104, 0x00000026, 0x00000000, 0x00000001, 0x00000110, 0x00000002, 0x00000025, + 0x00000000, 0x00000001, 0x0000011c, 0x00000026, 0x00000000, 0x00000001, 0x00000128, 0x00000000, + 0x00000134, 0x00000001, 0x00000000, 0x00000139, 0x00000006, 0x00000000, 0x0000000a, 0x00000000, + 0x00000001, 0x0000013c, 0x0000000b, 0x00000000, 0x00000001, 0x00000160, 0x00000002, 0x00000000, + 0x00000005, 0x0000025c, 0x00000007, 0x00000000, 0x00000005, 0x00000354, 0x00000006, 0x00000000, + 0x00000005, 0x00000488, 0x00000008, 0x00000000, 0x00000005, 0x00000580, }; +static void set_vec4(float *v, float x, float y, float z, float w) +{ + v[0] = x; + v[1] = y; + v[2] = z; + v[3] = w; +} + static void test_effect_index_expression(void) { D3D10_PASS_SHADER_DESC shader_desc; ID3D10EffectVectorVariable *vector; ID3D10EffectTechnique *tech; + D3D10_BLEND_DESC bs_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; + ID3D10BlendState *bs; ID3D10Effect *effect; ID3D10Device *device; ULONG refcount; @@ -7897,10 +7929,7 @@ static void test_effect_index_expression(void) v = effect->lpVtbl->GetVariableByName(effect, "g_var"); vector = v->lpVtbl->AsVector(v); - val[0] = 0.0f; - val[1] = 0.0f; - val[2] = 1.0f; - val[3] = 0.0f; + set_vec4(val, 0.0f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -7908,14 +7937,90 @@ static void test_effect_index_expression(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + + set_vec4(val, 0.0f, 0.0f, 1.0f, 1.0f); + hr = vector->lpVtbl->SetFloatVector(vector, val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + + /* Out of bounds index */ + set_vec4(val, 0.0f, 0.0f, 2.0f, 2.0f); + hr = vector->lpVtbl->SetFloatVector(vector, val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + + set_vec4(val, 0.0f, 0.0f, 3.0f, 3.0f); + hr = vector->lpVtbl->SetFloatVector(vector, val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + + set_vec4(val, 0.0f, 0.0f, -1.0f, -1.0f); + hr = vector->lpVtbl->SetFloatVector(vector, val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + + set_vec4(val, 0.0f, 0.0f, -11.0f, 0.0f); + hr = vector->lpVtbl->SetFloatVector(vector, val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); + ID3D10BlendState_GetDesc(bs, &bs_desc); + ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); + ID3D10BlendState_Release(bs); + hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); - val[0] = 0.9f; - val[1] = 0.0f; - val[2] = 1.0f; - val[3] = 0.0f; + set_vec4(val, 0.9f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -7930,10 +8035,7 @@ static void test_effect_index_expression(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); - val[0] = 0.0f; - val[1] = 1.0f; - val[2] = 0.0f; - val[3] = 0.0f; + set_vec4(val, 0.0f, 1.0f, 0.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.33.0

2 1

[PATCH 5/5] win32u: Move NtUserChangeDisplaySettings implementation from user32.
by Jacek Caban 02 Dec '21

02 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

2 1

[PATCH 4/5] win32u: Introduce get_virtual_screen_rect.
by Jacek Caban 02 Dec '21

02 Dec '21

And use it in nulldrv_GetDeviceCaps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

2 1

[PATCH 3/5] win32u: Handle invisible winstations in lock_display_devices.
by Jacek Caban 02 Dec '21

02 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 139 +++++++++++++++++++++++----------------- 1 file changed, 80 insertions(+), 59 deletions(-)

2 1

[PATCH 2/5] win32u: Move NtUserEnumDisplayMonitors implementation from user32.
by Jacek Caban 02 Dec '21

02 Dec '21

2 1

[PATCH 1/5] win32u: Move GetMonitorInfo implementation from user32.
by Jacek Caban 02 Dec '21

02 Dec '21

2 1

[PATCH 1/2] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster 02 Dec '21

02 Dec '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes: - Simplify tests dlls/kernel32/tests/console.c | 68 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..a39a637f6ca 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,7 +3554,7 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); @@ -3661,6 +3661,72 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + /* Request a TrueType font */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + /* Try setting console font information for the current window size */ + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test with no font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); -- 2.34.1

2 4

[PATCH 1/5] dwrite: Create backend font objects for faces.
by Nikolay Sivov 02 Dec '21

02 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 9 +++++++++ dlls/dwrite/font.c | 35 ++++++++++++++++++++++++++++++++-- dlls/dwrite/freetype.c | 37 ++++++++++++++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7cca4c5c4f9..9735ffd2605 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -241,6 +241,10 @@ extern UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned i extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; +struct dwrite_fontface; +typedef void * font_object_handle; +typedef font_object_handle (*p_dwrite_fontface_get_font_object)(struct dwrite_fontface *fontface); + struct dwrite_fontface { IDWriteFontFace5 IDWriteFontFace5_iface; @@ -253,6 +257,9 @@ struct dwrite_fontface IDWriteFactory7 *factory; struct fontfacecached *cached; + font_object_handle font_object; + void *data_context; + p_dwrite_fontface_get_font_object get_font_object; USHORT simulations; DWRITE_FONT_FACE_TYPE type; @@ -731,6 +738,8 @@ struct font_callback_funcs struct font_backend_funcs { + font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); + void (CDECL *release_font_object)(font_object_handle object); void (CDECL *notify_release)(void *key); int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b7071314bb2..85868c6bfd8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -636,8 +636,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFace5_ReleaseFontTable(iface, fontface->kern.context); if (fontface->file) IDWriteFontFile_Release(fontface->file); - if (fontface->stream) - IDWriteFontFileStream_Release(fontface->stream); if (fontface->names) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) @@ -652,6 +650,12 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) heap_free(fontface->glyphs[i]); font_funcs->notify_release(iface); + font_funcs->release_font_object(fontface->font_object); + if (fontface->stream) + { + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, fontface->data_context); + IDWriteFontFileStream_Release(fontface->stream); + } dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); @@ -5013,6 +5017,32 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } +static font_object_handle dwrite_fontface_get_font_object(struct dwrite_fontface *fontface) +{ + font_object_handle font_object; + const void *data_ptr; + void *data_context; + UINT64 size; + + if (!fontface->font_object && SUCCEEDED(IDWriteFontFileStream_GetFileSize(fontface->stream, &size))) + { + if (SUCCEEDED(IDWriteFontFileStream_ReadFileFragment(fontface->stream, &data_ptr, 0, size, &data_context))) + { + if (!(font_object = font_funcs->create_font_object(data_ptr, size, fontface->index))) + { + WARN("Backend failed to create font object.\n"); + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, data_context); + return NULL; + } + + if (InterlockedCompareExchangePointer((void **)&fontface->font_object, font_object, NULL)) + font_funcs->release_font_object(font_object); + } + } + + return fontface->font_object; +} + HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, IDWriteFontFace5 **ret) { struct file_stream_desc stream_desc; @@ -5102,6 +5132,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li release_font_data(font_data); fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); + fontface->get_font_object = dwrite_fontface_get_font_object; *ret = &fontface->IDWriteFontFace5_iface; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 1ece99e08c9..5c32ec725f6 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -69,6 +69,7 @@ typedef struct static const struct font_callback_funcs *callback_funcs; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); MAKE_FUNCPTR(FT_Get_First_Char); @@ -143,12 +144,14 @@ static BOOL init_freetype(void) FT_Version_t FT_Version; ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); - if (!ft_handle) { + if (!ft_handle) + { WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); - return FALSE; + return FALSE; } #define LOAD_FUNCPTR(f) if((p##f = dlsym(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Done_FreeType) LOAD_FUNCPTR(FT_Done_Glyph) LOAD_FUNCPTR(FT_Get_First_Char) @@ -211,6 +214,23 @@ sym_not_found: return FALSE; } +static font_object_handle CDECL freetype_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + FT_Face face = NULL; + FT_Error fterror; + + fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (fterror != FT_Err_Ok) + WARN("Failed to create a face object, error %d.\n", fterror); + + return face; +} + +static void CDECL freetype_release_font_object(font_object_handle object) +{ + pFT_Done_Face(object); +} + static void CDECL freetype_notify_release(void *key) { RtlEnterCriticalSection(&freetype_cs); @@ -777,6 +797,8 @@ static INT32 CDECL freetype_get_glyph_advance(void *key, float emSize, UINT16 in const static struct font_backend_funcs freetype_funcs = { + freetype_create_font_object, + freetype_release_font_object, freetype_notify_release, freetype_get_glyph_outline, freetype_get_glyph_count, @@ -803,6 +825,15 @@ static NTSTATUS release_freetype_lib(void) #else /* HAVE_FREETYPE */ +static font_object_handle CDECL null_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + return NULL; +} + +static void CDECL null_release_font_object(font_object_handle object) +{ +} + static void CDECL null_notify_release(void *key) { } @@ -842,6 +873,8 @@ static void CDECL null_get_design_glyph_metrics(void *key, UINT16 upem, UINT16 a const static struct font_backend_funcs null_funcs = { + null_create_font_object, + null_release_font_object, null_notify_release, null_get_glyph_outline, null_get_glyph_count, -- 2.33.0

1 4

[PATCH] dxdiagn: Update DirectX version to the one from Windows 11.
by Aidas Jonikas 02 Dec '21

02 Dec '21

This patch removes the DirectX 9 dialog in Roblox that prevents the game from starting and/or installing. Technically only DirectX 11 is required for fixing the issue but I want to future-proof this patch. --- dlls/dxdiagn/provider.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index aaffb5c213d..0f50fe1f65d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -614,7 +614,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200], localized_pagefile_fmt[200]; DWORD_PTR args[2]; - hr = add_ui4_property(node, L"dwDirectXVersionMajor", 9); + hr = add_ui4_property(node, L"dwDirectXVersionMajor", 12); if (FAILED(hr)) return hr; @@ -626,11 +626,11 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; - hr = add_bstr_property(node, L"szDirectXVersionEnglish", L"4.09.0000.0904"); + hr = add_bstr_property(node, L"szDirectXVersionEnglish", L"10.00.22000.1000"); if (FAILED(hr)) return hr; - hr = add_bstr_property(node, L"szDirectXVersionLongEnglish", L"= \"DirectX 9.0c (4.09.0000.0904)"); + hr = add_bstr_property(node, L"szDirectXVersionLongEnglish", L"= \"DirectX 12 (10.00.22000.1000)"); if (FAILED(hr)) return hr; -- 2.34.1

2 1

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 02 Dec '21

02 Dec '21

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 117 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 55 deletions(-) diff --git a/po/ko.po b/po/ko.po index d550e6f5ea7..635a29077fc 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-24 00:22+0900\n" +"PO-Revision-Date: 2021-12-02 20:37+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -56,7 +56,7 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" +"다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성 요소" "를 수정하려면, 목록에서 선택한 후 [수정] 또는 [제거]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:67 @@ -1109,8 +1109,8 @@ msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" -"페이지 범위를 벗어나지 않아야 올바른 값입니다.\n" -"%1!d! 과 %2!d! 사이의 값을 입력하시오." +"페이지 범위 안에 있어야 하는 값입니다.\n" +"%1!d! - %2!d! 사이의 값을 입력하세요." #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -1121,20 +1121,20 @@ msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"여백이 겹쳐졌거나 용지 크기를 넘었습니다.\n" -"여백 크기를 다시 입력하세요." +"여백이 용지 경계와 겹치거나 초과했습니다.\n" +"여백을 다시 조정하세요." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." -msgstr "'복사본 개수' 필드는 비어 있어서는 안됩니다." +msgstr "'복사본 매수' 필드는 비어 있지 않아야 합니다." #: dlls/comdlg32/comdlg32.rc:67 msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"이렇게 많은 복사본 갯수는 프린터에서 지원되지 않습니다.\n" -"1과 %d 사이의 값을 입력하세요." +"복사본 매수가 너무 많아서 프린터가 지원하지 않습니다.\n" +"1 - %d 사이의 값을 입력하세요." #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1170,7 +1170,7 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "%1!d!pt - %2!d!pt 사이에서 글꼴 크기를 선택하세요." +msgstr "글꼴 크기를 %1!d! - %2!d! pt 사이에서 선택하세요." #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1194,15 +1194,15 @@ msgstr "선택한 폴더" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "숫자는 글꼴 크기입니다." +msgstr "글꼴 크기는 숫자여야 합니다." #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" -msgstr "준비" +msgstr "준비됨" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "정지; " +msgstr "일시 중지됨; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " @@ -1210,23 +1210,23 @@ msgstr "오류; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "제거 중; " +msgstr "삭제 보류 중; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "종이 걸림; " +msgstr "용지 걸림; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "종이 초과; " +msgstr "용지 부족; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "수동 종이 공금; " +msgstr "용지 수동 곱급; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "종이 문제; " +msgstr "용지 문제; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " @@ -1234,23 +1234,23 @@ msgstr "프린터 오프라인; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 활성; " +msgstr "입출력 활성화 됨; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "바쁨; " +msgstr "다른 작업 중; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "인쇄중; " +msgstr "인쇄 중; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "출력 트레이가 꽉 찼습니다; " +msgstr "출력 트레이가 가득 참; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "가능하지 않음; " +msgstr "사용할 수 없음; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " @@ -1278,23 +1278,23 @@ msgstr "토너 없음; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "페이지 펀트; " +msgstr "페이지 포기; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "사용자에 의한 취소; " +msgstr "사용자가 중단함; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "메모리 초과; " +msgstr "메모리 부족; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "프린터 문이 열려있습니다; " +msgstr "프린터의 문이 열려 있음; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "프린트 서버 상태 알 수 없음; " +msgstr "알 수 없는 프린터 서버; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " @@ -1332,7 +1332,7 @@ msgstr "암호(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" -msgstr "내 암호 기억(&R)" +msgstr "내 암호 저장(&R)" #: dlls/credui/credui.rc:30 msgid "Connect to %s" @@ -1577,7 +1577,7 @@ msgstr "성" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "주소 구성 요소" +msgstr "도메인 구성 요소" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -2633,23 +2633,23 @@ msgstr " 유효기간(끝) " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "이 인증서는 잘못된 서명을 가지고 있습니다." +msgstr "인증서 서명이 잘못되었습니다." #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." -msgstr "이 인증서는 만료되었거나 아직 유효하지 않습니다." +msgstr "만료되었거나 아직 유효하지 않은 인증서입니다." #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "이 인증서는 발행자가 정한 유효시간을 초과했습니다." +msgstr "발행자가 정한 유효 기간을 넘긴 인증서입니다." #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "이 인증서는 발행자에 의하여 취소되었습니다." +msgstr "발행자가 취소한 인증서입니다." #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." -msgstr "이 인증서는 올바릅니다." +msgstr "올바른 인증서입니다." #: dlls/cryptui/cryptui.rc:47 msgid "Field" @@ -3251,7 +3251,7 @@ msgstr "이 대화상자 건너뛰기" #: dlls/gphoto2.ds/gphoto2.rc:38 msgid "Exit" -msgstr "끝내기" +msgstr "나가기" #: dlls/gphoto2.ds/gphoto2.rc:43 msgid "Transferring" @@ -3954,7 +3954,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "속성 '|'을(를) 정의할 수 없습니다. 개체가 확장 가능하지 않습니다." +msgstr "확장 가능하지 않은 속성 '|'을(를) 정의할 수 없습니다" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -4867,7 +4867,7 @@ msgstr "잘못된 서비스 컨트롤.\n" #: dlls/kernel32/winerror.mc:1143 msgid "Service request timeout.\n" -msgstr "서비스 요청 시간초과.\n" +msgstr "서비스 요청 시간 초과.\n" #: dlls/kernel32/winerror.mc:1148 msgid "Cannot create service thread.\n" @@ -6083,7 +6083,7 @@ msgstr "페이지파일 할당량이 없음.\n" #: dlls/kernel32/winerror.mc:2673 msgid "Exceeded commitment limit.\n" -msgstr "헌신 한도 초과.\n" +msgstr "약정 한도 초과.\n" #: dlls/kernel32/winerror.mc:2678 msgid "Menu item not found.\n" @@ -8342,7 +8342,7 @@ msgstr "프로그램: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "프로그램 컨텍스트: [1], 어셈블리 이름 : [2]" +msgstr "프로그램 컨텍스트:[1], 어셈블리 이름:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" @@ -10394,9 +10394,7 @@ msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "" -"협정 세계시\n" -"(UTC-08:00) 협정 세계시-08" +msgstr "(UTC-08:00) 협정 세계시-08" #: dlls/tzres/tzres.rc:39 msgid "Altai Standard Time" @@ -13178,13 +13176,12 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "활성 코드 페이지: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy #| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "잘못된 메시지입니다.\n" +msgstr "잘못된 코드 페이지입니다\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13197,6 +13194,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [번호]\n" +"\n" +" 활성 콘솔 코드 페이지를 설정하거나 표시합니다.\n" +"\n" +" 번호 활성화할 콘솔 코드 페이지 번호.\n" +"\n" +" 활성화된 콘솔 코드 페이지를 표시하려면 번호 없이 CHCP를 입력합니다.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14372,11 +14377,11 @@ msgid "" msgstr "" "구문:\n" "\n" -"NET 명령어[매개변수]\n" -"\n" +"NET 명령어 [매개변수]\n" +" 또는\n" "NET 명령어 /HELP\n" "\n" -"<명령어>는 HELP, START, STOP, USE 중 하나입니다.\n" +"<명령어>는 HELP, START, STOP, USE 중 하나입니다.\n" #: programs/net/net.rc:31 msgid "" @@ -15445,6 +15450,7 @@ msgstr "" "\n" "지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"\n" "특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" " REG [작업] /?\n" "\n" @@ -15911,7 +15917,7 @@ msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다.\n" +msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15923,7 +15929,7 @@ msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다.\n" +msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16736,7 +16742,7 @@ msgstr "오류: 프로세스 자체 종료는 허용되지 않습니다.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" -msgstr "새 작업 (실행...)(&N)" +msgstr "새 작업(&N) (실행...)" #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" @@ -17568,7 +17574,7 @@ msgid "" msgstr "" "Wine Application Uninstaller\n" "\n" -"현재 Wine 구성(prefix)에서 프로그램을 제거합니다.\n" +"현재 Wine PREFIX에서 프로그램을 제거합니다.\n" "\n" #: programs/uninstaller/uninstaller.rc:43 @@ -17589,7 +17595,8 @@ msgstr "" "\n" "옵션:\n" " --help 지금 보고 있는 정보를 표시합니다.\n" -" --list 실행한 Wine에 설치된 모든 프로그램의 목록을 표시합니다.\n" +" --list 실행한 Wine PREFIX에 설치된 모든 프로그램의 목록을 표시합니" +"다.\n" " --remove {GUID} 지정한 프로그램을 제거합니다. '--list' 옵션을\n" " 사용하면 프로그램의 GUID를 알 수 있습니다.\n" " [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" @@ -17641,7 +17648,7 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "%s의 Wine 구성을 업데이트하고 있습니다. 잠시만 기다려주세요..." +msgstr "%s의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주세요..." # 라이선스 문구는 번역하지 않습니다. #: programs/winecfg/winecfg.rc:140 -- 2.34.1

1 0

[PATCH 1/6] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Jan Sikorski 02 Dec '21

02 Dec '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- This is meant to be followed by more patches that manage references to all the other objects that need to be kept alive for command lists. That includes: all the ones handled similarly to samplers (i.e. the ones that we put into dedicated arrays); wined3d_resources, which are currently acquired on every draw/dispatch call; and views on these resources, which are not handled at all at this point. Apart from simplifying the code to some degree, it will fix the size problem of wined3d_resources arrays, which can get pretty large when the application is doing many repeated draw/dispatch calls. v2: naming & source structure changes --- dlls/wined3d/cs.c | 83 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..03a9cb74ffe 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -102,6 +102,10 @@ ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) return refcount; } +struct wined3d_cs_packet; +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *); +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *, SIZE_T *); + ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); @@ -111,7 +115,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) if (!refcount) { - SIZE_T i; + const struct wined3d_cs_packet *packet; + SIZE_T i, start = 0; for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); @@ -132,6 +137,12 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + while (start < list->data_size) + { + packet = wined3d_next_cs_packet(list->data, &start); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); @@ -207,6 +218,14 @@ struct wined3d_cs_packet BYTE data[1]; }; +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *start) +{ + struct wined3d_cs_packet *packet; + packet = (struct wined3d_cs_packet *)&data[*start]; + *start += offsetof(struct wined3d_cs_packet, data[packet->size]); + return packet; +} + struct wined3d_cs_nop { enum wined3d_cs_op opcode; @@ -3626,6 +3645,52 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_decref(op->samplers[i]); + } + break; + } + default: + break; + } +} + +static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_incref(op->samplers[i]); + } + break; + } + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3688,16 +3753,18 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + wined3d_cs_packet_incref_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3979,7 +4046,7 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *context) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - SIZE_T i; + SIZE_T i, start = 0; TRACE("context %p.\n", context); @@ -4022,6 +4089,12 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + while (start < deferred->data_size) + { + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(deferred->data, &start); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); -- 2.32.0

1 5

[PATCH 1/8] dinput8/tests: Add a more effect direction tests.
by Rémi Bernon 02 Dec '21

02 Dec '21

Making sure we are actually writing the correctly values to PID reports, regardless of user provided coordinate space. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 14 ++++- dlls/dinput8/tests/hid.c | 103 +++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 99fe98d95ce..49a8f28e864 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2764,6 +2764,13 @@ static void set_parameter_value_us( struct hid_joystick_effect *impl, char *repo set_parameter_value( impl, report_buf, caps, value ); } +static BOOL is_axis_usage_enabled( struct hid_joystick_effect *impl, USAGE usage ) +{ + DWORD i = impl->params.cAxes; + while (i--) if (LOWORD(impl->params.rgdwAxes[i]) == usage) return TRUE; + return FALSE; +} + static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) { static const DWORD complete_mask = DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS; @@ -2937,7 +2944,12 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) spherical.rglDirection = directions; convert_directions_to_spherical( &impl->params, &spherical ); - for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) + /* FIXME: as far as the test cases go, directions are only written if + * either X or Y axes are enabled, maybe need more tests though */ + if (!is_axis_usage_enabled( impl, HID_USAGE_GENERIC_X ) && + !is_axis_usage_enabled( impl, HID_USAGE_GENERIC_Y )) + WARN( "neither X or Y axes are selected, skipping direction\n" ); + else for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) { tmp = directions[i] + (i == 0 ? 9000 : 0); caps = effect_update->direction_caps[effect_update->direction_count - i - 1]; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d9ecf4a5dd5..2efa817f00e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6357,6 +6357,54 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO for (i = 1; i < 4; i++) { + struct hid_expect expect_directions[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x02,0x00,0x04,0x00}, + }, + /* update effect */ + {0}, + /* effect control */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {0x02,0x01,0x03,0x00}, + }, + }; + struct hid_expect expect_spherical = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x55 : 0,i >= 3 ? 0x1c : 0}, + }; + struct hid_expect expect_cartesian = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x63 : 0,i >= 3 ? 0x1d : 0}, + }; + struct hid_expect expect_polar = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x3f : 0,i >= 3 ? 0x00 : 0}, + }; + winetest_push_context( "%u axes", i ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); @@ -6465,6 +6513,61 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); + + desc = expect_desc; + desc.dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 3000; + desc.rglDirection[1] = 4000; + desc.rglDirection[2] = 5000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_spherical; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + desc = expect_desc; + desc.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 6000; + desc.rglDirection[1] = 7000; + desc.rglDirection[2] = 8000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_cartesian; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + if (i == 2) + { + desc = expect_desc; + desc.dwFlags = DIEFF_POLAR | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 9000; + desc.rglDirection[1] = 10000; + desc.rglDirection[2] = 11000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_polar; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + } + winetest_pop_context(); } -- 2.34.0

1 7

[PATCH 1/3] comsvcs: Add IDispatch support for ISharedPropertyGroupManager.
by Jactry Zeng 02 Dec '21

02 Dec '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/comsvcs_private.h | 15 +++++++ dlls/comsvcs/main.c | 82 ++++++++++++++++++++++++++++++++++ dlls/comsvcs/property.c | 46 +++++++++++++++---- dlls/comsvcs/tests/property.c | 61 +++++++++++++++++++++++++ 5 files changed, 197 insertions(+), 9 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 22090938b52..5ad3d085b90 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 uuid +IMPORTS = ole32 oleaut32 uuid EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index c09c2174e0e..0051fb95831 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -31,4 +31,19 @@ HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); +enum tid_t +{ + NULL_tid, + ISharedPropertyGroupManager_tid, + LAST_tid +}; + +static REFIID tid_ids[] = +{ + &IID_NULL, + &IID_ISharedPropertyGroupManager, +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + #endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 797e2db97db..7903d2c2e07 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); +HINSTANCE dll_instance = NULL; + typedef struct dispensermanager { IDispenserManager IDispenserManager_iface; @@ -1024,3 +1026,83 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + if (typelib) + return S_OK; + + hr = LoadRegTypeLib(&LIBID_COMSVCSLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %#x.\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + hr = load_typelib(); + if (FAILED(hr)) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %#x.\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + dll_instance = instance; + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; + } + return TRUE; +} diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 4dc6e1d9a46..382089f87b2 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -76,32 +76,62 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) { - FIXME("iface %p, info %p: stub.\n", iface, info); - return E_NOTIMPL; + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + + *info = 1; + return S_OK; } static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); - return E_NOTIMPL; + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedPropertyGroupManager_tid, info); } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); - return E_NOTIMPL; + + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 7be62987507..53dcfae8c8e 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -60,6 +60,59 @@ static const IUnknownVtbl outer_vtbl = static IUnknown test_outer = {&outer_vtbl}; +struct test_name_id +{ + const WCHAR *name; + DISPID id; +}; + +#define TEST_TYPEINFO(dispatch,test_name_ids,id_count,riid) \ + _test_typeinfo(dispatch, test_name_ids, id_count, riid, __LINE__) +static void _test_typeinfo(IDispatch *dispatch, const struct test_name_id *test_name_ids, + UINT id_count, REFIID riid, int line) +{ + static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + ULONG refcount; + DISPID dispid; + UINT count; + BSTR names; + HRESULT hr; + int i; + + hr = IDispatch_GetTypeInfoCount(dispatch, NULL); + ok_(__FILE__,line)(hr == E_INVALIDARG, "GetTypeInfoCount got hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IDispatch_GetTypeInfoCount(dispatch, &count); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfoCount got hr %#x.\n", hr); + ok_(__FILE__,line)(count == 1, "Got unexpected count: %d.\n", count); + + hr = IDispatch_GetTypeInfo(dispatch, 1, english, &typeinfo); + ok_(__FILE__,line)(hr == DISP_E_BADINDEX, "GetTypeInfo got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(dispatch, 0, english, &typeinfo); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfo failed %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok_(__FILE__,line)(hr == S_OK, "GetTypeAttr got hr %#x.\n", hr); + ok_(__FILE__,line)(IsEqualGUID(&typeattr->guid, riid), + "Got unexpected type guid: %s.\n", wine_dbgstr_guid(&typeattr->guid)); + refcount = get_refcount(typeinfo); + ok_(__FILE__,line)(refcount == 2, "Got refcount: %u.\n", refcount); + ITypeInfo_Release(typeinfo); + + for (i = 0; i < id_count; i++) + { + names = SysAllocString(test_name_ids[i].name); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames(dispatch, &IID_NULL, &names, 1, english, &dispid); + SysFreeString(names); + ok_(__FILE__,line)(hr == S_OK, "tests[%d] got hr %#x.\n", i, hr); + ok_(__FILE__,line)(dispid == test_name_ids[i].id, "tests[%d] got wrong dispid %x.\n", i, dispid); + } +} + static void test_interfaces(void) { ISharedPropertyGroupManager *manager, *manager1; @@ -67,6 +120,12 @@ static void test_interfaces(void) IDispatch *dispatch; IUnknown *unk; HRESULT hr; + static const struct test_name_id test_name_ids[] = + { + {L"CreatePropertyGroup", 0x1}, + {L"Group", 0x2}, + {L"_NewEnum", DISPID_NEWENUM}, + }; hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, &IID_ISharedPropertyGroupManager, (void **)&manager); @@ -100,6 +159,8 @@ static void test_interfaces(void) refcount = get_refcount(manager); ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroupManager); + IDispatch_Release(dispatch); IUnknown_Release(unk); ISharedPropertyGroupManager_Release(manager); -- 2.33.0

1 2

[PATCH] winemac: Include missing dlfcn.h.
by Huw Davies 02 Dec '21

02 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3665e0023b7..ca70db7a689 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <dlfcn.h> #include "macdrv.h" #include "wine/debug.h" -- 2.23.0

1 0

[PATCH] netapi32: Return the length in characters not bytes.
by Huw Davies 02 Dec '21

02 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/netapi32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 23881b470d9..c6b389950f7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -72,7 +72,7 @@ static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) { - if (!dst) return (strlen( src ) + 1) * sizeof(WCHAR); + if (!dst) return strlen( src ) + 1; return ntdll_umbstowcs( src, strlen( src ) + 1, dst, dstlen ); } -- 2.23.0

1 0

[PATCH] krnl386: Add GetLPErrMode stub
by Alex Henrie 02 Dec '21

02 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52102 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- To determine that this function returns a pointer to a 16-bit integer, I installed Windows 3.1 in DOSBox, installed version 4.5 of the Borland C++ compiler, and wrote a small test program. The value at the address returned by GetLPErrMode was always 0 in my tests, and calling SetErrorMode did not change it. However, setting the value is not necessary for outSPOKEN 3.0 because just returning NULL is enough for it to start and show its user interface. --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/krnl386.exe16/task.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 6a55aad78f8..d98e136c77e 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -100,7 +100,7 @@ 96 pascal -ret16 FreeLibrary(word) FreeLibrary16 97 pascal -ret16 GetTempFileName(word str word ptr) GetTempFileName16 98 pascal -ret16 GetLastDiskChange() KERNEL_nop -99 stub GetLPErrMode +99 pascal GetLPErrMode() 100 pascal -ret16 ValidateCodeSegments() KERNEL_nop 101 stub NoHookDosCall 102 pascal -register DOS3Call() DOS3Call diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 892f4d19f07..99c2fc6212f 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -1255,6 +1255,16 @@ WORD WINAPI GetExeVersion16(void) } +/*********************************************************************** + * GetLPErrMode (KERNEL.99) + */ +UINT16 * WINAPI GetLPErrMode( void ) +{ + FIXME("(): stub\n"); + return NULL; +} + + /*********************************************************************** * SetErrorMode (KERNEL.107) */ -- 2.34.1

1 0

[PATCH] wined3d: Map OpenGL adapter BOs persistently on 64-bit architectures.
by Zebediah Figura 01 Dec '21

01 Dec '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index dcb4ab7a0af..6391f6788e9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2705,10 +2705,22 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); map: + if (bo->b.map_ptr) + return (uint8_t *)bo->b.map_ptr; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, + GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) + { + if (wined3d_map_persistent()) + bo->b.map_ptr = map_ptr; + } + } + else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } @@ -2791,6 +2803,9 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); + if (bo->b.map_ptr) + return; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); @@ -2908,9 +2923,15 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei } if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + } else + { GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + } wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("buffer object creation"); -- 2.32.0

1 0

[PATCH] server: Remove workarounds for Mac OS X 10.4.
by Brendan Shanks 01 Dec '21

01 Dec '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- These were already removed from signal_i386. server/mach.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/server/mach.c b/server/mach.c index 77f1fdcdb86..d31e4025776 100644 --- a/server/mach.c +++ b/server/mach.c @@ -193,22 +193,12 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int else #endif { -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; -#else - context->debug.i386_regs.dr0 = state.uds.ds32.dr0; - context->debug.i386_regs.dr1 = state.uds.ds32.dr1; - context->debug.i386_regs.dr2 = state.uds.ds32.dr2; - context->debug.i386_regs.dr3 = state.uds.ds32.dr3; - context->debug.i386_regs.dr6 = state.uds.ds32.dr6; - context->debug.i386_regs.dr7 = state.uds.ds32.dr7; -#endif } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } @@ -262,7 +252,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dsh.flavor = x86_DEBUG_STATE32; state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; @@ -271,16 +260,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.__dr5 = 0; state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; state.uds.ds32.__dr7 = dr7; -#else - state.uds.ds32.dr0 = context->debug.i386_regs.dr0; - state.uds.ds32.dr1 = context->debug.i386_regs.dr1; - state.uds.ds32.dr2 = context->debug.i386_regs.dr2; - state.uds.ds32.dr3 = context->debug.i386_regs.dr3; - state.uds.ds32.dr4 = 0; - state.uds.ds32.dr5 = 0; - state.uds.ds32.dr6 = context->debug.i386_regs.dr6; - state.uds.ds32.dr7 = dr7; -#endif } thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port ); -- 2.30.1 (Apple Git-130)

1 0

[PATCH 1/5] configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified.
by Zebediah Figura 01 Dec '21

01 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- aclocal.m4 | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 +++++++++ 2 files changed, 83 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 07a0359a3f1..611909253c7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -64,6 +64,15 @@ AC_CHECK_TOOL(READELF,[readelf],true)]) AC_DEFUN([WINE_PATH_PKG_CONFIG], [WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])]) +AC_DEFUN([WINE_PATH_MINGW_PKG_CONFIG], +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-pkg-config ])" ;; + *) + ac_prefix_list="$host_cpu-w64-mingw32-pkg-config" ;; +esac +AC_CHECK_PROGS(MINGW_PKG_CONFIG,[$ac_prefix_list],false)]) + dnl **** Extract the soname of a library **** dnl dnl Usage: WINE_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) @@ -124,6 +133,30 @@ CPPFLAGS=$ac_save_CPPFLAGS AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl +dnl **** Get flags from MinGW pkg-config or alternate xxx-config program **** +dnl +dnl Usage: WINE_MINGW_PACKAGE_FLAGS(var,pkg-name,[default-lib,[cflags-alternate,libs-alternate,[checks]]]) +dnl +AC_DEFUN([WINE_MINGW_PACKAGE_FLAGS], +[AC_REQUIRE([WINE_PATH_MINGW_PKG_CONFIG])dnl +AS_VAR_PUSHDEF([ac_cflags],[[$1]_PE_CFLAGS])dnl +AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl +AS_VAR_IF([ac_cflags],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_cflags=`$MINGW_PKG_CONFIG --cflags [$2] 2>/dev/null`])]) +m4_ifval([$4],[test "$cross_compiling" = yes || ac_cflags=[$]{ac_cflags:-[$4]}]) +AS_VAR_IF([ac_libs],[], + [AS_VAR_SET_IF([MINGW_PKG_CONFIG], + [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) +m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) +m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $ac_cflags" +$6 +CPPFLAGS=$ac_save_CPPFLAGS +AS_VAR_POPDEF([ac_libs])dnl +AS_VAR_POPDEF([ac_cflags])])dnl + dnl **** Get flags for an external lib program **** dnl dnl Usage: WINE_EXTLIB_FLAGS(var,pkg-name,default-libs,default-cflags) @@ -189,6 +222,44 @@ ac_exeext=$ac_wine_try_cflags_saved_exeext]) AS_VAR_IF([ac_var],[yes],[m4_default([$2], [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS $1"])], [$3])dnl AS_VAR_POPDEF([ac_var])]) +dnl **** Check whether the given MinGW header is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_HEADER(header,[action-if-found],[action-if-not-found],[other-includes]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_HEADER], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_header_$1])dnl +AC_CACHE_CHECK([for MinGW $1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4 +#include <$1>]])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext]) +AS_VAR_IF([ac_var],[yes],[$2],[$3])dnl +AS_VAR_POPDEF([ac_var])]) + +dnl **** Check whether the given MinGW library is available **** +dnl +dnl Usage: WINE_CHECK_MINGW_LIB(library,function,[action-if-found],[action-if-not-found],[other-libraries]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_LIB], +[AS_VAR_PUSHDEF([ac_var],[ac_cv_mingw_lib_$1])dnl +AC_CACHE_CHECK([for $2 in MinGW -l$1], ac_var, +[ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-l$1 $5 $LIBS" +AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs]) +AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl +AS_VAR_POPDEF([ac_var])]) + dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) diff --git a/configure.ac b/configure.ac index 163d06fc327..5c32f71e672 100644 --- a/configure.ac +++ b/configure.ac @@ -1033,6 +1033,18 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], dnl **** External libraries **** +if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" +then + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz],,, + [WINE_CHECK_MINGW_HEADER(zlib.h, + [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])], + [ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""])]) + if test "x$ZLIB_PE_LIBS" = "x" + then + WINE_NOTICE([zlib ${notice_platform}MinGW development files not found; using bundled version.]) + fi +fi + WINE_EXTLIB_FLAGS(FAUDIO, faudio, "faudio mfplat mfreadwrite mfuuid propsys", "-I\$(top_srcdir)/libs/faudio/include") WINE_EXTLIB_FLAGS(GSM, gsm, gsm, "-I\$(top_srcdir)/libs/gsm/inc") WINE_EXTLIB_FLAGS(JPEG, jpeg, jpeg, "-I\$(top_srcdir)/libs/jpeg") -- 2.34.0

1 4

[PATCH v2 1/2] ntdll: Add tests for \Device\NamedPipe\ root directory.
by Jinoh Kang 01 Dec '21

01 Dec '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 109 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..681f3784974 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -22,6 +22,7 @@ #include "ntdll_test.h" #include "winternl.h" #include "winuser.h" +#include "winioctl.h" #include "ddk/wdm.h" #include "stdio.h" #include "winnt.h" @@ -197,6 +198,104 @@ static void test_namespace_pipe(void) pNtClose(pipe); } +static NTSTATUS fsctl(HANDLE handle, ULONG code, void *inbuf, ULONG insize, void *outbuf, ULONG outsize) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = pNtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + ok(status == STATUS_SUCCESS, "NtCreateEvent failure: %08x\n", status); + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = NtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + inbuf, insize, outbuf, outsize); + if (status == STATUS_PENDING) + { + while ((status = iosb.Status) == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + } + } + else if (status == STATUS_SUCCESS) + { + status = iosb.Status; + } + + pNtClose(event); + return status; +} + +static void test_pipe_device_file_as_root(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + LARGE_INTEGER timeout; + HANDLE pipe, root, h; + union { + FILE_PIPE_WAIT_FOR_BUFFER d; + unsigned char buf[offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[32])]; + } pipe_wait; + + timeout.QuadPart = -10000; + + pRtlInitUnicodeString(&str, L"\\Device\\NamedPipe"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&root, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded, but got %08x\n", status); + + memset( &pipe_wait.d, 0, sizeof(pipe_wait.d) ); + pipe_wait.d.Timeout.QuadPart = 0; + pipe_wait.d.TimeoutSpecified = TRUE; + wcscpy( pipe_wait.d.Name, L"nonexistent" ); + pipe_wait.d.NameLength = wcslen(pipe_wait.d.Name); + + status = fsctl(root, FSCTL_PIPE_WAIT, &pipe_wait, sizeof(pipe_wait), NULL, 0); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status); + + pRtlInitUnicodeString(&str, L"test3\\pipe"); + InitializeObjectAttributes(&attr, &str, 0, root, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status); + + if (SUCCEEDED(status)) pNtClose(pipe); + pNtClose(root); + + pRtlInitUnicodeString(&str, L"\\Device\\NamedPipe\\"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&root, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded, but got %08x\n", status); + + memset( &pipe_wait.d, 0, sizeof(pipe_wait.d) ); + pipe_wait.d.Timeout.QuadPart = 0; + pipe_wait.d.TimeoutSpecified = TRUE; + wcscpy( pipe_wait.d.Name, L"nonexistent_pipe" ); + pipe_wait.d.NameLength = wcslen(pipe_wait.d.Name); + + status = fsctl(root, FSCTL_PIPE_WAIT, &pipe_wait, sizeof(pipe_wait), NULL, 0); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status); + + pRtlInitUnicodeString(&str, L"test3\\pipe"); + InitializeObjectAttributes(&attr, &str, 0, root, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status); + + h = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + pNtClose(h); + pNtClose(pipe); + pNtClose(root); +} + #define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name, NTSTATUS expect ) { @@ -1870,6 +1969,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); @@ -2434,6 +2542,7 @@ START_TEST(om) test_case_sensitive(); test_namespace_pipe(); + test_pipe_device_file_as_root(); test_name_collisions(); test_name_limits(); test_directory(); -- 2.31.1

2 2

[PATCH] winemac.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/display.c | 594 ++++----------------------------- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_main.c | 2 +- 5 files changed, 64 insertions(+), 537 deletions(-)

1 0

[PATCH] gameux/tests: Skip gamestatistic tests on win10 >= 1803
by André Zwing 01 Dec '21

01 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51716 Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/gameux/tests/gamestatistics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c29c6b44470..aa10156f1ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -158,6 +158,12 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + /* With win10 1803 game explorer functionality was removed and gameux became a stub */ + win_skip("gameux is partially stubbed, skipping tests\n"); + return; + } ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); -- 2.25.1

1 0

[PATCH] ntdll: Set rcx on exit from syscall dispatcher on x64.
by Paul Gofman 01 Dec '21

01 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 220540. Changes: - leave r11 alone for now; - also test NtSetContextThread with CONTEXT_INTEGER; - don't assume same stack pointer and non-volatile registers between test function calls in the test. dlls/ntdll/tests/exception.c | 76 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 11 +++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0362cb9f0a9..3019c1a40cb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4917,6 +4917,81 @@ static void test_unwind_from_apc(void) ok(pass == 4, "Got unexpected pass %d.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } + +static void test_syscall_clobbered_regs(void) +{ + struct regs + { + UINT64 rcx; + }; + static const BYTE code[] = + { + 0x48, 0x8d, 0x05, 0x00, 0x10, 0x00, 0x00, + /* leaq 0x1000(%rip),%rax */ + 0x48, 0x25, 0x00, 0xf0, 0xff, 0xff, + /* andq $~0xfff,%rax */ + 0x48, 0x83, 0xe8, 0x08, /* subq $8,%rax */ + 0x48, 0x89, 0x20, /* movq %rsp,0(%rax) */ + 0x48, 0x89, 0xc4, /* movq %rax,%rsp */ + 0x41, 0x50, /* push %r8 */ + 0x53, 0x55, 0x57, 0x56, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, + /* push %rbx, %rbp, %rdi, %rsi, %r12, %r13, %r14, %r15 */ + 0x41, 0xff, 0xd1, /* callq *r9 */ + 0x41, 0x5f, 0x41, 0x5e, 0x41, 0x5d, 0x41, 0x5c, 0x5e, 0x5f, 0x5d, 0x5b, + /* pop %r15, %r14, %r13, %r12, %rsi, %rdi, %rbp, %rbx */ + 0x41, 0x58, /* pop %r8 */ + 0x49, 0x89, 0x48, 0x00, /* mov %rcx,(%r8) */ + 0x5c, /* pop %rsp */ + 0xc3, /* ret */ + }; + + NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); + NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + struct regs regs; + CONTEXT context; + NTSTATUS status; + + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); + ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + memset(&regs, 0, sizeof(regs)); + status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + /* After the syscall instruction rcx contains the address of the instruction next after syscall. */ + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + context.ContextFlags = CONTEXT_CONTROL; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + context.ContextFlags = CONTEXT_INTEGER; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20, + "Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread); + +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10737,6 +10812,7 @@ START_TEST(exception) test_extended_context(); test_copy_context(); test_unwind_from_apc(); + test_syscall_clobbered_regs(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4310c1c6a2f..69625af1e24 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3236,18 +3236,21 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" "movq 0x88(%rcx),%rsp\n\t" - "jmpq *0x70(%rcx)\n" /* frame->rip */ + "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ + "jmpq *%rcx\n\t" "1:\tleaq 0x70(%rcx),%rsp\n\t" "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ - "jz 1f\n\t" - "movq 0x00(%rcx),%rax\n\t" + "jnz 1f\n\t" + "movq (%rsp),%rcx\n\t" /* frame->rip */ + "iretq\n" + "1:\tmovq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%rdx\n\t" "movq 0x30(%rcx),%r8\n\t" "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" "movq 0x10(%rcx),%rcx\n" - "1:\tiretq\n" + "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" -- 2.33.1

2 6

[PATCH 2/3] win32u: Move NtUserEnumDisplaySettings implementation from user32.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +------ dlls/user32/sysparams.c | 39 ++++++------------------------------ dlls/win32u/driver.c | 35 +++++++++++++++++--------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 33 ++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 10 ++++++++- dlls/win32u/wrappers.c | 15 ++++++-------- include/ntuser.h | 2 ++ 9 files changed, 78 insertions(+), 66 deletions(-)

2 1

[PATCH 1/3] user32: Use NtUserGetDisplayConfigBufferSizes.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 57 ----------------------------------------- dlls/user32/user32.spec | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-)

2 1

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Write the else block only if it isn't empty.
by Giovanni Mascellani 01 Dec '21

01 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..c56a74d4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1446,11 +1446,14 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_block(ctx, buffer, &iff->then_instrs); - instr.opcode = VKD3D_SM4_OP_ELSE; - instr.src_count = 0; - write_sm4_instruction(buffer, &instr); + if (!list_empty(&iff->else_instrs.instrs)) + { + instr.opcode = VKD3D_SM4_OP_ELSE; + instr.src_count = 0; + write_sm4_instruction(buffer, &instr); - write_sm4_block(ctx, buffer, &iff->else_instrs); + write_sm4_block(ctx, buffer, &iff->else_instrs); + } instr.opcode = VKD3D_SM4_OP_ENDIF; write_sm4_instruction(buffer, &instr); -- 2.33.1

4 17

[PATCH vkd3d v6 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani 01 Dec '21

01 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

3 10

[PATCH] po: Update Dutch translation.
by Floris Renaud 01 Dec '21

01 Dec '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40227b8c909..e2b195fc896 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-10 00:03+0100\n" +"PO-Revision-Date: 2021-12-01 16:10+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -13263,13 +13263,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Actieve codetabel: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Ongeldig bericht.\n" +msgstr "Ongeldige codetabel\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13282,6 +13280,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [nummer]\n" +"\n" +" De actieve codetabel weergeven of instellen.\n" +"\n" +" nummer Stel het nummer van de codetabel in.\n" +"\n" +" Gebruik CHCP zonder nummer om de huidige codetabel te laten zien.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" -- 2.34.1

1 0

[PATCH 3/3] wineandroid.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 01 Dec '21

01 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/init.c | 62 ++++++++++++++------------------ 2 files changed, 28 insertions(+), 36 deletions(-)

1 0

[PATCH 6/6] winecoreaudio: Build with msvcrt.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 2 -- dlls/winecoreaudio.drv/midi.c | 6 +----- dlls/winecoreaudio.drv/mmdevdrv.c | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 8162eae67d7..4be396c489c 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ coreaudio.c \ coremidi.c \ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6191885553a..6c6752c0c76 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -21,23 +21,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - #include <string.h> #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" #include "mmdeviceapi.h" #include "audioclient.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/unixlib.h" #include "coreaudio.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b4cf325c9d2..128396fbe29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -21,11 +21,11 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/unixlib.h" @@ -126,10 +126,7 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0}; -static const WCHAR guidW[] = {'g','u','i','d',0}; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winecoreaudio.drv\\devices"; static HANDLE g_timer_q; @@ -253,7 +250,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, goto exit; } - lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, + lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); if(lr != ERROR_SUCCESS) ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); @@ -270,19 +267,17 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) DWORD type, size = sizeof(*guid); WCHAR key_name[256]; - static const WCHAR key_fmt[] = {'%','u',0}; - if(flow == eCapture) key_name[0] = '1'; else key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device_id); + swprintf(key_name + 2, ARRAY_SIZE(key_name), L"%u", device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ - if(RegQueryValueExW(dev_key, guidW, 0, &type, + if(RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size) == ERROR_SUCCESS){ if(type == REG_BINARY){ RegCloseKey(dev_key); @@ -322,8 +317,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, { struct get_endpoint_ids_params params; unsigned int i; - GUID *guids; - WCHAR **ids; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -346,7 +341,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; @@ -402,7 +397,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) } size = sizeof(reg_guid); - if(RegQueryValueExW(key, guidW, 0, &type, + if(RegQueryValueExW(key, L"guid", 0, &type, (BYTE*)&reg_guid, &size) == ERROR_SUCCESS){ if(IsEqualGUID(&reg_guid, guid)){ RegCloseKey(key); @@ -419,7 +414,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) return FALSE; } - *id = strtoulW(key_name + 2, NULL, 10); + *id = wcstoul(key_name + 2, NULL, 10); return TRUE; } -- 2.23.0

2 1

[PATCH 5/6] winecoreaudio: Always start the notification thread.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 9 ++------- dlls/winecoreaudio.drv/midi.c | 7 +------ dlls/winecoreaudio.drv/unixlib.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5777236bd26..8c09d4a2c1b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -417,19 +417,14 @@ NTSTATUS midi_init(void *args) dests[i].caps.wNotes = 0; } - params->num_srcs = num_srcs; - *params->err = DRV_SUCCESS; return STATUS_SUCCESS; } NTSTATUS midi_release(void *args) { - if (num_srcs) - { - /* stop the notify_wait thread */ - notify_post(NULL); - } + /* stop the notify_wait thread */ + notify_post(NULL); if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 262713dd003..6191885553a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static DWORD MIDIIn_NumDevs = 0; - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -87,10 +85,7 @@ static LONG CoreAudio_MIDIInit(void) return err; } - MIDIIn_NumDevs = params.num_srcs; - - if (MIDIIn_NumDevs > 0) - CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index d44a7a013e8..bd9a5ce03bd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -186,7 +186,6 @@ struct set_volumes_params struct midi_init_params { DWORD *err; - UINT num_srcs; }; struct notify_context -- 2.23.0

2 1

[PATCH 4/6] winecoreaudio: Switch midi_in_lock() away from a syscall prototype.
by Huw Davies 01 Dec '21

01 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ae8b71e002b..5777236bd26 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -136,13 +136,10 @@ static struct notify_context *notify_read, *notify_write; #define MAX_MIDI_SYNTHS 1 -NTSTATUS midi_in_lock(void *args) +static void midi_in_lock(BOOL lock) { - BOOL lock = !!args; - if (lock) pthread_mutex_lock(&midi_in_mutex); else pthread_mutex_unlock(&midi_in_mutex); - return STATUS_SUCCESS; } static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, @@ -228,7 +225,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) src->state |= 2; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); while (len) { @@ -253,7 +250,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) } } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); } static void process_small_packet(struct midi_src *src, MIDIPacket *packet) @@ -981,13 +978,13 @@ static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) hdr->dwBytesRecorded = 0; hdr->lpNext = NULL; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); next = &srcs[dev_id].lpQueueHdr; while (*next) next = &(*next)->lpNext; *next = hdr; - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return MMSYSERR_NOERROR; } @@ -1090,7 +1087,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) } src = srcs + dev_id; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); if (src->lpQueueHdr) { @@ -1102,7 +1099,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return err; } -- 2.23.0

2 1

[PATCH 3/6] winecoreaudio: Move the midi input event processing to the unixlib.
by Huw Davies 01 Dec '21

01 Dec '21

Notifications of incoming data are now directly added to a notify ring-buffer by macOS's midi read callback. The ring-buffer is implemented with an unused sentinel directly before the read ptr to distinguish between the full vs empty state. Notifications are processed by the client's notify thread via the midi_notify_wait syscall. Note that the read callback thread is not a Win32 thread, so the Win32 api cannot be used in anything that it calls. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 2 - dlls/winecoreaudio.drv/coremidi.c | 163 +++++++++++++++++++---- dlls/winecoreaudio.drv/coremidi.h | 86 ------------ dlls/winecoreaudio.drv/midi.c | 204 +---------------------------- dlls/winecoreaudio.drv/unixlib.h | 6 +- 5 files changed, 140 insertions(+), 321 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/coremidi.h diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1efcfdba3f4..e6ce5c33e36 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1634,6 +1634,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index bb8cb23f83b..ae8b71e002b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -89,7 +89,6 @@ #include "wine/unixlib.h" #include "coreaudio.h" -#include "coremidi.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(midi); @@ -107,12 +106,24 @@ struct midi_dest WORD wFlags; }; +struct midi_src +{ + MIDIEndpointRef source; + + WORD wDevID; + int state; /* 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIINCAPSW caps; + MIDIOPENDESC midiDesc; + LPMIDIHDR lpQueueHdr; + WORD wFlags; + DWORD startTime; +}; + static MIDIClientRef midi_client; static MIDIPortRef midi_out_port, midi_in_port; static UINT num_dests, num_srcs; static struct midi_dest *dests; static struct midi_src *srcs; -static CFStringRef midi_in_thread_port_name; static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -123,6 +134,8 @@ static BOOL notify_quit; static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; static struct notify_context *notify_read, *notify_write; +#define MAX_MIDI_SYNTHS 1 + NTSTATUS midi_in_lock(void *args) { BOOL lock = !!args; @@ -146,11 +159,49 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +/* + * notify buffer: The notification ring buffer is implemented so that + * there is always at least one unused sentinel before the current + * read position in order to allow detection of the full vs empty + * state. + */ +static struct notify_context *notify_buffer_next(struct notify_context *notify) +{ + if (++notify >= notify_buffer + ARRAY_SIZE(notify_buffer)) + notify = notify_buffer; + + return notify; +} + +static void notify_buffer_add(struct notify_context *notify) +{ + struct notify_context *next = notify_buffer_next(notify_write); + + if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ + notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ + *notify_write = *notify; + notify_write = next; +} + +static BOOL notify_buffer_empty(void) +{ + return notify_read == notify_write; +} + +static BOOL notify_buffer_remove(struct notify_context *notify) +{ + if (notify_buffer_empty()) return FALSE; + + *notify = *notify_read; + notify_read = notify_buffer_next(notify_read); + return TRUE; +} + static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) FIXME("Not yet handled\n"); + if (notify) notify_buffer_add(notify); else notify_quit = TRUE; pthread_cond_signal(&notify_cond); @@ -169,29 +220,94 @@ static uint64_t get_time_ms(void) return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; } +static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) +{ + unsigned int pos = 0, len = packet->length, copy_len; + DWORD current_time = get_time_ms() - src->startTime; + struct notify_context notify; + + src->state |= 2; + + midi_in_lock((void *)TRUE); + + while (len) + { + MIDIHDR *hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, packet->data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xf7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(&notify, src, src->wDevID, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + notify_post(&notify); + src->state &= ~2; + } + } + + midi_in_lock((void *)FALSE); +} + +static void process_small_packet(struct midi_src *src, MIDIPacket *packet) +{ + DWORD current_time = get_time_ms() - src->startTime, data; + struct notify_context notify; + unsigned int pos = 0; + + while (pos < packet->length) + { + data = 0; + switch (packet->data[pos] & 0xf0) + { + case 0xf0: + data = packet->data[pos]; + pos++; + break; + case 0xc0: + case 0xd0: + data = (packet->data[pos + 1] << 8) | packet->data[pos]; + pos += 2; + break; + default: + data = (packet->data[pos + 2] << 16) | (packet->data[pos + 1] << 8) | + packet->data[pos]; + pos += 3; + break; + } + set_in_notify(&notify, src, src->wDevID, MIM_DATA, data, current_time); + notify_post(&notify); + } +} + static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { - CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); MIDIPacket *packet = (MIDIPacket *)pktlist->packet; - CFMutableDataRef data; - MIDIMessage msg; + WORD dev_id = *(WORD *)connRefCon; + struct midi_src *src; unsigned int i; + if (dev_id >= num_srcs) return; + src = srcs + dev_id; + if (src->state < 1) /* input not started */ + return; + for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *(UInt16 *)connRefCon; - msg.length = packet->length; - data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + packet->length); - if (data) - { - CFDataAppendBytes(data, (UInt8 *)&msg, sizeof(msg)); - CFDataAppendBytes(data, packet->data, packet->length); - CFMessagePortSendRequest(msg_port, 0, data, 0.0, 0.0, NULL, NULL); - CFRelease(data); - } + if (packet->data[0] == 0xf0 || src->state & 2) + process_sysex_packet(src, packet); + else + process_small_packet(src, packet); + packet = MIDIPacketNext(packet); } - CFRelease(msg_port); } NTSTATUS midi_init(void *args) @@ -225,7 +341,6 @@ NTSTATUS midi_init(void *args) if (num_srcs > 0) { - midi_in_thread_port_name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineInputPort.%u"), getpid()); MIDIInputPortCreate(midi_client, name, midi_in_read_proc, NULL, &midi_in_port); CFRelease(name); @@ -306,8 +421,6 @@ NTSTATUS midi_init(void *args) } params->num_srcs = num_srcs; - params->srcs = srcs; - params->midi_in_port = (void *)midi_in_port; *params->err = DRV_SUCCESS; return STATUS_SUCCESS; @@ -315,15 +428,8 @@ NTSTATUS midi_init(void *args) NTSTATUS midi_release(void *args) { - CFMessagePortRef msg_port; - if (num_srcs) { - /* Stop CFRunLoop in MIDIIn_MessageThread */ - msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); - CFMessagePortSendRequest(msg_port, 1, NULL, 0.0, 0.0, NULL, NULL); - CFRelease(msg_port); - /* stop the notify_wait thread */ notify_post(NULL); } @@ -1114,10 +1220,11 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); - while (!notify_quit) + while (!notify_quit && notify_buffer_empty()) pthread_cond_wait(&notify_cond, &notify_mutex); *params->quit = notify_quit; + if (!notify_quit) notify_buffer_remove(params->notify); pthread_mutex_unlock(&notify_mutex); diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h deleted file mode 100644 index e6d5c8c18c8..00000000000 --- a/dlls/winecoreaudio.drv/coremidi.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Wine Midi driver for Mac OS X - * - * Copyright 2006 Emmanuel Maillard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef WINE_COREMIDI_H -#define WINE_COREMIDI_H - -#include <CoreFoundation/CoreFoundation.h> - -#define MAX_MIDI_SYNTHS 1 - -#ifdef WINE_DEFINITIONS -/* - * Due to CoreMIDI headers conflict redefine some types for Wine - */ -typedef void *MIDIClientRef; -typedef void *MIDIEndpointRef; -typedef void *MIDIPortRef; -typedef void *MIDIObjectRef; - -typedef struct MIDIPacketList MIDIPacketList; - -/* - * functions - */ -extern OSStatus MIDIClientDispose(MIDIClientRef client); -extern unsigned MIDIGetNumberOfDestinations(void); -extern MIDIEndpointRef MIDIGetDestination(unsigned i); -extern unsigned MIDIGetNumberOfSources(void); -extern MIDIEndpointRef MIDIGetSource(unsigned i); -extern OSStatus MIDIOutputPortCreate(MIDIClientRef client, CFStringRef portName, MIDIPortRef *outPort); - -typedef void (*MIDIReadProc)(const MIDIPacketList *pktlist, void *readProcRefCon, void *srcConnRefCon); -extern OSStatus MIDIInputPortCreate(MIDIClientRef client, CFStringRef portName, MIDIReadProc readProc, void *refCon, MIDIPortRef *outPort); - -extern OSStatus MIDIObjectGetProperties(MIDIObjectRef obj, CFPropertyListRef *outProperties, Boolean deep); - -extern OSStatus MIDIPortConnectSource(MIDIPortRef port, MIDIEndpointRef source, void *connRefCon); - -/* - * Due to AudioUnit headers conflict redefine some types. - */ -typedef void *AudioUnit; -typedef void *AUGraph; - -extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); -extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); -#endif - -/* midi.c */ -typedef struct midi_src -{ - MIDIEndpointRef source; - - WORD wDevID; - int state; /* 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIINCAPSW caps; - MIDIOPENDESC midiDesc; - LPMIDIHDR lpQueueHdr; - WORD wFlags; - DWORD startTime; -} MIDISource; - -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[]; -} MIDIMessage; - -#endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e9cdb2a8ec4..262713dd003 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,31 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#include <mach/mach_time.h> -#include <CoreAudio/CoreAudio.h> - -#define WINE_DEFINITIONS -#include "coremidi.h" - static DWORD MIDIIn_NumDevs = 0; - -static CFStringRef MIDIInThreadPortName; - -static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); - -static MIDIPortRef MIDIInPort = NULL; - -MIDISource *sources; - -static uint64_t get_time_ms(void) -{ - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info(&timebase); - return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -81,14 +58,17 @@ static void notify_client(struct notify_context *notify) static DWORD WINAPI notify_thread(void *p) { struct midi_notify_wait_params params; + struct notify_context notify; BOOL quit; + params.notify = &notify; params.quit = &quit; while (1) { UNIX_CALL(midi_notify_wait, &params); if (quit) break; + if (notify.send_notify) notify_client(&notify); } return 0; } @@ -108,15 +88,10 @@ static LONG CoreAudio_MIDIInit(void) } MIDIIn_NumDevs = params.num_srcs; - sources = params.srcs; - MIDIInPort = params.midi_in_port; if (MIDIIn_NumDevs > 0) - { - MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); - CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); - } + return err; } @@ -125,181 +100,10 @@ static LONG CoreAudio_MIDIRelease(void) TRACE("\n"); UNIX_CALL(midi_release, NULL); - sources = NULL; return DRV_SUCCESS; } - -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_DATA: - case MIM_LONGDATA: - case MIM_ERROR: - case MIM_LONGERROR: - case MIM_MOREDATA: - dwCallBack = sources[wDevID].midiDesc.dwCallback; - uFlags = sources[wDevID].wFlags; - hDev = sources[wDevID].midiDesc.hMidi; - dwInstance = sources[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -static void midi_lock( BOOL lock ) -{ - UNIX_CALL(midi_in_lock, (void *)lock); -} - -/* - * MIDI In Mach message handling - */ -static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) -{ - MIDIMessage *msg = NULL; - int i = 0; - MIDISource *src = NULL; - DWORD sendData = 0; - int pos = 0; - DWORD currentTime; - BOOL sysexStart; - - switch (msgid) - { - case 0: - msg = (MIDIMessage *) CFDataGetBytePtr(data); - TRACE("devID=%d\n", msg->devID); - for (i = 0; i < msg->length; ++i) { - TRACE("%02X ", msg->data[i]); - } - TRACE("\n"); - src = &sources[msg->devID]; - if (src->state < 1) - { - TRACE("input not started, thrown away\n"); - return NULL; - } - - sysexStart = (msg->data[0] == 0xF0); - - if (sysexStart || src->state & 2) { - int pos = 0; - int len = msg->length; - - if (sysexStart) { - TRACE("Receiving sysex message\n"); - src->state |= 2; - } - - midi_lock( TRUE ); - currentTime = get_time_ms() - src->startTime; - - while (len) { - LPMIDIHDR lpMidiHdr = src->lpQueueHdr; - - if (lpMidiHdr != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, msg->data + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - - TRACE("Copied %d bytes of sysex message\n", copylen); - - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - TRACE("Sysex message complete (or buffer limit reached), dispatching %d bytes\n", lpMidiHdr->dwBytesRecorded); - src->lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(msg->devID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, currentTime); - src->state &= ~2; - } - } - else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - - midi_lock( FALSE ); - return NULL; - } - - midi_lock( TRUE ); - currentTime = get_time_ms() - src->startTime; - - while (pos < msg->length) - { - sendData = 0; - switch (msg->data[pos] & 0xF0) - { - case 0xF0: - sendData = (msg->data[pos] << 0); - pos++; - break; - - case 0xC0: - case 0xD0: - sendData = (msg->data[pos + 1] << 8) | (msg->data[pos] << 0); - pos += 2; - break; - default: - sendData = (msg->data[pos + 2] << 16) | - (msg->data[pos + 1] << 8) | - (msg->data[pos] << 0); - pos += 3; - break; - } - MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, currentTime); - } - midi_lock( FALSE ); - break; - default: - CFRunLoopStop(CFRunLoopGetCurrent()); - break; - } - return NULL; -} - -static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) -{ - CFMessagePortRef local; - CFRunLoopSourceRef source; - Boolean info; - - local = CFMessagePortCreateLocal(kCFAllocatorDefault, MIDIInThreadPortName, &MIDIIn_MessageHandler, NULL, &info); - - source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, 0); - CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); - - CFRunLoopRun(); - - CFRunLoopSourceInvalidate(source); - CFRelease(source); - CFRelease(local); - CFRelease(MIDIInThreadPortName); - MIDIInThreadPortName = NULL; - - return 0; -} - /************************************************************************** * modMessage */ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 67fcc35ce4c..d44a7a013e8 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -187,8 +187,6 @@ struct midi_init_params { DWORD *err; UINT num_srcs; - void *srcs; - void *midi_in_port; }; struct notify_context @@ -228,6 +226,7 @@ struct midi_in_message_params struct midi_notify_wait_params { + struct notify_context *notify; BOOL *quit; }; @@ -258,8 +257,6 @@ enum unix_funcs unix_midi_out_message, unix_midi_in_message, unix_midi_notify_wait, - - unix_midi_in_lock, /* temporary */ }; NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; @@ -267,7 +264,6 @@ NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; -NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 2/6] winecoreaudio: Introduce a notification thread.
by Huw Davies 01 Dec '21

01 Dec '21

Currently the thread just blocks until told to quit by midi_release. Eventually, this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications and essentially replace the existing RunLoop-based mechanism. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 1 + dlls/winecoreaudio.drv/coremidi.c | 42 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 16 ++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 7 +++++ 4 files changed, 66 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 420021a53ea..1efcfdba3f4 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1633,6 +1633,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 2e92d9ac2cb..bb8cb23f83b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -116,6 +116,13 @@ static CFStringRef midi_in_thread_port_name; static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; +#define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; +static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; +static struct notify_context *notify_read, *notify_write; + NTSTATUS midi_in_lock(void *args) { BOOL lock = !!args; @@ -139,6 +146,17 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_cond); + + pthread_mutex_unlock(&notify_mutex); +} + /* * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. @@ -183,6 +201,11 @@ NTSTATUS midi_init(void *args) OSStatus sc; UINT i; + pthread_mutex_lock(&notify_mutex); + notify_quit = FALSE; + notify_read = notify_write = notify_buffer; + pthread_mutex_unlock(&notify_mutex); + sc = MIDIClientCreate(name, NULL /* FIXME use notify proc */, NULL, &midi_client); CFRelease(name); if (sc) @@ -300,6 +323,9 @@ NTSTATUS midi_release(void *args) msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); CFMessagePortSendRequest(msg_port, 1, NULL, 0.0, 0.0, NULL, NULL); CFRelease(msg_port); + + /* stop the notify_wait thread */ + notify_post(NULL); } if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ @@ -1081,3 +1107,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index b3adb09886d..e9cdb2a8ec4 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -78,6 +78,21 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + BOOL quit; + + params.quit = &quit; + + while (1) + { + UNIX_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + static LONG CoreAudio_MIDIInit(void) { struct midi_init_params params; @@ -100,6 +115,7 @@ static LONG CoreAudio_MIDIInit(void) { MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); } return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2f0464ad322..67fcc35ce4c 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -226,6 +226,11 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -252,6 +257,7 @@ enum unix_funcs unix_midi_release, unix_midi_out_message, unix_midi_in_message, + unix_midi_notify_wait, unix_midi_in_lock, /* temporary */ }; @@ -260,6 +266,7 @@ NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 1/6] winecoreaudio: Introduce a helper to retrieve the time.
by Huw Davies 01 Dec '21

01 Dec '21

The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). The instance of the helper on the user-side is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 12 ++++++++++-- dlls/winecoreaudio.drv/midi.c | 13 +++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 9dc9f452c29..2e92d9ac2cb 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -143,6 +143,14 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); @@ -917,7 +925,7 @@ static DWORD midi_in_start(WORD dev_id) return MMSYSERR_BADDEVICEID; } srcs[dev_id].state = 1; - srcs[dev_id].startTime = NtGetTickCount(); + srcs[dev_id].startTime = get_time_ms(); return MMSYSERR_NOERROR; } @@ -936,7 +944,7 @@ static DWORD midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - DWORD cur_time = NtGetTickCount(); + DWORD cur_time = get_time_ms(); DWORD err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index dcb9a7e1b69..b3adb09886d 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +#include <mach/mach_time.h> #include <CoreAudio/CoreAudio.h> #define WINE_DEFINITIONS @@ -61,6 +62,14 @@ static MIDIPortRef MIDIInPort = NULL; MIDISource *sources; +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -183,7 +192,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (len) { LPMIDIHDR lpMidiHdr = src->lpQueueHdr; @@ -218,7 +227,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (pos < msg->length) { -- 2.23.0

2 1

Re: [PATCH vkd3d 1/6] vkd3d-shader/hlsl: Write SM4 sample instructions.
by Francisco Casas 01 Dec '21

01 Dec '21

Hi, > + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), > instr.dsts[0].writemask); > + > + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, > + &instr.srcs[1].swizzle_type, sampler, sampler->var->data_type); > + > + instr.src_count = 3; Probably &instr.srcs[1].swizzle_type shall be &instr.srcs[2].swizzle_type there. >Here you pass the swizzle_type field to sm4_register_from_deref, as >write_sm4_ld already does. However, it seems that >sm4_register_from_deref currently ignores swizzle_type in its texture >branch, so that's going to remain uninitialized (swizzle_type is also >ignored in another branch of sm4_register_from_deref). I missed that. I think they weren't explicitly handled on master. I will make them default to VKD3D_SM4_SWIZZLE_VEC4 on an upcoming patch, probably after Mystral's big batch.

1 0

[PATCH 01/13] programs/winedbg: be more strict when detecting a string from an array
by Eric Pouech 01 Dec '21

01 Dec '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/types.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5e9188ccc6e..0ee6ab05f0f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -519,24 +519,29 @@ void print_value(const struct dbg_lvalue* lvalue, char format, int level) count = 1; size = 1; types_get_info(&type, TI_GET_COUNT, &count); types_get_info(&type, TI_GET_LENGTH, &size); + lvalue_field = *lvalue; + types_get_info(&lvalue_field.type, TI_GET_TYPE, &lvalue_field.type.id); + types_get_real_type(&lvalue_field.type, &tag); - if (size == count) - { - unsigned len; - char buffer[256]; - /* - * Special handling for character arrays. - */ - /* FIXME should check basic type here (should be a char!!!!)... */ - len = min(count, sizeof(buffer)); - memory_get_string(dbg_curr_process, - memory_to_linear_addr(&lvalue->addr), - lvalue->cookie == DLV_TARGET, TRUE, buffer, len); - dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); - break; + if (size == count && tag == SymTagBaseType) + { + DWORD basetype; + + types_get_info(&lvalue_field.type, TI_GET_BASETYPE, &basetype); + if (basetype == btChar) + { + char buffer[256]; + /* + * Special handling for character arrays. + */ + unsigned len = min(count, sizeof(buffer)); + memory_get_string(dbg_curr_process, + memory_to_linear_addr(&lvalue->addr), + lvalue->cookie == DLV_TARGET, TRUE, buffer, len); + dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); + break; + } } - lvalue_field = *lvalue; - types_get_info(&type, TI_GET_TYPE, &lvalue_field.type.id); dbg_printf("{"); for (i = 0; i < count; i++) {

1 12

[PATCH 1/7] dinput8/tests: Provide an explicit test context to the driver.
by Rémi Bernon 01 Dec '21

01 Dec '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 51 ++++++++++++++++------- dlls/dinput8/tests/driver_hid.h | 2 +- dlls/dinput8/tests/hid.c | 73 +++++++++++++++++++-------------- 3 files changed, 80 insertions(+), 46 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index db7b3185906..9a58b1c7d44 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -56,6 +56,7 @@ struct expect_queue struct hid_expect spurious; struct hid_expect *buffer; IRP *pending_wait; + char context[64]; }; static void expect_queue_init( struct expect_queue *queue ) @@ -93,6 +94,7 @@ static void expect_queue_cleanup( struct expect_queue *queue ) static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsigned int size ) { struct hid_expect *missing, *missing_end, *tmp; + char context[64]; KIRQL irql; missing = ExAllocatePool( PagedPool, EXPECT_QUEUE_BUFFER_SIZE ); @@ -108,12 +110,13 @@ static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsign if (size) memcpy( queue->end, buffer, size ); queue->end = queue->end + size / sizeof(struct hid_expect); + memcpy( context, queue->context, sizeof(context) ); KeReleaseSpinLock( &queue->lock, irql ); tmp = missing; while (tmp != missing_end) { - winetest_push_context( "%s expect[%d]", tmp->context, tmp - missing ); + winetest_push_context( "%s expect[%d]", context, tmp - missing ); if (tmp->broken) { todo_wine_if( tmp->todo ) @@ -180,7 +183,8 @@ static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) } static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_PACKET *packet, - LONG *index, struct hid_expect *expect, BOOL compare_buf ) + LONG *index, struct hid_expect *expect, BOOL compare_buf, + char *context, ULONG context_size ) { struct hid_expect *missing, *missing_end, *tmp; ULONG len = packet->reportBufferLen; @@ -219,6 +223,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ queue->pending_wait = NULL; if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; } + memcpy( context, queue->context, context_size ); KeReleaseSpinLock( &queue->lock, irql ); if (irp) @@ -228,9 +233,9 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ IoCompleteRequest( irp, IO_NO_INCREMENT ); } - ok( tmp != &queue->spurious, "got spurious packet\n" ); + ok( tmp != &queue->spurious, "%s got spurious packet\n", context ); - winetest_push_context( "%s expect[%d]", tmp->context, tmp - queue->buffer ); + winetest_push_context( "%s expect[%d]", context, tmp - queue->buffer ); todo_wine_if( tmp->todo ) ok( !tmp->wine_only, "found code %#x id %u len %u\n", tmp->code, tmp->report_id, tmp->report_len ); winetest_pop_context(); @@ -238,7 +243,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ tmp = missing; while (tmp != missing_end) { - winetest_push_context( "%s expect[%d]", tmp->context, tmp - missing ); + winetest_push_context( "%s expect[%d]", context, tmp - missing ); if (tmp->broken) { todo_wine_if( tmp->todo ) @@ -471,6 +476,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; const ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct hid_expect expect = {0}; + char context[64]; NTSTATUS ret; BOOL removed; KIRQL irql; @@ -563,8 +569,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !out_size, "got output size %u\n", out_size ); ok( packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -587,8 +593,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -610,8 +616,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -634,8 +640,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -657,8 +663,8 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); - winetest_push_context( "%s expect[%d]", expect.context, index ); + expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE, context, sizeof(context) ); + winetest_push_context( "%s expect[%d]", context, index ); ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); @@ -702,6 +708,7 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + KIRQL irql; switch (code) { @@ -714,6 +721,14 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return expect_queue_wait( &expect_queue, irp ); case IOCTL_WINETEST_HID_SEND_INPUT: input_queue_reset( &input_queue, irp->AssociatedIrp.SystemBuffer, in_size ); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; + case IOCTL_WINETEST_HID_SET_CONTEXT: + KeAcquireSpinLock( &expect_queue.lock, &irql ); + memcpy( expect_queue.context, irp->AssociatedIrp.SystemBuffer, in_size ); + KeReleaseSpinLock( &expect_queue.lock, irql ); + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; @@ -837,6 +852,12 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); input_queue_reset( &input_queue, buffer + info_size, size - info_size ); + RtlInitUnicodeString( &name_str, L"Context" ); + size = info_size + sizeof(expect_queue.context); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( expect_queue.context, buffer + info_size, size - info_size ); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 191c0c7bae2..3d31b4ee824 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -42,6 +42,7 @@ DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3 #define IOCTL_WINETEST_HID_SET_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x800, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SEND_INPUT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x802, METHOD_IN_DIRECT, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_HID_SET_CONTEXT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x803, METHOD_IN_DIRECT, FILE_ANY_ACCESS) struct hid_expect { @@ -54,7 +55,6 @@ struct hid_expect BYTE report_id; BYTE report_len; BYTE report_buf[128]; - char context[64]; }; /* kernel/user shared data */ diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a8ea8eaea9f..c0bfc8e8b30 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -765,21 +765,25 @@ static BOOL sync_ioctl_( int line, HANDLE file, DWORD code, void *in_buf, DWORD return ret; } +#define fill_context( line, a, b ) \ + do { \ + const char *source_file; \ + source_file = strrchr( __FILE__, '/' ); \ + if (!source_file) source_file = strrchr( __FILE__, '\\' ); \ + if (!source_file) source_file = __FILE__; \ + else source_file++; \ + snprintf( a, b, "%s:%d", source_file, line ); \ + } while (0) + #define set_hid_expect( a, b, c ) set_hid_expect_( __LINE__, a, b, c ) static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, DWORD expect_size ) { - const char *source_file; + char context[64]; BOOL ret; - int i; - - source_file = strrchr( __FILE__, '/' ); - if (!source_file) source_file = strrchr( __FILE__, '\\' ); - if (!source_file) source_file = __FILE__; - else source_file++; - - for (i = 0; i < expect_size / sizeof(struct hid_expect); ++i) - snprintf( expect[i].context, ARRAY_SIZE(expect[i].context), "%s:%d", source_file, line ); + fill_context( line, context, ARRAY_SIZE(context) ); + ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_CONTEXT, context, ARRAY_SIZE(context), NULL, 0, INFINITE ); + ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_CONTEXT failed, last error %u\n", GetLastError() ); ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_EXPECT, expect, expect_size, NULL, 0, INFINITE ); ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } @@ -796,18 +800,12 @@ static void wait_hid_expect_( int line, HANDLE file, DWORD timeout ) #define send_hid_input( a, b, c ) send_hid_input_( __LINE__, a, b, c ) static void send_hid_input_( int line, HANDLE file, struct hid_expect *expect, DWORD expect_size ) { - const char *source_file; + char context[64]; BOOL ret; - int i; - - source_file = strrchr( __FILE__, '/' ); - if (!source_file) source_file = strrchr( __FILE__, '\\' ); - if (!source_file) source_file = __FILE__; - else source_file++; - - for (i = 0; i < expect_size / sizeof(struct hid_expect); ++i) - snprintf( expect[i].context, ARRAY_SIZE(expect[i].context), "%s:%d", source_file, line ); + fill_context( line, context, ARRAY_SIZE(context) ); + ret = sync_ioctl_( line, file, IOCTL_WINETEST_HID_SET_CONTEXT, context, ARRAY_SIZE(context), NULL, 0, INFINITE ); + ok_(__FILE__, line)( ret, "IOCTL_WINETEST_HID_SET_CONTEXT failed, last error %u\n", GetLastError() ); ret = sync_ioctl( file, IOCTL_WINETEST_HID_SEND_INPUT, expect, expect_size, NULL, 0, INFINITE ); ok( ret, "IOCTL_WINETEST_HID_SEND_INPUT failed, last error %u\n", GetLastError() ); } @@ -2750,6 +2748,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + char context[64]; LSTATUS status; HKEY hkey; @@ -2782,6 +2781,10 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, (void *)&expect_in, polled ? sizeof(expect_in) : 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( __LINE__, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); pnp_driver_stop(); @@ -3102,6 +3105,7 @@ static void test_hidp_kdr(void) PHIDP_PREPARSED_DATA preparsed_data; DWORD i, report_id = 0, polled = 0; struct hidp_kdr *kdr; + char context[64]; LSTATUS status; HDEVINFO set; HANDLE file; @@ -3137,6 +3141,10 @@ static void test_hidp_kdr(void) status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( __LINE__, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (!pnp_driver_start( L"driver_hid.dll" )) goto done; set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); @@ -3291,8 +3299,9 @@ static void cleanup_registry_keys(void) RegCloseKey( root_key ); } -static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, - struct hid_expect *expect, ULONG expect_size ) +#define dinput_driver_start( a, b, c, d, e ) dinput_driver_start_( __LINE__, a, b, c, d, e ) +static BOOL dinput_driver_start_( int line, const BYTE *desc_buf, ULONG desc_len, const HIDP_CAPS *caps, + struct hid_expect *expect, ULONG expect_size ) { static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3303,26 +3312,30 @@ static BOOL dinput_driver_start( const BYTE *desc_buf, ULONG desc_len, const HID }; DWORD report_id = 1; DWORD polled = 0; + char context[64]; LSTATUS status; HKEY hkey; status = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ); - ok( !status, "RegCreateKeyExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegCreateKeyExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)desc_buf, desc_len ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)caps, sizeof(*caps) ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)expect, expect_size ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); - ok( !status, "RegSetValueExW returned %#x\n", status ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); + fill_context( line, context, ARRAY_SIZE(context) ); + status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); + ok_(__FILE__, line)( !status, "RegSetValueExW returned %#x\n", status ); return pnp_driver_start( L"driver_hid.dll" ); } -- 2.34.0

2 8

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-devel