wine-commits April 2019

1 participants
803 discussions

Alexandre Julliard : makefiles: Also pass -fPIC flag when linking.

by Alexandre Julliard

Module: wine Branch: master Commit: 8039941c52758113955d376bd7b6b6e1e5b5f76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8039941c52758113955d376b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 22:42:17 2019 +0200 makefiles: Also pass -fPIC flag when linking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 15 ++++++++++----- configure.ac | 11 ++++++++--- tools/makedep.c | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index ffdd61c..63e58d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ -UNWINDFLAGS = @UNWINDFLAGS@ +LDDLLFLAGS = @LDDLLFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ LIBS = @LIBS@ BISON = @BISON@ diff --git a/configure b/configure index 253a820..40c6a7d 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -UNWINDFLAGS BUILTINFLAG EXCESS_PRECISION_CFLAGS EXTRACFLAGS @@ -743,6 +742,7 @@ WINELOADER_LDFLAGS TOP_INSTALL_DEV TOP_INSTALL_LIB LDEXECFLAGS +LDDLLFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7849,6 +7849,8 @@ LDRPATH_INSTALL="" LDRPATH_LOCAL="" +LDDLLFLAGS="" + LDEXECFLAGS="" TOP_INSTALL_LIB="" @@ -8660,6 +8662,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" COREFOUNDATION_LIBS="-framework CoreFoundation" @@ -9038,6 +9041,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" enable_wineandroid_drv=${enable_wineandroid_drv:-yes} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 @@ -9280,9 +9284,11 @@ fi *) case $host_cpu in *i[3456789]86*) - DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + DLLFLAGS="$DLLFLAGS -fno-PIC" + LDDLLFLAGS="-fno-PIC" ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" ;; + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5 $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; } @@ -17548,8 +17554,7 @@ then $as_echo "#define __ASM_CFI(str) str" >>confdefs.h - UNWINDFLAGS=-fasynchronous-unwind-tables - + LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h diff --git a/configure.ac b/configure.ac index cb98a45..e35189c 100644 --- a/configure.ac +++ b/configure.ac @@ -707,6 +707,7 @@ dnl **** Check for working dll **** AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") +AC_SUBST(LDDLLFLAGS,"") AC_SUBST(LDEXECFLAGS,"") AC_SUBST(TOP_INSTALL_LIB,"") AC_SUBST(TOP_INSTALL_DEV,"") @@ -746,6 +747,7 @@ case $host_os in AC_LANG_POP([Objective C]) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" dnl declare needed frameworks @@ -891,6 +893,7 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], @@ -926,9 +929,11 @@ case $host_os in *) case $host_cpu in *i[[3456789]]86*) - DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + DLLFLAGS="$DLLFLAGS -fno-PIC" + LDDLLFLAGS="-fno-PIC" ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" ;; + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" ;; esac AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf, [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic], @@ -2137,7 +2142,7 @@ then asm_func_header="$asm_func_header.cfi_startproc\\n\\t" asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) - AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) + LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else AC_DEFINE([__ASM_CFI(str)],[""]) if test "x$enable_win64" = "xyes" diff --git a/tools/makedep.c b/tools/makedep.c index 05c574d..f5c5e0a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -134,7 +134,7 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray extra_cross_cflags; static struct strarray cpp_flags; -static struct strarray unwind_flags; +static struct strarray lddll_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2282,7 +2282,7 @@ static void output_winegcc_command( struct makefile *make, int cross ) else { output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_filenames( lddll_flags ); } } @@ -4201,7 +4201,7 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); extra_cross_cflags = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); - unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); + lddll_flags = get_expanded_make_var_array( top_makefile, "LDDLLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" ); top_install_lib = get_expanded_make_var_array( top_makefile, "TOP_INSTALL_LIB" );

4 years, 12 months

Zebediah Figura : makefiles: Build with -fno-PIC on i386.

by Alexandre Julliard

