June 2019 - Wine-devel - list.winehq.org

[PATCH v3 3/5] winex11.drv: Use generic EnumDisplayMonitors.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 10 -------- dlls/user32/sysparams.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 5 ++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +---------- 8 files changed, 63 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..bf600708ed 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4d644b9edf..e7aa418f09 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3815,6 +3818,55 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + HANDLE mutex; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + { + if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..a503ebe4db 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a0495c44b1..ecbcd6b381 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -304,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568ad8..d6969b0cfe 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..5b00a5dc5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268391..a6b07699a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531450..c8fa63f459 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -} -- 2.15.2 (Apple Git-101.1)

4 4

[PATCH v2] wbemprox: Add support for parsing ASSOCIATORS OF queries.
by Hans Leidekker 24 Jun '19

24 Jun '19

v2: Add missing null test. Thanks Jacek. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 16 ++-- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/tests/query.c | 31 +++++++- dlls/wbemprox/wbemprox_private.h | 13 +++- dlls/wbemprox/wql.y | 162 +++++++++++++++++++++++++++++++-------- 5 files changed, 179 insertions(+), 45 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d193574a39..3221e27b0b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,17 +30,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) +HRESULT create_view( const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, + const struct property *proplist, const struct expr *cond, struct view **ret ) { - struct view *view = heap_alloc( sizeof(struct view) ); + struct view *view = heap_alloc_zero( sizeof(*view) ); if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = grab_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; + view->path = path; + view->keywordlist = keywordlist; + view->proplist = proplist; + view->table = grab_table( class ); + view->cond = cond; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index ad56e0c7ba..a8fd0041b3 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -357,7 +357,7 @@ struct table *grab_table( const WCHAR *name ) LIST_FOR_EACH_ENTRY( table, table_list, struct table, entry ) { - if (!strcmpiW( table->name, name )) + if (name && !strcmpiW( table->name, name )) { TRACE("returning %p\n", table); return addref_table( table ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 052e8a2778..2c1ca7f91d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -156,14 +156,37 @@ static void test_select( IWbemServices *services ) static void test_associators( IWbemServices *services ) { static const WCHAR query1[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; static const WCHAR query2[] = {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query3[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','}',0}; + static const WCHAR query4[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','.','D','e','v','i','c','e','I','D','=', + '\'','\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\'','}',0}; + static const WCHAR query5[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',' ', + 'C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query6[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query7[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',' ', + 'A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2 }; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; HRESULT hr; IEnumWbemClassObject *result; UINT i; @@ -171,7 +194,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index d52affa82a..15b961de52 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -148,8 +148,17 @@ struct record struct table *table; }; +struct keyword +{ + const WCHAR *name; + const WCHAR *value; + const struct keyword *next; +}; + struct view { + const WCHAR *path; /* ASSOCIATORS OF query */ + const struct keyword *keywordlist; const struct property *proplist; struct table *table; const struct expr *cond; @@ -170,8 +179,8 @@ struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; -HRESULT create_view( const struct property *, const WCHAR *, const struct expr *, - struct view ** ) DECLSPEC_HIDDEN; +HRESULT create_view( const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, + const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 236a37d9f7..4d9ba493f0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -67,6 +67,18 @@ static struct property *alloc_property( struct parser *parser, const WCHAR *clas return prop; } +static struct keyword *alloc_keyword( struct parser *parser, const WCHAR *name, const WCHAR *value ) +{ + struct keyword *keyword = alloc_mem( parser, sizeof(*keyword) ); + if (keyword) + { + keyword->name = name; + keyword->value = value; + keyword->next = NULL; + } + return keyword; +} + static WCHAR *get_string( struct parser *parser, const struct string *str ) { const WCHAR *p = str->data; @@ -87,6 +99,18 @@ static WCHAR *get_string( struct parser *parser, const struct string *str ) return ret; } +static WCHAR *get_path( struct parser *parser, const struct string *str ) +{ + const WCHAR *p = str->data; + int len = str->len; + WCHAR *ret; + + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, p, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + static int get_int( struct parser *parser ) { const WCHAR *p = &parser->cmd[parser->idx]; @@ -195,28 +219,92 @@ static int wql_lex( void *val, struct parser *parser ); struct string str; WCHAR *string; struct property *proplist; + struct keyword *keywordlist; struct view *view; struct expr *expr; int integer; } %token TK_SELECT TK_FROM TK_STAR TK_COMMA TK_DOT TK_IS TK_LP TK_RP TK_NULL TK_FALSE TK_TRUE -%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY -%token <str> TK_STRING TK_ID +%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY TK_ASSOCIATORS TK_OF +%token <str> TK_STRING TK_ID TK_PATH -%type <string> id +%type <string> id path %type <proplist> prop proplist -%type <view> select +%type <keywordlist> keyword keywordlist +%type <view> query select associatorsof %type <expr> expr prop_val const_val string_val %type <integer> number -%left TK_OR -%left TK_AND -%left TK_NOT -%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE +%left TK_OR TK_AND TK_NOT TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE %% +query: + select + | + associatorsof + ; + +path: + TK_PATH + { + $$ = get_path( ctx, &$1 ); + if (!$$) + YYABORT; + } + ; + +keyword: + id + { + $$ = alloc_keyword( ctx, $1, NULL ); + if (!$$) + YYABORT; + } + | id TK_EQ id + { + $$ = alloc_keyword( ctx, $1, $3 ); + if (!$$) + YYABORT; + } + ; + +keywordlist: + keyword + | keyword keywordlist + { + $1->next = $2; + } + ; + +associatorsof: + TK_ASSOCIATORS TK_OF path + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, NULL, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, $5, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + ; + select: TK_SELECT TK_FROM id { @@ -224,7 +312,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, $3, NULL, &view ); + hr = create_view( NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -236,7 +324,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, NULL, &view ); + hr = create_view( NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) YYABORT; @@ -248,7 +336,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, $6, &view ); + hr = create_view( NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) YYABORT; @@ -535,16 +623,18 @@ static const char id_char[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; -struct keyword +struct wql_keyword { const WCHAR *name; unsigned int len; int type; }; -#define MAX_TOKEN_LEN 6 +#define MIN_TOKEN_LEN 2 +#define MAX_TOKEN_LEN 11 static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; static const WCHAR byW[] = {'B','Y'}; static const WCHAR falseW[] = {'F','A','L','S','E'}; static const WCHAR fromW[] = {'F','R','O','M'}; @@ -552,30 +642,33 @@ static const WCHAR isW[] = {'I','S'}; static const WCHAR likeW[] = {'L','I','K','E'}; static const WCHAR notW[] = {'N','O','T'}; static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR ofW[] = {'O','F'}; static const WCHAR orW[] = {'O','R'}; static const WCHAR selectW[] = {'S','E','L','E','C','T'}; static const WCHAR trueW[] = {'T','R','U','E'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -static const struct keyword keyword_table[] = +static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { andW, ARRAY_SIZE(andW), TK_AND }, + { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { falseW, ARRAY_SIZE(falseW), TK_FALSE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { ofW, ARRAY_SIZE(ofW), TK_OF }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { trueW, ARRAY_SIZE(trueW), TK_TRUE }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE } }; static int cmp_keyword( const void *arg1, const void *arg2 ) { - const struct keyword *key1 = arg1, *key2 = arg2; + const struct wql_keyword *key1 = arg1, *key2 = arg2; int len = min( key1->len, key2->len ); int ret; @@ -587,14 +680,14 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) static int keyword_type( const WCHAR *str, unsigned int len ) { - struct keyword key, *ret; + struct wql_keyword key, *ret; - if (len > MAX_TOKEN_LEN) return TK_ID; + if (len < MIN_TOKEN_LEN || len > MAX_TOKEN_LEN) return TK_ID; key.name = str; key.len = len; key.type = 0; - ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct keyword), cmp_keyword ); + ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct wql_keyword), cmp_keyword ); if (ret) return ret->type; return TK_ID; } @@ -622,6 +715,15 @@ static int get_token( const WCHAR *s, int *token ) case ')': *token = TK_RP; return 1; + case '{': + for (i = 1; s[i] && s[i] != '}'; i++) {} + if (s[i] != '}') + { + *token = TK_ILLEGAL; + return i; + } + *token = TK_PATH; + return i + 1; case '*': *token = TK_STAR; return 1; -- 2.11.0

1 0

[PATCH] wbemprox: Add support for parsing ASSOCIATORS OF queries.
by Hans Leidekker 24 Jun '19

24 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 16 ++-- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/tests/query.c | 31 +++++++- dlls/wbemprox/wbemprox_private.h | 13 +++- dlls/wbemprox/wql.y | 162 +++++++++++++++++++++++++++++++-------- 5 files changed, 179 insertions(+), 45 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d193574a39..3221e27b0b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,17 +30,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) +HRESULT create_view( const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, + const struct property *proplist, const struct expr *cond, struct view **ret ) { - struct view *view = heap_alloc( sizeof(struct view) ); + struct view *view = heap_alloc_zero( sizeof(*view) ); if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = grab_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; + view->path = path; + view->keywordlist = keywordlist; + view->proplist = proplist; + view->table = grab_table( class ); + view->cond = cond; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index ad56e0c7ba..a8fd0041b3 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -357,7 +357,7 @@ struct table *grab_table( const WCHAR *name ) LIST_FOR_EACH_ENTRY( table, table_list, struct table, entry ) { - if (!strcmpiW( table->name, name )) + if (name && !strcmpiW( table->name, name )) { TRACE("returning %p\n", table); return addref_table( table ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 052e8a2778..2c1ca7f91d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -156,14 +156,37 @@ static void test_select( IWbemServices *services ) static void test_associators( IWbemServices *services ) { static const WCHAR query1[] = - {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; static const WCHAR query2[] = {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', - 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query3[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','}',0}; + static const WCHAR query4[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ',' ','O','F',' ','{','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','.','D','e','v','i','c','e','I','D','=', + '\'','\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\'','}',0}; + static const WCHAR query5[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s','=','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',' ', + 'C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query6[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',0}; + static const WCHAR query7[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','C','l','a','s','s','D','e','f','s','O','n','l','y',' ', + 'A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR *test[] = { query1, query2 }; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; HRESULT hr; IEnumWbemClassObject *result; UINT i; @@ -171,7 +194,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index d52affa82a..15b961de52 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -148,8 +148,17 @@ struct record struct table *table; }; +struct keyword +{ + const WCHAR *name; + const WCHAR *value; + const struct keyword *next; +}; + struct view { + const WCHAR *path; /* ASSOCIATORS OF query */ + const struct keyword *keywordlist; const struct property *proplist; struct table *table; const struct expr *cond; @@ -170,8 +179,8 @@ struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; -HRESULT create_view( const struct property *, const WCHAR *, const struct expr *, - struct view ** ) DECLSPEC_HIDDEN; +HRESULT create_view( const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, + const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 236a37d9f7..85d4339e8d 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -67,6 +67,18 @@ static struct property *alloc_property( struct parser *parser, const WCHAR *clas return prop; } +static struct keyword *alloc_keyword( struct parser *parser, const WCHAR *name, const WCHAR *value ) +{ + struct keyword *keyword = alloc_mem( parser, sizeof(*keyword) ); + if (keyword) + { + keyword->name = name; + keyword->value = value; + keyword->next = NULL; + } + return keyword; +} + static WCHAR *get_string( struct parser *parser, const struct string *str ) { const WCHAR *p = str->data; @@ -87,6 +99,18 @@ static WCHAR *get_string( struct parser *parser, const struct string *str ) return ret; } +static WCHAR *get_path( struct parser *parser, const struct string *str ) +{ + const WCHAR *p = str->data; + int len = str->len; + WCHAR *ret; + + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, p, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + static int get_int( struct parser *parser ) { const WCHAR *p = &parser->cmd[parser->idx]; @@ -195,28 +219,92 @@ static int wql_lex( void *val, struct parser *parser ); struct string str; WCHAR *string; struct property *proplist; + struct keyword *keywordlist; struct view *view; struct expr *expr; int integer; } %token TK_SELECT TK_FROM TK_STAR TK_COMMA TK_DOT TK_IS TK_LP TK_RP TK_NULL TK_FALSE TK_TRUE -%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY -%token <str> TK_STRING TK_ID +%token TK_INTEGER TK_WHERE TK_SPACE TK_MINUS TK_ILLEGAL TK_BY TK_ASSOCIATORS TK_OF +%token <str> TK_STRING TK_ID TK_PATH -%type <string> id +%type <string> id path %type <proplist> prop proplist -%type <view> select +%type <keywordlist> keyword keywordlist +%type <view> query select associatorsof %type <expr> expr prop_val const_val string_val %type <integer> number -%left TK_OR -%left TK_AND -%left TK_NOT -%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE +%left TK_OR TK_AND TK_NOT TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_LIKE %% +query: + select + | + associatorsof + ; + +path: + TK_PATH + { + $$ = get_path( ctx, &$1 ); + if (!$$) + YYABORT; + } + ; + +keyword: + id + { + $$ = alloc_keyword( ctx, $1, NULL ); + if (!$$) + YYABORT; + } + | id TK_EQ id + { + $$ = alloc_keyword( ctx, $1, $3 ); + if (!$$) + YYABORT; + } + ; + +keywordlist: + keyword + | keyword keywordlist + { + $1->next = $2; + } + ; + +associatorsof: + TK_ASSOCIATORS TK_OF path + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, NULL, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist + { + HRESULT hr; + struct parser *parser = ctx; + struct view *view; + + hr = create_view( $3, $5, NULL, NULL, NULL, &view ); + if (hr != S_OK) + YYABORT; + + PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + } + ; + select: TK_SELECT TK_FROM id { @@ -224,7 +312,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, $3, NULL, &view ); + hr = create_view( NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -236,7 +324,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, NULL, &view ); + hr = create_view( NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) YYABORT; @@ -248,7 +336,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( $2, $4, $6, &view ); + hr = create_view( NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) YYABORT; @@ -535,16 +623,18 @@ static const char id_char[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; -struct keyword +struct wql_keyword { const WCHAR *name; unsigned int len; int type; }; -#define MAX_TOKEN_LEN 6 +#define MIN_TOKEN_LEN 2 +#define MAX_TOKEN_LEN 11 static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; static const WCHAR byW[] = {'B','Y'}; static const WCHAR falseW[] = {'F','A','L','S','E'}; static const WCHAR fromW[] = {'F','R','O','M'}; @@ -552,30 +642,33 @@ static const WCHAR isW[] = {'I','S'}; static const WCHAR likeW[] = {'L','I','K','E'}; static const WCHAR notW[] = {'N','O','T'}; static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR ofW[] = {'O','F'}; static const WCHAR orW[] = {'O','R'}; static const WCHAR selectW[] = {'S','E','L','E','C','T'}; static const WCHAR trueW[] = {'T','R','U','E'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -static const struct keyword keyword_table[] = +static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { andW, ARRAY_SIZE(andW), TK_AND }, + { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { falseW, ARRAY_SIZE(falseW), TK_FALSE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { ofW, ARRAY_SIZE(ofW), TK_OF }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { trueW, ARRAY_SIZE(trueW), TK_TRUE }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE } }; static int cmp_keyword( const void *arg1, const void *arg2 ) { - const struct keyword *key1 = arg1, *key2 = arg2; + const struct wql_keyword *key1 = arg1, *key2 = arg2; int len = min( key1->len, key2->len ); int ret; @@ -587,14 +680,14 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) static int keyword_type( const WCHAR *str, unsigned int len ) { - struct keyword key, *ret; + struct wql_keyword key, *ret; - if (len > MAX_TOKEN_LEN) return TK_ID; + if (len < MIN_TOKEN_LEN || len > MAX_TOKEN_LEN) return TK_ID; key.name = str; key.len = len; key.type = 0; - ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct keyword), cmp_keyword ); + ret = bsearch( &key, keyword_table, ARRAY_SIZE(keyword_table), sizeof(struct wql_keyword), cmp_keyword ); if (ret) return ret->type; return TK_ID; } @@ -622,6 +715,15 @@ static int get_token( const WCHAR *s, int *token ) case ')': *token = TK_RP; return 1; + case '{': + for (i = 1; s[i] != '}'; i++) {} + if (s[i] != '}') + { + *token = TK_ILLEGAL; + return i; + } + *token = TK_PATH; + return i + 1; case '*': *token = TK_STAR; return 1; -- 2.11.0

2 1

[PATCH 2/2] dxgi: Forbid creating D3D12 swapchains on desktop window.
by Józef Kucia 24 Jun '19

24 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 4 ++-- dlls/dxgi/swapchain.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index d23aba9dce23..54eec6b94fb4 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1404,12 +1404,12 @@ static void test_desktop_window(void) swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; swapchain_desc.Flags = 0; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); swapchain_desc.Width = rect.right; swapchain_desc.Height = rect.bottom; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); - todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); IDXGIFactory4_Release(factory); destroy_test_context(&context); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9ce0240..1bc59f48e90d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2683,6 +2683,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkResult vr; HRESULT hr; + if (window == GetDesktopWindow()) + { + WARN("D3D12 swapchain cannot be created on desktop window.\n"); + return E_ACCESSDENIED; + } + swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; -- 2.21.0

2 1

[PATCH 1/2] d3d12/tests: Add test for creating swapchain on desktop window.
by Józef Kucia 24 Jun '19

24 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index ae750af40aed..d23aba9dce23 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -308,6 +308,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line, struct test_context_desc { + BOOL no_render_target; BOOL no_pipeline; const D3D12_SHADER_BYTECODE *ps; }; @@ -436,6 +437,9 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); } + if (desc && desc->no_render_target) + return TRUE; + rtv_heap_desc.NumDescriptors = MAX_FRAME_COUNT; rtv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; rtv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; @@ -1011,6 +1015,7 @@ static void test_swapchain_draw(void) {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1088,6 +1093,7 @@ static void test_swapchain_refcount(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1165,6 +1171,7 @@ static void test_swapchain_size_mismatch(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1287,6 +1294,7 @@ static void test_swapchain_backbuffer_index(void) RECT rect; BOOL ret; + memset(&desc, 0, sizeof(desc)); desc.no_pipeline = TRUE; if (!init_test_context(&context, &desc)) return; @@ -1357,6 +1365,56 @@ static void test_swapchain_backbuffer_index(void) destroy_test_context(&context); } +static void test_desktop_window(void) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain1 *swapchain; + IDXGIFactory4 *factory; + IUnknown *queue; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = TRUE; + if (!init_test_context(&context, NULL)) + return; + queue = (IUnknown *)context.queue; + + window = GetDesktopWindow(); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + swapchain_desc.Width = rect.right; + swapchain_desc.Height = rect.bottom; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1391,4 +1449,5 @@ START_TEST(d3d12) test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); + test_desktop_window(); } -- 2.21.0

2 1

[PATCH 1/2] ddraw: Factor out fixup_texture_alpha_op() function.
by Paul Gofman 24 Jun '19

24 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/device.c | 78 +++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 48 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e07fe007f0..266499df4d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2664,6 +2664,33 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i return hr; } +static void fixup_texture_alpha_op(struct d3d_device *device) +{ + /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. + See d3d_device3_SetRenderState() for details. */ + struct wined3d_texture *tex; + BOOL tex_alpha = FALSE; + DDPIXELFORMAT ddfmt; + + if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) + return; + + if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + { + struct wined3d_resource_desc desc; + + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; + } + + /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ + wined3d_device_set_texture_stage_state(device->wined3d_device, + 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); +} + static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -2734,32 +2761,14 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } device->legacyTextureBlending = TRUE; + device->texture_map_blend = value; switch (value) { case D3DTBLEND_MODULATE: { - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; + fixup_texture_alpha_op(device); - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); wined3d_device_set_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); wined3d_device_set_texture_stage_state(device->wined3d_device, @@ -2829,7 +2838,6 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, default: FIXME("Unhandled texture environment %#x.\n", value); } - device->texture_map_blend = value; hr = D3D_OK; break; } @@ -4908,33 +4916,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); - if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE) - { - /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. - See d3d_device3_SetRenderState() for details. */ - struct wined3d_texture *tex = NULL; - BOOL tex_alpha = FALSE; - DDPIXELFORMAT ddfmt; - - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) - tex_alpha = TRUE; - } - - /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ - if (tex_alpha) - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); - else - wined3d_device_set_texture_stage_state(device->wined3d_device, - 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - } + fixup_texture_alpha_op(device); wined3d_mutex_unlock(); -- 2.21.0

3 4

[PATCH] d3drm: CreateViewport checks for non-NULL viewport pointer first
by Jeff Smith 24 Jun '19

24 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/d3drm.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ef5830efb..0b3af02a5a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -568,10 +568,12 @@ static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevic TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1090,10 +1092,12 @@ static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) return hr; @@ -1761,10 +1765,12 @@ static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevi TRACE("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p.\n", iface, device, camera, x, y, width, height, viewport); - if (!device || !camera) - return D3DRMERR_BADOBJECT; if (!viewport) return D3DRMERR_BADVALUE; + *viewport = NULL; + + if (!device || !camera) + return D3DRMERR_BADOBJECT; if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a..14b5b2f770 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1799,42 +1799,72 @@ static void test_Viewport(void) ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); /* Test all failures together */ + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); + viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport); hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); + viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2); hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); -- 2.14.3

