April 2024 - Wine-Commits - list.winehq.org

Francisco Casas : tests: Test x + 0 and x * 1 indentities.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: vkd3d Branch: master Commit: c43c900a300b0c3acf619bceeecac68b72414b9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c43c900a300b0c3acf619bceeecac… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 23 16:35:50 2024 -0400 tests: Test x + 0 and x * 1 indentities. --- tests/hlsl/arithmetic-float-uniform.shader_test | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index a49d3f00..0797b237 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -187,3 +187,21 @@ uniform 4 double2 1.625 -5.0 uniform 8 double2 1.00000007 -1.0 todo(sm<6) draw quad probe all rgba (2.62500024, 209.5, 0.0, 0.0) + + +% Test result when instructions might be removed because they are identities such as (+0) or (*1). +[pixel shader] +float4 a; + +float4 main() : sv_target +{ + float4 zero = {0, 0, 0, 0}; + float4 one = {1, 1, 1, 1}; + + return a + zero + a * one + zero * one; +} + +[test] +uniform 0 float4 0.2 0.3 9.1 3.2 +todo(glsl) draw quad +probe all rgba (0.4, 0.6, 18.2, 6.4)

1 0

Kirill Zhumarin : ntdll: Use termios2 for serial when possible.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 898ab8dab19d498c17859f39a55e317ee7e367a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/898ab8dab19d498c17859f39a55e31… Author: Kirill Zhumarin <kirill.zhumarin(a)gmail.com> Date: Sun Mar 3 09:12:21 2024 +0000 ntdll: Use termios2 for serial when possible. --- configure | 6 ++ configure.ac | 1 + dlls/ntdll/unix/serial.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 3 + 4 files changed, 165 insertions(+), 3 deletions(-)

1 0

