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

Alexandre Julliard : wow64: Add thunks for the debug object syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 863fda0b0f0d11a0e1cd191ac1b82412f9851a5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=863fda0b0f0d11a0e1cd191a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:10:57 2021 +0200 wow64: Add thunks for the debug object syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 57 +++++++++++++++++++++ dlls/wow64/sync.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 ++ dlls/wow64/wow64_private.h | 8 +++ 4 files changed, 194 insertions(+) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 23144e9e15a..776b1d4df35 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -37,4 +37,61 @@ typedef struct UNICODE_STRING32 ObjectTypeName; } DIRECTORY_BASIC_INFORMATION32; +typedef struct +{ + DBG_STATE NewState; + CLIENT_ID32 AppClientId; + union + { + struct + { + EXCEPTION_RECORD32 ExceptionRecord; + ULONG FirstChance; + } Exception; + struct + { + ULONG HandleToThread; + struct + { + ULONG SubSystemKey; + ULONG StartAddress; + } NewThread; + } CreateThread; + struct + { + ULONG HandleToProcess; + ULONG HandleToThread; + struct + { + ULONG SubSystemKey; + ULONG FileHandle; + ULONG BaseOfImage; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; + struct + { + ULONG SubSystemKey; + ULONG StartAddress; + } InitialThread; + } NewProcess; + } CreateProcessInfo; + struct + { + NTSTATUS ExitStatus; + } ExitProcess, ExitThread; + struct + { + ULONG FileHandle; + ULONG BaseOfDll; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; + ULONG NamePointer; + } LoadDll; + struct + { + ULONG BaseAddress; + } UnloadDll; + } StateInfo; +} DBGUI_WAIT_STATE_CHANGE32; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 55c0ed08e32..d280f1324a3 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -55,6 +55,27 @@ NTSTATUS WINAPI wow64_NtClearEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateDebugObject + */ +NTSTATUS WINAPI wow64_NtCreateDebugObject( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + ULONG flags = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateDebugObject( &handle, access, objattr_32to64( &attr, attr32 ), flags ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateDirectoryObject */ @@ -182,6 +203,21 @@ NTSTATUS WINAPI wow64_NtCreateTimer( UINT *args ) } +/********************************************************************** + * wow64_NtDebugContinue + */ +NTSTATUS WINAPI wow64_NtDebugContinue( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + CLIENT_ID32 *id32 = get_ptr( &args ); + NTSTATUS status = get_ulong( &args ); + + CLIENT_ID id; + + return NtDebugContinue( handle, client_id_32to64( &id, id32 ), status ); +} + + /********************************************************************** * wow64_NtOpenDirectoryObject */ @@ -474,6 +510,21 @@ NTSTATUS WINAPI wow64_NtSetEvent( UINT *args ) } +/********************************************************************** + * wow64_NtSetInformationDebugObject + */ +NTSTATUS WINAPI wow64_NtSetInformationDebugObject( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + DEBUGOBJECTINFOCLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtSetInformationDebugObject( handle, class, ptr, len, retlen ); +} + + /********************************************************************** * wow64_NtSetTimer */ @@ -492,6 +543,80 @@ NTSTATUS WINAPI wow64_NtSetTimer( UINT *args ) } +/********************************************************************** + * wow64_NtWaitForDebugEvent + */ +NTSTATUS WINAPI wow64_NtWaitForDebugEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + BOOLEAN alertable = get_ulong( &args ); + LARGE_INTEGER *timeout = get_ptr( &args ); + DBGUI_WAIT_STATE_CHANGE32 *state32 = get_ptr( &args ); + + ULONG i; + DBGUI_WAIT_STATE_CHANGE state; + NTSTATUS status = NtWaitForDebugEvent( handle, alertable, timeout, &state ); + + if (!status) + { + state32->NewState = state.NewState; + state32->AppClientId.UniqueProcess = HandleToULong( state.AppClientId.UniqueProcess ); + state32->AppClientId.UniqueThread = HandleToULong( state.AppClientId.UniqueThread ); + switch (state.NewState) + { +#define COPY_ULONG(field) state32->StateInfo.field = state.StateInfo.field +#define COPY_PTR(field) state32->StateInfo.field = PtrToUlong( state.StateInfo.field ) + case DbgCreateThreadStateChange: + COPY_PTR( CreateThread.HandleToThread ); + COPY_PTR( CreateThread.NewThread.StartAddress ); + COPY_ULONG( CreateThread.NewThread.SubSystemKey ); + break; + case DbgCreateProcessStateChange: + COPY_PTR( CreateProcessInfo.HandleToProcess ); + COPY_PTR( CreateProcessInfo.HandleToThread ); + COPY_PTR( CreateProcessInfo.NewProcess.FileHandle ); + COPY_PTR( CreateProcessInfo.NewProcess.BaseOfImage ); + COPY_PTR( CreateProcessInfo.NewProcess.InitialThread.StartAddress ); + COPY_ULONG( CreateProcessInfo.NewProcess.InitialThread.SubSystemKey ); + COPY_ULONG( CreateProcessInfo.NewProcess.DebugInfoFileOffset ); + COPY_ULONG( CreateProcessInfo.NewProcess.DebugInfoSize ); + break; + case DbgExitThreadStateChange: + case DbgExitProcessStateChange: + COPY_ULONG( ExitThread.ExitStatus ); + break; + case DbgExceptionStateChange: + case DbgBreakpointStateChange: + case DbgSingleStepStateChange: + COPY_ULONG( Exception.FirstChance ); + COPY_ULONG( Exception.ExceptionRecord.ExceptionCode ); + COPY_ULONG( Exception.ExceptionRecord.ExceptionFlags ); + COPY_ULONG( Exception.ExceptionRecord.NumberParameters ); + COPY_PTR( Exception.ExceptionRecord.ExceptionRecord ); + COPY_PTR( Exception.ExceptionRecord.ExceptionAddress ); + for (i = 0; i < state.StateInfo.Exception.ExceptionRecord.NumberParameters; i++) + COPY_ULONG( Exception.ExceptionRecord.ExceptionInformation[i] ); + break; + case DbgLoadDllStateChange: + COPY_PTR( LoadDll.FileHandle ); + COPY_PTR( LoadDll.BaseOfDll ); + COPY_ULONG( LoadDll.DebugInfoFileOffset ); + COPY_ULONG( LoadDll.DebugInfoSize ); + COPY_PTR( LoadDll.NamePointer ); + break; + case DbgUnloadDllStateChange: + COPY_PTR( UnloadDll.BaseAddress ); + break; + default: + break; + } +#undef COPY_ULONG +#undef COPY_PTR + } + return status; +} + + /********************************************************************** * wow64_NtWaitForKeyedEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index b64cabd15b5..a56e775bda3 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,12 +28,14 @@ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtCreateDebugObject ) \ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ SYSCALL_ENTRY( NtCreateTimer ) \ + SYSCALL_ENTRY( NtDebugContinue ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ @@ -60,7 +62,9 @@ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEvent ) \ + SYSCALL_ENTRY( NtSetInformationDebugObject ) \ SYSCALL_ENTRY( NtSetTimer ) \ + SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) #endif /* __WOW64_SYSCALL_H */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index f555f8db7bb..9e3fd914045 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -83,6 +83,14 @@ static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNI return str; } +static inline CLIENT_ID *client_id_32to64( CLIENT_ID *id, const CLIENT_ID32 *id32 ) +{ + if (!id32) return NULL; + id->UniqueProcess = LongToHandle( id32->UniqueProcess ); + id->UniqueThread = LongToHandle( id32->UniqueThread ); + return id; +} + static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, const SECURITY_DESCRIPTOR *in ) { /* relative descr has the same layout for 32 and 64 */

1 0

Alexandre Julliard : wow64: Add thunks for some general synchronization syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 1409b421d22e5c916e1fea7e9d04543eeebb8d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1409b421d22e5c916e1fea7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:47:39 2021 +0200 wow64: Add thunks for some general synchronization syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 10 ++++- 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 84fd2e8111a..c748668620a 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -282,6 +282,18 @@ NTSTATUS WINAPI wow64_NtDebugContinue( UINT *args ) } +/********************************************************************** + * wow64_NtDelayExecution + */ +NTSTATUS WINAPI wow64_NtDelayExecution( UINT *args ) +{ + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtDelayExecution( alertable, timeout ); +} + + /********************************************************************** * wow64_NtOpenDirectoryObject */ @@ -556,6 +568,18 @@ NTSTATUS WINAPI wow64_NtQueryMutant( UINT *args ) } +/********************************************************************** + * wow64_NtQueryPerformanceCounter + */ +NTSTATUS WINAPI wow64_NtQueryPerformanceCounter( UINT *args ) +{ + LARGE_INTEGER *counter = get_ptr( &args ); + LARGE_INTEGER *frequency = get_ptr( &args ); + + return NtQueryPerformanceCounter( counter, frequency ); +} + + /********************************************************************** * wow64_NtQuerySemaphore */ @@ -604,6 +628,19 @@ NTSTATUS WINAPI wow64_NtQueryTimer( UINT *args ) } +/********************************************************************** + * wow64_NtQueryTimerResolution + */ +NTSTATUS WINAPI wow64_NtQueryTimerResolution( UINT *args ) +{ + ULONG *min_res = get_ptr( &args ); + ULONG *max_res = get_ptr( &args ); + ULONG *current_res = get_ptr( &args ); + + return NtQueryTimerResolution( min_res, max_res, current_res ); +} + + /********************************************************************** * wow64_NtReleaseKeyedEvent */ @@ -715,6 +752,33 @@ NTSTATUS WINAPI wow64_NtSetTimer( UINT *args ) } +/********************************************************************** + * wow64_NtSetTimerResolution + */ +NTSTATUS WINAPI wow64_NtSetTimerResolution( UINT *args ) +{ + ULONG res = get_ulong( &args ); + BOOLEAN set = get_ulong( &args ); + ULONG *current_res = get_ptr( &args ); + + return NtSetTimerResolution( res, set, current_res ); +} + + +/********************************************************************** + * wow64_NtSignalAndWaitForSingleObject + */ +NTSTATUS WINAPI wow64_NtSignalAndWaitForSingleObject( UINT *args ) +{ + HANDLE signal = get_handle( &args ); + HANDLE wait = get_handle( &args ); + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtSignalAndWaitForSingleObject( signal, wait, alertable, timeout ); +} + + /********************************************************************** * wow64_NtTerminateJobObject */ @@ -813,3 +877,44 @@ NTSTATUS WINAPI wow64_NtWaitForKeyedEvent( UINT *args ) return NtWaitForKeyedEvent( handle, key, alertable, timeout ); } + + +/********************************************************************** + * wow64_NtWaitForMultipleObjects + */ +NTSTATUS WINAPI wow64_NtWaitForMultipleObjects( UINT *args ) +{ + DWORD count = get_ulong( &args ); + LONG *handles_ptr = get_ptr( &args ); + BOOLEAN wait_any = get_ulong( &args ); + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; + DWORD i; + + for (i = 0; i < count && i < MAXIMUM_WAIT_OBJECTS; i++) handles[i] = LongToHandle( handles_ptr[i] ); + return NtWaitForMultipleObjects( count, handles, wait_any, alertable, timeout ); +} + + +/********************************************************************** + * wow64_NtWaitForSingleObject + */ +NTSTATUS WINAPI wow64_NtWaitForSingleObject( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtWaitForSingleObject( handle, alertable, timeout ); +} + + +/********************************************************************** + * wow64_NtYieldExecution + */ +NTSTATUS WINAPI wow64_NtYieldExecution( UINT *args ) +{ + return NtYieldExecution(); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 60631a2d41c..91552953088 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -39,6 +39,7 @@ SYSCALL_ENTRY( NtCreateSymbolicLinkObject ) \ SYSCALL_ENTRY( NtCreateTimer ) \ SYSCALL_ENTRY( NtDebugContinue ) \ + SYSCALL_ENTRY( NtDelayExecution ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ @@ -60,9 +61,11 @@ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtQueryIoCompletion ) \ SYSCALL_ENTRY( NtQueryMutant ) \ + SYSCALL_ENTRY( NtQueryPerformanceCounter ) \ SYSCALL_ENTRY( NtQuerySemaphore ) \ SYSCALL_ENTRY( NtQuerySymbolicLinkObject ) \ SYSCALL_ENTRY( NtQueryTimer ) \ + SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtReleaseSemaphore ) \ @@ -73,8 +76,13 @@ SYSCALL_ENTRY( NtSetInformationDebugObject ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetTimer ) \ + SYSCALL_ENTRY( NtSetTimerResolution ) \ + SYSCALL_ENTRY( NtSignalAndWaitForSingleObject ) \ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ - SYSCALL_ENTRY( NtWaitForKeyedEvent ) + SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ + SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ + SYSCALL_ENTRY( NtWaitForSingleObject ) \ + SYSCALL_ENTRY( NtYieldExecution ) #endif /* __WOW64_SYSCALL_H */

