May 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : attrib: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 160654be6346c7af036b19a9630b2fe7d73a222d URL: https://source.winehq.org/git/wine.git/?a=commit;h=160654be6346c7af036b19a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:05:53 2020 +0200 attrib: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index e7fe468737..558a393253 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -74,11 +74,10 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) } __ms_va_start(parms, format); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); __ms_va_end(parms); - if (len == 0 && GetLastError() != NO_ERROR) { + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; }

1 0

Alexandre Julliard : cmd: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 88c34b39ed0885783ffbb4936619367d3d2287d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c34b39ed0885783ffbb493… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:06:39 2020 +0200 cmd: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4026f3e6be..97cc607a64 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -134,12 +134,11 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { DWORD len; __ms_va_start(ap,format); - SetLastError(NO_ERROR); string = NULL; len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); __ms_va_end(ap); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { @@ -160,12 +159,11 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { DWORD len; __ms_va_start(ap,format); - SetLastError(NO_ERROR); string = NULL; len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); __ms_va_end(ap); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { @@ -186,11 +184,10 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) DWORD len; __ms_va_start(ap,format); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); __ms_va_end(ap); - if (len == 0 && GetLastError() != NO_ERROR) { + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2); *string = 0;

1 0

Alexandre Julliard : net: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 972ec1ac20811c45fc4c18b8d148b56c8c431d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=972ec1ac20811c45fc4c18b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:06:46 2020 +0200 net: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index ae38c3a8a6..0f43e8a973 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -59,9 +59,8 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) WCHAR str[8192]; int len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt, 0, 0, str, ARRAY_SIZE(str), &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); else output_write(str, len);

1 0

Alexandre Julliard : reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: f81d15beb690c5e08c5995b90aec8015218bee55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81d15beb690c5e08c5995b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:06:51 2020 +0200 reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a1edd226ac..997a670383 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -132,10 +132,9 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WCHAR *str; DWORD len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Alexandre Julliard : regedit: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: d9884c930f0ce9ca3a1cb103c700b94cfc555011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9884c930f0ce9ca3a1cb103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:06:58 2020 +0200 regedit: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 4b555f4ef5..e25de19b52 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -55,10 +55,9 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WCHAR *str; DWORD len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Alexandre Julliard : regsvr32: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 919d9690877122ebf9f95b0e7bc244ad68ba7d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=919d9690877122ebf9f95b0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:07:04 2020 +0200 regsvr32: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index a7fb12e0fc..730f1fef3d 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -51,11 +51,10 @@ static void WINAPIV output_write(UINT id, ...) } __ms_va_start(va_args, id); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (LPWSTR)&str, 0, &va_args); __ms_va_end(va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Alexandre Julliard : uninstaller: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 16c93e97b669b71526633e1480905b3d3829233c URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c93e97b669b71526633e14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:07:11 2020 +0200 uninstaller: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 38a9e66830..d7f308c798 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -84,10 +84,9 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WCHAR *str; DWORD len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (LPWSTR)&str, 0, &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Alexandre Julliard : xcopy: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 536277adf5fbb28576187db3b2b45fcb6ce72bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=536277adf5fbb28576187db3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:07:16 2020 +0200 xcopy: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f50bb7791c..a8614f979a 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -122,11 +122,10 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { } __ms_va_start(parms, format); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); __ms_va_end(parms); - if (len == 0 && GetLastError() != NO_ERROR) { + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; }

1 0