Alexandros Frantzis : wineandroid.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: b5b22136f767301fd2d69477ab8093abefcf0bb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5b22136f767301fd2d69477ab8093… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 29 12:13:36 2024 +0300 wineandroid.drv: Enable wglDescribePixelFormat through p_get_pixel_formats. --- dlls/wineandroid.drv/opengl.c | 100 ++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index ecc6e9b7d20..f882c86b976 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -273,6 +273,39 @@ static struct wgl_context *create_context( HDC hdc, struct wgl_context *share, c return ctx; } +static void describe_pixel_format( struct egl_pixel_format *fmt, PIXELFORMATDESCRIPTOR *pfd ) +{ + EGLint val; + EGLConfig config = fmt->config; + + memset( pfd, 0, sizeof(*pfd) ); + pfd->nSize = sizeof(*pfd); + pfd->nVersion = 1; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | PFD_SUPPORT_COMPOSITION; + pfd->iPixelType = PFD_TYPE_RGBA; + pfd->iLayerType = PFD_MAIN_PLANE; + + p_eglGetConfigAttrib( display, config, EGL_BUFFER_SIZE, &val ); + pfd->cColorBits = val; + p_eglGetConfigAttrib( display, config, EGL_RED_SIZE, &val ); + pfd->cRedBits = val; + p_eglGetConfigAttrib( display, config, EGL_GREEN_SIZE, &val ); + pfd->cGreenBits = val; + p_eglGetConfigAttrib( display, config, EGL_BLUE_SIZE, &val ); + pfd->cBlueBits = val; + p_eglGetConfigAttrib( display, config, EGL_ALPHA_SIZE, &val ); + pfd->cAlphaBits = val; + p_eglGetConfigAttrib( display, config, EGL_DEPTH_SIZE, &val ); + pfd->cDepthBits = val; + p_eglGetConfigAttrib( display, config, EGL_STENCIL_SIZE, &val ); + pfd->cStencilBits = val; + + pfd->cAlphaShift = 0; + pfd->cBlueShift = pfd->cAlphaShift + pfd->cAlphaBits; + pfd->cGreenShift = pfd->cBlueShift + pfd->cBlueBits; + pfd->cRedShift = pfd->cGreenShift + pfd->cGreenBits; +} + /*********************************************************************** * android_wglGetExtensionsStringARB */ @@ -450,52 +483,6 @@ static BOOL android_wglDeleteContext( struct wgl_context *ctx ) return TRUE; } -/*********************************************************************** - * android_wglDescribePixelFormat - */ -static int android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ) -{ - EGLint val; - EGLConfig config; - - if (!pfd) return nb_onscreen_formats; - if (!is_onscreen_pixel_format( fmt )) return 0; - if (size < sizeof(*pfd)) return 0; - config = pixel_formats[fmt - 1].config; - - memset( pfd, 0, sizeof(*pfd) ); - pfd->nSize = sizeof(*pfd); - pfd->nVersion = 1; - pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | PFD_SUPPORT_COMPOSITION; - pfd->iPixelType = PFD_TYPE_RGBA; - pfd->iLayerType = PFD_MAIN_PLANE; - - p_eglGetConfigAttrib( display, config, EGL_BUFFER_SIZE, &val ); - pfd->cColorBits = val; - p_eglGetConfigAttrib( display, config, EGL_RED_SIZE, &val ); - pfd->cRedBits = val; - p_eglGetConfigAttrib( display, config, EGL_GREEN_SIZE, &val ); - pfd->cGreenBits = val; - p_eglGetConfigAttrib( display, config, EGL_BLUE_SIZE, &val ); - pfd->cBlueBits = val; - p_eglGetConfigAttrib( display, config, EGL_ALPHA_SIZE, &val ); - pfd->cAlphaBits = val; - p_eglGetConfigAttrib( display, config, EGL_DEPTH_SIZE, &val ); - pfd->cDepthBits = val; - p_eglGetConfigAttrib( display, config, EGL_STENCIL_SIZE, &val ); - pfd->cStencilBits = val; - - pfd->cAlphaShift = 0; - pfd->cBlueShift = pfd->cAlphaShift + pfd->cAlphaBits; - pfd->cGreenShift = pfd->cBlueShift + pfd->cBlueBits; - pfd->cRedShift = pfd->cGreenShift + pfd->cGreenBits; - - TRACE( "fmt %u color %u %u/%u/%u/%u depth %u stencil %u\n", - fmt, pfd->cColorBits, pfd->cRedBits, pfd->cGreenBits, pfd->cBlueBits, - pfd->cAlphaBits, pfd->cDepthBits, pfd->cStencilBits ); - return nb_onscreen_formats; -} - /*********************************************************************** * android_wglGetPixelFormat */ @@ -605,6 +592,24 @@ static BOOL android_wglSwapBuffers( HDC hdc ) return TRUE; } +/********************************************************************** + * android_get_pixel_formats + */ +static void android_get_pixel_formats( struct wgl_pixel_format *formats, + UINT max_formats, UINT *num_formats, + UINT *num_onscreen_formats ) +{ + UINT i; + + if (formats) + { + for (i = 0; i < min( max_formats, nb_pixel_formats ); ++i) + describe_pixel_format( &pixel_formats[i], &formats[i].pfd ); + } + *num_formats = nb_pixel_formats; + *num_onscreen_formats = nb_onscreen_formats; +} + static void wglFinish(void) { struct wgl_context *ctx = NtCurrentTeb()->glContext; @@ -1061,13 +1066,14 @@ static struct opengl_funcs egl_funcs = android_wglCopyContext, android_wglCreateContext, android_wglDeleteContext, - android_wglDescribePixelFormat, + NULL, /* p_wglDescribePixelFormat */ android_wglGetPixelFormat, android_wglGetProcAddress, android_wglMakeCurrent, android_wglSetPixelFormat, android_wglShareLists, android_wglSwapBuffers, + android_get_pixel_formats, }, #define USE_GL_FUNC(name) (void *)glstub_##name, { ALL_WGL_FUNCS }

1 0

