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

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8e1ac4819c5..b664214fb31 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,10 +133,8 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } @@ -200,6 +198,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu /* Context activation is done by the caller. */ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -228,7 +227,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -541,10 +540,11 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) { @@ -645,6 +645,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; @@ -680,7 +681,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); @@ -1011,6 +1012,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -1052,6 +1054,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) @@ -1070,7 +1073,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1168,12 +1171,14 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to find_arb_vs_compile_args().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b06d641338..c07b23ae71e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4470,18 +4470,17 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } static void find_arb_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_vs_compile_args(state, shader, context->stream_info.swizzle_map, &args->super, context); + find_vs_compile_args(state, shader, context_gl->c.stream_info.swizzle_map, &args->super, &context_gl->c); args->clip.boolclip_compare = 0; if (use_ps(state)) @@ -4496,7 +4495,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, { args->ps_signature = ~0; if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) - args->clip.boolclip.clip_texcoord = ffp_clip_emul(context) ? d3d_info->limits.ffp_blend_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(&context_gl->c) ? d3d_info->limits.ffp_blend_stages : 0; /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } @@ -4632,7 +4631,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context const struct wined3d_shader_signature *ps_input_sig; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(state, context, vs, &compile_args); + find_arb_vs_compile_args(state, context_gl, vs, &compile_args); /* Instead of searching for the signature in the signature list, read the one from the * current pixel shader. It's maybe not the shader where the signature came from, but it -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
by Henri Verbeet 21 Jun '19

21 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 273c4f31568..7b06d641338 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } static void find_arb_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_ps_compile_args *args) { - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int i; WORD int_skip; - find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, context); + find_ps_compile_args(state, shader, context_gl->c.stream_info.position_transformed, &args->super, &context_gl->c); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; @@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(state, context, ps, &compile_args); + find_arb_ps_compile_args(state, context_gl, ps, &compile_args); compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; -- 2.11.0

1 0

RFC: Raw-Input Support
by Derek Lesho 21 Jun '19

21 Jun '19

Hello, attached is a patch that adds true raw-input support for mouse movements, bypassing the desktop's sensitivity and mouse acceleration settings. It is mostly complete, however I'd like some input on how I should get retain compatibility with non winex11 display drivers. My idea is to have all display drivers that support any kind of native raw input send a raw input message to wineserver w/ a special flag set and w/ the structure specifying which raw-input events the display driver supports. For example in the case of x11/xinput2, we'd set hw_rawinput_t.mouse.x to 1 indicating that we intend to send native raw movement events. What do you guys think about this approach?

1 0

[PATCH v2 3/3] winex11.drv: Use generic GetMonitorInfo.
by Huw Davies 21 Jun '19

21 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 23 --------------- dlls/user32/sysparams.c | 47 +++++++++++++++++++++++++++++++ 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 | 22 +-------------- 7 files changed, 63 insertions(+), 45 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 9f72d2725f..ead21e82b3 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)) @@ -3702,6 +3704,51 @@ 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; + DWORD type; + + 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 */ + 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 ); + SetupDiDestroyDeviceInfoList( devinfo ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + SetupDiDestroyDeviceInfoList( devinfo ); + return FALSE; + } +} + /*********************************************************************** * 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..96d118a222 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -322,6 +322,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 )) @@ -390,24 +391,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.17.1

3 2

[PATCH v2 1/5] d3d11/tests: Test creating and rendering to a swapchain on the desktop window.
by Zebediah Figura 21 Jun '19

21 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8c2f649f8..b8a90ec1ae 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29290,6 +29290,85 @@ static void test_standard_pattern(void) release_test_context(&test_context); } +static void test_desktop_window(void) +{ + ID3D11RenderTargetView *backbuffer_rtv; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *backbuffer; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = GetDesktopWindow(); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + ID3D11Device_Release(device); + return; + } + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + check_texture_color(backbuffer, 0xff0000ff, 1); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11RenderTargetView_Release(backbuffer_rtv); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -29448,6 +29527,7 @@ START_TEST(d3d11) queue_test(test_staging_buffers); queue_test(test_render_a8); queue_test(test_standard_pattern); + queue_test(test_desktop_window); run_queued_tests(); } -- 2.20.1

3 12

[PATCH 1/2] dxgi: Remove wined3d_swapchain dependency from d3d11_swapchain_ResizeTarget().
by Conor McCarthy 21 Jun '19

21 Jun '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/output.c | 61 +++++++++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 62 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eace..9cb43b8 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8..0b4d1b6 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -539,3 +539,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *target_mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_output *target; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, target_mode_desc); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(target_mode_desc, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode_desc) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_output *target; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + target = impl_from_IDXGIOutput4((IDXGIOutput4 *)iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return hr; + } + + dxgi_mode_from_wined3d(mode_desc, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode_desc)); + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4f01d9c..b060a30 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -501,11 +501,65 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * return hr; } +static HRESULT dxgi_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + TRACE("iface %p, desc %p, mode %p.\n", iface, desc, mode); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if(FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + struct DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -520,9 +574,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i if (target_mode_desc->Scaling) FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) -- 2.21.0

4 6

[PATCH v2 2/3] winex11.drv: Use generic EnumDisplayMonitors.
by Huw Davies 21 Jun '19

21 Jun '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 10 ------- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ 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 +--------- 7 files changed, 58 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 63fea14c2a..9f72d2725f 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}; @@ -3797,6 +3800,51 @@ 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; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors */ + 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 ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + + /* 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/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.17.1

2 1

[PATCH] user32: Don't access a potentially uninitialized padded_border.
by Huw Davies 21 Jun '19

21 Jun '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/sysparams.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c66e0..9a5c3cf8d5 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1753,8 +1753,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - lpnm->iBorderWidth += padded_border; - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + if (ret) + { + lpnm->iBorderWidth += padded_border; + if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + } normalize_nonclientmetrics( lpnm ); break; } -- 2.18.0

1 0

[PATCH 1/3] user32: Move EnumDisplayDeviceA/W.
by Zhiyi Zhang 21 Jun '19

21 Jun '19

Because most of the monitor functions are in sysparams.c. And format the string constants to be more consistent with the style in sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 313 ---------------------------------------- dlls/user32/sysparams.c | 297 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 313 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5f26cf9af3..bed5812a47 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,14 +28,7 @@ #include "wine/windef16.h" #include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "winternl.h" #include "controls.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -43,66 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/* Wine specific monitor properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); - -static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR default_monitor_name[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','1','\\', - 'M','o','n','i','t','o','r','0',0}; -static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; -static const WCHAR default_monitor_string[] = - {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; -static const WCHAR default_adapter_id[] = - {'P','C','I','\\', - 'V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0','&', - 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', - 'R','E','V','_','0','0',0}; -static const WCHAR default_monitor_id[] = - {'M','O','N','I','T','O','R','\\', - 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', - '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', - 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', - '\\','0','0','0','0',0}; -static const WCHAR default_monitor_interface_id[] = - {'\\','\\','\?','\\', - 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', - '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', - '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', - 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; - -static const WCHAR monitor_fmtW[] = - {'\\','\\','.','\\', - 'D','I','S','P','L','A','Y','%','d','\\', - 'M','o','n','i','t','o','r','%','d',0}; -static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; -static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; -static const WCHAR video_keyW[] = - {'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O','\\',0}; -static const WCHAR video_value_fmtW[] = - {'\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; -static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; -static const WCHAR guid_devinterface_monitorW[] = - {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', - '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; -static const WCHAR backslashW[] = {'\\',0}; -static const WCHAR nt_classW[] = - {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s','\\',0}; -static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; -static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; -static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; - #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -307,252 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * EnumDisplayDevicesA (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, - DWORD dwFlags ) -{ - UNICODE_STRING deviceW; - DISPLAY_DEVICEW ddW; - BOOL ret; - - if(lpDevice) - RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); - else - deviceW.Buffer = NULL; - - ddW.cb = sizeof(ddW); - ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); - RtlFreeUnicodeString(&deviceW); - - if(!ret) return ret; - - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); - lpDispDev->StateFlags = ddW.StateFlags; - - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); - - return TRUE; -} - -/*********************************************************************** - * EnumDisplayDevicesW (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD dwFlags ) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO set = INVALID_HANDLE_VALUE; - WCHAR key_nameW[MAX_PATH]; - WCHAR instanceW[MAX_PATH]; - WCHAR bufferW[1024]; - LONG adapter_index; - WCHAR *next_charW; - DWORD size; - DWORD type; - HKEY hkey; - BOOL ret = FALSE; - - TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - - /* Find adapter */ - if (!lpDevice) - { - sprintfW(key_nameW, video_value_fmtW, i); - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceKey */ - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); - - /* Strip \Registry\Machine\ */ - lstrcpyW(key_nameW, bufferW + 18); - - /* DeviceString */ - size = sizeof(lpDisplayDevice->DeviceString); - if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, - lpDisplayDevice->DeviceString, &size)) - return FALSE; - - /* StateFlags */ - size = sizeof(lpDisplayDevice->StateFlags); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, - &lpDisplayDevice->StateFlags, &size)) - return FALSE; - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - { - size = sizeof(bufferW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, - bufferW, &size)) - return FALSE; - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); - if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) - || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - /* Find monitor */ - else - { - /* Check adapter name */ - if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) - return FALSE; - - adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); - sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); - - size = sizeof(bufferW); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) - return FALSE; - - /* DeviceName */ - sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); - - /* Get monitor instance */ - /* Strip \Registry\Machine\ first */ - lstrcpyW(key_nameW, bufferW + 18); - sprintfW(bufferW, mointor_id_value_fmtW, i); - - size = sizeof(instanceW); - if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) - return FALSE; - - set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); - if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) - goto done; - - /* StateFlags */ - if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) - goto done; - - /* DeviceString */ - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, - (BYTE *)lpDisplayDevice->DeviceString, - sizeof(lpDisplayDevice->DeviceString), NULL)) - goto done; - - /* DeviceKey */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); - lstrcatW(lpDisplayDevice->DeviceKey, bufferW); - } - - /* DeviceID */ - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - { - lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); - lstrcatW(lpDisplayDevice->DeviceID, instanceW); - lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); - /* Replace '\\' with '#' after prefix */ - for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; - next_charW++) - { - if (*next_charW == '\\') - *next_charW = '#'; - } - } - else - { - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcpyW(lpDisplayDevice->DeviceID, bufferW); - lstrcatW(lpDisplayDevice->DeviceID, backslashW); - - if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL)) - goto done; - - lstrcatW(lpDisplayDevice->DeviceID, bufferW); - } - } - } - - ret = TRUE; -done: - SetupDiDestroyDeviceInfoList(set); - if (ret) - return ret; - - /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ - if (i) - return FALSE; - - /* If user driver did initialize the registry, then exit */ - if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) - { - RegCloseKey(hkey); - return FALSE; - } - WARN("Reporting fallback display devices\n"); - - /* Adapter */ - if (!lpDevice) - { - memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); - memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - lpDisplayDevice->DeviceID[0] = 0; - else - memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); - } - } - /* Monitor */ - else - { - if (lstrcmpiW(default_adapter_name, lpDevice)) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); - memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); - lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; - if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - { - if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) - memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); - else - memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); - } - } - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; -} - /*********************************************************************** * QueryDisplayConfig (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c66e0..b401576efd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -34,10 +34,14 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "wine/wingdi16.h" #include "winerror.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -245,6 +249,56 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; 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); + +/* Strings for monitor functions */ +static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR DEFAULT_MONITOR_NAME[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR DEFAULT_ADAPTER_STRING[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR DEFAULT_MONITOR_STRING[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR DEFAULT_ADAPTER_ID[] = {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR DEFAULT_MONITOR_ID[] = {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR DEFAULT_MONITOR_INTERFACE_ID[] = {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR BACKSLASH[] = {'\\',0}; +static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; +static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','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}; +static const WCHAR NT_CLASS[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR ADAPTER_FMT[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR MONITOR_FMT[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR VIDEO_VALUE_FMT[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; +static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3769,6 +3823,249 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); } +/*********************************************************************** + * EnumDisplayDevicesA (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, DWORD dwFlags ) +{ + UNICODE_STRING deviceW; + DISPLAY_DEVICEW ddW; + BOOL ret; + + if(lpDevice) + RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); + else + deviceW.Buffer = NULL; + + ddW.cb = sizeof(ddW); + ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); + RtlFreeUnicodeString(&deviceW); + + if(!ret) return ret; + + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); + lpDispDev->StateFlags = ddW.StateFlags; + + if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); + if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) + WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); + + return TRUE; +} + +/*********************************************************************** + * EnumDisplayDevicesW (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + /* Find adapter */ + if (!lpDevice) + { + sprintfW(key_nameW, VIDEO_VALUE_FMT, i); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, ADAPTER_FMT, i + 1); + + /* Strip \Registry\Machine\ */ + lstrcpyW(key_nameW, bufferW + 18); + + /* DeviceString */ + size = sizeof(lpDisplayDevice->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, + lpDisplayDevice->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(lpDisplayDevice->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, + &lpDisplayDevice->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(lpDevice, DISPLAY, ARRAY_SIZE(DISPLAY))) + return FALSE; + + adapter_index = strtolW(lpDevice + 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; + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, MONITOR_FMT, adapter_index, i); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW(key_nameW, bufferW + 18); + sprintfW(bufferW, MONITOR_ID_VALUE_FMT, i); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)lpDisplayDevice->DeviceString, + sizeof(lpDisplayDevice->DeviceString), NULL)) + goto done; + + /* DeviceKey */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceKey, NT_CLASS); + lstrcatW(lpDisplayDevice->DeviceKey, bufferW); + } + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW(lpDisplayDevice->DeviceID, MONITOR_INTERFACE_PREFIX); + lstrcatW(lpDisplayDevice->DeviceID, instanceW); + lstrcatW(lpDisplayDevice->DeviceID, GUID_DEVINTERFACE_MONITOR); + /* Replace '\\' with '#' after prefix */ + for (next_charW = lpDisplayDevice->DeviceID + strlenW(MONITOR_INTERFACE_PREFIX); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + lstrcatW(lpDisplayDevice->DeviceID, BACKSLASH); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcatW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList(set); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ + if (i) + return FALSE; + + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, VIDEO_KEY, &hkey)) + { + RegCloseKey(hkey); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + + /* Adapter */ + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, DEFAULT_ADAPTER_NAME, sizeof(DEFAULT_ADAPTER_NAME)); + memcpy(lpDisplayDevice->DeviceString, DEFAULT_ADAPTER_STRING, sizeof(DEFAULT_ADAPTER_STRING)); + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + memcpy(lpDisplayDevice->DeviceID, DEFAULT_ADAPTER_ID, sizeof(DEFAULT_ADAPTER_ID)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(DEFAULT_ADAPTER_NAME, lpDevice)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, DEFAULT_MONITOR_NAME, sizeof(DEFAULT_MONITOR_NAME)); + memcpy(lpDisplayDevice->DeviceString, DEFAULT_MONITOR_STRING, sizeof(DEFAULT_MONITOR_STRING)); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(lpDisplayDevice->DeviceID, DEFAULT_MONITOR_INTERFACE_ID, sizeof(DEFAULT_MONITOR_INTERFACE_ID)); + else + memcpy(lpDisplayDevice->DeviceID, DEFAULT_MONITOR_ID, sizeof(DEFAULT_MONITOR_ID)); + } + } + + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + + return TRUE; +} /********************************************************************** * GetAutoRotationState [USER32.@] -- 2.20.1

2 1