Module: wine Branch: master Commit: 8f732c66ab37b54c30d63c74f7822ba1d4f04996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f732c66ab37b54c30d63c74… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 29 22:59:36 2019 -0500 makefiles: Build with -fno-PIC on i386. Many applications attempt to hook or copy native API calls, using methods sophisticated enough to recognize any sequence of x86 instructions, but not enough to recognize and account for a GOT register load. Most such cases only care to insert a JMP instruction in the first five bytes, and so are satisfied by adding the hot-patch prefix. However, the madCodeHook 3.x engine attempts to copy the first 15 bytes, and some copy-protection schemes will try to copy the whole function. Building with -fno-PIC on i386, as is the default behaviour for Visual Studio compiled applications, and likely for Windows libraries as well, fixes those applications, and also stops us once and for all wasting time debugging and individually applying DECLSPEC_HOTPATCH. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37540 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47027 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 95 ++++++++++++++++++++++++++++++++---------------------------- configure.ac | 19 +++++++----- 2 files changed, 62 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f732c66ab37b54c30d6…

4 years, 12 months

Alexandre Julliard : ntdll: Check for time conversion error to silence a compiler warning.

by Alexandre Julliard

Module: wine Branch: master Commit: 7c0385bdb49f28472b63b3dab823732fabda6707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0385bdb49f28472b63b3da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 20:24:52 2019 +0200 ntdll: Check for time conversion error to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index a4762fa..443d8b2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1006,9 +1006,8 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old if (!OldTime) OldTime = &tm; NtQuerySystemTime( OldTime ); - RtlTimeToSecondsSince1970( OldTime, &oldsec ); - - RtlTimeToSecondsSince1970( NewTime, &sec ); + if (!RtlTimeToSecondsSince1970( OldTime, &oldsec )) return STATUS_INVALID_PARAMETER; + if (!RtlTimeToSecondsSince1970( NewTime, &sec )) return STATUS_INVALID_PARAMETER; /* fake success if time didn't change */ if (oldsec == sec)

4 years, 12 months

Erich E. Hoover : iphlpapi: Implement AllocateAndGetTcpExTableFromStack.

by Alexandre Julliard

Module: wine Branch: master Commit: 05fca48ebc1321984a74ed11dc9c1f13a2cfd1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fca48ebc1321984a74ed11… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Apr 28 03:13:46 2019 +0200 iphlpapi: Implement AllocateAndGetTcpExTableFromStack. Based on a patch by Ralf Habacker. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34372 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/ipstats.c | 36 ++++++++++++++++++++++++++++++++++++ include/iphlpapi.h | 1 + 3 files changed, 38 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b4f77be..2a4b3d8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -5,6 +5,7 @@ @ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) +@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long ) @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index b4ed542..0b762eb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2320,6 +2320,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL ); } +/****************************************************************** + * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) + * + * Get the TCP connection table. + * Like GetTcpTable(), but allocate the returned table from heap. + * + * PARAMS + * ppTcpTable [Out] pointer into which the MIB_TCPTABLE_EX is + * allocated and returned. + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * family [In] address family [AF_INET|AF_INET6] + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() + * returns otherwise. + */ +DWORD WINAPI AllocateAndGetTcpExTableFromStack( VOID **ppTcpTable, BOOL bOrder, + HANDLE heap, DWORD flags, DWORD family ) +{ + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x, family %u\n", + ppTcpTable, bOrder, heap, flags, family); + + if (!ppTcpTable || !family) + return ERROR_INVALID_PARAMETER; + + if (family != WS_AF_INET) + { + FIXME( "family = %u not supported\n", family ); + return ERROR_NOT_SUPPORTED; + } + + return build_tcp_table( TCP_TABLE_OWNER_PID_ALL, ppTcpTable, bOrder, heap, flags, NULL ); +} + static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) { DWORD table_size; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 86507df..f52387a 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -158,6 +158,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags);

4 years, 12 months

Jefferson Carpenter : server: Add __pad member to pe_image_info_t and zero it.

by Alexandre Julliard

Module: wine Branch: master Commit: dd318b135d359cc6ea558214b32122ef42d21a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd318b135d359cc6ea558214… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Apr 30 04:10:55 2019 +0000 server: Add __pad member to pe_image_info_t and zero it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47032 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 1 + server/mapping.c | 1 + server/protocol.def | 1 + 3 files changed, 3 insertions(+) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9e26aa4..e0b6384 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -714,6 +714,7 @@ typedef struct unsigned int file_size; unsigned int checksum; cpu_type_t cpu; + int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 diff --git a/server/mapping.c b/server/mapping.c index 3480724..8a6c4f1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -703,6 +703,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; + mapping->image.__pad = 0; if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) diff --git a/server/protocol.def b/server/protocol.def index 79e9802..90f26d4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -730,6 +730,7 @@ typedef struct unsigned int file_size; unsigned int checksum; cpu_type_t cpu; + int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02

