July 2021 - Wine-Commits - list.winehq.org

Haoyang Chen : winhttp: Handle headers with '\r' line breaks.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 8147ccde1378b8adec160910a6523c6fb42aa9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8147ccde1378b8adec160910… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu Jul 29 15:57:17 2021 +0800 winhttp: Handle headers with '\r' line breaks. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 7 +++++-- dlls/winhttp/tests/winhttp.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 946168786ae..a6c16d7b653 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -378,14 +378,17 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD q[0] = '\r'; q[1] = '\n'; } - if (q[0] == '\r' && q[1] == '\n') break; + if (q[0] == '\r') break; q++; } if (!*p) break; if (*q == '\r') { *q = 0; - q += 2; /* jump over \r\n */ + if (q[1] == '\n') + q += 2; /* jump over \r\n */ + else + q++; /* jump over \r */ } if ((header = parse_header( p ))) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 56f35252615..60204f6536f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3480,7 +3480,7 @@ static void test_bad_header( int port ) req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); - ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\r", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); ok( ret, "failed to add header %u\n", GetLastError() ); index = 0; @@ -3492,6 +3492,15 @@ static void test_bad_header( int port ) ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); ok( index == 1, "index = %u\n", index ); + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Cookie", buffer, &len, &index ); + ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( index == 1, "index = %u\n", index ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses );

1 0

