[2/2] ntdll/file: Make NtQueryFullAttributesFile and NtQueryAttributesFile thin wrappers over internal function

Nikolay Sivov bunglehead at gmail.com
Fri Jun 5 05:06:02 CDT 2009


Calling API call in response of another API call cause problems sometimes as
described here http://bugs.winehq.org/show_bug.cgi?id=11030#c9 

Changelog:
    - Make NtQueryFullAttributesFile and NtQueryAttributesFile thin wrappers over internal function

>From 74091497173ae1a04b2812b94c305d95455f5045 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Fri, 5 Jun 2009 13:57:29 +0400
Subject: Make NtQueryFullAttributesFile and NtQueryAttributesFile thin wrappers over internal function

---
 dlls/ntdll/file.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 2a8f5fd..3fa6f19 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1965,10 +1965,10 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
 

 /******************************************************************************
- *              NtQueryFullAttributesFile   (NTDLL.@)
+ *              FILE_QueryFullAttributesFile   (internal)
  */
-NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
-                                           FILE_NETWORK_OPEN_INFORMATION *info )
+static NTSTATUS FILE_QueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
+                                              FILE_NETWORK_OPEN_INFORMATION *info )
 {
     ANSI_STRING unix_name;
     NTSTATUS status;
@@ -2011,6 +2011,15 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
     return status;
 }
 
+/******************************************************************************
+ *              NtQueryFullAttributesFile   (NTDLL.@)
+ */
+NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
+                                           FILE_NETWORK_OPEN_INFORMATION *info )
+{
+    return FILE_QueryFullAttributesFile( attr, info );
+}
+
 
 /******************************************************************************
  *              NtQueryAttributesFile   (NTDLL.@)
@@ -2021,7 +2030,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
     FILE_NETWORK_OPEN_INFORMATION full_info;
     NTSTATUS status;
 
-    if (!(status = NtQueryFullAttributesFile( attr, &full_info )))
+    if (!(status = FILE_QueryFullAttributesFile( attr, &full_info )))
     {
         info->CreationTime.QuadPart   = full_info.CreationTime.QuadPart;
         info->LastAccessTime.QuadPart = full_info.LastAccessTime.QuadPart;
-- 
1.5.6.5





More information about the wine-patches mailing list