November 2022 - Wine-Commits

Jason Millard : vbscript: Add support for VT_DISPATCH in Global_TypeName.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 0eff79ec7814763e93e4b9d62aadb96d99e84fad URL: https://gitlab.winehq.org/wine/wine/-/commit/0eff79ec7814763e93e4b9d62aadb9… Author: Jason Millard <jsm174(a)gmail.com> Date: Mon Nov 14 07:48:16 2022 -0500 vbscript: Add support for VT_DISPATCH in Global_TypeName. --- dlls/vbscript/global.c | 16 ++++++++++++++++ dlls/vbscript/tests/api.vbs | 4 ++++ dlls/vbscript/vbregexp.c | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1abfff9b4fe..51c92f6a8a0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2450,6 +2450,10 @@ static HRESULT Global_DatePart(BuiltinDisp *This, VARIANT *arg, unsigned args_cn static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { + ITypeInfo *typeinfo; + BSTR name = NULL; + HRESULT hres; + TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); @@ -2482,6 +2486,18 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn return return_string(res, L"Empty"); case VT_NULL: return return_string(res, L"Null"); + case VT_DISPATCH: + if (SUCCEEDED(IDispatch_GetTypeInfo(V_DISPATCH(arg), 0, GetUserDefaultLCID(), &typeinfo))) + { + hres = ITypeInfo_GetDocumentation(typeinfo, MEMBERID_NIL, &name, NULL, NULL, NULL); + ITypeInfo_Release(typeinfo); + + if (SUCCEEDED(hres) && name && *name) + return return_bstr(res, name); + + SysFreeString(name); + } + return return_string(res, L"Object"); default: FIXME("arg %s not supported\n", debugstr_variant(arg)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 5f7f2aac3bf..0e47f428d09 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1555,6 +1555,10 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) Call ok(TypeName(arr) = "Variant()", "TypeName(arr) = " & TypeName(arr)) Call ok(getVT(TypeName(arr)) = "VT_BSTR", "getVT(TypeName(arr)) = " & getVT(TypeName(arr))) +Call ok(TypeName(collectionObj) = "Object", "TypeName(collectionObj) = " & TypeName(collectionObj)) +Dim regex +set regex = new RegExp +Call ok(TypeName(regex) = "IRegExp2", "TypeName(regex) = " & TypeName(regex)) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 24ce243c645..7232773a3c3 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1140,8 +1140,12 @@ static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); + + *ppTInfo = typeinfos[RegExp2_tid]; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid,

1 0

Hans Leidekker : crypt32/tests: Remove OCSP revoked cert test.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: c1aee64eb2cac4d3832af2fbad473791a4021055 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1aee64eb2cac4d3832af2fbad4737… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 14 15:51:14 2022 +0100 crypt32/tests: Remove OCSP revoked cert test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53919 --- dlls/crypt32/tests/cert.c | 276 ---------------------------------------------- 1 file changed, 276 deletions(-)

1 0

Jinoh Kang : ntdll: Use an acquire/release pair on the IOSB status.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 282120a9c510bdb9aa3976e203437ebc2e28c08b URL: https://gitlab.winehq.org/wine/wine/-/commit/282120a9c510bdb9aa3976e203437e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 12 19:33:58 2022 -0600 ntdll: Use an acquire/release pair on the IOSB status. --- dlls/kernelbase/file.c | 6 +++++- dlls/ntdll/unix/unix_private.h | 26 ++++++++++++++++++++++---- dlls/ws2_32/socket.c | 6 +++++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 661bc0c2778..ac04388acde 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3156,7 +3156,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov TRACE( "(%p %p %p %lu %d)\n", file, overlapped, result, timeout, alertable ); - status = overlapped->Internal; + /* Paired with the write-release in set_async_iosb() in ntdll; see the + * latter for details. */ + status = ReadAcquire( (LONG *)&overlapped->Internal ); if (status == STATUS_PENDING) { if (!timeout) @@ -3173,6 +3175,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov return FALSE; } + /* We don't need to give this load acquire semantics; the wait above + * already guarantees that the IOSB and output buffer are filled. */ status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b94a27aca68..9cf8989fb0d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -367,6 +367,24 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR { if (!iosb) return; + /* GetOverlappedResult() and WSAGetOverlappedResult() expect that if the + * status is written, that the information (and buffer, which was written + * earlier from the async callback) will be available. Hence we need to + * store the status last, with release semantics to ensure that those + * writes are visible. This release is paired with a read-acquire in + * GetOverlappedResult() and WSAGetOverlappedResult(): + * + * CPU 0 (set_async_iosb) CPU 1 (GetOverlappedResultEx) + * =========================== =========================== + * write buffer + * write Information + * WriteRelease(Status) <--------. + * | + * | + * (paired with) `-> ReadAcquire(Status) + * read Information + */ + if (in_wow64_call()) { struct iosb32 @@ -374,18 +392,18 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR NTSTATUS Status; ULONG Information; } *io = wine_server_get_ptr( iosb ); - io->Status = status; io->Information = info; + WriteRelease( &io->Status, status ); } else { IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); + io->Information = info; #ifdef NONAMELESSUNION - io->u.Status = status; + WriteRelease( &io->u.Status, status ); #else - io->Status = status; + WriteRelease( &io->Status, status ); #endif - io->Information = info; } } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9e447f29d8c..09684f25b25 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3710,7 +3710,9 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, return FALSE; } - status = lpOverlapped->Internal; + /* Paired with the write-release in set_async_iosb() in ntdll; see the + * latter for details. */ + status = ReadAcquire( (LONG *)&lpOverlapped->Internal ); if (status == STATUS_PENDING) { if (!fWait) @@ -3722,6 +3724,8 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : SOCKET2HANDLE(s), INFINITE ) == WAIT_FAILED) return FALSE; + /* We don't need to give this load acquire semantics; the wait above + * already guarantees that the IOSB and output buffer are filled. */ status = lpOverlapped->Internal; }

