wine-commits July 2021

1 participants
728 discussions

Haoyang Chen : winhttp: Handle headers with '\r' line breaks.

by Alexandre Julliard

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 );

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for a number of security syscalls.

by Alexandre Julliard

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…

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for the registry notification syscalls.

by Alexandre Julliard

Module: wine Branch: master Commit: dce59f595bbb27fff8967517fc9f7b36aa8106c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce59f595bbb27fff8967517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 11:13:47 2021 +0200 wow64: Add thunks for the registry notification syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/registry.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 ++ 2 files changed, 58 insertions(+) diff --git a/dlls/wow64/registry.c b/dlls/wow64/registry.c index 67f8f509df5..e89c65c4c5e 100644 --- a/dlls/wow64/registry.c +++ b/dlls/wow64/registry.c @@ -182,6 +182,62 @@ NTSTATUS WINAPI wow64_NtLoadKey2( UINT *args ) } +/********************************************************************** + * wow64_NtNotifyChangeKey + */ +NTSTATUS WINAPI wow64_NtNotifyChangeKey( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG filter = get_ulong( &args ); + BOOLEAN subtree = get_ulong( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN async = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtNotifyChangeKey( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), filter, subtree, buffer, len, async ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtNotifyChangeMultipleKeys + */ +NTSTATUS WINAPI wow64_NtNotifyChangeMultipleKeys( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG count = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG filter = get_ulong( &args ); + BOOLEAN subtree = get_ulong( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN async = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtNotifyChangeMultipleKeys( handle, count, objattr_32to64( &attr, attr32 ), event, + apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), filter, subtree, buffer, len, async ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtOpenKey */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 77b380cac8d..ebdd2d6c6d2 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -92,6 +92,8 @@ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \ + SYSCALL_ENTRY( NtNotifyChangeKey ) \ + SYSCALL_ENTRY( NtNotifyChangeMultipleKeys ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenFile ) \

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for the process/thread set information syscalls.

by Alexandre Julliard

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 ) \

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for the process/thread query information syscalls.

by Alexandre Julliard

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…

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for the process/thread control syscalls.

by Alexandre Julliard

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…

2 years, 9 months

Alexandre Julliard : wow64: Add thunks for the process/thread creation syscalls.

by Alexandre Julliard

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…

2 years, 9 months

Jacek Caban : combase: Add CoDecodeProxy stub.

by Alexandre Julliard

Module: wine Branch: master Commit: a2f6ddeedd868f403d7746098092aae8e423d9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2f6ddeedd868f403d774609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 20:27:25 2021 +0200 combase: Add CoDecodeProxy stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/rpc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0437714edcc..7343da6a0ef 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -85,7 +85,7 @@ @ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr) @ stub CoCreateObjectInContext @ stub CoDeactivateObject -@ stub CoDecodeProxy +@ stdcall CoDecodeProxy(long int64 ptr) @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stub CoDisconnectContext diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 55450ad7f14..7337498e9fa 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -2109,3 +2109,12 @@ BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args) return TRUE; } + +/****************************************************************************** + * CoDecodeProxy (combase.@) + */ +HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info) +{ + FIXME("%x %s %p\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); + return E_NOTIMPL; +}

2 years, 9 months

Jacek Caban : include: Introduce combaseapi.h.

by Alexandre Julliard

Module: wine Branch: master Commit: 448317dca654c6146b3c10c95ee6f1a6b7bf5dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=448317dca654c6146b3c10c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 20:27:11 2021 +0200 include: Introduce combaseapi.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/combaseapi.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 11 +---------- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 46cb0f53a5e..9b397ffa183 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ SOURCES = \ colinf.idl \ colordlg.h \ colrst.idl \ + combaseapi.h \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/combaseapi.h b/include/combaseapi.h new file mode 100644 index 00000000000..4b8cb457328 --- /dev/null +++ b/include/combaseapi.h @@ -0,0 +1,53 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef _COMBASEAPI_H_ +#define _COMBASEAPI_H_ + +#ifndef RC_INVOKED +#include <stdlib.h> +#endif + +#include <objidlbase.h> +#include <guiddef.h> + +#ifndef INITGUID +#include <cguid.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct tagServerInformation +{ + DWORD dwServerPid; + DWORD dwServerTid; + UINT64 ui64ServerAddress; +} ServerInformation, *PServerInformation; + +HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info); + +#ifdef __cplusplus +} +#endif + +#endif /* _COMBASEAPI_H_ */ diff --git a/include/objbase.h b/include/objbase.h index 714d56f2f16..8bf6ad9da84 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -256,20 +256,11 @@ typedef interface IRpcStubBuffer IRpcStubBuffer; typedef interface IRpcChannelBuffer IRpcChannelBuffer; #endif -#ifndef RC_INVOKED -/* For compatibility only, at least for now */ -#include <stdlib.h> -#endif - +#include <combaseapi.h> #include <wtypes.h> #include <unknwn.h> #include <objidl.h> -#include <guiddef.h> -#ifndef INITGUID -#include <cguid.h> -#endif - #ifdef __cplusplus extern "C" { #endif

2 years, 9 months

Paul Gofman : kernelbase: Don't allow converting thread to fiber more than once.

by Alexandre Julliard

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 );

2 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021