* _dbdao.h, afxres.h, azroles.h, dbghelp.h, http.h, iprtrmib.h, mprapi.h, mscat.h, mspab.h, mspcall.h, mspcoll.h, mspenum.h, msplog.h, mspst.h, mspstrm.h, mspterm.h, mspthrd.h, msptrmac.h, msptrmar.h, msptrmvc.h, msputils.h, w32api.h, winbase.h, wincred.h, wincrypt.h, winhttp.h, winioctl.h, winnt.h, winsvc.h, winuser.h, wmiatlprov.h: Merged trivial whitespace changes and add missing public domain headers from experimental/vista_7_headers. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2844 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index c3e37e6..d878253 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,13 @@ +2010-07-16 Ozkan Sezer <sezeroz@gmail.com> + + * _dbdao.h, afxres.h, azroles.h, dbghelp.h, http.h, iprtrmib.h, + mprapi.h, mscat.h, mspab.h, mspcall.h, mspcoll.h, mspenum.h, msplog.h, + mspst.h, mspstrm.h, mspterm.h, mspthrd.h, msptrmac.h, msptrmar.h, + msptrmvc.h, msputils.h, w32api.h, winbase.h, wincred.h, wincrypt.h, + winhttp.h, winioctl.h, winnt.h, winsvc.h, winuser.h, wmiatlprov.h: + Merged trivial whitespace changes and add missing public domain + headers from experimental/vista_7_headers. + 2010-07-09 Ozkan Sezer <sezeroz@gmail.com> Incorrect version guards around the TCP_TABLE_CLASS enumeration:
diff --git a/mingw-w64-headers/include/_dbdao.h b/mingw-w64-headers/include/_dbdao.h index 2c43d30..66a81b9 100644 --- a/mingw-w64-headers/include/_dbdao.h +++ b/mingw-w64-headers/include/_dbdao.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef __DBDAO_H_ #define __DBDAO_H_
diff --git a/mingw-w64-headers/include/afxres.h b/mingw-w64-headers/include/afxres.h index 2aae5e9..fa991c9 100644 --- a/mingw-w64-headers/include/afxres.h +++ b/mingw-w64-headers/include/afxres.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _AFXRES_H #define _AFXRES_H #if __GNUC__ >= 3
diff --git a/mingw-w64-headers/include/azroles.h b/mingw-w64-headers/include/azroles.h index 3319ffe..4e2a08c 100644 --- a/mingw-w64-headers/include/azroles.h +++ b/mingw-w64-headers/include/azroles.h
@@ -2477,29 +2477,90 @@ #ifndef __AZROLESLib_LIBRARY_DEFINED__ #define __AZROLESLib_LIBRARY_DEFINED__ typedef enum tagAZ_PROP_CONSTANTS { - AZ_PROP_NAME = 1,AZ_PROP_DESCRIPTION = 2,AZ_PROP_WRITABLE = 3,AZ_PROP_APPLICATION_DATA = 4,AZ_PROP_CHILD_CREATE = 5, - AZ_MAX_APPLICATION_NAME_LENGTH = 512,AZ_MAX_OPERATION_NAME_LENGTH = 64,AZ_MAX_TASK_NAME_LENGTH = 64,AZ_MAX_SCOPE_NAME_LENGTH = 65536, - AZ_MAX_GROUP_NAME_LENGTH = 64,AZ_MAX_ROLE_NAME_LENGTH = 64,AZ_MAX_NAME_LENGTH = 65536,AZ_MAX_DESCRIPTION_LENGTH = 1024, - AZ_MAX_APPLICATION_DATA_LENGTH = 4096,AZ_SUBMIT_FLAG_ABORT = 0x1,AZ_MAX_POLICY_URL_LENGTH = 65536,AZ_AZSTORE_FLAG_CREATE = 0x1, - AZ_AZSTORE_FLAG_MANAGE_STORE_ONLY = 0x2,AZ_AZSTORE_FLAG_BATCH_UPDATE = 0x4,AZ_AZSTORE_FLAG_AUDIT_IS_CRITICAL = 0x8, - AZ_AZSTORE_FORCE_APPLICATION_CLOSE = 0x10,AZ_PROP_AZSTORE_DOMAIN_TIMEOUT = 100,AZ_AZSTORE_DEFAULT_DOMAIN_TIMEOUT = 15 *1000, - AZ_PROP_AZSTORE_SCRIPT_ENGINE_TIMEOUT = 101,AZ_AZSTORE_MIN_DOMAIN_TIMEOUT = 500,AZ_AZSTORE_MIN_SCRIPT_ENGINE_TIMEOUT = 5 *1000, - AZ_AZSTORE_DEFAULT_SCRIPT_ENGINE_TIMEOUT = 45 *1000,AZ_PROP_AZSTORE_MAX_SCRIPT_ENGINES = 102,AZ_AZSTORE_DEFAULT_MAX_SCRIPT_ENGINES = 120, - AZ_PROP_AZSTORE_MAJOR_VERSION = 103,AZ_PROP_AZSTORE_MINOR_VERSION = 104,AZ_PROP_AZSTORE_TARGET_MACHINE = 105,AZ_PROP_OPERATION_ID = 200, - AZ_PROP_TASK_OPERATIONS = 300,AZ_PROP_TASK_BIZRULE = 301,AZ_PROP_TASK_BIZRULE_LANGUAGE = 302,AZ_PROP_TASK_TASKS = 303, - AZ_PROP_TASK_BIZRULE_IMPORTED_PATH = 304,AZ_PROP_TASK_IS_ROLE_DEFINITION = 305,AZ_MAX_TASK_BIZRULE_LENGTH = 65536, - AZ_MAX_TASK_BIZRULE_LANGUAGE_LENGTH = 64,AZ_MAX_TASK_BIZRULE_IMPORTED_PATH_LENGTH = 512,AZ_MAX_BIZRULE_STRING = 65536, - AZ_PROP_GROUP_TYPE = 400,AZ_GROUPTYPE_LDAP_QUERY = 1,AZ_GROUPTYPE_BASIC = 2,AZ_PROP_GROUP_APP_MEMBERS = 401,AZ_PROP_GROUP_APP_NON_MEMBERS = 402, - AZ_PROP_GROUP_LDAP_QUERY = 403,AZ_MAX_GROUP_LDAP_QUERY_LENGTH = 4096,AZ_PROP_GROUP_MEMBERS = 404,AZ_PROP_GROUP_NON_MEMBERS = 405, - AZ_PROP_GROUP_MEMBERS_NAME = 406,AZ_PROP_GROUP_NON_MEMBERS_NAME = 407,AZ_PROP_ROLE_APP_MEMBERS = 500,AZ_PROP_ROLE_MEMBERS = 501, - AZ_PROP_ROLE_OPERATIONS = 502,AZ_PROP_ROLE_TASKS = 504,AZ_PROP_ROLE_MEMBERS_NAME = 505,AZ_PROP_SCOPE_BIZRULES_WRITABLE = 600, - AZ_PROP_SCOPE_CAN_BE_DELEGATED = 601,AZ_PROP_CLIENT_CONTEXT_USER_DN = 700,AZ_PROP_CLIENT_CONTEXT_USER_SAM_COMPAT = 701, - AZ_PROP_CLIENT_CONTEXT_USER_DISPLAY = 702,AZ_PROP_CLIENT_CONTEXT_USER_GUID = 703,AZ_PROP_CLIENT_CONTEXT_USER_CANONICAL = 704, - AZ_PROP_CLIENT_CONTEXT_USER_UPN = 705,AZ_PROP_CLIENT_CONTEXT_USER_DNS_SAM_COMPAT = 707,AZ_PROP_CLIENT_CONTEXT_ROLE_FOR_ACCESS_CHECK = 708, - AZ_PROP_CLIENT_CONTEXT_LDAP_QUERY_DN = 709,AZ_PROP_APPLICATION_AUTHZ_INTERFACE_CLSID = 800,AZ_PROP_APPLICATION_VERSION = 801, - AZ_MAX_APPLICATION_VERSION_LENGTH = 512,AZ_PROP_APPLICATION_NAME = 802,AZ_PROP_APPLY_STORE_SACL = 900,AZ_PROP_GENERATE_AUDITS = 901, - AZ_PROP_POLICY_ADMINS = 902,AZ_PROP_POLICY_READERS = 903,AZ_PROP_DELEGATED_POLICY_USERS = 904,AZ_PROP_POLICY_ADMINS_NAME = 905, - AZ_PROP_POLICY_READERS_NAME = 906,AZ_PROP_DELEGATED_POLICY_USERS_NAME = 907,AZ_CLIENT_CONTEXT_SKIP_GROUP = 1,AZ_CLIENT_CONTEXT_SKIP_LDAP_QUERY = 1 + AZ_PROP_NAME = 1, + AZ_PROP_DESCRIPTION = 2, + AZ_PROP_WRITABLE = 3, + AZ_PROP_APPLICATION_DATA = 4, + AZ_PROP_CHILD_CREATE = 5, + AZ_MAX_APPLICATION_NAME_LENGTH = 512, + AZ_MAX_OPERATION_NAME_LENGTH = 64, + AZ_MAX_TASK_NAME_LENGTH = 64, + AZ_MAX_SCOPE_NAME_LENGTH = 65536, + AZ_MAX_GROUP_NAME_LENGTH = 64, + AZ_MAX_ROLE_NAME_LENGTH = 64, + AZ_MAX_NAME_LENGTH = 65536, + AZ_MAX_DESCRIPTION_LENGTH = 1024, + AZ_MAX_APPLICATION_DATA_LENGTH = 4096, + AZ_SUBMIT_FLAG_ABORT = 0x1, + AZ_MAX_POLICY_URL_LENGTH = 65536, + AZ_AZSTORE_FLAG_CREATE = 0x1, + AZ_AZSTORE_FLAG_MANAGE_STORE_ONLY = 0x2, + AZ_AZSTORE_FLAG_BATCH_UPDATE = 0x4, + AZ_AZSTORE_FLAG_AUDIT_IS_CRITICAL = 0x8, + AZ_AZSTORE_FORCE_APPLICATION_CLOSE = 0x10, + AZ_PROP_AZSTORE_DOMAIN_TIMEOUT = 100, + AZ_AZSTORE_DEFAULT_DOMAIN_TIMEOUT = ( 15 * 1000 ), + AZ_PROP_AZSTORE_SCRIPT_ENGINE_TIMEOUT = 101, + AZ_AZSTORE_MIN_DOMAIN_TIMEOUT = 500, + AZ_AZSTORE_MIN_SCRIPT_ENGINE_TIMEOUT = ( 5 * 1000 ), + AZ_AZSTORE_DEFAULT_SCRIPT_ENGINE_TIMEOUT = ( 45 * 1000 ), + AZ_PROP_AZSTORE_MAX_SCRIPT_ENGINES = 102, + AZ_AZSTORE_DEFAULT_MAX_SCRIPT_ENGINES = 120, + AZ_PROP_AZSTORE_MAJOR_VERSION = 103, + AZ_PROP_AZSTORE_MINOR_VERSION = 104, + AZ_PROP_AZSTORE_TARGET_MACHINE = 105, + AZ_PROP_OPERATION_ID = 200, + AZ_PROP_TASK_OPERATIONS = 300, + AZ_PROP_TASK_BIZRULE = 301, + AZ_PROP_TASK_BIZRULE_LANGUAGE = 302, + AZ_PROP_TASK_TASKS = 303, + AZ_PROP_TASK_BIZRULE_IMPORTED_PATH = 304, + AZ_PROP_TASK_IS_ROLE_DEFINITION = 305, + AZ_MAX_TASK_BIZRULE_LENGTH = 65536, + AZ_MAX_TASK_BIZRULE_LANGUAGE_LENGTH = 64, + AZ_MAX_TASK_BIZRULE_IMPORTED_PATH_LENGTH = 512, + AZ_MAX_BIZRULE_STRING = 65536, + AZ_PROP_GROUP_TYPE = 400, + AZ_GROUPTYPE_LDAP_QUERY = 1, + AZ_GROUPTYPE_BASIC = 2, + AZ_PROP_GROUP_APP_MEMBERS = 401, + AZ_PROP_GROUP_APP_NON_MEMBERS = 402, + AZ_PROP_GROUP_LDAP_QUERY = 403, + AZ_MAX_GROUP_LDAP_QUERY_LENGTH = 4096, + AZ_PROP_GROUP_MEMBERS = 404, + AZ_PROP_GROUP_NON_MEMBERS = 405, + AZ_PROP_GROUP_MEMBERS_NAME = 406, + AZ_PROP_GROUP_NON_MEMBERS_NAME = 407, + AZ_PROP_ROLE_APP_MEMBERS = 500, + AZ_PROP_ROLE_MEMBERS = 501, + AZ_PROP_ROLE_OPERATIONS = 502, + AZ_PROP_ROLE_TASKS = 504, + AZ_PROP_ROLE_MEMBERS_NAME = 505, + AZ_PROP_SCOPE_BIZRULES_WRITABLE = 600, + AZ_PROP_SCOPE_CAN_BE_DELEGATED = 601, + AZ_PROP_CLIENT_CONTEXT_USER_DN = 700, + AZ_PROP_CLIENT_CONTEXT_USER_SAM_COMPAT = 701, + AZ_PROP_CLIENT_CONTEXT_USER_DISPLAY = 702, + AZ_PROP_CLIENT_CONTEXT_USER_GUID = 703, + AZ_PROP_CLIENT_CONTEXT_USER_CANONICAL = 704, + AZ_PROP_CLIENT_CONTEXT_USER_UPN = 705, + AZ_PROP_CLIENT_CONTEXT_USER_DNS_SAM_COMPAT = 707, + AZ_PROP_CLIENT_CONTEXT_ROLE_FOR_ACCESS_CHECK = 708, + AZ_PROP_CLIENT_CONTEXT_LDAP_QUERY_DN = 709, + AZ_PROP_APPLICATION_AUTHZ_INTERFACE_CLSID = 800, + AZ_PROP_APPLICATION_VERSION = 801, + AZ_MAX_APPLICATION_VERSION_LENGTH = 512, + AZ_PROP_APPLICATION_NAME = 802, + AZ_PROP_APPLY_STORE_SACL = 900, + AZ_PROP_GENERATE_AUDITS = 901, + AZ_PROP_POLICY_ADMINS = 902, + AZ_PROP_POLICY_READERS = 903, + AZ_PROP_DELEGATED_POLICY_USERS = 904, + AZ_PROP_POLICY_ADMINS_NAME = 905, + AZ_PROP_POLICY_READERS_NAME = 906, + AZ_PROP_DELEGATED_POLICY_USERS_NAME = 907, + AZ_CLIENT_CONTEXT_SKIP_GROUP = 1, + AZ_CLIENT_CONTEXT_SKIP_LDAP_QUERY = 1 } AZ_PROP_CONSTANTS; EXTERN_C const IID LIBID_AZROLESLib;
diff --git a/mingw-w64-headers/include/dbghelp.h b/mingw-w64-headers/include/dbghelp.h index a67a8f5..894b9d6 100644 --- a/mingw-w64-headers/include/dbghelp.h +++ b/mingw-w64-headers/include/dbghelp.h
@@ -1188,8 +1188,12 @@ } MINIDUMP_INCLUDE_THREAD_CALLBACK,*PMINIDUMP_INCLUDE_THREAD_CALLBACK; typedef enum _THREAD_WRITE_FLAGS { - ThreadWriteThread = 0x0001,ThreadWriteStack = 0x0002,ThreadWriteContext = 0x0004,ThreadWriteBackingStore = 0x0008, - ThreadWriteInstructionWindow = 0x0010,ThreadWriteThreadData = 0x0020 + ThreadWriteThread = 0x0001, + ThreadWriteStack = 0x0002, + ThreadWriteContext = 0x0004, + ThreadWriteBackingStore = 0x0008, + ThreadWriteInstructionWindow = 0x0010, + ThreadWriteThreadData = 0x0020 } THREAD_WRITE_FLAGS; typedef struct _MINIDUMP_MODULE_CALLBACK { @@ -1210,8 +1214,11 @@ } MINIDUMP_INCLUDE_MODULE_CALLBACK,*PMINIDUMP_INCLUDE_MODULE_CALLBACK; typedef enum _MODULE_WRITE_FLAGS { - ModuleWriteModule = 0x0001,ModuleWriteDataSeg = 0x0002,ModuleWriteMiscRecord = 0x0004,ModuleWriteCvRecord = 0x0008, - ModuleReferencedByMemory = 0x0010 + ModuleWriteModule = 0x0001, + ModuleWriteDataSeg = 0x0002, + ModuleWriteMiscRecord = 0x0004, + ModuleWriteCvRecord = 0x0008, + ModuleReferencedByMemory = 0x0010 } MODULE_WRITE_FLAGS; typedef struct _MINIDUMP_CALLBACK_INPUT { @@ -1236,13 +1243,21 @@ ULONG MemorySize; }; }; - } MINIDUMP_CALLBACK_OUTPUT,*PMINIDUMP_CALLBACK_OUTPUT; + } MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; typedef enum _MINIDUMP_TYPE { - MiniDumpNormal = 0x0000,MiniDumpWithDataSegs = 0x0001,MiniDumpWithFullMemory = 0x0002,MiniDumpWithHandleData = 0x0004, - MiniDumpFilterMemory = 0x0008,MiniDumpScanMemory = 0x0010,MiniDumpWithUnloadedModules = 0x0020,MiniDumpWithIndirectlyReferencedMemory = 0x0040, - MiniDumpFilterModulePaths = 0x0080,MiniDumpWithProcessThreadData = 0x0100,MiniDumpWithPrivateReadWriteMemory = 0x0200, - MiniDumpWithoutOptionalData = 0x0400 + MiniDumpNormal = 0x00000000, + MiniDumpWithDataSegs = 0x00000001, + MiniDumpWithFullMemory = 0x00000002, + MiniDumpWithHandleData = 0x00000004, + MiniDumpFilterMemory = 0x00000008, + MiniDumpScanMemory = 0x00000010, + MiniDumpWithUnloadedModules = 0x00000020, + MiniDumpWithIndirectlyReferencedMemory = 0x00000040, + MiniDumpFilterModulePaths = 0x00000080, + MiniDumpWithProcessThreadData = 0x00000100, + MiniDumpWithPrivateReadWriteMemory = 0x00000200, + MiniDumpWithoutOptionalData = 0x00000400 } MINIDUMP_TYPE; typedef WINBOOL (WINAPI *MINIDUMP_CALLBACK_ROUTINE)(PVOID CallbackParam,CONST PMINIDUMP_CALLBACK_INPUT CallbackInput,PMINIDUMP_CALLBACK_OUTPUT CallbackOutput);
diff --git a/mingw-w64-headers/include/http.h b/mingw-w64-headers/include/http.h index 2a10baa..b24b08d 100644 --- a/mingw-w64-headers/include/http.h +++ b/mingw-w64-headers/include/http.h
@@ -203,7 +203,10 @@ } HTTP_RESPONSE,*PHTTP_RESPONSE; typedef enum _HTTP_CACHE_POLICY_TYPE { - HttpCachePolicyNocache,HttpCachePolicyUserInvalidates,HttpCachePolicyTimeToLive,HttpCachePolicyMaximum + HttpCachePolicyNocache, + HttpCachePolicyUserInvalidates, + HttpCachePolicyTimeToLive, + HttpCachePolicyMaximum } HTTP_CACHE_POLICY_TYPE,*PHTTP_CACHE_POLICY_TYPE; typedef struct _HTTP_CACHE_POLICY { @@ -212,11 +215,16 @@ } HTTP_CACHE_POLICY,*PHTTP_CACHE_POLICY; typedef enum _HTTP_SERVICE_CONFIG_ID { - HttpServiceConfigIPListenList,HttpServiceConfigSSLCertInfo,HttpServiceConfigUrlAclInfo,HttpServiceConfigMax + HttpServiceConfigIPListenList, + HttpServiceConfigSSLCertInfo, + HttpServiceConfigUrlAclInfo, + HttpServiceConfigMax } HTTP_SERVICE_CONFIG_ID,*PHTTP_SERVICE_CONFIG_ID; typedef enum _HTTP_SERVICE_CONFIG_QUERY_TYPE { - HttpServiceConfigQueryExact,HttpServiceConfigQueryNext,HttpServiceConfigQueryMax + HttpServiceConfigQueryExact, + HttpServiceConfigQueryNext, + HttpServiceConfigQueryMax } HTTP_SERVICE_CONFIG_QUERY_TYPE,*PHTTP_SERVICE_CONFIG_QUERY_TYPE; typedef struct _HTTP_SERVICE_CONFIG_SSL_KEY { @@ -312,4 +320,5 @@ #ifdef __cplusplus } #endif -#endif + +#endif /* __HTTP_H__ */
diff --git a/mingw-w64-headers/include/iprtrmib.h b/mingw-w64-headers/include/iprtrmib.h index 0d652a8..0b04407 100644 --- a/mingw-w64-headers/include/iprtrmib.h +++ b/mingw-w64-headers/include/iprtrmib.h
@@ -7,7 +7,6 @@ #define __ROUTING_IPRTRMIB_H__ #include <mprapi.h> - #include <ipifcons.h> #define IPRTRMGR_PID 10000 @@ -739,4 +738,5 @@ #define DEFINE_MIB_BUFFER(X,Y,Z) DWORD __rgdwBuff[MIB_INFO_SIZE_IN_DWORDS(Y)]; PMIB_OPAQUE_INFO X = (PMIB_OPAQUE_INFO)__rgdwBuff; Y *Z = (Y *)(X->rgbyData) #define CAST_MIB_INFO(X,Y,Z) Z = (Y)(X->rgbyData) -#endif + +#endif /* __ROUTING_IPRTRMIB_H__ */
diff --git a/mingw-w64-headers/include/mprapi.h b/mingw-w64-headers/include/mprapi.h index d2b2fb3..efc2b0a 100644 --- a/mingw-w64-headers/include/mprapi.h +++ b/mingw-w64-headers/include/mprapi.h
@@ -618,4 +618,5 @@ #ifdef __cplusplus } #endif -#endif + +#endif /* __ROUTING_MPRADMIN_H__ */
diff --git a/mingw-w64-headers/include/mscat.h b/mingw-w64-headers/include/mscat.h index f344d8d..68d799b 100644 --- a/mingw-w64-headers/include/mscat.h +++ b/mingw-w64-headers/include/mscat.h
@@ -102,23 +102,23 @@ typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *); -WINBOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); +WINBOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); -WINBOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); +WINBOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); -WINBOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD); -WINBOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); -WINBOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); -WINBOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD); -WINBOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD); -WINBOOL WINAPI CryptCATCDFClose(CRYPTCATCDF *); +WINBOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD); +WINBOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); +WINBOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); +WINBOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD); +WINBOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD); +WINBOOL WINAPI CryptCATCDFClose(CRYPTCATCDF *); CRYPTCATATTRIBUTE * WINAPI CryptCATCDFEnumCatAttributes(CRYPTCATCDF *, CRYPTCATATTRIBUTE *, PFN_CDF_PARSE_ERROR_CALLBACK); LPWSTR WINAPI CryptCATCDFEnumMembersByCDFTagEx(CRYPTCATCDF *, LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK, CRYPTCATMEMBER **, WINBOOL, LPVOID); CRYPTCATCDF * WINAPI CryptCATCDFOpen(LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK); -WINBOOL WINAPI CryptCATClose(HANDLE); +WINBOOL WINAPI CryptCATClose(HANDLE); CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateAttr(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *); CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateCatAttr(HANDLE, CRYPTCATATTRIBUTE *); CRYPTCATMEMBER * WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER *);
diff --git a/mingw-w64-headers/include/mspab.h b/mingw-w64-headers/include/mspab.h index 4a4a9cf..50d14c6 100644 --- a/mingw-w64-headers/include/mspab.h +++ b/mingw-w64-headers/include/mspab.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #define PAB_PROVIDER_ID { 0xB5,0x3b,0xc2,0xc0,0x2c,0x77,0x10,0x1a,0xa1,0xbc,0x08,0x00,0x2b,0x2a,0x56,0xc2 } #define PR_PAB_PATH PROP_TAG(PT_TSTRING,0x6600)
diff --git a/mingw-w64-headers/include/mspcall.h b/mingw-w64-headers/include/mspcall.h index 145679c..444f924 100644 --- a/mingw-w64-headers/include/mspcall.h +++ b/mingw-w64-headers/include/mspcall.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef __MSPCALL_H_ #define __MSPCALL_H_
diff --git a/mingw-w64-headers/include/mspcoll.h b/mingw-w64-headers/include/mspcoll.h index 6bf186e..5da3da3 100644 --- a/mingw-w64-headers/include/mspcoll.h +++ b/mingw-w64-headers/include/mspcoll.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPCOLL_H_ #define _MSPCOLL_H_
diff --git a/mingw-w64-headers/include/mspenum.h b/mingw-w64-headers/include/mspenum.h index ac172f9..8af4697 100644 --- a/mingw-w64-headers/include/mspenum.h +++ b/mingw-w64-headers/include/mspenum.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPENUM_H_ #define _MSPENUM_H_
diff --git a/mingw-w64-headers/include/msplog.h b/mingw-w64-headers/include/msplog.h index 57efb7f..5660b13 100644 --- a/mingw-w64-headers/include/msplog.h +++ b/mingw-w64-headers/include/msplog.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPLOG_H_ #define _MSPLOG_H_
diff --git a/mingw-w64-headers/include/mspst.h b/mingw-w64-headers/include/mspst.h index bd3de48..f1b2233 100644 --- a/mingw-w64-headers/include/mspst.h +++ b/mingw-w64-headers/include/mspst.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPST_H_ #define _MSPST_H_
diff --git a/mingw-w64-headers/include/mspstrm.h b/mingw-w64-headers/include/mspstrm.h index a0098b5..4002f4b 100644 --- a/mingw-w64-headers/include/mspstrm.h +++ b/mingw-w64-headers/include/mspstrm.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPSTRM_H_ #define _MSPSTRM_H_
diff --git a/mingw-w64-headers/include/mspterm.h b/mingw-w64-headers/include/mspterm.h index 77e031d..a9ba385 100644 --- a/mingw-w64-headers/include/mspterm.h +++ b/mingw-w64-headers/include/mspterm.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPTERM_H_ #define _MSPTERM_H_
diff --git a/mingw-w64-headers/include/mspthrd.h b/mingw-w64-headers/include/mspthrd.h index dd3e5d5..645e3d0 100644 --- a/mingw-w64-headers/include/mspthrd.h +++ b/mingw-w64-headers/include/mspthrd.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef __MSPTHRD_H #define __MSPTHRD_H
diff --git a/mingw-w64-headers/include/msptrmac.h b/mingw-w64-headers/include/msptrmac.h index 04a83f0..8743ded 100644 --- a/mingw-w64-headers/include/msptrmac.h +++ b/mingw-w64-headers/include/msptrmac.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPTRMAC_H_ #define _MSPTRMAC_H_
diff --git a/mingw-w64-headers/include/msptrmar.h b/mingw-w64-headers/include/msptrmar.h index 257c66e..f47b14c 100644 --- a/mingw-w64-headers/include/msptrmar.h +++ b/mingw-w64-headers/include/msptrmar.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPTRMAR_H_ #define _MSPTRMAR_H_
diff --git a/mingw-w64-headers/include/msptrmvc.h b/mingw-w64-headers/include/msptrmvc.h index 4e7508b..26d7f15 100644 --- a/mingw-w64-headers/include/msptrmvc.h +++ b/mingw-w64-headers/include/msptrmvc.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _MSPTRMVC_H_ #define _MSPTRMVC_H_
diff --git a/mingw-w64-headers/include/msputils.h b/mingw-w64-headers/include/msputils.h index 63aba74..0a33834 100644 --- a/mingw-w64-headers/include/msputils.h +++ b/mingw-w64-headers/include/msputils.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef __MSPUTILS_H_ #define __MSPUTILS_H_
diff --git a/mingw-w64-headers/include/w32api.h b/mingw-w64-headers/include/w32api.h index c3e36c3..c6157b6 100644 --- a/mingw-w64-headers/include/w32api.h +++ b/mingw-w64-headers/include/w32api.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef _W32API_H #define _W32API_H #define _W32API_H_
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h index 576d2db..a7f1833 100644 --- a/mingw-w64-headers/include/winbase.h +++ b/mingw-w64-headers/include/winbase.h
@@ -2733,14 +2733,14 @@ #define SYMBOLIC_LINK_FLAG_FILE 0x0 #define SYMBOLIC_LINK_FLAG_DIRECTORY 0x1 - WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkA (LPSTR lpSymLinkFileName, LPSTR lpTargetFileName, DWORD dwFlags); - WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkW (LPWSTR lpSymLinkFileName, LPWSTR lpTargetFileName, DWORD dwFlags); - #define CreateSymbolicLink __MINGW_NAME_AW(CreateSymbolicLink) #define CreateBoundaryDescriptor __MINGW_NAME_AW(CreateBoundaryDescriptor) #define OpenPrivateNamespace __MINGW_NAME_AW(OpenPrivateNamespace) #define CreatePrivateNamespace __MINGW_NAME_AW(CreatePrivateNamespace) +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkA (LPSTR lpSymLinkFileName, LPSTR lpTargetFileName, DWORD dwFlags); +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkW (LPWSTR lpSymLinkFileName, LPWSTR lpTargetFileName, DWORD dwFlags); + /* Condition Variables http://msdn.microsoft.com/en-us/library/ms682052%28VS.85%29.aspx */ typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE; typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
diff --git a/mingw-w64-headers/include/wincred.h b/mingw-w64-headers/include/wincred.h index a35a5f4..ed33759 100644 --- a/mingw-w64-headers/include/wincred.h +++ b/mingw-w64-headers/include/wincred.h
@@ -6,6 +6,7 @@ #ifndef _WINCRED_H_ #define _WINCRED_H_ +#include <_mingw.h> #include <_mingw_unicode.h> #define WINADVAPI DECLSPEC_IMPORT @@ -316,4 +317,6 @@ #ifdef __cplusplus } #endif -#endif + +#endif /* _WINCRED_H_ */ +
diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h index b4f7f29..3f81f40 100644 --- a/mingw-w64-headers/include/wincrypt.h +++ b/mingw-w64-headers/include/wincrypt.h
@@ -6,6 +6,7 @@ #ifndef __WINCRYPT_H__ #define __WINCRYPT_H__ +#include <_mingw.h> #include <_mingw_unicode.h> #include <guiddef.h>
diff --git a/mingw-w64-headers/include/winhttp.h b/mingw-w64-headers/include/winhttp.h index ac8ba67..23a813d 100644 --- a/mingw-w64-headers/include/winhttp.h +++ b/mingw-w64-headers/include/winhttp.h
@@ -440,7 +440,7 @@ #define WINHTTP_TIME_FORMAT_BUFSIZE 62 -typedef struct +typedef struct _URL_COMPONENTS { DWORD dwStructSize; LPWSTR lpszScheme; @@ -461,13 +461,13 @@ typedef URL_COMPONENTS URL_COMPONENTSW; typedef LPURL_COMPONENTS LPURL_COMPONENTSW; -typedef struct +typedef struct _WINHTTP_ASYNC_RESULT { DWORD_PTR dwResult; DWORD dwError; } WINHTTP_ASYNC_RESULT, *LPWINHTTP_ASYNC_RESULT; -typedef struct +typedef struct _WINHTTP_CERTIFICATE_INFO { FILETIME ftExpiry; FILETIME ftStart; @@ -488,9 +488,9 @@ typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; -typedef struct +typedef struct _WINHTTP_CURRENT_USER_IE_PROXY_CONFIG { - WINBOOL fAutoDetect; + WINBOOL fAutoDetect; LPWSTR lpszAutoConfigUrl; LPWSTR lpszProxy; LPWSTR lpszProxyBypass; @@ -519,34 +519,34 @@ extern "C" { #endif -WINBOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -WINBOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); -WINBOOL WINAPI WinHttpCheckPlatform(void); -WINBOOL WINAPI WinHttpCloseHandle(HINTERNET); +WINBOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); +WINBOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); +WINBOOL WINAPI WinHttpCheckPlatform(void); +WINBOOL WINAPI WinHttpCloseHandle(HINTERNET); HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -WINBOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -WINBOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -WINBOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -WINBOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); -WINBOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +WINBOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +WINBOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +WINBOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINBOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); +WINBOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -WINBOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -WINBOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -WINBOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -WINBOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -WINBOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); -WINBOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -WINBOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -WINBOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -WINBOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -WINBOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -WINBOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); +WINBOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); +WINBOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); +WINBOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); +WINBOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +WINBOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); +WINBOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +WINBOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +WINBOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); +WINBOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +WINBOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); +WINBOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -WINBOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -WINBOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); -WINBOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -WINBOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +WINBOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); +WINBOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); +WINBOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +WINBOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); #ifdef __cplusplus }
diff --git a/mingw-w64-headers/include/winioctl.h b/mingw-w64-headers/include/winioctl.h index e128c28..ebc65ce 100644 --- a/mingw-w64-headers/include/winioctl.h +++ b/mingw-w64-headers/include/winioctl.h
@@ -223,12 +223,69 @@ #define TAPE_RESET_STATISTICS 2L typedef enum _STORAGE_MEDIA_TYPE { - DDS_4mm = 0x20,MiniQic,Travan,QIC,MP_8mm,AME_8mm,AIT1_8mm,DLT,NCTP,IBM_3480,IBM_3490E,IBM_Magstar_3590,IBM_Magstar_MP,STK_DATA_D3,SONY_DTF, - DV_6mm,DMI,SONY_D2,CLEANER_CARTRIDGE,CD_ROM,CD_R,CD_RW,DVD_ROM,DVD_R,DVD_RW,MO_3_RW,MO_5_WO,MO_5_RW,MO_5_LIMDOW,PC_5_WO,PC_5_RW,PD_5_RW, - ABL_5_WO,PINNACLE_APEX_5_RW,SONY_12_WO,PHILIPS_12_WO,HITACHI_12_WO,CYGNET_12_WO,KODAK_14_WO,MO_NFR_525,NIKON_12_RW,IOMEGA_ZIP,IOMEGA_JAZ, - SYQUEST_EZ135,SYQUEST_EZFLYER,SYQUEST_SYJET,AVATAR_F2,MP2_8mm,DST_S,DST_M,DST_L,VXATape_1,VXATape_2,STK_9840,LTO_Ultrium,LTO_Accelis,DVD_RAM, - AIT_8mm,ADR_1,ADR_2,STK_9940,SAIT - } STORAGE_MEDIA_TYPE,*PSTORAGE_MEDIA_TYPE; + DDS_4mm = 0x20, + MiniQic, + Travan, + QIC, + MP_8mm, + AME_8mm, + AIT1_8mm, + DLT, + NCTP, + IBM_3480, + IBM_3490E, + IBM_Magstar_3590, + IBM_Magstar_MP, + STK_DATA_D3, + SONY_DTF, + DV_6mm, + DMI, + SONY_D2, + CLEANER_CARTRIDGE, + CD_ROM, + CD_R, + CD_RW, + DVD_ROM, + DVD_R, + DVD_RW, + MO_3_RW, + MO_5_WO, + MO_5_RW, + MO_5_LIMDOW, + PC_5_WO, + PC_5_RW, + PD_5_RW, + ABL_5_WO, + PINNACLE_APEX_5_RW, + SONY_12_WO, + PHILIPS_12_WO, + HITACHI_12_WO, + CYGNET_12_WO, + KODAK_14_WO, + MO_NFR_525, + NIKON_12_RW, + IOMEGA_ZIP, + IOMEGA_JAZ, + SYQUEST_EZ135, + SYQUEST_EZFLYER, + SYQUEST_SYJET, + AVATAR_F2, + MP2_8mm, + DST_S, + DST_M, + DST_L, + VXATape_1, + VXATape_2, + STK_9840, + LTO_Ultrium, + LTO_Accelis, + DVD_RAM, + AIT_8mm, + ADR_1, + ADR_2, + STK_9940, + SAIT + } STORAGE_MEDIA_TYPE, *PSTORAGE_MEDIA_TYPE; #define MEDIA_ERASEABLE 0x00000001 #define MEDIA_WRITE_ONCE 0x00000002 @@ -239,8 +296,19 @@ #define MEDIA_CURRENTLY_MOUNTED 0x80000000 typedef enum _STORAGE_BUS_TYPE { - BusTypeUnknown = 0x00,BusTypeScsi,BusTypeAtapi,BusTypeAta,BusType1394,BusTypeSsa,BusTypeFibre,BusTypeUsb,BusTypeRAID,BusTypeiScsi, - BusTypeSas,BusTypeSata,BusTypeMaxReserved = 0x7F + BusTypeUnknown = 0x00, + BusTypeScsi, + BusTypeAtapi, + BusTypeAta, + BusType1394, + BusTypeSsa, + BusTypeFibre, + BusTypeUsb, + BusTypeRAID, + BusTypeiScsi, + BusTypeSas, + BusTypeSata, + BusTypeMaxReserved = 0x7F } STORAGE_BUS_TYPE,*PSTORAGE_BUS_TYPE; typedef struct _DEVICE_MEDIA_INFO {
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index d807b7c..9f061d6 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -6335,7 +6335,7 @@ ACTCTX_REQUESTED_RUN_LEVEL_INFORMATION RunLevel; ULONG UiAccess; } ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; - + typedef VOID (CALLBACK *CleanupGroupCancelCallback)( PVOID ObjectContext, PVOID CleanupContext @@ -6344,7 +6344,7 @@ #endif /*(_WIN32_WINNT >= 0x0600)*/ #ifdef __cplusplus - } +} #endif #endif /* _WINNT_ */
diff --git a/mingw-w64-headers/include/winsvc.h b/mingw-w64-headers/include/winsvc.h index 240143a..94a88b8 100644 --- a/mingw-w64-headers/include/winsvc.h +++ b/mingw-w64-headers/include/winsvc.h
@@ -6,6 +6,7 @@ #ifndef _WINSVC_ #define _WINSVC_ +#include <_mingw.h> #include <_mingw_unicode.h> #ifndef WINADVAPI @@ -330,4 +331,5 @@ #ifdef __cplusplus } #endif -#endif + +#endif /* _WINSVC_ */
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h index fac6684..9557056 100644 --- a/mingw-w64-headers/include/winuser.h +++ b/mingw-w64-headers/include/winuser.h
@@ -18,6 +18,7 @@ #define WINVER 0x0502 #endif +#include <_mingw.h> #include <stdarg.h> #include <guiddef.h>
diff --git a/mingw-w64-headers/include/wmiatlprov.h b/mingw-w64-headers/include/wmiatlprov.h index ef4b132..d155a40 100644 --- a/mingw-w64-headers/include/wmiatlprov.h +++ b/mingw-w64-headers/include/wmiatlprov.h
@@ -1,3 +1,8 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ #ifndef __ATLWMIPROV_H__ #define __ATLWMIPROV_H__