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

Zebediah Figura : ws2_32: Dump the flow label and scope ID in debugstr_sockaddr().
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: a5f787ac445a682ea7ced5dd78c3516d4b8b9311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5f787ac445a682ea7ced5dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:11 2021 -0500 ws2_32: Dump the flow label and scope ID in debugstr_sockaddr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 16bece395b8..7fb48698d2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -192,8 +192,8 @@ const char *debugstr_sockaddr( const struct WS_sockaddr *a ) p = WS_inet_ntop( WS_AF_INET6, &sin->sin6_addr, buf, sizeof(buf) ); if (!p) p = "(unknown IPv6 address)"; - return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", - p, ntohs(sin->sin6_port)); + return wine_dbg_sprintf("{ family AF_INET6, address %s, flow label %#x, port %d, scope %u }", + p, sin->sin6_flowinfo, ntohs(sin->sin6_port), sin->sin6_scope_id ); } case WS_AF_IPX: {

1 0

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

July 24, 2021

Module: wine Branch: master Commit: 205e2ae0362aad9b435d00d495feabbb373cf539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=205e2ae0362aad9b435d00d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:10 2021 -0500 ws2_32: 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/socket.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b4786e54b38..16bece395b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1097,14 +1097,14 @@ unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *wsaddr, int wsaddrlen, /* Note: Windows has 2 versions of the sockaddr_in6 struct, one with * scope_id, one without. */ - if (wsaddrlen >= sizeof(struct WS_sockaddr_in6_old)) { + if (wsaddrlen >= sizeof(struct WS_sockaddr_in6)) { uaddrlen = sizeof(struct sockaddr_in6); memset( uaddr, 0, uaddrlen ); uin6->sin6_family = AF_INET6; uin6->sin6_port = win6->sin6_port; uin6->sin6_flowinfo = win6->sin6_flowinfo; #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - if (wsaddrlen >= sizeof(struct WS_sockaddr_in6)) uin6->sin6_scope_id = win6->sin6_scope_id; + uin6->sin6_scope_id = win6->sin6_scope_id; #endif memcpy(&uin6->sin6_addr,&win6->sin6_addr,16); /* 16 bytes = 128 address bits */ break; @@ -1299,25 +1299,20 @@ int ws_sockaddr_u2ws(const struct sockaddr *uaddr, struct WS_sockaddr *wsaddr, i #endif case AF_INET6: { const struct sockaddr_in6* uin6 = (const struct sockaddr_in6*)uaddr; - struct WS_sockaddr_in6_old* win6old = (struct WS_sockaddr_in6_old*)wsaddr; + struct WS_sockaddr_in6 *win6 = (struct WS_sockaddr_in6 *)wsaddr; - if (*wsaddrlen < sizeof(struct WS_sockaddr_in6_old)) + if (*wsaddrlen < sizeof(struct WS_sockaddr_in6)) return -1; - win6old->sin6_family = WS_AF_INET6; - win6old->sin6_port = uin6->sin6_port; - win6old->sin6_flowinfo = uin6->sin6_flowinfo; - memcpy(&win6old->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ + win6->sin6_family = WS_AF_INET6; + win6->sin6_port = uin6->sin6_port; + win6->sin6_flowinfo = uin6->sin6_flowinfo; + memcpy(&win6->sin6_addr, &uin6->sin6_addr, 16); /* 16 bytes = 128 address bits */ #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - if (*wsaddrlen >= sizeof(struct WS_sockaddr_in6)) { - struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; - win6->sin6_scope_id = uin6->sin6_scope_id; - *wsaddrlen = sizeof(struct WS_sockaddr_in6); - } - else - *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); + win6->sin6_scope_id = uin6->sin6_scope_id; #else - *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); + win6->sin6_scope_id = 0; #endif + *wsaddrlen = sizeof(struct WS_sockaddr_in6); return 0; } case AF_INET: {

1 0

Jacek Caban : gdi32: Use ntgdi name for GetPixel.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: ccb6fbba76d4259adafa634874219672ec6c6d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb6fbba76d4259adafa6348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:52:06 2021 +0200 gdi32: Use ntgdi name for GetPixel. 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/gdi32.spec | 2 +- dlls/gdi32/painting.c | 4 ++-- include/ntgdi.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6974f3cb873..299b84268a5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -327,7 +327,7 @@ @ stdcall GetOutlineTextMetricsW(long long ptr) @ stdcall GetPaletteEntries(long long long ptr) @ stdcall GetPath(long ptr ptr long) -@ stdcall GetPixel(long long long) +@ stdcall GetPixel(long long long) NtGdiGetPixel @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @ stdcall GetROP2(long) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 21c3c853998..c879aeb9582 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -416,9 +416,9 @@ COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) } /*********************************************************************** - * GetPixel (GDI32.@) + * NtGdiGetPixel (win32u.@) */ -COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ) { PHYSDEV physdev; COLORREF ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index 56921d68fc3..2cf0a6f681e 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -166,8 +166,9 @@ BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, - OUTLINETEXTMETRICW *otm, ULONG opts); + OUTLINETEXTMETRICW *otm, ULONG opts ); INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ); +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ); INT WINAPI NtGdiGetRandomRgn( HDC hdc, HRGN region, INT code ); DWORD WINAPI NtGdiGetRegionData( HRGN hrgn, DWORD count, RGNDATA *data ); INT WINAPI NtGdiGetRgnBox( HRGN hrgn, RECT *rect );

