Differences between 20080122 and 20080129 diff -p -N -d -r -U2 winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/cygwin/path.cc winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/cygwin/path.cc --- winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/cygwin/path.cc 2008-01-23 00:27:15.000000000 +0000 +++ winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/cygwin/path.cc 2008-01-29 21:16:07.000000000 +0000 @@ -379,5 +379,5 @@ mkrelpath (char *path) } -/* Beginning with Samba 3.2, Samba allows to get version information using +/* Beginning with Samba 3.0.28a, Samba allows to get version information using the ExtendedInfo member returned by a FileFsObjectIdInformation request. We just store the samba_version information for now. Older versions than @@ -475,13 +475,13 @@ fs_info::update (PUNICODE_STRING upath, #define TEST_GVI(f,m) (((f) & GETVOLINFO_VALID_MASK) == (m)) -#define FS_IS_SAMBA TEST_GVI(flags (), \ +/* Volume quotas are potentially supported since Samba 3.0, object ids and + the unicode on disk flag since Samba 3.2. */ +#define SAMBA_IGNORE (FILE_VOLUME_QUOTAS \ + | FILE_SUPPORTS_OBJECT_IDS \ + | FILE_UNICODE_ON_DISK) +#define FS_IS_SAMBA TEST_GVI(flags () & ~SAMBA_IGNORE, \ FILE_CASE_SENSITIVE_SEARCH \ | FILE_CASE_PRESERVED_NAMES \ | FILE_PERSISTENT_ACLS) -#define FS_IS_SAMBA_WITH_QUOTA TEST_GVI(flags (), \ - FILE_CASE_SENSITIVE_SEARCH \ - | FILE_CASE_PRESERVED_NAMES \ - | FILE_PERSISTENT_ACLS \ - | FILE_VOLUME_QUOTAS) #define FS_IS_NETAPP_DATAONTAP TEST_GVI(flags (), \ FILE_CASE_SENSITIVE_SEARCH \ @@ -509,8 +509,9 @@ fs_info::update (PUNICODE_STRING upath, } } - /* Test for older Samba releases not supporting the extended info. */ + /* Test for Samba on NT4 or for older Samba releases not supporting + extended info. */ if (!is_samba ()) is_samba (RtlEqualUnicodeString (&fsname, &testname, FALSE) - && (FS_IS_SAMBA || FS_IS_SAMBA_WITH_QUOTA)); + && FS_IS_SAMBA); is_netapp (!is_samba () diff -p -N -d -r -U2 winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/include/psapi.h winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/include/psapi.h --- winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/include/psapi.h 2007-03-23 12:42:50.000000000 +0000 +++ winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/include/psapi.h 2008-01-29 21:16:08.000000000 +0000 @@ -71,4 +71,8 @@ DWORD WINAPI GetDeviceDriverFileNameA(LP DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD); BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD); +#if (_WIN32_WINNT >= 0x0501) +DWORD WINAPI GetProcessImageFileNameA(HANDLE,LPSTR,DWORD); +DWORD WINAPI GetProcessImageFileNameW(HANDLE,LPWSTR,DWORD); +#endif #endif /* not RC_INVOKED */ @@ -80,4 +84,7 @@ BOOL WINAPI GetProcessMemoryInfo(HANDLE, #define GetDeviceDriverBaseName GetDeviceDriverBaseNameW #define GetDeviceDriverFileName GetDeviceDriverFileNameW +#if (_WIN32_WINNT >= 0x0501) +#define GetProcessImageFileName GetProcessImageFileNameW +#endif #else #define GetModuleBaseName GetModuleBaseNameA @@ -86,4 +93,7 @@ BOOL WINAPI GetProcessMemoryInfo(HANDLE, #define GetDeviceDriverBaseName GetDeviceDriverBaseNameA #define GetDeviceDriverFileName GetDeviceDriverFileNameA +#if (_WIN32_WINNT >= 0x0501) +#define GetProcessImageFileName GetProcessImageFileNameA +#endif #endif diff -p -N -d -r -U2 winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/include/ras.h winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/include/ras.h --- winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/include/ras.h 2004-11-10 20:05:01.000000000 +0000 +++ winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/include/ras.h 2008-01-29 21:16:08.000000000 +0000 @@ -36,4 +36,5 @@ typedef unsigned long ULONG_PTR, *PULONG #define RAS_MaxUserData 200 #define RAS_MaxReplyMessage 1024 +#define RAX_MaxDnsSuffix 256 #define RDEOPT_UsePrefixSuffix 0x00000001 #define RDEOPT_PausedStates 0x00000002 diff -p -N -d -r -U2 winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/lib/psapi.def winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/lib/psapi.def --- winsup-src-20080122/cygwin-snapshot-20080122-1/winsup/w32api/lib/psapi.def 2000-06-27 18:21:31.000000000 +0000 +++ winsup-src-20080129/cygwin-snapshot-20080129-1/winsup/w32api/lib/psapi.def 2008-01-29 21:16:08.000000000 +0000 @@ -17,4 +17,6 @@ GetModuleFileNameExW@16 GetModuleInformation@16 GetProcessMemoryInfo@12 +GetProcessImageFileNameA@12 +GetProcessImageFileNameW@12 GetWsChanges@12 InitializeProcessForWsWatch@4