Alexandros Frantzis : wineandroid.drv: Rename wgl_pixel_format to avoid name conflicts.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 1b4ace844994c641f1b0043d975b0f9cd247749e URL: https://gitlab.winehq.org/wine/wine/-/commit/1b4ace844994c641f1b0043d975b0f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 29 11:11:09 2024 +0300 wineandroid.drv: Rename wgl_pixel_format to avoid name conflicts. --- dlls/wineandroid.drv/opengl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 99d2e3cebe1..ecc6e9b7d20 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -68,7 +68,7 @@ DECL_FUNCPTR( eglSwapInterval ); static const int egl_client_version = 2; -struct wgl_pixel_format +struct egl_pixel_format { EGLConfig config; }; @@ -96,7 +96,7 @@ struct gl_drawable static void *egl_handle; static void *opengl_handle; -static struct wgl_pixel_format *pixel_formats; +static struct egl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static EGLDisplay display; static int swap_interval;

1 0

Yuxuan Shui : shell32: Restore the ability of running native unix programs with ShellExecute.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: a2548c8db3096963012939c82e340f6b867f3efd URL: https://gitlab.winehq.org/wine/wine/-/commit/a2548c8db3096963012939c82e340f… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Mar 25 13:39:17 2024 +0000 shell32: Restore the ability of running native unix programs with ShellExecute. For ShellExecute, if the specified file is found, we will try running it anyway, even if it doesn't have a "program" extension. Windows associations will take precedence over this. --- dlls/shell32/shlexec.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 9704f9d8f06..d2fe3caed88 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -579,6 +579,7 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn * * Utility for code sharing between FindExecutable and ShellExecute * in: + * lpPath the path to search for the file * lpFile the name of a file * lpVerb the operation on it (open) * out: @@ -639,6 +640,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, { TRACE("PathResolveAW returned non-zero\n"); lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); /* The file was found in lpPath or one of the directories in the system-wide search path */ } else @@ -696,7 +698,6 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, if (wcsicmp(tok, &extension[1]) == 0) /* have to skip the leading "." */ { - lstrcpyW(lpResult, xlpFile); /* Need to perhaps check that the file has a path * attached */ TRACE("found %s\n", debugstr_w(lpResult)); @@ -781,7 +782,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, } } - TRACE("returning %s\n", debugstr_w(lpResult)); + TRACE("returning path %s, retval %d\n", debugstr_w(lpResult), retval); return retval; } @@ -1817,7 +1818,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buf = malloc(len * sizeof(WCHAR)); GetFullPathNameW(sei_tmp.lpDirectory, len, buf, NULL); if (wszDir != dirBuffer) - free(wszDir); + free(wszDir); wszDir = buf; sei_tmp.lpDirectory = wszDir; } @@ -1885,6 +1886,22 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) lstrcatW(lpstrTmpFile, lpFile); retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } + else if (retval == SE_ERR_NOASSOC && SHGetFileInfoW(wcmd, 0, NULL, 0, SHGFI_EXETYPE) == 0) + { + /* File found, but no association. And no other cases fit, this could be a + unix programs, try running it. We have to do this in a "catch-all" fashion because + unix program can have any extensions. However, things get more complicated because + the file we find could be a Windows executable without the proper extensions, it could + be seen as unexpected if we start it, so we special case it here. */ + UINT exec_retval; + TRACE("No association found, trying as Unix binary %s\n", debugstr_w(wcmd)); + exec_retval = SHELL_quote_and_execute( wcmd, wszParameters, wszKeyname, + wszApplicationName, env, &sei_tmp, + sei, execfunc ); + TRACE("Unix binary returned %u\n", exec_retval); + if (exec_retval > 32) + retval = exec_retval; + } end: TRACE("retval %Iu\n", retval);

1 0