4 years, 12 months

Alistair Leslie-Hughes : wintab32/tests: Improve WTInfoA tests.

by Alexandre Julliard

Module: wine Branch: master Commit: 911e9dad0283a9893054a673811f9272b284f6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=911e9dad0283a9893054a673… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 23:02:23 2019 +0000 wintab32/tests: Improve WTInfoA tests. Some older WACOM tables dont support DVC_Z, DVC_TPRESSURE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 3eb1315..a88e4bb 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -160,6 +160,9 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); trace("DVC_NAME %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_HARDWARE, name ); + trace("DVC_HARDWARE %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); @@ -169,16 +172,20 @@ static void test_WTInfoA(void) trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret);

4 years, 12 months

Jacek Caban : ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest.

by Alexandre Julliard

Module: wine Branch: master Commit: 73568dab0b8a82e510f805a91c4d19b843726e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73568dab0b8a82e510f805a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:37:03 2019 +0200 ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6e00041..0bb83cb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1361,11 +1361,11 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, { case IRP_MJ_READ: irpsp->Parameters.Read.Length = length; - irpsp->Parameters.Read.ByteOffset = *startoffset; + irpsp->Parameters.Read.ByteOffset.QuadPart = startoffset ? startoffset->QuadPart : 0; break; case IRP_MJ_WRITE: irpsp->Parameters.Write.Length = length; - irpsp->Parameters.Write.ByteOffset = *startoffset; + irpsp->Parameters.Write.ByteOffset.QuadPart = startoffset ? startoffset->QuadPart : 0; break; } irp->RequestorMode = KernelMode;

4 years, 12 months

Jacek Caban : ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest.

by Alexandre Julliard

Module: wine Branch: master Commit: b781a00b143954ce6fc04feeb2af52e682df647d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b781a00b143954ce6fc04fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:56 2019 +0200 ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b6c79d..6e00041 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2218,13 +2218,14 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; routine = irpsp->CompletionRoutine; call_flag = 0; - /* FIXME: add SL_INVOKE_ON_CANCEL support */ if (routine) { if ((irpsp->Control & SL_INVOKE_ON_SUCCESS) && STATUS_SUCCESS == status) call_flag = 1; if ((irpsp->Control & SL_INVOKE_ON_ERROR) && STATUS_SUCCESS != status) call_flag = 1; + if ((irpsp->Control & SL_INVOKE_ON_CANCEL) && irp->Cancel) + call_flag = 1; } ++irp->CurrentLocation; ++irp->Tail.Overlay.s.u2.CurrentStackLocation;

4 years, 12 months

Jacek Caban : ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel object.

by Alexandre Julliard

Module: wine Branch: master Commit: 332035fb9432a5af74cc944b87d1410efab563d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332035fb9432a5af74cc944b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:48 2019 +0200 ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++----------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 - dlls/ntoskrnl.exe/sync.c | 7 ++++--- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0dff14..4b6c79d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -366,20 +366,6 @@ static void ObReferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } -HANDLE kernel_object_handle( void *obj, unsigned int access ) -{ - HANDLE handle = NULL; - SERVER_START_REQ( get_kernel_object_handle ) - { - req->manager = wine_server_obj_handle( get_device_manager() ); - req->user_ptr = wine_server_client_ptr( obj ); - req->access = access; - if (!wine_server_call( req )) handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return handle; -} - static const POBJECT_TYPE *known_types[] = { &ExEventObjectType, @@ -1870,9 +1856,12 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); HANDLE handle; - handle = kernel_object_handle( device, 0 ); - status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); - NtClose( handle ); + status = ObOpenObjectByPointer( device, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle ); + if (!status) + { + status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); + NtClose( handle ); + } if (status == STATUS_SUCCESS) { /* Ensure room for NULL termination */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 295ff73..c2ea91c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -47,7 +47,6 @@ struct _ETHREAD }; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; -HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; extern POBJECT_TYPE ExEventObjectType; diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 6976b9e..8ea103b 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "ddk/ntddk.h" #include "ddk/wdm.h" +#include "ddk/ntifs.h" #include "wine/debug.h" #include "wine/heap.h" @@ -80,7 +81,7 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { if (objs[i]->WaitListHead.Blink == INVALID_HANDLE_VALUE) { - handles[i] = kernel_object_handle( objs[i], SYNCHRONIZE ); + ObOpenObjectByPointer( objs[i], OBJ_KERNEL_HANDLE, NULL, SYNCHRONIZE, NULL, KernelMode, &handles[i] ); continue; } @@ -266,7 +267,7 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) } else { - if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + if (!ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_MODIFY_STATE, NULL, KernelMode, &handle )) { NtSetEvent( handle, &ret ); NtClose( handle ); @@ -297,7 +298,7 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) } else { - if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + if (!ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_MODIFY_STATE, NULL, KernelMode, &handle )) { NtResetEvent( handle, &ret ); NtClose( handle );

