April 2022 - Wine-commits - list.winehq.org

Gerald Pfeifer : configure: Diagnose if NetAPI is not present.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 71dc3ca16ecf778b0b38a801c8a967ce491b70f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71dc3ca16ecf778b0b38a801… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 23 21:07:18 2021 +0100 configure: Diagnose if NetAPI is not present. For most other configure options we are warning when some dependency is not present, in particular when it's been explicitly requested. Also do this for Samba NetAPI now. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 07c9dd9bdf560f86598aa496a0ffaec6bb8479fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 11 +++++++++++ configure.ac | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/configure b/configure index 9931d53d463..ef010a831af 100755 --- a/configure +++ b/configure @@ -16460,6 +16460,17 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi +if test "x$ac_cv_lib_soname_netapi" != xyes +then : + case "x$with_netapi" in + x) as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;; + xno) ;; + *) as_fn_error $? "libnetapi not found, Samba NetAPI won't be supported. +This is an error since --with-netapi was requested." "$LINENO" 5 ;; +esac +enable_netapi=${enable_netapi:-no} +fi + if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono diff --git a/configure.ac b/configure.ac index 9cf059e1edc..e4c9c7edfef 100644 --- a/configure.ac +++ b/configure.ac @@ -1930,6 +1930,10 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes], + [libnetapi not found, Samba NetAPI won't be supported.], + [enable_netapi]) + dnl **** Check for any sound system **** if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \

1 0