1 0

Erich E. Hoover : ntdll: Add support for FreeBSD style extended attributes.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 71afae901f3c627331bf544e52a5b0e825391b66 URL: https://gitlab.winehq.org/wine/wine/-/commit/71afae901f3c627331bf544e52a5b0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Oct 6 14:21:11 2014 -0600 ntdll: Add support for FreeBSD style extended attributes. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- configure | 6 ++++++ configure.ac | 1 + dlls/ntdll/unix/file.c | 24 +++++++++++++++++++++++- include/config.h.in | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b21cc96dec0..aaebcc553f5 100755 --- a/configure +++ b/configure @@ -8194,6 +8194,12 @@ if test "x$ac_cv_header_sys_event_h" = xyes then : printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "sys/extattr.h" "ac_cv_header_sys_extattr_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_extattr_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_EXTATTR_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default" if test "x$ac_cv_header_sys_filio_h" = xyes diff --git a/configure.ac b/configure.ac index 51a02d3e876..fe6a773d1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -467,6 +467,7 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/epoll.h \ sys/event.h \ + sys/extattr.h \ sys/filio.h \ sys/ipc.h \ sys/link.h \ diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 44ff136c423..e80eb368e8a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -102,6 +102,10 @@ #ifdef HAVE_SYS_XATTR_H #include <sys/xattr.h> #endif +#ifdef HAVE_SYS_EXTATTR_H +#undef XATTR_ADDITIONAL_OPTIONS +#include <sys/extattr.h> +#endif #include <time.h> #include <unistd.h> @@ -171,7 +175,14 @@ typedef struct #define MAX_IGNORED_FILES 4 -#define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB" +#ifndef XATTR_USER_PREFIX +# define XATTR_USER_PREFIX "user." +#endif +#ifndef XATTR_USER_PREFIX_LEN +# define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) +#endif + +#define SAMBA_XATTR_DOS_ATTRIB XATTR_USER_PREFIX "DOSATTRIB" #define XATTR_ATTRIBS_MASK (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM) struct file_identity @@ -371,6 +382,8 @@ static int xattr_fremove( int filedes, const char *name ) # else return fremovexattr( filedes, name ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_delete_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN] ); #else errno = ENOSYS; return -1; @@ -386,6 +399,9 @@ static int xattr_fset( int filedes, const char *name, const void *value, size_t # else return fsetxattr( filedes, name, value, size, 0 ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_set_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; @@ -401,6 +417,9 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si # else return getxattr( path, name, value, size ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_get_file( path, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; @@ -416,6 +435,9 @@ static int xattr_fget( int filedes, const char *name, void *value, size_t size ) # else return fgetxattr( filedes, name, value, size ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_get_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; diff --git a/include/config.h.in b/include/config.h.in index 1cea698f585..3a06d36bd02 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -568,6 +568,9 @@ /* Define to 1 if you have the <sys/event.h> header file. */ #undef HAVE_SYS_EVENT_H +/* Define to 1 if you have the <sys/extattr.h> header file. */ +#undef HAVE_SYS_EXTATTR_H + /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H

