Changeset 62713 in vbox

Timestamp:

Jul 29, 2016 9:31:16 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109287

Message:

nt.h/rtFileNativeSetAttributes-win.cpp

Location:

trunk

Files:

• include/iprt/nt/nt.h (modified) (3 diffs)
• src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp (modified) (3 diffs)

trunk/include/iprt/nt/nt.h

@@ -42 +42 @@
 # define NtQuerySystemInformation       ZwQuerySystemInformation
 # define NtQuerySecurityObject          ZwQuerySecurityObject
+# define NtSetInformationFile           ZwSetInformationFile
 # define NtClose                        ZwClose
 # define NtCreateFile                   ZwCreateFile
@@ -1600 +1601 @@
 NTSYSAPI NTSTATUS NTAPI NtQueryDirectoryFile(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, PVOID, ULONG,
                                              FILE_INFORMATION_CLASS, BOOLEAN, PUNICODE_STRING, BOOLEAN);
+NTSYSAPI NTSTATUS NTAPI NtSetInformationFile(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS);
+
 
 /** For use with KeyBasicInformation. */
@@ -2368 +2371 @@
 #endif
 
+/*NTSYSAPI ULONG NTAPI RtlNtStatusToDosError(NTSTATUS rcNt);*/
+
+
 RT_C_DECLS_END
 /** @} */

trunk/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-/* APIs used here require DDK headers. */
-#pragma warning(disable: 4668)
-#include <wdm.h>
-#pragma warning(default: 4668)
+#include <iprt/nt/nt.h>
+#include <iprt/string.h>
 
-/* Declare ntdll exports. */
-extern "C"
-{
-NTSYSAPI ULONG NTAPI RtlNtStatusToDosError (IN NTSTATUS Status);
-
-NTSYSAPI NTSTATUS NTAPI NtSetInformationFile(IN HANDLE FileHandle,
-                                             OUT PIO_STATUS_BLOCK IoStatusBlock,
-                                             IN PVOID FileInformation,
-                                             IN ULONG Length,
-                                             IN FILE_INFORMATION_CLASS FileInformationClass);
-}
 
 /** Windows/NT worker.
@@ -51 +38 @@
 {
     IO_STATUS_BLOCK IoStatusBlock;
-    memset(&IoStatusBlock, 0, sizeof(IoStatusBlock));
+    RT_ZERO(IoStatusBlock);
 
     /*
@@ -59 +46 @@
      */
     FILE_BASIC_INFORMATION Info;
-    memset(&Info, 0, sizeof(Info));
+    RT_ZERO(Info);
     Info.FileAttributes = fAttributes;
 
     /** @todo resolve dynamically to avoid dragging in NtDll? */
-    NTSTATUS Status = NtSetInformationFile(hFile,
-                                           &IoStatusBlock,
-                                           &Info,
-                                           sizeof(Info),
-                                           FileBasicInformation);
-
-    return RtlNtStatusToDosError(Status);
+    NTSTATUS rcNt = NtSetInformationFile(hFile,
+                                         &IoStatusBlock,
+                                         &Info,
+                                         sizeof(Info),
+                                         FileBasicInformation);
+    return RtlNtStatusToDosError(rcNt);
 }