4 years, 12 months

Jacek Caban : ntoskrnl.exe: Implement ObOpenObjectByPointer.

by Alexandre Julliard

Module: wine Branch: master Commit: bfe3dfb5356d5944e0d9ff9d659eac6c77075bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe3dfb5356d5944e0d9ff9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:37 2019 +0200 ntoskrnl.exe: Implement ObOpenObjectByPointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 19 +++++++++++++++++-- include/ddk/ntifs.h | 1 + 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8756a8..f0dff14 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -511,6 +511,40 @@ POBJECT_TYPE WINAPI ObGetObjectType( void *object ) return header->type; } +/*********************************************************************** + * ObOpenObjectByPointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *access_state, + ACCESS_MASK access, POBJECT_TYPE type, + KPROCESSOR_MODE mode, HANDLE *handle ) +{ + NTSTATUS status; + + TRACE( "%p %x %p %x %p %d %p\n", obj, attr, access_state, access, type, mode, handle ); + + if (mode != KernelMode) + { + FIXME( "UserMode access not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "access %x not supported\n", access ); + if (access_state) FIXME( "access_state not implemented\n" ); + + if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH; + + SERVER_START_REQ( get_kernel_object_handle ) + { + req->manager = wine_server_obj_handle( get_device_manager() ); + req->user_ptr = wine_server_client_ptr( obj ); + req->access = access; + if (!(status = wine_server_call( req ))) + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return status; +} + static void *create_file_object( HANDLE handle ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 53070f3..1e46de3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -822,7 +822,7 @@ @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject @ stub ObOpenObjectByName -@ stub ObOpenObjectByPointer +@ stdcall ObOpenObjectByPointer(ptr long ptr long ptr long ptr) @ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 4bbaa79..e5d5dd8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -773,7 +773,7 @@ static void test_ob_reference(const WCHAR *test_path) { POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; - HANDLE event_handle, file_handle, file_handle2, thread_handle; + HANDLE event_handle, file_handle, file_handle2, thread_handle, handle; DISPATCHER_HEADER *header; FILE_OBJECT *file; void *obj1, *obj2; @@ -878,9 +878,24 @@ static void test_ob_reference(const WCHAR *test_path) status = wait_single(header, 0); ok(status == 0 || status == STATUS_TIMEOUT, "got %#x\n", status); - ObDereferenceObject(obj1); ObDereferenceObject(obj2); + status = ObOpenObjectByPointer(obj1, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle); + ok(status == STATUS_SUCCESS, "ObOpenObjectByPointer failed: %#x\n", status); + + status = ZwClose(handle); + ok(!status, "ZwClose failed: %#x\n", status); + + status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + ok(obj1 == obj2, "obj1 != obj2\n"); + ObDereferenceObject(obj2); + + status = ObOpenObjectByPointer(obj1, OBJ_KERNEL_HANDLE, NULL, 0, *pIoFileObjectType, KernelMode, &handle); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObOpenObjectByPointer returned: %#x\n", status); + + ObDereferenceObject(obj1); + status = ZwClose(thread_handle); ok(!status, "ZwClose failed: %#x\n", status); diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 2c61329..acdd232 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -130,6 +130,7 @@ typedef struct _FS_FILTER_CALLBACKS } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); +NTSTATUS WINAPI ObOpenObjectByPointer(void*,ULONG,PACCESS_STATE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,HANDLE*); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*);

4 years, 12 months

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 April 2019