Alexandre Julliard : configure: Fix the netapi check.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 795035c0ecfb983b1cb12c46419d531a9dfb4651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795035c0ecfb983b1cb12c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 16:54:07 2021 +0100 configure: Fix the netapi check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13a3340bc22b85f7294dfb72d9bc2410b804ce16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ef010a831af..50f9fce99b2 100755 --- a/configure +++ b/configure @@ -16460,7 +16460,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_soname_netapi" != xyes +if test "x$ac_cv_lib_soname_netapi" = "x" then : case "x$with_netapi" in x) as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;; diff --git a/configure.ac b/configure.ac index e4c9c7edfef..32d3e5c5441 100644 --- a/configure.ac +++ b/configure.ac @@ -1930,7 +1930,7 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi -WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes], +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" = "x"], [libnetapi not found, Samba NetAPI won't be supported.], [enable_netapi])

1 0

Louis Lenders : wsdapi: Add stub for WSDCreateDiscoveryProvider.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: ce23d7aa449b63606f6aec003097210611d3fa15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce23d7aa449b63606f6aec00… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Dec 7 19:22:03 2021 +0100 wsdapi: Add stub for WSDCreateDiscoveryProvider. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52173 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03f06598052e716178c41ef9203a8506122873f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/discovery.c | 7 ++++++ dlls/wsdapi/wsdapi.spec | 2 +- include/wsddisco.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index fcbdfef2ab2..708cb803d03 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -470,3 +470,10 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover return S_OK; } + +HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider) +{ + FIXME("(%p, %p) stub\n", context, provider); + + return E_NOTIMPL; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 95ee072a1cf..d7465458dd5 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -15,7 +15,7 @@ @ stub WSDCreateDeviceProxy @ stub WSDCreateDeviceProxyAdvanced @ stub WSDCreateDiscoveryProvider2 -@ stub WSDCreateDiscoveryProvider +@ stdcall WSDCreateDiscoveryProvider(ptr ptr) @ stub WSDCreateDiscoveryPublisher2 @ stdcall WSDCreateDiscoveryPublisher(ptr ptr) @ stub WSDCreateHttpAddress diff --git a/include/wsddisco.idl b/include/wsddisco.idl index 50d2198cea7..bbeff522a85 100644 --- a/include/wsddisco.idl +++ b/include/wsddisco.idl @@ -24,6 +24,9 @@ interface IWSDScopeMatchingRule; interface IWSDiscoveryPublisherNotify; interface IWSDiscoveryPublisher; interface IWSDXMLContext; +interface IWSDiscoveryProvider; +interface IWSDiscoveryProviderNotify; +interface IWSDiscoveredService; [ uuid(fcafe424-fef5-481a-bd9f-33ce0574256f), @@ -38,6 +41,62 @@ interface IWSDScopeMatchingRule : IUnknown HRESULT MatchScopes([in] LPCWSTR pszScope1, [in] LPCWSTR pszScope2, [out] BOOL *pfMatch); } +[ +uuid(73ee3ced-b6e6-4329-a546-3e8ad46563d2), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProviderNotify : IUnknown +{ + HRESULT Add([in] IWSDiscoveredService *service); + HRESULT Remove([in] IWSDiscoveredService *service); + HRESULT SearchFailed([in] HRESULT hr,[in, optional] LPCWSTR tag); + HRESULT SearchComplete([in, optional] LPCWSTR tag); +} + +[ +uuid(4bad8a3b-b374-4420-9632-aac945b374aa), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveredService : IUnknown +{ + HRESULT GetEndpointReference([out] WSD_ENDPOINT_REFERENCE **endpoint_reference); + HRESULT GetTypes([out] WSD_NAME_LIST **types_list); + HRESULT GetScopes([out] WSD_URI_LIST **scopes_list); + HRESULT GetXAddrs([out] WSD_URI_LIST **x_addrs_list); + HRESULT GetMetadataVersion([out] ULONGLONG *metadata_version); + HRESULT GetExtendedDiscoXML([out] WSDXML_ELEMENT **header_any,[out] WSDXML_ELEMENT **body_any); + HRESULT GetProbeResolveTag([out] LPCWSTR *tag); + HRESULT GetRemoteTransportAddress([out] LPCWSTR *remote_transport_address); + HRESULT GetLocalTransportAddress([out] LPCWSTR *local_transport_address); + HRESULT GetLocalInterfaceGUID([out] GUID *guid); + HRESULT GetInstanceId([out] ULONGLONG *instance_id); +} + +[ +uuid (8ffc8e55-f0eb-480f-88b7-b435dd281d45), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryProvider : IUnknown +{ + HRESULT SetAddressFamily([in] DWORD address_family); + HRESULT Attach([in] IWSDiscoveryProviderNotify *sink); + HRESULT Detach(void); + HRESULT SearchById([in] LPCWSTR id,[in, optional] LPCWSTR tag); + HRESULT SearchByAddress([in] LPCWSTR address,[in, optional] LPCWSTR tag); + HRESULT SearchByType([in, optional] const WSD_NAME_LIST *types_list, \ + [in, optional] const WSD_URI_LIST *scopes_list,[in, optional] LPCWSTR match_by,[in, optional] LPCWSTR tag); + HRESULT GetXMLContext([out] IWSDXMLContext **context); +} + [ uuid(e67651b0-337a-4b3c-9758-733388568251), object, @@ -104,4 +163,5 @@ interface IWSDiscoveryPublisher : IUnknown HRESULT GetXMLContext([out] IWSDXMLContext **ppContext); } +cpp_quote("HRESULT WINAPI WSDCreateDiscoveryProvider(IWSDXMLContext *context, IWSDiscoveryProvider **provider);") cpp_quote("HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext* pContext, IWSDiscoveryPublisher **ppPublisher);")

1 0

Christian Costa : d3dx9: Also check for a valid alpha channel for TGA images.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 19acdd0c3576fcef3df76997b73cd99cc0f54134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19acdd0c3576fcef3df76997… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 10 20:03:40 2021 +0100 d3dx9: Also check for a valid alpha channel for TGA images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48631 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46f08b169bc58f2ebb29f2bda843401bf2370930) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 362113386ea..c3f9f84a789 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -895,7 +895,8 @@ static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *in BYTE *buffer; HRESULT hr; - if (info->Format != D3DFMT_X8R8G8B8 || info->ImageFileFormat != D3DXIFF_BMP) + if (info->Format != D3DFMT_X8R8G8B8 || (info->ImageFileFormat != D3DXIFF_BMP + && info->ImageFileFormat != D3DXIFF_TGA)) return FALSE; size = info->Width * info->Height * 4;

1 0

Hugh McMaster : conhost: Process Ctrl-M key input.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 6e7f753c158aa2b6537bdeaf8e9dfc722248406d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7f753c158aa2b6537bdeaf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 14 22:43:15 2021 +1100 conhost: Process Ctrl-M key input. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50526 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 12cf3459b5ae561f012b4c47dd4775c428d026e6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fbee37d9c01..0a792251fd7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1107,6 +1107,7 @@ static const struct edit_line_key_entry win32_key_map_ctrl[] = { VK_RIGHT, edit_line_move_right_word }, { VK_END, edit_line_kill_suffix }, { VK_HOME, edit_line_kill_prefix }, + { 'M', edit_line_done }, { 0 } };

1 0

Rémi Bernon : ntdll: Use the unrolled memset from msvcrt.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 6d98de6889d641fc05dc17988df57ac30517f56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d98de6889d641fc05dc1798… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:44:30 2021 +0200 ntdll: Use the unrolled memset from msvcrt. Although less frequently used, heap allocations are zeroed out with ntdll memset and they don't benefit from the msvcrt memset optimisation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a602bdd326cf09b9c77ecbd4cb59af3c32bf2ecd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/string.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index f1cea6caa83..cd4f3c6a8a2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdint.h> #include "windef.h" #include "winbase.h" @@ -140,13 +141,72 @@ void * __cdecl memmove( void *dst, const void *src, size_t n ) } +static inline void memset_aligned_32( unsigned char *d, uint64_t v, size_t n ) +{ + unsigned char *end = d + n; + while (d < end) + { + *(uint64_t *)(d + 0) = v; + *(uint64_t *)(d + 8) = v; + *(uint64_t *)(d + 16) = v; + *(uint64_t *)(d + 24) = v; + d += 32; + } +} + /********************************************************************* * memset (NTDLL.@) */ -void * __cdecl memset( void *dst, int c, size_t n ) +void *__cdecl memset( void *dst, int c, size_t n ) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; + typedef uint64_t DECLSPEC_ALIGN(1) unaligned_ui64; + typedef uint32_t DECLSPEC_ALIGN(1) unaligned_ui32; + typedef uint16_t DECLSPEC_ALIGN(1) unaligned_ui16; + + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + if (n >= 16) + { + *(unaligned_ui64 *)(d + 0) = v; + *(unaligned_ui64 *)(d + 8) = v; + *(unaligned_ui64 *)(d + n - 16) = v; + *(unaligned_ui64 *)(d + n - 8) = v; + if (n <= 32) return dst; + *(unaligned_ui64 *)(d + 16) = v; + *(unaligned_ui64 *)(d + 24) = v; + *(unaligned_ui64 *)(d + n - 32) = v; + *(unaligned_ui64 *)(d + n - 24) = v; + if (n <= 64) return dst; + + n = (n - a) & ~0x1f; + memset_aligned_32( d + a, v, n ); + return dst; + } + if (n >= 8) + { + *(unaligned_ui64 *)d = v; + *(unaligned_ui64 *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(unaligned_ui32 *)d = v; + *(unaligned_ui32 *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(unaligned_ui16 *)d = v; + *(unaligned_ui16 *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; }

1 0

Alexandre Julliard : krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 2e51da6f1645394ccb7764a7f6b4b83439e3061e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e51da6f1645394ccb7764a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 12 17:57:55 2021 +0100 krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages. GlobalSize() uses the selector limit and that needs to match the allocated size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52082 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1c5e4d066f6cfd65cc5ad729ce6e8aff53e20939) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/global.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 0a8da28e99b..2eb02b8cef3 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -196,6 +196,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha { void *ptr; HGLOBAL16 handle; + DWORD align = 0x1f; TRACE("%d flags=%04x\n", size, flags ); @@ -205,8 +206,9 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha /* Fixup the size */ - if (size >= GLOBAL_MAX_ALLOC_SIZE - 0x1f) return 0; - size = (size + 0x1f) & ~0x1f; + if (size > 0x100000) align = 0xfff; /* selector limit will be in pages */ + if (size >= GLOBAL_MAX_ALLOC_SIZE - align) return 0; + size = (size + align) & ~align; /* Allocate the linear memory */ ptr = HeapAlloc( get_win16_heap(), 0, size );

1 0

Bernhard Übelacker : hhctrl.ocx: Handle only the number of bytes given in html_fragment_len.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 6766fb687ff3fcb344496ad7e81c9bb5f8933117 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6766fb687ff3fcb344496ad7… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jul 6 14:23:13 2021 +0200 hhctrl.ocx: Handle only the number of bytes given in html_fragment_len. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39699 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e3b28631485a010219928a888fcc543a5bb3c61d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/help.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 06f73358f44..e9957a86e73 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1898,14 +1898,14 @@ WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_p while(1) { symbol = 0; - amp = strchr(h, '&'); + amp = memchr(h, '&', html_fragment + html_fragment_len - h); if(!amp) break; len = amp-h; /* Copy the characters prior to the HTML encoded character */ memcpy(&tmp[tmp_len], h, len); tmp_len += len; amp++; /* skip ampersand */ - sem = strchr(amp, ';'); + sem = memchr(amp, ';', html_fragment + html_fragment_len - amp); /* Require a semicolon after the ampersand */ if(!sem) {

1 0

Connor McAdams : winex11.drv: Add mutable pixel format awareness.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 19de448df69189d6eba1b252818d13202627159c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19de448df69189d6eba1b252… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Apr 20 13:43:50 2021 -0400 winex11.drv: Add mutable pixel format awareness. Add the ability to check if the pixel format on the current window was previously set by wglSetPixelFormatWine(), and if was, allow the application to change it with a regular wglSetPixelFormat call. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6d04e6c3a9c4c8b1cc2d1ba337c33cc56d1a8ab2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4a3ab31273a..3de80eb0c6a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -248,6 +248,7 @@ struct gl_drawable SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ int swap_interval; BOOL refresh_swap_interval; + BOOL mutable_pf; }; enum glx_swap_control_method @@ -1305,7 +1306,8 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL known_child ) +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL known_child, + BOOL mutable_pf ) { struct gl_drawable *gl, *prev; XVisualInfo *visual = format->visual; @@ -1325,6 +1327,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->refresh_swap_interval = TRUE; gl->format = format; gl->ref = 1; + gl->mutable_pf = mutable_pf; if (!known_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ { @@ -1383,13 +1386,13 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel /*********************************************************************** * set_win_format */ -static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) +static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BOOL mutable_pf ) { struct gl_drawable *gl; if (!format->visual) return FALSE; - if (!(gl = create_gl_drawable( hwnd, format, FALSE ))) return FALSE; + if (!(gl = create_gl_drawable( hwnd, format, FALSE, mutable_pf ))) return FALSE; TRACE( "created GL drawable %lx for win %p %s\n", gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); @@ -1436,12 +1439,14 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) if ((gl = get_gl_drawable( hwnd, hdc ))) { int prev = pixel_format_index( gl->format ); + BOOL mutable_pf = gl->mutable_pf; release_gl_drawable( gl ); - return prev == format; /* cannot change it if already set */ + if (!mutable_pf) + return prev == format; /* cannot change it if already set */ } } - return set_win_format( hwnd, fmt ); + return set_win_format( hwnd, fmt, allow_change ); } @@ -1460,7 +1465,7 @@ void sync_gl_drawable( HWND hwnd, BOOL known_child ) if (!known_child) break; /* Still a childless top-level window */ /* fall through */ case DC_GL_PIXMAP_WIN: - if (!(new = create_gl_drawable( hwnd, old->format, known_child ))) break; + if (!(new = create_gl_drawable( hwnd, old->format, known_child, old->mutable_pf ))) break; mark_drawable_dirty( old, new ); XFlush( gdi_display ); TRACE( "Recreated GL drawable %lx to replace %lx\n", new->drawable, old->drawable ); @@ -1497,7 +1502,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) return; } - if ((new = create_gl_drawable( hwnd, old->format, FALSE ))) + if ((new = create_gl_drawable( hwnd, old->format, FALSE, old->mutable_pf ))) { mark_drawable_dirty( old, new ); release_gl_drawable( new );

1 0

Eric Pouech : cmd: Don't crash on 'if exist' without parameter.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 3bff9ccfa42613f24fe5bbedf1e80624f2570429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bff9ccfa42613f24fe5bbed… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 20 10:29:01 2021 +0100 cmd: Don't crash on 'if exist' without parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51598 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 535da77552deb74198f0fe8fedae3bbab5115ad7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3f9465320c1..d8e5d061bd4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2815,8 +2815,9 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); + if (!len) goto syntax_err; /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (len && param[len-1] == '\\') lstrcatW(param, L"."); + if (param[len-1] == '\\') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE );

1 0