From b4d72bae47bdf481d74d602e62bb4f7d8b8586c2 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 13 May 2005 20:28:00 +0000 Subject: [PATCH] * include/winnetwk.h (WNetGetResourceParentA): Add missing declaration. (WNetGetResourceParentW): Ditto. * include/ddk/ntifs.h (FILE_ID_FULL_DIRECTORY_INFORMATION): Define. --- winsup/w32api/ChangeLog | 6 +++++ winsup/w32api/include/ddk/ntifs.h | 38 +++++++++++++++++++++++++++++++ winsup/w32api/include/winnetwk.h | 4 ++++ 3 files changed, 48 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 34d2349f6..42606155c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2005-05-13 Corinna Vinschen + + * include/winnetwk.h (WNetGetResourceParentA): Add missing declaration. + (WNetGetResourceParentW): Ditto. + * include/ddk/ntifs.h (FILE_ID_FULL_DIRECTORY_INFORMATION): Define. + 2005-04-26 Danny Smith * include/wininet.h (FtpGetFileSize): Add prototype. diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h index 0621d83c6..4737a4254 100644 --- a/winsup/w32api/include/ddk/ntifs.h +++ b/winsup/w32api/include/ddk/ntifs.h @@ -938,6 +938,44 @@ typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { WCHAR FileName[0]; } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION; +#if (VER_PRODUCTBUILD >= 2600) + +typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + LARGE_INTEGER FileId; + WCHAR FileName[0]; +} FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION; + +typedef struct _FILE_ID_BOTH_DIRECTORY_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[0]; +} FILE_ID_BOTH_DIRECTORY_INFORMATION, *PFILE_ID_BOTH_DIRECTORY_INFORMATION; + +#endif + typedef struct _FILE_EA_INFORMATION { ULONG EaSize; } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; diff --git a/winsup/w32api/include/winnetwk.h b/winsup/w32api/include/winnetwk.h index 0e7344625..f37b4ebe8 100644 --- a/winsup/w32api/include/winnetwk.h +++ b/winsup/w32api/include/winnetwk.h @@ -278,6 +278,8 @@ DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT); DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT); DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*); DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEA,LPVOID,LPDWORD,LPWSTR*); +DWORD APIENTRY WNetGetResourceParentA(LPNETRESOURCEA,LPVOID,LPDWORD); +DWORD APIENTRY WNetGetResourceParentW(LPNETRESOURCEW,LPVOID,LPDWORD); DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD); DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD); DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); @@ -294,6 +296,7 @@ typedef UNIVERSAL_NAME_INFOW UNIVERSAL_NAME_INFO,*LPUNIVERSAL_NAME_INFO; #define WNetEnumResource WNetEnumResourceW #define WNetOpenEnum WNetOpenEnumW #define WNetGetResourceInformation WNetGetResourceInformationW +#define WNetGetResourceParent WNetGetResourceParentW #define WNetGetUniversalName WNetGetUniversalNameW #define WNetSetConnection WNetSetConnectionW #define WNetUseConnection WNetUseConnectionW @@ -322,6 +325,7 @@ typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO,*LPREMOTE_NAME_INFO; #define WNetOpenEnum WNetOpenEnumA #define WNetEnumResource WNetEnumResourceA #define WNetGetResourceInformation WNetGetResourceInformationA +#define WNetGetResourceParent WNetGetResourceParentA #define WNetGetUniversalName WNetGetUniversalNameA #define WNetConnectionDialog1 WNetConnectionDialog1A #define WNetDisconnectDialog1 WNetDisconnectDialog1A