Chip Davis : wined3d: Have ARB_fbo imply EXT_packed_depth_stencil.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: 160cb956f8611b7113433f075f19b5768349263a URL: https://source.winehq.org/git/wine.git/?a=commit;h=160cb956f8611b7113433f07… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue May 12 01:59:28 2020 -0500 wined3d: Have ARB_fbo imply EXT_packed_depth_stencil. The enums are the same between the two extensions. The 24-8 packed depth/stencil format is the only thing provided by the latter. Remove some redundant code. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 5 +++++ dlls/wined3d/utils.c | 32 ++++++-------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 29496f2556..48a135ce07 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3752,6 +3752,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, WARN("Disabling ARB_texture_multisample because immutable storage is not supported.\n"); gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; } + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] && !gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) + { + TRACE(" IMPLIED: GL_EXT_packed_depth_stencil (by GL_ARB_framebuffer_object).\n"); + gl_info->supported[EXT_PACKED_DEPTH_STENCIL] = TRUE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7f04cbdf2..62262b81b2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1795,29 +1795,20 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 4, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - EXT_PACKED_DEPTH_STENCIL, convert_s1_uint_d15_unorm}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - ARB_FRAMEBUFFER_OBJECT, convert_s1_uint_d15_unorm}, + EXT_PACKED_DEPTH_STENCIL, convert_s1_uint_d15_unorm}, {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - ARB_FRAMEBUFFER_OBJECT, NULL}, + EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_DEPTH, @@ -1831,14 +1822,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 4, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - EXT_PACKED_DEPTH_STENCIL, convert_s4x4_uint_d24_unorm}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, - ARB_FRAMEBUFFER_OBJECT, convert_s4x4_uint_d24_unorm}, + EXT_PACKED_DEPTH_STENCIL, convert_s4x4_uint_d24_unorm}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH, @@ -1885,16 +1872,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, - {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, - GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, - ARB_FRAMEBUFFER_OBJECT, NULL}, + EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE, @@ -2591,8 +2573,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for BOOL match = TRUE; GLuint rb; - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) + if (gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) { gl_info->fbo_ops.glGenRenderbuffers(1, &rb); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, rb); @@ -2698,8 +2679,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for } } - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) + if (gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) { gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0); gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);

1 0

Zhiyi Zhang : dxgi/tests: Test IDXGISwapChain_GetContainingOutput() after Alt+Enter.
by Alexandre Julliard 13 May '20

13 May '20

Module: wine Branch: master Commit: f904e9af1b5b3c3c429f6f90835680e35c089504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f904e9af1b5b3c3c429f6f90… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 12 20:48:58 2020 +0800 dxgi/tests: Test IDXGISwapChain_GetContainingOutput() after Alt+Enter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index dd00be1e8c..e8dfa036e0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2095,9 +2095,9 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp static void test_get_containing_output(void) { unsigned int adapter_idx, output_idx, output_count; + DXGI_OUTPUT_DESC output_desc, output_desc2; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGIOutput *output, *output2; - DXGI_OUTPUT_DESC output_desc; MONITORINFOEXW monitor_info; IDXGISwapChain *swapchain; IDXGIFactory *factory; @@ -2369,6 +2369,93 @@ static void test_get_containing_output(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + /* Test GetContainingOutput after a full screen swapchain is made windowed by pressing + * Alt+Enter, then move it to another output and use Alt+Enter to enter full screen */ + output = NULL; + output2 = NULL; + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, + output ? &output2 : &output)); ++output_idx) + { + if (output2) + break; + } + + IDXGIAdapter_Release(adapter); + if (output2) + break; + } + + if (output && output2) + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + IDXGIOutput_Release(output); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + IDXGIOutput_Release(output2); + goto done; + } + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to leave full screen on the first output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(!fullscreen, "Expect swapchain not full screen.\n"); + + /* Move the swapchain output window to the second output */ + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc2.DesktopCoordinates.left, + output_desc2.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed.\n"); + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to enter full screen on the second output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(fullscreen, "Expect swapchain full screen.\n"); + ok(!!output, "Expect output not NULL.\n"); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + IDXGIOutput_Release(output); + + output = NULL; + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "GetContainingOutput failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + } + else + { + skip("This test requires two outputs.\n"); + } + + if (output) + IDXGIOutput_Release(output); + if (output2) + IDXGIOutput_Release(output2); + done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);

1 0