1 0

Alexandre Julliard : wow64: Add thunks for the semaphore syscalls.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: e1a4fbe7307cb1ac842a00894b8a3438df012544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1a4fbe7307cb1ac842a0089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 16:51:33 2021 +0200 wow64: Add thunks for the semaphore syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 +++ 2 files changed, 74 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 2ca7764c3cd..bd7e20ca02c 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -83,6 +83,28 @@ NTSTATUS WINAPI wow64_NtCreateMutant( UINT *args ) } +/********************************************************************** + * wow64_NtCreateSemaphore + */ +NTSTATUS WINAPI wow64_NtCreateSemaphore( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + LONG initial = get_ulong( &args ); + LONG max = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateSemaphore( &handle, access, objattr_32to64( &attr, attr32 ), initial, max ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenEvent */ @@ -123,6 +145,26 @@ NTSTATUS WINAPI wow64_NtOpenMutant( UINT *args ) } +/********************************************************************** + * wow64_NtOpenSemaphore + */ +NTSTATUS WINAPI wow64_NtOpenSemaphore( 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 = NtOpenSemaphore( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtPulseEvent */ @@ -165,6 +207,21 @@ NTSTATUS WINAPI wow64_NtQueryMutant( UINT *args ) } +/********************************************************************** + * wow64_NtQuerySemaphore + */ +NTSTATUS WINAPI wow64_NtQuerySemaphore( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + SEMAPHORE_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQuerySemaphore( handle, class, info, len, retlen ); +} + + /********************************************************************** * wow64_NtReleaseMutant */ @@ -177,6 +234,19 @@ NTSTATUS WINAPI wow64_NtReleaseMutant( UINT *args ) } +/********************************************************************** + * wow64_NtReleaseSemaphore + */ +NTSTATUS WINAPI wow64_NtReleaseSemaphore( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG count = get_ulong( &args ); + ULONG *previous = get_ptr( &args ); + + return NtReleaseSemaphore( handle, count, previous ); +} + + /********************************************************************** * wow64_NtResetEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 8481db2a587..bb9f220332c 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -29,11 +29,13 @@ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ + SYSCALL_ENTRY( NtCreateSemaphore ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ + SYSCALL_ENTRY( NtOpenSemaphore ) \ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ @@ -41,7 +43,9 @@ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtQueryMutant ) \ + SYSCALL_ENTRY( NtQuerySemaphore ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ + SYSCALL_ENTRY( NtReleaseSemaphore ) \ SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \

1 0

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

July 24, 2021

Module: wine Branch: master Commit: 6f3e5090ee869c8f5015338f302d211f65e35d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3e5090ee869c8f5015338f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:09 2021 -0500 ntdll: 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/ntdll/unix/socket.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c38f4f53089..6b863fd61f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -232,19 +232,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); } @@ -303,7 +298,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); } @@ -335,7 +329,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; @@ -343,13 +337,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

1 0

Alexandre Julliard : wow64: Add thunks for the I/O completion syscalls.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: 0ae72a3c066b7b401e016af1c96827d870944f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ae72a3c066b7b401e016af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:22:06 2021 +0200 wow64: Add thunks for the I/O completion syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 +++ 2 files changed, 75 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index d280f1324a3..0a3e2cd099a 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -118,6 +118,27 @@ NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateIoCompletion + */ +NTSTATUS WINAPI wow64_NtCreateIoCompletion( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + ULONG threads = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateIoCompletion( &handle, access, objattr_32to64( &attr, attr32 ), threads ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateKeyedEvent */ @@ -258,6 +279,26 @@ NTSTATUS WINAPI wow64_NtOpenEvent( UINT *args ) } +/********************************************************************** + * wow64_NtOpenIoCompletion + */ +NTSTATUS WINAPI wow64_NtOpenIoCompletion( 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 = NtOpenIoCompletion( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenKeyedEvent */ @@ -402,6 +443,21 @@ NTSTATUS WINAPI wow64_NtQueryEvent( UINT *args ) } +/********************************************************************** + * wow64_NtQueryIoCompletion + */ +NTSTATUS WINAPI wow64_NtQueryIoCompletion( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_COMPLETION_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryIoCompletion( handle, class, info, len, retlen ); +} + + /********************************************************************** * wow64_NtQueryMutant */ @@ -525,6 +581,21 @@ NTSTATUS WINAPI wow64_NtSetInformationDebugObject( UINT *args ) } +/********************************************************************** + * wow64_NtSetIoCompletion + */ +NTSTATUS WINAPI wow64_NtSetIoCompletion( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG_PTR key = get_ulong( &args ); + ULONG_PTR value = get_ulong( &args ); + NTSTATUS status = get_ulong( &args ); + SIZE_T count = get_ulong( &args ); + + return NtSetIoCompletion( handle, key, value, status, count ); +} + + /********************************************************************** * wow64_NtSetTimer */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index a56e775bda3..c32f4b5fece 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -31,6 +31,7 @@ SYSCALL_ENTRY( NtCreateDebugObject ) \ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateIoCompletion ) \ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ @@ -41,6 +42,7 @@ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenIoCompletion ) \ SYSCALL_ENTRY( NtOpenKeyedEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtOpenSemaphore ) \ @@ -52,6 +54,7 @@ SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtQueryIoCompletion ) \ SYSCALL_ENTRY( NtQueryMutant ) \ SYSCALL_ENTRY( NtQuerySemaphore ) \ SYSCALL_ENTRY( NtQueryTimer ) \ @@ -63,6 +66,7 @@ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEvent ) \ SYSCALL_ENTRY( NtSetInformationDebugObject ) \ + SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetTimer ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent )

1 0

Alexandre Julliard : wow64: Add thunks for the event syscalls.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: 8b8b92e1ff553209a8eeb2bb8d78936fec9c98b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8b92e1ff553209a8eeb2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 16:43:28 2021 +0200 wow64: Add thunks for the event syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/struct32.h | 34 ++++++++++++ dlls/wow64/sync.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 9 ++- dlls/wow64/wow64_private.h | 63 +++++++++++++++++++++ 5 files changed, 239 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 8dc4dac5ba7..76e3ff97d6b 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f000000 C_SRCS = \ + sync.c \ syscall.c diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h new file mode 100644 index 00000000000..e8b2e22cdcf --- /dev/null +++ b/dlls/wow64/struct32.h @@ -0,0 +1,34 @@ +/* + * 32-bit version of ntdll structures + * + * Copyright 2021 Alexandre Julliard + * + * 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 + */ + +#ifndef __WOW64_STRUCT32_H +#define __WOW64_STRUCT32_H + +typedef struct +{ + ULONG Length; + ULONG RootDirectory; + ULONG ObjectName; + ULONG Attributes; + ULONG SecurityDescriptor; + ULONG SecurityQualityOfService; +} OBJECT_ATTRIBUTES32; + +#endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c new file mode 100644 index 00000000000..d61eed0a22d --- /dev/null +++ b/dlls/wow64/sync.c @@ -0,0 +1,133 @@ +/* + * WoW64 synchronization objects and functions + * + * Copyright 2021 Alexandre Julliard + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64_private.h" + + +/********************************************************************** + * wow64_NtClearEvent + */ +NTSTATUS WINAPI wow64_NtClearEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + + return NtClearEvent( handle ); +} + + +/********************************************************************** + * wow64_NtCreateEvent + */ +NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + EVENT_TYPE type = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateEvent( &handle, access, objattr_32to64( &attr, attr32 ), type, state ); + put_handle( handle_ptr, handle ); + return status; +} + + +/********************************************************************** + * wow64_NtOpenEvent + */ +NTSTATUS WINAPI wow64_NtOpenEvent( 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 = NtOpenEvent( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + +/********************************************************************** + * wow64_NtPulseEvent + */ +NTSTATUS WINAPI wow64_NtPulseEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtPulseEvent( handle, prev_state ); +} + + +/********************************************************************** + * wow64_NtQueryEvent + */ +NTSTATUS WINAPI wow64_NtQueryEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + EVENT_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryEvent( handle, class, info, len, retlen ); +} + + +/********************************************************************** + * wow64_NtResetEvent + */ +NTSTATUS WINAPI wow64_NtResetEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtResetEvent( handle, prev_state ); +} + + +/********************************************************************** + * wow64_NtSetEvent + */ +NTSTATUS WINAPI wow64_NtSetEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtSetEvent( handle, prev_state ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 583af0db476..df9da2261bb 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,15 +25,22 @@ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ + SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ - SYSCALL_ENTRY( NtSetDefaultUILanguage ) + SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ + SYSCALL_ENTRY( NtSetEvent ) #endif /* __WOW64_SYSCALL_H */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c441f1bf481..affd39df03b 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -22,6 +22,7 @@ #define __WOW64_PRIVATE_H #include "syscall.h" +#include "struct32.h" #define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN; ALL_SYSCALLS @@ -30,6 +31,13 @@ ALL_SYSCALLS extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; +struct object_attr64 +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + SECURITY_DESCRIPTOR sd; +}; + static inline void *get_rva( HMODULE module, DWORD va ) { return (void *)((char *)module + va); @@ -53,4 +61,59 @@ static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } +static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) +{ + if (!str32) return NULL; + str->Length = str32->Length; + str->MaximumLength = str32->MaximumLength; + str->Buffer = ULongToPtr( str32->Buffer ); + return str; +} + +static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, const SECURITY_DESCRIPTOR *in ) +{ + /* relative descr has the same layout for 32 and 64 */ + const SECURITY_DESCRIPTOR_RELATIVE *sd = (const SECURITY_DESCRIPTOR_RELATIVE *)in; + + if (!in) return NULL; + out->Revision = sd->Revision; + out->Sbz1 = sd->Sbz1; + out->Control = sd->Control & ~SE_SELF_RELATIVE; + if (sd->Control & SE_SELF_RELATIVE) + { + if (sd->Owner) out->Owner = (PSID)((BYTE *)sd + sd->Owner); + if (sd->Group) out->Group = (PSID)((BYTE *)sd + sd->Group); + if ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) out->Sacl = (PSID)((BYTE *)sd + sd->Sacl); + if ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) out->Dacl = (PSID)((BYTE *)sd + sd->Dacl); + } + else + { + out->Owner = ULongToPtr( sd->Owner ); + out->Group = ULongToPtr( sd->Group ); + if (sd->Control & SE_SACL_PRESENT) out->Sacl = ULongToPtr( sd->Sacl ); + if (sd->Control & SE_DACL_PRESENT) out->Dacl = ULongToPtr( sd->Dacl ); + } + return out; +} + +static inline OBJECT_ATTRIBUTES *objattr_32to64( struct object_attr64 *out, const OBJECT_ATTRIBUTES32 *in ) +{ + memset( out, 0, sizeof(*out) ); + if (!in) return NULL; + if (in->Length != sizeof(*in)) return &out->attr; + + out->attr.Length = sizeof(out->attr); + out->attr.RootDirectory = LongToHandle( in->RootDirectory ); + out->attr.Attributes = in->Attributes; + out->attr.ObjectName = unicode_str_32to64( &out->str, ULongToPtr( in->ObjectName )); + out->attr.SecurityQualityOfService = ULongToPtr( in->SecurityQualityOfService ); + out->attr.SecurityDescriptor = secdesc_32to64( &out->sd, ULongToPtr( in->SecurityDescriptor )); + return &out->attr; +} + +static inline void put_handle( ULONG *handle32, HANDLE handle ) +{ + *handle32 = HandleToULong( handle ); +} + #endif /* __WOW64_PRIVATE_H */