1 0

Rémi Bernon : server: Remove no-op raw_msg.foreground release.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 9804210966628c89ce04648c529f9cc3c2b1e8dc URL: https://gitlab.winehq.org/wine/wine/-/commit/9804210966628c89ce04648c529f9c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:44:12 2021 +0200 server: Remove no-op raw_msg.foreground release. It's previously set to NULL and never updated. --- server/queue.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 01fe8d6c060..22f720530b9 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2043,8 +2043,6 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data->rawinput = input->hw.rawinput; enum_processes( queue_rawinput_message, &raw_msg ); - - if (raw_msg.foreground) release_object( raw_msg.foreground ); return; }

1 0

Alex Henrie : include: Include limits.h in stdlib.h.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 7c2af26a620bfeafc6d7fcffc3cda8db2129a570 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c2af26a620bfeafc6d7fcffc3cda8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 22:41:10 2022 -0700 include: Include limits.h in stdlib.h. Needed to compile Tera Term. --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 7c2d7d7f9ad..c52423523f7 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -9,6 +9,7 @@ #define __WINE_STDLIB_H #include <corecrt_wstdlib.h> +#include <limits.h> #include <pshpack8.h>

1 0

Alex Henrie : user32: Use standard C functions for memory allocation in combo.c.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 6d58a94857dd7c3513be7426dc75053f79b4955e URL: https://gitlab.winehq.org/wine/wine/-/commit/6d58a94857dd7c3513be7426dc7505… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:31:18 2022 -0700 user32: Use standard C functions for memory allocation in combo.c. The big win here is getting rid of the reimplementation of strdup. --- dlls/user32/combo.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 5ea61c607be..e03a168b237 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -23,6 +23,7 @@ #define OEMRESOURCE +#include <stdlib.h> #include "user_private.h" #include "controls.h" #include "wine/debug.h" @@ -112,7 +113,7 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) { LPHEADCOMBO lphc; - if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) + if( COMBO_Init() && (lphc = calloc( 1, sizeof(HEADCOMBO) )) ) { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); @@ -154,7 +155,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) NtUserDestroyWindow( lphc->hWndLBox ); SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); + free( lphc ); } return 0; } @@ -641,7 +642,7 @@ static void CBPaintText( size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0); if (size == LB_ERR) FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + if( (pText = malloc((size + 1) * sizeof(WCHAR))) ) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); @@ -736,7 +737,7 @@ static void CBPaintText( if (!hdc_paint) NtUserReleaseDC( lphc->self, hdc ); } - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } /*********************************************************************** @@ -830,7 +831,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); if( length > 0 ) - pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + pText = malloc((length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -838,7 +839,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); @@ -867,7 +868,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) + if( (pText = malloc((length + 1) * sizeof(WCHAR))) ) { SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); } @@ -884,7 +885,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } /*********************************************************************** @@ -1295,7 +1296,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPWSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + WCHAR *lpBuffer = malloc((length + 1) * sizeof(WCHAR)); if (!lpBuffer) goto error; length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1305,7 +1306,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) lstrcpynW( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + free(lpBuffer); } else length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf); @@ -1345,7 +1346,7 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) ); + char *lpBuffer = malloc(length + 1); if (!lpBuffer) goto error; length = SendMessageA(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1355,7 +1356,7 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) lstrcpynA( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + free(lpBuffer); } else length = SendMessageA(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf); @@ -1678,19 +1679,6 @@ static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) return TRUE; } -static char *strdupA(LPCSTR str) -{ - char *ret; - DWORD len; - - if(!str) return NULL; - - len = strlen(str); - ret = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(ret, str, len + 1); - return ret; -} - /*********************************************************************** * ComboWndProc_common */ @@ -1927,18 +1915,18 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) { - string = strdupA((LPSTR)lParam); + string = strdup((char *)lParam); CharLowerA(string); } else if( lphc->dwStyle & CBS_UPPERCASE ) { - string = strdupA((LPSTR)lParam); + string = strdup((char *)lParam); CharUpperA(string); } ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); - HeapFree(GetProcessHeap(), 0, string); + free(string); return ret; } case CB_INSERTSTRING:

1 0

