diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:10:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:10:57 +0000 |
commit | 1259a2a9fe566ec479f54f031b8ac54a416a8e32 (patch) | |
tree | b9020d296482e6ed653a050ea62934803fd3f86b | |
parent | INTEGRATION: CWS mingwport06 (1.4.14); FILE MERGED (diff) | |
download | core-1259a2a9fe566ec479f54f031b8ac54a416a8e32.tar.gz core-1259a2a9fe566ec479f54f031b8ac54a416a8e32.zip |
INTEGRATION: CWS mingwport06 (1.3.14); FILE MERGED
2007/08/24 14:05:00 vg 1.3.14.1: #i80359# MinGW port efforts
-rw-r--r-- | external/mingwheaders/mingw_headers.patch | 75 |
1 files changed, 67 insertions, 8 deletions
diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch index 16496fc5eced..56f61b9af197 100644 --- a/external/mingwheaders/mingw_headers.patch +++ b/external/mingwheaders/mingw_headers.patch @@ -379,7 +379,7 @@ #ifdef __cplusplus } --- include/winbase.h.orig 2006-11-19 08:08:36.000000000 +0900 -+++ include/winbase.h 2007-01-20 00:16:33.484375000 +0900 ++++ include/winbase.h 2007-07-27 21:14:27.621750000 +0900 @@ -993,12 +993,14 @@ WORD Reserved2; CHAR szPathName[OFS_MAXPATHNAME]; @@ -395,7 +395,7 @@ #if (_WIN32_WINNT >= 0x0501) typedef struct tagACTCTXA { ULONG cbSize; -@@ -1337,8 +1337,8 @@ +@@ -1337,8 +1339,8 @@ WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD); WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*); #if (_WIN32_WINNT >= 0x0500) @@ -406,7 +406,7 @@ WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD); WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD); #endif -@@ -1346,7 +1346,7 @@ +@@ -1346,7 +1348,7 @@ WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW); #if (_WIN32_WINNT >= 0x0500) @@ -415,7 +415,7 @@ WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD); WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD); WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); -@@ -1458,10 +1458,10 @@ +@@ -1458,10 +1460,10 @@ WINBASEAPI DWORD WINAPI GetLogicalDrives(void); WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR); WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR); @@ -428,7 +428,7 @@ WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD); WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD); WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD); -@@ -1499,9 +1499,9 @@ +@@ -1499,9 +1501,9 @@ #endif WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID); WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); @@ -440,7 +440,7 @@ #if (_WIN32_WINNT >= 0x0500) WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS); #endif -@@ -1779,9 +1779,9 @@ +@@ -1779,9 +1781,9 @@ WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE); WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR); @@ -452,7 +452,15 @@ WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE); WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR); -@@ -2122,9 +2122,9 @@ +@@ -2016,6 +2018,7 @@ + WINBASEAPI BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR); + WINBASEAPI BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR); + WINBASEAPI DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL); ++WINBASEAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); + #define Yield() + #if (_WIN32_WINNT >= 0x0501) + WINBASEAPI BOOL WINAPI ZombifyActCtx(HANDLE); +@@ -2122,9 +2125,9 @@ #define GetFileAttributesEx GetFileAttributesExW #define GetFullPathName GetFullPathNameW #define GetLogicalDriveStrings GetLogicalDriveStringsW @@ -464,7 +472,7 @@ #define GetModuleFileName GetModuleFileNameW #define GetModuleHandle GetModuleHandleW #if (_WIN32_WINNT >= 0x0500) -@@ -2317,9 +2317,9 @@ +@@ -2317,9 +2320,9 @@ #define GetFileAttributesEx GetFileAttributesExA #define GetFullPathName GetFullPathNameA #define GetLogicalDriveStrings GetLogicalDriveStringsA @@ -1292,6 +1300,57 @@ #define __notnull #define __maybenull #define __readonly +--- include/sspi.h.orig 2007-07-07 19:02:37.037875000 +0900 ++++ include/sspi.h 2007-07-07 19:15:05.011625000 +0900 +@@ -2001,48 +2001,6 @@ + // The EX version below is preferred. + + // begin_ntifs +-#ifndef _AUTH_IDENTITY_DEFINED +-#define _AUTH_IDENTITY_DEFINED +- +-#define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1 +-#define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2 +- +-typedef struct _SEC_WINNT_AUTH_IDENTITY_W { +- unsigned short *User; +- unsigned long UserLength; +- unsigned short *Domain; +- unsigned long DomainLength; +- unsigned short *Password; +- unsigned long PasswordLength; +- unsigned long Flags; +-} SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W; +- +-// end_ntifs +- +-typedef struct _SEC_WINNT_AUTH_IDENTITY_A { +- unsigned char *User; +- unsigned long UserLength; +- unsigned char *Domain; +- unsigned long DomainLength; +- unsigned char *Password; +- unsigned long PasswordLength; +- unsigned long Flags; +-} SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A; +- +- +-#ifdef UNICODE +-#define SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY_W // ntifs +-#define PSEC_WINNT_AUTH_IDENTITY PSEC_WINNT_AUTH_IDENTITY_W // ntifs +-#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_W // ntifs +-#else // UNICODE +-#define SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY_A +-#define PSEC_WINNT_AUTH_IDENTITY PSEC_WINNT_AUTH_IDENTITY_A +-#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_A +-#endif // UNICODE +- +-#endif //_AUTH_IDENTITY_DEFINED // ntifs +- +-// begin_ntifs + // + // This is the combined authentication identity structure that may be + // used with the negotiate package, NTLM, Kerberos, or SCHANNEL --- include/strmif.h.orig 2005-04-14 17:54:58.000000000 +0900 +++ include/strmif.h 2007-01-02 22:04:39.312500000 +0900 @@ -1,3 +1,6 @@ |