August 2022 - Wine-Commits - list.winehq.org

Jacek Caban : wineandroid: Use RtlSetLastWin32Error.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 7ea592e5fe63bf231f479c184c387ebc64db7151 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ea592e5fe63bf231f479c184c387e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:05 2022 +0200 wineandroid: Use RtlSetLastWin32Error. --- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/opengl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 4ddc66e73e8..738b8943175 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -312,7 +312,7 @@ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, D if (n > 0) { TRACE( "mode %d -- not present\n", n ); - SetLastError( ERROR_NO_MORE_FILES ); + RtlSetLastWin32Error( ERROR_NO_MORE_FILES ); return FALSE; } diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 911f6e3f3d1..337486ba6be 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -363,7 +363,7 @@ static BOOL android_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct goto done; } } - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); done: release_gl_drawable( read_gl ); @@ -382,7 +382,7 @@ static BOOL android_wglSwapIntervalEXT( int interval ) if (interval < 0) { - SetLastError(ERROR_INVALID_DATA); + RtlSetLastWin32Error( ERROR_INVALID_DATA ); return FALSE; } @@ -391,7 +391,7 @@ static BOOL android_wglSwapIntervalEXT( int interval ) if (ret) swap_interval = interval; else - SetLastError( ERROR_DC_NOT_FOUND ); + RtlSetLastWin32Error( ERROR_DC_NOT_FOUND ); return ret; } @@ -553,7 +553,7 @@ static BOOL WINAPI android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx ) goto done; } } - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); done: release_gl_drawable( gl );

1 0

Zebediah Figura : winhttp: Don't make a copy of the string in add_request_headers().
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 7cd30faabee03ffc982b6e1ff2c0be9aa75c2418 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd30faabee03ffc982b6e1ff2c0be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 18:23:56 2022 -0500 winhttp: Don't make a copy of the string in add_request_headers(). --- dlls/winhttp/request.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e846676041e..9f769f3dc35 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -455,23 +455,20 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD len, DWORD flags ) { DWORD ret = ERROR_WINHTTP_INVALID_HEADER; - WCHAR *buffer, *p, *q; struct header *header; + const WCHAR *p, *q; if (len == ~0u) len = lstrlenW( headers ); if (!len) return ERROR_SUCCESS; - if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; - memcpy( buffer, headers, len * sizeof(WCHAR) ); - buffer[len] = 0; - p = buffer; + p = headers; do { const WCHAR *end; - if (!*p) break; + if (p >= headers + len) break; - for (q = p; *q && *q != '\r' && *q != '\n'; ++q) + for (q = p; q < headers + len && *q != '\r' && *q != '\n'; ++q) ; end = q; while (*q == '\r' || *q == '\n') @@ -485,7 +482,6 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = q; } while (!ret); - free( buffer ); return ret; }

1 0

Jacek Caban : include: Use RtlSetLastWin32Error in server.h.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 2f0c2684b274d39197f8e85dc9ff64b8c6b31e5e URL: https://gitlab.winehq.org/wine/wine/-/commit/2f0c2684b274d39197f8e85dc9ff64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:58 2022 +0200 include: Use RtlSetLastWin32Error in server.h. --- include/wine/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/server.h b/include/wine/server.h index b05271b7522..228682dc914 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -57,7 +57,7 @@ extern NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int acce static inline unsigned int wine_server_call_err( void *req_ptr ) { unsigned int res = wine_server_call( req_ptr ); - if (res) SetLastError( RtlNtStatusToDosError(res) ); + if (res) RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); return res; }

1 0