1 0

Alexandre Julliard : wow64: Add a stub for Wow64ApcRoutine().
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: d1171c7d10f7c8fda64fe3e36fc626a6ebbb5748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1171c7d10f7c8fda64fe3e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:00:39 2021 +0200 wow64: Add a stub for Wow64ApcRoutine(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 9 +++++++++ dlls/wow64/wow64.spec | 2 +- dlls/wow64/wow64_private.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 5c9bc8d4f27..6803efbd7e9 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -398,6 +398,15 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) } +/********************************************************************** + * Wow64ApcRoutine (NTDLL.@) + */ +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) +{ + FIXME( "stub %lx %lx %lx\n", arg1, arg2, arg3 ); +} + + /********************************************************************** * Wow64LdrpInitialize (NTDLL.@) */ diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index a477b6b628a..8f188043556 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -1,7 +1,7 @@ @ stub Wow64AllocThreadHeap @ stub Wow64AllocateHeap @ stub Wow64AllocateTemp -@ stub Wow64ApcRoutine +@ stdcall Wow64ApcRoutine(long long long ptr) @ stub Wow64CheckIfNXEnabled @ stub Wow64EmulateAtlThunk @ stub Wow64FreeHeap diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index affd39df03b..5ec8ef9d847 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,6 +28,8 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; + extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wow64: Add thunks for the timer syscalls.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: 54901695dcbf97173bc22c0df4b916089d2eeb11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54901695dcbf97173bc22c0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:00:52 2021 +0200 wow64: Add thunks for the timer syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 7 +++- dlls/wow64/wow64_private.h | 11 ++++++ 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index bd7e20ca02c..c6c5e1d374d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -29,6 +29,18 @@ #include "wow64_private.h" +/********************************************************************** + * wow64_NtCancelTimer + */ +NTSTATUS WINAPI wow64_NtCancelTimer( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + BOOLEAN *state = get_ptr( &args ); + + return NtCancelTimer( handle, state ); +} + + /********************************************************************** * wow64_NtClearEvent */ @@ -105,6 +117,27 @@ NTSTATUS WINAPI wow64_NtCreateSemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtCreateTimer + */ +NTSTATUS WINAPI wow64_NtCreateTimer( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + TIMER_TYPE type = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateTimer( &handle, access, objattr_32to64( &attr, attr32 ), type ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenEvent */ @@ -165,6 +198,26 @@ NTSTATUS WINAPI wow64_NtOpenSemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtOpenTimer + */ +NTSTATUS WINAPI wow64_NtOpenTimer( 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 = NtOpenTimer( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtPulseEvent */ @@ -222,6 +275,21 @@ NTSTATUS WINAPI wow64_NtQuerySemaphore( UINT *args ) } +/********************************************************************** + * wow64_NtQueryTimer + */ +NTSTATUS WINAPI wow64_NtQueryTimer( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + TIMER_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryTimer( handle, class, info, len, retlen ); +} + + /********************************************************************** * wow64_NtReleaseMutant */ @@ -269,3 +337,21 @@ NTSTATUS WINAPI wow64_NtSetEvent( UINT *args ) return NtSetEvent( handle, prev_state ); } + + +/********************************************************************** + * wow64_NtSetTimer + */ +NTSTATUS WINAPI wow64_NtSetTimer( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LARGE_INTEGER *when = get_ptr( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + BOOLEAN resume = get_ulong( &args ); + ULONG period = get_ulong( &args ); + BOOLEAN *state = get_ptr( &args ); + + return NtSetTimer( handle, when, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + resume, period, state ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index bb9f220332c..f348ecfe1d9 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,17 +25,20 @@ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ + SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ + SYSCALL_ENTRY( NtCreateTimer ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtOpenSemaphore ) \ + SYSCALL_ENTRY( NtOpenTimer ) \ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ @@ -44,11 +47,13 @@ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtQueryMutant ) \ SYSCALL_ENTRY( NtQuerySemaphore ) \ + SYSCALL_ENTRY( NtQueryTimer ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtReleaseSemaphore ) \ SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ - SYSCALL_ENTRY( NtSetEvent ) + SYSCALL_ENTRY( NtSetEvent ) \ + SYSCALL_ENTRY( NtSetTimer ) #endif /* __WOW64_SYSCALL_H */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 5ec8ef9d847..f555f8db7bb 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -63,6 +63,17 @@ static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } +static inline void *apc_32to64( ULONG func ) +{ + return func ? Wow64ApcRoutine : NULL; +} + +static inline void *apc_param_32to64( ULONG func, ULONG context ) +{ + if (!func) return ULongToPtr( context ); + return (void *)(ULONG_PTR)(((ULONG64)func << 32) | context); +} + static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) { if (!str32) return NULL;

