wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Alexandre Julliard : kernel32: Move FlushProcessWriteBuffers() stub to ntdll.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: a10f1e9d7b560f8cbdd85b8b5844694302fda0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10f1e9d7b560f8cbdd85b8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 20:07:31 2020 +0200 kernel32: Move FlushProcessWriteBuffers() stub to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 ----------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 9 +++++++++ 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1bc32e5ef2..ee7fca5606 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -518,7 +518,7 @@ @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) -@ stdcall FlushProcessWriteBuffers() +@ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall -import FoldStringW(long wstr long ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5146622230..1256d40588 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -992,17 +992,6 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) return TRUE; } -/********************************************************************** - * FlushProcessWriteBuffers (KERNEL32.@) - */ -VOID WINAPI FlushProcessWriteBuffers(void) -{ - static int once = 0; - - if (!once++) - FIXME(": stub\n"); -} - /*********************************************************************** * UnregisterApplicationRestart (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7b02838298..5f9eb9fdce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -382,7 +382,7 @@ @ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) -@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringW(long wstr long ptr long) # @ stub ForceSyncFgPolicyInternal diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cb6a8ec8c4..b2e467c70c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -212,6 +212,7 @@ @ stdcall NtFlushBuffersFile(long ptr) @ stdcall NtFlushInstructionCache(long ptr long) @ stdcall NtFlushKey(long) +@ stdcall NtFlushProcessWriteBuffers() @ stdcall NtFlushVirtualMemory(long ptr ptr long) @ stub NtFlushWriteBuffer # @ stub NtFreeUserPhysicalPages diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index e59c255e32..6c5f722b2a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -737,6 +737,15 @@ NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T return STATUS_SUCCESS; } +/********************************************************************** + * NtFlushProcessWriteBuffers [NTDLL.@] + */ +void WINAPI NtFlushProcessWriteBuffers(void) +{ + static int once = 0; + if (!once++) FIXME( "stub\n" ); +} + /****************************************************************** * NtOpenProcess [NTDLL.@] * ZwOpenProcess [NTDLL.@]

1 0

Alexandre Julliard : kernel32: Move Wer* function stubs to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8555e948bd0df14bf19df75b80026d6299667a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8555e948bd0df14bf19df75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 19:26:08 2020 +0200 kernel32: Move Wer* function stubs to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/kernel32.spec | 16 +++---- dlls/kernel32/wer.c | 92 ----------------------------------------- dlls/kernelbase/debug.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 16 +++---- include/werapi.h | 2 + 6 files changed, 101 insertions(+), 110 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index a6c9fed546..4c23ac59b6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -37,8 +37,7 @@ C_SRCS = \ toolhelp.c \ version.c \ virtual.c \ - volume.c \ - wer.c + volume.c RC_SRCS = \ locale_rc.rc \ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index db9d93e52a..1bc32e5ef2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1589,14 +1589,14 @@ @ stdcall -import WaitNamedPipeW (wstr long) @ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable @ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable -# @ stub WerGetFlags -@ stdcall WerRegisterFile(wstr long long) -@ stdcall WerRegisterMemoryBlock(ptr long) -@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) -@ stdcall WerSetFlags(long) -# @ stub WerUnregisterFile -@ stdcall WerUnregisterMemoryBlock(ptr) -@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) +@ stdcall -import WerGetFlags(ptr ptr) +@ stdcall -import WerRegisterFile(wstr long long) +@ stdcall -import WerRegisterMemoryBlock(ptr long) +@ stdcall -import WerRegisterRuntimeExceptionModule(wstr ptr) +@ stdcall -import WerSetFlags(long) +@ stdcall -import WerUnregisterFile(wstr) +@ stdcall -import WerUnregisterMemoryBlock(ptr) +@ stdcall -import WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpCleanupMessageMapping # @ stub WerpInitiateRemoteRecovery # @ stub WerpNotifyLoadStringResource diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c deleted file mode 100644 index 2a7853bde9..0000000000 --- a/dlls/kernel32/wer.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Windows Error Reporting functions - * - * Copyright 2010 Louis Lenders - * - * 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 - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "werapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wer); - -/*********************************************************************** - * WerRegisterFile (KERNEL32.@) - * - * Register a file to be included in WER error report. - */ -HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags) -{ - FIXME("(%s, %d, %d) stub!\n", debugstr_w(file), regfiletype, flags); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerRegisterRuntimeExceptionModule (KERNEL32.@) - * - * Register a custom runtime exception handler. - */ - -HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) -{ - FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); - return S_OK; -} - -/*********************************************************************** - * WerSetFlags (KERNEL32.@) - * - * Sets error reporting flags for the current process. - */ - -HRESULT WINAPI WerSetFlags(DWORD flags) -{ - FIXME("(%d) stub!\n", flags); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerRegisterMemoryBlock (KERNEL32.@) - */ -HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) -{ - FIXME("(%p %d) stub\n", block, size); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerUnregisterMemoryBlock (KERNEL32.@) - */ -HRESULT WINAPI WerUnregisterMemoryBlock(void *block) -{ - FIXME("(%p) stub\n", block); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerUnregisterRuntimeExceptionModule (KERNEL32.@) - */ -HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) -{ - FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); - return S_OK; -} diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 60c9d09cf6..f7457e8a37 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wingdi.h" #include "winuser.h" +#include "werapi.h" #include "wine/exception.h" #include "wine/server.h" @@ -767,3 +768,84 @@ LONG WINAPI UnhandledExceptionFilter( EXCEPTION_POINTERS *epointers ) } return EXCEPTION_CONTINUE_SEARCH; } + + +/*********************************************************************** + * WerGetFlags (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerGetFlags( HANDLE process, DWORD *flags ) +{ + FIXME( "(%p, %p) stub\n", process, flags ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterFile (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterFile( const WCHAR *file, WER_REGISTER_FILE_TYPE type, + DWORD flags ) +{ + FIXME( "(%s, %d, %d) stub\n", debugstr_w(file), type, flags ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterMemoryBlock (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterMemoryBlock( void *block, DWORD size ) +{ + FIXME( "(%p %d) stub\n", block, size ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterRuntimeExceptionModule (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterRuntimeExceptionModule( const WCHAR *dll, void *context ) +{ + FIXME( "(%s, %p) stub\n", debugstr_w(dll), context ); + return S_OK; +} + + +/*********************************************************************** + * WerSetFlags (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerSetFlags( DWORD flags ) +{ + FIXME("(%d) stub\n", flags); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterFile (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterFile( const WCHAR *file ) +{ + FIXME( "(%s) stub\n", debugstr_w(file) ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterMemoryBlock (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterMemoryBlock( void *block ) +{ + FIXME( "(%p) stub\n", block ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterRuntimeExceptionModule (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterRuntimeExceptionModule( const WCHAR *dll, void *context ) +{ + FIXME( "(%s, %p) stub\n", debugstr_w(dll), context ); + return S_OK; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 904f1704eb..7b02838298 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1701,14 +1701,14 @@ @ stdcall WakeByAddressAll(ptr) ntdll.RtlWakeAddressAll @ stdcall WakeByAddressSingle(ptr) ntdll.RtlWakeAddressSingle @ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable -# @ stub WerGetFlags -@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile -@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock -@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule -@ stdcall WerSetFlags(long) kernel32.WerSetFlags -# @ stub WerUnregisterFile -@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule +@ stdcall WerGetFlags(ptr ptr) +@ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterMemoryBlock(ptr long) +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) +@ stdcall WerSetFlags(long) +@ stdcall WerUnregisterFile(wstr) +@ stdcall WerUnregisterMemoryBlock(ptr) +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpNotifyLoadStringResource # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) diff --git a/include/werapi.h b/include/werapi.h index 247c612175..30ba6cd950 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -174,6 +174,7 @@ typedef struct _WER_EXCEPTION_INFORMATION /* #### */ HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); +HRESULT WINAPI WerGetFlags(HANDLE process, DWORD *flags); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size); HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); @@ -185,6 +186,7 @@ HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); HRESULT WINAPI WerSetFlags(DWORD flags); +HRESULT WINAPI WerUnregisterFile(PCWSTR file); HRESULT WINAPI WerUnregisterMemoryBlock(void *block); HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, void *context);