Jacek Caban : win32u: Use RtlSetLastWin32Error.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 1dfedae9030b18d6648d48fe613a1ade2af382e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1dfedae9030b18d6648d48fe613a1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:49:50 2022 +0200 win32u: Use RtlSetLastWin32Error. --- dlls/win32u/bitblt.c | 8 ++-- dlls/win32u/bitmap.c | 12 +++--- dlls/win32u/class.c | 24 +++++------ dlls/win32u/clipboard.c | 14 +++--- dlls/win32u/cursoricon.c | 6 +-- dlls/win32u/dc.c | 6 +-- dlls/win32u/dce.c | 6 +-- dlls/win32u/defwnd.c | 4 +- dlls/win32u/dib.c | 10 ++--- dlls/win32u/driver.c | 4 +- dlls/win32u/font.c | 16 +++---- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/hook.c | 16 +++---- dlls/win32u/imm.c | 4 +- dlls/win32u/input.c | 32 +++++++------- dlls/win32u/menu.c | 38 ++++++++-------- dlls/win32u/message.c | 32 +++++++------- dlls/win32u/painting.c | 2 +- dlls/win32u/path.c | 28 ++++++------ dlls/win32u/pen.c | 4 +- dlls/win32u/rawinput.c | 44 +++++++++---------- dlls/win32u/spy.c | 8 ++-- dlls/win32u/sysparams.c | 16 +++---- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 100 +++++++++++++++++++++---------------------- dlls/win32u/winstation.c | 18 ++++---- 26 files changed, 228 insertions(+), 228 deletions(-)

1 0