1 0

Alexandre Julliard : wow64: Add thunks for the directory object syscalls.
by Alexandre Julliard July 24, 2021

July 24, 2021

Module: wine Branch: master Commit: 994e4fba75a561ea643ad82988109507523d72b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=994e4fba75a561ea643ad829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:09:08 2021 +0200 wow64: Add thunks for the directory object syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 6 ++++ dlls/wow64/sync.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 3 ++ 3 files changed, 89 insertions(+) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index e8b2e22cdcf..23144e9e15a 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -31,4 +31,10 @@ typedef struct ULONG SecurityQualityOfService; } OBJECT_ATTRIBUTES32; +typedef struct +{ + UNICODE_STRING32 ObjectName; + UNICODE_STRING32 ObjectTypeName; +} DIRECTORY_BASIC_INFORMATION32; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 596e90bc71d..55c0ed08e32 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -27,6 +27,9 @@ #include "winnt.h" #include "winternl.h" #include "wow64_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wow); /********************************************************************** @@ -52,6 +55,26 @@ NTSTATUS WINAPI wow64_NtClearEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateDirectoryObject + */ +NTSTATUS WINAPI wow64_NtCreateDirectoryObject( 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 = NtCreateDirectoryObject( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateEvent */ @@ -159,6 +182,26 @@ NTSTATUS WINAPI wow64_NtCreateTimer( UINT *args ) } +/********************************************************************** + * wow64_NtOpenDirectoryObject + */ +NTSTATUS WINAPI wow64_NtOpenDirectoryObject( 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 = NtOpenDirectoryObject( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenEvent */ @@ -271,6 +314,43 @@ NTSTATUS WINAPI wow64_NtPulseEvent( UINT *args ) } +/********************************************************************** + * wow64_NtQueryDirectoryObject + */ +NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + DIRECTORY_BASIC_INFORMATION32 *info32 = get_ptr( &args ); + ULONG size32 = get_ulong( &args ); + BOOLEAN single_entry = get_ulong( &args ); + BOOLEAN restart = get_ulong( &args ); + ULONG *context = get_ptr( &args ); + ULONG *retlen = get_ptr( &args ); + + NTSTATUS status; + DIRECTORY_BASIC_INFORMATION *info; + ULONG size = size32 + sizeof(*info) - sizeof(*info32); + + if (!single_entry) FIXME( "not implemented\n" ); + info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, NULL ); + if (!status) + { + info32->ObjectName.Buffer = PtrToUlong( info32 + 1 ); + info32->ObjectName.Length = info->ObjectName.Length; + info32->ObjectName.MaximumLength = info->ObjectName.MaximumLength; + info32->ObjectTypeName.Buffer = info32->ObjectName.Buffer + info->ObjectName.MaximumLength; + info32->ObjectTypeName.Length = info->ObjectTypeName.Length; + info32->ObjectTypeName.MaximumLength = info->ObjectTypeName.MaximumLength; + size = info->ObjectName.MaximumLength + info->ObjectTypeName.MaximumLength; + memcpy( info32 + 1, info + 1, size ); + if (retlen) *retlen = sizeof(*info32) + size; + } + RtlFreeHeap( GetProcessHeap(), 0, info ); + return status; +} + + /********************************************************************** * wow64_NtQueryEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index db2b386fe24..b64cabd15b5 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,6 +28,7 @@ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ @@ -36,6 +37,7 @@ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenKeyedEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ @@ -44,6 +46,7 @@ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryDirectoryObject ) \ SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \

1 0