Alex Henrie : include: Add IN6ADDR_*_INIT to ws2ipdef.h.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: dc7f972896caf84e68f7d95bad2f506c7700640b URL: https://gitlab.winehq.org/wine/wine/-/commit/dc7f972896caf84e68f7d95bad2f50… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:21:53 2022 -0700 include: Add IN6ADDR_*_INIT to ws2ipdef.h. --- include/ws2ipdef.h | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index adc534dcb32..51d4c9f5ac2 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -337,13 +337,43 @@ typedef struct WS(in6_pktinfo) { #ifndef USE_WS_PREFIX #define INET_ADDRSTRLEN 22 #define INET6_ADDRSTRLEN 65 -#define IN6ADDR_ANY_INIT { 0 } -#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_6BONETESTPREFIX_INIT { 0x3f,0xfe,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_6TO4PREFIX_INIT { 0x20,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } +#define IN6ADDR_ALLNODESONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_ALLNODESONNODE_INIT { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_ALLROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } +#define IN6ADDR_ANY_INIT { 0 } +#define IN6ADDR_LINKLOCALPREFIX_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_MULTICASTPREFIX_INIT { 0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_SITELOCALPREFIX_INIT { 0xfe,0xc0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0x01,0xff,0,0,0 } +#define IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0xff,0xff,0xff,0xff,0xff,0xfe } +#define IN6ADDR_TEREDOPREFIX_INIT { 0x20,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_TEREDOPREFIX_INIT_OLD { 0x3f,0xfe,0x83,0x1f,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_ULAPREFIX_INIT { 0xfc,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_V4MAPPEDPREFIX_INIT { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0,0,0,0 } #else #define WS_INET_ADDRSTRLEN 22 #define WS_INET6_ADDRSTRLEN 65 -#define WS_IN6ADDR_ANY_INIT { 0 } -#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_6BONETESTPREFIX_INIT { 0x3f,0xfe,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_6TO4PREFIX_INIT { 0x20,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } +#define WS_IN6ADDR_ALLNODESONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_ALLNODESONNODE_INIT { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_ALLROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } +#define WS_IN6ADDR_ANY_INIT { 0 } +#define WS_IN6ADDR_LINKLOCALPREFIX_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_MULTICASTPREFIX_INIT { 0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_SITELOCALPREFIX_INIT { 0xfe,0xc0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0x01,0xff,0,0,0 } +#define WS_IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0xff,0xff,0xff,0xff,0xff,0xfe } +#define WS_IN6ADDR_TEREDOPREFIX_INIT { 0x20,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_TEREDOPREFIX_INIT_OLD { 0x3f,0xfe,0x83,0x1f,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_ULAPREFIX_INIT { 0xfc,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_V4MAPPEDPREFIX_INIT { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0,0,0,0 } #endif /* USE_WS_PREFIX */ #define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port)

1 0