Zebediah Figura : winhttp: Pass a length to parse_header().
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 6a84877cc204c86b3b0d034accbb2806418f73e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a84877cc204c86b3b0d034accbb28… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 18:20:23 2022 -0500 winhttp: Pass a length to parse_header(). --- dlls/winhttp/request.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2331c30b58c..e846676041e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -286,7 +286,7 @@ static BOOL valid_token_char( WCHAR c ) } } -static struct header *parse_header( const WCHAR *string ) +static struct header *parse_header( const WCHAR *string, size_t string_len ) { const WCHAR *p, *q; struct header *header; @@ -324,7 +324,7 @@ static struct header *parse_header( const WCHAR *string ) q++; /* skip past colon */ while (*q == ' ') q++; - len = lstrlenW( q ); + len = (string + string_len) - q; if (!(header->value = malloc( (len + 1) * sizeof(WCHAR) ))) { @@ -467,15 +467,17 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = buffer; do { + const WCHAR *end; + if (!*p) break; for (q = p; *q && *q != '\r' && *q != '\n'; ++q) ; - *q++ = 0; + end = q; while (*q == '\r' || *q == '\n') ++q; - if ((header = parse_header( p ))) + if ((header = parse_header( p, end - p ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); free_header( header ); @@ -2559,6 +2561,7 @@ static DWORD read_reply( struct request *request ) for (;;) { struct header *header; + int lenW; buflen = MAX_REPLY_LEN; if (read_line( request, buffer, &buflen )) return ERROR_SUCCESS; @@ -2576,9 +2579,9 @@ static DWORD read_reply( struct request *request ) memcpy( raw_headers + offset, L"\r\n", sizeof(L"\r\n") ); break; } - MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); + lenW = MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); - if (!(header = parse_header( raw_headers + offset ))) break; + if (!(header = parse_header( raw_headers + offset, lenW - 1 ))) break; if ((ret = process_header( request, header->field, header->value, WINHTTP_ADDREQ_FLAG_ADD, FALSE ))) { free_header( header );

1 0

Nikolay Sivov : dwrite/fallback: Fill in some more fallback ranges for various scripts.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 1795fd7af9a4d600e38dd20436595d8d14a26350 URL: https://gitlab.winehq.org/wine/wine/-/commit/1795fd7af9a4d600e38dd20436595d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:26:54 2022 +0300 dwrite/fallback: Fill in some more fallback ranges for various scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ccce2c63976..c528ccf7001 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -228,6 +228,12 @@ system_fallback_config[] = "08A0-08FF, FB50-FDCF, " "FDF0-FDFF, FE70-FEFE", L"Noto Sans Arabic" }, + { "0700-074F", L"Noto Sans Syriac" }, + { "0780-07BF", L"Noto Sans Thaana" }, + { "07C0-07FF", L"Noto Sans NKo" }, + { "0800-083F", L"Noto Sans Samaritan" }, + { "0840-085F", L"Noto Sans Mandaic" }, + { "0900-097F", L"Noto Sans Devanagari" }, { "0980-09FF", L"Noto Sans Bengali" }, { "0A00-0A7F", L"Noto Sans Gurmukhi" }, @@ -242,12 +248,53 @@ system_fallback_config[] = { "0E00-0E7F", L"Noto Sans Thai" }, { "0E80-0EFF", L"Noto Sans Lao" }, + { "0F00-0FFF", L"Noto Serif Tibetan" }, + + { "1000-109F, A9E0-A9FF, AA60-AA7F", L"Noto Sans Myanmar" }, + + /* Hangul Jamo - 1100-11FF + Hangul Compatibility Jamo - 3130-318F + Enc. CJK (Paren Hangul) - 3200-321F + Enc. CJK (Circled Hangul) - 3260-327F + Hangul Jamo Extended-A - A960-A97F + Hangul Syllables - AC00-D7AF + Hangul Jamo Extended-B - D7B0-D7FF */ + + { "1100-11FF, 3130-318F, " + "3200-321F, 3260-327F, " + "A960-A97F, AC00-D7FF, " + "D7B0-D7FF", L"Noto Sans CJK KR" }, + { "1680-169F", L"Noto Sans Ogham" }, { "16A0-16FF", L"Noto Sans Runic" }, + { "1700-171F", L"Noto Sans Tagalog" }, + { "1720-173F", L"Noto Sans Hanunoo" }, + { "1740-175F", L"Noto Sans Buhid" }, + { "1760-177F", L"Noto Sans Tagbanwa" }, { "1800-18AF, 11660-1167F", L"Noto Sans Mongolian" }, + { "1900-194F", L"Noto Sans Limbu" }, + { "1950-197F", L"Noto Sans Tai Le" }, + { "1980-19DF", L"Noto Sans New Tai Lue" }, + { "1A00-1A1F", L"Noto Sans Buginese" }, + { "1A20-1AAF", L"Noto Sans Tai Tham" }, + { "1B00-1B7F", L"Noto Sans Balinese" }, + { "1B80-1BBF, 1CC0-1CCF", L"Noto Sans Sundanes" }, + { "1BC0-1BFF", L"Noto Sans Batak" }, + { "1C00-1C4F", L"Noto Sans Lepcha" }, + { "1C50-1C7F", L"Noto Sans Ol Chiki" }, + + { "2C80-2CFF", L"Noto Sans Coptic" }, + { "2D30-2D7F", L"Noto Sans Tifinagh" }, + + /* CJK Radicals Supplement - 2E80-2EFF */ + + { "2E80-2EFF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "2E80-2EFF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "2E80-2EFF", L"Noto Sans CJK KR", L"ko" }, + /* CJK Symbols and Punctuation - 3000-303F Hiragana - 3040-309F Katakana - 30A0-30FF @@ -266,6 +313,18 @@ system_fallback_config[] = { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK KR", L"ko" }, { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK JP" }, + { "A000-A4CF", L"Noto Sans Yi" }, + { "A4D0-A4FF", L"Noto Sans Lisu" }, + { "A500-A63F", L"Noto Sans Vai" }, + { "A6A0-A6FF", L"Noto Sans Bamum" }, + { "A800-A82F", L"Noto Sans Syloti Nagri" }, + { "A840-A87F", L"Noto Sans PhagsPa" }, + { "A880-A8DF", L"Noto Sans Saurashtra" }, + { "A900-A92F", L"Noto Sans Kayah Li" }, + { "A930-A95F", L"Noto Sans Rejang" }, + { "A980-A9DF", L"Noto Sans Javanese" }, + { "AA00-AA5F", L"Noto Sans Cham" }, + /* CJK Compatibility Ideographs - F900-FAFF */ { "F900-FAFF", L"Noto Sans CJK SC", L"zh-Hans" },

1 0

Jacek Caban : ntdll: Introduce RtlSetLastWin32Error for unixlibs that additionally sets 32-bit error on wow64.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 35ae4703c4e92f97a32ee28cfdb11375427bf790 URL: https://gitlab.winehq.org/wine/wine/-/commit/35ae4703c4e92f97a32ee28cfdb113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:30:32 2022 +0200 ntdll: Introduce RtlSetLastWin32Error for unixlibs that additionally sets 32-bit error on wow64. --- dlls/ntdll/unix/env.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 17450b5ab4c..105038a34cb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2390,3 +2390,19 @@ ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) return map_status( status ); } + +/********************************************************************** + * RtlSetLastWin32Error (ntdll.so) + */ +void WINAPI RtlSetLastWin32Error( DWORD err ) +{ + TEB *teb = NtCurrentTeb(); +#ifdef _WIN64 + if (teb->WowTebOffset) + { + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->LastErrorValue = err; + } +#endif + teb->LastErrorValue = err; +}

1 0

Jacek Caban : winemac: Use RtlSetLastWin32Error.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: f79f58cb3a29eb72cdb8decacdf09a960b6e705d URL: https://gitlab.winehq.org/wine/wine/-/commit/f79f58cb3a29eb72cdb8decacdf09a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:14 2022 +0200 winemac: Use RtlSetLastWin32Error. --- dlls/winemac.drv/display.c | 2 +- dlls/winemac.drv/keyboard.c | 4 +-- dlls/winemac.drv/opengl.c | 86 ++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 46 deletions(-)

1 0

Jacek Caban : wow64win: Set last error in 32-bit TEB in wow64 thunks.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 0d4817fadbcdf9b3ee785bcc6239eb4e99db403f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4817fadbcdf9b3ee785bcc6239eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:32:27 2022 +0200 wow64win: Set last error in 32-bit TEB in wow64 thunks. --- dlls/wow64win/user.c | 40 ++++++++++++++++++++-------------------- dlls/wow64win/wow64win_private.h | 7 +++++++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4f54921ff02..c69c8fd6d6c 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -722,13 +722,13 @@ NTSTATUS WINAPI wow64_NtUserFlashWindowEx( UINT *args ) if (!info32) { - SetLastError( ERROR_NOACCESS ); + set_last_error32( ERROR_NOACCESS ); return FALSE; } if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -962,7 +962,7 @@ NTSTATUS WINAPI wow64_NtUserGetGUIThreadInfo( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1104,7 +1104,7 @@ NTSTATUS WINAPI wow64_NtUserGetMenuBarInfo( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1210,7 +1210,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputBuffer( UINT *args ) if (header_size != sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1230,7 +1230,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) if (header_size != sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1246,7 +1246,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) data_size64 = *data_size + sizeof(RAWINPUTHEADER); if (!(data64 = Wow64AllocateTemp( data_size64 ))) { - SetLastError( STATUS_NO_MEMORY ); + set_last_error32( STATUS_NO_MEMORY ); return ~0u; } @@ -1256,7 +1256,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) body_size = ret - sizeof(RAWINPUTHEADER); if (*data_size < sizeof(RAWINPUTHEADER32) + body_size) { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + set_last_error32( ERROR_INSUFFICIENT_BUFFER ); return ~0u; } @@ -1292,7 +1292,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) if (*data_size < sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + set_last_error32( ERROR_INSUFFICIENT_BUFFER ); return ~0u; } @@ -1306,7 +1306,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) } default: - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } } @@ -1329,7 +1329,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputDeviceList( UINT *args ) if (size != sizeof(RAWINPUTDEVICELIST32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1340,7 +1340,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputDeviceList( UINT *args ) if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return ~0u; } @@ -1376,7 +1376,7 @@ NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) if (wc32->cbSize != sizeof(*wc32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return 0; } @@ -1408,7 +1408,7 @@ NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) if (size != sizeof(RAWINPUTDEVICE32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1419,7 +1419,7 @@ NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return ~0u; } @@ -1662,7 +1662,7 @@ NTSTATUS WINAPI wow64_NtUserMsgWaitForMultipleObjectsEx( UINT *args ) if (count > ARRAYSIZE(handles)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return WAIT_FAILED; } for (i = 0; i < count; i++) handles[i] = UlongToHandle( handles32[i] ); @@ -1794,13 +1794,13 @@ NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) if (size != sizeof(RAWINPUTDEVICE32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } if (!(devices64 = Wow64AllocateTemp( count * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } @@ -1864,7 +1864,7 @@ NTSTATUS WINAPI wow64_NtUserSendInput( UINT *args ) if (size != sizeof(*inputs32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return 0; } @@ -2489,7 +2489,7 @@ NTSTATUS WINAPI wow64_NtUserTrackMouseEvent( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h index 9127085b7b4..cf0b2b62e5f 100644 --- a/dlls/wow64win/wow64win_private.h +++ b/dlls/wow64win/wow64win_private.h @@ -124,4 +124,11 @@ static inline OBJECT_ATTRIBUTES *objattr_32to64( struct object_attr64 *out, cons return &out->attr; } +static inline void set_last_error32( DWORD err ) +{ + TEB *teb = NtCurrentTeb(); + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->LastErrorValue = err; +} + #endif /* __WOW64WIN_PRIVATE_H */

1 0

Zebediah Figura : winhttp: Allow custom headers to be separated by any sequence of \r and \n.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 57955c735bdbb4a58878cca6f399483a32502780 URL: https://gitlab.winehq.org/wine/wine/-/commit/57955c735bdbb4a58878cca6f39948… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 17:53:20 2022 -0500 winhttp: Allow custom headers to be separated by any sequence of \r and \n. This fixes connecting to multiplayer game servers in Riptide GP: Renegade. --- dlls/winhttp/request.c | 26 +++++++------------------- dlls/winhttp/tests/winhttp.c | 15 ++++++--------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ece4e34f0b8..2331c30b58c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -467,26 +467,14 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = buffer; do { - q = p; - while (*q) - { - if (q[0] == '\n' && q[1] == '\r') - { - q[0] = '\r'; - q[1] = '\n'; - } - if (q[0] == '\r') break; - q++; - } if (!*p) break; - if (*q == '\r') - { - *q = 0; - if (q[1] == '\n') - q += 2; /* jump over \r\n */ - else - q++; /* jump over \r */ - } + + for (q = p; *q && *q != '\r' && *q != '\n'; ++q) + ; + *q++ = 0; + while (*q == '\r' || *q == '\n') + ++q; + if ((header = parse_header( p ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4e03a3752fd..17720611547 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2532,8 +2532,8 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "POST /bad_headers")) { ok(!!strstr(buffer, "Content-Type: text/html\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); - todo_wine ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); - todo_wine ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test3: Value3\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test4: Value4\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test5: Value5\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); @@ -3654,13 +3654,10 @@ static void test_bad_header( int port ) len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, header_tests[i].header, buffer, &len, &index ); - todo_wine_if (i >= 1 && i <= 3) - { - ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); - ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", - debugstr_w(header_tests[i].header), debugstr_w(buffer) ); - ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); - } + ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); + ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", + debugstr_w(header_tests[i].header), debugstr_w(buffer) ); + ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); } ret = WinHttpSendRequest( req, L"Test5: Value5\rTest6: Value6", ~0u, NULL, 0, 0, 0 );

1 0