Author: akhaldi Date: Sat Sep 3 10:46:01 2016 New Revision: 72541
URL: http://svn.reactos.org/svn/reactos?rev=72541&view=rev Log: [RTL] Partially sync actctx.c with Wine Staging 1.9.16. CORE-11866
Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/rtl/actctx.c
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 3 10:46:01 2016 @@ -254,7 +254,7 @@
reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.16
-reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.9.16 reactos/sdk/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 reactos/sdk/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55
Modified: trunk/reactos/sdk/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/actctx.c?rev=72... ============================================================================== --- trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] Sat Sep 3 10:46:01 2016 @@ -2579,11 +2579,7 @@ attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile(handle, - GENERIC_READ | SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_ALERT); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); }
static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, USHORT extra_len ) @@ -2837,9 +2833,8 @@ ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup );
- NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); - if (io.Status == STATUS_SUCCESS) + if (!NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, TRUE )) { ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; @@ -2852,9 +2847,9 @@ { if (data_pos >= data_len) { - NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, FALSE ); - if (io.Status != STATUS_SUCCESS) break; + if (NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, FALSE )) + break; data_len = (ULONG)io.Information; data_pos = 0; } @@ -2933,11 +2928,8 @@ attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL;
- if (!NtOpenFile(&handle, - GENERIC_READ | SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; file = lookup_manifest_file( handle, &sxs_ai ); @@ -4764,7 +4756,7 @@ }
ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); - if (source) RtlFreeHeap( RtlGetProcessHeap(), 0, source ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source ); if (!ret) { status = STATUS_NO_SUCH_FILE;