2 1

[PATCH v3 5/5] gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

From: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 96c2f1f129..dcbc480376 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -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; -- 2.15.2 (Apple Git-101.1)

3 2

[PATCH v3 4/5] winex11.drv: Use generic GetMonitorInfo.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 23 ------------------ dlls/user32/sysparams.c | 51 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 +++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 40 +++--------------------------- 7 files changed, 69 insertions(+), 61 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bf600708ed..921ea2c962 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,8 +197,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -359,27 +357,6 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM return FALSE; } -static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - RECT r = {0, 0, 640, 480}; - static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; - - TRACE("(%p, %p)\n", handle, info); - - if (handle != NULLDRV_DEFAULT_HMONITOR) - { - SetLastError(ERROR_INVALID_MONITOR_HANDLE); - return FALSE; - } - - info->rcMonitor = r; - info->rcWork = r; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); - return TRUE; -} - static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e7aa418f09..311ea5b2ad 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -252,6 +252,8 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) @@ -3720,6 +3722,55 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_name[CCHDEVICENAME]; + HDEVINFO devinfo; + HANDLE mutex; + DWORD type; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + /* Fallback to report one monitor */ + if (handle == NULLDRV_DEFAULT_HMONITOR) + { + RECT default_rect = {0, 0, 640, 480}; + info->rcMonitor = default_rect; + info->rcWork = default_rect; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, DEFAULT_ADAPTER_NAME ); + return TRUE; + } + + /* Use SetupAPI to get monitors */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + { + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); + SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); + info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); + ret = TRUE; + } + else + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + ret = FALSE; + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return ret; +} + /*********************************************************************** * GetMonitorInfoA (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a503ebe4db..c11aae707c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -123,6 +123,7 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; struct received_message_info; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d6969b0cfe..f5ef65f428 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,12 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -281,6 +284,15 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto done; + /* Adapter name */ + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5b00a5dc5d..c0e24d8fe8 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -21,7 +21,6 @@ @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx -@ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a6b07699a7..9ab948f724 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,8 @@ struct x11drv_monitor WCHAR name[128]; /* RcMonitor in MONITORINFO struct */ RECT rc_monitor; + /* RcWork in MONITORINFO struct */ + RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c8fa63f459..75ef3a2a99 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -57,18 +57,6 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -static inline HMONITOR index_to_monitor( int index ) -{ - return (HMONITOR)(UINT_PTR)(index + 1); -} - -static inline int monitor_to_index( HMONITOR handle ) -{ - UINT_PTR index = (UINT_PTR)handle; - if (index < 1 || index > nb_monitors) return -1; - return index - 1; -} - static void query_work_area( RECT *rc_work ) { Atom type; @@ -154,8 +142,6 @@ static int query_screens(void) monitors[i].dwFlags = 0; if (!IntersectRect( &monitors[i].rcWork, &rc_work, &monitors[i].rcMonitor )) monitors[i].rcWork = monitors[i].rcMonitor; - /* FIXME: using the same device name for all monitors for now */ - lstrcpyW( monitors[i].szDevice, default_monitor.szDevice ); } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; @@ -322,6 +308,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -371,8 +358,8 @@ void xinerama_init( unsigned int width, unsigned int height ) OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); - TRACE( "monitor %p: %s work %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + TRACE( "monitor 0x%x: %s work %s%s\n", + i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } @@ -390,24 +377,3 @@ void xinerama_init( unsigned int width, unsigned int height ) TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } - - -/*********************************************************************** - * X11DRV_GetMonitorInfo (X11DRV.@) - */ -BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) -{ - int i = monitor_to_index( handle ); - - if (i == -1) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - info->rcMonitor = monitors[i].rcMonitor; - info->rcWork = monitors[i].rcWork; - info->dwFlags = monitors[i].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); - return TRUE; -} -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH v3 2/5] user32: Avoid a possible race.
by Zhiyi Zhang 24 Jun '19

24 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3e457f09c4..4d644b9edf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -701,6 +701,21 @@ void release_display_dc( HDC hdc ) LeaveCriticalSection( &display_dc_section ); } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutexW ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -3871,6 +3886,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i WCHAR bufferW[1024]; LONG adapter_index; WCHAR *next_charW; + HANDLE mutex; DWORD size; DWORD type; HKEY hkey; @@ -3878,13 +3894,15 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + mutex = get_display_device_init_mutex(); + /* Find adapter */ if (!device) { sprintfW( key_nameW, VIDEO_VALUE_FMT, index ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceKey */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) @@ -3900,13 +3918,13 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(info->DeviceString); if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, info->DeviceString, &size )) - return FALSE; + goto done; /* StateFlags */ size = sizeof(info->StateFlags); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, &info->StateFlags, &size )) - return FALSE; + goto done; /* DeviceID */ if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) @@ -3918,7 +3936,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(bufferW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, bufferW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, @@ -3933,14 +3951,14 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i { /* Check adapter name */ if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) - return FALSE; + goto done; adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW); if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - return FALSE; + goto done; /* DeviceName */ sprintfW( info->DeviceName, MONITOR_FMT, adapter_index, index ); @@ -3952,7 +3970,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i size = sizeof(instanceW); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size )) - return FALSE; + goto done; set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_MONITOR, NULL ); if (!SetupDiOpenDeviceInfoW( set, instanceW, NULL, 0, &device_data )) @@ -4016,6 +4034,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i ret = TRUE; done: + release_display_device_init_mutex( mutex ); SetupDiDestroyDeviceInfoList( set ); if (ret) return ret; -- 2.15.2 (Apple Git-101.1)

3 2