Re: [PATCH 6/6] winemac.drv: Support multiple adapter display settings in registry.

[Ken Thomases]

On Jun 3, 2020, at 9:30 AM, Zhiyi Zhang  wrote:
> Signed-off-by: Zhiyi Zhang
>
> dlls/winemac.drv/display.c | 91 +++++++++++++++++++++++++-------------
> 1 file changed, 60 insertions(+), 31 deletions(-)
>
> diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
> index 461662b33b9..896948b2fea 100644
> --- a/dlls/winemac.drv/display.c
> +++ b/dlls/winemac.drv/display.c
> @@ -151,44 +151,64 @@ static void release_display_device_init_mutex(HANDLE mutex)
>     CloseHandle(mutex);
> }
>
> -static BOOL get_display_device_reg_key(char *key, unsigned len)
> +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len)
> {
> - static const char display_device_guid_prop[] = "__wine_display_device_guid";
> - static const char video_path[] = "System\CurrentControlSet\Control\Video\{";
> - static const char display0[] = "}\0000";
> - ATOM guid_atom;
> - static const WCHAR display[] = {'\','\','.','\','D','I','S','P','L','A','Y'};
> - static const WCHAR video_value_fmt[] = {'\','D','e','v','i','c','e','\',
> -
>                                        'V','i','d','e','o','%','d',0};
> - static const WCHAR video_key[] = {'H','A','R','D','W','A','R','E','\',
> -
>                                  'D','E','V','I','C','E','M','A','P','\\',
> -
>                                  'V','I','D','E','O','\\',0};

There are already constants defined at file scope for these two strings.

-Ken