Alexandre Julliard : wow64: Add thunks for a number of security syscalls.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 19cdc3497c86c3068a6abf51de1d93aa3d56d77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19cdc3497c86c3068a6abf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 12:44:06 2021 +0200 wow64: Add thunks for a number of security syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/security.c | 253 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 12 +++ 3 files changed, 266 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19cdc3497c86c3068a6a…

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread query information syscalls.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: ebb4d3887becc44be3dce210ce3f0eb8d34330cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb4d3887becc44be3dce210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 15:28:34 2021 +0200 wow64: Add thunks for the process/thread query information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 272 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 63 +++++++++++ dlls/wow64/syscall.h | 2 + dlls/wow64/wow64_private.h | 2 + 4 files changed, 339 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb4d3887becc44be3dc…

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread set information syscalls.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: ba74c5c6984bb19aade5ae0dfaa71b0f77d5786e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba74c5c6984bb19aade5ae0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 15:32:14 2021 +0200 wow64: Add thunks for the process/thread set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 23 ++++++++ dlls/wow64/syscall.h | 2 + 3 files changed, 175 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 61e3ca1e91b..44380535d9c 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -816,6 +816,156 @@ NTSTATUS WINAPI wow64_NtSetContextThread( UINT *args ) } +/********************************************************************** + * wow64_NtSetInformationProcess + */ +NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + PROCESSINFOCLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + + NTSTATUS status; + + switch (class) + { + case ProcessDefaultHardErrorMode: /* ULONG */ + case ProcessPriorityClass: /* PROCESS_PRIORITY_CLASS */ + return NtSetInformationProcess( handle, class, ptr, len ); + + case ProcessAffinityMask: /* ULONG_PTR */ + if (len == sizeof(ULONG)) + { + ULONG_PTR mask = *(ULONG *)ptr; + return NtSetInformationProcess( handle, class, &mask, sizeof(mask) ); + } + else return STATUS_INVALID_PARAMETER; + + case ProcessExecuteFlags: /* ULONG */ + return STATUS_ACCESS_DENIED; + + case ProcessInstrumentationCallback: /* PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION */ + if (len == sizeof(PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32)) + { + FIXME( "ProcessInstrumentationCallback stub\n" ); + return STATUS_SUCCESS; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + case ProcessThreadStackAllocation: /* PROCESS_STACK_ALLOCATION_INFORMATION(_EX) */ + if (len == sizeof(PROCESS_STACK_ALLOCATION_INFORMATION_EX32)) + { + PROCESS_STACK_ALLOCATION_INFORMATION_EX32 *stack = ptr; + PROCESS_STACK_ALLOCATION_INFORMATION_EX info; + + info.PreferredNode = stack->PreferredNode; + info.Reserved0 = stack->Reserved0; + info.Reserved1 = stack->Reserved1; + info.Reserved2 = stack->Reserved2; + info.AllocInfo.ReserveSize = stack->AllocInfo.ReserveSize; + info.AllocInfo.ZeroBits = get_zero_bits( stack->AllocInfo.ZeroBits ); + if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) + stack->AllocInfo.StackBase = PtrToUlong( info.AllocInfo.StackBase ); + return status; + } + else if (len == sizeof(PROCESS_STACK_ALLOCATION_INFORMATION32)) + { + PROCESS_STACK_ALLOCATION_INFORMATION32 *stack = ptr; + PROCESS_STACK_ALLOCATION_INFORMATION info; + + info.ReserveSize = stack->ReserveSize; + info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : 0x7fffffff; + if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) + stack->StackBase = PtrToUlong( info.StackBase ); + return status; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + case ProcessWineMakeProcessSystem: /* HANDLE* */ + if (len == sizeof(ULONG)) + { + HANDLE event = 0; + status = NtSetInformationProcess( handle, class, &event, sizeof(HANDLE *) ); + put_handle( ptr, event ); + return status; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + default: + FIXME( "unsupported class %u\n", class ); + return STATUS_INVALID_INFO_CLASS; + } +} + + +/********************************************************************** + * wow64_NtSetInformationThread + */ +NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + THREADINFOCLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + + switch (class) + { + case ThreadZeroTlsCell: /* ULONG */ + case ThreadBasePriority: /* ULONG */ + case ThreadHideFromDebugger: /* void */ + case ThreadEnableAlignmentFaultFixup: /* BOOLEAN */ + return NtSetInformationThread( handle, class, ptr, len ); + + case ThreadImpersonationToken: /* HANDLE */ + if (len == sizeof(ULONG)) + { + HANDLE token = LongToHandle( *(ULONG *)ptr ); + return NtSetInformationThread( handle, class, &token, sizeof(token) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadAffinityMask: /* ULONG_PTR */ + case ThreadQuerySetWin32StartAddress: /* PRTL_THREAD_START_ROUTINE */ + if (len == sizeof(ULONG)) + { + ULONG_PTR mask = *(ULONG *)ptr; + return NtSetInformationThread( handle, class, &mask, sizeof(mask) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadWow64Context: /* WOW64_CONTEXT* */ + return STATUS_INVALID_INFO_CLASS; + + case ThreadGroupInformation: /* GROUP_AFFINITY */ + if (len == sizeof(GROUP_AFFINITY32)) + { + GROUP_AFFINITY32 *info32 = ptr; + GROUP_AFFINITY info = { info32->Mask, info32->Group }; + + return NtSetInformationThread( handle, class, &info, sizeof(info) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadDescription: /* THREAD_DESCRIPTION_INFORMATION */ + if (len == sizeof(THREAD_DESCRIPTION_INFORMATION32)) + { + THREAD_DESCRIPTION_INFORMATION32 *info32 = ptr; + THREAD_DESCRIPTION_INFORMATION info; + + if (!unicode_str_32to64( &info.Description, &info32->Description )) + return STATUS_ACCESS_VIOLATION; + return NtSetInformationThread( handle, class, &info, sizeof(info) ); + } + else return STATUS_INFO_LENGTH_MISMATCH; + + default: + FIXME( "unsupported class %u\n", class ); + return STATUS_INVALID_INFO_CLASS; + } +} + + /********************************************************************** * wow64_NtSetThreadExecutionState */ diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 1955b6e16e5..6d5fa86af2b 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -153,6 +153,29 @@ typedef struct ULONG InheritedFromUniqueProcessId; } PROCESS_BASIC_INFORMATION32; +typedef struct +{ + ULONG Version; + ULONG Reserved; + ULONG Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32; + +typedef struct +{ + ULONG ReserveSize; + ULONG ZeroBits; + ULONG StackBase; +} PROCESS_STACK_ALLOCATION_INFORMATION32; + +typedef struct +{ + ULONG PreferredNode; + ULONG Reserved0; + ULONG Reserved1; + ULONG Reserved2; + PROCESS_STACK_ALLOCATION_INFORMATION32 AllocInfo; +} PROCESS_STACK_ALLOCATION_INFORMATION_EX32; + typedef struct { ULONG Size; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 20f70bddda1..77b380cac8d 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -168,6 +168,8 @@ SYSCALL_ENTRY( NtSetInformationFile ) \ SYSCALL_ENTRY( NtSetInformationKey ) \ SYSCALL_ENTRY( NtSetInformationObject ) \ + SYSCALL_ENTRY( NtSetInformationProcess ) \ + SYSCALL_ENTRY( NtSetInformationThread ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetPowerRequest ) \ SYSCALL_ENTRY( NtSetThreadExecutionState ) \

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetArcDirection.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 18ce9d5efc1488216709912ecb255650f265a3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ce9d5efc1488216709912e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:21:56 2021 +0100 gdi32: Use get_dc_attr in SetArcDirection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 29 ----------------------------- dlls/gdi32/enhmfdrv/dc.c | 6 +++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 55b48b2be5f..a76c7b79a0b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -990,35 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) } -/*********************************************************************** - * SetArcDirection (GDI32.@) - */ -INT WINAPI SetArcDirection( HDC hdc, INT dir ) -{ - DC * dc; - INT ret = 0; - - if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetArcDirection ); - dir = physdev->funcs->pSetArcDirection( physdev, dir ); - if (dir) - { - ret = dc->attr->arc_direction; - dc->attr->arc_direction = dir; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index ff78ab4c774..69e4a89af97 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -143,14 +143,14 @@ INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) +BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) { EMRSETARCDIRECTION emr; emr.emr.iType = EMR_SETARCDIRECTION; emr.emr.nSize = sizeof(emr); - emr.iArcDirection = arcDirection; - return EMFDRV_WriteRecord(dev, &emr.emr) ? arcDirection : 0; + emr.iArcDirection = dir; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a5d4a623b95..def005cefbd 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -113,7 +113,6 @@ extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_H extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN CDECL EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 33f075673cf..929d7a2dd51 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -127,7 +127,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SelectFont, /* pSelectFont */ EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ - EMFDRV_SetArcDirection, /* pSetArcDirection */ + NULL, /* pSetArcDirection */ EMFDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7ffb92d83d1..01a451576c1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -111,6 +111,7 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7f8af0552bf..f8ec6083ccf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -133,6 +133,28 @@ INT WINAPI GetArcDirection( HDC hdc ) return dc_attr ? dc_attr->arc_direction : 0; } +/*********************************************************************** + * SetArcDirection (GDI32.@) + */ +INT WINAPI SetArcDirection( HDC hdc, INT dir ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetArcDirection( dc_attr, dir )) return 0; + + ret = dc_attr->arc_direction; + dc_attr->arc_direction = dir; + return ret; +} + /*********************************************************************** * GetLayout (GDI32.@) */

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread control syscalls.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 6159b12330666eb35fc18f1b709342ee5d2ef5d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6159b12330666eb35fc18f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 11:04:20 2021 +0200 wow64: Add thunks for the process/thread control syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 16 ++++ 2 files changed, 223 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6159b12330666eb35fc1…

1 0

Paul Gofman : kernelbase: Don't allow converting thread to fiber more than once.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 90d3b9a3131ac7094e4bfbf0330769c546560651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90d3b9a3131ac7094e4bfbf0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 29 11:08:19 2021 +0300 kernelbase: Don't allow converting thread to fiber more than once. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 14 ++++++++++++++ dlls/kernelbase/thread.c | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 3c54351fa7b..9ae45c2091b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -128,10 +128,17 @@ static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) static void test_ConvertThreadToFiber(void) { + void *ret; + if (pConvertThreadToFiber) { fibers[0] = pConvertThreadToFiber(&testparam); ok(fibers[0] != NULL, "ConvertThreadToFiber failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertThreadToFiber(&testparam); + ok(!ret, "Got non NULL ret.\n"); + ok(GetLastError() == ERROR_ALREADY_FIBER, "Got unexpected error %u.\n", GetLastError()); } else { @@ -141,10 +148,17 @@ static void test_ConvertThreadToFiber(void) static void test_ConvertThreadToFiberEx(void) { + void *ret; + if (pConvertThreadToFiberEx) { fibers[0] = pConvertThreadToFiberEx(&testparam, 0); ok(fibers[0] != NULL, "ConvertThreadToFiberEx failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertThreadToFiberEx(&testparam, 0); + ok(!ret, "Got non NULL ret.\n"); + ok(GetLastError() == ERROR_ALREADY_FIBER, "Got unexpected error %u.\n", GetLastError()); } else { diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 61cb74c6222..9b97c4a8914 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -990,6 +990,12 @@ LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiberEx( LPVOID param, DWORD flag { struct fiber_data *fiber; + if (NtCurrentTeb()->Tib.u.FiberData) + { + SetLastError( ERROR_ALREADY_FIBER ); + return NULL; + } + if (!(fiber = HeapAlloc( GetProcessHeap(), 0, sizeof(*fiber) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY );

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread creation syscalls.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 34addf6dfee1d7db76eece1610ec43050168411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=34addf6dfee1d7db76eece16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 10:49:02 2021 +0200 wow64: Add thunks for the process/thread creation syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/process.c | 396 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 53 ++++++ dlls/wow64/syscall.h | 7 + dlls/wow64/wow64_private.h | 7 + 5 files changed, 464 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34addf6dfee1d7db76ee…

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) implementation to ntdll.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: a3f3ecf1266004294c5a4acf9b82580146a0315f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f3ecf1266004294c5a4acf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:11 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f0876c4c13a..123b5323674 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1873,6 +1873,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e41c5983e48..8548e7bf3a7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3633,6 +3633,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); case WS_IPV6_MULTICAST_IF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); + case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 30753cb93ab..284e8f55bc4 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -214,6 +214,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 6760eea1f057f1a52bbbce13dba68a1bc34dac58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6760eea1f057f1a52bbbce13… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 16:18:09 2021 -0500 ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 85763d032ed..12a6ef418ba 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1867,6 +1867,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9c2d58827ba..902f9e07b48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3627,8 +3627,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DROP_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); - case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 0f04cc824a8..2c0f1a1e23c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -212,6 +212,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) struct afd_create_params {

1 0