Alexandre Julliard : urlmon: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: e737a58f29bc0c8413a33129ad87af9fd7f723e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e737a58f29bc0c8413a33129ad87af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:59:10 2024 +0200 urlmon: Use fully interpreted IDL stubs. --- dlls/urlmon/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index ba6f1db87ad..9c9e9ef5a0e 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 DELAYIMPORTS = advpack +EXTRAIDLFLAGS = -Oicf + SOURCES = \ axinstall.c \ bindctx.c \

1 0

Zhiyi Zhang : win32u: Set the virtual desktop display frequency to 60Hz.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: b918ce9e7694da29231b73dcb228074d36d15761 URL: https://gitlab.winehq.org/wine/wine/-/commit/b918ce9e7694da29231b73dcb22807… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 30 18:43:03 2024 +0800 win32u: Set the virtual desktop display frequency to 60Hz. Fix a regression from ee0aad5c, which changes the virtual desktop display frequency to that of the host display while adding modes of 60Hz. So when the host display is not 60Hz, we might get ChangeDisplaySettings() failures when virtual desktop is on because the target mode is not found because of the frequency difference. --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d2ac6d5bfb2..cc6bd8e7628 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1900,6 +1900,7 @@ static BOOL desktop_update_display_devices( BOOL force, struct device_manager_ct if (!read_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, &current )) { current = desktop_ctx.primary; + current.dmDisplayFrequency = 60; current.dmPelsWidth = screen_width; current.dmPelsHeight = screen_height; }

1 0

Alexandre Julliard : windowscodecs: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: b44c3dc946f270b0f95646604e4435d30d1a0260 URL: https://gitlab.winehq.org/wine/wine/-/commit/b44c3dc946f270b0f95646604e4435… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:59:18 2024 +0200 windowscodecs: Use fully interpreted IDL stubs. --- dlls/windowscodecs/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 511d45170d3..0be0e750dbb 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = windowscodecs IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(PNG_PE_CFLAGS) +EXTRAIDLFLAGS = -Oicf + SOURCES = \ bitmap.c \ bmpdecode.c \

1 0

Yuxuan Shui : shell32: Use full path to current directory for finding executables.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 9bd7fab471eb60f07f59947af0fef3254644a8ae URL: https://gitlab.winehq.org/wine/wine/-/commit/9bd7fab471eb60f07f59947af0fef3… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Mar 25 13:35:08 2024 +0000 shell32: Use full path to current directory for finding executables. So that the path returned by SHELL_FindExecutable would be fully qualified, otherwise CreateProcess will do its own path resolution which is not what we want. --- dlls/shell32/shlexec.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 804aa38a904..9704f9d8f06 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1797,10 +1797,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (*sei_tmp.lpDirectory) { + LPWSTR buf; len = ExpandEnvironmentStringsW(sei_tmp.lpDirectory, NULL, 0); if (len > 0) { - LPWSTR buf; len++; buf = malloc(len * sizeof(WCHAR)); ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buf, len); @@ -1809,6 +1809,18 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) wszDir = buf; sei_tmp.lpDirectory = wszDir; } + + len = GetFullPathNameW(sei_tmp.lpDirectory, 0, NULL, NULL); + if (len > 0) + { + len++; + buf = malloc(len * sizeof(WCHAR)); + GetFullPathNameW(sei_tmp.lpDirectory, len, buf, NULL); + if (wszDir != dirBuffer) + free(wszDir); + wszDir = buf; + sei_tmp.lpDirectory = wszDir; + } } /* Else, try to execute the filename */

1 0

Yuxuan Shui : shell32: Fix a trace log message.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 20f8758e1ffc2257f814a403f1dba029e18831f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/20f8758e1ffc2257f814a403f1dba0… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Mar 25 12:38:39 2024 +0000 shell32: Fix a trace log message. --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f09b6d4daf3..804aa38a904 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -637,7 +637,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, lstrcpyW(xlpFile, lpFile); if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) { - TRACE("SearchPathW returned non-zero\n"); + TRACE("PathResolveAW returned non-zero\n"); lpFile = xlpFile; /* The file was found in lpPath or one of the directories in the system-wide search path */ }

1 0