ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices. 

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2019-06-25 16:39:11 +08:00 committed by Alexandre Julliard
parent 23b28323cb
commit 7c2d5a7c25
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/gdi32/driver.c
View File

@ -135,6 +135,32 @@ static const struct gdi_dc_funcs *get_display_driver(void)
}
/**********************************************************************
* is_display_device
*/
static BOOL is_display_device( LPCWSTR name )
{
static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'};
const WCHAR *p = name;
if (strncmpiW( name, display_deviceW, sizeof(display_deviceW) / sizeof(WCHAR) ))
return FALSE;
p += sizeof(display_deviceW) / sizeof(WCHAR);
if (!isdigitW( *p++ ))
return FALSE;
for (; *p; p++)
{
if (!isdigitW( *p ))
return FALSE;
}
return TRUE;
}
/**********************************************************************
* DRIVER_load_driver
*/
@ -143,10 +169,9 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name )
HMODULE module;
struct graphics_driver *driver, *new_driver;
static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 };
static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0};
/* display driver is a special case */
if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver();
if (!strcmpiW( name, displayW ) || is_display_device( name )) return get_display_driver();
if ((module = GetModuleHandleW( name )))
{
@ -883,13 +908,12 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size )
{
static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 };
static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 };
static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0};
static const WCHAR empty_strW[] = { 0 };
WCHAR *p;
/* display is a special case */
if (!strcmpiW( device, displayW ) ||
!strcmpiW( device, display1W ))
is_display_device( device ))
{
lstrcpynW( driver, displayW, size );
return TRUE;