Alex Henrie : ws2_32: Add in[46]addr_* constants to import library.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: a17f55f28748e38a9d48d6bdb7d68be5d95cd044 URL: https://gitlab.winehq.org/wine/wine/-/commit/a17f55f28748e38a9d48d6bdb7d68b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:21:53 2022 -0700 ws2_32: Add in[46]addr_* constants to import library. Needed to compile Tera Term. --- dlls/ws2_32/Makefile.in | 1 + dlls/ws2_32/inaddr.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2ipdef.h | 26 +++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 83ae5e915ae..c303e73d9c8 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -5,6 +5,7 @@ DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 C_SRCS = \ async.c \ + inaddr.c \ protocol.c \ socket.c \ unixlib.c diff --git a/dlls/ws2_32/inaddr.c b/dlls/ws2_32/inaddr.c new file mode 100644 index 00000000000..f226908d02c --- /dev/null +++ b/dlls/ws2_32/inaddr.c @@ -0,0 +1,52 @@ +/* + * ws2_32 static library constants + * + * Copyright 2022 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep implib +#endif + +#include "winsock2.h" +#include "mstcpip.h" +#include "ws2ipdef.h" + +const IN_ADDR in4addr_alligmpv3routersonlink = {{ IN4ADDR_ALLIGMPV3ROUTERSONLINK_INIT }}; +const IN_ADDR in4addr_allnodesonlink = {{ IN4ADDR_ALLNODESONLINK_INIT }}; +const IN_ADDR in4addr_allroutersonlink = {{ IN4ADDR_ALLROUTERSONLINK_INIT }}; +const IN_ADDR in4addr_allteredohostsonlink = {{ IN4ADDR_ALLTEREDONODESONLINK_INIT }}; +const IN_ADDR in4addr_any = {{ IN4ADDR_ANY_INIT }}; +const IN_ADDR in4addr_broadcast = {{ IN4ADDR_BROADCAST_INIT }}; +const IN_ADDR in4addr_linklocalprefix = {{ IN4ADDR_LINKLOCALPREFIX_INIT }}; +const IN_ADDR in4addr_loopback = {{ IN4ADDR_LOOPBACK_INIT }}; +const IN_ADDR in4addr_multicastprefix = {{ IN4ADDR_MULTICASTPREFIX_INIT }}; + +const IN6_ADDR in6addr_6to4prefix = {{ IN6ADDR_6TO4PREFIX_INIT }}; +const IN6_ADDR in6addr_allmldv2routersonlink = {{ IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT }}; +const IN6_ADDR in6addr_allnodesonlink = {{ IN6ADDR_ALLNODESONLINK_INIT }}; +const IN6_ADDR in6addr_allnodesonnode = {{ IN6ADDR_ALLNODESONNODE_INIT }}; +const IN6_ADDR in6addr_allroutersonlink = {{ IN6ADDR_ALLROUTERSONLINK_INIT }}; +const IN6_ADDR in6addr_any = {{ IN6ADDR_ANY_INIT }}; +const IN6_ADDR in6addr_linklocalprefix = {{ IN6ADDR_LINKLOCALPREFIX_INIT }}; +const IN6_ADDR in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }}; +const IN6_ADDR in6addr_multicastprefix = {{ IN6ADDR_MULTICASTPREFIX_INIT }}; +const IN6_ADDR in6addr_solicitednodemulticastprefix = {{ IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT }}; +const IN6_ADDR in6addr_teredoinitiallinklocaladdress = {{ IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT }}; +const IN6_ADDR in6addr_teredoprefix = {{ IN6ADDR_TEREDOPREFIX_INIT }}; +const IN6_ADDR in6addr_teredoprefix_old = {{ IN6ADDR_TEREDOPREFIX_INIT_OLD }}; +const IN6_ADDR in6addr_v4mappedprefix = {{ IN6ADDR_V4MAPPEDPREFIX_INIT }}; diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 51d4c9f5ac2..fcb1f56c005 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -386,6 +386,32 @@ typedef struct WS(in6_pktinfo) { #define WS_SIO_IDEAL_SEND_BACKLOG_QUERY WS__IOR('t', 123, ULONG) #endif +#ifndef USE_WS_PREFIX +extern const IN_ADDR in4addr_alligmpv3routersonlink; +extern const IN_ADDR in4addr_allnodesonlink; +extern const IN_ADDR in4addr_allroutersonlink; +extern const IN_ADDR in4addr_allteredohostsonlink; +extern const IN_ADDR in4addr_any; +extern const IN_ADDR in4addr_broadcast; +extern const IN_ADDR in4addr_linklocalprefix; +extern const IN_ADDR in4addr_loopback; +extern const IN_ADDR in4addr_multicastprefix; +extern const IN6_ADDR in6addr_6to4prefix; +extern const IN6_ADDR in6addr_allmldv2routersonlink; +extern const IN6_ADDR in6addr_allnodesonlink; +extern const IN6_ADDR in6addr_allnodesonnode; +extern const IN6_ADDR in6addr_allroutersonlink; +extern const IN6_ADDR in6addr_any; +extern const IN6_ADDR in6addr_linklocalprefix; +extern const IN6_ADDR in6addr_loopback; +extern const IN6_ADDR in6addr_multicastprefix; +extern const IN6_ADDR in6addr_solicitednodemulticastprefix; +extern const IN6_ADDR in6addr_teredoinitiallinklocaladdress; +extern const IN6_ADDR in6addr_teredoprefix; +extern const IN6_ADDR in6addr_teredoprefix_old; +extern const IN6_ADDR in6addr_v4mappedprefix; +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Eric Pouech : cmd: Don't write outside of variable array.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 8f1febc43019af11c606cb4a5207be999f5ecefc URL: https://gitlab.winehq.org/wine/wine/-/commit/8f1febc43019af11c606cb4a5207be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Nov 13 15:31:27 2022 +0100 cmd: Don't write outside of variable array. GCC 12.2 rightfully complains about an out-of-founds array access. This can possibly happen for unsupported variable names. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 82008c3ec7a..4856b619812 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2025,7 +2025,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /* Execute the body of the foor loop with these values */ - if (forloopcontext.variable[varidx] && forloopcontext.variable[varidx][0] != forf_eol) { + if (varidx >= 0 && forloopcontext.variable[varidx] && forloopcontext.variable[varidx][0] != forf_eol) { CMD_LIST *thisCmdStart = cmdStart; *doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, FALSE, TRUE);

1 0