From: "Zhiyi Zhang (@zhiyi)" <wine@gitlab.winehq.org>
Subject: Re: [PATCH 0/5] MR355: win32u: Move more display mode logic out of graphics drivers.
Message-Id: <wine-wine-mr355-v1-note3092@gitlab-mail-bridge>
Date: Fri, 01 Jul 2022 07:10:04 +0000
In-Reply-To: <wine-wine-mr355-v1@gitlab-mail-bridge>
References: <merge_request_434@gitlab.winehq.org> <wine-wine-mr355-v1@gitlab-mail-bridge>

Zhiyi Zhang (@zhiyi) commented about dlls/winex11.drv/display.c:
>          return FALSE;
>      }
>  
> -    memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode));
> +    mode = *(DEVMODEW *)((BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n);
>      pthread_mutex_unlock( &settings_mutex );
>  
> -done:
> -    /* Set generic fields */
> -    devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod);
> -    devmode->dmDriverExtra = 0;
> -    devmode->dmSpecVersion = DM_SPECVERSION;
> -    devmode->dmDriverVersion = DM_SPECVERSION;
> -    lstrcpyW(devmode->dmDeviceName, dev_name);
> +    memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) );
>      return TRUE;
You should move this memcpy() before pthread_mutex_unlock().

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/355#note_3092