2010-07-08  Ozkan Sezer  <sezeroz@gmail.com>
	Merge some obvious parts from experimental/vista_7_headers:
	* winbase.h: Remove commented out AdjustCalendarDate, CALDATETIME & co.
	(GetProcessDEPPolicy): Remove incorrect version guard.
	(SetProcessDEPPolicy): Likewise.
	(GetSystemDEPPolicy): Likewise.
	(DEP_SYSTEM_POLICY_TYPE): Likewise.
	(LOGON_WITH_PROFILE): Use the same style as LOGON_ZERO_PASSWORD_BUFFER.
	(LOGON_NETCREDENTIALS_ONLY): Likewise.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2813 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ChangeLog

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 7596f4c..cd995b6 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-08  Ozkan Sezer  <sezeroz@gmail.com>
+
+	Merge some obvious parts from experimental/vista_7_headers:
+	* winbase.h: Remove commented out AdjustCalendarDate, CALDATETIME & co.
+	(GetProcessDEPPolicy): Remove incorrect version guard.
+	(SetProcessDEPPolicy): Likewise.
+	(GetSystemDEPPolicy): Likewise.
+	(DEP_SYSTEM_POLICY_TYPE): Likewise.
+	(LOGON_WITH_PROFILE): Use the same style as LOGON_ZERO_PASSWORD_BUFFER.
+	(LOGON_NETCREDENTIALS_ONLY): Likewise.
+
 2010-07-06  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* ntddndis.h: Added a few endif comments.

mingw-w64-headers/include/winbase.h

diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index cceb0e6..5e0a1d4 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -1231,11 +1231,11 @@
   WINBASEAPI DWORD WINAPI GetLongPathNameW(LPCWSTR lpszShortPath,LPWSTR lpszLongPath,DWORD cchBuffer);
   WINBASEAPI WINBOOL WINAPI GetProcessAffinityMask(HANDLE hProcess,PDWORD_PTR lpProcessAffinityMask,PDWORD_PTR lpSystemAffinityMask);
   WINBASEAPI WINBOOL WINAPI SetProcessAffinityMask(HANDLE hProcess,DWORD_PTR dwProcessAffinityMask);
-#if (_WIN32_WINNT >= 0x0600)
-  /* available in Vista SP1 and higher */ 
+
+  /* available in XP SP3, Vista SP1 and higher */ 
   WINBASEAPI WINBOOL WINAPI GetProcessDEPPolicy (HANDLE hProcess,LPDWORD lpFlags,PBOOL lpPermanent);
   WINBASEAPI WINBOOL WINAPI SetProcessDEPPolicy (DWORD dwFlags);
-#endif
+
   WINBASEAPI WINBOOL WINAPI GetProcessHandleCount(HANDLE hProcess,PDWORD pdwHandleCount);
   WINBASEAPI WINBOOL WINAPI GetProcessTimes(HANDLE hProcess,LPFILETIME lpCreationTime,LPFILETIME lpExitTime,LPFILETIME lpKernelTime,LPFILETIME lpUserTime);
   WINBASEAPI WINBOOL WINAPI GetProcessIoCounters(HANDLE hProcess,PIO_COUNTERS lpIoCounters);
@@ -1884,8 +1884,7 @@
   WINBASEAPI HRSRC WINAPI FindResourceExA(HMODULE hModule,LPCSTR lpType,LPCSTR lpName,WORD wLanguage);
   WINBASEAPI HRSRC WINAPI FindResourceExW(HMODULE hModule,LPCWSTR lpType,LPCWSTR lpName,WORD wLanguage);
 
-#if (_WIN32_WINNT >= 0x0600)
-  /* available in Vista SP1 and higher */ 
+  /* available in XP SP3, Vista SP1 and higher */ 
   typedef enum _DEP_SYSTEM_POLICY_TYPE {
     AlwaysOff = 0,
     AlwaysOn = 1,
@@ -1893,7 +1892,6 @@
     OptOut = 3
   } DEP_SYSTEM_POLICY_TYPE;
   WINBASEAPI DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy (void);
-#endif
 
 #define ENUMRESTYPEPROC __MINGW_NAME_AW(ENUMRESTYPEPROC)
 #define ENUMRESNAMEPROC __MINGW_NAME_AW(ENUMRESNAMEPROC)
@@ -2439,8 +2437,8 @@
   WINADVAPI WINBOOL WINAPI CreateProcessAsUserA(HANDLE hToken,LPCSTR lpApplicationName,LPSTR lpCommandLine,LPSECURITY_ATTRIBUTES lpProcessAttributes,LPSECURITY_ATTRIBUTES lpThreadAttributes,WINBOOL bInheritHandles,DWORD dwCreationFlags,LPVOID lpEnvironment,LPCSTR lpCurrentDirectory,LPSTARTUPINFOA lpStartupInfo,LPPROCESS_INFORMATION lpProcessInformation);
   WINADVAPI WINBOOL WINAPI CreateProcessAsUserW(HANDLE hToken,LPCWSTR lpApplicationName,LPWSTR lpCommandLine,LPSECURITY_ATTRIBUTES lpProcessAttributes,LPSECURITY_ATTRIBUTES lpThreadAttributes,WINBOOL bInheritHandles,DWORD dwCreationFlags,LPVOID lpEnvironment,LPCWSTR lpCurrentDirectory,LPSTARTUPINFOW lpStartupInfo,LPPROCESS_INFORMATION lpProcessInformation);
 
-#define LOGON_WITH_PROFILE 0x1
-#define LOGON_NETCREDENTIALS_ONLY 0x2
+#define LOGON_WITH_PROFILE 0x00000001
+#define LOGON_NETCREDENTIALS_ONLY 0x00000002
 #define LOGON_ZERO_PASSWORD_BUFFER 0x80000000
 
   WINADVAPI WINBOOL WINAPI CreateProcessWithLogonW(LPCWSTR lpUsername,LPCWSTR lpDomain,LPCWSTR lpPassword,DWORD dwLogonFlags,LPCWSTR lpApplicationName,LPWSTR lpCommandLine,DWORD dwCreationFlags,LPVOID lpEnvironment,LPCWSTR lpCurrentDirectory,LPSTARTUPINFOW lpStartupInfo,LPPROCESS_INFORMATION lpProcessInformation);
@@ -2799,38 +2797,11 @@
 WINBASEAPI VOID WINAPI ApplicationRecoveryFinished(WINBOOL bSuccess);
 WINBASEAPI HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL pbCanceled);
 
-
-/* no associated headers
-  enum CALDATETIME_DATEUNIT {
-    EraUnit,
-    YearUnit,
-    MonthUnit,
-    WeekUnit,
-    DayUnit,
-    HourUnit,
-    MinuteUnit,
-    SecondUnit,
-    TickUnit
-  };
-  typedef struct _caldatetime {
-    CALID CalId;
-    UINT  Era;
-    UINT  Year;
-    UINT  Month;
-    UINT  Day;
-    UINT  DayOfWeek;
-    UINT  Hour;
-    UINT  Minute;
-    UINT  Second;
-    ULONG Tick;
-  } CALDATETIME, *LPCALDATETIME;
-WINBOOL AdjustCalendarDate(LPCALDATETIME lpCalDateTime,CALDATETIME_DATEUNIT calUnit,INT amount);
-*/
-
-
-#endif
+#endif /*(_WIN32_WINNT >= 0x0601)*/
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* _WINBASE_ */
+