1 0

Alexandre Julliard : kernel32: Move some file functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: b6c94018823f0217dcc9e5ecf1f100ba9ef12b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c94018823f0217dcc9e5ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 13:10:03 2020 +0200 kernel32: Move some file functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 326 ------------------- dlls/kernel32/kernel32.spec | 22 +- dlls/kernel32/path.c | 449 -------------------------- dlls/kernelbase/file.c | 700 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 20 +- 5 files changed, 721 insertions(+), 796 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6c94018823f0217dcc9…

1 0

Alexandre Julliard : kernel32: Move volume functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: e36a9c459d7d1644f401eb49f3684c6fe42f7948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36a9c459d7d1644f401eb49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 11:54:11 2020 +0200 kernel32: Move volume functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 40 +- dlls/kernel32/volume.c | 1675 +----------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 40 +- dlls/kernelbase/volume.c | 1777 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 1851 insertions(+), 1684 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e36a9c459d7d1644f401…

1 0

Brendan Shanks : user32: Improve DisplayConfigGetDeviceInfo() stub.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: b1b1399dd6f31c60b43a193fcd8966b0776d1f3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b1399dd6f31c60b43a193f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:31 2020 -0700 user32: Improve DisplayConfigGetDeviceInfo() stub. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 6 ------ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 74158f6aae..10f17bb4c3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4528,5 +4528,53 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; + + if (!packet || packet->size < sizeof(*packet)) + return ERROR_GEN_FAILURE; + + switch (packet->type) + { + case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: + { + DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + if (packet->size < sizeof(*source_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: + { + DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + if (packet->size < sizeof(*target_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: + { + DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + if (packet->size < sizeof(*preferred_mode)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: + { + DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + if (packet->size < sizeof(*adapter_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE: + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE: + case DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION: + case DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION: + case DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO: + case DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE: + case DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL: + default: + FIXME("Unimplemented packet type: %u\n", packet->type); + return ERROR_INVALID_PARAMETER; + } } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7c034c823a..fb5e331c25 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1332,8 +1332,6 @@ static void test_display_config_get_device_info(void) DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; DISPLAYCONFIG_ADAPTER_NAME adapter_name; - todo_wine - { ret = pDisplayConfigGetDeviceInfo(NULL); ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); @@ -1366,7 +1364,6 @@ static void test_display_config_get_device_info(void) source_name.header.size = sizeof(source_name) - 1; ret = pDisplayConfigGetDeviceInfo(&source_name.header); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); - } source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; source_name.header.size = sizeof(source_name); @@ -1379,7 +1376,6 @@ static void test_display_config_get_device_info(void) target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; target_name.header.size = sizeof(target_name) - 1; ret = pDisplayConfigGetDeviceInfo(&target_name.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; @@ -1393,7 +1389,6 @@ static void test_display_config_get_device_info(void) preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; preferred_mode.header.size = sizeof(preferred_mode) - 1; ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; @@ -1407,7 +1402,6 @@ static void test_display_config_get_device_info(void) adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; adapter_name.header.size = sizeof(adapter_name) - 1; ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME;

1 0

Brendan Shanks : user32: Improve QueryDisplayConfig() stub.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4e795a8d8130e0e7156f6ba8f1e33bac374ea851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e795a8d8130e0e7156f6ba8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:30 2020 -0700 user32: Improve QueryDisplayConfig() stub. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 +++++++++++- dlls/user32/tests/monitor.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c43720eca8..74158f6aae 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4509,7 +4509,17 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON DISPLAYCONFIG_TOPOLOGY_ID *topologyid) { FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (!numpathelements || !numinfoelements) + return ERROR_INVALID_PARAMETER; + + if (!*numpathelements || !*numinfoelements) + return ERROR_INVALID_PARAMETER; + + if (!flags) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; } /*********************************************************************** diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 2a9c5c3984..7c034c823a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1275,8 +1275,6 @@ static void test_query_display_config(void) DISPLAYCONFIG_MODE_INFO mi[20]; LONG ret; - todo_wine - { ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1324,7 +1322,6 @@ static void test_query_display_config(void) ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); ok (paths == 1, "got %u\n", paths); ok (modes == 1, "got %u\n", modes); - } } static void test_display_config_get_device_info(void)

1 0

Brendan Shanks : user32/tests: Add QueryDisplayConfig() and DisplayConfigGetDeviceInfo() tests.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: af89ccc5350ecc4499031e95a629ee8188954d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af89ccc5350ecc4499031e95… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:29 2020 -0700 user32/tests: Add QueryDisplayConfig() and DisplayConfigGetDeviceInfo() tests. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 181 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 174 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 63cbe5067c..2a9c5c3984 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -29,6 +29,9 @@ static HMODULE hdll; static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); +static LONG (WINAPI *pQueryDisplayConfig)(UINT32,UINT32*,DISPLAYCONFIG_PATH_INFO*,UINT32*, + DISPLAYCONFIG_MODE_INFO*,DISPLAYCONFIG_TOPOLOGY_ID*); +static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER*); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static void init_function_pointers(void) @@ -41,6 +44,8 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetDisplayConfigBufferSizes) + GET_PROC(QueryDisplayConfig) + GET_PROC(DisplayConfigGetDeviceInfo) GET_PROC(SetThreadDpiAwarenessContext) #undef GET_PROC @@ -1102,17 +1107,11 @@ static void test_work_area(void) DestroyWindow(hwnd); } -static void test_display_config(void) +static void test_get_display_config_buffer_sizes(void) { UINT32 paths, modes; LONG ret; - if (!pGetDisplayConfigBufferSizes) - { - win_skip("GetDisplayConfigBufferSizes is not supported\n"); - return; - } - ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1269,6 +1268,174 @@ static void test_EnumDisplayMonitors(void) } } +static void test_query_display_config(void) +{ + UINT32 paths, modes; + DISPLAYCONFIG_PATH_INFO pi[10]; + DISPLAYCONFIG_MODE_INFO mi[20]; + LONG ret; + + todo_wine + { + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, NULL, &modes, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, NULL, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 0; + modes = 1; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok (paths == 0, "got %u\n", paths); + ok (modes == 1, "got %u\n", modes); + + /* Crashes on Windows 10 */ + if (0) + { + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, pi, NULL, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + } + + paths = modes = 1; + ret = pQueryDisplayConfig(0, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 1; + memset(pi, 0xFF, sizeof(pi[0])); + memset(mi, 0xFF, sizeof(mi[0])); + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok (paths == 1, "got %u\n", paths); + ok (modes == 1, "got %u\n", modes); + } +} + +static void test_display_config_get_device_info(void) +{ + LONG ret; + DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; + DISPLAYCONFIG_TARGET_DEVICE_NAME target_name; + DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; + DISPLAYCONFIG_ADAPTER_NAME adapter_name; + + todo_wine + { + ret = pDisplayConfigGetDeviceInfo(NULL); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = sizeof(source_name.header); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name.header); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = sizeof(source_name); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + } + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId.LowPart = 0xFFFF; + source_name.header.adapterId.HighPart = 0xFFFF; + source_name.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name); + target_name.header.adapterId.LowPart = 0xFFFF; + target_name.header.adapterId.HighPart = 0xFFFF; + target_name.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode) - 1; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode); + preferred_mode.header.adapterId.LowPart = 0xFFFF; + preferred_mode.header.adapterId.HighPart = 0xFFFF; + preferred_mode.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name); + adapter_name.header.adapterId.LowPart = 0xFFFF; + adapter_name.header.adapterId.HighPart = 0xFFFF; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); +} + +static void test_display_config(void) +{ + if (!pGetDisplayConfigBufferSizes || + !pQueryDisplayConfig || + !pDisplayConfigGetDeviceInfo) + { + win_skip("DisplayConfig APIs are not supported\n"); + return; + } + + test_get_display_config_buffer_sizes(); + test_query_display_config(); + test_display_config_get_device_info(); +} + START_TEST(monitor) { init_function_pointers();

1 0

Brendan Shanks : user32: Move DisplayConfig stubs together into sysparams.c.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 91cf6d716e09976ac1667f33499930d367c7479d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cf6d716e09976ac1667f33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:28 2020 -0700 user32: Move DisplayConfig stubs together into sysparams.c. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 26 -------------------------- dlls/user32/sysparams.c | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bed5812a47..6e1f60612b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -240,17 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * QueryDisplayConfig (USER32.@) - */ -LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid) -{ - FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; -} - /*********************************************************************** * RegisterSystemThread (USER32.@) */ @@ -545,21 +534,6 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; } -/********************************************************************** - * GetDisplayConfigBufferSizes [USER32.@] - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; -} - /********************************************************************** * RegisterPointerDeviceNotifications [USER32.@] */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 043742a9bf..c43720eca8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3345,15 +3345,6 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND } -/*********************************************************************** - * DisplayConfigGetDeviceInfo (USER32.@) - */ -LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) -{ - FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; -} - /*********************************************************************** * EnumDisplaySettingsW (USER32.@) * @@ -4494,3 +4485,38 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) { return TRUE; } + +/********************************************************************** + * GetDisplayConfigBufferSizes (USER32.@) + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +}

1 0

Brendan Shanks : include: Add additional DISPLAYCONFIG defines.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 6396546b0aec8cd0f7f05f5a375a2b6137372820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6396546b0aec8cd0f7f05f5a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:27 2020 -0700 include: Add additional DISPLAYCONFIG defines. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 0a456f8230..de028f5212 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3293,6 +3293,9 @@ typedef enum { DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff } DISPLAYCONFIG_DEVICE_INFO_TYPE; @@ -3429,6 +3432,16 @@ typedef enum DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; +typedef enum +{ + DISPLAYCONFIG_COLOR_ENCODING_RGB = 0, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR444 = 1, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR422 = 2, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR420 = 3, + DISPLAYCONFIG_COLOR_ENCODING_INTENSITY = 4, + DISPLAYCONFIG_COLOR_ENCODING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_COLOR_ENCODING; + typedef struct DISPLAYCONFIG_2DREGION { UINT32 cx; @@ -3525,6 +3538,105 @@ typedef struct DISPLAYCONFIG_MODE_INFO } DUMMYUNIONNAME; } DISPLAYCONFIG_MODE_INFO; +typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR viewGdiDeviceName[CCHDEVICENAME]; +} DISPLAYCONFIG_SOURCE_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS { + union { + struct { + UINT32 friendlyNameFromEdid :1; + UINT32 friendlyNameForced :1; + UINT32 edidIdsValid :1; + UINT32 reserved :29; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS flags; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + UINT16 edidManufactureId; + UINT16 edidProductCodeId; + UINT32 connectorInstance; + WCHAR monitorFriendlyDeviceName[64]; + WCHAR monitorDevicePath[128]; +} DISPLAYCONFIG_TARGET_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_PREFERRED_MODE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + UINT32 width; + UINT32 height; + DISPLAYCONFIG_TARGET_MODE targetMode; +} DISPLAYCONFIG_TARGET_PREFERRED_MODE; + +typedef struct DISPLAYCONFIG_ADAPTER_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR adapterDevicePath[128]; +} DISPLAYCONFIG_ADAPTER_NAME; + +typedef struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 bootPersistenceOn :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_TARGET_PERSISTENCE; + +typedef struct DISPLAYCONFIG_TARGET_BASE_TYPE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY baseOutputTechnology; +} DISPLAYCONFIG_TARGET_BASE_TYPE; + +typedef struct DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 disableMonitorVirtualResolution :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION; + +typedef struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 advancedColorSupported :1; + UINT32 advancedColorEnabled :1; + UINT32 wideColorEnforced :1; + UINT32 advancedColorForceDisabled :1; + UINT32 reserved :28; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; + DISPLAYCONFIG_COLOR_ENCODING colorEncoding; + UINT32 bitsPerColorChannel; +} DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO; + +typedef struct DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 enableAdvancedColor :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE; + +typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + ULONG SDRWhiteLevel; +} DISPLAYCONFIG_SDR_WHITE_LEVEL; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002

1 0

Zhiyi Zhang : user32: Leave critical section before calling callbacks in EnumDisplayMonitors().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 449ca2fbf9e44a40ff2cc6eedada8dd2f94c7adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=449ca2fbf9e44a40ff2cc6ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:39 2020 +0800 user32: Leave critical section before calling callbacks in EnumDisplayMonitors(). Previously, callbacks were called with a critical section held. It was intended that monitor handles passed to callbacks should always be valid. But it created a deadlock condition when callbacks call other functions which try to grab the critical section using a different thread. Tests also show that a monitor handle can be invalid after a display change. So do not hold the critical section when calling callbacks. Monitor handles will be checked when passed to GetMonitorInfo(), which is the sole function that consumes HMONITORs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e..043742a9bf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4126,28 +4126,34 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT default_rect = {0, 0, 640, 480}; - DWORD i; + RECT monitor_rect; + DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); if (update_monitor_cache()) { - EnterCriticalSection( &monitors_section ); - for (i = 0; i < monitor_count; i++) + while (TRUE) { - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) + EnterCriticalSection( &monitors_section ); + if (i >= monitor_count) { LeaveCriticalSection( &monitors_section ); - return FALSE; + return TRUE; } + monitor_rect = monitors[i].rcMonitor; + LeaveCriticalSection( &monitors_section ); + + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) + return FALSE; + + ++i; } - LeaveCriticalSection( &monitors_section ); - return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + SetRect( &monitor_rect, 0, 0, 640, 480 ); + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; }

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020