1 0

Zebediah Figura : server: Validate the output size of IOCTL_AFD_BIND against the input address size rather than sizeof(struct sockaddr).
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: c06e5693cb421692c85a87da3e90a94182651a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06e5693cb421692c85a87da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:07 2021 -0500 server: Validate the output size of IOCTL_AFD_BIND against the input address size rather than sizeof(struct sockaddr). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 4 ++-- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 32daab0beab..c31d1def139 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1610,7 +1610,7 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size, &addr6, sizeof(addr6) - 1); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, @@ -1620,7 +1620,7 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size, &addr6, sizeof(struct sockaddr_in6_old)); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); memset(&io, 0xcc, sizeof(io)); diff --git a/server/sock.c b/server/sock.c index f730bb31c55..cce91f5150d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2492,7 +2492,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } in_size = get_req_data_size() - get_reply_max_size(); if (in_size < offsetof(struct afd_bind_params, addr.sa_data) - || get_reply_max_size() < sizeof(struct WS_sockaddr)) + || get_reply_max_size() < in_size - sizeof(int)) { set_error( STATUS_INVALID_PARAMETER ); return 0;

1 0

Jacek Caban : gdi32: Remove no longer used EMF path driver.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 0bc43b3a920288b6c39fd1492440d0805f49f5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc43b3a920288b6c39fd149… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:50:59 2021 +0200 gdi32: Remove no longer used EMF path driver. 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/enhmfdrv/dc.c | 204 ----------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - 2 files changed, 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bc43b3a920288b6c39f…

1 0

Jacek Caban : gdi32: Use NtGdiSetPixel for SetPixel implementation.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 5a71d8415e82f62661006431d92139bbc5349093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a71d8415e82f62661006431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:51:16 2021 +0200 gdi32: Use NtGdiSetPixel for SetPixel implementation. 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/enhmfdrv/graphics.c | 24 ++++++++------ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 ++++++++ dlls/gdi32/mfdrv/graphics.c | 7 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 6 ++-- dlls/gdi32/tests/metafile.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 108 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index d4fd2b482ef..fcaf432b57e 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -524,9 +524,9 @@ BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, } /*********************************************************************** - * EMFDRV_SetPixel + * EMFDC_SetPixel */ -COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) { EMRSETPIXELV emr; @@ -535,15 +535,19 @@ COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) emr.ptlPixel.x = x; emr.ptlPixel.y = y; emr.crColor = color; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); +} - if (EMFDRV_WriteRecord( dev, &emr.emr )) { - RECTL bounds; - bounds.left = bounds.right = x; - bounds.top = bounds.bottom = y; - EMFDRV_UpdateBBox( dev, &bounds ); - return color; - } - return -1; +/*********************************************************************** + * EMFDRV_SetPixel + */ +COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +{ + RECTL bounds; + bounds.left = bounds.right = x; + bounds.top = bounds.bottom = y; + EMFDRV_UpdateBBox( dev, &bounds ); + return CLR_INVALID; } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a95053ea44c..481bc14d7f3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -60,6 +60,7 @@ extern BOOL METADC_Polyline( HDC hdc, const POINT *points,INT count) DECLSPEC_HI extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -92,5 +93,6 @@ 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_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 04d90a5e0ba..0bfc48f3fcc 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -57,6 +57,19 @@ BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetPixel (GDI32.@) + */ +COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetPixel( hdc, x, y, color ); + if (!(dc_attr = get_dc_attr( hdc ))) return CLR_INVALID; + if (dc_attr->emf && !EMFDC_SetPixel( dc_attr, x, y, color )) return CLR_INVALID; + return NtGdiSetPixel( hdc, x, y, color ); +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index d5f256346f9..8b74c1a3696 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -116,12 +116,11 @@ BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, } /*********************************************************************** - * MFDRV_SetPixel + * METADC_SetPixel */ -COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) { - return MFDRV_MetaParam4(dev, META_SETPIXEL, x, y,HIWORD(color), - LOWORD(color)); + return metadc_param4( hdc, META_SETPIXEL, x, y, HIWORD(color), LOWORD(color) ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index b37dc5c6d92..f53f8304a8e 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -202,7 +202,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetLayout, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ - MFDRV_SetPixel, /* pSetPixel */ + NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ MFDRV_SetROP2, /* pSetROP2 */ MFDRV_SetRelAbs, /* pSetRelAbs */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 3fad2970e64..6b4984854ed 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -112,7 +112,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 803b9797736..1e03a2046d9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -399,15 +399,15 @@ BOOL WINAPI NtGdiRoundRect( HDC hdc, INT left, INT top, INT right, } /*********************************************************************** - * SetPixel (GDI32.@) + * NtGdiSetPixel (win32u.@) */ -COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) +COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) { PHYSDEV physdev; COLORREF ret; DC * dc = get_dc_ptr( hdc ); - if (!dc) return ~0; + if (!dc) return CLR_INVALID; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pSetPixel ); ret = physdev->funcs->pSetPixel( physdev, x, y, color ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 34de9518f2a..d310eb47fa2 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3077,6 +3077,42 @@ static void test_metafile_file(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } +static void test_mf_SetPixel(void) +{ + HMETAFILE mf; + COLORREF c; + BOOL ret; + HDC hdc; + + hdc = CreateMetaFileW(NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == 1, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == 1, "c = %x\n", c); + + ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); + ok(ret, "ret = %x\n", ret); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = Rectangle(hdc, 1, 1, 10, 10); + ok(ret, "Rectangle failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + mf = CloseMetaFile(hdc); + ok(mf != 0, "CloseEnhMetaFile failed\n"); + DeleteMetaFile(mf); +} + static void test_enhmetafile_file(void) { char temp_path[MAX_PATH]; @@ -3178,6 +3214,40 @@ static void test_enhmetafile_file(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } +static void test_emf_SetPixel(void) +{ + HENHMETAFILE emf; + COLORREF c; + BOOL ret; + HDC hdc; + + hdc = CreateEnhMetaFileW(NULL, L"test.emf", NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); + todo_wine + ok(!ret, "ret = %x\n", ret); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = Rectangle(hdc, 1, 1, 10, 10); + ok(ret, "Rectangle failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile failed\n"); + DeleteEnhMetaFile(emf); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6272,6 +6342,7 @@ START_TEST(metafile) test_emf_WorldTransform(); test_emf_text_extents(); test_enhmetafile_file(); + test_emf_SetPixel(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6286,6 +6357,7 @@ START_TEST(metafile) test_mf_GetPath(); test_mf_SetLayout(); test_metafile_file(); + test_mf_SetPixel(); /* For metafile conversions */ test_mf_conversions();

1 0

Gerald Pfeifer : nsiproxy: Include sys/socket.h.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 49a1f9cf282ed38c7b1e4d584e06cb06c0c01f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=49a1f9cf282ed38c7b1e4d58… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jul 22 12:21:43 2021 +0200 nsiproxy: Include sys/socket.h. This addresses invalid use of undefined type 'struct sock addr' and AF_INET being unknown when building on FreeBSD 11.x. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index ab1b6294bea..93fdefa24cc 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -21,6 +21,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif

1 0

Zebediah Figura : server: Do not accept sizeof(struct WS_sockaddr_in6_old).
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: d04c5f4b1bb52d8648d02ea19aec5957a05fe7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04c5f4b1bb52d8648d02ea1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:08 2021 -0500 server: Do not accept sizeof(struct WS_sockaddr_in6_old). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 29 +++++++++++++---------------- server/sock.c | 23 ++++++----------------- 2 files changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index c31d1def139..50922500859 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1582,17 +1582,17 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size - 1, &addr6, sizeof(addr6)); - todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in6_old), &addr6, sizeof(addr6)); - todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, offsetof(struct afd_bind_params, addr.sa_data), &addr6, sizeof(addr6)); - todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, @@ -1604,8 +1604,8 @@ static void test_bind(void) params, params6_size, &addr6, sizeof(addr6)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); - todo_wine ok(!ret, "got %#x\n", ret); - todo_wine ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); + ok(!ret, "got %#x\n", ret); + ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, @@ -1615,7 +1615,7 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size - 1, &addr6, sizeof(addr6) - 1); - todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, @@ -1629,15 +1629,12 @@ static void test_bind(void) params, params6_size, &addr6, sizeof(addr6)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); - ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); - ok(!memcmp(&addr6.sin6_addr, &bind_addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); - ok(!addr6.sin6_flowinfo, "got flow info %#x\n", addr6.sin6_flowinfo); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); + ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); + ok(!memcmp(&addr6.sin6_addr, &bind_addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(!addr6.sin6_flowinfo, "got flow info %#x\n", addr6.sin6_flowinfo); ok(addr6.sin6_port, "expected nonzero port\n"); /* getsockname() returns EINVAL here. Possibly the socket name is cached (in shared memory?) */ @@ -1645,7 +1642,7 @@ static void test_bind(void) ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_GETSOCKNAME, NULL, 0, &addr6_2, sizeof(addr6_2)); ok(!ret, "got %#x\n", ret); - todo_wine ok(!memcmp(&addr6, &addr6_2, sizeof(addr6)), "addresses didn't match\n"); + ok(!memcmp(&addr6, &addr6_2, sizeof(addr6)), "addresses didn't match\n"); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size, &addr6, sizeof(addr6)); diff --git a/server/sock.c b/server/sock.c index cce91f5150d..cd77ff7bdca 100644 --- a/server/sock.c +++ b/server/sock.c @@ -311,7 +311,7 @@ static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_socka { struct WS_sockaddr_in6 win = {0}; - if (wsaddrlen < sizeof(struct WS_sockaddr_in6_old)) return -1; + if (wsaddrlen < sizeof(win)) return -1; win.sin6_family = WS_AF_INET6; win.sin6_port = uaddr->in6.sin6_port; win.sin6_flowinfo = uaddr->in6.sin6_flowinfo; @@ -319,13 +319,8 @@ static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_socka #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID win.sin6_scope_id = uaddr->in6.sin6_scope_id; #endif - if (wsaddrlen >= sizeof(struct WS_sockaddr_in6)) - { - memcpy( wsaddr, &win, sizeof(struct WS_sockaddr_in6) ); - return sizeof(struct WS_sockaddr_in6); - } - memcpy( wsaddr, &win, sizeof(struct WS_sockaddr_in6_old) ); - return sizeof(struct WS_sockaddr_in6_old); + memcpy( wsaddr, &win, sizeof(win) ); + return sizeof(win); } #ifdef HAS_IPX @@ -391,19 +386,14 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl { struct WS_sockaddr_in6 win = {0}; - if (wsaddrlen < sizeof(struct WS_sockaddr_in6_old)) return 0; - if (wsaddrlen < sizeof(struct WS_sockaddr_in6)) - memcpy( &win, wsaddr, sizeof(struct WS_sockaddr_in6_old) ); - else - memcpy( &win, wsaddr, sizeof(struct WS_sockaddr_in6) ); - + if (wsaddrlen < sizeof(win)) return 0; + memcpy( &win, wsaddr, sizeof(win) ); uaddr->in6.sin6_family = AF_INET6; uaddr->in6.sin6_port = win.sin6_port; uaddr->in6.sin6_flowinfo = win.sin6_flowinfo; memcpy( &uaddr->in6.sin6_addr, &win.sin6_addr, sizeof(win.sin6_addr) ); #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - if (wsaddrlen >= sizeof(struct WS_sockaddr_in6)) - uaddr->in6.sin6_scope_id = win.sin6_scope_id; + uaddr->in6.sin6_scope_id = win.sin6_scope_id; #endif return sizeof(uaddr->in6); } @@ -462,7 +452,6 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl #endif case sizeof(struct WS_sockaddr_in6): - case sizeof(struct WS_sockaddr_in6_old): return sizeof(uaddr->in6); }

1 0

Alexandre Julliard : wow64: Add thunks for the symbolic link object syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 89ad6974c123ac3b71c9801f913d1177c3ec5f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ad6974c123ac3b71c9801f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:33:45 2021 +0200 wow64: Add thunks for the symbolic link object syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 3 +++ 2 files changed, 64 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 7d8ad3edac3..84fd2e8111a 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -223,6 +223,29 @@ NTSTATUS WINAPI wow64_NtCreateSemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtCreateSymbolicLinkObject + */ +NTSTATUS WINAPI wow64_NtCreateSymbolicLinkObject( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + UNICODE_STRING32 *target32 = get_ptr( &args ); + + struct object_attr64 attr; + UNICODE_STRING target; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateSymbolicLinkObject( &handle, access, objattr_32to64( &attr, attr32 ), + unicode_str_32to64( &target, target32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateTimer */ @@ -399,6 +422,26 @@ NTSTATUS WINAPI wow64_NtOpenSemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtOpenSymbolicLinkObject + */ +NTSTATUS WINAPI wow64_NtOpenSymbolicLinkObject( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenSymbolicLinkObject( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenTimer */ @@ -528,6 +571,24 @@ NTSTATUS WINAPI wow64_NtQuerySemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtQuerySymbolicLinkObject + */ +NTSTATUS WINAPI wow64_NtQuerySymbolicLinkObject( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + UNICODE_STRING32 *target32 = get_ptr( &args ); + ULONG *retlen = get_ptr( &args ); + + UNICODE_STRING target; + NTSTATUS status; + + status = NtQuerySymbolicLinkObject( handle, unicode_str_32to64( &target, target32 ), retlen ); + if (!status) target32->Length = target.Length; + return status; +} + + /********************************************************************** * wow64_NtQueryTimer */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 677e92f1a37..60631a2d41c 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -36,6 +36,7 @@ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ + SYSCALL_ENTRY( NtCreateSymbolicLinkObject ) \ SYSCALL_ENTRY( NtCreateTimer ) \ SYSCALL_ENTRY( NtDebugContinue ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ @@ -48,6 +49,7 @@ SYSCALL_ENTRY( NtOpenKeyedEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtOpenSemaphore ) \ + SYSCALL_ENTRY( NtOpenSymbolicLinkObject ) \ SYSCALL_ENTRY( NtOpenTimer ) \ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ @@ -59,6 +61,7 @@ SYSCALL_ENTRY( NtQueryIoCompletion ) \ SYSCALL_ENTRY( NtQueryMutant ) \ SYSCALL_ENTRY( NtQuerySemaphore ) \ + SYSCALL_ENTRY( NtQuerySymbolicLinkObject ) \ SYSCALL_ENTRY( NtQueryTimer ) \ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \

1 0

Alexandre Julliard : ntdll: Always clear the returned handle in Nt object functions.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 3fb4d1f779770eab44d3f56fb9e95899b3791ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb4d1f779770eab44d3f56f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:14:08 2021 +0200 ntdll: Always clear the returned handle in Nt object functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 9 +- dlls/ntdll/tests/om.c | 310 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/file.c | 5 +- dlls/ntdll/unix/process.c | 2 + dlls/ntdll/unix/registry.c | 9 +- dlls/ntdll/unix/security.c | 5 + dlls/ntdll/unix/server.c | 2 + dlls/ntdll/unix/sync.c | 37 ++++-- dlls/ntdll/unix/thread.c | 2 + 9 files changed, 354 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fb4d1f779770eab44d3…

1 0

Alexandre Julliard : wow64: Add thunks for the job object syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 0e374683cf0342bcf769d58f7c4cfa07a58e0eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e374683cf0342bcf769d58f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:30:11 2021 +0200 wow64: Add thunks for the job object syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 3 +++ 2 files changed, 55 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 0a3e2cd099a..7d8ad3edac3 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -139,6 +139,26 @@ NTSTATUS WINAPI wow64_NtCreateIoCompletion( UINT *args ) } +/********************************************************************** + * wow64_NtCreateJobObject + */ +NTSTATUS WINAPI wow64_NtCreateJobObject( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateJobObject( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateKeyedEvent */ @@ -299,6 +319,26 @@ NTSTATUS WINAPI wow64_NtOpenIoCompletion( UINT *args ) } +/********************************************************************** + * wow64_NtOpenJobObject + */ +NTSTATUS WINAPI wow64_NtOpenJobObject( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenJobObject( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenKeyedEvent */ @@ -614,6 +654,18 @@ NTSTATUS WINAPI wow64_NtSetTimer( UINT *args ) } +/********************************************************************** + * wow64_NtTerminateJobObject + */ +NTSTATUS WINAPI wow64_NtTerminateJobObject( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + NTSTATUS status = get_ulong( &args ); + + return NtTerminateJobObject( handle, status ); +} + + /********************************************************************** * wow64_NtWaitForDebugEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index c32f4b5fece..677e92f1a37 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -32,6 +32,7 @@ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtCreateIoCompletion ) \ + SYSCALL_ENTRY( NtCreateJobObject ) \ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ @@ -43,6 +44,7 @@ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenIoCompletion ) \ + SYSCALL_ENTRY( NtOpenJobObject ) \ SYSCALL_ENTRY( NtOpenKeyedEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtOpenSemaphore ) \ @@ -68,6 +70,7 @@ SYSCALL_ENTRY( NtSetInformationDebugObject ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetTimer ) \ + SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent )

1 0