authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-06-12 02:51:36+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-06-12 02:51:36+02:00
log4a02e080d127cc577d40f8ea5d68122ba8ac4243
treeec78ff4709cf83e749f6240445302d804a92bbaa
parentf4c7290bc51c48293690a879a428b24e520b0f68
parent78d6f1c56aa3bca72c3f336b89626982631da2e7
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #23912 from alexrp/mingw-update

`mingw`: Update MinGW-w64 to 38c8142f660b6ba11e7c408f2de1e9f8bfaf839e.

511 files changed, 7830 insertions(+), 8651 deletions(-)

lib/libc/include/any-windows-any/_mingw.h+7-1
...@@ -246,6 +246,12 @@ limitations in handling dllimport attribute. */...@@ -246,6 +246,12 @@ limitations in handling dllimport attribute. */
246#define _UCRT246#define _UCRT
247#endif247#endif
248248
249#ifdef _UCRT
250# define __MINGW_UCRT_ASM_CALL(func) __MINGW_ASM_CALL(func)
251#else
252# define __MINGW_UCRT_ASM_CALL(func)
253#endif
254
249#ifndef _WIN32_WINNT255#ifndef _WIN32_WINNT
250#define _WIN32_WINNT 0xa00256#define _WIN32_WINNT 0xa00
251#endif257#endif
...@@ -384,7 +390,7 @@ typedef int __int128 __attribute__ ((__mode__ (TI)));...@@ -384,7 +390,7 @@ typedef int __int128 __attribute__ ((__mode__ (TI)));
384390
385#ifndef __WIDL__391#ifndef __WIDL__
386392
387#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT) && !defined (_UCRT)393#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT) && !defined (_UCRT) && !(defined (_TIME_BITS) && _TIME_BITS == 64)
388#ifndef _USE_32BIT_TIME_T394#ifndef _USE_32BIT_TIME_T
389#define _USE_32BIT_TIME_T395#define _USE_32BIT_TIME_T
390#endif396#endif
lib/libc/include/any-windows-any/_mingw_mac.h+1-1
...@@ -270,7 +270,7 @@...@@ -270,7 +270,7 @@
270# define __MINGW_ATTRIB_DEPRECATED_MSVC2005270# define __MINGW_ATTRIB_DEPRECATED_MSVC2005
271#endif271#endif
272272
273#if !defined (_CRT_SECURE_NO_WARNINGS) || (_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES == 0)273#if !defined (_CRT_SECURE_NO_WARNINGS)
274# define __MINGW_ATTRIB_DEPRECATED_SEC_WARN \274# define __MINGW_ATTRIB_DEPRECATED_SEC_WARN \
275 __MINGW_ATTRIB_DEPRECATED_STR(__MINGW_SEC_WARN_STR)275 __MINGW_ATTRIB_DEPRECATED_STR(__MINGW_SEC_WARN_STR)
276#else276#else
lib/libc/include/any-windows-any/_mingw_stat64.h+3-20
...@@ -1,5 +1,8 @@...@@ -1,5 +1,8 @@
1#ifndef _STAT_DEFINED1#ifndef _STAT_DEFINED
22
3/* __stat64 is needed for compatibility with msvc */
4#define __stat64 _stat64
5
3#ifdef _USE_32BIT_TIME_T6#ifdef _USE_32BIT_TIME_T
4#define _fstat _fstat327#define _fstat _fstat32
5#define _fstati64 _fstat32i648#define _fstati64 _fstat32i64
...@@ -30,22 +33,6 @@...@@ -30,22 +33,6 @@
30 __time32_t st_ctime;33 __time32_t st_ctime;
31 };34 };
3235
33#ifndef NO_OLDNAMES
34 struct stat {
35 _dev_t st_dev;
36 _ino_t st_ino;
37 unsigned short st_mode;
38 short st_nlink;
39 short st_uid;
40 short st_gid;
41 _dev_t st_rdev;
42 _off_t st_size;
43 time_t st_atime;
44 time_t st_mtime;
45 time_t st_ctime;
46 };
47#endif /* NO_OLDNAMES */
48
49 struct _stat32i64 {36 struct _stat32i64 {
50 _dev_t st_dev;37 _dev_t st_dev;
51 _ino_t st_ino;38 _ino_t st_ino;
...@@ -88,9 +75,5 @@...@@ -88,9 +75,5 @@
88 __time64_t st_ctime;75 __time64_t st_ctime;
89 };76 };
9077
91#define __stat64 _stat64
92#define stat64 _stat64 /* for POSIX */
93#define fstat64 _fstat64 /* for POSIX */
94
95#define _STAT_DEFINED78#define _STAT_DEFINED
96#endif /* _STAT_DEFINED */79#endif /* _STAT_DEFINED */
lib/libc/include/any-windows-any/accctrl.h+2-2
...@@ -32,7 +32,7 @@ extern "C" {...@@ -32,7 +32,7 @@ extern "C" {
32 SE_DS_OBJECT_ALL,32 SE_DS_OBJECT_ALL,
33 SE_PROVIDER_DEFINED_OBJECT,33 SE_PROVIDER_DEFINED_OBJECT,
34 SE_WMIGUID_OBJECT,34 SE_WMIGUID_OBJECT,
35 SE_REGISTRY_WOW64_32KEY,35 SE_REGISTRY_WOW64_32KEY
36 } SE_OBJECT_TYPE;36 } SE_OBJECT_TYPE;
3737
38 typedef enum _TRUSTEE_TYPE {38 typedef enum _TRUSTEE_TYPE {
...@@ -56,7 +56,7 @@ extern "C" {...@@ -56,7 +56,7 @@ extern "C" {
5656
57 typedef enum _MULTIPLE_TRUSTEE_OPERATION {57 typedef enum _MULTIPLE_TRUSTEE_OPERATION {
58 NO_MULTIPLE_TRUSTEE,58 NO_MULTIPLE_TRUSTEE,
59 TRUSTEE_IS_IMPERSONATE,59 TRUSTEE_IS_IMPERSONATE
60 } MULTIPLE_TRUSTEE_OPERATION;60 } MULTIPLE_TRUSTEE_OPERATION;
6161
62 typedef struct _OBJECTS_AND_SID {62 typedef struct _OBJECTS_AND_SID {
lib/libc/include/any-windows-any/aclui.h+1-1
...@@ -112,7 +112,7 @@ extern "C" {...@@ -112,7 +112,7 @@ extern "C" {
112 SI_SHOW_OWNER_ACTIVATED,112 SI_SHOW_OWNER_ACTIVATED,
113 SI_SHOW_EFFECTIVE_ACTIVATED,113 SI_SHOW_EFFECTIVE_ACTIVATED,
114 SI_SHOW_SHARE_ACTIVATED,114 SI_SHOW_SHARE_ACTIVATED,
115 SI_SHOW_CENTRAL_POLICY_ACTIVATED,115 SI_SHOW_CENTRAL_POLICY_ACTIVATED
116 } SI_PAGE_ACTIVATED;116 } SI_PAGE_ACTIVATED;
117117
118#define GET_PAGE_TYPE(X) (UINT) ((X) &0x0000ffff)118#define GET_PAGE_TYPE(X) (UINT) ((X) &0x0000ffff)
lib/libc/include/any-windows-any/activation.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activation.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activation.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/activaut.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activaut.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activaut.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/activdbg.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activdbg.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/activdbg100.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg100.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activdbg100.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/activprof.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activprof.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activprof.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/activscp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/activscp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/activscp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/adhoc.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/adhoc.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/adhoc.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/af_irda.h+1-1
...@@ -59,7 +59,7 @@...@@ -59,7 +59,7 @@
5959
60enum {60enum {
61 LM_HB_Extension = 128,LM_HB1_PnP = 1,LM_HB1_PDA_Palmtop = 2,LM_HB1_Computer = 4,LM_HB1_Printer = 8,LM_HB1_Modem = 16,LM_HB1_Fax = 32,61 LM_HB_Extension = 128,LM_HB1_PnP = 1,LM_HB1_PDA_Palmtop = 2,LM_HB1_Computer = 4,LM_HB1_Printer = 8,LM_HB1_Modem = 16,LM_HB1_Fax = 32,
62 LM_HB1_LANAccess = 64,LM_HB2_Telephony = 1,LM_HB2_FileServer = 2,62 LM_HB1_LANAccess = 64,LM_HB2_Telephony = 1,LM_HB2_FileServer = 2
63};63};
6464
65#define LmCharSetASCII 065#define LmCharSetASCII 0
lib/libc/include/any-windows-any/agtctl_i.c deleted-50
...@@ -1,50 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#ifndef __IID_DEFINED__
11#define __IID_DEFINED__
12 typedef struct _IID {
13 unsigned long x;
14 unsigned short s1;
15 unsigned short s2;
16 unsigned char c[8];
17 } IID;
18#endif
19
20#ifndef CLSID_DEFINED
21#define CLSID_DEFINED
22 typedef IID CLSID;
23#endif
24
25 const IID IID_IAgentCtlRequest = {0x1DAB85C3,0x803A,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
26 const IID IID_IAgentCtlUserInput = {0xC4ABF875,0x8100,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
27 const IID IID_IAgentCtlBalloon = {0xF5BE8BD3,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
28 const IID IID_IAgentCtlBalloonEx = {0x822DB1C0,0x8879,0x11d1,{0x9E,0xC6,0x00,0xC0,0x4F,0xD7,0x08,0x1F}};
29 const IID IID_IAgentCtlCommand = {0xF5BE8BE3,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
30 const IID IID_IAgentCtlCommandEx = {0xB0913410,0x3B44,0x11d1,{0xAC,0xBA,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
31 const IID IID_IAgentCtlCommands = {0xF5BE8BE1,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
32 const IID IID_IAgentCtlCommandsEx = {0x6BA90C01,0x3910,0x11d1,{0xAC,0xB3,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
33 const IID IID_IAgentCtlCharacter = {0xF5BE8BD9,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
34 const IID IID_IAgentCtlAnimationNames = {0x8B77181C,0xD3EF,0x11d1,{0x85,0x00,0x00,0xC0,0x4F,0xA3,0x4A,0x14}};
35 const IID IID_IAgentCtlCharacterEx = {0xDE8EF600,0x2F82,0x11d1,{0xAC,0xAC,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
36 const IID IID_IAgentCtlCharacters = {0xF5BE8BE8,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
37 const IID IID_IAgentCtlAudioObject = {0xF5BE8BDB,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
38 const IID IID_IAgentCtlAudioObjectEx = {0xF5BE8BF0,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
39 const IID IID_IAgentCtlSpeechInput = {0xF5BE8BDD,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
40 const IID IID_IAgentCtlPropertySheet = {0xF5BE8BDF,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
41 const IID IID_IAgentCtlCommandsWindow = {0x6D0ECB27,0x9968,0x11D0,{0xAC,0x6E,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
42 const IID IID_IAgentCtl = {0xF5BE8BD1,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
43 const IID IID_IAgentCtlEx = {0x8563FF20,0x8ECC,0x11d1,{0xB9,0xB4,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
44 const IID LIBID_AgentObjects = {0xF5BE8BC2,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
45 const IID DIID__AgentEvents = {0xF5BE8BD4,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
46 const CLSID CLSID_Agent = {0xD45FD31B,0x5C6E,0x11D1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}};
47
48#ifdef __cplusplus
49}
50#endif
lib/libc/include/any-windows-any/agtsvr_i.c deleted-51
...@@ -1,51 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#ifndef __IID_DEFINED__
11#define __IID_DEFINED__
12 typedef struct _IID {
13 unsigned long x;
14 unsigned short s1;
15 unsigned short s2;
16 unsigned char c[8];
17 } IID;
18#endif
19
20#ifndef CLSID_DEFINED
21#define CLSID_DEFINED
22 typedef IID CLSID;
23#endif
24
25 const IID IID_IAgentUserInput = {0xA7B93C80,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
26 const IID IID_IAgentCommand = {0xA7B93C83,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
27 const IID IID_IAgentCommandEx = {0xB0913412,0x3B44,0x11d1,{0xAC,0xBA,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
28 const IID IID_IAgentCommands = {0xA7B93C85,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
29 const IID IID_IAgentCommandsEx = {0x6BA90C00,0x3910,0x11d1,{0xAC,0xB3,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
30 const IID IID_IAgentCommandWindow = {0x6D0ECB23,0x9968,0x11D0,{0xAC,0x6E,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
31 const IID IID_IAgentSpeechInputProperties = {0xA7B93C87,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
32 const IID IID_IAgentAudioOutputProperties = {0xA7B93C89,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
33 const IID IID_IAgentAudioOutputPropertiesEx = {0xA7B93CA0,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
34 const IID IID_IAgentPropertySheet = {0xA7B93C8B,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
35 const IID IID_IAgentBalloon = {0xA7B93C8D,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
36 const IID IID_IAgentBalloonEx = {0xD7A6D440,0x8872,0x11d1,{0x9E,0xC6,0x00,0xC0,0x4F,0xD7,0x08,0x1F}};
37 const IID IID_IAgentCharacter = {0xA7B93C8F,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
38 const IID IID_IAgentCharacterEx = {0x98BBE491,0x2EED,0x11d1,{0xAC,0xAC,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
39 const IID IID_IAgent = {0xA7B93C91,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
40 const IID IID_IAgentEx = {0x48D12BA0,0x5B77,0x11d1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}};
41 const IID IID_IAgentNotifySink = {0x00D18159,0x8466,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
42 const IID IID_IAgentNotifySinkEx = {0x08C75162,0x3C9C,0x11d1,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}};
43 const IID IID_IAgentPrivateNotifySink = {0xB741B760,0x8EA6,0x11d0,{0xAC,0x6A,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
44 const IID IID_IAgentCustomMarshalMaker = {0x408D7542,0xC8FC,0x11d1,{0xAA,0x83,0x00,0xC0,0x4F,0xA3,0x4D,0x72}};
45 const IID IID_IAgentClientStatus = {0xC5649F70,0x7AED,0x11d1,{0xB9,0xA8,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
46 const IID LIBID_AgentServerObjects = {0xA7B93C73,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}};
47 const CLSID CLSID_AgentServer = {0xD45FD2FC,0x5C6E,0x11D1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}};
48
49#ifdef __cplusplus
50}
51#endif
lib/libc/include/any-windows-any/alg.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/alg.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/alg.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/alink.h+1-1
...@@ -35,7 +35,7 @@ typedef enum _AssemblyFlags {...@@ -35,7 +35,7 @@ typedef enum _AssemblyFlags {
35 afCleanModules = 0x00000002,35 afCleanModules = 0x00000002,
36 afNoRefHash = 0x00000004,36 afNoRefHash = 0x00000004,
37 afNoDupTypeCheck = 0x00000008,37 afNoDupTypeCheck = 0x00000008,
38 afDupeCheckTypeFwds = 0x00000010,38 afDupeCheckTypeFwds = 0x00000010
39} AssemblyFlags;39} AssemblyFlags;
4040
41EXTERN_GUID (CLSID_AssemblyLinker, 0xf7e02368, 0xa7f4, 0x471f, 0x8c, 0x5e, 0x98, 0x39, 0xed, 0x57, 0xcb, 0x5e);41EXTERN_GUID (CLSID_AssemblyLinker, 0xf7e02368, 0xa7f4, 0x471f, 0x8c, 0x5e, 0x98, 0x39, 0xed, 0x57, 0xcb, 0x5e);
lib/libc/include/any-windows-any/amstream.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/amstream.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/amstream.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/amvideo.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/amvideo.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/amvideo.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/aqadmtyp.h+2-2
...@@ -10,7 +10,7 @@...@@ -10,7 +10,7 @@
10#define QUEUE_ADMIN_MAX_BUFFER_REQUIRED 20010#define QUEUE_ADMIN_MAX_BUFFER_REQUIRED 200
1111
12typedef enum tagQUEUE_ADMIN_VERSIONS {12typedef enum tagQUEUE_ADMIN_VERSIONS {
13 CURRENT_QUEUE_ADMIN_VERSION = 4,13 CURRENT_QUEUE_ADMIN_VERSION = 4
14} QUEUE_ADMIN_VERSIONS;14} QUEUE_ADMIN_VERSIONS;
1515
16typedef struct tagMESSAGE_FILTER {16typedef struct tagMESSAGE_FILTER {
...@@ -54,7 +54,7 @@ typedef enum tagMESSAGE_ENUM_FILTER_TYPE {...@@ -54,7 +54,7 @@ typedef enum tagMESSAGE_ENUM_FILTER_TYPE {
54 MEF_N_OLDEST_MESSAGES = 0x80,54 MEF_N_OLDEST_MESSAGES = 0x80,
55 MEF_FAILED = 0x100,55 MEF_FAILED = 0x100,
56 MEF_ALL = 0x40000000,56 MEF_ALL = 0x40000000,
57 MEF_INVERTSENSE = 0x80000000,57 MEF_INVERTSENSE = 0x80000000
58} MESSAGE_ENUM_FILTER_TYPE;58} MESSAGE_ENUM_FILTER_TYPE;
5959
60typedef struct tagMESSAGE_ENUM_FILTER {60typedef struct tagMESSAGE_ENUM_FILTER {
lib/libc/include/any-windows-any/asyncinfo.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/asyncinfo.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/asyncinfo.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/audioapotypes.h+1-1
...@@ -29,7 +29,7 @@ typedef struct APO_CONNECTION_PROPERTY {...@@ -29,7 +29,7 @@ typedef struct APO_CONNECTION_PROPERTY {
2929
30typedef enum {30typedef enum {
31 AUDIO_CURVE_TYPE_NONE = 0,31 AUDIO_CURVE_TYPE_NONE = 0,
32 AUDIO_CURVE_TYPE_WINDOWS_FADE = 1,32 AUDIO_CURVE_TYPE_WINDOWS_FADE = 1
33} AUDIO_CURVE_TYPE;33} AUDIO_CURVE_TYPE;
34#endif34#endif
3535
lib/libc/include/any-windows-any/audioclient.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/audioclient.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/audioclient.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/audioendpoints.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/audioendpoints.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/audioendpoints.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/audiopolicy.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/audiopolicy.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/audiopolicy.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/austream.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/austream.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/austream.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/authz.h+1-1
...@@ -243,7 +243,7 @@ extern "C" {...@@ -243,7 +243,7 @@ extern "C" {
243 AuthzAuditEventInfoOperationType,243 AuthzAuditEventInfoOperationType,
244 AuthzAuditEventInfoObjectType,244 AuthzAuditEventInfoObjectType,
245 AuthzAuditEventInfoObjectName,245 AuthzAuditEventInfoObjectName,
246 AuthzAuditEventInfoAdditionalInfo,246 AuthzAuditEventInfoAdditionalInfo
247 } AUTHZ_AUDIT_EVENT_INFORMATION_CLASS;247 } AUTHZ_AUDIT_EVENT_INFORMATION_CLASS;
248248
249 AUTHZAPI WINBOOL WINAPI AuthzFreeAuditEvent (AUTHZ_AUDIT_EVENT_HANDLE hAuditEvent);249 AUTHZAPI WINBOOL WINAPI AuthzFreeAuditEvent (AUTHZ_AUDIT_EVENT_HANDLE hAuditEvent);
lib/libc/include/any-windows-any/bdaiface.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bdaiface.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bdaiface.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bdaiface_enums.h+3-3
...@@ -1,6 +1,6 @@...@@ -1,6 +1,6 @@
1/** 1/**
2 * This file is part of the mingw-w64 runtime package. 2 * This file is part of the mingw-w64 runtime package.
3 * No warranty is given; refer to the file DISCLAIMER within this package. 3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */4 */
5#ifndef BDAIFACE_ENUMS_H5#ifndef BDAIFACE_ENUMS_H
6#define BDAIFACE_ENUMS_H6#define BDAIFACE_ENUMS_H
lib/libc/include/any-windows-any/bdatypes.h+3-3
...@@ -69,7 +69,7 @@ typedef enum MEDIA_SAMPLE_CONTENT...@@ -69,7 +69,7 @@ typedef enum MEDIA_SAMPLE_CONTENT
6969
70typedef enum ISDBCAS_REQUEST_ID {70typedef enum ISDBCAS_REQUEST_ID {
71 ISDBCAS_REQUEST_ID_EMG = 0x38,71 ISDBCAS_REQUEST_ID_EMG = 0x38,
72 ISDBCAS_REQUEST_ID_EMD = 0x3a,72 ISDBCAS_REQUEST_ID_EMD = 0x3a
73} ISDBCAS_REQUEST_ID;73} ISDBCAS_REQUEST_ID;
7474
75typedef enum MUX_PID_TYPE {75typedef enum MUX_PID_TYPE {
...@@ -299,7 +299,7 @@ typedef enum tagScanModulationTypes...@@ -299,7 +299,7 @@ typedef enum tagScanModulationTypes
299 ScanModulationTypesMask_DVBC = BDA_MOD_64QAM | BDA_SCAN_MOD_128QAM |299 ScanModulationTypesMask_DVBC = BDA_MOD_64QAM | BDA_SCAN_MOD_128QAM |
300 BDA_MOD_256QAM,300 BDA_MOD_256QAM,
301 BDA_SCAN_MOD_16APSK = 0x10000000,301 BDA_SCAN_MOD_16APSK = 0x10000000,
302 BDA_SCAN_MOD_32APSK = 0x20000000,302 BDA_SCAN_MOD_32APSK = 0x20000000
303} ScanModulationTypes;303} ScanModulationTypes;
304304
305#ifdef __WIDL__305#ifdef __WIDL__
...@@ -460,7 +460,7 @@ typedef enum ApplicationTypeType {...@@ -460,7 +460,7 @@ typedef enum ApplicationTypeType {
460 SCTE28_CopyProtection,460 SCTE28_CopyProtection,
461 SCTE28_Diagnostic,461 SCTE28_Diagnostic,
462 SCTE28_Undesignated,462 SCTE28_Undesignated,
463 SCTE28_Reserved,463 SCTE28_Reserved
464} ApplicationTypeType;464} ApplicationTypeType;
465465
466#ifdef __WIDL__466#ifdef __WIDL__
lib/libc/include/any-windows-any/bits.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bits1_5.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits1_5.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits1_5.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bits2_0.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits2_0.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits2_0.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bits2_5.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits2_5.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits2_5.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bits3_0.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits3_0.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits3_0.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/bits5_0.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/bits5_0.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/bits5_0.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/cdoex_i.c deleted-106
...@@ -1,106 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14#ifndef INITGUID
15#define INITGUID
16#include <guiddef.h>
17#undef INITGUID
18#else
19#include <guiddef.h>
20#endif
21#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
22#else
23#ifndef __IID_DEFINED__
24#define __IID_DEFINED__
25 typedef struct _IID {
26 unsigned long x;
27 unsigned short s1;
28 unsigned short s2;
29 unsigned char c[8];
30 } IID;
31#endif
32
33#ifndef CLSID_DEFINED
34#define CLSID_DEFINED
35 typedef IID CLSID;
36#endif
37#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
38#endif
39
40#if defined __cplusplus && !defined CDO_NO_NAMESPACE
41 namespace CDO {
42#else
43#undef IDataSource
44#endif
45
46 MIDL_DEFINE_GUID(IID,IID_IDataSource,0xCD000029,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
47 MIDL_DEFINE_GUID(IID,IID_IMessage,0xCD000020,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
48 MIDL_DEFINE_GUID(IID,IID_IBodyPart,0xCD000021,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
49 MIDL_DEFINE_GUID(IID,IID_IConfiguration,0xCD000022,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
50 MIDL_DEFINE_GUID(IID,IID_IMessages,0xCD000025,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
51 MIDL_DEFINE_GUID(IID,IID_IDropDirectory,0xCD000024,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
52 MIDL_DEFINE_GUID(IID,IID_IBodyParts,0xCD000023,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
53 MIDL_DEFINE_GUID(IID,IID_ISMTPScriptConnector,0xCD000030,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
54 MIDL_DEFINE_GUID(IID,IID_INNTPEarlyScriptConnector,0xCD000034,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
55 MIDL_DEFINE_GUID(IID,IID_INNTPPostScriptConnector,0xCD000031,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
56 MIDL_DEFINE_GUID(IID,IID_INNTPFinalScriptConnector,0xCD000032,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
57 MIDL_DEFINE_GUID(IID,IID_ISMTPOnArrival,0xCD000026,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
58 MIDL_DEFINE_GUID(IID,IID_INNTPOnPostEarly,0xCD000033,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
59 MIDL_DEFINE_GUID(IID,IID_INNTPOnPost,0xCD000027,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
60 MIDL_DEFINE_GUID(IID,IID_INNTPOnPostFinal,0xCD000028,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
61 MIDL_DEFINE_GUID(IID,IID_IProxyObject,0xCD000083,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
62 MIDL_DEFINE_GUID(IID,IID_IItem,0xCD000126,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
63 MIDL_DEFINE_GUID(IID,IID_IAppointment,0xCD000120,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
64 MIDL_DEFINE_GUID(IID,IID_ICalendarMessage,0xCD000122,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
65 MIDL_DEFINE_GUID(IID,IID_IIntegers,0xCD00012E,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
66 MIDL_DEFINE_GUID(IID,IID_IVariants,0xCD00012F,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
67 MIDL_DEFINE_GUID(IID,IID_IRecurrencePattern,0xCD000123,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
68 MIDL_DEFINE_GUID(IID,IID_IException,0xCD000124,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
69 MIDL_DEFINE_GUID(IID,IID_IRecurrencePatterns,0xCD00012C,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
70 MIDL_DEFINE_GUID(IID,IID_IExceptions,0xCD00012D,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
71 MIDL_DEFINE_GUID(IID,IID_ICalendarPart,0xCD000133,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
72 MIDL_DEFINE_GUID(IID,IID_ICalendarParts,0xCD000130,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
73 MIDL_DEFINE_GUID(IID,IID_IAttendee,0xCD000135,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
74 MIDL_DEFINE_GUID(IID,IID_IAttendees,0xCD000136,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
75 MIDL_DEFINE_GUID(IID,IID_IMailbox,0xCD000125,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
76 MIDL_DEFINE_GUID(IID,IID_IFolder,0xCD000132,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
77 MIDL_DEFINE_GUID(IID,IID_IContactGroupMembers,0xCD000138,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
78 MIDL_DEFINE_GUID(IID,IID_IPerson,0xCD000127,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
79 MIDL_DEFINE_GUID(IID,IID_IAddressee,0xCD000139,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
80 MIDL_DEFINE_GUID(IID,IID_IAddressees,0xCD000142,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
81 MIDL_DEFINE_GUID(IID,IID_IGetInterface,0xCD0ff000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
82 MIDL_DEFINE_GUID(IID,LIBID_CDO,0xCD000000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
83 MIDL_DEFINE_GUID(CLSID,CLSID_Message,0xCD000001,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
84 MIDL_DEFINE_GUID(CLSID,CLSID_Configuration,0xCD000002,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
85 MIDL_DEFINE_GUID(CLSID,CLSID_DropDirectory,0xCD000004,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
86 MIDL_DEFINE_GUID(CLSID,CLSID_SMTPConnector,0xCD000008,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
87 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPEarlyConnector,0xCD000011,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
88 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPPostConnector,0xCD000009,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
89 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPFinalConnector,0xCD000010,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
90 MIDL_DEFINE_GUID(CLSID,CLSID_Item,0xCD000112,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
91 MIDL_DEFINE_GUID(CLSID,CLSID_Appointment,0xCD000100,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
92 MIDL_DEFINE_GUID(CLSID,CLSID_CalendarMessage,0xCD000102,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
93 MIDL_DEFINE_GUID(CLSID,CLSID_Folder,0xCD00010E,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
94 MIDL_DEFINE_GUID(CLSID,CLSID_Person,0xCD000107,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
95 MIDL_DEFINE_GUID(CLSID,CLSID_Attendee,0xCD00010D,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
96 MIDL_DEFINE_GUID(CLSID,CLSID_Addressee,0xCD000110,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
97
98#undef MIDL_DEFINE_GUID
99
100#if defined __cplusplus && !defined CDO_NO_NAMESPACE
101}
102#endif
103
104#ifdef __cplusplus
105}
106#endif
lib/libc/include/any-windows-any/cdoexm_i.c deleted-59
...@@ -1,59 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14#ifndef INITGUID
15#define INITGUID
16#include <guiddef.h>
17#undef INITGUID
18#else
19#include <guiddef.h>
20#endif
21#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
22#else
23#ifndef __IID_DEFINED__
24#define __IID_DEFINED__
25 typedef struct _IID {
26 unsigned long x;
27 unsigned short s1;
28 unsigned short s2;
29 unsigned char c[8];
30 } IID;
31#endif
32
33#ifndef CLSID_DEFINED
34#define CLSID_DEFINED
35 typedef IID CLSID;
36#endif
37
38#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
39#endif
40
41 MIDL_DEFINE_GUID(IID,LIBID_CDOEXM,0x25150F00,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
42 MIDL_DEFINE_GUID(IID,IID_IDistributionList,0x25150F3F,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
43 MIDL_DEFINE_GUID(IID,IID_IMailRecipient,0x25150F40,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
44 MIDL_DEFINE_GUID(IID,IID_IMailboxStore,0x25150F41,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
45 MIDL_DEFINE_GUID(CLSID,CLSID_MailGroup,0x25150F1F,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
46 MIDL_DEFINE_GUID(CLSID,CLSID_MailRecipient,0x25150F20,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
47 MIDL_DEFINE_GUID(CLSID,CLSID_Mailbox,0x25150F21,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
48 MIDL_DEFINE_GUID(CLSID,CLSID_FolderAdmin,0x25150F22,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
49 MIDL_DEFINE_GUID(CLSID,CLSID_ExchangeServer,0x25150F27,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
50 MIDL_DEFINE_GUID(CLSID,CLSID_FolderTree,0x25150F23,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
51 MIDL_DEFINE_GUID(CLSID,CLSID_PublicStoreDB,0x25150F24,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
52 MIDL_DEFINE_GUID(CLSID,CLSID_MailboxStoreDB,0x25150F25,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
53 MIDL_DEFINE_GUID(CLSID,CLSID_StorageGroup,0x25150F26,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
54
55#undef MIDL_DEFINE_GUID
56
57#ifdef __cplusplus
58}
59#endif
lib/libc/include/any-windows-any/cdosys_i.c deleted-83
...@@ -1,83 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14#ifndef INITGUID
15#define INITGUID
16#include <guiddef.h>
17#undef INITGUID
18#else
19#include <guiddef.h>
20#endif
21
22#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
23#else
24
25#ifndef __IID_DEFINED__
26#define __IID_DEFINED__
27 typedef struct _IID {
28 unsigned long x;
29 unsigned short s1;
30 unsigned short s2;
31 unsigned char c[8];
32 } IID;
33#endif
34
35#ifndef CLSID_DEFINED
36#define CLSID_DEFINED
37 typedef IID CLSID;
38#endif
39
40#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
41#endif
42
43#if defined __cplusplus && !defined CDO_NO_NAMESPACE
44 namespace CDO {
45#else
46#undef IDataSource
47#endif
48
49 MIDL_DEFINE_GUID(IID,IID_IDataSource,0xCD000029,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
50 MIDL_DEFINE_GUID(IID,IID_IMessage,0xCD000020,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
51 MIDL_DEFINE_GUID(IID,IID_IBodyPart,0xCD000021,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
52 MIDL_DEFINE_GUID(IID,IID_IConfiguration,0xCD000022,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
53 MIDL_DEFINE_GUID(IID,IID_IMessages,0xCD000025,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
54 MIDL_DEFINE_GUID(IID,IID_IDropDirectory,0xCD000024,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
55 MIDL_DEFINE_GUID(IID,IID_IBodyParts,0xCD000023,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
56 MIDL_DEFINE_GUID(IID,IID_ISMTPScriptConnector,0xCD000030,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
57 MIDL_DEFINE_GUID(IID,IID_INNTPEarlyScriptConnector,0xCD000034,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
58 MIDL_DEFINE_GUID(IID,IID_INNTPPostScriptConnector,0xCD000031,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
59 MIDL_DEFINE_GUID(IID,IID_INNTPFinalScriptConnector,0xCD000032,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
60 MIDL_DEFINE_GUID(IID,IID_ISMTPOnArrival,0xCD000026,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
61 MIDL_DEFINE_GUID(IID,IID_INNTPOnPostEarly,0xCD000033,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
62 MIDL_DEFINE_GUID(IID,IID_INNTPOnPost,0xCD000027,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
63 MIDL_DEFINE_GUID(IID,IID_INNTPOnPostFinal,0xCD000028,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
64 MIDL_DEFINE_GUID(IID,IID_IProxyObject,0xCD000083,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
65 MIDL_DEFINE_GUID(IID,IID_IGetInterface,0xCD0ff000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
66 MIDL_DEFINE_GUID(IID,LIBID_CDO,0xCD000000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
67 MIDL_DEFINE_GUID(CLSID,CLSID_Message,0xCD000001,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
68 MIDL_DEFINE_GUID(CLSID,CLSID_Configuration,0xCD000002,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
69 MIDL_DEFINE_GUID(CLSID,CLSID_DropDirectory,0xCD000004,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
70 MIDL_DEFINE_GUID(CLSID,CLSID_SMTPConnector,0xCD000008,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
71 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPEarlyConnector,0xCD000011,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
72 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPPostConnector,0xCD000009,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
73 MIDL_DEFINE_GUID(CLSID,CLSID_NNTPFinalConnector,0xCD000010,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D);
74
75#undef MIDL_DEFINE_GUID
76
77#if defined __cplusplus && !defined CDO_NO_NAMESPACE
78}
79#endif
80
81#ifdef __cplusplus
82}
83#endif
lib/libc/include/any-windows-any/certsrv.h+1-1
...@@ -167,7 +167,7 @@...@@ -167,7 +167,7 @@
167#define __ENUM_CATYPES__167#define __ENUM_CATYPES__
168168
169typedef enum {169typedef enum {
170 ENUM_ENTERPRISE_ROOTCA = 0,ENUM_ENTERPRISE_SUBCA = 1,ENUM_STANDALONE_ROOTCA = 3,ENUM_STANDALONE_SUBCA = 4,ENUM_UNKNOWN_CA = 5,170 ENUM_ENTERPRISE_ROOTCA = 0,ENUM_ENTERPRISE_SUBCA = 1,ENUM_STANDALONE_ROOTCA = 3,ENUM_STANDALONE_SUBCA = 4,ENUM_UNKNOWN_CA = 5
171} ENUM_CATYPES;171} ENUM_CATYPES;
172172
173typedef struct _CAINFO {173typedef struct _CAINFO {
lib/libc/include/any-windows-any/comadmin.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/comadmin.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/comadmin.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/combaseapi.h+1-1
...@@ -147,7 +147,7 @@ typedef interface IRpcStubBuffer IRpcStubBuffer;...@@ -147,7 +147,7 @@ typedef interface IRpcStubBuffer IRpcStubBuffer;
147typedef interface IRpcChannelBuffer IRpcChannelBuffer;147typedef interface IRpcChannelBuffer IRpcChannelBuffer;
148148
149typedef enum tagCOINITBASE {149typedef enum tagCOINITBASE {
150 COINITBASE_MULTITHREADED = 0x0,150 COINITBASE_MULTITHREADED = 0x0
151} COINITBASE;151} COINITBASE;
152152
153#include <wtypesbase.h>153#include <wtypesbase.h>
lib/libc/include/any-windows-any/comcat.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/comcat.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/comcat.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/commctrl.h+2-2
...@@ -3827,7 +3827,7 @@ extern "C" {...@@ -3827,7 +3827,7 @@ extern "C" {
3827#define TreeView_ShowInfoTip(hwnd, hitem) (DWORD)SNDMSG ((hwnd), TVM_SHOWINFOTIP, 0,(LPARAM) (hitem))3827#define TreeView_ShowInfoTip(hwnd, hitem) (DWORD)SNDMSG ((hwnd), TVM_SHOWINFOTIP, 0,(LPARAM) (hitem))
38283828
3829 typedef enum _TVITEMPART {3829 typedef enum _TVITEMPART {
3830 TVGIPR_BUTTON = 0x0001,3830 TVGIPR_BUTTON = 0x0001
3831 } TVITEMPART;3831 } TVITEMPART;
38323832
3833 typedef struct tagTVGETITEMPARTRECTINFO {3833 typedef struct tagTVGETITEMPARTRECTINFO {
...@@ -5534,7 +5534,7 @@ WINCOMMCTRLAPI WINBOOL WINAPI Str_SetPtrW (LPWSTR *ppsz, LPCWSTR psz);...@@ -5534,7 +5534,7 @@ WINCOMMCTRLAPI WINBOOL WINAPI Str_SetPtrW (LPWSTR *ppsz, LPCWSTR psz);
5534#if NTDDI_VERSION >= 0x060000005534#if NTDDI_VERSION >= 0x06000000
5535 enum _LI_METRIC {5535 enum _LI_METRIC {
5536 LIM_SMALL,5536 LIM_SMALL,
5537 LIM_LARGE,5537 LIM_LARGE
5538 };5538 };
55395539
5540 WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric (HINSTANCE hinst, PCWSTR pszName, int lims, HICON *phico);5540 WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric (HINSTANCE hinst, PCWSTR pszName, int lims, HICON *phico);
lib/libc/include/any-windows-any/commoncontrols.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/commoncontrols.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/commoncontrols.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/control.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/control.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/control.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/cor.h+4-4
...@@ -165,14 +165,14 @@ extern "C" {...@@ -165,14 +165,14 @@ extern "C" {
165 nltUnicode = 3,165 nltUnicode = 3,
166 nltAuto = 4,166 nltAuto = 4,
167 nltOle = 5,167 nltOle = 5,
168 nltMaxValue = 7,168 nltMaxValue = 7
169 } CorNativeLinkType;169 } CorNativeLinkType;
170170
171 typedef enum {171 typedef enum {
172 nlfNone = 0x0,172 nlfNone = 0x0,
173 nlfLastError = 0x1,173 nlfLastError = 0x1,
174 nlfNoMangle = 0x2,174 nlfNoMangle = 0x2,
175 nlfMaxValue = 0x3,175 nlfMaxValue = 0x3
176 } CorNativeLinkFlags;176 } CorNativeLinkFlags;
177177
178 typedef void const *UVCP_CONSTANT;178 typedef void const *UVCP_CONSTANT;
...@@ -644,7 +644,7 @@ extern "C" {...@@ -644,7 +644,7 @@ extern "C" {
644 ValidatorModuleTypeObj = 0x00000002,644 ValidatorModuleTypeObj = 0x00000002,
645 ValidatorModuleTypeEnc = 0x00000003,645 ValidatorModuleTypeEnc = 0x00000003,
646 ValidatorModuleTypeIncr = 0x00000004,646 ValidatorModuleTypeIncr = 0x00000004,
647 ValidatorModuleTypeMax = 0x00000004,647 ValidatorModuleTypeMax = 0x00000004
648 } CorValidatorModuleType;648 } CorValidatorModuleType;
649649
650#undef INTERFACE650#undef INTERFACE
...@@ -804,7 +804,7 @@ extern "C" {...@@ -804,7 +804,7 @@ extern "C" {
804enum {804enum {
805 SIGN_MASK_ONEBYTE = 0xffffffc0,805 SIGN_MASK_ONEBYTE = 0xffffffc0,
806 SIGN_MASK_TWOBYTE = 0xffffe000,806 SIGN_MASK_TWOBYTE = 0xffffe000,
807 SIGN_MASK_FOURBYTE = 0xf0000000,807 SIGN_MASK_FOURBYTE = 0xf0000000
808};808};
809809
810extern const mdToken __declspec (selectany) g_tkCorEncodeToken[4] = { mdtTypeDef, mdtTypeRef, mdtTypeSpec, mdtBaseType };810extern const mdToken __declspec (selectany) g_tkCorEncodeToken[4] = { mdtTypeDef, mdtTypeRef, mdtTypeSpec, mdtBaseType };
lib/libc/include/any-windows-any/corecrt_startup.h+1-1
...@@ -25,7 +25,7 @@ _CRTIMP void __cdecl _set_app_type(_crt_app_type _Type);...@@ -25,7 +25,7 @@ _CRTIMP void __cdecl _set_app_type(_crt_app_type _Type);
25typedef enum _crt_argv_mode {25typedef enum _crt_argv_mode {
26 _crt_argv_no_arguments,26 _crt_argv_no_arguments,
27 _crt_argv_unexpanded_arguments,27 _crt_argv_unexpanded_arguments,
28 _crt_argv_expanded_arguments,28 _crt_argv_expanded_arguments
29} _crt_argv_mode;29} _crt_argv_mode;
3030
31_CRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode mode);31_CRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode mode);
lib/libc/include/any-windows-any/corecrt_stdio_config.h+12-2
...@@ -9,6 +9,13 @@...@@ -9,6 +9,13 @@
99
10#include <corecrt.h>10#include <corecrt.h>
1111
12#ifdef __cplusplus
13extern "C" {
14#endif
15
16unsigned __int64* __local_stdio_printf_options(void);
17unsigned __int64* __local_stdio_scanf_options(void);
18
12#define _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION 0x0001ULL19#define _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION 0x0001ULL
13#define _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR 0x0002ULL20#define _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR 0x0002ULL
14#define _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS 0x0004ULL21#define _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS 0x0004ULL
...@@ -21,11 +28,14 @@...@@ -21,11 +28,14 @@
21#define _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY 0x0004ULL28#define _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY 0x0004ULL
2229
23#ifndef _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS30#ifndef _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS
24#define _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS (_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS | _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING)31#define _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS (*__local_stdio_printf_options())
25#endif32#endif
2633
27#ifndef _CRT_INTERNAL_LOCAL_SCANF_OPTIONS34#ifndef _CRT_INTERNAL_LOCAL_SCANF_OPTIONS
28#define _CRT_INTERNAL_LOCAL_SCANF_OPTIONS _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS35#define _CRT_INTERNAL_LOCAL_SCANF_OPTIONS (*__local_stdio_scanf_options())
29#endif36#endif
3037
38#ifdef __cplusplus
39}
40#endif
31#endif /* _STDIO_CONFIG_DEFINED */41#endif /* _STDIO_CONFIG_DEFINED */
lib/libc/include/any-windows-any/corecrt_wctype.h created+164
...@@ -0,0 +1,164 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifndef _INC_CORECRT_WCTYPE
7#define _INC_CORECRT_WCTYPE
8
9#include <corecrt.h>
10
11#ifdef __cplusplus
12extern "C" {
13#endif
14
15#ifndef _WCTYPE_T_DEFINED
16#define _WCTYPE_T_DEFINED
17 typedef unsigned short wint_t;
18 typedef unsigned short wctype_t;
19#endif /* _WCTYPE_T_DEFINED */
20
21#ifndef WEOF
22#define WEOF (wint_t)(0xFFFF)
23#endif
24
25#ifndef _CRT_CTYPEDATA_DEFINED
26#define _CRT_CTYPEDATA_DEFINED
27#ifndef _CTYPE_DISABLE_MACROS
28
29#ifndef __PCTYPE_FUNC
30#define __PCTYPE_FUNC __pctype_func()
31 _CRTIMP const unsigned short* __pctype_func(void);
32#endif
33
34#ifndef _pctype
35#define _pctype (__pctype_func())
36#endif
37
38#endif
39#endif
40
41#ifndef _CRT_WCTYPEDATA_DEFINED
42#define _CRT_WCTYPEDATA_DEFINED
43#ifndef _CTYPE_DISABLE_MACROS
44#if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
45 extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
46#define _wctype (* __MINGW_IMP_SYMBOL(_wctype))
47#endif
48
49 _CRTIMP const wctype_t * __cdecl __pwctype_func(void);
50#ifndef _pwctype
51#define _pwctype (__pwctype_func())
52#endif
53#endif
54#endif
55
56#define _UPPER 0x1
57#define _LOWER 0x2
58#define _DIGIT 0x4
59#define _SPACE 0x8
60
61#define _PUNCT 0x10
62#define _CONTROL 0x20
63#define _BLANK 0x40
64#define _HEX 0x80
65
66#define _LEADBYTE 0x8000
67#define _ALPHA (0x0100|_UPPER|_LOWER)
68
69#ifndef _WCTYPE_DEFINED
70#define _WCTYPE_DEFINED
71
72 _CRTIMP int __cdecl iswalpha(wint_t _C);
73 _CRTIMP int __cdecl iswupper(wint_t _C);
74 _CRTIMP int __cdecl iswlower(wint_t _C);
75 _CRTIMP int __cdecl iswdigit(wint_t _C);
76 _CRTIMP int __cdecl iswxdigit(wint_t _C);
77 _CRTIMP int __cdecl iswspace(wint_t _C);
78 _CRTIMP int __cdecl iswpunct(wint_t _C);
79 _CRTIMP int __cdecl iswalnum(wint_t _C);
80 _CRTIMP int __cdecl iswprint(wint_t _C);
81 _CRTIMP int __cdecl iswgraph(wint_t _C);
82 _CRTIMP int __cdecl iswcntrl(wint_t _C);
83 _CRTIMP int __cdecl iswascii(wint_t _C);
84#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
85 _CRTIMP int __cdecl isleadbyte(int _C);
86#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
87 _CRTIMP wint_t __cdecl towupper(wint_t _C);
88 _CRTIMP wint_t __cdecl towlower(wint_t _C);
89 _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type);
90 _CRTIMP int __cdecl __iswcsymf(wint_t _C);
91 _CRTIMP int __cdecl __iswcsym(wint_t _C);
92 _CRTIMP int __cdecl iswblank(wint_t _C);
93#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
94 /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in
95 * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */
96 _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale);
97 _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale);
98 _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale);
99 _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale);
100 _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale);
101 _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale);
102 _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale);
103 _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale);
104 _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale);
105 _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale);
106 _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale);
107 _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale);
108 _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale);
109# ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
110 _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale);
111# endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
112 _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale);
113 _CRTIMP int __cdecl _iswblank_l(wint_t _C,_locale_t _Locale);
114#endif
115#if __MSVCRT_VERSION__ >= 0x800
116 /* These are only available since msvcr80.dll, never in msvcrt.dll. */
117 _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale);
118 _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale);
119#endif
120#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
121 _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type);
122#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
123#endif
124
125#ifndef _WCTYPE_INLINE_DEFINED
126#define _WCTYPE_INLINE_DEFINED
127
128#undef _CRT_WCTYPE_NOINLINE
129#ifndef __cplusplus
130#define iswalpha(_c) (iswctype(_c,_ALPHA))
131#define iswupper(_c) (iswctype(_c,_UPPER))
132#define iswlower(_c) (iswctype(_c,_LOWER))
133#define iswdigit(_c) (iswctype(_c,_DIGIT))
134#define iswxdigit(_c) (iswctype(_c,_HEX))
135#define iswspace(_c) (iswctype(_c,_SPACE))
136#define iswpunct(_c) (iswctype(_c,_PUNCT))
137#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT))
138#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT))
139#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
140#define iswcntrl(_c) (iswctype(_c,_CONTROL))
141#define iswascii(_c) ((unsigned)(_c) < 0x80)
142#define iswblank(_c) (((_c) == '\t') || iswctype(_c,_BLANK))
143#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
144# define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p))
145# define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p))
146# define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p))
147# define _iswdigit_l(_c,_p) (_iswctype_l(_c,_DIGIT,_p))
148# define _iswxdigit_l(_c,_p) (_iswctype_l(_c,_HEX,_p))
149# define _iswspace_l(_c,_p) (_iswctype_l(_c,_SPACE,_p))
150# define _iswpunct_l(_c,_p) (_iswctype_l(_c,_PUNCT,_p))
151# define _iswalnum_l(_c,_p) (_iswctype_l(_c,_ALPHA|_DIGIT,_p))
152# define _iswprint_l(_c,_p) (_iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT,_p))
153# define _iswgraph_l(_c,_p) (_iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT,_p))
154# define _iswcntrl_l(_c,_p) (_iswctype_l(_c,_CONTROL,_p))
155# define _iswblank_l(_c,_p) (((_c) == '\t') || _iswctype_l(_c,_BLANK,_p))
156#endif /* __MSVCRT_VERSION__ >= 0x800 */
157#endif
158#endif
159
160#ifdef __cplusplus
161}
162#endif
163
164#endif
lib/libc/include/any-windows-any/corhdr.h+13-13
...@@ -42,7 +42,7 @@ typedef enum CorTypeAttr {...@@ -42,7 +42,7 @@ typedef enum CorTypeAttr {
42 tdForwarder = 0x200000,42 tdForwarder = 0x200000,
43 tdReservedMask = 0x40800,43 tdReservedMask = 0x40800,
44 tdRTSpecialName = 0x800,44 tdRTSpecialName = 0x800,
45 tdHasSecurity = 0x40000,45 tdHasSecurity = 0x40000
46} CorTypeAttr;46} CorTypeAttr;
4747
48typedef enum CorMethodAttr {48typedef enum CorMethodAttr {
...@@ -164,7 +164,7 @@ typedef enum CorPropertyAttr {...@@ -164,7 +164,7 @@ typedef enum CorPropertyAttr {
164typedef enum CorEventAttr {164typedef enum CorEventAttr {
165 evSpecialName = 0x0200,165 evSpecialName = 0x0200,
166 evReservedMask = 0x0400,166 evReservedMask = 0x0400,
167 evRTSpecialName = 0x0400,167 evRTSpecialName = 0x0400
168} CorEventAttr;168} CorEventAttr;
169169
170typedef enum CorMethodSemanticsAttr {170typedef enum CorMethodSemanticsAttr {
...@@ -266,12 +266,12 @@ typedef enum CorAssemblyFlags {...@@ -266,12 +266,12 @@ typedef enum CorAssemblyFlags {
266typedef enum CorManifestResourceFlags {266typedef enum CorManifestResourceFlags {
267 mrVisibilityMask = 0x0007,267 mrVisibilityMask = 0x0007,
268 mrPublic = 0x0001,268 mrPublic = 0x0001,
269 mrPrivate = 0x0002,269 mrPrivate = 0x0002
270} CorManifestResourceFlags;270} CorManifestResourceFlags;
271271
272typedef enum CorFileFlags {272typedef enum CorFileFlags {
273 ffContainsMetaData = 0x0000,273 ffContainsMetaData = 0x0000,
274 ffContainsNoMetaData = 0x0001,274 ffContainsNoMetaData = 0x0001
275} CorFileFlags;275} CorFileFlags;
276276
277typedef enum CorPEKind {277typedef enum CorPEKind {
...@@ -331,7 +331,7 @@ typedef enum CorElementType {...@@ -331,7 +331,7 @@ typedef enum CorElementType {
331 ELEMENT_TYPE_MAX = 0x22,331 ELEMENT_TYPE_MAX = 0x22,
332 ELEMENT_TYPE_MODIFIER = 0x40,332 ELEMENT_TYPE_MODIFIER = 0x40,
333 ELEMENT_TYPE_SENTINEL = 0x01 | ELEMENT_TYPE_MODIFIER,333 ELEMENT_TYPE_SENTINEL = 0x01 | ELEMENT_TYPE_MODIFIER,
334 ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER,334 ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER
335} CorElementType;335} CorElementType;
336336
337typedef enum CorSerializationType {337typedef enum CorSerializationType {
...@@ -370,7 +370,7 @@ typedef enum CorCallingConvention {...@@ -370,7 +370,7 @@ typedef enum CorCallingConvention {
370 IMAGE_CEE_CS_CALLCONV_MASK = 0x0f,370 IMAGE_CEE_CS_CALLCONV_MASK = 0x0f,
371 IMAGE_CEE_CS_CALLCONV_HASTHIS = 0x20,371 IMAGE_CEE_CS_CALLCONV_HASTHIS = 0x20,
372 IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS = 0x40,372 IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS = 0x40,
373 IMAGE_CEE_CS_CALLCONV_GENERIC = 0x10,373 IMAGE_CEE_CS_CALLCONV_GENERIC = 0x10
374} CorCallingConvention;374} CorCallingConvention;
375375
376typedef enum CorUnmanagedCallingConvention {376typedef enum CorUnmanagedCallingConvention {
...@@ -381,7 +381,7 @@ typedef enum CorUnmanagedCallingConvention {...@@ -381,7 +381,7 @@ typedef enum CorUnmanagedCallingConvention {
381 IMAGE_CEE_CS_CALLCONV_C = IMAGE_CEE_UNMANAGED_CALLCONV_C,381 IMAGE_CEE_CS_CALLCONV_C = IMAGE_CEE_UNMANAGED_CALLCONV_C,
382 IMAGE_CEE_CS_CALLCONV_STDCALL = IMAGE_CEE_UNMANAGED_CALLCONV_STDCALL,382 IMAGE_CEE_CS_CALLCONV_STDCALL = IMAGE_CEE_UNMANAGED_CALLCONV_STDCALL,
383 IMAGE_CEE_CS_CALLCONV_THISCALL = IMAGE_CEE_UNMANAGED_CALLCONV_THISCALL,383 IMAGE_CEE_CS_CALLCONV_THISCALL = IMAGE_CEE_UNMANAGED_CALLCONV_THISCALL,
384 IMAGE_CEE_CS_CALLCONV_FASTCALL = IMAGE_CEE_UNMANAGED_CALLCONV_FASTCALL,384 IMAGE_CEE_CS_CALLCONV_FASTCALL = IMAGE_CEE_UNMANAGED_CALLCONV_FASTCALL
385} CorUnmanagedCallingConvention;385} CorUnmanagedCallingConvention;
386386
387typedef enum CorArgType {387typedef enum CorArgType {
...@@ -395,7 +395,7 @@ typedef enum CorArgType {...@@ -395,7 +395,7 @@ typedef enum CorArgType {
395 IMAGE_CEE_CS_OBJECT = 0x7,395 IMAGE_CEE_CS_OBJECT = 0x7,
396 IMAGE_CEE_CS_STRUCT4 = 0x8,396 IMAGE_CEE_CS_STRUCT4 = 0x8,
397 IMAGE_CEE_CS_STRUCT32 = 0x9,397 IMAGE_CEE_CS_STRUCT32 = 0x9,
398 IMAGE_CEE_CS_BYVALUE = 0xa,398 IMAGE_CEE_CS_BYVALUE = 0xa
399} CorArgType;399} CorArgType;
400400
401typedef enum CorNativeType {401typedef enum CorNativeType {
...@@ -471,7 +471,7 @@ typedef enum CorILMethodFlags {...@@ -471,7 +471,7 @@ typedef enum CorILMethodFlags {
471 CorILMethod_SmallFormat = 0x0,471 CorILMethod_SmallFormat = 0x0,
472 CorILMethod_TinyFormat = 0x0002,472 CorILMethod_TinyFormat = 0x0002,
473 CorILMethod_FatFormat = 0x0003,473 CorILMethod_FatFormat = 0x0003,
474 CorILMethod_TinyFormat1 = 0x0006,474 CorILMethod_TinyFormat1 = 0x0006
475} CorILMethodFlags;475} CorILMethodFlags;
476476
477typedef enum CorExceptionFlag {477typedef enum CorExceptionFlag {
...@@ -556,7 +556,7 @@ typedef enum CorSetENC {...@@ -556,7 +556,7 @@ typedef enum CorSetENC {
556 MDUpdateExtension = 0x00000003,556 MDUpdateExtension = 0x00000003,
557 MDUpdateIncremental = 0x00000004,557 MDUpdateIncremental = 0x00000004,
558 MDUpdateDelta = 0x00000005,558 MDUpdateDelta = 0x00000005,
559 MDUpdateMask = 0x00000007,559 MDUpdateMask = 0x00000007
560} CorSetENC;560} CorSetENC;
561561
562typedef enum CorErrorIfEmitOutOfOrder {562typedef enum CorErrorIfEmitOutOfOrder {
...@@ -567,7 +567,7 @@ typedef enum CorErrorIfEmitOutOfOrder {...@@ -567,7 +567,7 @@ typedef enum CorErrorIfEmitOutOfOrder {
567 MDFieldOutOfOrder = 0x00000002,567 MDFieldOutOfOrder = 0x00000002,
568 MDParamOutOfOrder = 0x00000004,568 MDParamOutOfOrder = 0x00000004,
569 MDPropertyOutOfOrder = 0x00000008,569 MDPropertyOutOfOrder = 0x00000008,
570 MDEventOutOfOrder = 0x00000010,570 MDEventOutOfOrder = 0x00000010
571} CorErrorIfEmitOutOfOrder;571} CorErrorIfEmitOutOfOrder;
572572
573typedef enum CorImportOptions {573typedef enum CorImportOptions {
...@@ -634,7 +634,7 @@ typedef enum CorTokenType {...@@ -634,7 +634,7 @@ typedef enum CorTokenType {
634 mdtGenericParamConstraint = 0x2c000000,634 mdtGenericParamConstraint = 0x2c000000,
635 mdtString = 0x70000000,635 mdtString = 0x70000000,
636 mdtName = 0x71000000,636 mdtName = 0x71000000,
637 mdtBaseType = 0x72000000,637 mdtBaseType = 0x72000000
638} CorTokenType;638} CorTokenType;
639639
640typedef enum CorOpenFlags {640typedef enum CorOpenFlags {
...@@ -669,7 +669,7 @@ typedef enum CorAttributeTargets {...@@ -669,7 +669,7 @@ typedef enum CorAttributeTargets {
669 catGenericParameter = 0x4000,669 catGenericParameter = 0x4000,
670 catAll = catAssembly | catModule | catClass | catStruct | catEnum | catConstructor670 catAll = catAssembly | catModule | catClass | catStruct | catEnum | catConstructor
671 | catMethod | catProperty | catField | catEvent | catInterface | catParameter | catDelegate | catGenericParameter,671 | catMethod | catProperty | catField | catEvent | catInterface | catParameter | catDelegate | catGenericParameter,
672 catClassMembers = catClass | catStruct | catEnum | catConstructor | catMethod | catProperty | catField | catEvent | catDelegate | catInterface,672 catClassMembers = catClass | catStruct | catEnum | catConstructor | catMethod | catProperty | catField | catEvent | catDelegate | catInterface
673} CorAttributeTargets;673} CorAttributeTargets;
674674
675typedef enum CorFileMapping {675typedef enum CorFileMapping {
lib/libc/include/any-windows-any/credentialprovider.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/credentialprovider.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/credentialprovider.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/crtdbg.h-2
...@@ -161,12 +161,10 @@ extern "C" {...@@ -161,12 +161,10 @@ extern "C" {
161#define _aligned_offset_malloc_dbg(s,a,o,f,l) _aligned_offset_malloc(s,a,o)161#define _aligned_offset_malloc_dbg(s,a,o,f,l) _aligned_offset_malloc(s,a,o)
162#define _aligned_offset_realloc_dbg(p,s,a,o,f,l) _aligned_offset_realloc(p,s,a,o)162#define _aligned_offset_realloc_dbg(p,s,a,o,f,l) _aligned_offset_realloc(p,s,a,o)
163163
164#if __MSVCRT_VERSION__ >= 0x900
165#define _recalloc_dbg(p,c,s,t,f,l) _recalloc(p,c,s)164#define _recalloc_dbg(p,c,s,t,f,l) _recalloc(p,c,s)
166#define _aligned_recalloc_dbg(p,c,s,a,f,l) _aligned_realloc(p,c,s,a)165#define _aligned_recalloc_dbg(p,c,s,a,f,l) _aligned_realloc(p,c,s,a)
167#define _aligned_offset_recalloc_dbg(p,c,s,a,o,f,l) _aligned_offset_recalloc(p,c,s,a,o)166#define _aligned_offset_recalloc_dbg(p,c,s,a,o,f,l) _aligned_offset_recalloc(p,c,s,a,o)
168#define _aligned_msize_dbg(p,a,o) _aligned_msize(p,a,o)167#define _aligned_msize_dbg(p,a,o) _aligned_msize(p,a,o)
169#endif
170168
171#define _malloca_dbg(s,t,f,l) _malloca(s)169#define _malloca_dbg(s,t,f,l) _malloca(s)
172#define _freea_dbg(p,t) _freea(p)170#define _freea_dbg(p,t) _freea(p)
lib/libc/include/any-windows-any/ctfutb.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/ctfutb.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/ctfutb.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/ctxtcall.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/ctxtcall.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/ctxtcall.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/ctype.h+18-163
...@@ -6,7 +6,7 @@...@@ -6,7 +6,7 @@
6#ifndef _INC_CTYPE6#ifndef _INC_CTYPE
7#define _INC_CTYPE7#define _INC_CTYPE
88
9#include <crtdefs.h>9#include <corecrt_wctype.h>
1010
11#ifdef __cplusplus11#ifdef __cplusplus
12extern "C" {12extern "C" {
...@@ -14,37 +14,6 @@ extern "C" {...@@ -14,37 +14,6 @@ extern "C" {
1414
15#ifndef WEOF15#ifndef WEOF
16#define WEOF (wint_t)(0xFFFF)16#define WEOF (wint_t)(0xFFFF)
17#endif
18
19#ifndef _CRT_CTYPEDATA_DEFINED
20#define _CRT_CTYPEDATA_DEFINED
21#ifndef _CTYPE_DISABLE_MACROS
22
23#ifndef __PCTYPE_FUNC
24#define __PCTYPE_FUNC __pctype_func()
25 _CRTIMP const unsigned short* __pctype_func(void);
26#endif
27
28#ifndef _pctype
29#define _pctype (__pctype_func())
30#endif
31
32#endif
33#endif
34
35#ifndef _CRT_WCTYPEDATA_DEFINED
36#define _CRT_WCTYPEDATA_DEFINED
37#ifndef _CTYPE_DISABLE_MACROS
38#if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
39 extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
40#define _wctype (* __MINGW_IMP_SYMBOL(_wctype))
41#endif
42
43 _CRTIMP const wctype_t * __cdecl __pwctype_func(void);
44#ifndef _pwctype
45#define _pwctype (__pwctype_func())
46#endif
47#endif
48#endif17#endif
4918
50 /* CRT stuff */19 /* CRT stuff */
...@@ -61,123 +30,45 @@ extern "C" {...@@ -61,123 +30,45 @@ extern "C" {
61 pthreadmbcinfo __cdecl __updatetmbcinfo(void);30 pthreadmbcinfo __cdecl __updatetmbcinfo(void);
62#endif31#endif
6332
64#define _UPPER 0x1
65#define _LOWER 0x2
66#define _DIGIT 0x4
67#define _SPACE 0x8
68
69#define _PUNCT 0x10
70#define _CONTROL 0x20
71#define _BLANK 0x40
72#define _HEX 0x80
73
74#define _LEADBYTE 0x8000
75#define _ALPHA (0x0100|_UPPER|_LOWER)
76
77#ifndef _CTYPE_DEFINED33#ifndef _CTYPE_DEFINED
78#define _CTYPE_DEFINED34#define _CTYPE_DEFINED
7935
80 _CRTIMP int __cdecl _isctype(int _C,int _Type);
81 _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale);
82 _CRTIMP int __cdecl isalpha(int _C);36 _CRTIMP int __cdecl isalpha(int _C);
83 _CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale);
84 _CRTIMP int __cdecl isupper(int _C);37 _CRTIMP int __cdecl isupper(int _C);
85 _CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale);
86 _CRTIMP int __cdecl islower(int _C);38 _CRTIMP int __cdecl islower(int _C);
87 _CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale);
88 _CRTIMP int __cdecl isdigit(int _C);39 _CRTIMP int __cdecl isdigit(int _C);
89 _CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale);
90 _CRTIMP int __cdecl isxdigit(int _C);40 _CRTIMP int __cdecl isxdigit(int _C);
91 _CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale);
92 _CRTIMP int __cdecl isspace(int _C);41 _CRTIMP int __cdecl isspace(int _C);
93 _CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale);
94 _CRTIMP int __cdecl ispunct(int _C);42 _CRTIMP int __cdecl ispunct(int _C);
95 _CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale);
96 _CRTIMP int __cdecl isalnum(int _C);43 _CRTIMP int __cdecl isalnum(int _C);
97 _CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale);
98 _CRTIMP int __cdecl isprint(int _C);44 _CRTIMP int __cdecl isprint(int _C);
99 _CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale);
100 _CRTIMP int __cdecl isgraph(int _C);45 _CRTIMP int __cdecl isgraph(int _C);
101 _CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale);
102 _CRTIMP int __cdecl iscntrl(int _C);46 _CRTIMP int __cdecl iscntrl(int _C);
103 _CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale);
104 _CRTIMP int __cdecl toupper(int _C);47 _CRTIMP int __cdecl toupper(int _C);
48 _CRTIMP int __cdecl _toupper(int _C);
105 _CRTIMP int __cdecl tolower(int _C);49 _CRTIMP int __cdecl tolower(int _C);
106 _CRTIMP int __cdecl _tolower(int _C);50 _CRTIMP int __cdecl _tolower(int _C);
107 _CRTIMP int __cdecl _tolower_l(int _C,_locale_t _Locale);51 _CRTIMP int __cdecl _tolower_l(int _C,_locale_t _Locale);
108 _CRTIMP int __cdecl _toupper(int _C);52 _CRTIMP int __cdecl _isctype(int _C,int _Type);
53 _CRTIMP int __cdecl isblank(int _C);
54 _CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale);
55 _CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale);
56 _CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale);
57 _CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale);
58 _CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale);
59 _CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale);
60 _CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale);
61 _CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale);
62 _CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale);
63 _CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale);
64 _CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale);
109 _CRTIMP int __cdecl _toupper_l(int _C,_locale_t _Locale);65 _CRTIMP int __cdecl _toupper_l(int _C,_locale_t _Locale);
66 _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale);
67 _CRTIMP int __cdecl _isblank_l(int _C,_locale_t _Locale);
110 _CRTIMP int __cdecl __isascii(int _C);68 _CRTIMP int __cdecl __isascii(int _C);
111 _CRTIMP int __cdecl __toascii(int _C);69 _CRTIMP int __cdecl __toascii(int _C);
112 _CRTIMP int __cdecl __iscsymf(int _C);70 _CRTIMP int __cdecl __iscsymf(int _C);
113 _CRTIMP int __cdecl __iscsym(int _C);71 _CRTIMP int __cdecl __iscsym(int _C);
114#if __MSVCRT_VERSION__ >= 0xC00
115 _CRTIMP int __cdecl isblank(int _C);
116 _CRTIMP int __cdecl _isblank_l(int _C,_locale_t _Locale);
117#else
118 int __cdecl isblank(int _C);
119#endif /* msvcr120 */
120#endif
121
122#ifndef _WCTYPE_DEFINED
123#define _WCTYPE_DEFINED
124
125 _CRTIMP int __cdecl iswalpha(wint_t _C);
126 _CRTIMP int __cdecl iswupper(wint_t _C);
127 _CRTIMP int __cdecl iswlower(wint_t _C);
128 _CRTIMP int __cdecl iswdigit(wint_t _C);
129 _CRTIMP int __cdecl iswxdigit(wint_t _C);
130 _CRTIMP int __cdecl iswspace(wint_t _C);
131 _CRTIMP int __cdecl iswpunct(wint_t _C);
132 _CRTIMP int __cdecl iswalnum(wint_t _C);
133 _CRTIMP int __cdecl iswprint(wint_t _C);
134 _CRTIMP int __cdecl iswgraph(wint_t _C);
135 _CRTIMP int __cdecl iswcntrl(wint_t _C);
136 _CRTIMP int __cdecl iswascii(wint_t _C);
137#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
138 _CRTIMP int __cdecl isleadbyte(int _C);
139#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
140 _CRTIMP wint_t __cdecl towupper(wint_t _C);
141 _CRTIMP wint_t __cdecl towlower(wint_t _C);
142 _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type);
143#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
144 /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in
145 * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */
146 _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale);
147 _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale);
148 _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale);
149 _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale);
150 _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale);
151 _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale);
152 _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale);
153 _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale);
154 _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale);
155 _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale);
156 _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale);
157 _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale);
158 _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale);
159# ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
160 _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale);
161# endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
162 _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale);
163 _CRTIMP int __cdecl __iswcsymf(wint_t _C);
164 _CRTIMP int __cdecl __iswcsym(wint_t _C);
165#endif
166#if __MSVCRT_VERSION__ >= 0x800
167 /* These are only available since msvcr80.dll, never in msvcrt.dll. */
168 _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale);
169 _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale);
170#endif
171#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
172 _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type);
173#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
174
175#if __MSVCRT_VERSION__ >= 0xC00
176 _CRTIMP int __cdecl iswblank(wint_t _C);
177 _CRTIMP int __cdecl _iswblank_l(wint_t _C,_locale_t _Locale);
178#else
179 int __cdecl iswblank(wint_t _C);
180#endif /* msvcr120 */
181#endif72#endif
18273
183#ifndef _CTYPE_DISABLE_MACROS74#ifndef _CTYPE_DISABLE_MACROS
...@@ -209,48 +100,12 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);...@@ -209,48 +100,12 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
209#define _isprint_l(_Char,_Locale) _ischartype_l(_Char,_BLANK|_PUNCT|_ALPHA|_DIGIT,_Locale)100#define _isprint_l(_Char,_Locale) _ischartype_l(_Char,_BLANK|_PUNCT|_ALPHA|_DIGIT,_Locale)
210#define _isgraph_l(_Char,_Locale) _ischartype_l(_Char,_PUNCT|_ALPHA|_DIGIT,_Locale)101#define _isgraph_l(_Char,_Locale) _ischartype_l(_Char,_PUNCT|_ALPHA|_DIGIT,_Locale)
211#define _iscntrl_l(_Char,_Locale) _ischartype_l(_Char,_CONTROL,_Locale)102#define _iscntrl_l(_Char,_Locale) _ischartype_l(_Char,_CONTROL,_Locale)
103#define _isblank_l(_Char,_Locale) (((_Char) == '\t') || _ischartype_l(_Char,_BLANK,_Locale))
212#define _tolower(_Char) ((_Char)-'A'+'a')104#define _tolower(_Char) ((_Char)-'A'+'a')
213#define _toupper(_Char) ((_Char)-'a'+'A')105#define _toupper(_Char) ((_Char)-'a'+'A')
214#define __isascii(_Char) ((unsigned)(_Char) < 0x80)106#define __isascii(_Char) ((unsigned)(_Char) < 0x80)
215#define __toascii(_Char) ((_Char) & 0x7f)107#define __toascii(_Char) ((_Char) & 0x7f)
216108
217#ifndef _WCTYPE_INLINE_DEFINED
218#define _WCTYPE_INLINE_DEFINED
219
220#undef _CRT_WCTYPE_NOINLINE
221#ifndef __cplusplus
222#define iswalpha(_c) (iswctype(_c,_ALPHA))
223#define iswupper(_c) (iswctype(_c,_UPPER))
224#define iswlower(_c) (iswctype(_c,_LOWER))
225#define iswdigit(_c) (iswctype(_c,_DIGIT))
226#define iswxdigit(_c) (iswctype(_c,_HEX))
227#define iswspace(_c) (iswctype(_c,_SPACE))
228#define iswpunct(_c) (iswctype(_c,_PUNCT))
229#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT))
230#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT))
231#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
232#define iswcntrl(_c) (iswctype(_c,_CONTROL))
233#define iswascii(_c) ((unsigned)(_c) < 0x80)
234#define iswblank(_c) (iswctype(_c,_SPACE) || ((_c)=='\t'))
235#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
236# define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p))
237# define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p))
238# define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p))
239# define _iswdigit_l(_c,_p) (_iswctype_l(_c,_DIGIT,_p))
240# define _iswxdigit_l(_c,_p) (_iswctype_l(_c,_HEX,_p))
241# define _iswspace_l(_c,_p) (_iswctype_l(_c,_SPACE,_p))
242# define _iswpunct_l(_c,_p) (_iswctype_l(_c,_PUNCT,_p))
243# define _iswalnum_l(_c,_p) (_iswctype_l(_c,_ALPHA|_DIGIT,_p))
244# define _iswprint_l(_c,_p) (_iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT,_p))
245# define _iswgraph_l(_c,_p) (_iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT,_p))
246# define _iswcntrl_l(_c,_p) (_iswctype_l(_c,_CONTROL,_p))
247#endif /* __MSVCRT_VERSION__ >= 0x800 */
248#if __MSVCRT_VERSION__ >= 0xC00
249#define _iswblank_l(_c,_p) (_iswctype_l(_c,_BLANK,_p) || ((_c)=='\t'))
250#endif
251#endif /* __cplusplus */
252#endif
253
254#define __iscsymf(_c) (isalpha(_c) || ((_c)=='_'))109#define __iscsymf(_c) (isalpha(_c) || ((_c)=='_'))
255#define __iscsym(_c) (isalnum(_c) || ((_c)=='_'))110#define __iscsym(_c) (isalnum(_c) || ((_c)=='_'))
256#define __iswcsymf(_c) (iswalpha(_c) || ((_c)=='_'))111#define __iswcsymf(_c) (iswalpha(_c) || ((_c)=='_'))
lib/libc/include/any-windows-any/d3d10.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d10.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d10.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d10_1.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d10_1.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d10_1.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d10effect.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d10effect.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d10effect.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d10sdklayers.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d10sdklayers.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d10sdklayers.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d10shader.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d10shader.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d10shader.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11_1.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11_1.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11_1.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11_2.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11_2.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11_2.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11_3.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11_3.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11_3.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11_4.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11_4.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11_4.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11on12.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11on12.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11on12.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d11sdklayers.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d11sdklayers.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d11sdklayers.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d12.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d12.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d12.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d12sdklayers.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d12sdklayers.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d12sdklayers.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d12shader.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d12shader.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d12shader.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d12video.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3d12video.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3d12video.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3d8.h+13-13
...@@ -128,7 +128,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU...@@ -128,7 +128,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU
128 */128 */
129#undef INTERFACE129#undef INTERFACE
130#define INTERFACE IDirect3D8130#define INTERFACE IDirect3D8
131DECLARE_INTERFACE_(IDirect3D8,IUnknown)131DECLARE_INTERFACE_IID_(IDirect3D8,IUnknown,"1dd9e8da-1c77-4d40-b0cf-98fefdff9512")
132{132{
133 /*** IUnknown methods ***/133 /*** IUnknown methods ***/
134 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;134 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IDirect3D8,IUnknown)...@@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IDirect3D8,IUnknown)
195 * IDirect3DVolume8 interface195 * IDirect3DVolume8 interface
196 */196 */
197#define INTERFACE IDirect3DVolume8197#define INTERFACE IDirect3DVolume8
198DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown)198DECLARE_INTERFACE_IID_(IDirect3DVolume8,IUnknown,"bd7349f5-14f1-42e4-9c79-972380db40c0")
199{199{
200 /*** IUnknown methods ***/200 /*** IUnknown methods ***/
201 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;201 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -247,7 +247,7 @@ DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown)...@@ -247,7 +247,7 @@ DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown)
247 * IDirect3DSwapChain8 interface247 * IDirect3DSwapChain8 interface
248 */248 */
249#define INTERFACE IDirect3DSwapChain8249#define INTERFACE IDirect3DSwapChain8
250DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown)250DECLARE_INTERFACE_IID_(IDirect3DSwapChain8,IUnknown,"928c088b-76b9-4c6b-a536-a590853876cd")
251{251{
252 /*** IUnknown methods ***/252 /*** IUnknown methods ***/
253 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;253 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -282,7 +282,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown)...@@ -282,7 +282,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown)
282 * IDirect3DSurface8 interface282 * IDirect3DSurface8 interface
283 */283 */
284#define INTERFACE IDirect3DSurface8284#define INTERFACE IDirect3DSurface8
285DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown)285DECLARE_INTERFACE_IID_(IDirect3DSurface8,IUnknown,"b96eebca-b326-4ea5-882f-2ff5bae021dd")
286{286{
287 /*** IUnknown methods ***/287 /*** IUnknown methods ***/
288 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;288 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -334,7 +334,7 @@ DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown)...@@ -334,7 +334,7 @@ DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown)
334 * IDirect3DResource8 interface334 * IDirect3DResource8 interface
335 */335 */
336#define INTERFACE IDirect3DResource8336#define INTERFACE IDirect3DResource8
337DECLARE_INTERFACE_(IDirect3DResource8,IUnknown)337DECLARE_INTERFACE_IID_(IDirect3DResource8,IUnknown,"1b36bb7b-09b7-410a-b445-7d1430d7b33f")
338{338{
339 /*** IUnknown methods ***/339 /*** IUnknown methods ***/
340 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;340 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -386,7 +386,7 @@ DECLARE_INTERFACE_(IDirect3DResource8,IUnknown)...@@ -386,7 +386,7 @@ DECLARE_INTERFACE_(IDirect3DResource8,IUnknown)
386 * IDirect3DVertexBuffer8 interface386 * IDirect3DVertexBuffer8 interface
387 */387 */
388#define INTERFACE IDirect3DVertexBuffer8388#define INTERFACE IDirect3DVertexBuffer8
389DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8)389DECLARE_INTERFACE_IID_(IDirect3DVertexBuffer8,IDirect3DResource8,"8aeeeac7-05f9-44d4-b591-000b0df1cb95")
390{390{
391 /*** IUnknown methods ***/391 /*** IUnknown methods ***/
392 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;392 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8)...@@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8)
450 * IDirect3DIndexBuffer8 interface450 * IDirect3DIndexBuffer8 interface
451 */451 */
452#define INTERFACE IDirect3DIndexBuffer8452#define INTERFACE IDirect3DIndexBuffer8
453DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8)453DECLARE_INTERFACE_IID_(IDirect3DIndexBuffer8,IDirect3DResource8,"0e689c9a-053d-44a0-9d92-db0e3d750f86")
454{454{
455 /*** IUnknown methods ***/455 /*** IUnknown methods ***/
456 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;456 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -514,7 +514,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8)...@@ -514,7 +514,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8)
514 * IDirect3DBaseTexture8 interface514 * IDirect3DBaseTexture8 interface
515 */515 */
516#define INTERFACE IDirect3DBaseTexture8516#define INTERFACE IDirect3DBaseTexture8
517DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8)517DECLARE_INTERFACE_IID_(IDirect3DBaseTexture8,IDirect3DResource8,"b4211cfa-51b9-4a9f-ab78-db99b2bb678e")
518{518{
519 /*** IUnknown methods ***/519 /*** IUnknown methods ***/
520 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;520 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -578,7 +578,7 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8)...@@ -578,7 +578,7 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8)
578 * IDirect3DCubeTexture8 interface578 * IDirect3DCubeTexture8 interface
579 */579 */
580#define INTERFACE IDirect3DCubeTexture8580#define INTERFACE IDirect3DCubeTexture8
581DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8)581DECLARE_INTERFACE_IID_(IDirect3DCubeTexture8,IDirect3DBaseTexture8,"3ee5b968-2aca-4c34-8bb5-7e0c3d19b750")
582{582{
583 /*** IUnknown methods ***/583 /*** IUnknown methods ***/
584 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;584 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8)...@@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8)
661 * IDirect3DTexture8 interface661 * IDirect3DTexture8 interface
662 */662 */
663#define INTERFACE IDirect3DTexture8663#define INTERFACE IDirect3DTexture8
664DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8)664DECLARE_INTERFACE_IID_(IDirect3DTexture8,IDirect3DBaseTexture8,"e4cdd575-2866-4f01-b12e-7eece1ec9358")
665{665{
666 /*** IUnknown methods ***/666 /*** IUnknown methods ***/
667 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;667 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -743,7 +743,7 @@ DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8)...@@ -743,7 +743,7 @@ DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8)
743 * IDirect3DVolumeTexture8 interface743 * IDirect3DVolumeTexture8 interface
744 */744 */
745#define INTERFACE IDirect3DVolumeTexture8745#define INTERFACE IDirect3DVolumeTexture8
746DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8)746DECLARE_INTERFACE_IID_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8,"4b8aaafa-140f-42ba-9131-597eafaa2ead")
747{747{
748 /*** IUnknown methods ***/748 /*** IUnknown methods ***/
749 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;749 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -825,7 +825,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8)...@@ -825,7 +825,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8)
825 * IDirect3DDevice8 interface825 * IDirect3DDevice8 interface
826 */826 */
827#define INTERFACE IDirect3DDevice8827#define INTERFACE IDirect3DDevice8
828DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown)828DECLARE_INTERFACE_IID_(IDirect3DDevice8,IUnknown,"7385e5df-8fe8-41d5-86b6-d7b48547b6cf")
829{829{
830 /*** IUnknown methods ***/830 /*** IUnknown methods ***/
831 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;831 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1115,7 +1115,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown)...@@ -1115,7 +1115,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown)
1115#define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->DrawIndexedPrimitive(a,b,c,d,e)1115#define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->DrawIndexedPrimitive(a,b,c,d,e)
1116#define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->DrawPrimitiveUP(a,b,c,d)1116#define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->DrawPrimitiveUP(a,b,c,d)
1117#define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->DrawIndexedPrimitiveUP(a,b,c,d,e,f,g,h)1117#define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->DrawIndexedPrimitiveUP(a,b,c,d,e,f,g,h)
1118#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->processVertices(a,b,c,d,e)1118#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->ProcessVertices(a,b,c,d,e)
1119#define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->CreateVertexShader(a,b,c,d)1119#define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->CreateVertexShader(a,b,c,d)
1120#define IDirect3DDevice8_SetVertexShader(p,a) (p)->SetVertexShader(a)1120#define IDirect3DDevice8_SetVertexShader(p,a) (p)->SetVertexShader(a)
1121#define IDirect3DDevice8_GetVertexShader(p,a) (p)->GetVertexShader(a)1121#define IDirect3DDevice8_GetVertexShader(p,a) (p)->GetVertexShader(a)
lib/libc/include/any-windows-any/d3d8caps.h+2-2
...@@ -20,7 +20,7 @@...@@ -20,7 +20,7 @@
20#define __WINE_D3D8CAPS_H20#define __WINE_D3D8CAPS_H
2121
22#ifdef __i386__22#ifdef __i386__
23#include <pshpack4.h>23#pragma pack(push,4)
24#endif24#endif
2525
26/*26/*
...@@ -290,7 +290,7 @@ typedef struct _D3DCAPS8 {...@@ -290,7 +290,7 @@ typedef struct _D3DCAPS8 {
290} D3DCAPS8;290} D3DCAPS8;
291291
292#ifdef __i386__292#ifdef __i386__
293#include <poppack.h>293#pragma pack(pop)
294#endif294#endif
295295
296#endif /* __WINE_D3D8CAPS_H */296#endif /* __WINE_D3D8CAPS_H */
lib/libc/include/any-windows-any/d3d8types.h+8-2
...@@ -20,7 +20,7 @@...@@ -20,7 +20,7 @@
20#define __WINE_D3D8TYPES_H20#define __WINE_D3D8TYPES_H
2121
22#ifdef __i386__22#ifdef __i386__
23#include <pshpack4.h>23#pragma pack(push,4)
24#endif24#endif
2525
26/*****************************************************************************26/*****************************************************************************
...@@ -150,6 +150,9 @@...@@ -150,6 +150,9 @@
150#define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2)150#define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2)
151#define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3)151#define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3)
152152
153#define D3DDEVINFOID_RESOURCEMANAGER 5
154#define D3DDEVINFOID_VERTEXSTATS 6
155
153156
154#ifndef MAKEFOURCC157#ifndef MAKEFOURCC
155#define MAKEFOURCC(ch0, ch1, ch2, ch3) \158#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
...@@ -1117,6 +1120,9 @@ typedef struct _D3DMATRIX {...@@ -1117,6 +1120,9 @@ typedef struct _D3DMATRIX {
1117 } DUMMYUNIONNAME;1120 } DUMMYUNIONNAME;
1118} D3DMATRIX;1121} D3DMATRIX;
11191122
1123#define D3DPRESENT_RATE_DEFAULT 0
1124#define D3DPRESENT_RATE_UNLIMITED 0x7fffffff
1125
1120typedef struct _D3DPRESENT_PARAMETERS_ {1126typedef struct _D3DPRESENT_PARAMETERS_ {
1121 UINT BackBufferWidth;1127 UINT BackBufferWidth;
1122 UINT BackBufferHeight;1128 UINT BackBufferHeight;
...@@ -1214,7 +1220,7 @@ typedef struct _D3DVOLUME_DESC {...@@ -1214,7 +1220,7 @@ typedef struct _D3DVOLUME_DESC {
1214} D3DVOLUME_DESC;1220} D3DVOLUME_DESC;
12151221
1216#ifdef __i386__1222#ifdef __i386__
1217#include <poppack.h>1223#pragma pack(pop)
1218#endif1224#endif
12191225
1220#endif /* __WINE_D3D8TYPES_H */1226#endif /* __WINE_D3D8TYPES_H */
lib/libc/include/any-windows-any/d3d9.h+20-20
...@@ -175,7 +175,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;...@@ -175,7 +175,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
175 */175 */
176#undef INTERFACE176#undef INTERFACE
177#define INTERFACE IDirect3D9177#define INTERFACE IDirect3D9
178DECLARE_INTERFACE_(IDirect3D9,IUnknown)178DECLARE_INTERFACE_IID_(IDirect3D9,IUnknown,"81bdcbca-64d4-426d-ae8d-ad0147f4275c")
179{179{
180 /*** IUnknown methods ***/180 /*** IUnknown methods ***/
181 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;181 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -249,7 +249,7 @@ __CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE,...@@ -249,7 +249,7 @@ __CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE,
249 * IDirect3DVolume9 interface249 * IDirect3DVolume9 interface
250 */250 */
251#define INTERFACE IDirect3DVolume9251#define INTERFACE IDirect3DVolume9
252DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown)252DECLARE_INTERFACE_IID_(IDirect3DVolume9,IUnknown,"24f416e6-1f67-4aa7-b88e-d33f6f3128a1")
253{253{
254 /*** IUnknown methods ***/254 /*** IUnknown methods ***/
255 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;255 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -305,7 +305,7 @@ __CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8,...@@ -305,7 +305,7 @@ __CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8,
305 * IDirect3DSwapChain9 interface305 * IDirect3DSwapChain9 interface
306 */306 */
307#define INTERFACE IDirect3DSwapChain9307#define INTERFACE IDirect3DSwapChain9
308DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown)308DECLARE_INTERFACE_IID_(IDirect3DSwapChain9,IUnknown,"794950f2-adfc-458a-905e-10a10b0b503b")
309{309{
310 /*** IUnknown methods ***/310 /*** IUnknown methods ***/
311 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;311 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;
...@@ -359,7 +359,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90,...@@ -359,7 +359,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90,
359 * IDirect3DResource9 interface359 * IDirect3DResource9 interface
360 */360 */
361#define INTERFACE IDirect3DResource9361#define INTERFACE IDirect3DResource9
362DECLARE_INTERFACE_(IDirect3DResource9,IUnknown)362DECLARE_INTERFACE_IID_(IDirect3DResource9,IUnknown,"05eec05d-8f7d-4362-b999-d1baf357c704")
363{363{
364 /*** IUnknown methods ***/364 /*** IUnknown methods ***/
365 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;365 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -415,7 +415,7 @@ __CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0...@@ -415,7 +415,7 @@ __CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0
415 * IDirect3DSurface9 interface415 * IDirect3DSurface9 interface
416 */416 */
417#define INTERFACE IDirect3DSurface9417#define INTERFACE IDirect3DSurface9
418DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9)418DECLARE_INTERFACE_IID_(IDirect3DSurface9,IDirect3DResource9,"0cfbaf3a-9ff6-429a-99b3-a2796af8b89b")
419{419{
420 /*** IUnknown methods ***/420 /*** IUnknown methods ***/
421 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;421 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -492,7 +492,7 @@ __CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0...@@ -492,7 +492,7 @@ __CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0
492 * IDirect3DVertexBuffer9 interface492 * IDirect3DVertexBuffer9 interface
493 */493 */
494#define INTERFACE IDirect3DVertexBuffer9494#define INTERFACE IDirect3DVertexBuffer9
495DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9)495DECLARE_INTERFACE_IID_(IDirect3DVertexBuffer9,IDirect3DResource9,"b64bb1b5-fd70-4df6-bf91-19d0a12455e3")
496{496{
497 /*** IUnknown methods ***/497 /*** IUnknown methods ***/
498 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;498 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -560,7 +560,7 @@ __CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf,...@@ -560,7 +560,7 @@ __CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf,
560 * IDirect3DIndexBuffer9 interface560 * IDirect3DIndexBuffer9 interface
561 */561 */
562#define INTERFACE IDirect3DIndexBuffer9562#define INTERFACE IDirect3DIndexBuffer9
563DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9)563DECLARE_INTERFACE_IID_(IDirect3DIndexBuffer9,IDirect3DResource9,"7c9dd65e-d3f7-4529-acee-785830acde35")
564{564{
565 /*** IUnknown methods ***/565 /*** IUnknown methods ***/
566 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;566 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -628,7 +628,7 @@ __CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac,...@@ -628,7 +628,7 @@ __CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac,
628 * IDirect3DBaseTexture9 interface628 * IDirect3DBaseTexture9 interface
629 */629 */
630#define INTERFACE IDirect3DBaseTexture9630#define INTERFACE IDirect3DBaseTexture9
631DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9)631DECLARE_INTERFACE_IID_(IDirect3DBaseTexture9,IDirect3DResource9,"580ca87e-1d3c-4d54-991d-b7d3e3c298ce")
632{632{
633 /*** IUnknown methods ***/633 /*** IUnknown methods ***/
634 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;634 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -705,7 +705,7 @@ __CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99,...@@ -705,7 +705,7 @@ __CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99,
705 * IDirect3DCubeTexture9 interface705 * IDirect3DCubeTexture9 interface
706 */706 */
707#define INTERFACE IDirect3DCubeTexture9707#define INTERFACE IDirect3DCubeTexture9
708DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9)708DECLARE_INTERFACE_IID_(IDirect3DCubeTexture9,IDirect3DBaseTexture9,"fff32f81-d953-473a-9223-93d652aba93f")
709{709{
710 /*** IUnknown methods ***/710 /*** IUnknown methods ***/
711 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;711 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -801,7 +801,7 @@ __CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92,...@@ -801,7 +801,7 @@ __CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92,
801 * IDirect3DTexture9 interface801 * IDirect3DTexture9 interface
802 */802 */
803#define INTERFACE IDirect3DTexture9803#define INTERFACE IDirect3DTexture9
804DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9)804DECLARE_INTERFACE_IID_(IDirect3DTexture9,IDirect3DBaseTexture9,"85c31227-3de5-4f00-9b3a-f11ac38c18b5")
805{805{
806 /*** IUnknown methods ***/806 /*** IUnknown methods ***/
807 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;807 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -896,7 +896,7 @@ __CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b,...@@ -896,7 +896,7 @@ __CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b,
896 * IDirect3DVolumeTexture9 interface896 * IDirect3DVolumeTexture9 interface
897 */897 */
898#define INTERFACE IDirect3DVolumeTexture9898#define INTERFACE IDirect3DVolumeTexture9
899DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9)899DECLARE_INTERFACE_IID_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9,"2518526c-e789-4111-a7b9-47ef328d13e6")
900{900{
901 /*** IUnknown methods ***/901 /*** IUnknown methods ***/
902 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;902 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -991,7 +991,7 @@ __CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7,...@@ -991,7 +991,7 @@ __CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7,
991 * IDirect3DVertexDeclaration9 interface991 * IDirect3DVertexDeclaration9 interface
992 */992 */
993#define INTERFACE IDirect3DVertexDeclaration9993#define INTERFACE IDirect3DVertexDeclaration9
994DECLARE_INTERFACE_(IDirect3DVertexDeclaration9,IUnknown)994DECLARE_INTERFACE_IID_(IDirect3DVertexDeclaration9,IUnknown,"dd13c59c-36fa-4098-a8fb-c7ed39dc8546")
995{995{
996 /*** IUnknown methods ***/996 /*** IUnknown methods ***/
997 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;997 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1029,7 +1029,7 @@ __CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8,...@@ -1029,7 +1029,7 @@ __CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8,
1029 * IDirect3DVertexShader9 interface1029 * IDirect3DVertexShader9 interface
1030 */1030 */
1031#define INTERFACE IDirect3DVertexShader91031#define INTERFACE IDirect3DVertexShader9
1032DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown)1032DECLARE_INTERFACE_IID_(IDirect3DVertexShader9,IUnknown,"efc5557e-6265-4613-8a94-43857889eb36")
1033{1033{
1034 /*** IUnknown methods ***/1034 /*** IUnknown methods ***/
1035 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;1035 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1067,7 +1067,7 @@ __CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a,...@@ -1067,7 +1067,7 @@ __CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a,
1067 * IDirect3DPixelShader9 interface1067 * IDirect3DPixelShader9 interface
1068 */1068 */
1069#define INTERFACE IDirect3DPixelShader91069#define INTERFACE IDirect3DPixelShader9
1070DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown)1070DECLARE_INTERFACE_IID_(IDirect3DPixelShader9,IUnknown,"6d3bdbdc-5b02-4415-b852-ce5e8bccb289")
1071{1071{
1072 /*** IUnknown methods ***/1072 /*** IUnknown methods ***/
1073 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;1073 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1105,7 +1105,7 @@ __CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8,...@@ -1105,7 +1105,7 @@ __CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8,
1105 * IDirect3DStateBlock9 interface1105 * IDirect3DStateBlock9 interface
1106 */1106 */
1107#define INTERFACE IDirect3DStateBlock91107#define INTERFACE IDirect3DStateBlock9
1108DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown)1108DECLARE_INTERFACE_IID_(IDirect3DStateBlock9,IUnknown,"b07c4fe5-310d-4ba8-a23c-4f0f206f218b")
1109{1109{
1110 /*** IUnknown methods ***/1110 /*** IUnknown methods ***/
1111 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;1111 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1146,7 +1146,7 @@ __CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2,...@@ -1146,7 +1146,7 @@ __CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2,
1146 * IDirect3DQuery9 interface1146 * IDirect3DQuery9 interface
1147 */1147 */
1148#define INTERFACE IDirect3DQuery91148#define INTERFACE IDirect3DQuery9
1149DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown)1149DECLARE_INTERFACE_IID_(IDirect3DQuery9,IUnknown,"d9771460-a695-4f26-bbd3-27b840b541cc")
1150{1150{
1151 /*** IUnknown methods ***/1151 /*** IUnknown methods ***/
1152 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;1152 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1193,7 +1193,7 @@ __CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb,...@@ -1193,7 +1193,7 @@ __CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb,
1193 * IDirect3DDevice9 interface1193 * IDirect3DDevice9 interface
1194 */1194 */
1195#define INTERFACE IDirect3DDevice91195#define INTERFACE IDirect3DDevice9
1196DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown)1196DECLARE_INTERFACE_IID_(IDirect3DDevice9,IUnknown,"d0223b96-bf7a-43fd-92bd-a43b0d82b9eb")
1197{1197{
1198 /*** IUnknown methods ***/1198 /*** IUnknown methods ***/
1199 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;1199 STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
...@@ -1589,7 +1589,7 @@ __CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4...@@ -1589,7 +1589,7 @@ __CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4
1589DEFINE_GUID(IID_IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4, 0x4d, 0xf6, 0x86, 0x1d);1589DEFINE_GUID(IID_IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4, 0x4d, 0xf6, 0x86, 0x1d);
15901590
1591#define INTERFACE IDirect3D9Ex1591#define INTERFACE IDirect3D9Ex
1592DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9)1592DECLARE_INTERFACE_IID_(IDirect3D9Ex,IDirect3D9,"02177241-69fc-400c-8ff1-93a44df6861d")
1593{1593{
1594 /* IUnknown */1594 /* IUnknown */
1595 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;1595 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;
...@@ -1688,7 +1688,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0...@@ -1688,7 +1688,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0
1688DEFINE_GUID(IID_IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3);1688DEFINE_GUID(IID_IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3);
16891689
1690#define INTERFACE IDirect3DSwapChain9Ex1690#define INTERFACE IDirect3DSwapChain9Ex
1691DECLARE_INTERFACE_(IDirect3DSwapChain9Ex, IDirect3DSwapChain9)1691DECLARE_INTERFACE_IID_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9,"91886caf-1c3d-4d2e-a0ab-3e4c7d8d3303")
1692{1692{
1693 /* IUnknown */1693 /* IUnknown */
1694 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;1694 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;
...@@ -1753,7 +1753,7 @@ __CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95,...@@ -1753,7 +1753,7 @@ __CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95,
1753DEFINE_GUID(IID_IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a);1753DEFINE_GUID(IID_IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a);
17541754
1755#define INTERFACE IDirect3DDevice9Ex1755#define INTERFACE IDirect3DDevice9Ex
1756DECLARE_INTERFACE_(IDirect3DDevice9Ex, IDirect3DDevice9)1756DECLARE_INTERFACE_IID_(IDirect3DDevice9Ex,IDirect3DDevice9,"b18b10ce-2649-405a-870f-95f777d4313a")
1757{1757{
1758 /* IUnknown */1758 /* IUnknown */
1759 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;1759 STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE;
lib/libc/include/any-windows-any/d3d9caps.h+2-2
...@@ -21,7 +21,7 @@...@@ -21,7 +21,7 @@
21#define __WINE_D3D9CAPS_H21#define __WINE_D3D9CAPS_H
2222
23#ifdef __i386__23#ifdef __i386__
24#include <pshpack4.h>24#pragma pack(push,4)
25#endif25#endif
2626
27/*27/*
...@@ -449,7 +449,7 @@ DEFINE_GUID(D3DKEYEXCHANGE_DXVA, 0x43d3775c, 0x38e5, 0x4924, 0x8d, 0x86,...@@ -449,7 +449,7 @@ DEFINE_GUID(D3DKEYEXCHANGE_DXVA, 0x43d3775c, 0x38e5, 0x4924, 0x8d, 0x86,
449#endif449#endif
450450
451#ifdef __i386__451#ifdef __i386__
452#include <poppack.h>452#pragma pack(pop)
453#endif453#endif
454454
455#endif455#endif
lib/libc/include/any-windows-any/d3d9types.h+4-4
...@@ -22,7 +22,7 @@...@@ -22,7 +22,7 @@
22#define __WINE_D3D9TYPES_H22#define __WINE_D3D9TYPES_H
2323
24#ifdef __i386__24#ifdef __i386__
25#include <pshpack4.h>25#pragma pack(push,4)
26#endif26#endif
2727
28/*****************************************************************************28/*****************************************************************************
...@@ -1366,9 +1366,9 @@ typedef struct D3DRESOURCESTATS {...@@ -1366,9 +1366,9 @@ typedef struct D3DRESOURCESTATS {
1366 DWORD TotalBytes;1366 DWORD TotalBytes;
1367} D3DRESOURCESTATS;1367} D3DRESOURCESTATS;
13681368
1369typedef struct _D3DDEVINFO_D3DRESOURCEMANAGER {1369typedef struct _D3DDEVINFO_RESOURCEMANAGER {
1370 D3DRESOURCESTATS stats[D3DRTYPECOUNT];1370 D3DRESOURCESTATS stats[D3DRTYPECOUNT];
1371} D3DDEVINFO_D3DRESOURCEMANAGER;1371} D3DDEVINFO_RESOURCEMANAGER;
13721372
1373typedef struct _D3DDEVINFO_D3DVERTEXSTATS {1373typedef struct _D3DDEVINFO_D3DVERTEXSTATS {
1374 DWORD NumRenderedTriangles;1374 DWORD NumRenderedTriangles;
...@@ -1632,7 +1632,7 @@ typedef enum _D3DSHADER_COMPARISON...@@ -1632,7 +1632,7 @@ typedef enum _D3DSHADER_COMPARISON
1632} D3DSHADER_COMPARISON;1632} D3DSHADER_COMPARISON;
16331633
1634#ifdef __i386__1634#ifdef __i386__
1635#include <poppack.h>1635#pragma pack(pop)
1636#endif1636#endif
16371637
1638#endif /* __WINE_D3D9TYPES_H */1638#endif /* __WINE_D3D9TYPES_H */
lib/libc/include/any-windows-any/d3dcaps.h+2-2
...@@ -22,7 +22,7 @@...@@ -22,7 +22,7 @@
22#include <ddraw.h>22#include <ddraw.h>
2323
24#ifdef __i386__24#ifdef __i386__
25#include <pshpack4.h>25#pragma pack(push,4)
26#endif26#endif
2727
28typedef struct _D3DTRANSFORMCAPS {28typedef struct _D3DTRANSFORMCAPS {
...@@ -433,7 +433,7 @@ typedef struct _D3DDEVINFO_TEXTURING {...@@ -433,7 +433,7 @@ typedef struct _D3DDEVINFO_TEXTURING {
433} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING;433} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING;
434434
435#ifdef __i386__435#ifdef __i386__
436#include <poppack.h>436#pragma pack(pop)
437#endif437#endif
438438
439#endif439#endif
lib/libc/include/any-windows-any/d3dcommon.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/d3dcommon.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/d3dcommon.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/d3drmobj.h+8-8
...@@ -279,7 +279,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)...@@ -279,7 +279,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)
279#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b)279#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b)
280#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c)280#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c)
281#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)281#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
282#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->SetClientData(p,a,b)282#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->GetClientData(p,a,b)
283#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a)283#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a)
284#define IDirect3DRMObject2_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b)284#define IDirect3DRMObject2_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b)
285#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c)285#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c)
...@@ -294,7 +294,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)...@@ -294,7 +294,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)
294#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b)294#define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b)
295#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->Clone(a,b,c)295#define IDirect3DRMObject2_Clone(p,a,b,c) (p)->Clone(a,b,c)
296#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)296#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)
297#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->SetClientData(a,b)297#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->GetClientData(a,b)
298#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a)298#define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a)
299#define IDirect3DRMObject2_GetName(p,a,b) (p)->GetName(a,b)299#define IDirect3DRMObject2_GetName(p,a,b) (p)->GetName(a,b)
300#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c)300#define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c)
...@@ -991,7 +991,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject)...@@ -991,7 +991,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject)
991#define IDirect3DRMViewport2_AddRef(p) (p)->lpVtbl->AddRef(p)991#define IDirect3DRMViewport2_AddRef(p) (p)->lpVtbl->AddRef(p)
992#define IDirect3DRMViewport2_Release(p) (p)->lpVtbl->Release(p)992#define IDirect3DRMViewport2_Release(p) (p)->lpVtbl->Release(p)
993/*** IDirect3DRMObject methods ***/993/*** IDirect3DRMObject methods ***/
994#define IDirect3DRMViewport_2Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c)994#define IDirect3DRMViewport2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c)
995#define IDirect3DRMViewport2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b)995#define IDirect3DRMViewport2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b)
996#define IDirect3DRMViewport2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)996#define IDirect3DRMViewport2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
997#define IDirect3DRMViewport2_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a)997#define IDirect3DRMViewport2_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a)
...@@ -2155,7 +2155,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual)...@@ -2155,7 +2155,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual)
2155#define IDirect3DRMShadow_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b)2155#define IDirect3DRMShadow_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b)
2156#define IDirect3DRMShadow_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b)2156#define IDirect3DRMShadow_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b)
2157/*** IDirect3DRMShadow methods ***/2157/*** IDirect3DRMShadow methods ***/
2158#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Load(p,a,b,c,d,e,f,g)2158#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Init(p,a,b,c,d,e,f,g)
2159#else2159#else
2160/*** IUnknown methods ***/2160/*** IUnknown methods ***/
2161#define IDirect3DRMShadow_QueryInterface(p,a,b) (p)->QueryInterface(a,b)2161#define IDirect3DRMShadow_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
...@@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual)...@@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual)
2171#define IDirect3DRMShadow_GetName(p,a,b) (p)->GetName(a,b)2171#define IDirect3DRMShadow_GetName(p,a,b) (p)->GetName(a,b)
2172#define IDirect3DRMShadow_GetClassName(p,a,b) (p)->GetClassName(a,b)2172#define IDirect3DRMShadow_GetClassName(p,a,b) (p)->GetClassName(a,b)
2173/*** IDirect3DRMShadow methods ***/2173/*** IDirect3DRMShadow methods ***/
2174#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Load(a,b,c,d,e,f,g)2174#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Init(a,b,c,d,e,f,g)
2175#endif2175#endif
21762176
2177/*****************************************************************************2177/*****************************************************************************
...@@ -3251,7 +3251,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual)...@@ -3251,7 +3251,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual)
3251#define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b)3251#define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b)
3252#define IDirect3DRMTexture_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a)3252#define IDirect3DRMTexture_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a)
3253#define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a)3253#define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a)
3254#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a)3254#define IDirect3DRMTexture_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a)
3255#define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b)3255#define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b)
3256#define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b)3256#define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b)
3257#define IDirect3DRMTexture_GetImage(p) (p)->lpVtbl->GetImage(p)3257#define IDirect3DRMTexture_GetImage(p) (p)->lpVtbl->GetImage(p)
...@@ -3367,7 +3367,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture)...@@ -3367,7 +3367,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture)
3367#define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b)3367#define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b)
3368#define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a)3368#define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a)
3369#define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a)3369#define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a)
3370#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a)3370#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a)
3371#define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b)3371#define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b)
3372#define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b)3372#define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b)
3373#define IDirect3DRMTexture2_GetImage(p) (p)->lpVtbl->GetImage(p)3373#define IDirect3DRMTexture2_GetImage(p) (p)->lpVtbl->GetImage(p)
...@@ -3537,7 +3537,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual)...@@ -3537,7 +3537,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual)
3537#define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b)3537#define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b)
3538#define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->SetDecalScale(a)3538#define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->SetDecalScale(a)
3539#define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a)3539#define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a)
3540#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a)3540#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a)
3541#define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b)3541#define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b)
3542#define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b)3542#define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b)
3543#define IDirect3DRMTexture3_GetImage(p) (p)->GetImage()3543#define IDirect3DRMTexture3_GetImage(p) (p)->GetImage()
lib/libc/include/any-windows-any/d3dtypes.h+2-2
...@@ -30,7 +30,7 @@...@@ -30,7 +30,7 @@
30#include <ddraw.h>30#include <ddraw.h>
3131
32#ifdef __i386__32#ifdef __i386__
33#include <pshpack4.h>33#pragma pack(push,4)
34#endif34#endif
3535
36#define D3DVALP(val, prec) ((float)(val))36#define D3DVALP(val, prec) ((float)(val))
...@@ -1364,7 +1364,7 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {...@@ -1364,7 +1364,7 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {
1364#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))1364#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))
13651365
1366#ifdef __i386__1366#ifdef __i386__
1367#include <poppack.h>1367#pragma pack(pop)
1368#endif1368#endif
13691369
1370#endif1370#endif
lib/libc/include/any-windows-any/d3dx9shader.h+1-1
...@@ -214,7 +214,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)...@@ -214,7 +214,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
214/*** ID3DXConstantTable methods ***/214/*** ID3DXConstantTable methods ***/
215#define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a)215#define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a)
216#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c)216#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c)
217#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetConstantDesc(a)217#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetSamplerIndex(a)
218#define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b)218#define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b)
219#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b)219#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b)
220#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)220#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)
lib/libc/include/any-windows-any/d3dx9tex.h+3
...@@ -182,6 +182,9 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(struct IDirect3DVolume9 *destvolume,...@@ -182,6 +182,9 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(struct IDirect3DVolume9 *destvolume,
182 D3DFORMAT srcformat, UINT srcrowpitch, UINT srcslicepitch, const PALETTEENTRY *srcpalette,182 D3DFORMAT srcformat, UINT srcrowpitch, UINT srcslicepitch, const PALETTEENTRY *srcpalette,
183 const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey);183 const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey);
184184
185HRESULT WINAPI D3DXSaveVolumeToFileInMemory(struct ID3DXBuffer **dst_buffer, D3DXIMAGE_FILEFORMAT dst_format,
186 struct IDirect3DVolume9 *src_volume, const PALETTEENTRY *src_palette, const D3DBOX *src_box);
187
185HRESULT WINAPI D3DXSaveVolumeToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat,188HRESULT WINAPI D3DXSaveVolumeToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat,
186 struct IDirect3DVolume9 *srcvolume, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox);189 struct IDirect3DVolume9 *srcvolume, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox);
187HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat,190HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat,
lib/libc/include/any-windows-any/dbgprop.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dbgprop.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dbgprop.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dcommon.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dcommon.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dcommon.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dcompanimation.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dcompanimation.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dcompanimation.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/ddstream.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/ddstream.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/ddstream.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/devicetopology.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/devicetopology.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/devicetopology.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dimm.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dimm.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dimm.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dinputd.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dinputd.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dinputd.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/directmanipulation.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/directmanipulation.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/directmanipulation.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dispex.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dispex.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dispex.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dmodshow.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dmodshow.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dmodshow.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dmplugin.h+2-2
...@@ -28,7 +28,7 @@...@@ -28,7 +28,7 @@
28#include <objbase.h>28#include <objbase.h>
29#include <mmsystem.h>29#include <mmsystem.h>
30#include <dmusici.h>30#include <dmusici.h>
31#include <pshpack8.h>31#pragma pack(push,8)
3232
33#ifdef __cplusplus33#ifdef __cplusplus
34extern "C" {34extern "C" {
...@@ -292,6 +292,6 @@ DECLARE_INTERFACE_(IDirectMusicTrack8,IDirectMusicTrack)...@@ -292,6 +292,6 @@ DECLARE_INTERFACE_(IDirectMusicTrack8,IDirectMusicTrack)
292}292}
293#endif293#endif
294294
295#include <poppack.h>295#pragma pack(pop)
296296
297#endif /* __WINE_DMUSIC_PLUGIN_H */297#endif /* __WINE_DMUSIC_PLUGIN_H */
lib/libc/include/any-windows-any/dmusbuff.h+2-2
...@@ -40,13 +40,13 @@...@@ -40,13 +40,13 @@
40typedef struct _DMUS_EVENTHEADER DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;40typedef struct _DMUS_EVENTHEADER DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;
4141
42/* actual structure*/ 42/* actual structure*/
43#include <pshpack4.h>43#pragma pack(push,4)
44struct _DMUS_EVENTHEADER {44struct _DMUS_EVENTHEADER {
45 DWORD cbEvent;45 DWORD cbEvent;
46 DWORD dwChannelGroup;46 DWORD dwChannelGroup;
47 REFERENCE_TIME rtDelta;47 REFERENCE_TIME rtDelta;
48 DWORD dwFlags;48 DWORD dwFlags;
49};49};
50#include <poppack.h>50#pragma pack(pop)
5151
52#endif /* __WINE_DMUSIC_BUFFER_H */52#endif /* __WINE_DMUSIC_BUFFER_H */
lib/libc/include/any-windows-any/dmusicc.h+2-2
...@@ -34,7 +34,7 @@...@@ -34,7 +34,7 @@
34#include <dmusbuff.h>34#include <dmusbuff.h>
35#include <strmif.h>35#include <strmif.h>
3636
37#include <pshpack8.h>37#pragma pack(push,8)
3838
39#ifdef __cplusplus39#ifdef __cplusplus
40extern "C" {40extern "C" {
...@@ -724,6 +724,6 @@ DECLARE_INTERFACE_(IDirectMusicThru,IUnknown)...@@ -724,6 +724,6 @@ DECLARE_INTERFACE_(IDirectMusicThru,IUnknown)
724}724}
725#endif725#endif
726726
727#include <poppack.h>727#pragma pack(pop)
728728
729#endif /* __WINE_DMUSIC_CORE_H */729#endif /* __WINE_DMUSIC_CORE_H */
lib/libc/include/any-windows-any/dmusicf.h+2-2
...@@ -26,7 +26,7 @@...@@ -26,7 +26,7 @@
26#define COM_NO_WINDOWS_H26#define COM_NO_WINDOWS_H
27#include <objbase.h>27#include <objbase.h>
28#include <mmsystem.h>28#include <mmsystem.h>
29#include <pshpack8.h>29#pragma pack(push,8)
3030
31#ifdef __cplusplus31#ifdef __cplusplus
32extern "C" {32extern "C" {
...@@ -903,6 +903,6 @@ struct _DSOUND_IO_DXDMO_DATA {...@@ -903,6 +903,6 @@ struct _DSOUND_IO_DXDMO_DATA {
903}903}
904#endif904#endif
905905
906#include <poppack.h>906#pragma pack(pop)
907907
908#endif /* __WINE_DMUSIC_FILEFORMATS_H */908#endif /* __WINE_DMUSIC_FILEFORMATS_H */
lib/libc/include/any-windows-any/dmusici.h+2-2
...@@ -29,7 +29,7 @@...@@ -29,7 +29,7 @@
29#include <mmsystem.h>29#include <mmsystem.h>
30#include <dmusicc.h>30#include <dmusicc.h>
31#include <dmplugin.h>31#include <dmplugin.h>
32#include <pshpack8.h>32#pragma pack(push,8)
3333
34#ifdef WINE_NO_UNICODE_MACROS34#ifdef WINE_NO_UNICODE_MACROS
35#undef AddPort35#undef AddPort
...@@ -1714,6 +1714,6 @@ DECLARE_INTERFACE_(IDirectMusicContainer,IUnknown)...@@ -1714,6 +1714,6 @@ DECLARE_INTERFACE_(IDirectMusicContainer,IUnknown)
1714}1714}
1715#endif1715#endif
17161716
1717#include <poppack.h>1717#pragma pack(pop)
17181718
1719#endif /* __WINE_DMUSIC_PERFORMANCE_H */1719#endif /* __WINE_DMUSIC_PERFORMANCE_H */
lib/libc/include/any-windows-any/docobj.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/docobj.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/docobj.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/docobjectservice.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/docobjectservice.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/docobjectservice.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/documenttarget.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/documenttarget.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/documenttarget.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/downloadmgr.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/downloadmgr.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/downloadmgr.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dpnathlp.h+1-1
...@@ -183,7 +183,7 @@ DECLARE_INTERFACE_(IDirectPlayNATHelp,IUnknown)...@@ -183,7 +183,7 @@ DECLARE_INTERFACE_(IDirectPlayNATHelp,IUnknown)
183#define IDirectPlayNATHelp_QueryAddress(p,a,b,c,d,e) (p)->lpVtbl->QueryAddress(p,a,b,c,d,e)183#define IDirectPlayNATHelp_QueryAddress(p,a,b,c,d,e) (p)->lpVtbl->QueryAddress(p,a,b,c,d,e)
184#define IDirectPlayNATHelp_SetAlertEvent(p,a,b) (p)->lpVtbl->SetAlertEvent(p,a,b)184#define IDirectPlayNATHelp_SetAlertEvent(p,a,b) (p)->lpVtbl->SetAlertEvent(p,a,b)
185#define IDirectPlayNATHelp_SetAlertIOCompletionPort(p,a,b,c,d) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c,d)185#define IDirectPlayNATHelp_SetAlertIOCompletionPort(p,a,b,c,d) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c,d)
186#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c)186#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->ExtendRegisteredPortsLease(p,a,b,c)
187#endif187#endif
188188
189#ifdef __cplusplus189#ifdef __cplusplus
lib/libc/include/any-windows-any/drmexternals.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/drmexternals.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/drmexternals.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dvdif.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dvdif.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dvdif.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dwmapi.h+1-1
...@@ -100,7 +100,7 @@ extern "C" {...@@ -100,7 +100,7 @@ extern "C" {
100 GT_TOUCH_RIGHTTAP = 7,100 GT_TOUCH_RIGHTTAP = 7,
101 GT_TOUCH_PRESSANDHOLD = 8,101 GT_TOUCH_PRESSANDHOLD = 8,
102 GT_TOUCH_PRESSANDHOLDABORT = 9,102 GT_TOUCH_PRESSANDHOLDABORT = 9,
103 GT_TOUCH_PRESSANDTAP = 10,103 GT_TOUCH_PRESSANDTAP = 10
104 };104 };
105105
106 enum DWM_SHOWCONTACT {106 enum DWM_SHOWCONTACT {
lib/libc/include/any-windows-any/dwrite.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dwrite.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dwrite.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dwrite_1.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dwrite_1.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dwrite_1.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dwrite_2.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dwrite_2.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dwrite_2.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dwrite_3.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dwrite_3.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dwrite_3.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi1_2.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi1_2.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi1_2.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi1_3.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi1_3.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi1_3.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi1_4.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi1_4.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi1_4.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi1_5.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi1_5.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi1_5.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgi1_6.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgi1_6.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgi1_6.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgicommon.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgicommon.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgicommon.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgidebug.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgidebug.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgidebug.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgiformat.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgiformat.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgiformat.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxgitype.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxgitype.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxgitype.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxva.h+28-2
...@@ -99,11 +99,26 @@ DEFINE_GUID(DXVA_ModeJPEG_VLD_444, 0x4cd00e17, 0x89ba, 0x48ef, 0xb9, 0xf9, 0xed,...@@ -99,11 +99,26 @@ DEFINE_GUID(DXVA_ModeJPEG_VLD_444, 0x4cd00e17, 0x89ba, 0x48ef, 0xb9, 0xf9, 0xed,
9999
100DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);100DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
101101
102#define DXVA_ModeH264_MoComp_NoFGT DXVA_ModeH264_A
103#define DXVA_ModeH264_MoComp_FGT DXVA_ModeH264_B
104#define DXVA_ModeH264_IDCT_NoFGT DXVA_ModeH264_C
105#define DXVA_ModeH264_IDCT_FGT DXVA_ModeH264_D
106#define DXVA_ModeH264_VLD_NoFGT DXVA_ModeH264_E
107#define DXVA_ModeH264_VLD_FGT DXVA_ModeH264_F
108
102#define DXVA_USUAL_BLOCK_WIDTH 8109#define DXVA_USUAL_BLOCK_WIDTH 8
103#define DXVA_USUAL_BLOCK_HEIGHT 8110#define DXVA_USUAL_BLOCK_HEIGHT 8
104#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT)111#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT)
105112
106#include <pshpack1.h>113#define DXVA_PICTURE_DECODING_FUNCTION 1
114#define DXVA_ALPHA_BLEND_DATA_LOAD_FUNCTION 2
115#define DXVA_ALPHA_BLEND_COMBINATION_FUNCTION 3
116#define DXVA_PICTURE_RESAMPLE_FUNCTION 4
117#define DXVA_DEBLOCKING_FILTER_FUNCTION 5
118#define DXVA_FILM_GRAIN_SYNTHESIS_FUNCTION 6
119#define DXVA_STATUS_REPORTING_FUNCTION 7
120
121#pragma pack(push,1)
107122
108typedef struct _DXVA_PicEntry_H264123typedef struct _DXVA_PicEntry_H264
109{124{
...@@ -309,6 +324,17 @@ typedef struct _DXVA_Slice_H264_Short...@@ -309,6 +324,17 @@ typedef struct _DXVA_Slice_H264_Short
309 USHORT wBadSliceChopping;324 USHORT wBadSliceChopping;
310} DXVA_Slice_H264_Short, *LPDXVA_Slice_H264_Short;325} DXVA_Slice_H264_Short, *LPDXVA_Slice_H264_Short;
311326
327typedef struct _DXVA_Status_H264
328{
329 UINT StatusReportFeedbackNumber;
330 DXVA_PicEntry_H264 CurrPic;
331 UCHAR field_pic_flag;
332 UCHAR bDXVA_Func;
333 UCHAR bBufType;
334 UCHAR bStatus;
335 UCHAR bReserved8Bits;
336 USHORT wNumMbsAffected;
337} DXVA_Status_H264, *LPDXVA_Status_H264;
312338
313typedef struct _DXVA_PicEntry_HEVC339typedef struct _DXVA_PicEntry_HEVC
314{340{
...@@ -938,7 +964,7 @@ typedef struct _DXVA_Status_AV1 {...@@ -938,7 +964,7 @@ typedef struct _DXVA_Status_AV1 {
938 USHORT NumMbsAffected;964 USHORT NumMbsAffected;
939} DXVA_Status_AV1, *LPDXVA_Status_AV1;965} DXVA_Status_AV1, *LPDXVA_Status_AV1;
940966
941#include <poppack.h>967#pragma pack(pop)
942968
943typedef enum _DXVA_VideoChromaSubsampling969typedef enum _DXVA_VideoChromaSubsampling
944{970{
lib/libc/include/any-windows-any/dxva2api.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxva2api.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxva2api.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/dxvahd.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/dxvahd.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/dxvahd.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/emostore_i.c deleted-54
...@@ -1,54 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14#ifndef INITGUID
15#define INITGUID
16#include <guiddef.h>
17#undef INITGUID
18#else
19#include <guiddef.h>
20#endif
21
22#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
23#else
24
25#ifndef __IID_DEFINED__
26#define __IID_DEFINED__
27 typedef struct _IID {
28 unsigned long x;
29 unsigned short s1;
30 unsigned short s2;
31 unsigned char c[8];
32 } IID;
33#endif
34
35#ifndef CLSID_DEFINED
36#define CLSID_DEFINED
37 typedef IID CLSID;
38#endif
39
40#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
41#endif
42
43 MIDL_DEFINE_GUID(IID,IID_IExchangeServer,0x25150F47,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
44 MIDL_DEFINE_GUID(IID,IID_IStorageGroup,0x25150F46,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
45 MIDL_DEFINE_GUID(IID,IID_IPublicStoreDB,0x25150F44,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
46 MIDL_DEFINE_GUID(IID,IID_IMailboxStoreDB,0x25150F45,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
47 MIDL_DEFINE_GUID(IID,IID_IFolderTree,0x25150F43,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
48 MIDL_DEFINE_GUID(IID,IID_IDataSource2,0x25150F48,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A);
49
50#undef MIDL_DEFINE_GUID
51
52#ifdef __cplusplus
53}
54#endif
lib/libc/include/any-windows-any/endpointvolume.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/endpointvolume.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/endpointvolume.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/evntprov.h+3-3
...@@ -1,6 +1,6 @@...@@ -1,6 +1,6 @@
1/** 1/**
2 * This file is part of the mingw-w64 runtime package. 2 * This file is part of the mingw-w64 runtime package.
3 * No warranty is given; refer to the file DISCLAIMER within this package. 3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */4 */
5/*5/*
6 * evntprov.h6 * evntprov.h
lib/libc/include/any-windows-any/evr.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/evr.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/evr.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/evr9.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/evr9.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/evr9.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/exdisp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/exdisp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/exdisp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fenv.h+31-77
...@@ -6,44 +6,30 @@...@@ -6,44 +6,30 @@
6#ifndef _FENV_H_6#ifndef _FENV_H_
7#define _FENV_H_7#define _FENV_H_
88
9#include <crtdefs.h>9#include <float.h>
1010
11#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)
1211
13/* FPU status word exception flags */12/* FPU status word exception flags */
14#define FE_INVALID 0x0113#define FE_INEXACT _SW_INEXACT
15#define FE_DIVBYZERO 0x0214#define FE_UNDERFLOW _SW_UNDERFLOW
16#define FE_OVERFLOW 0x0415#define FE_OVERFLOW _SW_OVERFLOW
17#define FE_UNDERFLOW 0x0816#define FE_DIVBYZERO _SW_ZERODIVIDE
18#define FE_INEXACT 0x1017#define FE_INVALID _SW_INVALID
19#define FE_ALL_EXCEPT (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)18#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_INEXACT | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
2019
21/* FPU control word rounding flags */20/* FPU control word rounding flags */
22#define FE_TONEAREST 0x0000000021#define FE_TONEAREST _RC_NEAR
23#define FE_UPWARD 0x0040000022#define FE_UPWARD _RC_UP
24#define FE_DOWNWARD 0x0080000023#define FE_DOWNWARD _RC_DOWN
25#define FE_TOWARDZERO 0x00c0000024#define FE_TOWARDZERO _RC_CHOP
25
26#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)
2627
27/* Amount to shift by to convert an exception to a mask bit. */28/* Amount to shift by to convert an exception to a mask bit. */
28#define FE_EXCEPT_SHIFT 0x0829#define FE_EXCEPT_SHIFT 0x08
2930
30#else31#else
3132
32#define FE_INVALID 0x01
33#define FE_DENORMAL 0x02
34#define FE_DIVBYZERO 0x04
35#define FE_OVERFLOW 0x08
36#define FE_UNDERFLOW 0x10
37#define FE_INEXACT 0x20
38#define FE_ALL_EXCEPT (FE_INVALID | FE_DENORMAL | FE_DIVBYZERO \
39 | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
40
41/* FPU control word rounding flags */
42#define FE_TONEAREST 0x0000
43#define FE_DOWNWARD 0x0400
44#define FE_UPWARD 0x0800
45#define FE_TOWARDZERO 0x0c00
46
47/* The MXCSR exception flags are the same as the33/* The MXCSR exception flags are the same as the
48 FE flags. */34 FE flags. */
49#define __MXCSR_EXCEPT_FLAG_SHIFT 035#define __MXCSR_EXCEPT_FLAG_SHIFT 0
...@@ -60,68 +46,36 @@...@@ -60,68 +46,36 @@
6046
61#ifndef RC_INVOKED47#ifndef RC_INVOKED
6248
63#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)
64
65/* Type representing exception flags. */
66typedef unsigned int fexcept_t;
67
68/* Type representing floating-point environment. */
69typedef struct49typedef struct
70{50{
71 unsigned int __cw;51 unsigned long _Fe_ctl;
52 unsigned long _Fe_stat;
72} fenv_t;53} fenv_t;
7354
74/* If the default argument is used we use this value. */55/* Type representing exception flags. */
75#define FE_DFL_ENV ((const fenv_t *) -1l)56typedef unsigned long fexcept_t;
7657
77#else58#ifdef __cplusplus
59extern "C" {
60#endif
7861
79/*62/* The FE_DFL_ENV macro is required by standard.
80 For now, support only for the basic abstraction of flags that are63 fesetenv will use the environment set at app startup.*/
81 either set or clear. fexcept_t could be structure that holds more64extern const fenv_t __mingw_fe_dfl_env;
82 info about the fp environment.65#define FE_DFL_ENV (&__mingw_fe_dfl_env)
83*/
84typedef unsigned short fexcept_t;
85
86/* This 32-byte struct represents the entire floating point
87 environment as stored by fnstenv or fstenv, augmented by
88 the contents of the MXCSR register, as stored by stmxcsr
89 (if CPU supports it). */
90typedef struct
91{
92 unsigned short __control_word;
93 unsigned short __unused0;
94 unsigned short __status_word;
95 unsigned short __unused1;
96 unsigned short __tag_word;
97 unsigned short __unused2;
98 unsigned int __ip_offset; /* instruction pointer offset */
99 unsigned short __ip_selector;
100 unsigned short __opcode;
101 unsigned int __data_offset;
102 unsigned short __data_selector;
103 unsigned short __unused3;
104 unsigned int __mxcsr; /* contents of the MXCSR register */
105} fenv_t;
10666
67/* The C99 standard (7.6.9) allows us to define implementation-specific macros for
68 different fp environments */
69#if defined(__i386__) || defined(__x86_64__)
10770
108/*The C99 standard (7.6.9) allows us to define implementation-specific macros for
109 different fp environments */
110
111/* The default Intel x87 floating point environment (64-bit mantissa) */71/* The default Intel x87 floating point environment (64-bit mantissa) */
112#define FE_PC64_ENV ((const fenv_t *)-1)72extern const fenv_t __mingw_fe_pc64_env;
73#define FE_PC64_ENV (&__mingw_fe_pc64_env)
11374
114/* The floating point environment set by MSVCRT _fpreset (53-bit mantissa) */75/* The floating point environment set by MSVCRT _fpreset (53-bit mantissa) */
115#define FE_PC53_ENV ((const fenv_t *)-2)76extern const fenv_t __mingw_fe_pc53_env;
77#define FE_PC53_ENV (&__mingw_fe_pc53_env)
11678
117/* The FE_DFL_ENV macro is required by standard.
118 fesetenv will use the environment set at app startup.*/
119#define FE_DFL_ENV ((const fenv_t *) 0)
120
121#endif /* defined(_ARM_) || defined(__arm__) */
122
123#ifdef __cplusplus
124extern "C" {
125#endif79#endif
12680
127/*TODO: Some of these could be inlined */81/*TODO: Some of these could be inlined */
lib/libc/include/any-windows-any/filter.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/filter.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/filter.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/float.h+14
...@@ -181,6 +181,8 @@...@@ -181,6 +181,8 @@
181/* Control word values for unNew (use with related unMask above) */181/* Control word values for unNew (use with related unMask above) */
182#define _DN_SAVE 0x00000000182#define _DN_SAVE 0x00000000
183#define _DN_FLUSH 0x01000000183#define _DN_FLUSH 0x01000000
184#define _DN_FLUSH_OPERANDS_SAVE_RESULTS 0x02000000
185#define _DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000
184#define _EM_INVALID 0x00000010186#define _EM_INVALID 0x00000010
185#define _EM_DENORMAL 0x00080000187#define _EM_DENORMAL 0x00080000
186#define _EM_ZERODIVIDE 0x00000008188#define _EM_ZERODIVIDE 0x00000008
...@@ -196,6 +198,7 @@...@@ -196,6 +198,7 @@
196#define _PC_24 0x00020000198#define _PC_24 0x00020000
197#define _PC_53 0x00010000199#define _PC_53 0x00010000
198#define _PC_64 0x00000000200#define _PC_64 0x00000000
201#define _EM_AMBIGUOUS 0x80000000
199202
200/* These are also defined in Mingw math.h, needed to work around203/* These are also defined in Mingw math.h, needed to work around
201 GCC build issues. */204 GCC build issues. */
...@@ -214,6 +217,14 @@...@@ -214,6 +217,14 @@
214#define _FPCLASS_PINF 0x0200 /* Positive Infinity */217#define _FPCLASS_PINF 0x0200 /* Positive Infinity */
215#endif /* __MINGW_FPCLASS_DEFINED */218#endif /* __MINGW_FPCLASS_DEFINED */
216219
220/* _statusfp bit flags */
221#define _SW_INEXACT 0x00000001 /* inexact (precision) */
222#define _SW_UNDERFLOW 0x00000002 /* underflow */
223#define _SW_OVERFLOW 0x00000004 /* overflow */
224#define _SW_ZERODIVIDE 0x00000008 /* zero divide */
225#define _SW_INVALID 0x00000010 /* invalid */
226#define _SW_DENORMAL 0x00080000 /* denormal status bit */
227
217/* invalid subconditions (_SW_INVALID also set) */228/* invalid subconditions (_SW_INVALID also set) */
218#define _SW_UNEMULATED 0x0040 /* unemulated instruction */229#define _SW_UNEMULATED 0x0040 /* unemulated instruction */
219#define _SW_SQRTNEG 0x0080 /* square root of a neg number */230#define _SW_SQRTNEG 0x0080 /* square root of a neg number */
...@@ -261,6 +272,9 @@ extern "C" {...@@ -261,6 +272,9 @@ extern "C" {
261_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int _NewValue, unsigned int _Mask) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;272_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int _NewValue, unsigned int _Mask) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
262_SECIMP errno_t __cdecl _controlfp_s(unsigned int *_CurrentState, unsigned int _NewValue, unsigned int _Mask);273_SECIMP errno_t __cdecl _controlfp_s(unsigned int *_CurrentState, unsigned int _NewValue, unsigned int _Mask);
263_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int _NewValue, unsigned int _Mask);274_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int _NewValue, unsigned int _Mask);
275#ifdef __i386__
276_CRTIMP int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *);
277#endif
264278
265279
266_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */280_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */
lib/libc/include/any-windows-any/fsrm.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fsrm.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fsrm.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fsrmenums.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fsrmenums.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fsrmenums.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fsrmquota.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fsrmquota.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fsrmquota.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fsrmreports.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fsrmreports.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fsrmreports.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fsrmscreen.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fsrmscreen.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fsrmscreen.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/ftw.h+27-3
...@@ -53,10 +53,34 @@ extern "C" {...@@ -53,10 +53,34 @@ extern "C" {
53 /* Continue with FTW_DP callback for current directory (if FTW_DEPTH) and then its siblings. */53 /* Continue with FTW_DP callback for current directory (if FTW_DEPTH) and then its siblings. */
54#define FTW_SKIP_SIBLINGS 354#define FTW_SKIP_SIBLINGS 3
5555
56 int ftw (const char *, int (*) (const char *, const struct stat *, int), int);56/*
57 int ftw64 (const char *, int (*) (const char *, const struct stat64 *, int), int);57 * When building mingw-w64 CRT files it is required that the ftw and
58 * nftw functions are not declared with __MINGW_ASM_CALL redirection.
59 * Otherwise the mingw-w64 would provide broken ftw and nftw symbols.
60 * To prevent ABI issues, the mingw-w64 runtime should not call the ftw,
61 * and nftw functions, instead it should call the fixed-size variants.
62 */
63#ifndef _CRTBLD
64#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
65#ifdef _USE_32BIT_TIME_T
66 int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw32i64);
67 int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw32i64);
68#else
69 int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw64);
70 int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw64);
71#endif
72#else
73#ifdef _USE_32BIT_TIME_T
74 int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw32);
75 int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw32);
76#else
77 int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw64i32);
78 int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw64i32);
79#endif
80#endif
81#endif
5882
59 int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int);83 int ftw64 (const char *, int (*) (const char *, const struct stat64 *, int), int);
60 int nftw64 (const char *, int (*) (const char *, const struct stat64 *, int , struct FTW *), int, int);84 int nftw64 (const char *, int (*) (const char *, const struct stat64 *, int , struct FTW *), int, int);
6185
62#ifdef __cplusplus86#ifdef __cplusplus
lib/libc/include/any-windows-any/fusion.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fusion.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fusion.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/fwptypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/fwptypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/fwptypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/hstring.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/hstring.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/hstring.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/httprequest.h created+473
...@@ -0,0 +1,473 @@
1/*** Autogenerated by WIDL 10.4 from include/httprequest.idl - Do not edit ***/
2
3#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__
5#define __REQUIRED_RPCNDR_H_VERSION__ 475
6#endif
7#include <rpc.h>
8#include <rpcndr.h>
9#endif
10
11#ifndef COM_NO_WINDOWS_H
12#include <windows.h>
13#include <ole2.h>
14#endif
15
16#ifndef __httprequest_h__
17#define __httprequest_h__
18
19/* Forward declarations */
20
21#ifndef __IWinHttpRequest_FWD_DEFINED__
22#define __IWinHttpRequest_FWD_DEFINED__
23typedef interface IWinHttpRequest IWinHttpRequest;
24#ifdef __cplusplus
25interface IWinHttpRequest;
26#endif /* __cplusplus */
27#endif
28
29#ifndef __WinHttpRequest_FWD_DEFINED__
30#define __WinHttpRequest_FWD_DEFINED__
31#ifdef __cplusplus
32typedef class WinHttpRequest WinHttpRequest;
33#else
34typedef struct WinHttpRequest WinHttpRequest;
35#endif /* defined __cplusplus */
36#endif /* defined __WinHttpRequest_FWD_DEFINED__ */
37
38/* Headers for imported files */
39
40#include <oaidl.h>
41
42#ifdef __cplusplus
43extern "C" {
44#endif
45
46#ifndef __WinHttp_LIBRARY_DEFINED__
47#define __WinHttp_LIBRARY_DEFINED__
48
49DEFINE_GUID(LIBID_WinHttp, 0x662901fc, 0x6951, 0x4854, 0x9e,0xb2, 0xd9,0xa2,0x57,0x0f,0x2b,0x2e);
50
51typedef LONG HTTPREQUEST_PROXY_SETTING;
52#define HTTPREQUEST_PROXYSETTING_DEFAULT (0x0)
53
54#define HTTPREQUEST_PROXYSETTING_PRECONFIG (0x0)
55
56#define HTTPREQUEST_PROXYSETTING_DIRECT (0x1)
57
58#define HTTPREQUEST_PROXYSETTING_PROXY (0x2)
59
60typedef LONG HTTPREQUEST_SETCREDENTIALS_FLAGS;
61#define HTTPREQUEST_SETCREDENTIALS_FOR_SERVER (0x0)
62
63#define HTTPREQUEST_SETCREDENTIALS_FOR_PROXY (0x1)
64
65typedef enum WinHttpRequestOption {
66 WinHttpRequestOption_UserAgentString = 0,
67 WinHttpRequestOption_URL = 1,
68 WinHttpRequestOption_URLCodePage = 2,
69 WinHttpRequestOption_EscapePercentInURL = 3,
70 WinHttpRequestOption_SslErrorIgnoreFlags = 4,
71 WinHttpRequestOption_SelectCertificate = 5,
72 WinHttpRequestOption_EnableRedirects = 6,
73 WinHttpRequestOption_UrlEscapeDisable = 7,
74 WinHttpRequestOption_UrlEscapeDisableQuery = 8,
75 WinHttpRequestOption_SecureProtocols = 9,
76 WinHttpRequestOption_EnableTracing = 10,
77 WinHttpRequestOption_RevertImpersonationOverSsl = 11,
78 WinHttpRequestOption_EnableHttpsToHttpRedirects = 12,
79 WinHttpRequestOption_EnablePassportAuthentication = 13,
80 WinHttpRequestOption_MaxAutomaticRedirects = 14,
81 WinHttpRequestOption_MaxResponseHeaderSize = 15,
82 WinHttpRequestOption_MaxResponseDrainSize = 16,
83 WinHttpRequestOption_EnableHttp1_1 = 17,
84 WinHttpRequestOption_EnableCertificateRevocationCheck = 18,
85 WinHttpRequestOption_RejectUserpwd = 19
86} WinHttpRequestOption;
87typedef enum WinHttpRequestAutoLogonPolicy {
88 AutoLogonPolicy_Always = 0,
89 AutoLogonPolicy_OnlyIfBypassProxy = 1,
90 AutoLogonPolicy_Never = 2
91} WinHttpRequestAutoLogonPolicy;
92/*****************************************************************************
93 * IWinHttpRequest interface
94 */
95#ifndef __IWinHttpRequest_INTERFACE_DEFINED__
96#define __IWinHttpRequest_INTERFACE_DEFINED__
97
98DEFINE_GUID(IID_IWinHttpRequest, 0x016fe2ec, 0xb2c8, 0x45f8, 0xb2,0x3b, 0x39,0xe5,0x3a,0x75,0x39,0x6b);
99#if defined(__cplusplus) && !defined(CINTERFACE)
100MIDL_INTERFACE("016fe2ec-b2c8-45f8-b23b-39e53a75396b")
101IWinHttpRequest : public IDispatch
102{
103 virtual HRESULT STDMETHODCALLTYPE SetProxy(
104 HTTPREQUEST_PROXY_SETTING proxy_setting,
105 VARIANT proxy_server,
106 VARIANT bypass_list) = 0;
107
108 virtual HRESULT STDMETHODCALLTYPE SetCredentials(
109 BSTR username,
110 BSTR password,
111 HTTPREQUEST_SETCREDENTIALS_FLAGS flags) = 0;
112
113 virtual HRESULT STDMETHODCALLTYPE Open(
114 BSTR method,
115 BSTR url,
116 VARIANT async) = 0;
117
118 virtual HRESULT STDMETHODCALLTYPE SetRequestHeader(
119 BSTR header,
120 BSTR value) = 0;
121
122 virtual HRESULT STDMETHODCALLTYPE GetResponseHeader(
123 BSTR header,
124 BSTR *value) = 0;
125
126 virtual HRESULT STDMETHODCALLTYPE GetAllResponseHeaders(
127 BSTR *headers) = 0;
128
129 virtual HRESULT STDMETHODCALLTYPE Send(
130 VARIANT body) = 0;
131
132 virtual HRESULT STDMETHODCALLTYPE get_Status(
133 LONG *status) = 0;
134
135 virtual HRESULT STDMETHODCALLTYPE get_StatusText(
136 BSTR *status) = 0;
137
138 virtual HRESULT STDMETHODCALLTYPE get_ResponseText(
139 BSTR *body) = 0;
140
141 virtual HRESULT STDMETHODCALLTYPE get_ResponseBody(
142 VARIANT *body) = 0;
143
144 virtual HRESULT STDMETHODCALLTYPE get_ResponseStream(
145 VARIANT *body) = 0;
146
147 virtual HRESULT STDMETHODCALLTYPE get_Option(
148 WinHttpRequestOption option,
149 VARIANT *value) = 0;
150
151 virtual HRESULT STDMETHODCALLTYPE put_Option(
152 WinHttpRequestOption option,
153 VARIANT value) = 0;
154
155 virtual HRESULT STDMETHODCALLTYPE WaitForResponse(
156 VARIANT timeout,
157 VARIANT_BOOL *succeeded) = 0;
158
159 virtual HRESULT STDMETHODCALLTYPE Abort(
160 ) = 0;
161
162 virtual HRESULT STDMETHODCALLTYPE SetTimeouts(
163 LONG resolve_timeout,
164 LONG connect_timeout,
165 LONG send_timeout,
166 LONG receive_timeout) = 0;
167
168 virtual HRESULT STDMETHODCALLTYPE SetClientCertificate(
169 BSTR certificate) = 0;
170
171 virtual HRESULT STDMETHODCALLTYPE SetAutoLogonPolicy(
172 WinHttpRequestAutoLogonPolicy policy) = 0;
173
174};
175#ifdef __CRT_UUID_DECL
176__CRT_UUID_DECL(IWinHttpRequest, 0x016fe2ec, 0xb2c8, 0x45f8, 0xb2,0x3b, 0x39,0xe5,0x3a,0x75,0x39,0x6b)
177#endif
178#else
179typedef struct IWinHttpRequestVtbl {
180 BEGIN_INTERFACE
181
182 /*** IUnknown methods ***/
183 HRESULT (STDMETHODCALLTYPE *QueryInterface)(
184 IWinHttpRequest *This,
185 REFIID riid,
186 void **ppvObject);
187
188 ULONG (STDMETHODCALLTYPE *AddRef)(
189 IWinHttpRequest *This);
190
191 ULONG (STDMETHODCALLTYPE *Release)(
192 IWinHttpRequest *This);
193
194 /*** IDispatch methods ***/
195 HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
196 IWinHttpRequest *This,
197 UINT *pctinfo);
198
199 HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
200 IWinHttpRequest *This,
201 UINT iTInfo,
202 LCID lcid,
203 ITypeInfo **ppTInfo);
204
205 HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
206 IWinHttpRequest *This,
207 REFIID riid,
208 LPOLESTR *rgszNames,
209 UINT cNames,
210 LCID lcid,
211 DISPID *rgDispId);
212
213 HRESULT (STDMETHODCALLTYPE *Invoke)(
214 IWinHttpRequest *This,
215 DISPID dispIdMember,
216 REFIID riid,
217 LCID lcid,
218 WORD wFlags,
219 DISPPARAMS *pDispParams,
220 VARIANT *pVarResult,
221 EXCEPINFO *pExcepInfo,
222 UINT *puArgErr);
223
224 /*** IWinHttpRequest methods ***/
225 HRESULT (STDMETHODCALLTYPE *SetProxy)(
226 IWinHttpRequest *This,
227 HTTPREQUEST_PROXY_SETTING proxy_setting,
228 VARIANT proxy_server,
229 VARIANT bypass_list);
230
231 HRESULT (STDMETHODCALLTYPE *SetCredentials)(
232 IWinHttpRequest *This,
233 BSTR username,
234 BSTR password,
235 HTTPREQUEST_SETCREDENTIALS_FLAGS flags);
236
237 HRESULT (STDMETHODCALLTYPE *Open)(
238 IWinHttpRequest *This,
239 BSTR method,
240 BSTR url,
241 VARIANT async);
242
243 HRESULT (STDMETHODCALLTYPE *SetRequestHeader)(
244 IWinHttpRequest *This,
245 BSTR header,
246 BSTR value);
247
248 HRESULT (STDMETHODCALLTYPE *GetResponseHeader)(
249 IWinHttpRequest *This,
250 BSTR header,
251 BSTR *value);
252
253 HRESULT (STDMETHODCALLTYPE *GetAllResponseHeaders)(
254 IWinHttpRequest *This,
255 BSTR *headers);
256
257 HRESULT (STDMETHODCALLTYPE *Send)(
258 IWinHttpRequest *This,
259 VARIANT body);
260
261 HRESULT (STDMETHODCALLTYPE *get_Status)(
262 IWinHttpRequest *This,
263 LONG *status);
264
265 HRESULT (STDMETHODCALLTYPE *get_StatusText)(
266 IWinHttpRequest *This,
267 BSTR *status);
268
269 HRESULT (STDMETHODCALLTYPE *get_ResponseText)(
270 IWinHttpRequest *This,
271 BSTR *body);
272
273 HRESULT (STDMETHODCALLTYPE *get_ResponseBody)(
274 IWinHttpRequest *This,
275 VARIANT *body);
276
277 HRESULT (STDMETHODCALLTYPE *get_ResponseStream)(
278 IWinHttpRequest *This,
279 VARIANT *body);
280
281 HRESULT (STDMETHODCALLTYPE *get_Option)(
282 IWinHttpRequest *This,
283 WinHttpRequestOption option,
284 VARIANT *value);
285
286 HRESULT (STDMETHODCALLTYPE *put_Option)(
287 IWinHttpRequest *This,
288 WinHttpRequestOption option,
289 VARIANT value);
290
291 HRESULT (STDMETHODCALLTYPE *WaitForResponse)(
292 IWinHttpRequest *This,
293 VARIANT timeout,
294 VARIANT_BOOL *succeeded);
295
296 HRESULT (STDMETHODCALLTYPE *Abort)(
297 IWinHttpRequest *This);
298
299 HRESULT (STDMETHODCALLTYPE *SetTimeouts)(
300 IWinHttpRequest *This,
301 LONG resolve_timeout,
302 LONG connect_timeout,
303 LONG send_timeout,
304 LONG receive_timeout);
305
306 HRESULT (STDMETHODCALLTYPE *SetClientCertificate)(
307 IWinHttpRequest *This,
308 BSTR certificate);
309
310 HRESULT (STDMETHODCALLTYPE *SetAutoLogonPolicy)(
311 IWinHttpRequest *This,
312 WinHttpRequestAutoLogonPolicy policy);
313
314 END_INTERFACE
315} IWinHttpRequestVtbl;
316
317interface IWinHttpRequest {
318 CONST_VTBL IWinHttpRequestVtbl* lpVtbl;
319};
320
321#ifdef COBJMACROS
322#ifndef WIDL_C_INLINE_WRAPPERS
323/*** IUnknown methods ***/
324#define IWinHttpRequest_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
325#define IWinHttpRequest_AddRef(This) (This)->lpVtbl->AddRef(This)
326#define IWinHttpRequest_Release(This) (This)->lpVtbl->Release(This)
327/*** IDispatch methods ***/
328#define IWinHttpRequest_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo)
329#define IWinHttpRequest_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo)
330#define IWinHttpRequest_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
331#define IWinHttpRequest_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
332/*** IWinHttpRequest methods ***/
333#define IWinHttpRequest_SetProxy(This,proxy_setting,proxy_server,bypass_list) (This)->lpVtbl->SetProxy(This,proxy_setting,proxy_server,bypass_list)
334#define IWinHttpRequest_SetCredentials(This,username,password,flags) (This)->lpVtbl->SetCredentials(This,username,password,flags)
335#define IWinHttpRequest_Open(This,method,url,async) (This)->lpVtbl->Open(This,method,url,async)
336#define IWinHttpRequest_SetRequestHeader(This,header,value) (This)->lpVtbl->SetRequestHeader(This,header,value)
337#define IWinHttpRequest_GetResponseHeader(This,header,value) (This)->lpVtbl->GetResponseHeader(This,header,value)
338#define IWinHttpRequest_GetAllResponseHeaders(This,headers) (This)->lpVtbl->GetAllResponseHeaders(This,headers)
339#define IWinHttpRequest_Send(This,body) (This)->lpVtbl->Send(This,body)
340#define IWinHttpRequest_get_Status(This,status) (This)->lpVtbl->get_Status(This,status)
341#define IWinHttpRequest_get_StatusText(This,status) (This)->lpVtbl->get_StatusText(This,status)
342#define IWinHttpRequest_get_ResponseText(This,body) (This)->lpVtbl->get_ResponseText(This,body)
343#define IWinHttpRequest_get_ResponseBody(This,body) (This)->lpVtbl->get_ResponseBody(This,body)
344#define IWinHttpRequest_get_ResponseStream(This,body) (This)->lpVtbl->get_ResponseStream(This,body)
345#define IWinHttpRequest_get_Option(This,option,value) (This)->lpVtbl->get_Option(This,option,value)
346#define IWinHttpRequest_put_Option(This,option,value) (This)->lpVtbl->put_Option(This,option,value)
347#define IWinHttpRequest_WaitForResponse(This,timeout,succeeded) (This)->lpVtbl->WaitForResponse(This,timeout,succeeded)
348#define IWinHttpRequest_Abort(This) (This)->lpVtbl->Abort(This)
349#define IWinHttpRequest_SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout) (This)->lpVtbl->SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout)
350#define IWinHttpRequest_SetClientCertificate(This,certificate) (This)->lpVtbl->SetClientCertificate(This,certificate)
351#define IWinHttpRequest_SetAutoLogonPolicy(This,policy) (This)->lpVtbl->SetAutoLogonPolicy(This,policy)
352#else
353/*** IUnknown methods ***/
354static inline HRESULT IWinHttpRequest_QueryInterface(IWinHttpRequest* This,REFIID riid,void **ppvObject) {
355 return This->lpVtbl->QueryInterface(This,riid,ppvObject);
356}
357static inline ULONG IWinHttpRequest_AddRef(IWinHttpRequest* This) {
358 return This->lpVtbl->AddRef(This);
359}
360static inline ULONG IWinHttpRequest_Release(IWinHttpRequest* This) {
361 return This->lpVtbl->Release(This);
362}
363/*** IDispatch methods ***/
364static inline HRESULT IWinHttpRequest_GetTypeInfoCount(IWinHttpRequest* This,UINT *pctinfo) {
365 return This->lpVtbl->GetTypeInfoCount(This,pctinfo);
366}
367static inline HRESULT IWinHttpRequest_GetTypeInfo(IWinHttpRequest* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) {
368 return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo);
369}
370static inline HRESULT IWinHttpRequest_GetIDsOfNames(IWinHttpRequest* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) {
371 return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId);
372}
373static inline HRESULT IWinHttpRequest_Invoke(IWinHttpRequest* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) {
374 return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr);
375}
376/*** IWinHttpRequest methods ***/
377static inline HRESULT IWinHttpRequest_SetProxy(IWinHttpRequest* This,HTTPREQUEST_PROXY_SETTING proxy_setting,VARIANT proxy_server,VARIANT bypass_list) {
378 return This->lpVtbl->SetProxy(This,proxy_setting,proxy_server,bypass_list);
379}
380static inline HRESULT IWinHttpRequest_SetCredentials(IWinHttpRequest* This,BSTR username,BSTR password,HTTPREQUEST_SETCREDENTIALS_FLAGS flags) {
381 return This->lpVtbl->SetCredentials(This,username,password,flags);
382}
383static inline HRESULT IWinHttpRequest_Open(IWinHttpRequest* This,BSTR method,BSTR url,VARIANT async) {
384 return This->lpVtbl->Open(This,method,url,async);
385}
386static inline HRESULT IWinHttpRequest_SetRequestHeader(IWinHttpRequest* This,BSTR header,BSTR value) {
387 return This->lpVtbl->SetRequestHeader(This,header,value);
388}
389static inline HRESULT IWinHttpRequest_GetResponseHeader(IWinHttpRequest* This,BSTR header,BSTR *value) {
390 return This->lpVtbl->GetResponseHeader(This,header,value);
391}
392static inline HRESULT IWinHttpRequest_GetAllResponseHeaders(IWinHttpRequest* This,BSTR *headers) {
393 return This->lpVtbl->GetAllResponseHeaders(This,headers);
394}
395static inline HRESULT IWinHttpRequest_Send(IWinHttpRequest* This,VARIANT body) {
396 return This->lpVtbl->Send(This,body);
397}
398static inline HRESULT IWinHttpRequest_get_Status(IWinHttpRequest* This,LONG *status) {
399 return This->lpVtbl->get_Status(This,status);
400}
401static inline HRESULT IWinHttpRequest_get_StatusText(IWinHttpRequest* This,BSTR *status) {
402 return This->lpVtbl->get_StatusText(This,status);
403}
404static inline HRESULT IWinHttpRequest_get_ResponseText(IWinHttpRequest* This,BSTR *body) {
405 return This->lpVtbl->get_ResponseText(This,body);
406}
407static inline HRESULT IWinHttpRequest_get_ResponseBody(IWinHttpRequest* This,VARIANT *body) {
408 return This->lpVtbl->get_ResponseBody(This,body);
409}
410static inline HRESULT IWinHttpRequest_get_ResponseStream(IWinHttpRequest* This,VARIANT *body) {
411 return This->lpVtbl->get_ResponseStream(This,body);
412}
413static inline HRESULT IWinHttpRequest_get_Option(IWinHttpRequest* This,WinHttpRequestOption option,VARIANT *value) {
414 return This->lpVtbl->get_Option(This,option,value);
415}
416static inline HRESULT IWinHttpRequest_put_Option(IWinHttpRequest* This,WinHttpRequestOption option,VARIANT value) {
417 return This->lpVtbl->put_Option(This,option,value);
418}
419static inline HRESULT IWinHttpRequest_WaitForResponse(IWinHttpRequest* This,VARIANT timeout,VARIANT_BOOL *succeeded) {
420 return This->lpVtbl->WaitForResponse(This,timeout,succeeded);
421}
422static inline HRESULT IWinHttpRequest_Abort(IWinHttpRequest* This) {
423 return This->lpVtbl->Abort(This);
424}
425static inline HRESULT IWinHttpRequest_SetTimeouts(IWinHttpRequest* This,LONG resolve_timeout,LONG connect_timeout,LONG send_timeout,LONG receive_timeout) {
426 return This->lpVtbl->SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout);
427}
428static inline HRESULT IWinHttpRequest_SetClientCertificate(IWinHttpRequest* This,BSTR certificate) {
429 return This->lpVtbl->SetClientCertificate(This,certificate);
430}
431static inline HRESULT IWinHttpRequest_SetAutoLogonPolicy(IWinHttpRequest* This,WinHttpRequestAutoLogonPolicy policy) {
432 return This->lpVtbl->SetAutoLogonPolicy(This,policy);
433}
434#endif
435#endif
436
437#endif
438
439
440#endif /* __IWinHttpRequest_INTERFACE_DEFINED__ */
441
442/*****************************************************************************
443 * WinHttpRequest coclass
444 */
445
446DEFINE_GUID(CLSID_WinHttpRequest, 0x2087c2f4, 0x2cef, 0x4953, 0xa8,0xab, 0x66,0x77,0x9b,0x67,0x04,0x95);
447
448#ifdef __cplusplus
449class DECLSPEC_UUID("2087c2f4-2cef-4953-a8ab-66779b670495") WinHttpRequest;
450#ifdef __CRT_UUID_DECL
451__CRT_UUID_DECL(WinHttpRequest, 0x2087c2f4, 0x2cef, 0x4953, 0xa8,0xab, 0x66,0x77,0x9b,0x67,0x04,0x95)
452#endif
453#endif
454
455#endif /* __WinHttp_LIBRARY_DEFINED__ */
456/* Begin additional prototypes for all interfaces */
457
458ULONG __RPC_USER VARIANT_UserSize (ULONG *, ULONG, VARIANT *);
459unsigned char * __RPC_USER VARIANT_UserMarshal (ULONG *, unsigned char *, VARIANT *);
460unsigned char * __RPC_USER VARIANT_UserUnmarshal(ULONG *, unsigned char *, VARIANT *);
461void __RPC_USER VARIANT_UserFree (ULONG *, VARIANT *);
462ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *);
463unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *);
464unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *);
465void __RPC_USER BSTR_UserFree (ULONG *, BSTR *);
466
467/* End additional prototypes */
468
469#ifdef __cplusplus
470}
471#endif
472
473#endif /* __httprequest_h__ */
lib/libc/include/any-windows-any/icftypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/icftypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/icftypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/icodecapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/icodecapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/icodecapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/iisext_i.c deleted-66
...@@ -1,66 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14
15#ifndef INITGUID
16#define INITGUID
17#include <guiddef.h>
18#undef INITGUID
19#else
20#include <guiddef.h>
21#endif
22
23#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
24#else
25
26#ifndef __IID_DEFINED__
27#define __IID_DEFINED__
28 typedef struct _IID {
29 unsigned long x;
30 unsigned short s1;
31 unsigned short s2;
32 unsigned char c[8];
33 } IID;
34#endif
35
36#ifndef CLSID_DEFINED
37#define CLSID_DEFINED
38 typedef IID CLSID;
39#endif
40
41#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
42#endif
43
44 MIDL_DEFINE_GUID(IID,LIBID_IISExt,0x2a56ea30,0xafeb,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03);
45 MIDL_DEFINE_GUID(IID,IID_IISApplicationPool,0x0B3CB1E1,0x829A,0x4c06,0x8B,0x09,0xF5,0x6D,0xA1,0x89,0x4C,0x88);
46 MIDL_DEFINE_GUID(IID,IID_IISApplicationPools,0x587F123F,0x49B4,0x49dd,0x93,0x9E,0xF4,0x54,0x7A,0xA3,0xFA,0x75);
47 MIDL_DEFINE_GUID(IID,IID_IISWebService,0xEE46D40C,0x1B38,0x4a02,0x89,0x8D,0x35,0x8E,0x74,0xDF,0xC9,0xD2);
48 MIDL_DEFINE_GUID(IID,IID_IISDsCrMap,0xedcd6a60,0xb053,0x11d0,0xa6,0x2f,0x00,0xa0,0xc9,0x22,0xe7,0x52);
49 MIDL_DEFINE_GUID(IID,IID_IISApp,0x46FBBB80,0x0192,0x11d1,0x9C,0x39,0x00,0xA0,0xC9,0x22,0xE7,0x03);
50 MIDL_DEFINE_GUID(IID,IID_IISApp2,0x603DCBEA,0x7350,0x11d2,0xA7,0xBE,0x00,0x00,0xF8,0x08,0x5B,0x95);
51 MIDL_DEFINE_GUID(IID,IID_IISApp3,0x2812B639,0x8FAC,0x4510,0x96,0xC5,0x71,0xDD,0xBD,0x1F,0x54,0xFC);
52 MIDL_DEFINE_GUID(IID,IID_IISComputer,0xCF87A2E0,0x078B,0x11d1,0x9C,0x3D,0x00,0xA0,0xC9,0x22,0xE7,0x03);
53 MIDL_DEFINE_GUID(IID,IID_IISComputer2,0x63d89839,0x5762,0x4a68,0xb1,0xb9,0x35,0x07,0xea,0x76,0xcb,0xbf);
54 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtComputer,0x91ef9258,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03);
55 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApp,0xb4f34438,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03);
56 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtServer,0xc3b32488,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03);
57 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtDsCrMap,0xbc36cde8,0xafeb,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03);
58 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApplicationPool,0xE99F9D0C,0xFB39,0x402b,0x9E,0xEB,0xAA,0x18,0x52,0x37,0xBD,0x34);
59 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApplicationPools,0x95863074,0xA389,0x406a,0xA2,0xD7,0xD9,0x8B,0xFC,0x95,0xB9,0x05);
60 MIDL_DEFINE_GUID(CLSID,CLSID_IISExtWebService,0x40B8F873,0xB30E,0x475d,0xBE,0xC5,0x4D,0x0E,0xBB,0x0D,0xBA,0xF3);
61
62#undef MIDL_DEFINE_GUID
63
64#ifdef __cplusplus
65}
66#endif
lib/libc/include/any-windows-any/iketypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/iketypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/iketypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/inputpaneinterop.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/inputpaneinterop.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/inputpaneinterop.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/inputscope.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/inputscope.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/inputscope.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/inspectable.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/inspectable.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/inspectable.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/iwscapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/iwscapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/iwscapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/locale.h+4
...@@ -103,6 +103,10 @@ extern "C" {...@@ -103,6 +103,10 @@ extern "C" {
103 _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale);103 _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale);
104#endif104#endif
105105
106#if __MSVCRT_VERSION__ >= 0xB00
107 _CRTIMP _locale_t __cdecl _wcreate_locale(int _Category, const wchar_t *_Locale);
108#endif
109
106#ifdef __CHAR_UNSIGNED__110#ifdef __CHAR_UNSIGNED__
107/* Pull in the constructor from 'charmax.c'. */111/* Pull in the constructor from 'charmax.c'. */
108extern int __mingw_initcharmax;112extern int __mingw_initcharmax;
lib/libc/include/any-windows-any/locationapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/locationapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/locationapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/malloc.h+2-2
...@@ -102,12 +102,10 @@ extern "C" {...@@ -102,12 +102,10 @@ extern "C" {
102 _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);102 _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);
103 _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);103 _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);
104 _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset);104 _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset);
105# if __MSVCRT_VERSION__ >= 0x900
106 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);105 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);
107 _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);106 _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);
108 _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);107 _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);
109 _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);108 _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);
110# endif
111109
112#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)110#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
113#pragma pop_macro("calloc")111#pragma pop_macro("calloc")
...@@ -131,7 +129,9 @@ extern "C" {...@@ -131,7 +129,9 @@ extern "C" {
131void * __mingw_aligned_malloc (size_t _Size, size_t _Alignment);129void * __mingw_aligned_malloc (size_t _Size, size_t _Alignment);
132void __mingw_aligned_free (void *_Memory);130void __mingw_aligned_free (void *_Memory);
133void * __mingw_aligned_offset_realloc (void *_Memory, size_t _Size, size_t _Alignment, size_t _Offset);131void * __mingw_aligned_offset_realloc (void *_Memory, size_t _Size, size_t _Alignment, size_t _Offset);
132void * __mingw_aligned_offset_malloc (size_t, size_t, size_t);
134void * __mingw_aligned_realloc (void *_Memory, size_t _Size, size_t _Offset);133void * __mingw_aligned_realloc (void *_Memory, size_t _Size, size_t _Offset);
134size_t __mingw_aligned_msize (void *memblock, size_t alignment, size_t offset);
135135
136#if defined(__x86_64__) || defined(__i386__)136#if defined(__x86_64__) || defined(__i386__)
137/* Get the compiler's definition of _mm_malloc and _mm_free. */137/* Get the compiler's definition of _mm_malloc and _mm_free. */
lib/libc/include/any-windows-any/math.h+10-172
...@@ -206,7 +206,7 @@ extern "C" {...@@ -206,7 +206,7 @@ extern "C" {
206206
207 __CRT_INLINE long double __cdecl fabsl (long double x)207 __CRT_INLINE long double __cdecl fabsl (long double x)
208 {208 {
209#if defined(__arm__) || defined(__aarch64__)209#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
210 return __builtin_fabsl (x);210 return __builtin_fabsl (x);
211#else211#else
212 long double res = 0.0l;212 long double res = 0.0l;
...@@ -397,7 +397,9 @@ typedef long double double_t;...@@ -397,7 +397,9 @@ typedef long double double_t;
397397
398#ifndef __CRT__NO_INLINE398#ifndef __CRT__NO_INLINE
399 __CRT_INLINE int __cdecl __fpclassifyl (long double x) {399 __CRT_INLINE int __cdecl __fpclassifyl (long double x) {
400#if defined(__x86_64__) || defined(_AMD64_)400#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
401 return __fpclassify(x);
402#elif defined(__x86_64__) || defined(_AMD64_)
401 __mingw_ldbl_type_t hlp;403 __mingw_ldbl_type_t hlp;
402 unsigned int e;404 unsigned int e;
403 hlp.x = x;405 hlp.x = x;
...@@ -414,8 +416,6 @@ typedef long double double_t;...@@ -414,8 +416,6 @@ typedef long double double_t;
414 return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ?416 return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ?
415 FP_INFINITE : FP_NAN);417 FP_INFINITE : FP_NAN);
416 return FP_NORMAL;418 return FP_NORMAL;
417#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
418 return __fpclassify(x);
419#elif defined(__i386__) || defined(_X86_)419#elif defined(__i386__) || defined(_X86_)
420 unsigned short sw;420 unsigned short sw;
421 __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x));421 __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x));
...@@ -551,7 +551,9 @@ __mingw_choose_expr ( \...@@ -551,7 +551,9 @@ __mingw_choose_expr ( \
551551
552 __CRT_INLINE int __cdecl __isnanl (long double _x)552 __CRT_INLINE int __cdecl __isnanl (long double _x)
553 {553 {
554#if defined(__x86_64__) || defined(_AMD64_)554#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
555 return __isnan(_x);
556#elif defined(__x86_64__) || defined(_AMD64_)
555 __mingw_ldbl_type_t ld;557 __mingw_ldbl_type_t ld;
556 unsigned int xx, signexp;558 unsigned int xx, signexp;
557559
...@@ -561,8 +563,6 @@ __mingw_choose_expr ( \...@@ -561,8 +563,6 @@ __mingw_choose_expr ( \
561 signexp |= (xx | (-xx)) >> 31;563 signexp |= (xx | (-xx)) >> 31;
562 signexp = 0xfffe - signexp;564 signexp = 0xfffe - signexp;
563 return (int) signexp >> 16;565 return (int) signexp >> 16;
564#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
565 return __isnan(_x);
566#elif defined(__i386__) || defined(_X86_)566#elif defined(__i386__) || defined(_X86_)
567 unsigned short sw;567 unsigned short sw;
568 __asm__ __volatile__ ("fxam;"568 __asm__ __volatile__ ("fxam;"
...@@ -621,12 +621,12 @@ __mingw_choose_expr ( \...@@ -621,12 +621,12 @@ __mingw_choose_expr ( \
621 }621 }
622622
623 __CRT_INLINE int __cdecl __signbitl (long double x) {623 __CRT_INLINE int __cdecl __signbitl (long double x) {
624#if defined(__x86_64__) || defined(_AMD64_)624#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
625 return __signbit(x);
626#elif defined(__x86_64__) || defined(_AMD64_)
625 __mingw_ldbl_type_t ld;627 __mingw_ldbl_type_t ld;
626 ld.x = x;628 ld.x = x;
627 return ((ld.lh.sign_exponent & 0x8000) != 0);629 return ((ld.lh.sign_exponent & 0x8000) != 0);
628#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
629 return __signbit(x);
630#elif defined(__i386__) || defined(_X86_)630#elif defined(__i386__) || defined(_X86_)
631 unsigned short stw;631 unsigned short stw;
632 __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));632 __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
...@@ -766,90 +766,6 @@ __mingw_choose_expr ( \...@@ -766,90 +766,6 @@ __mingw_choose_expr ( \
766 extern float __cdecl logbf (float);766 extern float __cdecl logbf (float);
767 extern long double __cdecl logbl (long double);767 extern long double __cdecl logbl (long double);
768768
769#ifndef __CRT__NO_INLINE
770/* When compiling with gcc, always use gcc's builtins.
771 * The asm inlines below are kept here for future reference:
772 * they were written for gcc and do no error handling
773 * (exceptions/errno), therefore only valid if __FAST_MATH__
774 * is defined (-ffast-math) . */
775#if 0 /*defined(__GNUC__) && defined(__FAST_MATH__)*/
776 __CRT_INLINE double __cdecl logb (double x)
777 {
778#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
779 __mingw_dbl_type_t hlp;
780 int lx, hx;
781
782 hlp.x = x;
783 lx = hlp.lh.low;
784 hx = hlp.lh.high & 0x7fffffff; /* high |x| */
785 if ((hx | lx) == 0)
786 return -1.0 / fabs (x);
787 if (hx >= 0x7ff00000)
788 return x * x;
789 if ((hx >>= 20) == 0) {
790 unsigned long long mantissa = hlp.val & 0xfffffffffffffULL;
791 return -1023.0 - (__builtin_clzll(mantissa) - 12);
792 }
793 return (double) (hx - 1023);
794#elif defined(__i386__) || defined(_X86_)
795 double res = 0.0;
796 __asm__ __volatile__ ("fxtract\n\t"
797 "fstp %%st" : "=t" (res) : "0" (x));
798 return res;
799#endif
800 }
801
802 __CRT_INLINE float __cdecl logbf (float x)
803 {
804#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
805 int v;
806 __mingw_flt_type_t hlp;
807
808 hlp.x = x;
809 v = hlp.val & 0x7fffffff; /* high |x| */
810 if (!v)
811 return (float)-1.0 / fabsf (x);
812 if (v >= 0x7f800000)
813 return x * x;
814 if ((v >>= 23) == 0)
815 return -127.0 - (__builtin_clzl(hlp.val & 0x7fffff) - 9);
816 return (float) (v - 127);
817#elif defined(__i386__) || defined(_X86_)
818 float res = 0.0F;
819 __asm__ __volatile__ ("fxtract\n\t"
820 "fstp %%st" : "=t" (res) : "0" (x));
821 return res;
822#endif
823 }
824
825 __CRT_INLINE long double __cdecl logbl (long double x)
826 {
827#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
828 __mingw_ldbl_type_t hlp;
829 int lx, hx;
830
831 hlp.x = x;
832 lx = hlp.lh.low;
833 hx = hlp.lh.high & 0x7fffffff; /* high |x| */
834 if ((hx | lx) == 0)
835 return -1.0 / fabs (x);
836 if (hx >= 0x7ff00000)
837 return x * x;
838 if ((hx >>= 20) == 0) {
839 unsigned long long mantissa = hlp.val & 0xfffffffffffffULL;
840 return -1023.0 - (__builtin_clzll(mantissa) - 12);
841 }
842 return (double) (hx - 1023);
843#elif defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_)
844 long double res = 0.0l;
845 __asm__ __volatile__ ("fxtract\n\t"
846 "fstp %%st" : "=t" (res) : "0" (x));
847 return res;
848#endif
849 }
850#endif /* defined(__GNUC__) && defined(__FAST_MATH__) */
851#endif /* __CRT__NO_INLINE */
852
853/* 7.12.6.12 Double in C89 */769/* 7.12.6.12 Double in C89 */
854 extern float __cdecl modff (float, float*);770 extern float __cdecl modff (float, float*);
855 extern long double __cdecl modfl (long double, long double*);771 extern long double __cdecl modfl (long double, long double*);
...@@ -938,84 +854,6 @@ __MINGW_EXTENSION long long __cdecl llrint (double);...@@ -938,84 +854,6 @@ __MINGW_EXTENSION long long __cdecl llrint (double);
938__MINGW_EXTENSION long long __cdecl llrintf (float);854__MINGW_EXTENSION long long __cdecl llrintf (float);
939__MINGW_EXTENSION long long __cdecl llrintl (long double);855__MINGW_EXTENSION long long __cdecl llrintl (long double);
940856
941#ifndef __CRT__NO_INLINE
942/* When compiling with gcc, always use gcc's builtins.
943 * The asm inlines below are kept here for future reference:
944 * they were written for gcc and do no error handling
945 * (exceptions/errno), therefore only valid if __FAST_MATH__
946 * is defined (-ffast-math) . */
947#if 0 /*defined(__GNUC__) && defined(__FAST_MATH__)*/
948 __CRT_INLINE double __cdecl rint (double x)
949 {
950 double retval = 0.0;
951 __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x));
952 return retval;
953 }
954
955 __CRT_INLINE float __cdecl rintf (float x)
956 {
957 float retval = 0.0;
958 __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) );
959 return retval;
960 }
961
962 __CRT_INLINE long double __cdecl rintl (long double x)
963 {
964 long double retval = 0.0l;
965 __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) );
966 return retval;
967 }
968
969 __CRT_INLINE long __cdecl lrint (double x)
970 {
971 long retval = 0;
972 __asm__ __volatile__ \
973 ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \
974 return retval;
975 }
976
977 __CRT_INLINE long __cdecl lrintf (float x)
978 {
979 long retval = 0;
980 __asm__ __volatile__ \
981 ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \
982 return retval;
983 }
984
985 __CRT_INLINE long __cdecl lrintl (long double x)
986 {
987 long retval = 0;
988 __asm__ __volatile__ \
989 ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \
990 return retval;
991 }
992
993 __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x)
994 {
995 __MINGW_EXTENSION long long retval = 0ll;
996 __asm__ __volatile__ \
997 ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \
998 return retval;
999 }
1000
1001 __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x)
1002 {
1003 __MINGW_EXTENSION long long retval = 0ll;
1004 __asm__ __volatile__ \
1005 ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \
1006 return retval;
1007 }
1008
1009 __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x)
1010 {
1011 __MINGW_EXTENSION long long retval = 0ll;
1012 __asm__ __volatile__ \
1013 ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \
1014 return retval;
1015 }
1016#endif /* defined(__GNUC__) && defined(__FAST_MATH__) */
1017#endif /* !__CRT__NO_INLINE */
1018
1019/* 7.12.9.6 */857/* 7.12.9.6 */
1020/* round away from zero, regardless of fpu control word settings */858/* round away from zero, regardless of fpu control word settings */
1021 extern double __cdecl round (double);859 extern double __cdecl round (double);
lib/libc/include/any-windows-any/mediaobj.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mediaobj.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mediaobj.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/medparam.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/medparam.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/medparam.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/memoryapi.h+3-1
...@@ -159,7 +159,9 @@ extern "C" {...@@ -159,7 +159,9 @@ extern "C" {
159159
160#if NTDDI_VERSION >= NTDDI_WIN10_RS2160#if NTDDI_VERSION >= NTDDI_WIN10_RS2
161 WINBASEAPI PVOID WINAPI MapViewOfFileNuma2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection, ULONG PreferredNode);161 WINBASEAPI PVOID WINAPI MapViewOfFileNuma2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection, ULONG PreferredNode);
162 WINBASEAPI PVOID MapViewOfFile2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection);162 FORCEINLINE PVOID MapViewOfFile2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection) {
163 return MapViewOfFileNuma2(FileMappingHandle, ProcessHandle, Offset, BaseAddress, ViewSize, AllocationType, PageProtection, NUMA_NO_PREFERRED_NODE);
164 }
163#endif165#endif
164166
165#if NTDDI_VERSION >= NTDDI_WIN10_RS4167#if NTDDI_VERSION >= NTDDI_WIN10_RS4
lib/libc/include/any-windows-any/mfapi.h+6-6
...@@ -104,7 +104,7 @@ extern "C" {...@@ -104,7 +104,7 @@ extern "C" {
104 typedef enum {104 typedef enum {
105 MF_STANDARD_WORKQUEUE = 0,105 MF_STANDARD_WORKQUEUE = 0,
106 MF_WINDOW_WORKQUEUE = 1,106 MF_WINDOW_WORKQUEUE = 1,
107 MF_MULTITHREADED_WORKQUEUE = 2,107 MF_MULTITHREADED_WORKQUEUE = 2
108 } MFASYNC_WORKQUEUE_TYPE;108 } MFASYNC_WORKQUEUE_TYPE;
109#endif109#endif
110110
...@@ -198,7 +198,7 @@ extern "C" {...@@ -198,7 +198,7 @@ extern "C" {
198 MF_TOPOSTATUS_DYNAMIC_CHANGED = 210,198 MF_TOPOSTATUS_DYNAMIC_CHANGED = 210,
199#endif199#endif
200 MF_TOPOSTATUS_SINK_SWITCHED = 300,200 MF_TOPOSTATUS_SINK_SWITCHED = 300,
201 MF_TOPOSTATUS_ENDED = 400,201 MF_TOPOSTATUS_ENDED = 400
202 } MF_TOPOSTATUS;202 } MF_TOPOSTATUS;
203203
204 EXTERN_C const GUID MR_BUFFER_SERVICE;204 EXTERN_C const GUID MR_BUFFER_SERVICE;
...@@ -451,26 +451,26 @@ DEFINE_MEDIATYPE_GUID(MFVideoFormat_Theora, FCC('theo'));...@@ -451,26 +451,26 @@ DEFINE_MEDIATYPE_GUID(MFVideoFormat_Theora, FCC('theo'));
451 MFVideo3DSampleFormat_BaseView = 0,451 MFVideo3DSampleFormat_BaseView = 0,
452 MFVideo3DSampleFormat_MultiView = 1,452 MFVideo3DSampleFormat_MultiView = 1,
453 MFVideo3DSampleFormat_Packed_LeftRight = 2,453 MFVideo3DSampleFormat_Packed_LeftRight = 2,
454 MFVideo3DSampleFormat_Packed_TopBottom = 3,454 MFVideo3DSampleFormat_Packed_TopBottom = 3
455 } MFVideo3DFormat;455 } MFVideo3DFormat;
456456
457 typedef enum _MFVideo3DSampleFormat {457 typedef enum _MFVideo3DSampleFormat {
458 MFSampleExtension_3DVideo_MultiView = 1,458 MFSampleExtension_3DVideo_MultiView = 1,
459 MFSampleExtension_3DVideo_Packed = 0,459 MFSampleExtension_3DVideo_Packed = 0
460 } MFVideo3DSampleFormat;460 } MFVideo3DSampleFormat;
461461
462 typedef enum _MFVideoRotationFormat {462 typedef enum _MFVideoRotationFormat {
463 MFVideoRotationFormat_0 = 0,463 MFVideoRotationFormat_0 = 0,
464 MFVideoRotationFormat_90 = 90,464 MFVideoRotationFormat_90 = 90,
465 MFVideoRotationFormat_180 = 180,465 MFVideoRotationFormat_180 = 180,
466 MFVideoRotationFormat_270 = 270,466 MFVideoRotationFormat_270 = 270
467 } MFVideoRotationFormat;467 } MFVideoRotationFormat;
468#endif468#endif
469469
470 typedef enum _MFVideoDRMFlags {470 typedef enum _MFVideoDRMFlags {
471 MFVideoDRMFlag_None = 0,471 MFVideoDRMFlag_None = 0,
472 MFVideoDRMFlag_AnalogProtected = 1,472 MFVideoDRMFlag_AnalogProtected = 1,
473 MFVideoDRMFlag_DigitallyProtected = 2,473 MFVideoDRMFlag_DigitallyProtected = 2
474 } MFVideoDRMFlags;474 } MFVideoDRMFlags;
475475
476 typedef enum _MFVideoPadFlags {476 typedef enum _MFVideoPadFlags {
lib/libc/include/any-windows-any/mfcaptureengine.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfcaptureengine.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfcaptureengine.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfd3d12.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfd3d12.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfd3d12.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfmediacapture.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfmediacapture.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfmediacapture.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfmediaengine.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfmediaengine.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfmediaengine.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfobjects.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfobjects.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfobjects.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfplay.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfplay.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfplay.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mfreadwrite.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mfreadwrite.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mfreadwrite.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mftransform.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mftransform.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mftransform.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mmdeviceapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mmdeviceapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mmdeviceapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mmstream.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mmstream.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mmstream.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mpeg2bits.h+63-17
...@@ -1,23 +1,69 @@...@@ -1,23 +1,69 @@
1/**1/*
2 * This file has no copyright assigned and is placed in the Public Domain.2 * Copyright (C) 2025 Biswapriyo Nath
3 * This file is part of the mingw-w64 runtime package.3 *
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version.
8 *
9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details.
13 *
14 * You should have received a copy of the GNU Lesser General Public
15 * License along with this library; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
5 */17 */
6#ifndef __INC_MPEG2BITS__
7#define __INC_MPEG2BITS__
8#include <windef.h>
918
10typedef struct _MPEG_HEADER_BITS {19#ifndef _MPEG2BITS_H_
11 WORD SectionLength :12;20#define _MPEG2BITS_H_
12 WORD Reserved :2;21
13 WORD PrivateIndicator :1;22#pragma pack(push)
14 WORD SectionSyntaxIndicator :1;23#pragma pack(1)
24
25#if defined(__midl) || defined(__WIDL__)
26typedef struct
27{
28 WORD Bits;
29} PID_BITS_MIDL;
30#else
31typedef struct
32{
33 WORD Reserved : 3;
34 WORD ProgramId : 13;
35} PID_BITS, *PPID_BITS;
36#endif
37
38#if defined(__midl) || defined(__WIDL__)
39typedef struct
40{
41 WORD Bits;
42} MPEG_HEADER_BITS_MIDL;
43#else
44typedef struct
45{
46 WORD SectionLength : 12;
47 WORD Reserved : 2;
48 WORD PrivateIndicator : 1;
49 WORD SectionSyntaxIndicator : 1;
15} MPEG_HEADER_BITS, *PMPEG_HEADER_BITS;50} MPEG_HEADER_BITS, *PMPEG_HEADER_BITS;
51#endif
1652
17typedef struct _MPEG_HEADER_VERSION_BITS {53#if defined(__midl) || defined(__WIDL__)
18 BYTE CurrentNextIndicator :1;54typedef struct
19 BYTE VersionNumber :5;55{
20 BYTE Reserved :2;56 BYTE Bits;
57} MPEG_HEADER_VERSION_BITS_MIDL;
58#else
59typedef struct
60{
61 BYTE CurrentNextIndicator : 1;
62 BYTE VersionNumber : 5;
63 BYTE Reserved : 2;
21} MPEG_HEADER_VERSION_BITS, *PMPEG_HEADER_VERSION_BITS;64} MPEG_HEADER_VERSION_BITS, *PMPEG_HEADER_VERSION_BITS;
65#endif
66
67#pragma pack(pop)
2268
23#endif /* __INC_MPEG2BITS__ */69#endif /* _MPEG2BITS_H_ */
lib/libc/include/any-windows-any/mpeg2data.h+731-91
...@@ -1,138 +1,778 @@...@@ -1,138 +1,778 @@
1/**1/*** Autogenerated by WIDL 10.4 from include/mpeg2data.idl - Do not edit ***/
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifndef __INC_MPEG2DATA__
7#define __INC_MPEG2DATA__
82
9#include <objbase.h>3#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__
5#define __REQUIRED_RPCNDR_H_VERSION__ 475
6#endif
7#include <rpc.h>
8#include <rpcndr.h>
9#endif
1010
11typedef WORD PID;11#ifndef COM_NO_WINDOWS_H
12typedef BYTE TID;12#include <windows.h>
13#include <ole2.h>
14#endif
1315
14typedef struct _ATSC_FILTER_OPTIONS {16#ifndef __mpeg2data_h__
15 WINBOOL fSpecifyEtmId;17#define __mpeg2data_h__
16 DWORD EtmId;
17} ATSC_FILTER_OPTIONS;
1818
19#include <mpeg2structs.h>19/* Forward declarations */
2020
21#ifndef __ISectionList_FWD_DEFINED__21#ifndef __IMpeg2TableFilter_FWD_DEFINED__
22#define __ISectionList_FWD_DEFINED__22#define __IMpeg2TableFilter_FWD_DEFINED__
23typedef struct ISectionList ISectionList;23typedef interface IMpeg2TableFilter IMpeg2TableFilter;
24#ifdef __cplusplus
25interface IMpeg2TableFilter;
26#endif /* __cplusplus */
24#endif27#endif
2528
29#ifndef __Mpeg2TableFilter_FWD_DEFINED__
30#define __Mpeg2TableFilter_FWD_DEFINED__
31#ifdef __cplusplus
32typedef class Mpeg2TableFilter Mpeg2TableFilter;
33#else
34typedef struct Mpeg2TableFilter Mpeg2TableFilter;
35#endif /* defined __cplusplus */
36#endif /* defined __Mpeg2TableFilter_FWD_DEFINED__ */
37
26#ifndef __IMpeg2Data_FWD_DEFINED__38#ifndef __IMpeg2Data_FWD_DEFINED__
27#define __IMpeg2Data_FWD_DEFINED__39#define __IMpeg2Data_FWD_DEFINED__
28typedef struct IMpeg2Data IMpeg2Data;40typedef interface IMpeg2Data IMpeg2Data;
41#ifdef __cplusplus
42interface IMpeg2Data;
43#endif /* __cplusplus */
44#endif
45
46#ifndef __ISectionList_FWD_DEFINED__
47#define __ISectionList_FWD_DEFINED__
48typedef interface ISectionList ISectionList;
49#ifdef __cplusplus
50interface ISectionList;
51#endif /* __cplusplus */
29#endif52#endif
3053
31#ifndef __IMpeg2Stream_FWD_DEFINED__54#ifndef __IMpeg2Stream_FWD_DEFINED__
32#define __IMpeg2Stream_FWD_DEFINED__55#define __IMpeg2Stream_FWD_DEFINED__
33typedef struct IMpeg2Stream IMpeg2Stream;56typedef interface IMpeg2Stream IMpeg2Stream;
57#ifdef __cplusplus
58interface IMpeg2Stream;
59#endif /* __cplusplus */
34#endif60#endif
3561
36#undef INTERFACE62#ifndef __SectionList_FWD_DEFINED__
37#define INTERFACE ISectionList63#define __SectionList_FWD_DEFINED__
38#ifdef __GNUC__64#ifdef __cplusplus
39#warning COM interfaces layout in this header has not been verified.65typedef class SectionList SectionList;
40#warning COM interfaces with incorrect layout may not work at all.66#else
41__MINGW_BROKEN_INTERFACE(INTERFACE)67typedef struct SectionList SectionList;
68#endif /* defined __cplusplus */
69#endif /* defined __SectionList_FWD_DEFINED__ */
70
71#ifndef __Mpeg2Stream_FWD_DEFINED__
72#define __Mpeg2Stream_FWD_DEFINED__
73#ifdef __cplusplus
74typedef class Mpeg2Stream Mpeg2Stream;
75#else
76typedef struct Mpeg2Stream Mpeg2Stream;
77#endif /* defined __cplusplus */
78#endif /* defined __Mpeg2Stream_FWD_DEFINED__ */
79
80#ifndef __Mpeg2Data_FWD_DEFINED__
81#define __Mpeg2Data_FWD_DEFINED__
82#ifdef __cplusplus
83typedef class Mpeg2Data Mpeg2Data;
84#else
85typedef struct Mpeg2Data Mpeg2Data;
86#endif /* defined __cplusplus */
87#endif /* defined __Mpeg2Data_FWD_DEFINED__ */
88
89/* Headers for imported files */
90
91#include <oaidl.h>
92#include <ocidl.h>
93#include <bdaiface.h>
94#include <mpeg2structs.h>
95
96#ifdef __cplusplus
97extern "C" {
42#endif98#endif
43DECLARE_INTERFACE_(ISectionList,IUnknown)99
100#ifndef __ISectionList_FWD_DEFINED__
101#define __ISectionList_FWD_DEFINED__
102typedef interface ISectionList ISectionList;
103#ifdef __cplusplus
104interface ISectionList;
105#endif /* __cplusplus */
106#endif
107
108#ifndef __IMpeg2Stream_FWD_DEFINED__
109#define __IMpeg2Stream_FWD_DEFINED__
110typedef interface IMpeg2Stream IMpeg2Stream;
111#ifdef __cplusplus
112interface IMpeg2Stream;
113#endif /* __cplusplus */
114#endif
115
116#define MPEG_PAT_PID 0x0000
117#define MPEG_PAT_TID 0x00
118#define MPEG_CAT_PID 0x0001
119#define MPEG_CAT_TID 0x01
120#define MPEG_PMT_TID 0x02
121#define MPEG_TSDT_PID 0x0002
122#define MPEG_TSDT_TID 0x03
123#define ATSC_MGT_PID 0x1ffb
124#define ATSC_MGT_TID 0xc7
125#define ATSC_VCT_PID 0x1ffb
126#define ATSC_VCT_TERR_TID 0xc8
127#define ATSC_VCT_CABL_TID 0xc9
128#define ATSC_EIT_TID 0xcb
129#define ATSC_ETT_TID 0xcc
130#define ATSC_RRT_TID 0xca
131#define ATSC_RRT_PID 0x1ffb
132#define ATSC_STT_PID 0x1ffb
133#define ATSC_STT_TID 0xcd
134#define ATSC_PIT_TID 0xd0
135#define DVB_NIT_PID 0x0010
136#define DVB_NIT_ACTUAL_TID 0x40
137#define DVB_NIT_OTHER_TID 0x41
138#define DVB_SDT_PID 0x0011
139#define DVB_SDT_ACTUAL_TID 0x42
140#define DVB_SDT_OTHER_TID 0x46
141#define DVB_BAT_PID 0x0011
142#define DVB_BAT_TID 0x4a
143#define DVB_EIT_PID 0x0012
144#define DVB_EIT_ACTUAL_TID 0x4e
145#define DVB_EIT_OTHER_TID 0x4f
146#define DVB_RST_PID 0x0013
147#define DVB_RST_TID 0x71
148#define DVB_TDT_PID 0x0014
149#define DVB_TDT_TID 0x70
150#define DVB_ST_PID_16 0x0010
151#define DVB_ST_PID_17 0x0011
152#define DVB_ST_PID_18 0x0012
153#define DVB_ST_PID_19 0x0013
154#define DVB_ST_PID_20 0x0014
155#define DVB_ST_TID 0x72
156#define ISDB_ST_TID 0x72
157#define DVB_TOT_PID 0x0014
158#define DVB_TOT_TID 0x73
159#define DVB_DIT_PID 0x001e
160#define DVB_DIT_TID 0x7e
161#define DVB_SIT_PID 0x001f
162#define DVB_SIT_TID 0x7f
163#define ISDB_EMM_TID 0x85
164#define ISDB_BIT_PID 0x0024
165#define ISDB_BIT_TID 0xc4
166#define ISDB_NBIT_PID 0x0025
167#define ISDB_NBIT_MSG_TID 0xc5
168#define ISDB_NBIT_REF_TID 0xc6
169#define ISDB_LDT_PID 0x0025
170#define ISDB_LDT_TID 0xc7
171#define ISDB_SDTT_PID 0x0023
172#define ISDB_SDTT_ALT_PID 0x0028
173#define ISDB_SDTT_TID 0xc3
174#define ISDB_CDT_PID 0x0029
175#define ISDB_CDT_TID 0xc8
176#define SCTE_EAS_TID 0xd8
177#define SCTE_EAS_IB_PID 0x1ffb
178#define SCTE_EAS_OOB_PID 0x1ffc
179/*****************************************************************************
180 * IMpeg2TableFilter interface
181 */
182#ifndef __IMpeg2TableFilter_INTERFACE_DEFINED__
183#define __IMpeg2TableFilter_INTERFACE_DEFINED__
184
185DEFINE_GUID(IID_IMpeg2TableFilter, 0xbdcdd913, 0x9ecd, 0x4fb2, 0x81,0xae, 0xad,0xf7,0x47,0xea,0x75,0xa5);
186#if defined(__cplusplus) && !defined(CINTERFACE)
187MIDL_INTERFACE("bdcdd913-9ecd-4fb2-81ae-adf747ea75a5")
188IMpeg2TableFilter : public IUnknown
44{189{
190 virtual HRESULT STDMETHODCALLTYPE AddPID(
191 PID p) = 0;
192
193 virtual HRESULT STDMETHODCALLTYPE AddTable(
194 PID p,
195 TID t) = 0;
196
197 virtual HRESULT STDMETHODCALLTYPE AddExtension(
198 PID p,
199 TID t,
200 TEID e) = 0;
201
202 virtual HRESULT STDMETHODCALLTYPE RemovePID(
203 PID p) = 0;
204
205 virtual HRESULT STDMETHODCALLTYPE RemoveTable(
206 PID p,
207 TID t) = 0;
208
209 virtual HRESULT STDMETHODCALLTYPE RemoveExtension(
210 PID p,
211 TID t,
212 TEID e) = 0;
213
214};
215#ifdef __CRT_UUID_DECL
216__CRT_UUID_DECL(IMpeg2TableFilter, 0xbdcdd913, 0x9ecd, 0x4fb2, 0x81,0xae, 0xad,0xf7,0x47,0xea,0x75,0xa5)
217#endif
218#else
219typedef struct IMpeg2TableFilterVtbl {
45 BEGIN_INTERFACE220 BEGIN_INTERFACE
46221
47 /* IUnknown methods */222 /*** IUnknown methods ***/
48 STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;223 HRESULT (STDMETHODCALLTYPE *QueryInterface)(
49 STDMETHOD_(ULONG, AddRef)(THIS) PURE;224 IMpeg2TableFilter *This,
50 STDMETHOD_(ULONG, Release)(THIS) PURE;225 REFIID riid,
226 void **ppvObject);
227
228 ULONG (STDMETHODCALLTYPE *AddRef)(
229 IMpeg2TableFilter *This);
230
231 ULONG (STDMETHODCALLTYPE *Release)(
232 IMpeg2TableFilter *This);
233
234 /*** IMpeg2TableFilter methods ***/
235 HRESULT (STDMETHODCALLTYPE *AddPID)(
236 IMpeg2TableFilter *This,
237 PID p);
238
239 HRESULT (STDMETHODCALLTYPE *AddTable)(
240 IMpeg2TableFilter *This,
241 PID p,
242 TID t);
51243
52 /* ISectionList methods */244 HRESULT (STDMETHODCALLTYPE *AddExtension)(
53 STDMETHOD_(HRESULT,CancelPendingRequest)(THIS) PURE;245 IMpeg2TableFilter *This,
54 STDMETHOD_(HRESULT,GetNumberOfSections)(THIS_ WORD *pCount) PURE;246 PID p,
55 STDMETHOD_(HRESULT,GetProgramIdentifier)(THIS_ PID *pPid) PURE;247 TID t,
56 STDMETHOD_(HRESULT,GetSectionData)(THIS_ WORD sectionNumber,DWORD *pdwRawPacketLength,PSECTION *ppSection) PURE;248 TEID e);
57 STDMETHOD_(HRESULT,GetTableIdentifier)(THIS_ TID *pTableId) PURE;249
58 STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD timeout,HANDLE hDoneEvent) PURE;250 HRESULT (STDMETHODCALLTYPE *RemovePID)(
59 STDMETHOD_(HRESULT,InitializeWithRawSections)(THIS_ PMPEG_PACKET_LIST pmplSections) PURE;251 IMpeg2TableFilter *This,
252 PID p);
253
254 HRESULT (STDMETHODCALLTYPE *RemoveTable)(
255 IMpeg2TableFilter *This,
256 PID p,
257 TID t);
258
259 HRESULT (STDMETHODCALLTYPE *RemoveExtension)(
260 IMpeg2TableFilter *This,
261 PID p,
262 TID t,
263 TEID e);
60264
61 END_INTERFACE265 END_INTERFACE
266} IMpeg2TableFilterVtbl;
267
268interface IMpeg2TableFilter {
269 CONST_VTBL IMpeg2TableFilterVtbl* lpVtbl;
62};270};
271
63#ifdef COBJMACROS272#ifdef COBJMACROS
64#define ISectionList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)273#ifndef WIDL_C_INLINE_WRAPPERS
65#define ISectionList_AddRef(This) (This)->lpVtbl->AddRef(This)274/*** IUnknown methods ***/
66#define ISectionList_Release(This) (This)->lpVtbl->Release(This)275#define IMpeg2TableFilter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
67#define ISectionList_CancelPendingRequest() (This)->lpVtbl->CancelPendingRequest(This)276#define IMpeg2TableFilter_AddRef(This) (This)->lpVtbl->AddRef(This)
68#define ISectionList_GetNumberOfSections(This,pCount) (This)->lpVtbl->GetNumberOfSections(This,pCount)277#define IMpeg2TableFilter_Release(This) (This)->lpVtbl->Release(This)
69#define ISectionList_GetProgramIdentifier(This,pPid) (This)->lpVtbl->GetProgramIdentifier(This,pPid)278/*** IMpeg2TableFilter methods ***/
70#define ISectionList_GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection) (This)->lpVtbl->GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection)279#define IMpeg2TableFilter_AddPID(This,p) (This)->lpVtbl->AddPID(This,p)
71#define ISectionList_GetTableIdentifier(This,pTableId) (This)->lpVtbl->GetTableIdentifier(This,pTableId)280#define IMpeg2TableFilter_AddTable(This,p,t) (This)->lpVtbl->AddTable(This,p,t)
72#define ISectionList_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent)281#define IMpeg2TableFilter_AddExtension(This,p,t,e) (This)->lpVtbl->AddExtension(This,p,t,e)
73#define ISectionList_InitializeWithRawSections(This,pmplSections) (This)->lpVtbl->InitializeWithRawSections(This,pmplSections)282#define IMpeg2TableFilter_RemovePID(This,p) (This)->lpVtbl->RemovePID(This,p)
74#endif /*COBJMACROS*/283#define IMpeg2TableFilter_RemoveTable(This,p,t) (This)->lpVtbl->RemoveTable(This,p,t)
75284#define IMpeg2TableFilter_RemoveExtension(This,p,t,e) (This)->lpVtbl->RemoveExtension(This,p,t,e)
76#undef INTERFACE285#else
77#define INTERFACE IMpeg2Data286/*** IUnknown methods ***/
78#ifdef __GNUC__287static inline HRESULT IMpeg2TableFilter_QueryInterface(IMpeg2TableFilter* This,REFIID riid,void **ppvObject) {
79#warning COM interfaces layout in this header has not been verified.288 return This->lpVtbl->QueryInterface(This,riid,ppvObject);
80#warning COM interfaces with incorrect layout may not work at all.289}
81__MINGW_BROKEN_INTERFACE(INTERFACE)290static inline ULONG IMpeg2TableFilter_AddRef(IMpeg2TableFilter* This) {
82#endif291 return This->lpVtbl->AddRef(This);
83DECLARE_INTERFACE_(IMpeg2Data,IUnknown)292}
293static inline ULONG IMpeg2TableFilter_Release(IMpeg2TableFilter* This) {
294 return This->lpVtbl->Release(This);
295}
296/*** IMpeg2TableFilter methods ***/
297static inline HRESULT IMpeg2TableFilter_AddPID(IMpeg2TableFilter* This,PID p) {
298 return This->lpVtbl->AddPID(This,p);
299}
300static inline HRESULT IMpeg2TableFilter_AddTable(IMpeg2TableFilter* This,PID p,TID t) {
301 return This->lpVtbl->AddTable(This,p,t);
302}
303static inline HRESULT IMpeg2TableFilter_AddExtension(IMpeg2TableFilter* This,PID p,TID t,TEID e) {
304 return This->lpVtbl->AddExtension(This,p,t,e);
305}
306static inline HRESULT IMpeg2TableFilter_RemovePID(IMpeg2TableFilter* This,PID p) {
307 return This->lpVtbl->RemovePID(This,p);
308}
309static inline HRESULT IMpeg2TableFilter_RemoveTable(IMpeg2TableFilter* This,PID p,TID t) {
310 return This->lpVtbl->RemoveTable(This,p,t);
311}
312static inline HRESULT IMpeg2TableFilter_RemoveExtension(IMpeg2TableFilter* This,PID p,TID t,TEID e) {
313 return This->lpVtbl->RemoveExtension(This,p,t,e);
314}
315#endif
316#endif
317
318#endif
319
320
321#endif /* __IMpeg2TableFilter_INTERFACE_DEFINED__ */
322
323/*****************************************************************************
324 * Mpeg2TableFilter coclass
325 */
326
327DEFINE_GUID(CLSID_Mpeg2TableFilter, 0x752845f1, 0x758f, 0x4c83, 0xa0,0x43, 0x42,0x70,0xc5,0x93,0x30,0x8e);
328
329#ifdef __cplusplus
330class DECLSPEC_UUID("752845f1-758f-4c83-a043-4270c593308e") Mpeg2TableFilter;
331#ifdef __CRT_UUID_DECL
332__CRT_UUID_DECL(Mpeg2TableFilter, 0x752845f1, 0x758f, 0x4c83, 0xa0,0x43, 0x42,0x70,0xc5,0x93,0x30,0x8e)
333#endif
334#endif
335
336typedef struct Mpeg2TableSampleHdr {
337 BYTE SectionCount;
338 BYTE Reserved[3];
339 LONG SectionOffsets[1];
340} Mpeg2TableSampleHdr;
341#ifndef __Mpeg2DataLib_LIBRARY_DEFINED__
342#define __Mpeg2DataLib_LIBRARY_DEFINED__
343
344DEFINE_GUID(LIBID_Mpeg2DataLib, 0xdbaf6c1b, 0xb6a4, 0x4898, 0xae,0x65, 0x20,0x4f,0x0d,0x95,0x09,0xa1);
345
346/*****************************************************************************
347 * IMpeg2Data interface
348 */
349#ifndef __IMpeg2Data_INTERFACE_DEFINED__
350#define __IMpeg2Data_INTERFACE_DEFINED__
351
352DEFINE_GUID(IID_IMpeg2Data, 0x9b396d40, 0xf380, 0x4e3c, 0xa5,0x14, 0x1a,0x82,0xbf,0x6e,0xbf,0xe6);
353#if defined(__cplusplus) && !defined(CINTERFACE)
354MIDL_INTERFACE("9b396d40-f380-4e3c-a514-1a82bf6ebfe6")
355IMpeg2Data : public IUnknown
84{356{
357 virtual HRESULT STDMETHODCALLTYPE GetSection(
358 PID pid,
359 TID tid,
360 PMPEG2_FILTER filter,
361 DWORD timeout,
362 ISectionList **section_list) = 0;
363
364 virtual HRESULT STDMETHODCALLTYPE GetTable(
365 PID pid,
366 TID tid,
367 PMPEG2_FILTER filter,
368 DWORD timeout,
369 ISectionList **section_list) = 0;
370
371 virtual HRESULT STDMETHODCALLTYPE GetStreamOfSections(
372 PID pid,
373 TID tid,
374 PMPEG2_FILTER filter,
375 HANDLE data_ready_event,
376 IMpeg2Stream **mpeg_stream) = 0;
377
378};
379#ifdef __CRT_UUID_DECL
380__CRT_UUID_DECL(IMpeg2Data, 0x9b396d40, 0xf380, 0x4e3c, 0xa5,0x14, 0x1a,0x82,0xbf,0x6e,0xbf,0xe6)
381#endif
382#else
383typedef struct IMpeg2DataVtbl {
85 BEGIN_INTERFACE384 BEGIN_INTERFACE
86385
87 /* IUnknown methods */386 /*** IUnknown methods ***/
88 STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;387 HRESULT (STDMETHODCALLTYPE *QueryInterface)(
89 STDMETHOD_(ULONG, AddRef)(THIS) PURE;388 IMpeg2Data *This,
90 STDMETHOD_(ULONG, Release)(THIS) PURE;389 REFIID riid,
390 void **ppvObject);
391
392 ULONG (STDMETHODCALLTYPE *AddRef)(
393 IMpeg2Data *This);
91394
92 /* IMpeg2Data methods */395 ULONG (STDMETHODCALLTYPE *Release)(
93 STDMETHOD_(HRESULT,GetSection)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE;396 IMpeg2Data *This);
94 STDMETHOD_(HRESULT,GetStreamOfSections)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent,IMpeg2Stream **ppMpegStream) PURE;397
95 STDMETHOD_(HRESULT,GetTable)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE;398 /*** IMpeg2Data methods ***/
399 HRESULT (STDMETHODCALLTYPE *GetSection)(
400 IMpeg2Data *This,
401 PID pid,
402 TID tid,
403 PMPEG2_FILTER filter,
404 DWORD timeout,
405 ISectionList **section_list);
406
407 HRESULT (STDMETHODCALLTYPE *GetTable)(
408 IMpeg2Data *This,
409 PID pid,
410 TID tid,
411 PMPEG2_FILTER filter,
412 DWORD timeout,
413 ISectionList **section_list);
414
415 HRESULT (STDMETHODCALLTYPE *GetStreamOfSections)(
416 IMpeg2Data *This,
417 PID pid,
418 TID tid,
419 PMPEG2_FILTER filter,
420 HANDLE data_ready_event,
421 IMpeg2Stream **mpeg_stream);
96422
97 END_INTERFACE423 END_INTERFACE
424} IMpeg2DataVtbl;
425
426interface IMpeg2Data {
427 CONST_VTBL IMpeg2DataVtbl* lpVtbl;
98};428};
429
99#ifdef COBJMACROS430#ifdef COBJMACROS
431#ifndef WIDL_C_INLINE_WRAPPERS
432/*** IUnknown methods ***/
100#define IMpeg2Data_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)433#define IMpeg2Data_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
101#define IMpeg2Data_AddRef(This) (This)->lpVtbl->AddRef(This)434#define IMpeg2Data_AddRef(This) (This)->lpVtbl->AddRef(This)
102#define IMpeg2Data_Release(This) (This)->lpVtbl->Release(This)435#define IMpeg2Data_Release(This) (This)->lpVtbl->Release(This)
103#define IMpeg2Data_GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList)436/*** IMpeg2Data methods ***/
104#define IMpeg2Data_GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream)437#define IMpeg2Data_GetSection(This,pid,tid,filter,timeout,section_list) (This)->lpVtbl->GetSection(This,pid,tid,filter,timeout,section_list)
105#define IMpeg2Data_GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList)438#define IMpeg2Data_GetTable(This,pid,tid,filter,timeout,section_list) (This)->lpVtbl->GetTable(This,pid,tid,filter,timeout,section_list)
106#endif /*COBJMACROS*/439#define IMpeg2Data_GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream)
107440#else
108#undef INTERFACE441/*** IUnknown methods ***/
109#define INTERFACE IMpeg2Stream442static inline HRESULT IMpeg2Data_QueryInterface(IMpeg2Data* This,REFIID riid,void **ppvObject) {
110#ifdef __GNUC__443 return This->lpVtbl->QueryInterface(This,riid,ppvObject);
111#warning COM interfaces layout in this header has not been verified.444}
112#warning COM interfaces with incorrect layout may not work at all.445static inline ULONG IMpeg2Data_AddRef(IMpeg2Data* This) {
113__MINGW_BROKEN_INTERFACE(INTERFACE)446 return This->lpVtbl->AddRef(This);
114#endif447}
115DECLARE_INTERFACE_(IMpeg2Stream,IUnknown)448static inline ULONG IMpeg2Data_Release(IMpeg2Data* This) {
449 return This->lpVtbl->Release(This);
450}
451/*** IMpeg2Data methods ***/
452static inline HRESULT IMpeg2Data_GetSection(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,ISectionList **section_list) {
453 return This->lpVtbl->GetSection(This,pid,tid,filter,timeout,section_list);
454}
455static inline HRESULT IMpeg2Data_GetTable(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,ISectionList **section_list) {
456 return This->lpVtbl->GetTable(This,pid,tid,filter,timeout,section_list);
457}
458static inline HRESULT IMpeg2Data_GetStreamOfSections(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,HANDLE data_ready_event,IMpeg2Stream **mpeg_stream) {
459 return This->lpVtbl->GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream);
460}
461#endif
462#endif
463
464#endif
465
466
467#endif /* __IMpeg2Data_INTERFACE_DEFINED__ */
468
469/*****************************************************************************
470 * ISectionList interface
471 */
472#ifndef __ISectionList_INTERFACE_DEFINED__
473#define __ISectionList_INTERFACE_DEFINED__
474
475DEFINE_GUID(IID_ISectionList, 0xafec1eb5, 0x2a64, 0x46c6, 0xbf,0x4b, 0xae,0x3c,0xcb,0x6a,0xfd,0xb0);
476#if defined(__cplusplus) && !defined(CINTERFACE)
477MIDL_INTERFACE("afec1eb5-2a64-46c6-bf4b-ae3ccb6afdb0")
478ISectionList : public IUnknown
116{479{
480 virtual HRESULT STDMETHODCALLTYPE Initialize(
481 MPEG_REQUEST_TYPE request_type,
482 IMpeg2Data *mpeg2_data,
483 PMPEG_CONTEXT context,
484 PID pid,
485 TID tid,
486 PMPEG2_FILTER filter,
487 DWORD timeout,
488 HANDLE done_event) = 0;
489
490 virtual HRESULT STDMETHODCALLTYPE InitializeWithRawSections(
491 PMPEG_PACKET_LIST mpl_sections) = 0;
492
493 virtual HRESULT STDMETHODCALLTYPE CancelPendingRequest(
494 ) = 0;
495
496 virtual HRESULT STDMETHODCALLTYPE GetNumberOfSections(
497 WORD *count) = 0;
498
499 virtual HRESULT STDMETHODCALLTYPE GetSectionData(
500 WORD section_number,
501 DWORD *raw_packet_length,
502 PSECTION *section) = 0;
503
504 virtual HRESULT STDMETHODCALLTYPE GetProgramIdentifier(
505 PID *pid) = 0;
506
507 virtual HRESULT STDMETHODCALLTYPE GetTableIdentifier(
508 TID *tid) = 0;
509
510};
511#ifdef __CRT_UUID_DECL
512__CRT_UUID_DECL(ISectionList, 0xafec1eb5, 0x2a64, 0x46c6, 0xbf,0x4b, 0xae,0x3c,0xcb,0x6a,0xfd,0xb0)
513#endif
514#else
515typedef struct ISectionListVtbl {
117 BEGIN_INTERFACE516 BEGIN_INTERFACE
118517
119 /* IUnknown methods */518 /*** IUnknown methods ***/
120 STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;519 HRESULT (STDMETHODCALLTYPE *QueryInterface)(
121 STDMETHOD_(ULONG, AddRef)(THIS) PURE;520 ISectionList *This,
122 STDMETHOD_(ULONG, Release)(THIS) PURE;521 REFIID riid,
522 void **ppvObject);
523
524 ULONG (STDMETHODCALLTYPE *AddRef)(
525 ISectionList *This);
526
527 ULONG (STDMETHODCALLTYPE *Release)(
528 ISectionList *This);
529
530 /*** ISectionList methods ***/
531 HRESULT (STDMETHODCALLTYPE *Initialize)(
532 ISectionList *This,
533 MPEG_REQUEST_TYPE request_type,
534 IMpeg2Data *mpeg2_data,
535 PMPEG_CONTEXT context,
536 PID pid,
537 TID tid,
538 PMPEG2_FILTER filter,
539 DWORD timeout,
540 HANDLE done_event);
541
542 HRESULT (STDMETHODCALLTYPE *InitializeWithRawSections)(
543 ISectionList *This,
544 PMPEG_PACKET_LIST mpl_sections);
545
546 HRESULT (STDMETHODCALLTYPE *CancelPendingRequest)(
547 ISectionList *This);
548
549 HRESULT (STDMETHODCALLTYPE *GetNumberOfSections)(
550 ISectionList *This,
551 WORD *count);
552
553 HRESULT (STDMETHODCALLTYPE *GetSectionData)(
554 ISectionList *This,
555 WORD section_number,
556 DWORD *raw_packet_length,
557 PSECTION *section);
558
559 HRESULT (STDMETHODCALLTYPE *GetProgramIdentifier)(
560 ISectionList *This,
561 PID *pid);
123562
124 /* IMpeg2Stream methods */563 HRESULT (STDMETHODCALLTYPE *GetTableIdentifier)(
125 STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent) PURE;564 ISectionList *This,
126 STDMETHOD_(HRESULT,SupplyDataBuffer)(THIS_ PMPEG_STREAM_BUFFER pStreamBuffer) PURE;565 TID *tid);
127566
128 END_INTERFACE567 END_INTERFACE
568} ISectionListVtbl;
569
570interface ISectionList {
571 CONST_VTBL ISectionListVtbl* lpVtbl;
129};572};
573
130#ifdef COBJMACROS574#ifdef COBJMACROS
575#ifndef WIDL_C_INLINE_WRAPPERS
576/*** IUnknown methods ***/
577#define ISectionList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
578#define ISectionList_AddRef(This) (This)->lpVtbl->AddRef(This)
579#define ISectionList_Release(This) (This)->lpVtbl->Release(This)
580/*** ISectionList methods ***/
581#define ISectionList_Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event) (This)->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event)
582#define ISectionList_InitializeWithRawSections(This,mpl_sections) (This)->lpVtbl->InitializeWithRawSections(This,mpl_sections)
583#define ISectionList_CancelPendingRequest(This) (This)->lpVtbl->CancelPendingRequest(This)
584#define ISectionList_GetNumberOfSections(This,count) (This)->lpVtbl->GetNumberOfSections(This,count)
585#define ISectionList_GetSectionData(This,section_number,raw_packet_length,section) (This)->lpVtbl->GetSectionData(This,section_number,raw_packet_length,section)
586#define ISectionList_GetProgramIdentifier(This,pid) (This)->lpVtbl->GetProgramIdentifier(This,pid)
587#define ISectionList_GetTableIdentifier(This,tid) (This)->lpVtbl->GetTableIdentifier(This,tid)
588#else
589/*** IUnknown methods ***/
590static inline HRESULT ISectionList_QueryInterface(ISectionList* This,REFIID riid,void **ppvObject) {
591 return This->lpVtbl->QueryInterface(This,riid,ppvObject);
592}
593static inline ULONG ISectionList_AddRef(ISectionList* This) {
594 return This->lpVtbl->AddRef(This);
595}
596static inline ULONG ISectionList_Release(ISectionList* This) {
597 return This->lpVtbl->Release(This);
598}
599/*** ISectionList methods ***/
600static inline HRESULT ISectionList_Initialize(ISectionList* This,MPEG_REQUEST_TYPE request_type,IMpeg2Data *mpeg2_data,PMPEG_CONTEXT context,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,HANDLE done_event) {
601 return This->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event);
602}
603static inline HRESULT ISectionList_InitializeWithRawSections(ISectionList* This,PMPEG_PACKET_LIST mpl_sections) {
604 return This->lpVtbl->InitializeWithRawSections(This,mpl_sections);
605}
606static inline HRESULT ISectionList_CancelPendingRequest(ISectionList* This) {
607 return This->lpVtbl->CancelPendingRequest(This);
608}
609static inline HRESULT ISectionList_GetNumberOfSections(ISectionList* This,WORD *count) {
610 return This->lpVtbl->GetNumberOfSections(This,count);
611}
612static inline HRESULT ISectionList_GetSectionData(ISectionList* This,WORD section_number,DWORD *raw_packet_length,PSECTION *section) {
613 return This->lpVtbl->GetSectionData(This,section_number,raw_packet_length,section);
614}
615static inline HRESULT ISectionList_GetProgramIdentifier(ISectionList* This,PID *pid) {
616 return This->lpVtbl->GetProgramIdentifier(This,pid);
617}
618static inline HRESULT ISectionList_GetTableIdentifier(ISectionList* This,TID *tid) {
619 return This->lpVtbl->GetTableIdentifier(This,tid);
620}
621#endif
622#endif
623
624#endif
625
626
627#endif /* __ISectionList_INTERFACE_DEFINED__ */
628
629/*****************************************************************************
630 * IMpeg2Stream interface
631 */
632#ifndef __IMpeg2Stream_INTERFACE_DEFINED__
633#define __IMpeg2Stream_INTERFACE_DEFINED__
634
635DEFINE_GUID(IID_IMpeg2Stream, 0x400cc286, 0x32a0, 0x4ce4, 0x90,0x41, 0x39,0x57,0x11,0x25,0xa6,0x35);
636#if defined(__cplusplus) && !defined(CINTERFACE)
637MIDL_INTERFACE("400cc286-32a0-4ce4-9041-39571125a635")
638IMpeg2Stream : public IUnknown
639{
640 virtual HRESULT STDMETHODCALLTYPE Initialize(
641 MPEG_REQUEST_TYPE request_type,
642 IMpeg2Data *mpeg2_data,
643 PMPEG_CONTEXT context,
644 PID pid,
645 TID tid,
646 PMPEG2_FILTER filter,
647 HANDLE data_ready_event) = 0;
648
649 virtual HRESULT STDMETHODCALLTYPE SupplyDataBuffer(
650 PMPEG_STREAM_BUFFER stream_buffer) = 0;
651
652};
653#ifdef __CRT_UUID_DECL
654__CRT_UUID_DECL(IMpeg2Stream, 0x400cc286, 0x32a0, 0x4ce4, 0x90,0x41, 0x39,0x57,0x11,0x25,0xa6,0x35)
655#endif
656#else
657typedef struct IMpeg2StreamVtbl {
658 BEGIN_INTERFACE
659
660 /*** IUnknown methods ***/
661 HRESULT (STDMETHODCALLTYPE *QueryInterface)(
662 IMpeg2Stream *This,
663 REFIID riid,
664 void **ppvObject);
665
666 ULONG (STDMETHODCALLTYPE *AddRef)(
667 IMpeg2Stream *This);
668
669 ULONG (STDMETHODCALLTYPE *Release)(
670 IMpeg2Stream *This);
671
672 /*** IMpeg2Stream methods ***/
673 HRESULT (STDMETHODCALLTYPE *Initialize)(
674 IMpeg2Stream *This,
675 MPEG_REQUEST_TYPE request_type,
676 IMpeg2Data *mpeg2_data,
677 PMPEG_CONTEXT context,
678 PID pid,
679 TID tid,
680 PMPEG2_FILTER filter,
681 HANDLE data_ready_event);
682
683 HRESULT (STDMETHODCALLTYPE *SupplyDataBuffer)(
684 IMpeg2Stream *This,
685 PMPEG_STREAM_BUFFER stream_buffer);
686
687 END_INTERFACE
688} IMpeg2StreamVtbl;
689
690interface IMpeg2Stream {
691 CONST_VTBL IMpeg2StreamVtbl* lpVtbl;
692};
693
694#ifdef COBJMACROS
695#ifndef WIDL_C_INLINE_WRAPPERS
696/*** IUnknown methods ***/
131#define IMpeg2Stream_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)697#define IMpeg2Stream_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
132#define IMpeg2Stream_AddRef(This) (This)->lpVtbl->AddRef(This)698#define IMpeg2Stream_AddRef(This) (This)->lpVtbl->AddRef(This)
133#define IMpeg2Stream_Release(This) (This)->lpVtbl->Release(This)699#define IMpeg2Stream_Release(This) (This)->lpVtbl->Release(This)
134#define IMpeg2Stream_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,hDataReadyEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,hDataReadyEvent)700/*** IMpeg2Stream methods ***/
135#define IMpeg2Stream_SupplyDataBuffer(This,pStreamBuffer) (This)->lpVtbl->SupplyDataBuffer(This,pStreamBuffer)701#define IMpeg2Stream_Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event) (This)->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event)
136#endif /*COBJMACROS*/702#define IMpeg2Stream_SupplyDataBuffer(This,stream_buffer) (This)->lpVtbl->SupplyDataBuffer(This,stream_buffer)
703#else
704/*** IUnknown methods ***/
705static inline HRESULT IMpeg2Stream_QueryInterface(IMpeg2Stream* This,REFIID riid,void **ppvObject) {
706 return This->lpVtbl->QueryInterface(This,riid,ppvObject);
707}
708static inline ULONG IMpeg2Stream_AddRef(IMpeg2Stream* This) {
709 return This->lpVtbl->AddRef(This);
710}
711static inline ULONG IMpeg2Stream_Release(IMpeg2Stream* This) {
712 return This->lpVtbl->Release(This);
713}
714/*** IMpeg2Stream methods ***/
715static inline HRESULT IMpeg2Stream_Initialize(IMpeg2Stream* This,MPEG_REQUEST_TYPE request_type,IMpeg2Data *mpeg2_data,PMPEG_CONTEXT context,PID pid,TID tid,PMPEG2_FILTER filter,HANDLE data_ready_event) {
716 return This->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event);
717}
718static inline HRESULT IMpeg2Stream_SupplyDataBuffer(IMpeg2Stream* This,PMPEG_STREAM_BUFFER stream_buffer) {
719 return This->lpVtbl->SupplyDataBuffer(This,stream_buffer);
720}
721#endif
722#endif
723
724#endif
725
726
727#endif /* __IMpeg2Stream_INTERFACE_DEFINED__ */
728
729/*****************************************************************************
730 * SectionList coclass
731 */
732
733DEFINE_GUID(CLSID_SectionList, 0x73da5d04, 0x4347, 0x45d3, 0xa9,0xdc, 0xfa,0xe9,0xdd,0xbe,0x55,0x8d);
734
735#ifdef __cplusplus
736class DECLSPEC_UUID("73da5d04-4347-45d3-a9dc-fae9ddbe558d") SectionList;
737#ifdef __CRT_UUID_DECL
738__CRT_UUID_DECL(SectionList, 0x73da5d04, 0x4347, 0x45d3, 0xa9,0xdc, 0xfa,0xe9,0xdd,0xbe,0x55,0x8d)
739#endif
740#endif
741
742/*****************************************************************************
743 * Mpeg2Stream coclass
744 */
745
746DEFINE_GUID(CLSID_Mpeg2Stream, 0xf91d96c7, 0x8509, 0x4d0b, 0xab,0x26, 0xa0,0xdd,0x10,0x90,0x4b,0xb7);
747
748#ifdef __cplusplus
749class DECLSPEC_UUID("f91d96c7-8509-4d0b-ab26-a0dd10904bb7") Mpeg2Stream;
750#ifdef __CRT_UUID_DECL
751__CRT_UUID_DECL(Mpeg2Stream, 0xf91d96c7, 0x8509, 0x4d0b, 0xab,0x26, 0xa0,0xdd,0x10,0x90,0x4b,0xb7)
752#endif
753#endif
754
755/*****************************************************************************
756 * Mpeg2Data coclass
757 */
758
759DEFINE_GUID(CLSID_Mpeg2Data, 0xc666e115, 0xbb62, 0x4027, 0xa1,0x13, 0x82,0xd6,0x43,0xfe,0x2d,0x99);
760
761#ifdef __cplusplus
762class DECLSPEC_UUID("c666e115-bb62-4027-a113-82d643fe2d99") Mpeg2Data;
763#ifdef __CRT_UUID_DECL
764__CRT_UUID_DECL(Mpeg2Data, 0xc666e115, 0xbb62, 0x4027, 0xa1,0x13, 0x82,0xd6,0x43,0xfe,0x2d,0x99)
765#endif
766#endif
767
768#endif /* __Mpeg2DataLib_LIBRARY_DEFINED__ */
769/* Begin additional prototypes for all interfaces */
770
771
772/* End additional prototypes */
773
774#ifdef __cplusplus
775}
776#endif
137777
138#endif /*__INC_MPEG2DATA__*/778#endif /* __mpeg2data_h__ */
lib/libc/include/any-windows-any/mpeg2structs.h+264-205
...@@ -1,222 +1,281 @@...@@ -1,222 +1,281 @@
1/**1/*** Autogenerated by WIDL 10.4 from include/mpeg2structs.idl - Do not edit ***/
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
62
7#include <mpeg2data.h>3#ifdef _WIN32
8#include <mpeg2bits.h>4#ifndef __REQUIRED_RPCNDR_H_VERSION__
5#define __REQUIRED_RPCNDR_H_VERSION__ 475
6#endif
7#include <rpc.h>
8#include <rpcndr.h>
9#endif
910
10#ifndef __INC_MPEG2STRUCTS__11#ifndef COM_NO_WINDOWS_H
11#define __INC_MPEG2STRUCTS__12#include <windows.h>
13#include <ole2.h>
14#endif
1215
13typedef enum _MPEG_CONTEXT_TYPE {16#ifndef __mpeg2structs_h__
14 MPEG_CONTEXT_BCS_DEMUX = 0,17#define __mpeg2structs_h__
15 MPEG_CONTEXT_WINSOCK
16} MPEG_CONTEXT_TYPE;
1718
18typedef enum _MPEG_CURRENT_NEXT_BIT {19/* Forward declarations */
19 MPEG_SECTION_IS_NEXT = 0,
20 MPEG_SECTION_IS_CURRENT = 1
21} MPEG_CURRENT_NEXT_BIT;
2220
23typedef enum _MPEG_REQUEST_TYPE {21/* Headers for imported files */
24 MPEG_RQST_UNKNOWN = 0,
25 MPEG_RQST_GET_SECTION,
26 MPEG_RQST_GET_SECTION_ASYNC,
27 MPEG_RQST_GET_TABLE,
28 MPEG_RQST_GET_TABLE_ASYNC,
29 MPEG_RQST_GET_SECTIONS_STREAM,
30 MPEG_RQST_GET_PES_STREAM,
31 MPEG_RQST_GET_TS_STREAM,
32 MPEG_RQST_START_MPE_STREAM
33} MPEG_REQUEST_TYPE;
3422
35typedef struct _DSMCC_ELEMENT {23#include <wtypes.h>
36 PID pid;
37 BYTE bComponentTag;
38 DWORD dwCarouselId;
39 DWORD dwTransactionId;
40 struct _DSMCC_ELEMENT *pNext;
41} DSMCC_ELEMENT, *PDSMCC_ELEMENT;
4224
43typedef struct {25#ifdef __cplusplus
44 WINBOOL fSpecifyProtocol;26extern "C" {
45 BYTE Protocol;27#endif
46 WINBOOL fSpecifyType;
47 BYTE Type;
48 WINBOOL fSpecifyMessageId;
49 WORD MessageId;
50 WINBOOL fSpecifyTransactionId;
51 WINBOOL fUseTrxIdMessageIdMask;
52 DWORD TransactionId;
53 WINBOOL fSpecifyModuleVersion;
54 BYTE ModuleVersion;
55 WINBOOL fSpecifyBlockNumber;
56 WORD BlockNumber;
57 WINBOOL fGetModuleCall;
58 WORD NumberOfBlocksInModule;
59} DSMCC_FILTER_OPTIONS;
6028
61typedef struct _MPEG_HEADER_BITS_MIDL {29#pragma pack(push)
62 WORD Bits;30#pragma pack(1)
31typedef struct __WIDL_mpeg2structs_generated_name_0000000C {
32 WORD Bits;
33} PID_BITS_MIDL;
34typedef struct __WIDL_mpeg2structs_generated_name_0000000D {
35 WORD Bits;
63} MPEG_HEADER_BITS_MIDL;36} MPEG_HEADER_BITS_MIDL;
6437typedef struct __WIDL_mpeg2structs_generated_name_0000000E {
65typedef struct _MPEG_HEADER_VERSION_BITS_MIDL {
66 BYTE Bits;38 BYTE Bits;
67} MPEG_HEADER_VERSION_BITS_MIDL;39} MPEG_HEADER_VERSION_BITS_MIDL;
6840#pragma pack(pop)
69typedef struct _DSMCC_SECTION {41typedef WORD PID;
70 TID TableId;42typedef BYTE TID;
71 __C89_NAMELESS union {43typedef WORD TEID;
72 MPEG_HEADER_BITS_MIDL S;44typedef UINT ClientKey;
73 WORD W;45typedef enum __WIDL_mpeg2structs_generated_name_0000000F {
74 } Header;46 MPEG_SECTION_IS_NEXT = 0,
75 WORD TableIdExtension;47 MPEG_SECTION_IS_CURRENT = 1
76 __C89_NAMELESS union {48} MPEG_CURRENT_NEXT_BIT;
77 MPEG_HEADER_VERSION_BITS_MIDL S;49typedef struct __WIDL_mpeg2structs_generated_name_00000010 {
78 BYTE B;50 WORD wTidExt;
79 } Version;51 WORD wCount;
80 BYTE SectionNumber;52} TID_EXTENSION;
81 BYTE LastSectionNumber;53typedef struct __WIDL_mpeg2structs_generated_name_00000010 *PTID_EXTENSION;
82 BYTE ProtocolDiscriminator;54typedef struct __WIDL_mpeg2structs_generated_name_00000011 {
83 BYTE DsmccType;55 TID TableId;
84 WORD MessageId;56 union {
85 DWORD TransactionId;57 MPEG_HEADER_BITS_MIDL S;
86 BYTE Reserved;58 WORD W;
87 BYTE AdaptationLength;59 } Header;
88 WORD MessageLength;60 BYTE SectionData[1];
89 BYTE RemainingData[1];61} SECTION;
90} DSMCC_SECTION, *PDSMCC_SECTION;62typedef struct __WIDL_mpeg2structs_generated_name_00000011 *PSECTION;
9163typedef struct __WIDL_mpeg2structs_generated_name_00000012 {
92typedef struct _DVB_EIT_FILTER_OPTIONS {64 TID TableId;
93 WINBOOL fSpecifySegment;65 union {
94 BYTE bSegment;66 MPEG_HEADER_BITS_MIDL S;
95} DVB_EIT_FILTER_OPTIONS, *PDVB_EIT_FILTER_OPTIONS;67 WORD W;
9668 } Header;
97typedef struct {69 TEID TableIdExtension;
98 TID TableId;70 union {
99 __C89_NAMELESS union {71 MPEG_HEADER_VERSION_BITS_MIDL S;
100 MPEG_HEADER_BITS_MIDL S;72 BYTE B;
101 WORD W;73 } Version;
102 } Header;74 BYTE SectionNumber;
103 WORD TableIdExtension;75 BYTE LastSectionNumber;
104 __C89_NAMELESS union {76 BYTE RemainingData[1];
105 MPEG_HEADER_VERSION_BITS_MIDL S;77} LONG_SECTION;
106 BYTE B;78typedef struct __WIDL_mpeg2structs_generated_name_00000012 *PLONG_SECTION;
107 } Version;79typedef struct __WIDL_mpeg2structs_generated_name_00000013 {
108 BYTE SectionNumber;80 TID TableId;
109 BYTE LastSectionNumber;81 union {
110 BYTE RemainingData[1];82 MPEG_HEADER_BITS_MIDL S;
111} LONG_SECTION, *PLONG_SECTION;83 WORD W;
11284 } Header;
113typedef struct _MPE_ELEMENT {85 TEID TableIdExtension;
114 PID pid;86 union {
115 BYTE bComponentTag;87 MPEG_HEADER_VERSION_BITS_MIDL S;
116 struct _MPE_ELEMENT *pNext;88 BYTE B;
117} MPE_ELEMENT, *PMPE_ELEMENT;89 } Version;
11890 BYTE SectionNumber;
119typedef struct _MPEG2_FILTER {91 BYTE LastSectionNumber;
120 BYTE bVersionNumber;92 BYTE ProtocolDiscriminator;
121 WORD wFilterSize;93 BYTE DsmccType;
122 WINBOOL fUseRawFilteringBits;94 WORD MessageId;
123 BYTE Filter[16];95 DWORD TransactionId;
124 BYTE Mask[16];96 BYTE Reserved;
125 WINBOOL fSpecifyTableIdExtension;97 BYTE AdaptationLength;
126 WORD TableIdExtension;98 WORD MessageLength;
127 WINBOOL fSpecifyVersion;99 BYTE RemainingData[1];
128 BYTE Version;100} DSMCC_SECTION;
129 WINBOOL fSpecifySectionNumber;101typedef struct __WIDL_mpeg2structs_generated_name_00000013 *PDSMCC_SECTION;
130 BYTE SectionNumber;102typedef struct __WIDL_mpeg2structs_generated_name_00000014 {
131 WINBOOL fSpecifyCurrentNext;103 DWORD dwLength;
132 WINBOOL fNext;104 PSECTION pSection;
133 WINBOOL fSpecifyDsmccOptions;105} MPEG_RQST_PACKET;
134 DSMCC_FILTER_OPTIONS Dsmcc;106typedef struct __WIDL_mpeg2structs_generated_name_00000014 *PMPEG_RQST_PACKET;
135 WINBOOL fSpecifyAtscOptions;107typedef struct __WIDL_mpeg2structs_generated_name_00000015 {
136 ATSC_FILTER_OPTIONS Atsc;108 WORD wPacketCount;
137} MPEG2_FILTER, *PMPEG2_FILTER;109 PMPEG_RQST_PACKET PacketList[1];
138110} MPEG_PACKET_LIST;
139typedef struct {111typedef struct __WIDL_mpeg2structs_generated_name_00000015 *PMPEG_PACKET_LIST;
140 BYTE bVersionNumber;112typedef struct __WIDL_mpeg2structs_generated_name_00000016 {
141 WORD wFilterSize;113 WINBOOL fSpecifyProtocol;
142 WINBOOL fUseRawFilteringBits;114 BYTE Protocol;
143 BYTE Filter[16];115 WINBOOL fSpecifyType;
144 BYTE Mask[16];116 BYTE Type;
145 WINBOOL fSpecifyTableIdExtension;117 WINBOOL fSpecifyMessageId;
146 WORD TableIdExtension;118 WORD MessageId;
147 WINBOOL fSpecifyVersion;119 WINBOOL fSpecifyTransactionId;
148 BYTE Version;120 WINBOOL fUseTrxIdMessageIdMask;
149 WINBOOL fSpecifySectionNumber;121 DWORD TransactionId;
150 BYTE SectionNumber;122 WINBOOL fSpecifyModuleVersion;
151 WINBOOL fSpecifyCurrentNext;123 BYTE ModuleVersion;
152 WINBOOL fNext;124 WINBOOL fSpecifyBlockNumber;
153 WINBOOL fSpecifyDsmccOptions;125 WORD BlockNumber;
154 DSMCC_FILTER_OPTIONS Dsmcc;126 WINBOOL fGetModuleCall;
155 WINBOOL fSpecifyAtscOptions;127 WORD NumberOfBlocksInModule;
156 ATSC_FILTER_OPTIONS Atsc;128} DSMCC_FILTER_OPTIONS;
157 WINBOOL fSpecifyDvbEitOptions;129typedef struct __WIDL_mpeg2structs_generated_name_00000017 {
158 DVB_EIT_FILTER_OPTIONS Dvb_Eit;130 WINBOOL fSpecifyEtmId;
159} MPEG2_FILTER2, *PMPEG2_FILTER2;131 DWORD EtmId;
160132} ATSC_FILTER_OPTIONS;
161typedef struct _MPEG_BCS_DEMUX {133typedef struct __WIDL_mpeg2structs_generated_name_00000018 {
162 DWORD AVMGraphId;134 WINBOOL fSpecifySegment;
163} MPEG_BCS_DEMUX;135 BYTE bSegment;
164136} DVB_EIT_FILTER_OPTIONS;
165typedef struct _MPEG_WINSOCK {137typedef struct __WIDL_mpeg2structs_generated_name_00000019 {
166 DWORD AVMGraphId;138 BYTE bVersionNumber;
167} MPEG_WINSOCK;139 WORD wFilterSize;
168140 WINBOOL fUseRawFilteringBits;
169typedef struct _MPEG_CONTEXT {141 BYTE Filter[16];
170 MPEG_CONTEXT_TYPE Type;142 BYTE Mask[16];
171 __C89_NAMELESS union {143 WINBOOL fSpecifyTableIdExtension;
172 MPEG_BCS_DEMUX Demux;144 WORD TableIdExtension;
173 MPEG_WINSOCK Winsock;145 WINBOOL fSpecifyVersion;
174 } U;146 BYTE Version;
175} MPEG_CONTEXT, *PMPEG_CONTEXT;147 WINBOOL fSpecifySectionNumber;
176148 BYTE SectionNumber;
177typedef struct _MPEG_DATE {149 WINBOOL fSpecifyCurrentNext;
178 BYTE Date;150 WINBOOL fNext;
179 BYTE Month;151 WINBOOL fSpecifyDsmccOptions;
180 WORD Year;152 DSMCC_FILTER_OPTIONS Dsmcc;
181} MPEG_DATE;153 WINBOOL fSpecifyAtscOptions;
182154 ATSC_FILTER_OPTIONS Atsc;
183typedef struct _MPEG_TIME {155} MPEG2_FILTER;
184 BYTE Hours;156typedef struct __WIDL_mpeg2structs_generated_name_00000019 *PMPEG2_FILTER;
185 BYTE Minutes;157typedef struct __WIDL_mpeg2structs_generated_name_0000001A {
186 BYTE Seconds;158 __C89_NAMELESS union {
159 __C89_NAMELESS struct {
160 BYTE bVersionNumber;
161 WORD wFilterSize;
162 WINBOOL fUseRawFilteringBits;
163 BYTE Filter[16];
164 BYTE Mask[16];
165 WINBOOL fSpecifyTableIdExtension;
166 WORD TableIdExtension;
167 WINBOOL fSpecifyVersion;
168 BYTE Version;
169 WINBOOL fSpecifySectionNumber;
170 BYTE SectionNumber;
171 WINBOOL fSpecifyCurrentNext;
172 WINBOOL fNext;
173 WINBOOL fSpecifyDsmccOptions;
174 DSMCC_FILTER_OPTIONS Dsmcc;
175 WINBOOL fSpecifyAtscOptions;
176 ATSC_FILTER_OPTIONS Atsc;
177 } __C89_NAMELESSSTRUCTNAME;
178 BYTE bVersion1Bytes[124];
179 } __C89_NAMELESSUNIONNAME;
180 WINBOOL fSpecifyDvbEitOptions;
181 DVB_EIT_FILTER_OPTIONS DvbEit;
182} MPEG2_FILTER2;
183typedef struct __WIDL_mpeg2structs_generated_name_0000001A *PMPEG2_FILTER2;
184#define MPEG2_FILTER_VERSION_1_SIZE 124
185#define MPEG2_FILTER_VERSION_2_SIZE 133
186typedef struct __WIDL_mpeg2structs_generated_name_0000001B {
187 HRESULT hr;
188 DWORD dwDataBufferSize;
189 DWORD dwSizeOfDataRead;
190 BYTE *pDataBuffer;
191} MPEG_STREAM_BUFFER;
192typedef struct __WIDL_mpeg2structs_generated_name_0000001B *PMPEG_STREAM_BUFFER;
193typedef struct __WIDL_mpeg2structs_generated_name_0000001C {
194 BYTE Hours;
195 BYTE Minutes;
196 BYTE Seconds;
187} MPEG_TIME;197} MPEG_TIME;
188
189typedef struct _MPEG_DATE_AND_TIME {
190 MPEG_DATE D;
191 MPEG_TIME T;
192} MPEG_DATE_AND_TIME;
193
194typedef MPEG_TIME MPEG_DURATION;198typedef MPEG_TIME MPEG_DURATION;
199typedef struct __WIDL_mpeg2structs_generated_name_0000001D {
200 BYTE Date;
201 BYTE Month;
202 WORD Year;
203} MPEG_DATE;
204typedef struct __WIDL_mpeg2structs_generated_name_0000001E {
205 MPEG_DATE D;
206 MPEG_TIME T;
207} MPEG_DATE_AND_TIME;
208typedef enum __WIDL_mpeg2structs_generated_name_0000001F {
209 MPEG_CONTEXT_BCS_DEMUX = 0,
210 MPEG_CONTEXT_WINSOCK = 1
211} MPEG_CONTEXT_TYPE;
212typedef struct __WIDL_mpeg2structs_generated_name_00000020 {
213 DWORD AVMGraphId;
214} MPEG_BCS_DEMUX;
215typedef struct __WIDL_mpeg2structs_generated_name_00000021 {
216 DWORD AVMGraphId;
217} MPEG_WINSOCK;
218typedef struct __WIDL_mpeg2structs_generated_name_00000022 {
219 MPEG_CONTEXT_TYPE Type;
220 union {
221 MPEG_BCS_DEMUX Demux;
222 MPEG_WINSOCK Winsock;
223 } U;
224} MPEG_CONTEXT;
225typedef struct __WIDL_mpeg2structs_generated_name_00000022 *PMPEG_CONTEXT;
226typedef enum __WIDL_mpeg2structs_generated_name_00000023 {
227 MPEG_RQST_UNKNOWN = 0,
228 MPEG_RQST_GET_SECTION = 1,
229 MPEG_RQST_GET_SECTION_ASYNC = 2,
230 MPEG_RQST_GET_TABLE = 3,
231 MPEG_RQST_GET_TABLE_ASYNC = 4,
232 MPEG_RQST_GET_SECTIONS_STREAM = 5,
233 MPEG_RQST_GET_PES_STREAM = 6,
234 MPEG_RQST_GET_TS_STREAM = 7,
235 MPEG_RQST_START_MPE_STREAM = 8
236} MPEG_REQUEST_TYPE;
237typedef struct __WIDL_mpeg2structs_generated_name_00000024 {
238 MPEG_REQUEST_TYPE Type;
239 MPEG_CONTEXT Context;
240 PID Pid;
241 TID TableId;
242 MPEG2_FILTER Filter;
243 DWORD Flags;
244} MPEG_SERVICE_REQUEST;
245typedef struct __WIDL_mpeg2structs_generated_name_00000024 *PMPEG_SERVICE_REQUEST;
246typedef struct __WIDL_mpeg2structs_generated_name_00000025 {
247 DWORD IPAddress;
248 WORD Port;
249} MPEG_SERVICE_RESPONSE;
250typedef struct __WIDL_mpeg2structs_generated_name_00000025 *PMPEG_SERVICE_RESPONSE;
251typedef struct _DSMCC_ELEMENT {
252 PID pid;
253 BYTE bComponentTag;
254 DWORD dwCarouselId;
255 DWORD dwTransactionId;
256 struct _DSMCC_ELEMENT *pNext;
257} DSMCC_ELEMENT;
258typedef struct _DSMCC_ELEMENT *PDSMCC_ELEMENT;
259typedef struct _MPE_ELEMENT {
260 PID pid;
261 BYTE bComponentTag;
262 struct _MPE_ELEMENT *pNext;
263} MPE_ELEMENT;
264typedef struct _MPE_ELEMENT *PMPE_ELEMENT;
265typedef struct _MPEG_STREAM_FILTER {
266 WORD wPidValue;
267 DWORD dwFilterSize;
268 WINBOOL fCrcEnabled;
269 BYTE rgchFilter[16];
270 BYTE rgchMask[16];
271} MPEG_STREAM_FILTER;
272/* Begin additional prototypes for all interfaces */
195273
196typedef struct {
197 TID TableId;
198 __C89_NAMELESS union {
199 MPEG_HEADER_BITS_MIDL S;
200 WORD W;
201 } Header;
202 BYTE SectionData[1];
203} SECTION, *PSECTION;
204
205typedef struct _MPEG_RQST_PACKET {
206 DWORD dwLength;
207 PSECTION pSection;
208} MPEG_RQST_PACKET, *PMPEG_RQST_PACKET;
209274
210typedef struct _MPEG_PACKET_LIST {275/* End additional prototypes */
211 WORD wPacketCount;
212 PMPEG_RQST_PACKET PacketList[1];
213} MPEG_PACKET_LIST, *PMPEG_PACKET_LIST;
214276
215typedef struct _MPEG_STREAM_BUFFER {277#ifdef __cplusplus
216 HRESULT hr;278}
217 DWORD dwDataBufferSize;279#endif
218 DWORD dwSizeOfDataRead;
219 BYTE *pDataBuffer;
220} MPEG_STREAM_BUFFER, *PMPEG_STREAM_BUFFER;
221280
222#endif /*__INC_MPEG2STRUCTS__*/281#endif /* __mpeg2structs_h__ */
lib/libc/include/any-windows-any/mscat.h+2-2
...@@ -66,7 +66,7 @@ extern "C" {...@@ -66,7 +66,7 @@ extern "C" {
66#define CRYPTCAT_VERSION_1 0x10066#define CRYPTCAT_VERSION_1 0x100
67#define CRYPTCAT_VERSION_2 0x20067#define CRYPTCAT_VERSION_2 0x200
6868
69#include <pshpack8.h>69#pragma pack(push,8)
7070
71typedef struct CRYPTCATATTRIBUTE_71typedef struct CRYPTCATATTRIBUTE_
72{72{
...@@ -110,7 +110,7 @@ typedef struct CRYPTCATCDF_...@@ -110,7 +110,7 @@ typedef struct CRYPTCATCDF_
110 HANDLE hCATStore;110 HANDLE hCATStore;
111} CRYPTCATCDF;111} CRYPTCATCDF;
112112
113#include <poppack.h>113#pragma pack(pop)
114114
115typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *);115typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *);
116116
lib/libc/include/any-windows-any/mscoree.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mscoree.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mscoree.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msctf.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msctf.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msctf.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mshtmhst.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mshtmhst.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mshtmhst.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mshtml.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/mshtml.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/mshtml.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msinkaut.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msinkaut.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msinkaut.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msinkaut_i.c+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from msinkaut.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from msinkaut.idl - Do not edit ***/
22
3#include <rpc.h>3#include <rpc.h>
4#include <rpcndr.h>4#include <rpcndr.h>
lib/libc/include/any-windows-any/msopc.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msopc.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msopc.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msxml.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msxml.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msxml.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msxml2.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msxml2.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msxml2.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/msxml6.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/msxml6.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/msxml6.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/mtsadmin_i.c deleted-41
...@@ -1,41 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#ifndef __IID_DEFINED__
11#define __IID_DEFINED__
12 typedef struct _IID {
13 unsigned long x;
14 unsigned short s1;
15 unsigned short s2;
16 unsigned char c[8];
17 } IID;
18#endif
19
20#ifndef CLSID_DEFINED
21#define CLSID_DEFINED
22 typedef IID CLSID;
23#endif
24
25 const IID IID_ICatalog = {0x6eb22870,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
26 const IID IID_IComponentUtil = {0x6eb22873,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
27 const IID IID_IPackageUtil = {0x6eb22874,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
28 const IID IID_IRemoteComponentUtil = {0x6eb22875,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
29 const IID IID_IRoleAssociationUtil = {0x6eb22876,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
30 const IID LIBID_MTSAdmin = {0x6eb22880,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
31 const CLSID CLSID_Catalog = {0x6eb22881,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
32 const CLSID CLSID_CatalogObject = {0x6eb22882,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
33 const CLSID CLSID_CatalogCollection = {0x6eb22883,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
34 const CLSID CLSID_ComponentUtil = {0x6eb22884,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
35 const CLSID CLSID_PackageUtil = {0x6eb22885,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
36 const CLSID CLSID_RemoteComponentUtil = {0x6eb22886,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
37 const CLSID CLSID_RoleAssociationUtil = {0x6eb22887,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
38
39#ifdef __cplusplus
40}
41#endif
lib/libc/include/any-windows-any/mtxadmin_i.c deleted-41
...@@ -1,41 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#ifndef __IID_DEFINED__
11#define __IID_DEFINED__
12 typedef struct _IID {
13 unsigned long x;
14 unsigned short s1;
15 unsigned short s2;
16 unsigned char c[8];
17 } IID;
18#endif
19
20#ifndef CLSID_DEFINED
21#define CLSID_DEFINED
22 typedef IID CLSID;
23#endif
24
25 const IID IID_ICatalog = {0x6eb22870,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
26 const IID IID_IComponentUtil = {0x6eb22873,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
27 const IID IID_IPackageUtil = {0x6eb22874,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
28 const IID IID_IRemoteComponentUtil = {0x6eb22875,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
29 const IID IID_IRoleAssociationUtil = {0x6eb22876,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
30 const IID LIBID_MTSAdmin = {0x6eb22880,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
31 const CLSID CLSID_Catalog = {0x6eb22881,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
32 const CLSID CLSID_CatalogObject = {0x6eb22882,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
33 const CLSID CLSID_CatalogCollection = {0x6eb22883,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
34 const CLSID CLSID_ComponentUtil = {0x6eb22884,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
35 const CLSID CLSID_PackageUtil = {0x6eb22885,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
36 const CLSID CLSID_RemoteComponentUtil = {0x6eb22886,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
37 const CLSID CLSID_RoleAssociationUtil = {0x6eb22887,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}};
38
39#ifdef __cplusplus
40}
41#endif
lib/libc/include/any-windows-any/napcertrelyingparty.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napcertrelyingparty.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napcertrelyingparty.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napcommon.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napcommon.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napcommon.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napenforcementclient.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napenforcementclient.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napenforcementclient.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napmanagement.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napmanagement.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napmanagement.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napprotocol.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napprotocol.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napprotocol.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napservermanagement.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napservermanagement.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napservermanagement.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napsystemhealthagent.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napsystemhealthagent.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napsystemhealthagent.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/napsystemhealthvalidator.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/napsystemhealthvalidator.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/napsystemhealthvalidator.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/naptypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/naptypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/naptypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/netcfgn.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/netcfgn.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/netcfgn.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/netcfgx.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/netcfgx.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/netcfgx.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/netfw.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/netfw.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/netfw.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/netlistmgr.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/netlistmgr.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/netlistmgr.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/nldef.h+3-3
...@@ -19,7 +19,7 @@ typedef enum {...@@ -19,7 +19,7 @@ typedef enum {
19 IpDadStateTentative,19 IpDadStateTentative,
20 IpDadStateDuplicate,20 IpDadStateDuplicate,
21 IpDadStateDeprecated,21 IpDadStateDeprecated,
22 IpDadStatePreferred,22 IpDadStatePreferred
23} NL_DAD_STATE;23} NL_DAD_STATE;
2424
25#define MAKE_ROUTE_PROTOCOL(N, V) MIB_IPPROTO_ ## N = V, PROTO_IP_ ## N = V25#define MAKE_ROUTE_PROTOCOL(N, V) MIB_IPPROTO_ ## N = V, PROTO_IP_ ## N = V
...@@ -98,7 +98,7 @@ typedef enum _NL_ROUTE_ORIGIN {...@@ -98,7 +98,7 @@ typedef enum _NL_ROUTE_ORIGIN {
98 NlroWellKnown,98 NlroWellKnown,
99 NlroDHCP,99 NlroDHCP,
100 NlroRouterAdvertisement,100 NlroRouterAdvertisement,
101 Nlro6to4,101 Nlro6to4
102} NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN;102} NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN;
103103
104typedef enum _NL_NEIGHBOR_STATE {104typedef enum _NL_NEIGHBOR_STATE {
...@@ -109,7 +109,7 @@ typedef enum _NL_NEIGHBOR_STATE {...@@ -109,7 +109,7 @@ typedef enum _NL_NEIGHBOR_STATE {
109 NlnsStale,109 NlnsStale,
110 NlnsReachable,110 NlnsReachable,
111 NlnsPermanent,111 NlnsPermanent,
112 NlnsMaximum,112 NlnsMaximum
113} NL_NEIGHBOR_STATE, *PNL_NEIGHBOR_STATE;113} NL_NEIGHBOR_STATE, *PNL_NEIGHBOR_STATE;
114114
115typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR {115typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR {
lib/libc/include/any-windows-any/ntddmmc.h+1-1
...@@ -125,7 +125,7 @@ typedef enum _FEATURE_NUMBER {...@@ -125,7 +125,7 @@ typedef enum _FEATURE_NUMBER {
125 FeatureDvdCPRM = 0x010B,125 FeatureDvdCPRM = 0x010B,
126 FeatureFirmwareDate = 0x010C,126 FeatureFirmwareDate = 0x010C,
127 FeatureAACS = 0x010D,127 FeatureAACS = 0x010D,
128 FeatureVCPS = 0x0110,128 FeatureVCPS = 0x0110
129} FEATURE_NUMBER, *PFEATURE_NUMBER;129} FEATURE_NUMBER, *PFEATURE_NUMBER;
130130
131typedef struct _FEATURE_DATA_PROFILE_LIST_EX {131typedef struct _FEATURE_DATA_PROFILE_LIST_EX {
lib/libc/include/any-windows-any/ntddndis.h+5-5
...@@ -1181,7 +1181,7 @@ extern "C" {...@@ -1181,7 +1181,7 @@ extern "C" {
11811181
1182 typedef enum _NDIS_802_11_MEDIA_STREAM_MODE {1182 typedef enum _NDIS_802_11_MEDIA_STREAM_MODE {
1183 Ndis802_11MediaStreamOff,1183 Ndis802_11MediaStreamOff,
1184 Ndis802_11MediaStreamOn,1184 Ndis802_11MediaStreamOn
1185 } NDIS_802_11_MEDIA_STREAM_MODE, *PNDIS_802_11_MEDIA_STREAM_MODE;1185 } NDIS_802_11_MEDIA_STREAM_MODE, *PNDIS_802_11_MEDIA_STREAM_MODE;
11861186
1187 typedef UCHAR NDIS_802_11_PMKID_VALUE[16];1187 typedef UCHAR NDIS_802_11_PMKID_VALUE[16];
...@@ -2457,7 +2457,7 @@ extern "C" {...@@ -2457,7 +2457,7 @@ extern "C" {
2457#if NDIS_SUPPORT_NDIS6302457#if NDIS_SUPPORT_NDIS630
2458 NdisPortTypeNdisImPlatform,2458 NdisPortTypeNdisImPlatform,
2459#endif2459#endif
2460 NdisPortTypeMax,2460 NdisPortTypeMax
2461 } NDIS_PORT_TYPE, *PNDIS_PORT_TYPE;2461 } NDIS_PORT_TYPE, *PNDIS_PORT_TYPE;
24622462
2463 typedef enum _NDIS_PORT_AUTHORIZATION_STATE {2463 typedef enum _NDIS_PORT_AUTHORIZATION_STATE {
...@@ -2923,7 +2923,7 @@ extern "C" {...@@ -2923,7 +2923,7 @@ extern "C" {
2923 NdisWakeReasonWlan4WayHandshakeRequest = 0x1003,2923 NdisWakeReasonWlan4WayHandshakeRequest = 0x1003,
2924 NdisWakeReasonWwanRegisterState = 0x2000,2924 NdisWakeReasonWwanRegisterState = 0x2000,
2925 NdisWakeReasonWwanSMSReceive = 0x2001,2925 NdisWakeReasonWwanSMSReceive = 0x2001,
2926 NdisWakeReasonWwanUSSDReceive = 0x2002,2926 NdisWakeReasonWwanUSSDReceive = 0x2002
2927 } NDIS_PM_WAKE_REASON_TYPE, *PNDIS_PM_WAKE_REASON_TYPE;2927 } NDIS_PM_WAKE_REASON_TYPE, *PNDIS_PM_WAKE_REASON_TYPE;
29282928
2929 typedef struct _NDIS_PM_WAKE_REASON {2929 typedef struct _NDIS_PM_WAKE_REASON {
...@@ -3445,7 +3445,7 @@ extern "C" {...@@ -3445,7 +3445,7 @@ extern "C" {
3445 NdisRssProfileNuma,3445 NdisRssProfileNuma,
3446 NdisRssProfileNumaStatic,3446 NdisRssProfileNumaStatic,
3447 NdisRssProfileConservative,3447 NdisRssProfileConservative,
3448 NdisRssProfileMaximum,3448 NdisRssProfileMaximum
3449 } NDIS_RSS_PROFILE, *PNDIS_RSS_PROFILE;3449 } NDIS_RSS_PROFILE, *PNDIS_RSS_PROFILE;
3450#endif3450#endif
34513451
...@@ -3977,7 +3977,7 @@ extern "C" {...@@ -3977,7 +3977,7 @@ extern "C" {
3977 NdisNicSwitchVPortInterruptModerationOff = 2,3977 NdisNicSwitchVPortInterruptModerationOff = 2,
3978 NdisNicSwitchVPortInterruptModerationLow = 100,3978 NdisNicSwitchVPortInterruptModerationLow = 100,
3979 NdisNicSwitchVPortInterruptModerationMedium = 200,3979 NdisNicSwitchVPortInterruptModerationMedium = 200,
3980 NdisNicSwitchVPortInterruptModerationHigh = 300,3980 NdisNicSwitchVPortInterruptModerationHigh = 300
3981 } NDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION, *PNDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION;3981 } NDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION, *PNDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION;
39823982
3983 typedef struct _NDIS_NIC_SWITCH_VPORT_PARAMETERS {3983 typedef struct _NDIS_NIC_SWITCH_VPORT_PARAMETERS {
lib/libc/include/any-windows-any/ntsecapi.h+2-2
...@@ -2572,7 +2572,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE {...@@ -2572,7 +2572,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE {
2572 } KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE, *PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE;2572 } KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE, *PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE;
25732573
2574 typedef enum _KERB_CERTIFICATE_INFO_TYPE {2574 typedef enum _KERB_CERTIFICATE_INFO_TYPE {
2575 CertHashInfo = 1,2575 CertHashInfo = 1
2576 } KERB_CERTIFICATE_INFO_TYPE, *PKERB_CERTIFICATE_INFO_TYPE;2576 } KERB_CERTIFICATE_INFO_TYPE, *PKERB_CERTIFICATE_INFO_TYPE;
25772577
2578 typedef struct _KERB_CERTIFICATE_HASHINFO {2578 typedef struct _KERB_CERTIFICATE_HASHINFO {
...@@ -2827,7 +2827,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE {...@@ -2827,7 +2827,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE {
2827 } PKU2U_CREDUI_CONTEXT, *PPKU2U_CREDUI_CONTEXT;2827 } PKU2U_CREDUI_CONTEXT, *PPKU2U_CREDUI_CONTEXT;
28282828
2829 typedef enum _PKU2U_LOGON_SUBMIT_TYPE {2829 typedef enum _PKU2U_LOGON_SUBMIT_TYPE {
2830 Pku2uCertificateS4ULogon = 14,2830 Pku2uCertificateS4ULogon = 14
2831 } PKU2U_LOGON_SUBMIT_TYPE, *PPKU2U_LOGON_SUBMIT_TYPE;2831 } PKU2U_LOGON_SUBMIT_TYPE, *PPKU2U_LOGON_SUBMIT_TYPE;
28322832
2833 typedef struct _PKU2U_CERTIFICATE_S4U_LOGON {2833 typedef struct _PKU2U_CERTIFICATE_S4U_LOGON {
lib/libc/include/any-windows-any/oaidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/oaidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/oaidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/objectarray.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/objectarray.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/objectarray.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/objidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/objidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/objidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/objidlbase.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/objidlbase.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/objidlbase.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/ocidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/ocidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/ocidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/odbcinst.h+1-1
...@@ -13,7 +13,7 @@ extern "C" {...@@ -13,7 +13,7 @@ extern "C" {
13#endif13#endif
1414
15#ifndef ODBCVER15#ifndef ODBCVER
16#define ODBCVER 0x035116#define ODBCVER 0x0380
17#endif17#endif
1818
19#define ODBC_ADD_DSN 119#define ODBC_ADD_DSN 1
lib/libc/include/any-windows-any/oleacc.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/oleacc.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/oleacc.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/oleidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/oleidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/oleidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/optary.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/optary.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/optary.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/p2p.h+14-14
...@@ -34,23 +34,23 @@ extern "C" {...@@ -34,23 +34,23 @@ extern "C" {
34 PEER_RECORD_ADDED = 1,34 PEER_RECORD_ADDED = 1,
35 PEER_RECORD_UPDATED = 2,35 PEER_RECORD_UPDATED = 2,
36 PEER_RECORD_DELETED = 3,36 PEER_RECORD_DELETED = 3,
37 PEER_RECORD_EXPIRED = 4,37 PEER_RECORD_EXPIRED = 4
38 } PEER_RECORD_CHANGE_TYPE;38 } PEER_RECORD_CHANGE_TYPE;
3939
40 typedef enum peer_connection_status_tag {40 typedef enum peer_connection_status_tag {
41 PEER_CONNECTED = 1,41 PEER_CONNECTED = 1,
42 PEER_DISCONNECTED = 2,42 PEER_DISCONNECTED = 2,
43 PEER_CONNECTION_FAILED = 3,43 PEER_CONNECTION_FAILED = 3
44 } PEER_CONNECTION_STATUS;44 } PEER_CONNECTION_STATUS;
4545
46 typedef enum peer_connection_flags_tag {46 typedef enum peer_connection_flags_tag {
47 PEER_CONNECTION_NEIGHBOR = 0x0001,47 PEER_CONNECTION_NEIGHBOR = 0x0001,
48 PEER_CONNECTION_DIRECT = 0x0002,48 PEER_CONNECTION_DIRECT = 0x0002
49 } PEER_CONNECTION_FLAGS;49 } PEER_CONNECTION_FLAGS;
5050
51 typedef enum peer_record_flags_tag {51 typedef enum peer_record_flags_tag {
52 PEER_RECORD_FLAG_AUTOREFRESH = 0x0001,52 PEER_RECORD_FLAG_AUTOREFRESH = 0x0001,
53 PEER_RECORD_FLAG_DELETED = 0x0002,53 PEER_RECORD_FLAG_DELETED = 0x0002
54 } PEER_RECORD_FLAGS;54 } PEER_RECORD_FLAGS;
5555
56 typedef56 typedef
...@@ -155,24 +155,24 @@ extern "C" {...@@ -155,24 +155,24 @@ extern "C" {
155 PEER_GRAPH_EVENT_INCOMING_DATA = 6,155 PEER_GRAPH_EVENT_INCOMING_DATA = 6,
156 PEER_GRAPH_EVENT_CONNECTION_REQUIRED = 7,156 PEER_GRAPH_EVENT_CONNECTION_REQUIRED = 7,
157 PEER_GRAPH_EVENT_NODE_CHANGED = 8,157 PEER_GRAPH_EVENT_NODE_CHANGED = 8,
158 PEER_GRAPH_EVENT_SYNCHRONIZED = 9,158 PEER_GRAPH_EVENT_SYNCHRONIZED = 9
159 } PEER_GRAPH_EVENT_TYPE;159 } PEER_GRAPH_EVENT_TYPE;
160160
161 typedef enum peer_node_change_type_tag {161 typedef enum peer_node_change_type_tag {
162 PEER_NODE_CHANGE_CONNECTED = 1,162 PEER_NODE_CHANGE_CONNECTED = 1,
163 PEER_NODE_CHANGE_DISCONNECTED = 2,163 PEER_NODE_CHANGE_DISCONNECTED = 2,
164 PEER_NODE_CHANGE_UPDATED = 3,164 PEER_NODE_CHANGE_UPDATED = 3
165 } PEER_NODE_CHANGE_TYPE;165 } PEER_NODE_CHANGE_TYPE;
166166
167 typedef enum peer_graph_status_flags_tag {167 typedef enum peer_graph_status_flags_tag {
168 PEER_GRAPH_STATUS_LISTENING = 0x0001,168 PEER_GRAPH_STATUS_LISTENING = 0x0001,
169 PEER_GRAPH_STATUS_HAS_CONNECTIONS = 0x0002,169 PEER_GRAPH_STATUS_HAS_CONNECTIONS = 0x0002,
170 PEER_GRAPH_STATUS_SYNCHRONIZED = 0x0004,170 PEER_GRAPH_STATUS_SYNCHRONIZED = 0x0004
171 } PEER_GRAPH_STATUS_FLAGS;171 } PEER_GRAPH_STATUS_FLAGS;
172172
173 typedef enum peer_graph_property_flags_tag {173 typedef enum peer_graph_property_flags_tag {
174 PEER_GRAPH_PROPERTY_HEARTBEATS = 0x0001,174 PEER_GRAPH_PROPERTY_HEARTBEATS = 0x0001,
175 PEER_GRAPH_PROPERTY_DEFER_EXPIRATION = 0x0002,175 PEER_GRAPH_PROPERTY_DEFER_EXPIRATION = 0x0002
176 } PEER_GRAPH_PROPERTY_FLAGS;176 } PEER_GRAPH_PROPERTY_FLAGS;
177177
178 typedef enum peer_graph_scope_tag {178 typedef enum peer_graph_scope_tag {
...@@ -317,24 +317,24 @@ extern "C" {...@@ -317,24 +317,24 @@ extern "C" {
317317
318 typedef enum peer_group_status_tag {318 typedef enum peer_group_status_tag {
319 PEER_GROUP_STATUS_LISTENING = 0x0001,319 PEER_GROUP_STATUS_LISTENING = 0x0001,
320 PEER_GROUP_STATUS_HAS_CONNECTIONS = 0x0002,320 PEER_GROUP_STATUS_HAS_CONNECTIONS = 0x0002
321 } PEER_GROUP_STATUS;321 } PEER_GROUP_STATUS;
322322
323 typedef enum peer_group_property_flags_tag {323 typedef enum peer_group_property_flags_tag {
324 PEER_MEMBER_DATA_OPTIONAL = 0x0001,324 PEER_MEMBER_DATA_OPTIONAL = 0x0001,
325 PEER_DISABLE_PRESENCE = 0x0002,325 PEER_DISABLE_PRESENCE = 0x0002,
326 PEER_DEFER_EXPIRATION = 0x0004,326 PEER_DEFER_EXPIRATION = 0x0004
327 } PEER_GROUP_PROPERTY_FLAGS;327 } PEER_GROUP_PROPERTY_FLAGS;
328328
329#if NTDDI_VERSION >= 0x06000000329#if NTDDI_VERSION >= 0x06000000
330 typedef enum peer_group_authentication_scheme_tag {330 typedef enum peer_group_authentication_scheme_tag {
331 PEER_GROUP_GMC_AUTHENTICATION = 0x00000001,331 PEER_GROUP_GMC_AUTHENTICATION = 0x00000001,
332 PEER_GROUP_PASSWORD_AUTHENTICATION = 0x00000002,332 PEER_GROUP_PASSWORD_AUTHENTICATION = 0x00000002
333 } PEER_GROUP_AUTHENTICATION_SCHEME;333 } PEER_GROUP_AUTHENTICATION_SCHEME;
334#endif334#endif
335335
336 typedef enum peer_member_flags_tag {336 typedef enum peer_member_flags_tag {
337 PEER_MEMBER_PRESENT = 0x0001,337 PEER_MEMBER_PRESENT = 0x0001
338 } PEER_MEMBER_FLAGS;338 } PEER_MEMBER_FLAGS;
339339
340 typedef enum peer_member_change_type_tag {340 typedef enum peer_member_change_type_tag {
...@@ -342,11 +342,11 @@ extern "C" {...@@ -342,11 +342,11 @@ extern "C" {
342 PEER_MEMBER_DISCONNECTED = 2,342 PEER_MEMBER_DISCONNECTED = 2,
343 PEER_MEMBER_UPDATED = 3,343 PEER_MEMBER_UPDATED = 3,
344 PEER_MEMBER_JOINED = 4,344 PEER_MEMBER_JOINED = 4,
345 PEER_MEMBER_LEFT = 5,345 PEER_MEMBER_LEFT = 5
346 } PEER_MEMBER_CHANGE_TYPE;346 } PEER_MEMBER_CHANGE_TYPE;
347347
348 typedef enum peer_issue_credential_flags_tag {348 typedef enum peer_issue_credential_flags_tag {
349 PEER_GROUP_STORE_CREDENTIALS = 0x0001,349 PEER_GROUP_STORE_CREDENTIALS = 0x0001
350 } PEER_GROUP_ISSUE_CREDENTIAL_FLAGS;350 } PEER_GROUP_ISSUE_CREDENTIAL_FLAGS;
351351
352#ifndef __WIDL__352#ifndef __WIDL__
lib/libc/include/any-windows-any/pnrpdef.h+1-1
...@@ -74,7 +74,7 @@ typedef struct _PNRP_CLOUD_ID {...@@ -74,7 +74,7 @@ typedef struct _PNRP_CLOUD_ID {
74typedef enum _PNRP_EXTENDED_PAYLOAD_TYPE {74typedef enum _PNRP_EXTENDED_PAYLOAD_TYPE {
75 PNRP_EXTENDED_PAYLOAD_TYPE_NONE = 0,75 PNRP_EXTENDED_PAYLOAD_TYPE_NONE = 0,
76 PNRP_EXTENDED_PAYLOAD_TYPE_BINARY,76 PNRP_EXTENDED_PAYLOAD_TYPE_BINARY,
77 PNRP_EXTENDED_PAYLOAD_TYPE_STRING,77 PNRP_EXTENDED_PAYLOAD_TYPE_STRING
78} PNRP_EXTENDED_PAYLOAD_TYPE,*PPNRP_EXTENDED_PAYLOAD_TYPE;78} PNRP_EXTENDED_PAYLOAD_TYPE,*PPNRP_EXTENDED_PAYLOAD_TYPE;
7979
80#endif80#endif
lib/libc/include/any-windows-any/portabledeviceapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/portabledeviceapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/portabledeviceapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/portabledevicetypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/portabledevicetypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/portabledevicetypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/proofofpossessioncookieinfo.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/proofofpossessioncookieinfo.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/proofofpossessioncookieinfo.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/propidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/propidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/propidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/propsys.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/propsys.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/propsys.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/pthread.h+61-24
...@@ -86,8 +86,6 @@ extern "C" {...@@ -86,8 +86,6 @@ extern "C" {
86/* MSB 8-bit major version, 8-bit minor version, 16-bit patch level. */86/* MSB 8-bit major version, 8-bit minor version, 16-bit patch level. */
87#define __WINPTHREADS_VERSION 0x0005000087#define __WINPTHREADS_VERSION 0x00050000
8888
89/* #define WINPTHREAD_DBG 1 */
90
91/* Compatibility stuff: */89/* Compatibility stuff: */
92#define RWLS_PER_THREAD 890#define RWLS_PER_THREAD 8
9391
...@@ -141,7 +139,16 @@ extern "C" {...@@ -141,7 +139,16 @@ extern "C" {
141#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE139#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
142140
143WINPTHREAD_API void * pthread_timechange_handler_np(void * dummy);141WINPTHREAD_API void * pthread_timechange_handler_np(void * dummy);
144WINPTHREAD_API int pthread_delay_np (const struct timespec *interval);142WINPTHREAD_API int pthread_delay32_np (const struct _timespec32 *interval);
143WINPTHREAD_API int pthread_delay64_np (const struct _timespec64 *interval);
144WINPTHREAD_THREAD_DECL int pthread_delay_np (const struct timespec *interval)
145{
146#if WINPTHREADS_TIME_BITS == 32
147 return pthread_delay32_np ((const struct _timespec32 *) interval);
148#else
149 return pthread_delay64_np ((const struct _timespec64 *) interval);
150#endif
151}
145WINPTHREAD_API int pthread_num_processors_np(void);152WINPTHREAD_API int pthread_num_processors_np(void);
146WINPTHREAD_API int pthread_set_num_processors_np(int n);153WINPTHREAD_API int pthread_set_num_processors_np(int n);
147154
...@@ -158,7 +165,7 @@ WINPTHREAD_API int pthread_set_num_processors_np(int n);...@@ -158,7 +165,7 @@ WINPTHREAD_API int pthread_set_num_processors_np(int n);
158#define pthread_mutex_setprioceiling(M, P) ENOTSUP165#define pthread_mutex_setprioceiling(M, P) ENOTSUP
159#define pthread_getcpuclockid(T, C) ENOTSUP166#define pthread_getcpuclockid(T, C) ENOTSUP
160#define pthread_attr_getguardsize(A, S) ENOTSUP167#define pthread_attr_getguardsize(A, S) ENOTSUP
161#define pthread_attr_setgaurdsize(A, S) ENOTSUP168#define pthread_attr_setguardsize(A, S) ENOTSUP
162169
163typedef long pthread_once_t;170typedef long pthread_once_t;
164typedef unsigned pthread_mutexattr_t;171typedef unsigned pthread_mutexattr_t;
...@@ -166,16 +173,6 @@ typedef unsigned pthread_key_t;...@@ -166,16 +173,6 @@ typedef unsigned pthread_key_t;
166typedef void *pthread_barrierattr_t;173typedef void *pthread_barrierattr_t;
167typedef int pthread_condattr_t;174typedef int pthread_condattr_t;
168typedef int pthread_rwlockattr_t;175typedef int pthread_rwlockattr_t;
169
170/*
171struct _pthread_v;
172
173typedef struct pthread_t {
174 struct _pthread_v *p;
175 int x;
176} pthread_t;
177*/
178
179typedef uintptr_t pthread_t;176typedef uintptr_t pthread_t;
180177
181typedef struct _pthread_cleanup _pthread_cleanup;178typedef struct _pthread_cleanup _pthread_cleanup;
...@@ -281,12 +278,29 @@ WINPTHREAD_API int pthread_detach(pthread_t t);...@@ -281,12 +278,29 @@ WINPTHREAD_API int pthread_detach(pthread_t t);
281WINPTHREAD_API int pthread_setname_np(pthread_t thread, const char *name);278WINPTHREAD_API int pthread_setname_np(pthread_t thread, const char *name);
282WINPTHREAD_API int pthread_getname_np(pthread_t thread, char *name, size_t len);279WINPTHREAD_API int pthread_getname_np(pthread_t thread, char *name, size_t len);
283280
284
285WINPTHREAD_API int pthread_rwlock_init(pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *attr);281WINPTHREAD_API int pthread_rwlock_init(pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *attr);
286WINPTHREAD_API int pthread_rwlock_wrlock(pthread_rwlock_t *l);282WINPTHREAD_API int pthread_rwlock_wrlock(pthread_rwlock_t *l);
287WINPTHREAD_API int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *ts);283WINPTHREAD_API int pthread_rwlock_timedwrlock32(pthread_rwlock_t *rwlock, const struct _timespec32 *ts);
284WINPTHREAD_API int pthread_rwlock_timedwrlock64(pthread_rwlock_t *rwlock, const struct _timespec64 *ts);
285WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *ts)
286{
287#if WINPTHREADS_TIME_BITS == 32
288 return pthread_rwlock_timedwrlock32 (rwlock, (const struct _timespec32 *) ts);
289#else
290 return pthread_rwlock_timedwrlock64 (rwlock, (const struct _timespec64 *) ts);
291#endif
292}
288WINPTHREAD_API int pthread_rwlock_rdlock(pthread_rwlock_t *l);293WINPTHREAD_API int pthread_rwlock_rdlock(pthread_rwlock_t *l);
289WINPTHREAD_API int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts);294WINPTHREAD_API int pthread_rwlock_timedrdlock32(pthread_rwlock_t *l, const struct _timespec32 *ts);
295WINPTHREAD_API int pthread_rwlock_timedrdlock64(pthread_rwlock_t *l, const struct _timespec64 *ts);
296WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts)
297{
298#if WINPTHREADS_TIME_BITS == 32
299 return pthread_rwlock_timedrdlock32 (l, (const struct _timespec32 *) ts);
300#else
301 return pthread_rwlock_timedrdlock64 (l, (const struct _timespec64 *) ts);
302#endif
303}
290WINPTHREAD_API int pthread_rwlock_unlock(pthread_rwlock_t *l);304WINPTHREAD_API int pthread_rwlock_unlock(pthread_rwlock_t *l);
291WINPTHREAD_API int pthread_rwlock_tryrdlock(pthread_rwlock_t *l);305WINPTHREAD_API int pthread_rwlock_tryrdlock(pthread_rwlock_t *l);
292WINPTHREAD_API int pthread_rwlock_trywrlock(pthread_rwlock_t *l);306WINPTHREAD_API int pthread_rwlock_trywrlock(pthread_rwlock_t *l);
...@@ -297,11 +311,38 @@ WINPTHREAD_API int pthread_cond_destroy(pthread_cond_t *cv);...@@ -297,11 +311,38 @@ WINPTHREAD_API int pthread_cond_destroy(pthread_cond_t *cv);
297WINPTHREAD_API int pthread_cond_signal (pthread_cond_t *cv);311WINPTHREAD_API int pthread_cond_signal (pthread_cond_t *cv);
298WINPTHREAD_API int pthread_cond_broadcast (pthread_cond_t *cv);312WINPTHREAD_API int pthread_cond_broadcast (pthread_cond_t *cv);
299WINPTHREAD_API int pthread_cond_wait (pthread_cond_t *cv, pthread_mutex_t *external_mutex);313WINPTHREAD_API int pthread_cond_wait (pthread_cond_t *cv, pthread_mutex_t *external_mutex);
300WINPTHREAD_API int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t);314WINPTHREAD_API int pthread_cond_timedwait32(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec32 *t);
301WINPTHREAD_API int pthread_cond_timedwait_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t);315WINPTHREAD_API int pthread_cond_timedwait64(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec64 *t);
316WINPTHREAD_COND_DECL int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t)
317{
318#if WINPTHREADS_TIME_BITS == 32
319 return pthread_cond_timedwait32 (cv, external_mutex, (const struct _timespec32 *) t);
320#else
321 return pthread_cond_timedwait64 (cv, external_mutex, (const struct _timespec64 *) t);
322#endif
323}
324WINPTHREAD_API int pthread_cond_timedwait32_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec32 *t);
325WINPTHREAD_API int pthread_cond_timedwait64_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec64 *t);
326WINPTHREAD_COND_DECL int pthread_cond_timedwait_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t)
327{
328#if WINPTHREADS_TIME_BITS == 32
329 return pthread_cond_timedwait32_relative_np (cv, external_mutex, (const struct _timespec32 *) t);
330#else
331 return pthread_cond_timedwait64_relative_np (cv, external_mutex, (const struct _timespec64 *) t);
332#endif
333}
302334
303WINPTHREAD_API int pthread_mutex_lock(pthread_mutex_t *m);335WINPTHREAD_API int pthread_mutex_lock(pthread_mutex_t *m);
304WINPTHREAD_API int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts);336WINPTHREAD_API int pthread_mutex_timedlock32(pthread_mutex_t *m, const struct _timespec32 *ts);
337WINPTHREAD_API int pthread_mutex_timedlock64(pthread_mutex_t *m, const struct _timespec64 *ts);
338WINPTHREAD_MUTEX_DECL int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts)
339{
340#if WINPTHREADS_TIME_BITS == 32
341 return pthread_mutex_timedlock32 (m, (const struct _timespec32 *) ts);
342#else
343 return pthread_mutex_timedlock64 (m, (const struct _timespec64 *) ts);
344#endif
345}
305WINPTHREAD_API int pthread_mutex_unlock(pthread_mutex_t *m);346WINPTHREAD_API int pthread_mutex_unlock(pthread_mutex_t *m);
306WINPTHREAD_API int pthread_mutex_trylock(pthread_mutex_t *m);347WINPTHREAD_API int pthread_mutex_trylock(pthread_mutex_t *m);
307WINPTHREAD_API int pthread_mutex_init(pthread_mutex_t *m, const pthread_mutexattr_t *a);348WINPTHREAD_API int pthread_mutex_init(pthread_mutex_t *m, const pthread_mutexattr_t *a);
...@@ -355,7 +396,6 @@ WINPTHREAD_API int pthread_condattr_getclock (const pthread_condattr_t *attr,...@@ -355,7 +396,6 @@ WINPTHREAD_API int pthread_condattr_getclock (const pthread_condattr_t *attr,
355 clockid_t *clock_id);396 clockid_t *clock_id);
356WINPTHREAD_API int pthread_condattr_setclock(pthread_condattr_t *attr,397WINPTHREAD_API int pthread_condattr_setclock(pthread_condattr_t *attr,
357 clockid_t clock_id);398 clockid_t clock_id);
358WINPTHREAD_API int __pthread_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp);
359399
360WINPTHREAD_API int pthread_barrierattr_init(void **attr);400WINPTHREAD_API int pthread_barrierattr_init(void **attr);
361WINPTHREAD_API int pthread_barrierattr_destroy(void **attr);401WINPTHREAD_API int pthread_barrierattr_destroy(void **attr);
...@@ -367,9 +407,6 @@ WINPTHREAD_API struct _pthread_cleanup ** pthread_getclean (void);...@@ -367,9 +407,6 @@ WINPTHREAD_API struct _pthread_cleanup ** pthread_getclean (void);
367WINPTHREAD_API void * pthread_gethandle (pthread_t t);407WINPTHREAD_API void * pthread_gethandle (pthread_t t);
368WINPTHREAD_API void * pthread_getevent (void);408WINPTHREAD_API void * pthread_getevent (void);
369409
370WINPTHREAD_API unsigned long long _pthread_rel_time_in_ms(const struct timespec *ts);
371WINPTHREAD_API unsigned long long _pthread_time_in_ms(void);
372WINPTHREAD_API unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts);
373WINPTHREAD_API int _pthread_tryjoin (pthread_t t, void **res);410WINPTHREAD_API int _pthread_tryjoin (pthread_t t, void **res);
374WINPTHREAD_API int pthread_rwlockattr_destroy(pthread_rwlockattr_t *a);411WINPTHREAD_API int pthread_rwlockattr_destroy(pthread_rwlockattr_t *a);
375WINPTHREAD_API int pthread_rwlockattr_getpshared(pthread_rwlockattr_t *a, int *s);412WINPTHREAD_API int pthread_rwlockattr_getpshared(pthread_rwlockattr_t *a, int *s);
lib/libc/include/any-windows-any/pthread_compat.h+31-1
...@@ -60,6 +60,12 @@...@@ -60,6 +60,12 @@
60#ifndef WIN_PTHREADS_PTHREAD_COMPAT_H60#ifndef WIN_PTHREADS_PTHREAD_COMPAT_H
61#define WIN_PTHREADS_PTHREAD_COMPAT_H61#define WIN_PTHREADS_PTHREAD_COMPAT_H
6262
63#if defined(_USE_32BIT_TIME_T) || (defined(_TIME_BITS) && _TIME_BITS == 32)
64#define WINPTHREADS_TIME_BITS 32
65#else
66#define WINPTHREADS_TIME_BITS 64
67#endif
68
63#if defined(IN_WINPTHREAD)69#if defined(IN_WINPTHREAD)
64# if defined(DLL_EXPORT)70# if defined(DLL_EXPORT)
65# define WINPTHREAD_API __declspec(dllexport) /* building the DLL */71# define WINPTHREAD_API __declspec(dllexport) /* building the DLL */
...@@ -97,7 +103,8 @@ typedef unsigned short mode_t;...@@ -97,7 +103,8 @@ typedef unsigned short mode_t;
97103
98#ifdef __GNUC__104#ifdef __GNUC__
99105
100#define WINPTHREADS_INLINE inline106#define WINPTHREADS_INLINE __inline__
107#define WINPTHREADS_ALWAYS_INLINE __inline__ __attribute__((__always_inline__))
101#define WINPTHREADS_ATTRIBUTE(X) __attribute__(X)108#define WINPTHREADS_ATTRIBUTE(X) __attribute__(X)
102#define WINPTHREADS_SECTION(X) __section__(X)109#define WINPTHREADS_SECTION(X) __section__(X)
103110
...@@ -110,9 +117,32 @@ typedef int pid_t;...@@ -110,9 +117,32 @@ typedef int pid_t;
110#endif117#endif
111118
112#define WINPTHREADS_INLINE __inline119#define WINPTHREADS_INLINE __inline
120#define WINPTHREADS_ALWAYS_INLINE __inline __forceinline
113#define WINPTHREADS_ATTRIBUTE(X) __declspec X121#define WINPTHREADS_ATTRIBUTE(X) __declspec X
114#define WINPTHREADS_SECTION(X) allocate(X)122#define WINPTHREADS_SECTION(X) allocate(X)
115123
116#endif124#endif
117125
126#ifndef WINPTHREAD_CLOCK_DECL
127#define WINPTHREAD_CLOCK_DECL static WINPTHREADS_ALWAYS_INLINE
128#endif
129#ifndef WINPTHREAD_COND_DECL
130#define WINPTHREAD_COND_DECL static WINPTHREADS_ALWAYS_INLINE
131#endif
132#ifndef WINPTHREAD_MUTEX_DECL
133#define WINPTHREAD_MUTEX_DECL static WINPTHREADS_ALWAYS_INLINE
134#endif
135#ifndef WINPTHREAD_NANOSLEEP_DECL
136#define WINPTHREAD_NANOSLEEP_DECL static WINPTHREADS_ALWAYS_INLINE
137#endif
138#ifndef WINPTHREAD_RWLOCK_DECL
139#define WINPTHREAD_RWLOCK_DECL static WINPTHREADS_ALWAYS_INLINE
140#endif
141#ifndef WINPTHREAD_SEM_DECL
142#define WINPTHREAD_SEM_DECL static WINPTHREADS_ALWAYS_INLINE
143#endif
144#ifndef WINPTHREAD_THREAD_DECL
145#define WINPTHREAD_THREAD_DECL static WINPTHREADS_ALWAYS_INLINE
146#endif
147
118#endif148#endif
lib/libc/include/any-windows-any/pthread_time.h+54-5
...@@ -23,6 +23,7 @@...@@ -23,6 +23,7 @@
23#ifndef WIN_PTHREADS_TIME_H23#ifndef WIN_PTHREADS_TIME_H
24#define WIN_PTHREADS_TIME_H24#define WIN_PTHREADS_TIME_H
2525
26#include <sys/timeb.h>
26#include "pthread_compat.h"27#include "pthread_compat.h"
2728
28/* Posix timers are supported */29/* Posix timers are supported */
...@@ -73,12 +74,60 @@...@@ -73,12 +74,60 @@
73extern "C" {74extern "C" {
74#endif75#endif
7576
76WINPTHREAD_API int __cdecl nanosleep(const struct timespec *request, struct timespec *remain);77WINPTHREAD_API int __cdecl nanosleep32(const struct _timespec32 *request, struct _timespec32 *remain);
78WINPTHREAD_API int __cdecl nanosleep64(const struct _timespec64 *request, struct _timespec64 *remain);
79WINPTHREAD_NANOSLEEP_DECL int __cdecl nanosleep(const struct timespec *request, struct timespec *remain)
80{
81#if WINPTHREADS_TIME_BITS == 32
82 return nanosleep32 ((struct _timespec32 *)request, (struct _timespec32 *)remain);
83#else
84 return nanosleep64 ((struct _timespec64 *)request, (struct _timespec64 *)remain);
85#endif
86}
7787
78WINPTHREAD_API int __cdecl clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *request, struct timespec *remain);88WINPTHREAD_API int __cdecl clock_nanosleep32(clockid_t clock_id, int flags, const struct _timespec32 *request, struct _timespec32 *remain);
79WINPTHREAD_API int __cdecl clock_getres(clockid_t clock_id, struct timespec *res);89WINPTHREAD_API int __cdecl clock_nanosleep64(clockid_t clock_id, int flags, const struct _timespec64 *request, struct _timespec64 *remain);
80WINPTHREAD_API int __cdecl clock_gettime(clockid_t clock_id, struct timespec *tp);90WINPTHREAD_CLOCK_DECL int __cdecl clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *request, struct timespec *remain)
81WINPTHREAD_API int __cdecl clock_settime(clockid_t clock_id, const struct timespec *tp);91{
92#if WINPTHREADS_TIME_BITS == 32
93 return clock_nanosleep32 (clock_id, flags, (struct _timespec32 *)request, (struct _timespec32 *)remain);
94#else
95 return clock_nanosleep64 (clock_id, flags, (struct _timespec64 *)request, (struct _timespec64 *)remain);
96#endif
97}
98
99WINPTHREAD_API int __cdecl clock_getres32(clockid_t clock_id, struct _timespec32 *res);
100WINPTHREAD_API int __cdecl clock_getres64(clockid_t clock_id, struct _timespec64 *res);
101WINPTHREAD_CLOCK_DECL int __cdecl clock_getres(clockid_t clock_id, struct timespec *res)
102{
103#if WINPTHREADS_TIME_BITS == 32
104 return clock_getres32 (clock_id, (struct _timespec32 *)res);
105#else
106 return clock_getres64 (clock_id, (struct _timespec64 *)res);
107#endif
108}
109
110WINPTHREAD_API int __cdecl clock_gettime32(clockid_t clock_id, struct _timespec32 *tp);
111WINPTHREAD_API int __cdecl clock_gettime64(clockid_t clock_id, struct _timespec64 *tp);
112WINPTHREAD_CLOCK_DECL int __cdecl clock_gettime(clockid_t clock_id, struct timespec *tp)
113{
114#if WINPTHREADS_TIME_BITS == 32
115 return clock_gettime32 (clock_id, (struct _timespec32 *)tp);
116#else
117 return clock_gettime64 (clock_id, (struct _timespec64 *)tp);
118#endif
119}
120
121WINPTHREAD_API int __cdecl clock_settime32(clockid_t clock_id, const struct _timespec32 *tp);
122WINPTHREAD_API int __cdecl clock_settime64(clockid_t clock_id, const struct _timespec64 *tp);
123WINPTHREAD_CLOCK_DECL int __cdecl clock_settime(clockid_t clock_id, const struct timespec *tp)
124{
125#if WINPTHREADS_TIME_BITS == 32
126 return clock_settime32 (clock_id, (struct _timespec32 *)tp);
127#else
128 return clock_settime64 (clock_id, (struct _timespec64 *)tp);
129#endif
130}
82131
83#ifdef __cplusplus132#ifdef __cplusplus
84}133}
lib/libc/include/any-windows-any/qedit.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/qedit.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/qedit.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/qnetwork.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/qnetwork.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/qnetwork.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/rasshost.h+2-2
...@@ -5,8 +5,8 @@...@@ -5,8 +5,8 @@
5#ifndef _RASSHOST_5#ifndef _RASSHOST_
6#define _RASSHOST_6#define _RASSHOST_
77
8#include <winapifamily.h> 8#include <winapifamily.h>
9 9
10#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)10#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
1111
12#include <mprapi.h>12#include <mprapi.h>
lib/libc/include/any-windows-any/rdpencomapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/rdpencomapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/rdpencomapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/regbag.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/regbag.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/regbag.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/relogger.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/relogger.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/relogger.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/robuffer.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/robuffer.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/robuffer.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/rtworkq.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/rtworkq.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/rtworkq.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/sapi51.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/sapi51.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/sapi51.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/sapi53.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/sapi53.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/sapi53.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/sapi54.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/sapi54.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/sapi54.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/scardssp_i.c deleted-63
...@@ -1,63 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C"{
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14#ifndef INITGUID
15#define INITGUID
16#include <guiddef.h>
17#undef INITGUID
18#else
19#include <guiddef.h>
20#endif
21
22#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
23#else
24
25#ifndef __IID_DEFINED__
26#define __IID_DEFINED__
27 typedef struct _IID {
28 unsigned long x;
29 unsigned short s1;
30 unsigned short s2;
31 unsigned char c[8];
32 } IID;
33#endif
34
35#ifndef CLSID_DEFINED
36#define CLSID_DEFINED
37 typedef IID CLSID;
38#endif
39
40#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
41#endif
42
43 MIDL_DEFINE_GUID(IID,IID_IByteBuffer,0xE126F8FE,0xA7AF,0x11D0,0xB8,0x8A,0x00,0xC0,0x4F,0xD4,0x24,0xB9);
44 MIDL_DEFINE_GUID(IID,IID_ISCardTypeConv,0x53B6AA63,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68);
45 MIDL_DEFINE_GUID(IID,IID_ISCardCmd,0xD5778AE3,0x43DE,0x11D0,0x91,0x71,0x00,0xAA,0x00,0xC1,0x80,0x68);
46 MIDL_DEFINE_GUID(IID,IID_ISCardISO7816,0x53B6AA68,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68);
47 MIDL_DEFINE_GUID(IID,IID_ISCard,0x1461AAC3,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
48 MIDL_DEFINE_GUID(IID,IID_ISCardDatabase,0x1461AAC8,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
49 MIDL_DEFINE_GUID(IID,IID_ISCardLocate,0x1461AACD,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
50 MIDL_DEFINE_GUID(IID,LIBID_SCARDSSPLib,0x82C38704,0x19F1,0x11D3,0xA1,0x1F,0x00,0xC0,0x4F,0x79,0xF8,0x00);
51 MIDL_DEFINE_GUID(CLSID,CLSID_CByteBuffer,0xE126F8FF,0xA7AF,0x11D0,0xB8,0x8A,0x00,0xC0,0x4F,0xD4,0x24,0xB9);
52 MIDL_DEFINE_GUID(CLSID,CLSID_CSCardTypeConv,0x53B6AA67,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68);
53 MIDL_DEFINE_GUID(CLSID,CLSID_CSCardCmd,0xD5778AE7,0x43DE,0x11D0,0x91,0x71,0x00,0xAA,0x00,0xC1,0x80,0x68);
54 MIDL_DEFINE_GUID(CLSID,CLSID_CSCardISO7816,0x53B6AA6C,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68);
55 MIDL_DEFINE_GUID(CLSID,CLSID_CSCard,0x1461AAC7,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
56 MIDL_DEFINE_GUID(CLSID,CLSID_CSCardDatabase,0x1461AACC,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
57 MIDL_DEFINE_GUID(CLSID,CLSID_CSCardLocate,0x1461AAD1,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68);
58
59#undef MIDL_DEFINE_GUID
60
61#ifdef __cplusplus
62}
63#endif
lib/libc/include/any-windows-any/scardssp_p.c deleted-285
...@@ -1,285 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#define USE_STUBLESS_PROXY
7
8#ifndef __REDQ_RPCPROXY_H_VERSION__
9#define __REQUIRED_RPCPROXY_H_VERSION__ 475
10#endif
11
12#include "rpcproxy.h"
13#ifndef __RPCPROXY_H_VERSION__
14#error This stub requires an updated version of <rpcproxy.h>
15#endif
16
17#include "scardssp.h"
18
19#define TYPE_FORMAT_STRING_SIZE 1313
20#define PROC_FORMAT_STRING_SIZE 3859
21#define TRANSMIT_AS_TABLE_SIZE 0
22#define WIRE_MARSHAL_TABLE_SIZE 3
23
24typedef struct _MIDL_TYPE_FORMAT_STRING {
25 short Pad;
26 unsigned char Format[TYPE_FORMAT_STRING_SIZE];
27} MIDL_TYPE_FORMAT_STRING;
28
29typedef struct _MIDL_PROC_FORMAT_STRING {
30 short Pad;
31 unsigned char Format[PROC_FORMAT_STRING_SIZE];
32} MIDL_PROC_FORMAT_STRING;
33
34extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
35extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
36
37static const MIDL_STUB_DESC Object_StubDesc;
38static const MIDL_SERVER_INFO IByteBuffer_ServerInfo;
39
40#pragma code_seg(".orpc")
41static const unsigned short IByteBuffer_FormatStringOffsetTable[] = {
42 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,0,36,72,108,144,198,240,288,336,366,414,450,492,540
43};
44
45static const MIDL_SERVER_INFO IByteBuffer_ServerInfo = {
46 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&IByteBuffer_FormatStringOffsetTable[-3],0,0,0,0
47};
48
49static const MIDL_STUBLESS_PROXY_INFO IByteBuffer_ProxyInfo = {
50 &Object_StubDesc,__MIDL_ProcFormatString.Format,&IByteBuffer_FormatStringOffsetTable[-3],0,0,0
51};
52
53CINTERFACE_PROXY_VTABLE(21) _IByteBufferProxyVtbl = {
54 &IByteBuffer_ProxyInfo,&IID_IByteBuffer,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
55};
56
57static const PRPC_STUB_FUNCTION IByteBuffer_table[] = {
58 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
59};
60
61CInterfaceStubVtbl _IByteBufferStubVtbl = {
62 &IID_IByteBuffer,&IByteBuffer_ServerInfo,21,&IByteBuffer_table[-3],CStdStubBuffer_DELEGATING_METHODS
63};
64
65static const MIDL_SERVER_INFO ISCardTypeConv_ServerInfo;
66
67#pragma code_seg(".orpc")
68static const unsigned short ISCardTypeConv_FormatStringOffsetTable[] = {
69 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,588,636,678,720,762,804,846,888,930,972
70};
71
72static const MIDL_SERVER_INFO ISCardTypeConv_ServerInfo = {
73 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardTypeConv_FormatStringOffsetTable[-3],0,0,0,0
74};
75
76static const MIDL_STUBLESS_PROXY_INFO ISCardTypeConv_ProxyInfo = {
77 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardTypeConv_FormatStringOffsetTable[-3],0,0,0
78};
79
80CINTERFACE_PROXY_VTABLE(17) _ISCardTypeConvProxyVtbl = {
81 &ISCardTypeConv_ProxyInfo,&IID_ISCardTypeConv,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
82};
83
84static const PRPC_STUB_FUNCTION ISCardTypeConv_table[] = {
85 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
86};
87
88CInterfaceStubVtbl _ISCardTypeConvStubVtbl = {
89 &IID_ISCardTypeConv,&ISCardTypeConv_ServerInfo,17,&ISCardTypeConv_table[-3],CStdStubBuffer_DELEGATING_METHODS
90};
91
92static const MIDL_STUB_DESC Object_StubDesc;
93static const MIDL_SERVER_INFO ISCardCmd_ServerInfo;
94
95#pragma code_seg(".orpc")
96static const unsigned short ISCardCmd_FormatStringOffsetTable[] = {
97 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,1014,1050,1086,1122,1158,1194,1230,1266,1302,1338,1374,1410,1446,1482,1518,1554,1590,1626,1662,1698,1734,1770,1806,1842,1878,1914,1950,1986,2022,2088,2118,2160,2196
98};
99
100static const MIDL_SERVER_INFO ISCardCmd_ServerInfo = {
101 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardCmd_FormatStringOffsetTable[-3],0,0,0,0
102};
103
104static const MIDL_STUBLESS_PROXY_INFO ISCardCmd_ProxyInfo = {
105 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardCmd_FormatStringOffsetTable[-3],0,0,0
106};
107
108CINTERFACE_PROXY_VTABLE(40) _ISCardCmdProxyVtbl = {
109 &ISCardCmd_ProxyInfo,&IID_ISCardCmd,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
110};
111
112static const PRPC_STUB_FUNCTION ISCardCmd_table[] = {
113 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
114};
115
116CInterfaceStubVtbl _ISCardCmdStubVtbl = {
117 &IID_ISCardCmd,&ISCardCmd_ServerInfo,40,&ISCardCmd_table[-3],CStdStubBuffer_DELEGATING_METHODS
118};
119
120static const MIDL_STUB_DESC Object_StubDesc;
121static const MIDL_SERVER_INFO ISCardISO7816_ServerInfo;
122
123#pragma code_seg(".orpc")
124static const unsigned short ISCardISO7816_FormatStringOffsetTable[] = {
125 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,2232,2280,2334,2388,2430,2484,2538,2598,2646,2700,2754,2808,1446,2868,2922,2976,3024,3078
126};
127
128static const MIDL_SERVER_INFO ISCardISO7816_ServerInfo = {
129 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardISO7816_FormatStringOffsetTable[-3],0,0,0,0
130};
131
132static const MIDL_STUBLESS_PROXY_INFO ISCardISO7816_ProxyInfo = {
133 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardISO7816_FormatStringOffsetTable[-3],0,0,0
134};
135
136CINTERFACE_PROXY_VTABLE(25) _ISCardISO7816ProxyVtbl = {
137 &ISCardISO7816_ProxyInfo,&IID_ISCardISO7816,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
138};
139
140static const PRPC_STUB_FUNCTION ISCardISO7816_table[] = {
141 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
142};
143
144CInterfaceStubVtbl _ISCardISO7816StubVtbl = {
145 &IID_ISCardISO7816,&ISCardISO7816_ServerInfo,25,&ISCardISO7816_table[-3],CStdStubBuffer_DELEGATING_METHODS
146};
147
148static const MIDL_STUB_DESC Object_StubDesc;
149static const MIDL_SERVER_INFO ISCard_ServerInfo;
150
151#pragma code_seg(".orpc")
152static const unsigned short ISCard_FormatStringOffsetTable[] = {
153 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,1014,3132,1086,3168,3204,3240,3276,3324,336,3360,3402,3438
154};
155
156static const MIDL_SERVER_INFO ISCard_ServerInfo = {
157 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCard_FormatStringOffsetTable[-3],0,0,0,0
158};
159
160static const MIDL_STUBLESS_PROXY_INFO ISCard_ProxyInfo = {
161 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCard_FormatStringOffsetTable[-3],0,0,0
162};
163
164CINTERFACE_PROXY_VTABLE(19) _ISCardProxyVtbl = {
165 &ISCard_ProxyInfo,&IID_ISCard,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
166};
167
168static const PRPC_STUB_FUNCTION ISCard_table[] = {
169 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
170};
171
172CInterfaceStubVtbl _ISCardStubVtbl = {
173 &IID_ISCard,&ISCard_ServerInfo,19,&ISCard_table[-3],CStdStubBuffer_DELEGATING_METHODS
174};
175
176static const MIDL_STUB_DESC Object_StubDesc;
177static const MIDL_SERVER_INFO ISCardDatabase_ServerInfo;
178
179#pragma code_seg(".orpc")
180static const unsigned short ISCardDatabase_FormatStringOffsetTable[] = {
181 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,3474,3516,3558,3612,3654
182};
183
184static const MIDL_SERVER_INFO ISCardDatabase_ServerInfo = {
185 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardDatabase_FormatStringOffsetTable[-3],0,0,0,0
186};
187
188static const MIDL_STUBLESS_PROXY_INFO ISCardDatabase_ProxyInfo = {
189 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardDatabase_FormatStringOffsetTable[-3],0,0,0
190};
191
192CINTERFACE_PROXY_VTABLE(12) _ISCardDatabaseProxyVtbl = {
193 &ISCardDatabase_ProxyInfo,&IID_ISCardDatabase,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1
194};
195
196static const PRPC_STUB_FUNCTION ISCardDatabase_table[] = {
197 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2
198};
199
200CInterfaceStubVtbl _ISCardDatabaseStubVtbl = {
201 &IID_ISCardDatabase,&ISCardDatabase_ServerInfo,12,&ISCardDatabase_table[-3],CStdStubBuffer_DELEGATING_METHODS
202};
203
204static const MIDL_STUB_DESC Object_StubDesc;
205static const MIDL_SERVER_INFO ISCardLocate_ServerInfo;
206
207#pragma code_seg(".orpc")
208static const unsigned short ISCardLocate_FormatStringOffsetTable[] = {
209 (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,3696,3750,3804
210};
211
212static const MIDL_SERVER_INFO ISCardLocate_ServerInfo = {
213 &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardLocate_FormatStringOffsetTable[-3],0,0,0,0
214};
215
216static const MIDL_STUBLESS_PROXY_INFO ISCardLocate_ProxyInfo = {
217 &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardLocate_FormatStringOffsetTable[-3],0,0,0
218};
219
220CINTERFACE_PROXY_VTABLE(10) _ISCardLocateProxyVtbl = {
221 &ISCardLocate_ProxyInfo,&IID_ISCardLocate,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1
222};
223
224static const PRPC_STUB_FUNCTION ISCardLocate_table[] = {
225 STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2
226};
227
228CInterfaceStubVtbl _ISCardLocateStubVtbl = {
229 &IID_ISCardLocate,&ISCardLocate_ServerInfo,10,&ISCardLocate_table[-3],CStdStubBuffer_DELEGATING_METHODS
230};
231
232static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[WIRE_MARSHAL_TABLE_SIZE];
233
234static const MIDL_STUB_DESC Object_StubDesc = {
235 0,NdrOleAllocate,NdrOleFree,0,0,0,0,0,__MIDL_TypeFormatString.Format,1,0x50002,0,0x5030117,0,UserMarshalRoutines,0,0x1,0,0,0
236};
237
238#pragma data_seg(".rdata")
239static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[WIRE_MARSHAL_TABLE_SIZE] = {
240 { HGLOBAL_UserSize,HGLOBAL_UserMarshal,HGLOBAL_UserUnmarshal,HGLOBAL_UserFree },
241 { LPSAFEARRAY_UserSize,LPSAFEARRAY_UserMarshal,LPSAFEARRAY_UserUnmarshal,LPSAFEARRAY_UserFree},
242 { BSTR_UserSize,BSTR_UserMarshal,BSTR_UserUnmarshal,BSTR_UserFree }
243};
244
245#if !defined(__RPC_WIN32__)
246#error Invalid build platform for this stub.
247#endif
248
249const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = {
250 0,{ 0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x2),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x18),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0x18),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x18),NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x10),NdrFcShort(0xd),NdrFcShort(0x8),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x148),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x8),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x14),NdrFcShort(0x15),NdrFcShort(0x15),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x158),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x8),0x44,0x1,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x70),NdrFcShort(0x4),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x10),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0x10),NdrFcShort(0x24),NdrFcShort(0x24),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x11a),NdrFcShort(0x4),NdrFcShort(0x3a),NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x13),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x8),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0x14),NdrFcShort(0x15),NdrFcShort(0x15),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x158),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x14),NdrFcShort(0xd),NdrFcShort(0x8),0x45,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x148),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x13),NdrFcShort(0xc),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x3),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x2013),NdrFcShort(0x8),NdrFcShort(0x48),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x13),NdrFcShort(0x8),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x15),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2012),NdrFcShort(0x8),NdrFcShort(0x4c2),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x13),NdrFcShort(0x8),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x10),NdrFcShort(0x5),NdrFcShort(0x8),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x148),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x3),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x2013),NdrFcShort(0x8),NdrFcShort(0x48),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x18),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x2112),NdrFcShort(0x8),NdrFcShort(0x2ce),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x13),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x15),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x16),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x17),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x18),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x19),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1a),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xe),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x6,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1b),NdrFcShort(0xc),NdrFcShort(0x6),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x6,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1c),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1d),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1e),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xe),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2010),NdrFcShort(0x4),NdrFcShort(0x4d6),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1f),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x20),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x21),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x22),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x23),NdrFcShort(0x20),NdrFcShort(0x1c),NdrFcShort(0x8),0x46,0x7,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x10),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x14),NdrFcShort(0x1c),NdrFcShort(0x148),NdrFcShort(0x18),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x1c),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x24),NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x8),0x44,0x1,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x70),NdrFcShort(0x4),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x25),NdrFcShort(0x10),NdrFcShort(0x6),NdrFcShort(0x8),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x8),0xd,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x26),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x27),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x14),NdrFcShort(0x5),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x8),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x47,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x8),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x1c),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x6,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x14),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x18),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x14),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0x1c),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x6,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x14),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x18),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x15),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x16),NdrFcShort(0x14),NdrFcShort(0x5),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x8),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x17),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x14),NdrFcShort(0x10),NdrFcShort(0x8),0x46,0x4,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x8),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x30),0x46,0x3,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x2012),NdrFcShort(0x8),NdrFcShort(0x502),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x7,NdrFcShort(0x12),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x47,0x5,0x8,0x7,NdrFcShort(0x12),NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x10),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x46,0x5,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x25),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0xc),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x46,0x5,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x25),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0xc),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0x38),0x44,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x2012),NdrFcShort(0x10),NdrFcShort(0x50a),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x0 }
251};
252
253const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = {
254 0,{ NdrFcShort(0x0),0x11,0x10,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xc),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x11,0x14,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xe126f8fe),NdrFcShort(0xa7af),NdrFcShort(0x11d0),0xb8,0x8a,0x0,0xc0,0x4f,0xd4,0x24,0xb9,0x11,0x8,0x8,0x5c,0x11,0x8,0x2,0x5c,0x11,0x0,NdrFcShort(0x2),0x15,0x3,NdrFcShort(0x14),0x8,0x8,0x8,0x8,0x8,0x5b,0x11,0x10,NdrFcShort(0xffffffd6),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x50),0x13,0x0,NdrFcShort(0x2),0x2a,0x88,NdrFcShort(0x8),NdrFcShort(0x3),NdrFcLong(0x48746457),NdrFcShort(0x8008),NdrFcLong(0x52746457),NdrFcShort(0xa),NdrFcLong(0x50746457),NdrFcShort(0x800b),NdrFcShort(0xffffffff),0x13,0x0,NdrFcShort(0xe),0x1b,0x0,NdrFcShort(0x1),0x9,0x0,NdrFcShort(0xfffc),NdrFcShort(0x1),0x1,0x5b,0x17,0x3,NdrFcShort(0x8),NdrFcShort(0xfffffff0),0x8,0x8,0x5c,0x5b,0xb4,0x83,NdrFcShort(0x0),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xffffffc0),0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x4),NdrFcShort(0x1),0x2,0x5b,0x1a,0x3,NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xa),0x4c,0x0,NdrFcShort(0xffffffe0),0x8,0x36,0x5c,0x5b,0x13,0x0,NdrFcShort(0xffffffe2),0x11,0x4,NdrFcShort(0x3f2),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x3d8),0x2a,0x49,NdrFcShort(0x18),NdrFcShort(0xa),NdrFcLong(0x8),NdrFcShort(0x70),NdrFcLong(0xd),NdrFcShort(0xa6),NdrFcLong(0x9),NdrFcShort(0xd8),NdrFcLong(0xc),NdrFcShort(0x2bc),NdrFcLong(0x24),NdrFcShort(0x2e6),NdrFcLong(0x800d),NdrFcShort(0x302),NdrFcLong(0x10),NdrFcShort(0x31c),NdrFcLong(0x2),NdrFcShort(0x336),NdrFcLong(0x3),NdrFcShort(0x350),NdrFcLong(0x14),NdrFcShort(0x36a),NdrFcShort(0xffffffff),0x1b,0x1,NdrFcShort(0x2),0x9,0x0,NdrFcShort(0xfffc),NdrFcShort(0x1),0x6,0x5b,0x17,0x3,NdrFcShort(0x8),NdrFcShort(0xfffffff0),0x8,0x8,0x5c,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffffdc),0x5b,0x8,0x5c,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x11,0x0,NdrFcShort(0xffffffd2),0x5b,0x8,0x8,0x5b,0x2f,0x5a,NdrFcLong(0x0),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x21,0x3,NdrFcShort(0x0),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcLong(0xffffffff),NdrFcShort(0x0),0x4c,0x0,NdrFcShort(0xffffffdc),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffdc),0x2f,0x5a,NdrFcLong(0x20400),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x21,0x3,NdrFcShort(0x0),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcLong(0xffffffff),NdrFcShort(0x0),0x4c,0x0,NdrFcShort(0xffffffdc),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffdc),0x2b,0x9,0x7,0x0,NdrFcShort(0xfff8),NdrFcShort(0x1),NdrFcShort(0x2),NdrFcShort(0x10),NdrFcShort(0x2b),NdrFcLong(0x3),NdrFcShort(0x8008),NdrFcLong(0x11),NdrFcShort(0x8001),NdrFcLong(0x2),NdrFcShort(0x8006),NdrFcLong(0x4),NdrFcShort(0x800a),NdrFcLong(0x5),NdrFcShort(0x800c),NdrFcLong(0xb),NdrFcShort(0x8006),NdrFcLong(0xa),NdrFcShort(0x8008),NdrFcLong(0x6),NdrFcShort(0xd6),NdrFcLong(0x7),NdrFcShort(0x800c),NdrFcLong(0x8),NdrFcShort(0xd0),NdrFcLong(0xd),NdrFcShort(0xffffff42),NdrFcLong(0x9),NdrFcShort(0xffffff74),NdrFcLong(0x2000),NdrFcShort(0xc2),NdrFcLong(0x24),NdrFcShort(0xc4),NdrFcLong(0x4024),NdrFcShort(0xbe),NdrFcLong(0x4011),NdrFcShort(0xee),NdrFcLong(0x4002),NdrFcShort(0xec),NdrFcLong(0x4003),NdrFcShort(0xea),NdrFcLong(0x4004),NdrFcShort(0xe8),NdrFcLong(0x4005),NdrFcShort(0xe6),NdrFcLong(0x400b),NdrFcShort(0xd4),NdrFcLong(0x400a),NdrFcShort(0xd2),NdrFcLong(0x4006),NdrFcShort(0xd8),NdrFcLong(0x4007),NdrFcShort(0xce),NdrFcLong(0x4008),NdrFcShort(0xd0),NdrFcLong(0x400d),NdrFcShort(0xce),NdrFcLong(0x4009),NdrFcShort(0xcc),NdrFcLong(0x6000),NdrFcShort(0xca),NdrFcLong(0x400c),NdrFcShort(0xd0),NdrFcLong(0x10),NdrFcShort(0x8002),NdrFcLong(0x12),NdrFcShort(0x8006),NdrFcLong(0x13),NdrFcShort(0x8008),NdrFcLong(0x16),NdrFcShort(0x8008),NdrFcLong(0x17),NdrFcShort(0x8008),NdrFcLong(0xe),NdrFcShort(0xb4),NdrFcLong(0x400e),NdrFcShort(0xba),NdrFcLong(0x4010),NdrFcShort(0xb8),NdrFcLong(0x4012),NdrFcShort(0x6e),NdrFcLong(0x4013),NdrFcShort(0x6c),NdrFcLong(0x4016),NdrFcShort(0x66),NdrFcLong(0x4017),NdrFcShort(0x60),NdrFcLong(0x0),NdrFcShort(0x0),NdrFcLong(0x1),NdrFcShort(0x0),NdrFcShort(0xffffffff),0x15,0x7,NdrFcShort(0x8),0xb,0x5b,0x13,0x0,NdrFcShort(0xfffffe38),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x1b6),0x13,0x0,NdrFcShort(0x20),0x2f,0x5a,NdrFcLong(0x2f),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x4),NdrFcShort(0x1),0x1,0x5b,0x1a,0x3,NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0xa),0x8,0x8,0x4c,0x0,NdrFcShort(0xffffffd6),0x36,0x5b,0x13,0x0,NdrFcShort(0xffffffe2),0x13,0x8,0x1,0x5c,0x13,0x8,0x6,0x5c,0x13,0x8,0x8,0x5c,0x13,0x8,0xa,0x5c,0x13,0x8,0xc,0x5c,0x13,0x0,NdrFcShort(0xffffffa2),0x13,0x10,NdrFcShort(0xffffffa4),0x13,0x10,NdrFcShort(0xfffffe18),0x13,0x10,NdrFcShort(0xfffffe4c),0x13,0x10,NdrFcShort(0x2),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x150),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x16),0x15,0x7,NdrFcShort(0x10),0x6,0x1,0x1,0x38,0x8,0x39,0xb,0x5b,0x13,0x0,NdrFcShort(0xfffffff2),0x13,0x8,0x2,0x5c,0x1a,0x7,NdrFcShort(0x20),NdrFcShort(0x0),NdrFcShort(0x0),0x8,0x8,0x6,0x6,0x6,0x6,0x4c,0x0,NdrFcShort(0xfffffe4a),0x5c,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffffd2),0x5b,0x8,0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffd2),0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffff42),0x5b,0x8,0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffd2),0x1d,0x0,NdrFcShort(0x8),0x2,0x5b,0x15,0x3,NdrFcShort(0x10),0x8,0x6,0x6,0x4c,0x0,NdrFcShort(0xfffffff1),0x5b,0x1a,0x3,NdrFcShort(0x18),NdrFcShort(0x0),NdrFcShort(0xa),0x8,0x36,0x4c,0x0,NdrFcShort(0xffffffe8),0x5c,0x5b,0x11,0x0,NdrFcShort(0xfffffd64),0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x1,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x1,NdrFcShort(0x2),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x6,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x8,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x7,NdrFcShort(0x8),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0xb,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x15,0x3,NdrFcShort(0x8),0x8,0x8,0x5c,0x5b,0x1b,0x3,NdrFcShort(0x8),0x7,0x0,NdrFcShort(0xffd8),NdrFcShort(0x1),0x4c,0x0,NdrFcShort(0xffffffec),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x28),NdrFcShort(0xffffffec),NdrFcShort(0x0),0x6,0x6,0x38,0x8,0x8,0x4c,0x0,NdrFcShort(0xfffffc1b),0x5b,0xb4,0x83,NdrFcShort(0x1),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffc08),0x12,0x10,NdrFcShort(0x2),0x12,0x0,NdrFcShort(0xffffffde),0xb4,0x83,NdrFcShort(0x1),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffff0),0x11,0x14,NdrFcShort(0xfffffe9a),0x11,0x4,NdrFcShort(0xfffffe06),0x11,0xc,0x8,0x5c,0x11,0xc,0x2,0x5c,0x11,0xc,0x6,0x5c,0x11,0xc,0xd,0x5c,0x11,0x14,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xd5778ae3),NdrFcShort(0x43de),NdrFcShort(0x11d0),0x91,0x71,0x0,0xaa,0x0,0xc1,0x80,0x68,0x11,0xc,0xe,0x5c,0x12,0x0,NdrFcShort(0xfffffc18),0xb4,0x83,NdrFcShort(0x2),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffff4),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0xfffffed4),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x2),0x15,0x3,NdrFcShort(0x20),0x8,0x8,0xe,0xe,0x8,0x8,0x8,0x8,0x5c,0x5b,0x0 }
255};
256
257const CInterfaceProxyVtbl *_scardssp_ProxyVtblList[] = {
258 (CInterfaceProxyVtbl *) &_ISCardTypeConvProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardISO7816ProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardDatabaseProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardLocateProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardCmdProxyVtbl,(CInterfaceProxyVtbl *) &_IByteBufferProxyVtbl,0
259};
260
261const CInterfaceStubVtbl *_scardssp_StubVtblList[] = {
262 (CInterfaceStubVtbl *) &_ISCardTypeConvStubVtbl,(CInterfaceStubVtbl *) &_ISCardISO7816StubVtbl,(CInterfaceStubVtbl *) &_ISCardStubVtbl,(CInterfaceStubVtbl *) &_ISCardDatabaseStubVtbl,(CInterfaceStubVtbl *) &_ISCardLocateStubVtbl,(CInterfaceStubVtbl *) &_ISCardCmdStubVtbl,(CInterfaceStubVtbl *) &_IByteBufferStubVtbl,0
263};
264
265PCInterfaceName const _scardssp_InterfaceNamesList[] = {
266 "ISCardTypeConv","ISCardISO7816","ISCard","ISCardDatabase","ISCardLocate","ISCardCmd","IByteBuffer",0
267};
268
269const IID *_scardssp_BaseIIDList[] = {
270 &IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,0
271};
272
273#define _scardssp_CHECK_IID(n) IID_GENERIC_CHECK_IID(_scardssp,pIID,n)
274
275int __stdcall _scardssp_IID_Lookup(const IID *pIID,int *pIndex) {
276 IID_BS_LOOKUP_SETUP
277 IID_BS_LOOKUP_INITIAL_TEST(_scardssp,7,4)
278 IID_BS_LOOKUP_NEXT_TEST(_scardssp,2)
279 IID_BS_LOOKUP_NEXT_TEST(_scardssp,1)
280 IID_BS_LOOKUP_RETURN_RESULT(_scardssp,7,*pIndex)
281}
282
283const ExtendedProxyFileInfo scardssp_ProxyFileInfo = {
284 (PCInterfaceProxyVtblList *) & _scardssp_ProxyVtblList,(PCInterfaceStubVtblList *) & _scardssp_StubVtblList,(const PCInterfaceName *) & _scardssp_InterfaceNamesList,(const IID **) & _scardssp_BaseIIDList,& _scardssp_IID_Lookup,7,2,0,0,0,0
285};
lib/libc/include/any-windows-any/semaphore.h+11-4
...@@ -23,15 +23,13 @@...@@ -23,15 +23,13 @@
23#ifndef WIN_PTHREADS_SEMAPHORE_H23#ifndef WIN_PTHREADS_SEMAPHORE_H
24#define WIN_PTHREADS_SEMAPHORE_H24#define WIN_PTHREADS_SEMAPHORE_H
2525
26#include <sys/timeb.h>
26#include "pthread_compat.h"27#include "pthread_compat.h"
2728
28#ifdef __cplusplus29#ifdef __cplusplus
29extern "C" {30extern "C" {
30#endif31#endif
3132
32/* Set this to 0 to disable it */
33#define USE_SEM_CriticalSection_SpinCount 100
34
35#define SEM_VALUE_MAX INT_MAX33#define SEM_VALUE_MAX INT_MAX
3634
37typedef void *sem_t;35typedef void *sem_t;
...@@ -46,7 +44,16 @@ WINPTHREAD_API int sem_trywait(sem_t *sem);...@@ -46,7 +44,16 @@ WINPTHREAD_API int sem_trywait(sem_t *sem);
4644
47WINPTHREAD_API int sem_wait(sem_t *sem);45WINPTHREAD_API int sem_wait(sem_t *sem);
4846
49WINPTHREAD_API int sem_timedwait(sem_t * sem, const struct timespec *t);47WINPTHREAD_API int sem_timedwait32(sem_t * sem, const struct _timespec32 *t);
48WINPTHREAD_API int sem_timedwait64(sem_t * sem, const struct _timespec64 *t);
49WINPTHREAD_SEM_DECL int sem_timedwait(sem_t * sem, const struct timespec *t)
50{
51#if WINPTHREADS_TIME_BITS == 32
52 return sem_timedwait32 (sem, (const struct _timespec32 *) t);
53#else
54 return sem_timedwait64 (sem, (const struct _timespec64 *) t);
55#endif
56}
5057
51WINPTHREAD_API int sem_post(sem_t *sem);58WINPTHREAD_API int sem_post(sem_t *sem);
5259
lib/libc/include/any-windows-any/sensorsapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/sensorsapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/sensorsapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/servprov.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/servprov.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/servprov.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/setjmp.h+12-12
...@@ -224,21 +224,21 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void);...@@ -224,21 +224,21 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void);
224#ifndef _INC_SETJMPEX224#ifndef _INC_SETJMPEX
225# if defined(_X86_) || defined(__i386__)225# if defined(_X86_) || defined(__i386__)
226# define setjmp(BUF) _setjmp3((BUF), NULL)226# define setjmp(BUF) _setjmp3((BUF), NULL)
227# elif ((defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) && (!defined(__SEH__) || !__has_builtin(__builtin_sponentry) || defined(__USE_MINGW_SETJMP_NON_SEH)))227# elif !defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH)
228# define setjmp(BUF) __mingw_setjmp((BUF))228# if defined(__arm__) || defined(__aarch64__)
229# define longjmp __mingw_longjmp229# define setjmp(BUF) __mingw_setjmp((BUF))
230 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf);230# define longjmp __mingw_longjmp
231 __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf,int _Value);231 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf);
232# elif defined(__SEH__) && !defined(__USE_MINGW_SETJMP_NON_SEH)232 __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf,int _Value);
233# if defined(__aarch64__) || defined(_ARM64_) || defined(__arm__) || defined(_ARM_)
234# define setjmp(BUF) _setjmp((BUF), __builtin_sponentry())
235# elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
236# define setjmp(BUF) _setjmp((BUF), mingw_getsp())
237# else233# else
238# define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0))234# define setjmp(BUF) _setjmp((BUF), NULL)
239# endif235# endif
236# elif __has_builtin(__builtin_sponentry)
237# define setjmp(BUF) _setjmp((BUF), __builtin_sponentry())
238# elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
239# define setjmp(BUF) _setjmp((BUF), mingw_getsp())
240# else240# else
241# define setjmp(BUF) _setjmp((BUF), NULL)241# define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0))
242# endif242# endif
243 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Ctx);243 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Ctx);
244 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, void *_Ctx);244 int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, void *_Ctx);
lib/libc/include/any-windows-any/shldisp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/shldisp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/shldisp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/shlobj.h+4-4
...@@ -33,7 +33,7 @@...@@ -33,7 +33,7 @@
3333
34typedef enum {34typedef enum {
35 SHGFP_TYPE_CURRENT = 0,35 SHGFP_TYPE_CURRENT = 0,
36 SHGFP_TYPE_DEFAULT = 1,36 SHGFP_TYPE_DEFAULT = 1
37} SHGFP_TYPE;37} SHGFP_TYPE;
3838
39 SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath);39 SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath);
...@@ -1108,7 +1108,7 @@ extern "C" {...@@ -1108,7 +1108,7 @@ extern "C" {
1108 STDMETHOD(GetBandInfoSFB) (THIS_ PBANDINFOSFB pbi) PURE;1108 STDMETHOD(GetBandInfoSFB) (THIS_ PBANDINFOSFB pbi) PURE;
1109 };1109 };
1110 enum {1110 enum {
1111 SFBID_PIDLCHANGED,1111 SFBID_PIDLCHANGED
1112 };1112 };
11131113
1114#undef INTERFACE1114#undef INTERFACE
...@@ -1550,7 +1550,7 @@ extern "C" {...@@ -1550,7 +1550,7 @@ extern "C" {
1550 DROPIMAGE_LINK = DROPEFFECT_LINK,1550 DROPIMAGE_LINK = DROPEFFECT_LINK,
1551 DROPIMAGE_LABEL = 6,1551 DROPIMAGE_LABEL = 6,
1552 DROPIMAGE_WARNING = 7,1552 DROPIMAGE_WARNING = 7,
1553 DROPIMAGE_NOIMAGE = 8,1553 DROPIMAGE_NOIMAGE = 8
1554 } DROPIMAGETYPE;1554 } DROPIMAGETYPE;
15551555
1556 typedef struct {1556 typedef struct {
...@@ -2747,7 +2747,7 @@ DECLARE_INTERFACE_IID_ (INamedPropertyBag, IUnknown, "FB700430-952C-11d1-946F-00...@@ -2747,7 +2747,7 @@ DECLARE_INTERFACE_IID_ (INamedPropertyBag, IUnknown, "FB700430-952C-11d1-946F-00
2747 IESHORTCUT_NEWBROWSER = 0x01,2747 IESHORTCUT_NEWBROWSER = 0x01,
2748 IESHORTCUT_OPENNEWTAB = 0x02,2748 IESHORTCUT_OPENNEWTAB = 0x02,
2749 IESHORTCUT_FORCENAVIGATE = 0x04,2749 IESHORTCUT_FORCENAVIGATE = 0x04,
2750 IESHORTCUT_BACKGROUNDTAB = 0x08,2750 IESHORTCUT_BACKGROUNDTAB = 0x08
2751 } IESHORTCUTFLAGS;2751 } IESHORTCUTFLAGS;
2752#endif2752#endif
27532753
lib/libc/include/any-windows-any/shobjidl.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/shobjidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/shobjidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/shtypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/shtypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/shtypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/spatialaudioclient.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/spatialaudioclient.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/spatialaudioclient.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/spellcheck.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/spellcheck.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/spellcheck.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/sql.h+1-1
...@@ -7,7 +7,7 @@...@@ -7,7 +7,7 @@
7#define __SQL7#define __SQL
88
9#ifndef ODBCVER9#ifndef ODBCVER
10#define ODBCVER 0x035110#define ODBCVER 0x0380
11#endif11#endif
1212
13#include <sqltypes.h>13#include <sqltypes.h>
lib/libc/include/any-windows-any/sqlext.h+75-2
...@@ -13,10 +13,12 @@ extern "C" {...@@ -13,10 +13,12 @@ extern "C" {
13#endif13#endif
1414
15#define SQL_SPEC_MAJOR 315#define SQL_SPEC_MAJOR 3
16#define SQL_SPEC_MINOR 5216#define SQL_SPEC_MINOR 80
17#define SQL_SPEC_STRING "03.52"17#define SQL_SPEC_STRING "03.80"
1818
19#define SQL_SQLSTATE_SIZE 519#define SQL_SQLSTATE_SIZE 5
20typedef SQLTCHAR SQLSTATE[SQL_SQLSTATE_SIZE + 1];
21
20#define SQL_MAX_DSN_LENGTH 3222#define SQL_MAX_DSN_LENGTH 32
2123
22#define SQL_MAX_OPTION_STRING_LENGTH 25624#define SQL_MAX_OPTION_STRING_LENGTH 256
...@@ -35,6 +37,7 @@ extern "C" {...@@ -35,6 +37,7 @@ extern "C" {
35#define SQL_ATTR_ODBC_VERSION 20037#define SQL_ATTR_ODBC_VERSION 200
36#define SQL_ATTR_CONNECTION_POOLING 20138#define SQL_ATTR_CONNECTION_POOLING 201
37#define SQL_ATTR_CP_MATCH 20239#define SQL_ATTR_CP_MATCH 202
40#define SQL_ATTR_APPLICATION_KEY 203
38#endif41#endif
3942
40#if (ODBCVER >= 0x0300)43#if (ODBCVER >= 0x0300)
...@@ -42,6 +45,7 @@ extern "C" {...@@ -42,6 +45,7 @@ extern "C" {
42#define SQL_CP_OFF __MSABI_LONG(0U)45#define SQL_CP_OFF __MSABI_LONG(0U)
43#define SQL_CP_ONE_PER_DRIVER __MSABI_LONG(1U)46#define SQL_CP_ONE_PER_DRIVER __MSABI_LONG(1U)
44#define SQL_CP_ONE_PER_HENV __MSABI_LONG(2U)47#define SQL_CP_ONE_PER_HENV __MSABI_LONG(2U)
48#define SQL_CP_DRIVER_AWARE __MSABI_LONG(3U)
45#define SQL_CP_DEFAULT SQL_CP_OFF49#define SQL_CP_DEFAULT SQL_CP_OFF
4650
47#define SQL_CP_STRICT_MATCH __MSABI_LONG(0U)51#define SQL_CP_STRICT_MATCH __MSABI_LONG(0U)
...@@ -52,6 +56,10 @@ extern "C" {...@@ -52,6 +56,10 @@ extern "C" {
52#define SQL_OV_ODBC3 __MSABI_LONG(3U)56#define SQL_OV_ODBC3 __MSABI_LONG(3U)
53#endif57#endif
5458
59#if (ODBCVER >= 0x0380)
60#define SQL_OV_ODBC3_80 __MSABI_LONG(380U)
61#endif
62
55#define SQL_ACCESS_MODE 10163#define SQL_ACCESS_MODE 101
56#define SQL_AUTOCOMMIT 10264#define SQL_AUTOCOMMIT 102
57#define SQL_LOGIN_TIMEOUT 10365#define SQL_LOGIN_TIMEOUT 103
...@@ -91,6 +99,15 @@ extern "C" {...@@ -91,6 +99,15 @@ extern "C" {
91#define SQL_ATTR_ANSI_APP 11599#define SQL_ATTR_ANSI_APP 115
92#endif100#endif
93101
102#if (ODBCVER >= 0x0380)
103#define SQL_ATTR_RESET_CONNECTION 116
104#define SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE 117
105#endif
106
107#if (ODBCVER >= 0x0380)
108#define SQL_ATTR_ASYNC_DBC_EVENT 119
109#endif
110
94#if (ODBCVER < 0x0300)111#if (ODBCVER < 0x0300)
95#define SQL_CONNECT_OPT_DRVR_START 1000112#define SQL_CONNECT_OPT_DRVR_START 1000
96#endif113#endif
...@@ -136,6 +153,16 @@ extern "C" {...@@ -136,6 +153,16 @@ extern "C" {
136#define SQL_AA_FALSE __MSABI_LONG(0)153#define SQL_AA_FALSE __MSABI_LONG(0)
137#endif154#endif
138155
156#if (ODBCVER >= 0x0380)
157#define SQL_RESET_CONNECTION_YES __MSABI_LONG(1U)
158#endif
159
160#if (ODBCVER >= 0x0380)
161#define SQL_ASYNC_DBC_ENABLE_ON __MSABI_LONG(1U)
162#define SQL_ASYNC_DBC_ENABLE_OFF __MSABI_LONG(0U)
163#define SQL_ASYNC_DBC_ENABLE_DEFAULT SQL_ASYNC_DBC_ENABLE_OFF
164#endif
165
139#define SQL_QUERY_TIMEOUT 0166#define SQL_QUERY_TIMEOUT 0
140#define SQL_MAX_ROWS 1167#define SQL_MAX_ROWS 1
141#define SQL_NOSCAN 2168#define SQL_NOSCAN 2
...@@ -181,6 +208,10 @@ extern "C" {...@@ -181,6 +208,10 @@ extern "C" {
181#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS208#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
182#endif209#endif
183210
211#if (ODBCVER >= 0x0380)
212#define SQL_ATTR_ASYNC_STMT_EVENT 29
213#endif
214
184#if (ODBCVER < 0x0300)215#if (ODBCVER < 0x0300)
185#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER216#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER
186#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT217#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
...@@ -439,6 +470,19 @@ extern "C" {...@@ -439,6 +470,19 @@ extern "C" {
439#define SQL_TYPE_MAX SQL_VARCHAR470#define SQL_TYPE_MAX SQL_VARCHAR
440#endif471#endif
441472
473#if (ODBCVER >= 0x380)
474#define SQL_DRIVER_C_TYPE_BASE 0x4000
475#endif
476
477#if (ODBCVER >= 0x380)
478#define SQL_DRIVER_SQL_TYPE_BASE 0x4000
479#define SQL_DRIVER_DESC_FIELD_BASE 0x4000
480#define SQL_DRIVER_DIAG_FIELD_BASE 0x4000
481#define SQL_DRIVER_INFO_TYPE_BASE 0x4000
482#define SQL_DRIVER_CONN_ATTR_BASE 0x00004000
483#define SQL_DRIVER_STMT_ATTR_BASE 0x00004000
484#endif
485
442#if (ODBCVER >= 0x0300)486#if (ODBCVER >= 0x0300)
443#define SQL_C_VARBOOKMARK SQL_C_BINARY487#define SQL_C_VARBOOKMARK SQL_C_BINARY
444#endif488#endif
...@@ -513,6 +557,7 @@ extern "C" {...@@ -513,6 +557,7 @@ extern "C" {
513#define SQL_API_SQLDESCRIBEPARAM 58557#define SQL_API_SQLDESCRIBEPARAM 58
514#define SQL_API_SQLDRIVERCONNECT 41558#define SQL_API_SQLDRIVERCONNECT 41
515#define SQL_API_SQLDRIVERS 71559#define SQL_API_SQLDRIVERS 71
560#define SQL_API_SQLPRIVATEDRIVERS 79
516#define SQL_API_SQLEXTENDEDFETCH 59561#define SQL_API_SQLEXTENDEDFETCH 59
517#define SQL_API_SQLFOREIGNKEYS 60562#define SQL_API_SQLFOREIGNKEYS 60
518#define SQL_API_SQLMORERESULTS 61563#define SQL_API_SQLMORERESULTS 61
...@@ -705,8 +750,21 @@ extern "C" {...@@ -705,8 +750,21 @@ extern "C" {
705#define SQL_INSERT_STATEMENT 172750#define SQL_INSERT_STATEMENT 172
706#define SQL_CONVERT_GUID 173751#define SQL_CONVERT_GUID 173
707#define SQL_UNION_STATEMENT SQL_UNION752#define SQL_UNION_STATEMENT SQL_UNION
753
754#if (ODBCVER >= 0x0380)
755#define SQL_ASYNC_DBC_FUNCTIONS 10023
756#endif
757
758#define SQL_DRIVER_AWARE_POOLING_SUPPORTED 10024
759
760#if (ODBCVER >= 0x0380)
761#define SQL_ASYNC_NOTIFICATION 10025
762#define SQL_ASYNC_NOTIFICATION_NOT_CAPABLE __MSABI_LONG(0x00000000)
763#define SQL_ASYNC_NOTIFICATION_CAPABLE __MSABI_LONG(0x00000001)
708#endif764#endif
709765
766#endif /* ODBCVER >= 0x0300 */
767
710#define SQL_DTC_TRANSITION_COST 1750768#define SQL_DTC_TRANSITION_COST 1750
711769
712#if (ODBCVER >= 0x0300)770#if (ODBCVER >= 0x0300)
...@@ -968,6 +1026,9 @@ extern "C" {...@@ -968,6 +1026,9 @@ extern "C" {
9681026
969#define SQL_GD_BLOCK __MSABI_LONG(0x00000004)1027#define SQL_GD_BLOCK __MSABI_LONG(0x00000004)
970#define SQL_GD_BOUND __MSABI_LONG(0x00000008)1028#define SQL_GD_BOUND __MSABI_LONG(0x00000008)
1029#if (ODBCVER >= 0x0380)
1030#define SQL_GD_OUTPUT_PARAMS __MSABI_LONG(0x00000010)
1031#endif
9711032
972#define SQL_PS_POSITIONED_DELETE __MSABI_LONG(0x00000001)1033#define SQL_PS_POSITIONED_DELETE __MSABI_LONG(0x00000001)
973#define SQL_PS_POSITIONED_UPDATE __MSABI_LONG(0x00000002)1034#define SQL_PS_POSITIONED_UPDATE __MSABI_LONG(0x00000002)
...@@ -1302,11 +1363,19 @@ extern "C" {...@@ -1302,11 +1363,19 @@ extern "C" {
13021363
1303#define SQL_US_UNION SQL_U_UNION1364#define SQL_US_UNION SQL_U_UNION
1304#define SQL_US_UNION_ALL SQL_U_UNION_ALL1365#define SQL_US_UNION_ALL SQL_U_UNION_ALL
1366
1367#define SQL_DRIVER_AWARE_POOLING_NOT_CAPABLE __MSABI_LONG(0x00000000)
1368#define SQL_DRIVER_AWARE_POOLING_CAPABLE __MSABI_LONG(0x00000001)
1305#endif1369#endif
13061370
1307#define SQL_DTC_ENLIST_EXPENSIVE __MSABI_LONG(0x00000001)1371#define SQL_DTC_ENLIST_EXPENSIVE __MSABI_LONG(0x00000001)
1308#define SQL_DTC_UNENLIST_EXPENSIVE __MSABI_LONG(0x00000002)1372#define SQL_DTC_UNENLIST_EXPENSIVE __MSABI_LONG(0x00000002)
13091373
1374#if (ODBCVER >= 0x0380)
1375#define SQL_ASYNC_DBC_NOT_CAPABLE __MSABI_LONG(0x00000000)
1376#define SQL_ASYNC_DBC_CAPABLE __MSABI_LONG(0x00000001)
1377#endif
1378
1310#if (ODBCVER >= 0x0300)1379#if (ODBCVER >= 0x0300)
1311#define SQL_FETCH_FIRST_USER 311380#define SQL_FETCH_FIRST_USER 31
1312#define SQL_FETCH_FIRST_SYSTEM 321381#define SQL_FETCH_FIRST_SYSTEM 32
...@@ -1412,6 +1481,10 @@ extern "C" {...@@ -1412,6 +1481,10 @@ extern "C" {
1412#define SQL_RESULT_COL 31481#define SQL_RESULT_COL 3
1413#define SQL_PARAM_OUTPUT 41482#define SQL_PARAM_OUTPUT 4
1414#define SQL_RETURN_VALUE 51483#define SQL_RETURN_VALUE 5
1484#if (ODBCVER >= 0x0380)
1485#define SQL_PARAM_INPUT_OUTPUT_STREAM 8
1486#define SQL_PARAM_OUTPUT_STREAM 16
1487#endif
14151488
1416#define SQL_PT_UNKNOWN 01489#define SQL_PT_UNKNOWN 0
1417#define SQL_PT_PROCEDURE 11490#define SQL_PT_PROCEDURE 1
lib/libc/include/any-windows-any/sqltypes.h+1-1
...@@ -7,7 +7,7 @@...@@ -7,7 +7,7 @@
7#define __SQLTYPES7#define __SQLTYPES
88
9#ifndef ODBCVER9#ifndef ODBCVER
10#define ODBCVER 0x035110#define ODBCVER 0x0380
11#endif11#endif
1212
13#ifdef __cplusplus13#ifdef __cplusplus
lib/libc/include/any-windows-any/stdio.h+94-168
...@@ -206,32 +206,62 @@ extern...@@ -206,32 +206,62 @@ extern
206206
207extern207extern
208 __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)208 __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)
209 int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...);209 int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...)
210 __MINGW_UCRT_ASM_CALL(sscanf);
211extern
212 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
213 int __cdecl __ms_vsscanf(const char * __restrict__ _Str,const char * __restrict__ _Format,va_list argp)
214 __MINGW_ASM_CALL(vsscanf);
210extern215extern
211 __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1)216 __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1)
212 int __cdecl __ms_scanf(const char * __restrict__ _Format,...);217 int __cdecl __ms_scanf(const char * __restrict__ _Format,...)
218 __MINGW_UCRT_ASM_CALL(scanf);
219extern
220 __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)
221 int __cdecl __ms_vscanf(const char * __restrict__ _Format,va_list argp)
222 __MINGW_ASM_CALL(vscanf);
213extern223extern
214 __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)224 __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2)
215 int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...);225 int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...)
226 __MINGW_UCRT_ASM_CALL(fscanf);
227extern
228 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
229 int __cdecl __ms_vfscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,va_list argp)
230 __MINGW_ASM_CALL(vfscanf);
216231
217extern232extern
218 __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1)233 __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1)
219 int __cdecl __ms_printf(const char * __restrict__ , ... ) __MINGW_NOTHROW;234 int __cdecl __ms_printf(const char * __restrict__ , ... )
235 __MINGW_UCRT_ASM_CALL(printf) __MINGW_NOTHROW;
220extern236extern
221 __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1)237 __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1)
222 int __cdecl __ms_vprintf (const char * __restrict__ , va_list) __MINGW_NOTHROW;238 int __cdecl __ms_vprintf (const char * __restrict__ , va_list)
239 __MINGW_UCRT_ASM_CALL(vprintf) __MINGW_NOTHROW;
223extern240extern
224 __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2)241 __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2)
225 int __cdecl __ms_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW;242 int __cdecl __ms_fprintf (FILE * __restrict__ , const char * __restrict__ , ...)
243 __MINGW_UCRT_ASM_CALL(fprintf) __MINGW_NOTHROW;
226extern244extern
227 __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2)245 __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2)
228 int __cdecl __ms_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW;246 int __cdecl __ms_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list)
247 __MINGW_UCRT_ASM_CALL(vfprintf) __MINGW_NOTHROW
248;
229extern249extern
230 __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2)250 __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2)
231 int __cdecl __ms_sprintf (char * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW;251 int __cdecl __ms_sprintf (char * __restrict__ , const char * __restrict__ , ...)
252 __MINGW_UCRT_ASM_CALL(sprintf) __MINGW_NOTHROW;
232extern253extern
233 __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2)254 __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2)
234 int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW;255 int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , va_list)
256 __MINGW_UCRT_ASM_CALL(vsprintf) __MINGW_NOTHROW;
257extern
258 __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3)
259 int __cdecl __ms_snprintf (char * __restrict__ , size_t , const char * __restrict__ , ...)
260 __MINGW_UCRT_ASM_CALL(snprintf) __MINGW_NOTHROW;
261extern
262 __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
263 int __cdecl __ms_vsnprintf (char * __restrict__ , size_t , const char * __restrict__ , va_list)
264 __MINGW_UCRT_ASM_CALL(vsnprintf) __MINGW_NOTHROW;
235265
236#ifdef _UCRT266#ifdef _UCRT
237 int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, _locale_t locale, va_list valist);267 int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, _locale_t locale, va_list valist);
...@@ -487,24 +517,12 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li...@@ -487,24 +517,12 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li
487#pragma GCC diagnostic ignored "-Wshadow"517#pragma GCC diagnostic ignored "-Wshadow"
488#endif518#endif
489519
490 __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)
491 int __cdecl __ms_vscanf(const char * __restrict__ Format, va_list argp);
492 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
493 int __cdecl __ms_vfscanf (FILE * __restrict__ fp, const char * __restrict__ Format,va_list argp);
494 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)520 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
495 int __cdecl __ms_vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp);521 int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv);
496
497 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
498 int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv)
499 __MINGW_ASM_CALL(__ms_vfscanf);
500
501 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)522 __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2)
502 int vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv)523 int vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv);
503 __MINGW_ASM_CALL(__ms_vsscanf);
504
505 __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)524 __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1)
506 int vscanf(const char *__format, __builtin_va_list __local_argv)525 int vscanf(const char *__format, __builtin_va_list __local_argv);
507 __MINGW_ASM_CALL(__ms_vscanf);
508526
509#ifdef __GNUC__527#ifdef __GNUC__
510#pragma GCC diagnostic pop528#pragma GCC diagnostic pop
...@@ -794,10 +812,6 @@ char * tmpnam(char * __dst)...@@ -794,10 +812,6 @@ char * tmpnam(char * __dst)
794#pragma GCC diagnostic ignored "-Wshadow"812#pragma GCC diagnostic ignored "-Wshadow"
795#endif813#endif
796814
797 __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
798 int __cdecl __ms_vsnprintf(char * __restrict__ d,size_t n,const char * __restrict__ format,va_list arg)
799 __MINGW_ATTRIB_DEPRECATED_MSVC2005 __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
800
801 __mingw_bos_ovr815 __mingw_bos_ovr
802 __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)816 __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3)
803 int vsnprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, va_list __local_argv)817 int vsnprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, va_list __local_argv)
...@@ -810,9 +824,6 @@ char * tmpnam(char * __dst)...@@ -810,9 +824,6 @@ char * tmpnam(char * __dst)
810 return __ms_vsnprintf (__stream, __n, __format, __local_argv);824 return __ms_vsnprintf (__stream, __n, __format, __local_argv);
811 }825 }
812826
813 __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3)
814 int __cdecl __ms_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...);
815
816#ifndef __NO_ISOCEXT827#ifndef __NO_ISOCEXT
817#if __MINGW_FORTIFY_VA_ARG828#if __MINGW_FORTIFY_VA_ARG
818829
...@@ -928,24 +939,49 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,...@@ -928,24 +939,49 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,
928 int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);939 int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);
929940
930/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)941/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
931 int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);942 int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...)
943 __MINGW_UCRT_ASM_CALL(swscanf);
944/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
945 int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,va_list)
946 __MINGW_ASM_CALL(vswscanf);
932/* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)947/* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
933 int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...);948 int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...)
949 __MINGW_UCRT_ASM_CALL(wscanf);
950/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
951 int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list)
952 __MINGW_ASM_CALL(vwscanf);
934/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)953/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
935 int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);954 int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...)
955 __MINGW_UCRT_ASM_CALL(fwscanf);
956/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
957 int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list)
958 __MINGW_ASM_CALL(vfwscanf);
936959
937/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)960/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
938 int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);961 int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
962 /* No __MINGW_UCRT_ASM_CALL for __ms_fwprintf; this is provided as an
963 * actual function in the ucrt import libraries. */
939/* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)964/* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
940 int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...);965 int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...)
966 __MINGW_UCRT_ASM_CALL(wprintf);
941/* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2)967/* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2)
942 int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);968 int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList)
969 __MINGW_UCRT_ASM_CALL(vfwprintf);
943/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)970/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
944 int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);971 int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList)
972 __MINGW_UCRT_ASM_CALL(vwprintf);
973/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
974 int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...)
975 __MINGW_UCRT_ASM_CALL(swprintf);
976/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
977 int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list)
978 __MINGW_UCRT_ASM_CALL(vswprintf);
945/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)979/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
946 int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);980 int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...)
981 __MINGW_UCRT_ASM_CALL(snwprintf);
947/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)982/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
948 int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);983 int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list)
984 __MINGW_UCRT_ASM_CALL(vsnwprintf);
949985
950#ifdef _UCRT986#ifdef _UCRT
951 int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);987 int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);
...@@ -1062,98 +1098,38 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti...@@ -1062,98 +1098,38 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
1062#else /* !__USE_MINGW_ANSI_STDIO */1098#else /* !__USE_MINGW_ANSI_STDIO */
10631099
1064#ifdef _UCRT1100#ifdef _UCRT
1065 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN1101 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
1066 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...)1102 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
1067 {1103 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
1068 __builtin_va_list __ap;1104 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);
1069 int __ret;1105 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
1070 __builtin_va_start(__ap, _Format);1106 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...);
1071 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap);
1072 __builtin_va_end(__ap);
1073 return __ret;
1074 }
1075 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN
1076 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...)
1077 {
1078 __builtin_va_list __ap;
1079 int __ret;
1080 __builtin_va_start(__ap, _Format);
1081 __ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap);
1082 __builtin_va_end(__ap);
1083 return __ret;
1084 }
1085 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN
1086 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...)
1087 {
1088 __builtin_va_list __ap;
1089 int __ret;
1090 __builtin_va_start(__ap, _Format);
1091 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap);
1092 __builtin_va_end(__ap);
1093 return __ret;
1094 }
1095 __mingw_ovr
1096 __MINGW_ATTRIB_NONNULL(2)1107 __MINGW_ATTRIB_NONNULL(2)
1097 int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv)1108 int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv);
1098 {
1099 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv);
1100 }
11011109
1102 __mingw_ovr
1103 __MINGW_ATTRIB_NONNULL(2)1110 __MINGW_ATTRIB_NONNULL(2)
1104 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv)1111 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv);
1105 {
1106 return __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, (size_t)-1, __format, NULL, __local_argv);
1107 }
1108 __mingw_ovr
1109 __MINGW_ATTRIB_NONNULL(1)1112 __MINGW_ATTRIB_NONNULL(1)
1110 int vwscanf(const wchar_t *__format, va_list __local_argv)1113 int vwscanf(const wchar_t *__format, va_list __local_argv);
1111 {
1112 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv);
1113 }
11141114
1115 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);1115 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
1116 __mingw_ovr1116 int __cdecl wprintf(const wchar_t * __restrict__ _Format,...);
1117 int __cdecl wprintf(const wchar_t * __restrict__ _Format,...)1117 int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);
1118 {1118 int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);
1119 __builtin_va_list __ap;
1120 int __ret;
1121 __builtin_va_start(__ap, _Format);
1122 __ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, __ap);
1123 __builtin_va_end(__ap);
1124 return __ret;
1125 }
1126 __mingw_ovr
1127 int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList)
1128 {
1129 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList);
1130 }
1131 __mingw_ovr
1132 int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList)
1133 {
1134 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList);
1135 }
1136#else1119#else
11371120
1138 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;1121 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
1139 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;1122 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
1140 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;1123 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
1141#ifndef __NO_ISOCEXT /* externs in libmingwex.a */1124#ifndef __NO_ISOCEXT /* externs in libmingwex.a */
1142 int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list);
1143 int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list);
1144 int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list);
1145
1146 __MINGW_ATTRIB_NONNULL(2)1125 __MINGW_ATTRIB_NONNULL(2)
1147 int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv)1126 int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv);
1148 __MINGW_ASM_CALL(__ms_vfwscanf);
11491127
1150 __MINGW_ATTRIB_NONNULL(2)1128 __MINGW_ATTRIB_NONNULL(2)
1151 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv)1129 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv);
1152 __MINGW_ASM_CALL(__ms_vswscanf);
11531130
1154 __MINGW_ATTRIB_NONNULL(1)1131 __MINGW_ATTRIB_NONNULL(1)
1155 int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv)1132 int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv);
1156 __MINGW_ASM_CALL(__ms_vwscanf);
11571133
1158#endif /* __NO_ISOCEXT */1134#endif /* __NO_ISOCEXT */
11591135
...@@ -1203,59 +1179,11 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti...@@ -1203,59 +1179,11 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
1203 int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;1179 int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
12041180
1205#if __USE_MINGW_ANSI_STDIO == 01181#if __USE_MINGW_ANSI_STDIO == 0
1206 __mingw_ovr1182 int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...);
1207 int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...)1183 int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args);
1208 {
1209 __builtin_va_list __ap;
1210 int __ret;
1211 /*
1212 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
1213 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
1214 * executed in "standard snprintf behavior" and returns number of (wide)
1215 * chars required to allocate. For all other cases it is executed in a way
1216 * that returns negative value on error. But C95+ compliant swprintf() for
1217 * case _Count == 0 returns negative value, so handle this case specially.
1218 */
1219 if (_Dest == NULL && _Count == 0)
1220 return -1;
1221 __builtin_va_start(__ap, _Format);
1222 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap);
1223 __builtin_va_end(__ap);
1224 return __ret < 0 ? -1 : __ret;
1225 }
1226 __mingw_ovr
1227 int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args)
1228 {
1229 int __ret;
1230 /*
1231 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
1232 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
1233 * executed in "standard snprintf behavior" and returns number of (wide)
1234 * chars required to allocate. For all other cases it is executed in a way
1235 * that returns negative value on error. But C95+ compliant vswprintf() for
1236 * case _Count == 0 returns negative value, so handle this case specially.
1237 */
1238 if (_Dest == NULL && _Count == 0)
1239 return -1;
1240 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args);
1241 return __ret < 0 ? -1 : __ret;
1242 }
12431184
1244 __mingw_ovr1185 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
1245 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)1186 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg);
1246 {
1247 __builtin_va_list __ap;
1248 int __ret;
1249 __builtin_va_start(__ap, format);
1250 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, __ap);
1251 __builtin_va_end(__ap);
1252 return __ret;
1253 }
1254 __mingw_ovr
1255 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
1256 {
1257 return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg);
1258 }
1259#endif1187#endif
12601188
1261 __mingw_ovr1189 __mingw_ovr
...@@ -1291,8 +1219,6 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti...@@ -1291,8 +1219,6 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
1291#ifndef __NO_ISOCEXT /* externs in libmingwex.a */1219#ifndef __NO_ISOCEXT /* externs in libmingwex.a */
12921220
1293#if __USE_MINGW_ANSI_STDIO == 01221#if __USE_MINGW_ANSI_STDIO == 0
1294 int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
1295 int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
1296 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);1222 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
1297 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);1223 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
1298#endif1224#endif
lib/libc/include/any-windows-any/stdlib.h-2
...@@ -458,12 +458,10 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re...@@ -458,12 +458,10 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re
458 _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);458 _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);
459 _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);459 _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);
460 _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset);460 _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset);
461# if __MSVCRT_VERSION__ >= 0x900
462 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);461 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);
463 _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);462 _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);
464 _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);463 _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);
465 _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);464 _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);
466# endif
467465
468#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)466#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
469#pragma pop_macro("calloc")467#pragma pop_macro("calloc")
lib/libc/include/any-windows-any/strmif.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/strmif.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/strmif.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/structuredquerycondition.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/structuredquerycondition.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/structuredquerycondition.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/sys/stat.h+61-153
...@@ -70,67 +70,21 @@ extern "C" {...@@ -70,67 +70,21 @@ extern "C" {
70 _CRTIMP int __cdecl _stat32(const char *_Name,struct _stat32 *_Stat);70 _CRTIMP int __cdecl _stat32(const char *_Name,struct _stat32 *_Stat);
71 _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat);71 _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat);
72 _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat);72 _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat);
73 int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat);73 _CRTIMP int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat);
74#ifndef __CRT__NO_INLINE
75 __CRT_INLINE int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat)
76 {
77 struct _stat64 st;
78 int __ret=_fstat64(_FileDes,&st);
79 if (__ret == -1) {
80 memset(_Stat,0,sizeof(struct _stat64i32));
81 return -1;
82 }
83 _Stat->st_dev=st.st_dev;
84 _Stat->st_ino=st.st_ino;
85 _Stat->st_mode=st.st_mode;
86 _Stat->st_nlink=st.st_nlink;
87 _Stat->st_uid=st.st_uid;
88 _Stat->st_gid=st.st_gid;
89 _Stat->st_rdev=st.st_rdev;
90 _Stat->st_size=(_off_t) st.st_size;
91 _Stat->st_atime=st.st_atime;
92 _Stat->st_mtime=st.st_mtime;
93 _Stat->st_ctime=st.st_ctime;
94 return __ret;
95 }
96#endif /* __CRT__NO_INLINE */
97 _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat);74 _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat);
98 _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat);75 _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat);
99 int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat);76 _CRTIMP int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat);
100#ifndef __CRT__NO_INLINE
101 __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat)
102 {
103 struct _stat64 st;
104 int __ret=_stat64(_Name,&st);
105 if (__ret == -1) {
106 memset(_Stat,0,sizeof(struct _stat64i32));
107 return -1;
108 }
109 _Stat->st_dev=st.st_dev;
110 _Stat->st_ino=st.st_ino;
111 _Stat->st_mode=st.st_mode;
112 _Stat->st_nlink=st.st_nlink;
113 _Stat->st_uid=st.st_uid;
114 _Stat->st_gid=st.st_gid;
115 _Stat->st_rdev=st.st_rdev;
116 _Stat->st_size=(_off_t) st.st_size;
117 _Stat->st_atime=st.st_atime;
118 _Stat->st_mtime=st.st_mtime;
119 _Stat->st_ctime=st.st_ctime;
120 return __ret;
121 }
122#endif /* __CRT__NO_INLINE */
12377
124#ifndef _WSTAT_DEFINED78#ifndef _WSTAT_DEFINED
125#define _WSTAT_DEFINED79#define _WSTAT_DEFINED
126 _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat);80 _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat);
127 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat);81 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat);
128 int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat);82 _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat);
129 _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat);83 _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat);
130#endif84#endif
13185
132#ifndef NO_OLDNAMES86#ifndef NO_OLDNAMES
133#define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */87#define _S_IFBLK 0x6000 /* Block: Is this ever set under w32? */
13488
135#define S_IFMT _S_IFMT89#define S_IFMT _S_IFMT
136#define S_IFDIR _S_IFDIR90#define S_IFDIR _S_IFDIR
...@@ -170,115 +124,69 @@ extern "C" {...@@ -170,115 +124,69 @@ extern "C" {
170124
171#endif125#endif
172126
173#if !defined (RC_INVOKED) && !defined (NO_OLDNAMES)127#if !defined(NO_OLDNAMES) || defined(_POSIX)
174int __cdecl fstat(int _Desc,struct stat *_Stat);
175#ifdef _UCRT
176 __mingw_ovr int __cdecl stat(const char *_Filename,struct stat *_Stat)
177 {
178 return _stat(_Filename, (struct _stat *)_Stat);
179 }
180 __mingw_ovr int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat)
181 {
182 return _wstat(_Filename, (struct _stat *)_Stat);
183 }
184#else
185int __cdecl stat(const char *_Filename,struct stat *_Stat);
186int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat);
187#endif
188128
189#ifndef __CRT__NO_INLINE129/*
130 * When building mingw-w64 CRT files it is required that the fstat, stat and
131 * wstat functions are not declared with __MINGW_ASM_CALL redirection.
132 * Otherwise the mingw-w64 would provide broken fstat, stat and wstat symbols.
133 * To prevent ABI issues, the mingw-w64 runtime should not call the fstat,
134 * stat and wstat functions, instead it should call the fixed-size variants.
135 */
136#ifndef _CRTBLD
137struct stat {
138 _dev_t st_dev;
139 _ino_t st_ino;
140 unsigned short st_mode;
141 short st_nlink;
142 short st_uid;
143 short st_gid;
144 _dev_t st_rdev;
145 off_t st_size; /* off_t follows _FILE_OFFSET_BITS */
146 time_t st_atime; /* time_t follows _USE_32BIT_TIME_T */
147 time_t st_mtime;
148 time_t st_ctime;
149};
150#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
190#ifdef _USE_32BIT_TIME_T151#ifdef _USE_32BIT_TIME_T
191__CRT_INLINE int __cdecl152int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat32i64);
192 fstat(int _Desc,struct stat *_Stat) {153int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat32i64);
193 struct _stat32 st;154int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat32i64);
194 int __ret=_fstat32(_Desc,&st);
195 if (__ret == -1) {
196 memset(_Stat,0,sizeof(struct stat));
197 return -1;
198 }
199 /* struct stat and struct _stat32
200 are the same for this case. */
201 memcpy(_Stat, &st, sizeof(struct _stat32));
202 return __ret;
203}
204/* Disable it for making sure trailing slash issue is fixed. */
205#if 0
206__CRT_INLINE int __cdecl
207 stat(const char *_Filename,struct stat *_Stat) {
208 struct _stat32 st;
209 int __ret=_stat32(_Filename,&st);
210 if (__ret == -1) {
211 memset(_Stat,0,sizeof(struct stat));
212 return -1;
213 }
214 /* struct stat and struct _stat32
215 are the same for this case. */
216 memcpy(_Stat, &st, sizeof(struct _stat32));
217 return __ret;
218}
219#endif
220#else155#else
221__CRT_INLINE int __cdecl156int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat64);
222 fstat(int _Desc,struct stat *_Stat) {157int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat64);
223 struct _stat64 st;158int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat64);
224 int __ret=_fstat64(_Desc,&st);
225 if (__ret == -1) {
226 memset(_Stat,0,sizeof(struct stat));
227 return -1;
228 }
229 /* struct stat and struct _stat64i32
230 are the same for this case. */
231 _Stat->st_dev=st.st_dev;
232 _Stat->st_ino=st.st_ino;
233 _Stat->st_mode=st.st_mode;
234 _Stat->st_nlink=st.st_nlink;
235 _Stat->st_uid=st.st_uid;
236 _Stat->st_gid=st.st_gid;
237 _Stat->st_rdev=st.st_rdev;
238 _Stat->st_size=(_off_t) st.st_size;
239 _Stat->st_atime=st.st_atime;
240 _Stat->st_mtime=st.st_mtime;
241 _Stat->st_ctime=st.st_ctime;
242 return __ret;
243}
244/* Disable it for making sure trailing slash issue is fixed. */
245#if 0
246__CRT_INLINE int __cdecl
247 stat(const char *_Filename,struct stat *_Stat) {
248 struct _stat64 st;
249 int __ret=_stat64(_Filename,&st);
250 if (__ret == -1) {
251 memset(_Stat,0,sizeof(struct stat));
252 return -1;
253 }
254 /* struct stat and struct _stat64i32
255 are the same for this case. */
256 _Stat->st_dev=st.st_dev;
257 _Stat->st_ino=st.st_ino;
258 _Stat->st_mode=st.st_mode;
259 _Stat->st_nlink=st.st_nlink;
260 _Stat->st_uid=st.st_uid;
261 _Stat->st_gid=st.st_gid;
262 _Stat->st_rdev=st.st_rdev;
263 _Stat->st_size=(_off_t) st.st_size;
264 _Stat->st_atime=st.st_atime;
265 _Stat->st_mtime=st.st_mtime;
266 _Stat->st_ctime=st.st_ctime;
267 return __ret;
268}
269#endif159#endif
270#endif /* _USE_32BIT_TIME_T */160#else
271#endif /* __CRT__NO_INLINE */
272#endif /* !RC_INVOKED && !NO_OLDNAMES */
273
274#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
275#ifdef _USE_32BIT_TIME_T161#ifdef _USE_32BIT_TIME_T
276#define stat _stat32i64162int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat32);
277#define fstat _fstat32i64163int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat32);
164int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat32);
278#else165#else
279#define stat _stat64166int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat64i32);
280#define fstat _fstat64167int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat64i32);
281#endif168int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat64i32);
169#endif
170#endif
171#endif
172
173struct stat64 {
174 _dev_t st_dev;
175 _ino_t st_ino;
176 unsigned short st_mode;
177 short st_nlink;
178 short st_uid;
179 short st_gid;
180 _dev_t st_rdev;
181 __MINGW_EXTENSION __int64 st_size;
182 __time64_t st_atime;
183 __time64_t st_mtime;
184 __time64_t st_ctime;
185};
186int __cdecl fstat64(int _Desc, struct stat64 *_Stat);
187int __cdecl stat64(const char *_Filename, struct stat64 *_Stat);
188int __cdecl wstat64(const wchar_t *_Filename, struct stat64 *_Stat);
189
282#endif190#endif
283191
284#ifdef __cplusplus192#ifdef __cplusplus
lib/libc/include/any-windows-any/sysinfoapi.h+10
...@@ -41,8 +41,18 @@ extern "C" {...@@ -41,8 +41,18 @@ extern "C" {
41#if _WIN32_WINNT >= 0x060041#if _WIN32_WINNT >= 0x0600
42 WINBASEAPI ULONGLONG WINAPI GetTickCount64 (VOID);42 WINBASEAPI ULONGLONG WINAPI GetTickCount64 (VOID);
43#endif43#endif
44
45#define USER_CET_ENVIRONMENT_WIN32_PROCESS 0x00000000
46#define USER_CET_ENVIRONMENT_SGX2_ENCLAVE 0x00000002
47#define USER_CET_ENVIRONMENT_VBS_ENCLAVE 0x00000010
48#define USER_CET_ENVIRONMENT_VBS_BASIC_ENCLAVE 0x00000011
49
50#if (NTDDI_VERSION >= NTDDI_WIN10_VB)
51 WINBASEAPI WINBOOL WINAPI IsUserCetAvailableInEnvironment(DWORD UserCetEnvironment);
44#endif52#endif
4553
54#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
55
46#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN1056#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10
4757
48 typedef struct _MEMORYSTATUSEX {58 typedef struct _MEMORYSTATUSEX {
lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/systemmediatransportcontrolsinterop.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/systemmediatransportcontrolsinterop.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/taskschd.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/taskschd.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/taskschd.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tchar.h-6
...@@ -473,9 +473,7 @@ extern "C" {...@@ -473,9 +473,7 @@ extern "C" {
473#define _istxdigit iswxdigit473#define _istxdigit iswxdigit
474#define _istxdigit_l _iswxdigit_l474#define _istxdigit_l _iswxdigit_l
475#define _istblank iswblank475#define _istblank iswblank
476#if __MSVCRT_VERSION__ >= 0xC00
477#define _istblank_l _iswblank_l476#define _istblank_l _iswblank_l
478#endif /* msvcr120 */
479477
480#define _totupper towupper478#define _totupper towupper
481#define _totupper_l _towupper_l479#define _totupper_l _towupper_l
...@@ -1005,9 +1003,7 @@ extern "C" {...@@ -1005,9 +1003,7 @@ extern "C" {
1005#define _istupper _ismbcupper1003#define _istupper _ismbcupper
1006#define _istupper_l _ismbcupper_l1004#define _istupper_l _ismbcupper_l
1007#define _istblank _ismbcblank1005#define _istblank _ismbcblank
1008#if __MSVCRT_VERSION__ >= 0xC00
1009#define _istblank_l _ismbcblank_l1006#define _istblank_l _ismbcblank_l
1010#endif /* msvcr120 */
10111007
1012#define _totupper _mbctoupper1008#define _totupper _mbctoupper
1013#define _totupper_l _mbctoupper_l1009#define _totupper_l _mbctoupper_l
...@@ -1146,9 +1142,7 @@ extern "C" {...@@ -1146,9 +1142,7 @@ extern "C" {
1146#define _istupper isupper1142#define _istupper isupper
1147#define _istupper_l _isupper_l1143#define _istupper_l _isupper_l
1148#define _istblank isblank1144#define _istblank isblank
1149#if __MSVCRT_VERSION__ >= 0xC00
1150#define _istblank_l _isblank_l1145#define _istblank_l _isblank_l
1151#endif /* msvcr120 */
11521146
1153#define _totupper toupper1147#define _totupper toupper
1154#define _totupper_l _toupper_l1148#define _totupper_l _toupper_l
lib/libc/include/any-windows-any/textstor.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/textstor.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/textstor.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/thumbcache.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/thumbcache.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/thumbcache.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tlbref.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/tlbref.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/tlbref.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tlogstg.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/tlogstg.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/tlogstg.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tpcshrd.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/tpcshrd.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/tpcshrd.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tsattrs.h+100-100
...@@ -1,100 +1,100 @@...@@ -1,100 +1,100 @@
1/** 1/**
2 * This file has no copyright assigned and is placed in the Public Domain. 2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package. 3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package. 4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */ 5 */
6 6
7#ifndef _TSATTRS_H_ 7#ifndef _TSATTRS_H_
8#define _TSATTRS_H_ 8#define _TSATTRS_H_
9 9
10DEFINE_GUID(TSATTRID_OTHERS, 0xb3c32af9,0x57d0,0x46a9,0xbc,0xa8,0xda,0xc2,0x38,0xa1,0x30,0x57); 10DEFINE_GUID(TSATTRID_OTHERS, 0xb3c32af9,0x57d0,0x46a9,0xbc,0xa8,0xda,0xc2,0x38,0xa1,0x30,0x57);
11 11
12DEFINE_GUID(TSATTRID_Font, 0x573ea825,0x749b,0x4f8a,0x9c,0xfd,0x21,0xc3,0x60,0x5c,0xa8,0x28); 12DEFINE_GUID(TSATTRID_Font, 0x573ea825,0x749b,0x4f8a,0x9c,0xfd,0x21,0xc3,0x60,0x5c,0xa8,0x28);
13DEFINE_GUID(TSATTRID_Font_FaceName, 0xb536aeb6,0x053b,0x4eb8,0xb6,0x5a,0x50,0xda,0x1e,0x81,0xe7,0x2e); 13DEFINE_GUID(TSATTRID_Font_FaceName, 0xb536aeb6,0x053b,0x4eb8,0xb6,0x5a,0x50,0xda,0x1e,0x81,0xe7,0x2e);
14DEFINE_GUID(TSATTRID_Font_SizePts, 0xc8493302,0xa5e9,0x456d,0xaf,0x04,0x80,0x05,0xe4,0x13,0x0f,0x03); 14DEFINE_GUID(TSATTRID_Font_SizePts, 0xc8493302,0xa5e9,0x456d,0xaf,0x04,0x80,0x05,0xe4,0x13,0x0f,0x03);
15DEFINE_GUID(TSATTRID_Font_Style, 0x68b2a77f,0x6b0e,0x4f28,0x81,0x77,0x57,0x1c,0x2f,0x3a,0x42,0xb1); 15DEFINE_GUID(TSATTRID_Font_Style, 0x68b2a77f,0x6b0e,0x4f28,0x81,0x77,0x57,0x1c,0x2f,0x3a,0x42,0xb1);
16DEFINE_GUID(TSATTRID_Font_Style_Bold, 0x48813a43,0x8a20,0x4940,0x8e,0x58,0x97,0x82,0x3f,0x7b,0x26,0x8a); 16DEFINE_GUID(TSATTRID_Font_Style_Bold, 0x48813a43,0x8a20,0x4940,0x8e,0x58,0x97,0x82,0x3f,0x7b,0x26,0x8a);
17DEFINE_GUID(TSATTRID_Font_Style_Italic, 0x8740682a,0xa765,0x48e1,0xac,0xfc,0xd2,0x22,0x22,0xb2,0xf8,0x10); 17DEFINE_GUID(TSATTRID_Font_Style_Italic, 0x8740682a,0xa765,0x48e1,0xac,0xfc,0xd2,0x22,0x22,0xb2,0xf8,0x10);
18DEFINE_GUID(TSATTRID_Font_Style_SmallCaps, 0xfacb6bc6,0x9100,0x4cc6,0xb9,0x69,0x11,0xee,0xa4,0x5a,0x86,0xb4); 18DEFINE_GUID(TSATTRID_Font_Style_SmallCaps, 0xfacb6bc6,0x9100,0x4cc6,0xb9,0x69,0x11,0xee,0xa4,0x5a,0x86,0xb4);
19DEFINE_GUID(TSATTRID_Font_Style_Capitalize, 0x7d85a3ba,0xb4fd,0x43b3,0xbe,0xfc,0x6b,0x98,0x5c,0x84,0x31,0x41); 19DEFINE_GUID(TSATTRID_Font_Style_Capitalize, 0x7d85a3ba,0xb4fd,0x43b3,0xbe,0xfc,0x6b,0x98,0x5c,0x84,0x31,0x41);
20DEFINE_GUID(TSATTRID_Font_Style_Uppercase, 0x33a300e8,0xe340,0x4937,0xb6,0x97,0x8f,0x23,0x40,0x45,0xcd,0x9a); 20DEFINE_GUID(TSATTRID_Font_Style_Uppercase, 0x33a300e8,0xe340,0x4937,0xb6,0x97,0x8f,0x23,0x40,0x45,0xcd,0x9a);
21DEFINE_GUID(TSATTRID_Font_Style_Lowercase, 0x76d8ccb5,0xca7b,0x4498,0x8e,0xe9,0xd5,0xc4,0xf6,0xf7,0x4c,0x60); 21DEFINE_GUID(TSATTRID_Font_Style_Lowercase, 0x76d8ccb5,0xca7b,0x4498,0x8e,0xe9,0xd5,0xc4,0xf6,0xf7,0x4c,0x60);
22DEFINE_GUID(TSATTRID_Font_Style_Animation, 0xdcf73d22,0xe029,0x47b7,0xbb,0x36,0xf2,0x63,0xa3,0xd0,0x04,0xcc); 22DEFINE_GUID(TSATTRID_Font_Style_Animation, 0xdcf73d22,0xe029,0x47b7,0xbb,0x36,0xf2,0x63,0xa3,0xd0,0x04,0xcc);
23DEFINE_GUID(TSATTRID_Font_Style_Animation_LasVegasLights, 0xf40423d5,0x0f87,0x4f8f,0xba,0xda,0xe6,0xd6,0x0c,0x25,0xe1,0x52); 23DEFINE_GUID(TSATTRID_Font_Style_Animation_LasVegasLights, 0xf40423d5,0x0f87,0x4f8f,0xba,0xda,0xe6,0xd6,0x0c,0x25,0xe1,0x52);
24DEFINE_GUID(TSATTRID_Font_Style_Animation_BlinkingBackground, 0x86e5b104,0x0104,0x4b10,0xb5,0x85,0x00,0xf2,0x52,0x75,0x22,0xb5); 24DEFINE_GUID(TSATTRID_Font_Style_Animation_BlinkingBackground, 0x86e5b104,0x0104,0x4b10,0xb5,0x85,0x00,0xf2,0x52,0x75,0x22,0xb5);
25DEFINE_GUID(TSATTRID_Font_Style_Animation_SparkleText, 0x533aad20,0x962c,0x4e9f,0x8c,0x09,0xb4,0x2e,0xa4,0x74,0x97,0x11); 25DEFINE_GUID(TSATTRID_Font_Style_Animation_SparkleText, 0x533aad20,0x962c,0x4e9f,0x8c,0x09,0xb4,0x2e,0xa4,0x74,0x97,0x11);
26DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingBlackAnts, 0x7644e067,0xf186,0x4902,0xbf,0xc6,0xec,0x81,0x5a,0xa2,0x0e,0x9d); 26DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingBlackAnts, 0x7644e067,0xf186,0x4902,0xbf,0xc6,0xec,0x81,0x5a,0xa2,0x0e,0x9d);
27DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingRedAnts, 0x78368dad,0x50fb,0x4c6f,0x84,0x0b,0xd4,0x86,0xbb,0x6c,0xf7,0x81); 27DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingRedAnts, 0x78368dad,0x50fb,0x4c6f,0x84,0x0b,0xd4,0x86,0xbb,0x6c,0xf7,0x81);
28DEFINE_GUID(TSATTRID_Font_Style_Animation_Shimmer, 0x2ce31b58,0x5293,0x4c36,0x88,0x09,0xbf,0x8b,0xb5,0x1a,0x27,0xb3); 28DEFINE_GUID(TSATTRID_Font_Style_Animation_Shimmer, 0x2ce31b58,0x5293,0x4c36,0x88,0x09,0xbf,0x8b,0xb5,0x1a,0x27,0xb3);
29DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeDown, 0x5872e874,0x367b,0x4803,0xb1,0x60,0xc9,0x0f,0xf6,0x25,0x69,0xd0); 29DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeDown, 0x5872e874,0x367b,0x4803,0xb1,0x60,0xc9,0x0f,0xf6,0x25,0x69,0xd0);
30DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeRight, 0xb855cbe3,0x3d2c,0x4600,0xb1,0xe9,0xe1,0xc9,0xce,0x02,0xf8,0x42); 30DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeRight, 0xb855cbe3,0x3d2c,0x4600,0xb1,0xe9,0xe1,0xc9,0xce,0x02,0xf8,0x42);
31DEFINE_GUID(TSATTRID_Font_Style_Emboss, 0xbd8ed742,0x349e,0x4e37,0x82,0xfb,0x43,0x79,0x79,0xcb,0x53,0xa7); 31DEFINE_GUID(TSATTRID_Font_Style_Emboss, 0xbd8ed742,0x349e,0x4e37,0x82,0xfb,0x43,0x79,0x79,0xcb,0x53,0xa7);
32DEFINE_GUID(TSATTRID_Font_Style_Engrave, 0x9c3371de,0x8332,0x4897,0xbe,0x5d,0x89,0x23,0x32,0x23,0x17,0x9a); 32DEFINE_GUID(TSATTRID_Font_Style_Engrave, 0x9c3371de,0x8332,0x4897,0xbe,0x5d,0x89,0x23,0x32,0x23,0x17,0x9a);
33DEFINE_GUID(TSATTRID_Font_Style_Hidden, 0xb1e28770,0x881c,0x475f,0x86,0x3f,0x88,0x7a,0x64,0x7b,0x10,0x90); 33DEFINE_GUID(TSATTRID_Font_Style_Hidden, 0xb1e28770,0x881c,0x475f,0x86,0x3f,0x88,0x7a,0x64,0x7b,0x10,0x90);
34DEFINE_GUID(TSATTRID_Font_Style_Kerning, 0xcc26e1b4,0x2f9a,0x47c8,0x8b,0xff,0xbf,0x1e,0xb7,0xcc,0xe0,0xdd); 34DEFINE_GUID(TSATTRID_Font_Style_Kerning, 0xcc26e1b4,0x2f9a,0x47c8,0x8b,0xff,0xbf,0x1e,0xb7,0xcc,0xe0,0xdd);
35DEFINE_GUID(TSATTRID_Font_Style_Outlined, 0x10e6db31,0xdb0d,0x4ac6,0xa7,0xf5,0x9c,0x9c,0xff,0x6f,0x2a,0xb4); 35DEFINE_GUID(TSATTRID_Font_Style_Outlined, 0x10e6db31,0xdb0d,0x4ac6,0xa7,0xf5,0x9c,0x9c,0xff,0x6f,0x2a,0xb4);
36DEFINE_GUID(TSATTRID_Font_Style_Position, 0x15cd26ab,0xf2fb,0x4062,0xb5,0xa6,0x9a,0x49,0xe1,0xa5,0xcc,0x0b); 36DEFINE_GUID(TSATTRID_Font_Style_Position, 0x15cd26ab,0xf2fb,0x4062,0xb5,0xa6,0x9a,0x49,0xe1,0xa5,0xcc,0x0b);
37DEFINE_GUID(TSATTRID_Font_Style_Protected, 0x1c557cb2,0x14cf,0x4554,0xa5,0x74,0xec,0xb2,0xf7,0xe7,0xef,0xd4); 37DEFINE_GUID(TSATTRID_Font_Style_Protected, 0x1c557cb2,0x14cf,0x4554,0xa5,0x74,0xec,0xb2,0xf7,0xe7,0xef,0xd4);
38DEFINE_GUID(TSATTRID_Font_Style_Shadow, 0x5f686d2f,0xc6cd,0x4c56,0x8a,0x1a,0x99,0x4a,0x4b,0x97,0x66,0xbe); 38DEFINE_GUID(TSATTRID_Font_Style_Shadow, 0x5f686d2f,0xc6cd,0x4c56,0x8a,0x1a,0x99,0x4a,0x4b,0x97,0x66,0xbe);
39DEFINE_GUID(TSATTRID_Font_Style_Spacing, 0x98c1200d,0x8f06,0x409a,0x8e,0x49,0x6a,0x55,0x4b,0xf7,0xc1,0x53); 39DEFINE_GUID(TSATTRID_Font_Style_Spacing, 0x98c1200d,0x8f06,0x409a,0x8e,0x49,0x6a,0x55,0x4b,0xf7,0xc1,0x53);
40DEFINE_GUID(TSATTRID_Font_Style_Weight, 0x12f3189c,0x8bb0,0x461b,0xb1,0xfa,0xea,0xf9,0x07,0x04,0x7f,0xe0); 40DEFINE_GUID(TSATTRID_Font_Style_Weight, 0x12f3189c,0x8bb0,0x461b,0xb1,0xfa,0xea,0xf9,0x07,0x04,0x7f,0xe0);
41DEFINE_GUID(TSATTRID_Font_Style_Height, 0x7e937477,0x12e6,0x458b,0x92,0x6a,0x1f,0xa4,0x4e,0xe8,0xf3,0x91); 41DEFINE_GUID(TSATTRID_Font_Style_Height, 0x7e937477,0x12e6,0x458b,0x92,0x6a,0x1f,0xa4,0x4e,0xe8,0xf3,0x91);
42DEFINE_GUID(TSATTRID_Font_Style_Underline, 0xc3c9c9f3,0x7902,0x444b,0x9a,0x7b,0x48,0xe7,0x0f,0x4b,0x50,0xf7); 42DEFINE_GUID(TSATTRID_Font_Style_Underline, 0xc3c9c9f3,0x7902,0x444b,0x9a,0x7b,0x48,0xe7,0x0f,0x4b,0x50,0xf7);
43DEFINE_GUID(TSATTRID_Font_Style_Underline_Single, 0x1b6720e5,0x0f73,0x4951,0xa6,0xb3,0x6f,0x19,0xe4,0x3c,0x94,0x61); 43DEFINE_GUID(TSATTRID_Font_Style_Underline_Single, 0x1b6720e5,0x0f73,0x4951,0xa6,0xb3,0x6f,0x19,0xe4,0x3c,0x94,0x61);
44DEFINE_GUID(TSATTRID_Font_Style_Underline_Double, 0x74d24aa6,0x1db3,0x4c69,0xa1,0x76,0x31,0x12,0x0e,0x75,0x86,0xd5); 44DEFINE_GUID(TSATTRID_Font_Style_Underline_Double, 0x74d24aa6,0x1db3,0x4c69,0xa1,0x76,0x31,0x12,0x0e,0x75,0x86,0xd5);
45DEFINE_GUID(TSATTRID_Font_Style_Strikethrough, 0x0c562193,0x2d08,0x4668,0x96,0x01,0xce,0xd4,0x13,0x09,0xd7,0xaf); 45DEFINE_GUID(TSATTRID_Font_Style_Strikethrough, 0x0c562193,0x2d08,0x4668,0x96,0x01,0xce,0xd4,0x13,0x09,0xd7,0xaf);
46DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Single, 0x75d736b6,0x3c8f,0x4b97,0xab,0x78,0x18,0x77,0xcb,0x99,0x0d,0x31); 46DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Single, 0x75d736b6,0x3c8f,0x4b97,0xab,0x78,0x18,0x77,0xcb,0x99,0x0d,0x31);
47DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Double, 0x62489b31,0xa3e7,0x4f94,0xac,0x43,0xeb,0xaf,0x8f,0xcc,0x7a,0x9f); 47DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Double, 0x62489b31,0xa3e7,0x4f94,0xac,0x43,0xeb,0xaf,0x8f,0xcc,0x7a,0x9f);
48DEFINE_GUID(TSATTRID_Font_Style_Overline, 0xe3989f4a,0x992b,0x4301,0x8c,0xe1,0xa5,0xb7,0xc6,0xd1,0xf3,0xc8); 48DEFINE_GUID(TSATTRID_Font_Style_Overline, 0xe3989f4a,0x992b,0x4301,0x8c,0xe1,0xa5,0xb7,0xc6,0xd1,0xf3,0xc8);
49DEFINE_GUID(TSATTRID_Font_Style_Overline_Single, 0x8440d94c,0x51ce,0x47b2,0x8d,0x4c,0x15,0x75,0x1e,0x5f,0x72,0x1b); 49DEFINE_GUID(TSATTRID_Font_Style_Overline_Single, 0x8440d94c,0x51ce,0x47b2,0x8d,0x4c,0x15,0x75,0x1e,0x5f,0x72,0x1b);
50DEFINE_GUID(TSATTRID_Font_Style_Overline_Double, 0xdc46063a,0xe115,0x46e3,0xbc,0xd8,0xca,0x67,0x72,0xaa,0x95,0xb4); 50DEFINE_GUID(TSATTRID_Font_Style_Overline_Double, 0xdc46063a,0xe115,0x46e3,0xbc,0xd8,0xca,0x67,0x72,0xaa,0x95,0xb4);
51DEFINE_GUID(TSATTRID_Font_Style_Blink, 0xbfb2c036,0x7acf,0x4532,0xb7,0x20,0xb4,0x16,0xdd,0x77,0x65,0xa8); 51DEFINE_GUID(TSATTRID_Font_Style_Blink, 0xbfb2c036,0x7acf,0x4532,0xb7,0x20,0xb4,0x16,0xdd,0x77,0x65,0xa8);
52DEFINE_GUID(TSATTRID_Font_Style_Subscript, 0x5774fb84,0x389b,0x43bc,0xa7,0x4b,0x15,0x68,0x34,0x7c,0xf0,0xf4); 52DEFINE_GUID(TSATTRID_Font_Style_Subscript, 0x5774fb84,0x389b,0x43bc,0xa7,0x4b,0x15,0x68,0x34,0x7c,0xf0,0xf4);
53DEFINE_GUID(TSATTRID_Font_Style_Superscript, 0x2ea4993c,0x563c,0x49aa,0x93,0x72,0x0b,0xef,0x09,0xa9,0x25,0x5b); 53DEFINE_GUID(TSATTRID_Font_Style_Superscript, 0x2ea4993c,0x563c,0x49aa,0x93,0x72,0x0b,0xef,0x09,0xa9,0x25,0x5b);
54DEFINE_GUID(TSATTRID_Font_Style_Color, 0x857a7a37,0xb8af,0x4e9a,0x81,0xb4,0xac,0xf7,0x00,0xc8,0x41,0x1b); 54DEFINE_GUID(TSATTRID_Font_Style_Color, 0x857a7a37,0xb8af,0x4e9a,0x81,0xb4,0xac,0xf7,0x00,0xc8,0x41,0x1b);
55DEFINE_GUID(TSATTRID_Font_Style_BackgroundColor, 0xb50eaa4e,0x3091,0x4468,0x81,0xdb,0xd7,0x9e,0xa1,0x90,0xc7,0xc7); 55DEFINE_GUID(TSATTRID_Font_Style_BackgroundColor, 0xb50eaa4e,0x3091,0x4468,0x81,0xdb,0xd7,0x9e,0xa1,0x90,0xc7,0xc7);
56 56
57DEFINE_GUID(TSATTRID_Text, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); 57DEFINE_GUID(TSATTRID_Text, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0);
58DEFINE_GUID(TSATTRID_Text_VerticalWriting, 0x6bba8195,0x046f,0x4ea9,0xb3,0x11,0x97,0xfd,0x66,0xc4,0x27,0x4b); 58DEFINE_GUID(TSATTRID_Text_VerticalWriting, 0x6bba8195,0x046f,0x4ea9,0xb3,0x11,0x97,0xfd,0x66,0xc4,0x27,0x4b);
59DEFINE_GUID(TSATTRID_Text_RightToLeft, 0xca666e71,0x1b08,0x453d,0xbf,0xdd,0x28,0xe0,0x8c,0x8a,0xaf,0x7a); 59DEFINE_GUID(TSATTRID_Text_RightToLeft, 0xca666e71,0x1b08,0x453d,0xbf,0xdd,0x28,0xe0,0x8c,0x8a,0xaf,0x7a);
60DEFINE_GUID(TSATTRID_Text_Orientation, 0x6bab707f,0x8785,0x4c39,0x8b,0x52,0x96,0xf8,0x78,0x30,0x3f,0xfb); 60DEFINE_GUID(TSATTRID_Text_Orientation, 0x6bab707f,0x8785,0x4c39,0x8b,0x52,0x96,0xf8,0x78,0x30,0x3f,0xfb);
61DEFINE_GUID(TSATTRID_Text_Language, 0xd8c04ef1,0x5753,0x4c25,0x88,0x87,0x85,0x44,0x3f,0xe5,0xf8,0x19); 61DEFINE_GUID(TSATTRID_Text_Language, 0xd8c04ef1,0x5753,0x4c25,0x88,0x87,0x85,0x44,0x3f,0xe5,0xf8,0x19);
62DEFINE_GUID(TSATTRID_Text_ReadOnly, 0x85836617,0xde32,0x4afd,0xa5,0x0f,0xa2,0xdb,0x11,0x0e,0x6e,0x4d); 62DEFINE_GUID(TSATTRID_Text_ReadOnly, 0x85836617,0xde32,0x4afd,0xa5,0x0f,0xa2,0xdb,0x11,0x0e,0x6e,0x4d);
63DEFINE_GUID(TSATTRID_Text_EmbeddedObject, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); 63DEFINE_GUID(TSATTRID_Text_EmbeddedObject, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0);
64DEFINE_GUID(TSATTRID_Text_Alignment, 0x139941e6,0x1767,0x456d,0x93,0x8e,0x35,0xba,0x56,0x8b,0x5c,0xd4); 64DEFINE_GUID(TSATTRID_Text_Alignment, 0x139941e6,0x1767,0x456d,0x93,0x8e,0x35,0xba,0x56,0x8b,0x5c,0xd4);
65DEFINE_GUID(TSATTRID_Text_Alignment_Left, 0x16ae95d3,0x6361,0x43a2,0x84,0x95,0xd0,0x0f,0x39,0x7f,0x16,0x93); 65DEFINE_GUID(TSATTRID_Text_Alignment_Left, 0x16ae95d3,0x6361,0x43a2,0x84,0x95,0xd0,0x0f,0x39,0x7f,0x16,0x93);
66DEFINE_GUID(TSATTRID_Text_Alignment_Right, 0xb36f0f98,0x1b9e,0x4360,0x86,0x16,0x03,0xfb,0x08,0xa7,0x84,0x56); 66DEFINE_GUID(TSATTRID_Text_Alignment_Right, 0xb36f0f98,0x1b9e,0x4360,0x86,0x16,0x03,0xfb,0x08,0xa7,0x84,0x56);
67DEFINE_GUID(TSATTRID_Text_Alignment_Center, 0xa4a95c16,0x53bf,0x4d55,0x8b,0x87,0x4b,0xdd,0x8d,0x42,0x75,0xfc); 67DEFINE_GUID(TSATTRID_Text_Alignment_Center, 0xa4a95c16,0x53bf,0x4d55,0x8b,0x87,0x4b,0xdd,0x8d,0x42,0x75,0xfc);
68DEFINE_GUID(TSATTRID_Text_Alignment_Justify, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); 68DEFINE_GUID(TSATTRID_Text_Alignment_Justify, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0);
69DEFINE_GUID(TSATTRID_Text_Link, 0x47cd9051,0x3722,0x4cd8,0xb7,0xc8,0x4e,0x17,0xca,0x17,0x59,0xf5); 69DEFINE_GUID(TSATTRID_Text_Link, 0x47cd9051,0x3722,0x4cd8,0xb7,0xc8,0x4e,0x17,0xca,0x17,0x59,0xf5);
70DEFINE_GUID(TSATTRID_Text_Hyphenation, 0xdadf4525,0x618e,0x49eb,0xb1,0xa8,0x3b,0x68,0xbd,0x76,0x48,0xe3); 70DEFINE_GUID(TSATTRID_Text_Hyphenation, 0xdadf4525,0x618e,0x49eb,0xb1,0xa8,0x3b,0x68,0xbd,0x76,0x48,0xe3);
71DEFINE_GUID(TSATTRID_Text_Para, 0x5edc5822,0x99dc,0x4dd6,0xae,0xc3,0xb6,0x2b,0xaa,0x5b,0x2e,0x7c); 71DEFINE_GUID(TSATTRID_Text_Para, 0x5edc5822,0x99dc,0x4dd6,0xae,0xc3,0xb6,0x2b,0xaa,0x5b,0x2e,0x7c);
72DEFINE_GUID(TSATTRID_Text_Para_FirstLineIndent, 0x07c97a13,0x7472,0x4dd8,0x90,0xa9,0x91,0xe3,0xd7,0xe4,0xf2,0x9c); 72DEFINE_GUID(TSATTRID_Text_Para_FirstLineIndent, 0x07c97a13,0x7472,0x4dd8,0x90,0xa9,0x91,0xe3,0xd7,0xe4,0xf2,0x9c);
73DEFINE_GUID(TSATTRID_Text_Para_LeftIndent, 0xfb2848e9,0x7471,0x41c9,0xb6,0xb3,0x8a,0x14,0x50,0xe0,0x18,0x97); 73DEFINE_GUID(TSATTRID_Text_Para_LeftIndent, 0xfb2848e9,0x7471,0x41c9,0xb6,0xb3,0x8a,0x14,0x50,0xe0,0x18,0x97);
74DEFINE_GUID(TSATTRID_Text_Para_RightIndent, 0x2c7f26f9,0xa5e2,0x48da,0xb9,0x8a,0x52,0x0c,0xb1,0x65,0x13,0xbf); 74DEFINE_GUID(TSATTRID_Text_Para_RightIndent, 0x2c7f26f9,0xa5e2,0x48da,0xb9,0x8a,0x52,0x0c,0xb1,0x65,0x13,0xbf);
75DEFINE_GUID(TSATTRID_Text_Para_SpaceAfter, 0x7b0a3f55,0x22dc,0x425f,0xa4,0x11,0x93,0xda,0x1d,0x8f,0x9b,0xaa); 75DEFINE_GUID(TSATTRID_Text_Para_SpaceAfter, 0x7b0a3f55,0x22dc,0x425f,0xa4,0x11,0x93,0xda,0x1d,0x8f,0x9b,0xaa);
76DEFINE_GUID(TSATTRID_Text_Para_SpaceBefore, 0x8df98589,0x194a,0x4601,0xb2,0x51,0x98,0x65,0xa3,0xe9,0x06,0xdd); 76DEFINE_GUID(TSATTRID_Text_Para_SpaceBefore, 0x8df98589,0x194a,0x4601,0xb2,0x51,0x98,0x65,0xa3,0xe9,0x06,0xdd);
77DEFINE_GUID(TSATTRID_Text_Para_LineSpacing, 0x699b380d,0x7f8c,0x46d6,0xa7,0x3b,0xdf,0xe3,0xd1,0x53,0x8d,0xf3); 77DEFINE_GUID(TSATTRID_Text_Para_LineSpacing, 0x699b380d,0x7f8c,0x46d6,0xa7,0x3b,0xdf,0xe3,0xd1,0x53,0x8d,0xf3);
78DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Single, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); 78DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Single, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0);
79DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_OnePtFive, 0x0428a021,0x0397,0x4b57,0x9a,0x17,0x07,0x95,0x99,0x4c,0xd3,0xc5); 79DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_OnePtFive, 0x0428a021,0x0397,0x4b57,0x9a,0x17,0x07,0x95,0x99,0x4c,0xd3,0xc5);
80DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Double, 0x82fb1805,0xa6c4,0x4231,0xac,0x12,0x62,0x60,0xaf,0x2a,0xba,0x28); 80DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Double, 0x82fb1805,0xa6c4,0x4231,0xac,0x12,0x62,0x60,0xaf,0x2a,0xba,0x28);
81DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_AtLeast, 0xadfedf31,0x2d44,0x4434,0xa5,0xff,0x7f,0x4c,0x49,0x90,0xa9,0x05); 81DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_AtLeast, 0xadfedf31,0x2d44,0x4434,0xa5,0xff,0x7f,0x4c,0x49,0x90,0xa9,0x05);
82DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Exactly, 0x3d45ad40,0x23de,0x48d7,0xa6,0xb3,0x76,0x54,0x20,0xc6,0x20,0xcc); 82DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Exactly, 0x3d45ad40,0x23de,0x48d7,0xa6,0xb3,0x76,0x54,0x20,0xc6,0x20,0xcc);
83DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Multiple, 0x910f1e3c,0xd6d0,0x4f65,0x8a,0x3c,0x42,0xb4,0xb3,0x18,0x68,0xc5); 83DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Multiple, 0x910f1e3c,0xd6d0,0x4f65,0x8a,0x3c,0x42,0xb4,0xb3,0x18,0x68,0xc5);
84 84
85DEFINE_GUID(TSATTRID_List, 0x436d673b,0x26f1,0x4aee,0x9e,0x65,0x8f,0x83,0xa4,0xed,0x48,0x84); 85DEFINE_GUID(TSATTRID_List, 0x436d673b,0x26f1,0x4aee,0x9e,0x65,0x8f,0x83,0xa4,0xed,0x48,0x84);
86DEFINE_GUID(TSATTRID_List_LevelIndel, 0x7f7cc899,0x311f,0x487b,0xad,0x5d,0xe2,0xa4,0x59,0xe1,0x2d,0x42); 86DEFINE_GUID(TSATTRID_List_LevelIndel, 0x7f7cc899,0x311f,0x487b,0xad,0x5d,0xe2,0xa4,0x59,0xe1,0x2d,0x42);
87DEFINE_GUID(TSATTRID_List_Type, 0xae3e665e,0x4bce,0x49e3,0xa0,0xfe,0x2d,0xb4,0x7d,0x3a,0x17,0xae); 87DEFINE_GUID(TSATTRID_List_Type, 0xae3e665e,0x4bce,0x49e3,0xa0,0xfe,0x2d,0xb4,0x7d,0x3a,0x17,0xae);
88DEFINE_GUID(TSATTRID_List_Type_Bullet, 0xbccd77c5,0x4c4d,0x4ce2,0xb1,0x02,0x55,0x9f,0x3b,0x2b,0xfc,0xea); 88DEFINE_GUID(TSATTRID_List_Type_Bullet, 0xbccd77c5,0x4c4d,0x4ce2,0xb1,0x02,0x55,0x9f,0x3b,0x2b,0xfc,0xea);
89DEFINE_GUID(TSATTRID_List_Type_Arabic, 0x1338c5d6,0x98a3,0x4fa3,0x9b,0xd1,0x7a,0x60,0xee,0xf8,0xe9,0xe0); 89DEFINE_GUID(TSATTRID_List_Type_Arabic, 0x1338c5d6,0x98a3,0x4fa3,0x9b,0xd1,0x7a,0x60,0xee,0xf8,0xe9,0xe0);
90DEFINE_GUID(TSATTRID_List_Type_LowerLetter, 0x96372285,0xf3cf,0x491e,0xa9,0x25,0x38,0x32,0x34,0x7f,0xd2,0x37); 90DEFINE_GUID(TSATTRID_List_Type_LowerLetter, 0x96372285,0xf3cf,0x491e,0xa9,0x25,0x38,0x32,0x34,0x7f,0xd2,0x37);
91DEFINE_GUID(TSATTRID_List_Type_UpperLetter, 0x7987b7cd,0xce52,0x428b,0x9b,0x95,0xa3,0x57,0xf6,0xf1,0x0c,0x45); 91DEFINE_GUID(TSATTRID_List_Type_UpperLetter, 0x7987b7cd,0xce52,0x428b,0x9b,0x95,0xa3,0x57,0xf6,0xf1,0x0c,0x45);
92DEFINE_GUID(TSATTRID_List_Type_LowerRoman, 0x90466262,0x3980,0x4b8e,0x93,0x68,0x91,0x8b,0xd1,0x21,0x8a,0x41); 92DEFINE_GUID(TSATTRID_List_Type_LowerRoman, 0x90466262,0x3980,0x4b8e,0x93,0x68,0x91,0x8b,0xd1,0x21,0x8a,0x41);
93DEFINE_GUID(TSATTRID_List_Type_UpperRoman, 0x0f6ab552,0x4a80,0x467f,0xb2,0xf1,0x12,0x7e,0x2a,0xa3,0xba,0x9e); 93DEFINE_GUID(TSATTRID_List_Type_UpperRoman, 0x0f6ab552,0x4a80,0x467f,0xb2,0xf1,0x12,0x7e,0x2a,0xa3,0xba,0x9e);
94 94
95DEFINE_GUID(TSATTRID_App, 0xa80f77df,0x4237,0x40e5,0x84,0x9c,0xb5,0xfa,0x51,0xc1,0x3a,0xc7); 95DEFINE_GUID(TSATTRID_App, 0xa80f77df,0x4237,0x40e5,0x84,0x9c,0xb5,0xfa,0x51,0xc1,0x3a,0xc7);
96DEFINE_GUID(TSATTRID_App_IncorrectSpelling, 0xf42de43c,0xef12,0x430d,0x94,0x4c,0x9a,0x08,0x97,0x0a,0x25,0xd2); 96DEFINE_GUID(TSATTRID_App_IncorrectSpelling, 0xf42de43c,0xef12,0x430d,0x94,0x4c,0x9a,0x08,0x97,0x0a,0x25,0xd2);
97DEFINE_GUID(TSATTRID_App_IncorrectGrammar, 0xbd54e398,0xad03,0x4b74,0xb6,0xb3,0x5e,0xdb,0x19,0x99,0x63,0x88); 97DEFINE_GUID(TSATTRID_App_IncorrectGrammar, 0xbd54e398,0xad03,0x4b74,0xb6,0xb3,0x5e,0xdb,0x19,0x99,0x63,0x88);
98 98
99#endif 99#endif
100 100
lib/libc/include/any-windows-any/tsuserex_i.c deleted-53
...@@ -1,53 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6#ifdef __cplusplus
7extern "C" {
8#endif
9
10#include <rpc.h>
11#include <rpcndr.h>
12
13#ifdef _MIDL_USE_GUIDDEF_
14
15#ifndef INITGUID
16#define INITGUID
17#include <guiddef.h>
18#undef INITGUID
19#else
20#include <guiddef.h>
21#endif
22
23#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
24#else
25
26#ifndef __IID_DEFINED__
27#define __IID_DEFINED__
28 typedef struct _IID {
29 unsigned long x;
30 unsigned short s1;
31 unsigned short s2;
32 unsigned char c[8];
33 } IID;
34#endif
35
36#ifndef CLSID_DEFINED
37#define CLSID_DEFINED
38 typedef IID CLSID;
39#endif
40
41#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
42#endif
43
44 MIDL_DEFINE_GUID(IID,LIBID_TSUSEREXLib,0x45413F04,0xDF86,0x11D1,0xAE,0x27,0x00,0xC0,0x4F,0xA3,0x58,0x13);
45 MIDL_DEFINE_GUID(CLSID,CLSID_TSUserExInterfaces,0x0910dd01,0xdf8c,0x11d1,0xae,0x27,0x00,0xc0,0x4f,0xa3,0x58,0x13);
46 MIDL_DEFINE_GUID(IID,IID_IADsTSUserEx,0xC4930E79,0x2989,0x4462,0x8A,0x60,0x2F,0xCF,0x2F,0x29,0x55,0xEF);
47 MIDL_DEFINE_GUID(CLSID,CLSID_ADsTSUserEx,0xE2E9CAE6,0x1E7B,0x4B8E,0xBA,0xBD,0xE9,0xBF,0x62,0x92,0xAC,0x29);
48
49#undef MIDL_DEFINE_GUID
50
51#ifdef __cplusplus
52}
53#endif
lib/libc/include/any-windows-any/tsvirtualchannels.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/tsvirtualchannels.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/tsvirtualchannels.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/tuner.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/tuner.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/tuner.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/uianimation.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/uianimation.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/uianimation.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/uiautomationclient.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/uiautomationclient.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/uiautomationclient.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/uiautomationcore.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/uiautomationcore.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/uiautomationcore.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/uiviewsettingsinterop.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/uiviewsettingsinterop.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/uiviewsettingsinterop.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/unknwn.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/unknwn.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/unknwn.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/unknwnbase.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/unknwnbase.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/unknwnbase.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/urlhist.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/urlhist.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/urlhist.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/urlmon.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/urlmon.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/urlmon.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/usp10.h+1-1
...@@ -129,7 +129,7 @@ extern "C" {...@@ -129,7 +129,7 @@ extern "C" {
129 SCRIPT_JUSTIFY_ARABIC_BA = 12,129 SCRIPT_JUSTIFY_ARABIC_BA = 12,
130 SCRIPT_JUSTIFY_ARABIC_BARA = 13,130 SCRIPT_JUSTIFY_ARABIC_BARA = 13,
131 SCRIPT_JUSTIFY_ARABIC_SEEN = 14,131 SCRIPT_JUSTIFY_ARABIC_SEEN = 14,
132 SCRIPT_JUSTIFY_ARABIC_SEEN_M = 15,132 SCRIPT_JUSTIFY_ARABIC_SEEN_M = 15
133 } SCRIPT_JUSTIFY;133 } SCRIPT_JUSTIFY;
134134
135 typedef struct tag_SCRIPT_VISATTR {135 typedef struct tag_SCRIPT_VISATTR {
lib/libc/include/any-windows-any/uxtheme.h+5-5
...@@ -39,7 +39,7 @@ typedef enum TA_PROPERTY {...@@ -39,7 +39,7 @@ typedef enum TA_PROPERTY {
39 TAP_STAGGERDELAY,39 TAP_STAGGERDELAY,
40 TAP_STAGGERDELAYCAP,40 TAP_STAGGERDELAYCAP,
41 TAP_STAGGERDELAYFACTOR,41 TAP_STAGGERDELAYFACTOR,
42 TAP_ZORDER,42 TAP_ZORDER
43} TA_PROPERTY;43} TA_PROPERTY;
4444
45typedef enum TA_PROPERTY_FLAG {45typedef enum TA_PROPERTY_FLAG {
...@@ -48,7 +48,7 @@ typedef enum TA_PROPERTY_FLAG {...@@ -48,7 +48,7 @@ typedef enum TA_PROPERTY_FLAG {
48 TAPF_ISRTLAWARE = 0x2,48 TAPF_ISRTLAWARE = 0x2,
49 TAPF_ALLOWCOLLECTION = 0x4,49 TAPF_ALLOWCOLLECTION = 0x4,
50 TAPF_HASBACKGROUND = 0x8,50 TAPF_HASBACKGROUND = 0x8,
51 TAPF_HASPERSPECTIVE = 0x10,51 TAPF_HASPERSPECTIVE = 0x10
52} TA_PROPERTY_FLAG;52} TA_PROPERTY_FLAG;
5353
54THEMEAPI GetThemeAnimationProperty(HTHEME hTheme, int iStoryboardId, int iTargetId, TA_PROPERTY eProperty, VOID *pvProperty, DWORD cbSize, DWORD *pcbSizeOut);54THEMEAPI GetThemeAnimationProperty(HTHEME hTheme, int iStoryboardId, int iTargetId, TA_PROPERTY eProperty, VOID *pvProperty, DWORD cbSize, DWORD *pcbSizeOut);
...@@ -57,14 +57,14 @@ typedef enum TA_TRANSFORM_TYPE {...@@ -57,14 +57,14 @@ typedef enum TA_TRANSFORM_TYPE {
57 TATT_TRANSLATE_2D,57 TATT_TRANSLATE_2D,
58 TATT_SCALE_2D,58 TATT_SCALE_2D,
59 TATT_OPACITY,59 TATT_OPACITY,
60 TATT_CLIP,60 TATT_CLIP
61} TA_TRANSFORM_TYPE;61} TA_TRANSFORM_TYPE;
6262
63typedef enum TA_TRANSFORM_FLAG {63typedef enum TA_TRANSFORM_FLAG {
64 TATF_NONE = 0x0,64 TATF_NONE = 0x0,
65 TATF_TARGETVALUES_USER = 0x1,65 TATF_TARGETVALUES_USER = 0x1,
66 TATF_HASINITIALVALUES = 0x2,66 TATF_HASINITIALVALUES = 0x2,
67 TATF_HASORIGINVALUES = 0x4,67 TATF_HASORIGINVALUES = 0x4
68} TA_TRANSFORM_FLAG;68} TA_TRANSFORM_FLAG;
6969
70typedef struct TA_TRANSFORM {70typedef struct TA_TRANSFORM {
...@@ -107,7 +107,7 @@ THEMEAPI GetThemeAnimationTransform(HTHEME hTheme, int iStoryboardId, int iTarge...@@ -107,7 +107,7 @@ THEMEAPI GetThemeAnimationTransform(HTHEME hTheme, int iStoryboardId, int iTarge
107107
108typedef enum TA_TIMINGFUNCTION_TYPE {108typedef enum TA_TIMINGFUNCTION_TYPE {
109 TTFT_UNDEFINED,109 TTFT_UNDEFINED,
110 TTFT_CUBIC_BEZIER,110 TTFT_CUBIC_BEZIER
111} TA_TIMINGFUNCTION_TYPE;111} TA_TIMINGFUNCTION_TYPE;
112112
113typedef struct TA_TIMINGFUNCTION {113typedef struct TA_TIMINGFUNCTION {
lib/libc/include/any-windows-any/vdslun.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vdslun.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vdslun.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vidcap.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vidcap.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vidcap.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vmr9.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vmr9.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vmr9.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vsadmin.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vsadmin.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vsadmin.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vsbackup.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vsbackup.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vsbackup.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vsmgmt.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vsmgmt.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vsmgmt.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vsprov.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vsprov.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vsprov.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vss.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vss.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vss.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/vsstyle.h+168-168
...@@ -66,22 +66,22 @@ enum AEROWIZARDPARTS {...@@ -66,22 +66,22 @@ enum AEROWIZARDPARTS {
66 AW_HEADERAREA = 2,66 AW_HEADERAREA = 2,
67 AW_CONTENTAREA = 3,67 AW_CONTENTAREA = 3,
68 AW_COMMANDAREA = 4,68 AW_COMMANDAREA = 4,
69 AW_BUTTON = 5,69 AW_BUTTON = 5
70};70};
7171
72#define AEROWIZARDSTYLEPARTS AEROWIZARDPARTS;72#define AEROWIZARDSTYLEPARTS AEROWIZARDPARTS;
7373
74enum TITLEBARSTATES {74enum TITLEBARSTATES {
75 AW_S_TITLEBAR_ACTIVE = 1,75 AW_S_TITLEBAR_ACTIVE = 1,
76 AW_S_TITLEBAR_INACTIVE = 2,76 AW_S_TITLEBAR_INACTIVE = 2
77};77};
7878
79enum HEADERAREASTATES {79enum HEADERAREASTATES {
80 AW_S_HEADERAREA_NOMARGIN = 1,80 AW_S_HEADERAREA_NOMARGIN = 1
81};81};
8282
83enum CONTENTAREASTATES {83enum CONTENTAREASTATES {
84 AW_S_CONTENTAREA_NOMARGIN = 1,84 AW_S_CONTENTAREA_NOMARGIN = 1
85};85};
8686
87/* BUTTONSTYLE class */87/* BUTTONSTYLE class */
...@@ -103,7 +103,7 @@ enum BUTTONPARTS {...@@ -103,7 +103,7 @@ enum BUTTONPARTS {
103 BP_GROUPBOX = 4,103 BP_GROUPBOX = 4,
104 BP_USERBUTTON = 5,104 BP_USERBUTTON = 5,
105 BP_COMMANDLINK = 6,105 BP_COMMANDLINK = 6,
106 BP_COMMANDLINKGLYPH = 7,106 BP_COMMANDLINKGLYPH = 7
107};107};
108108
109#define BUTTONSTYLEPARTS BUTTONPARTS;109#define BUTTONSTYLEPARTS BUTTONPARTS;
...@@ -114,7 +114,7 @@ enum PUSHBUTTONSTATES {...@@ -114,7 +114,7 @@ enum PUSHBUTTONSTATES {
114 PBS_PRESSED = 3,114 PBS_PRESSED = 3,
115 PBS_DISABLED = 4,115 PBS_DISABLED = 4,
116 PBS_DEFAULTED = 5,116 PBS_DEFAULTED = 5,
117 PBS_DEFAULTED_ANIMATING = 6,117 PBS_DEFAULTED_ANIMATING = 6
118};118};
119119
120enum RADIOBUTTONSTATES {120enum RADIOBUTTONSTATES {
...@@ -125,7 +125,7 @@ enum RADIOBUTTONSTATES {...@@ -125,7 +125,7 @@ enum RADIOBUTTONSTATES {
125 RBS_CHECKEDNORMAL = 5,125 RBS_CHECKEDNORMAL = 5,
126 RBS_CHECKEDHOT = 6,126 RBS_CHECKEDHOT = 6,
127 RBS_CHECKEDPRESSED = 7,127 RBS_CHECKEDPRESSED = 7,
128 RBS_CHECKEDDISABLED = 8,128 RBS_CHECKEDDISABLED = 8
129};129};
130130
131enum CHECKBOXSTATES {131enum CHECKBOXSTATES {
...@@ -148,12 +148,12 @@ enum CHECKBOXSTATES {...@@ -148,12 +148,12 @@ enum CHECKBOXSTATES {
148 CBS_EXCLUDEDNORMAL = 17,148 CBS_EXCLUDEDNORMAL = 17,
149 CBS_EXCLUDEDHOT = 18,149 CBS_EXCLUDEDHOT = 18,
150 CBS_EXCLUDEDPRESSED = 19,150 CBS_EXCLUDEDPRESSED = 19,
151 CBS_EXCLUDEDDISABLED = 20,151 CBS_EXCLUDEDDISABLED = 20
152};152};
153153
154enum GROUPBOXSTATES {154enum GROUPBOXSTATES {
155 GBS_NORMAL = 1,155 GBS_NORMAL = 1,
156 GBS_DISABLED = 2,156 GBS_DISABLED = 2
157};157};
158158
159enum COMMANDLINKSTATES {159enum COMMANDLINKSTATES {
...@@ -162,7 +162,7 @@ enum COMMANDLINKSTATES {...@@ -162,7 +162,7 @@ enum COMMANDLINKSTATES {
162 CMDLS_PRESSED = 3,162 CMDLS_PRESSED = 3,
163 CMDLS_DISABLED = 4,163 CMDLS_DISABLED = 4,
164 CMDLS_DEFAULTED = 5,164 CMDLS_DEFAULTED = 5,
165 CMDLS_DEFAULTED_ANIMATING = 6,165 CMDLS_DEFAULTED_ANIMATING = 6
166};166};
167167
168enum COMMANDLINKGLYPHSTATES {168enum COMMANDLINKGLYPHSTATES {
...@@ -170,7 +170,7 @@ enum COMMANDLINKGLYPHSTATES {...@@ -170,7 +170,7 @@ enum COMMANDLINKGLYPHSTATES {
170 CMDLGS_HOT = 2,170 CMDLGS_HOT = 2,
171 CMDLGS_PRESSED = 3,171 CMDLGS_PRESSED = 3,
172 CMDLGS_DISABLED = 4,172 CMDLGS_DISABLED = 4,
173 CMDLGS_DEFAULTED = 5,173 CMDLGS_DEFAULTED = 5
174};174};
175175
176/* COMBOBOXSTYLE class */176/* COMBOBOXSTYLE class */
...@@ -193,7 +193,7 @@ enum COMBOBOXPARTS {...@@ -193,7 +193,7 @@ enum COMBOBOXPARTS {
193 CP_READONLY = 5,193 CP_READONLY = 5,
194 CP_DROPDOWNBUTTONRIGHT = 6,194 CP_DROPDOWNBUTTONRIGHT = 6,
195 CP_DROPDOWNBUTTONLEFT = 7,195 CP_DROPDOWNBUTTONLEFT = 7,
196 CP_CUEBANNER = 8,196 CP_CUEBANNER = 8
197};197};
198198
199#define COMBOBOXSTYLEPARTS COMBOBOXPARTS;199#define COMBOBOXSTYLEPARTS COMBOBOXPARTS;
...@@ -202,49 +202,49 @@ enum COMBOBOXSTYLESTATES {...@@ -202,49 +202,49 @@ enum COMBOBOXSTYLESTATES {
202 CBXS_NORMAL = 1,202 CBXS_NORMAL = 1,
203 CBXS_HOT = 2,203 CBXS_HOT = 2,
204 CBXS_PRESSED = 3,204 CBXS_PRESSED = 3,
205 CBXS_DISABLED = 4,205 CBXS_DISABLED = 4
206};206};
207207
208enum DROPDOWNBUTTONRIGHTSTATES {208enum DROPDOWNBUTTONRIGHTSTATES {
209 CBXSR_NORMAL = 1,209 CBXSR_NORMAL = 1,
210 CBXSR_HOT = 2,210 CBXSR_HOT = 2,
211 CBXSR_PRESSED = 3,211 CBXSR_PRESSED = 3,
212 CBXSR_DISABLED = 4,212 CBXSR_DISABLED = 4
213};213};
214214
215enum DROPDOWNBUTTONLEFTSTATES {215enum DROPDOWNBUTTONLEFTSTATES {
216 CBXSL_NORMAL = 1,216 CBXSL_NORMAL = 1,
217 CBXSL_HOT = 2,217 CBXSL_HOT = 2,
218 CBXSL_PRESSED = 3,218 CBXSL_PRESSED = 3,
219 CBXSL_DISABLED = 4,219 CBXSL_DISABLED = 4
220};220};
221221
222enum TRANSPARENTBACKGROUNDSTATES {222enum TRANSPARENTBACKGROUNDSTATES {
223 CBTBS_NORMAL = 1,223 CBTBS_NORMAL = 1,
224 CBTBS_HOT = 2,224 CBTBS_HOT = 2,
225 CBTBS_DISABLED = 3,225 CBTBS_DISABLED = 3,
226 CBTBS_FOCUSED = 4,226 CBTBS_FOCUSED = 4
227};227};
228228
229enum BORDERSTATES {229enum BORDERSTATES {
230 CBB_NORMAL = 1,230 CBB_NORMAL = 1,
231 CBB_HOT = 2,231 CBB_HOT = 2,
232 CBB_FOCUSED = 3,232 CBB_FOCUSED = 3,
233 CBB_DISABLED = 4,233 CBB_DISABLED = 4
234};234};
235235
236enum READONLYSTATES {236enum READONLYSTATES {
237 CBRO_NORMAL = 1,237 CBRO_NORMAL = 1,
238 CBRO_HOT = 2,238 CBRO_HOT = 2,
239 CBRO_PRESSED = 3,239 CBRO_PRESSED = 3,
240 CBRO_DISABLED = 4,240 CBRO_DISABLED = 4
241};241};
242242
243enum CUEBANNERSTATES {243enum CUEBANNERSTATES {
244 CBCB_NORMAL = 1,244 CBCB_NORMAL = 1,
245 CBCB_HOT = 2,245 CBCB_HOT = 2,
246 CBCB_PRESSED = 3,246 CBCB_PRESSED = 3,
247 CBCB_DISABLED = 4,247 CBCB_DISABLED = 4
248};248};
249249
250/* COMMUNICATIONSSTYLE class */250/* COMMUNICATIONSSTYLE class */
...@@ -260,7 +260,7 @@ static const WCHAR VSCLASS_COMMUNICATIONS [] = {'C','O','M','M','U','N','I','C',...@@ -260,7 +260,7 @@ static const WCHAR VSCLASS_COMMUNICATIONS [] = {'C','O','M','M','U','N','I','C',
260#endif260#endif
261261
262enum COMMUNICATIONSPARTS {262enum COMMUNICATIONSPARTS {
263 CSST_TAB = 1,263 CSST_TAB = 1
264};264};
265265
266#define COMMUNICATIONSSTYLEPARTS COMMUNICATIONSPARTS;266#define COMMUNICATIONSSTYLEPARTS COMMUNICATIONSPARTS;
...@@ -268,7 +268,7 @@ enum COMMUNICATIONSPARTS {...@@ -268,7 +268,7 @@ enum COMMUNICATIONSPARTS {
268enum TABSTATES {268enum TABSTATES {
269 CSTB_NORMAL = 1,269 CSTB_NORMAL = 1,
270 CSTB_HOT = 2,270 CSTB_HOT = 2,
271 CSTB_SELECTED = 3,271 CSTB_SELECTED = 3
272};272};
273273
274/* CONTROLPANELSTYLE class */274/* CONTROLPANELSTYLE class */
...@@ -302,7 +302,7 @@ enum CONTROLPANELPARTS {...@@ -302,7 +302,7 @@ enum CONTROLPANELPARTS {
302 CPANEL_NAVIGATIONPANELINE = 16,302 CPANEL_NAVIGATIONPANELINE = 16,
303 CPANEL_CONTENTPANELINE = 17,303 CPANEL_CONTENTPANELINE = 17,
304 CPANEL_BANNERAREA = 18,304 CPANEL_BANNERAREA = 18,
305 CPANEL_BODYTITLE = 19,305 CPANEL_BODYTITLE = 19
306};306};
307307
308#define CONTROLPANELSTYLEPARTS CONTROLPANELPARTS;308#define CONTROLPANELSTYLEPARTS CONTROLPANELPARTS;
...@@ -311,7 +311,7 @@ enum HELPLINKSTATES {...@@ -311,7 +311,7 @@ enum HELPLINKSTATES {
311 CPHL_NORMAL = 1,311 CPHL_NORMAL = 1,
312 CPHL_HOT = 2,312 CPHL_HOT = 2,
313 CPHL_PRESSED = 3,313 CPHL_PRESSED = 3,
314 CPHL_DISABLED = 4,314 CPHL_DISABLED = 4
315};315};
316316
317enum TASKLINKSTATES {317enum TASKLINKSTATES {
...@@ -319,19 +319,19 @@ enum TASKLINKSTATES {...@@ -319,19 +319,19 @@ enum TASKLINKSTATES {
319 CPTL_HOT = 2,319 CPTL_HOT = 2,
320 CPTL_PRESSED = 3,320 CPTL_PRESSED = 3,
321 CPTL_DISABLED = 4,321 CPTL_DISABLED = 4,
322 CPTL_PAGE = 5,322 CPTL_PAGE = 5
323};323};
324324
325enum CONTENTLINKSTATES {325enum CONTENTLINKSTATES {
326 CPCL_NORMAL = 1,326 CPCL_NORMAL = 1,
327 CPCL_HOT = 2,327 CPCL_HOT = 2,
328 CPCL_PRESSED = 3,328 CPCL_PRESSED = 3,
329 CPCL_DISABLED = 4,329 CPCL_DISABLED = 4
330};330};
331331
332enum SECTIONTITLELINKSTATES {332enum SECTIONTITLELINKSTATES {
333 CPSTL_NORMAL = 1,333 CPSTL_NORMAL = 1,
334 CPSTL_HOT = 2,334 CPSTL_HOT = 2
335};335};
336336
337/* DATEPICKERSTYLE class */337/* DATEPICKERSTYLE class */
...@@ -349,7 +349,7 @@ static const WCHAR VSCLASS_DATEPICKER [] = {'D','A','T','E','P','I','C','K','E',...@@ -349,7 +349,7 @@ static const WCHAR VSCLASS_DATEPICKER [] = {'D','A','T','E','P','I','C','K','E',
349enum DATEPICKERPARTS {349enum DATEPICKERPARTS {
350 DP_DATETEXT = 1,350 DP_DATETEXT = 1,
351 DP_DATEBORDER = 2,351 DP_DATEBORDER = 2,
352 DP_SHOWCALENDARBUTTONRIGHT = 3,352 DP_SHOWCALENDARBUTTONRIGHT = 3
353};353};
354354
355#define DATEPICKERSTYLEPARTS DATEPICKERPARTS;355#define DATEPICKERSTYLEPARTS DATEPICKERPARTS;
...@@ -357,21 +357,21 @@ enum DATEPICKERPARTS {...@@ -357,21 +357,21 @@ enum DATEPICKERPARTS {
357enum DATETEXTSTATES {357enum DATETEXTSTATES {
358 DPDT_NORMAL = 1,358 DPDT_NORMAL = 1,
359 DPDT_DISABLED = 2,359 DPDT_DISABLED = 2,
360 DPDT_SELECTED = 3,360 DPDT_SELECTED = 3
361};361};
362362
363enum DATEBORDERSTATES {363enum DATEBORDERSTATES {
364 DPDB_NORMAL = 1,364 DPDB_NORMAL = 1,
365 DPDB_HOT = 2,365 DPDB_HOT = 2,
366 DPDB_FOCUSED = 3,366 DPDB_FOCUSED = 3,
367 DPDB_DISABLED = 4,367 DPDB_DISABLED = 4
368};368};
369369
370enum SHOWCALENDARBUTTONRIGHTSTATES {370enum SHOWCALENDARBUTTONRIGHTSTATES {
371 DPSCBR_NORMAL = 1,371 DPSCBR_NORMAL = 1,
372 DPSCBR_HOT = 2,372 DPSCBR_HOT = 2,
373 DPSCBR_PRESSED = 3,373 DPSCBR_PRESSED = 3,
374 DPSCBR_DISABLED = 4,374 DPSCBR_DISABLED = 4
375};375};
376376
377/* DRAGDROPSTYLE class */377/* DRAGDROPSTYLE class */
...@@ -394,39 +394,39 @@ enum DRAGDROPPARTS {...@@ -394,39 +394,39 @@ enum DRAGDROPPARTS {
394 DD_WARNING = 5,394 DD_WARNING = 5,
395 DD_NONE = 6,395 DD_NONE = 6,
396 DD_IMAGEBG = 7,396 DD_IMAGEBG = 7,
397 DD_TEXTBG = 8,397 DD_TEXTBG = 8
398};398};
399399
400#define DRAGDROPSTYLEPARTS DRAGDROPPARTS;400#define DRAGDROPSTYLEPARTS DRAGDROPPARTS;
401401
402enum COPYSTATES {402enum COPYSTATES {
403 DDCOPY_HIGHLIGHT = 1,403 DDCOPY_HIGHLIGHT = 1,
404 DDCOPY_NOHIGHLIGHT = 2,404 DDCOPY_NOHIGHLIGHT = 2
405};405};
406406
407enum MOVESTATES {407enum MOVESTATES {
408 DDMOVE_HIGHLIGHT = 1,408 DDMOVE_HIGHLIGHT = 1,
409 DDMOVE_NOHIGHLIGHT = 2,409 DDMOVE_NOHIGHLIGHT = 2
410};410};
411411
412enum UPDATEMETADATASTATES {412enum UPDATEMETADATASTATES {
413 DDUPDATEMETADATA_HIGHLIGHT = 1,413 DDUPDATEMETADATA_HIGHLIGHT = 1,
414 DDUPDATEMETADATA_NOHIGHLIGHT = 2,414 DDUPDATEMETADATA_NOHIGHLIGHT = 2
415};415};
416416
417enum CREATELINKSTATES {417enum CREATELINKSTATES {
418 DDCREATELINK_HIGHLIGHT = 1,418 DDCREATELINK_HIGHLIGHT = 1,
419 DDCREATELINK_NOHIGHLIGHT = 2,419 DDCREATELINK_NOHIGHLIGHT = 2
420};420};
421421
422enum WARNINGSTATES {422enum WARNINGSTATES {
423 DDWARNING_HIGHLIGHT = 1,423 DDWARNING_HIGHLIGHT = 1,
424 DDWARNING_NOHIGHLIGHT = 2,424 DDWARNING_NOHIGHLIGHT = 2
425};425};
426426
427enum NONESTATES {427enum NONESTATES {
428 DDNONE_HIGHLIGHT = 1,428 DDNONE_HIGHLIGHT = 1,
429 DDNONE_NOHIGHLIGHT = 2,429 DDNONE_NOHIGHLIGHT = 2
430};430};
431431
432/* EDITSTYLE class */432/* EDITSTYLE class */
...@@ -450,7 +450,7 @@ enum EDITPARTS {...@@ -450,7 +450,7 @@ enum EDITPARTS {
450 EP_EDITBORDER_NOSCROLL = 6,450 EP_EDITBORDER_NOSCROLL = 6,
451 EP_EDITBORDER_HSCROLL = 7,451 EP_EDITBORDER_HSCROLL = 7,
452 EP_EDITBORDER_VSCROLL = 8,452 EP_EDITBORDER_VSCROLL = 8,
453 EP_EDITBORDER_HVSCROLL = 9,453 EP_EDITBORDER_HVSCROLL = 9
454};454};
455455
456#define EDITSTYLEPARTS EDITPARTS;456#define EDITSTYLEPARTS EDITPARTS;
...@@ -463,7 +463,7 @@ enum EDITTEXTSTATES {...@@ -463,7 +463,7 @@ enum EDITTEXTSTATES {
463 ETS_FOCUSED = 5,463 ETS_FOCUSED = 5,
464 ETS_READONLY = 6,464 ETS_READONLY = 6,
465 ETS_ASSIST = 7,465 ETS_ASSIST = 7,
466 ETS_CUEBANNER = 8,466 ETS_CUEBANNER = 8
467};467};
468468
469enum BACKGROUNDSTATES {469enum BACKGROUNDSTATES {
...@@ -472,42 +472,42 @@ enum BACKGROUNDSTATES {...@@ -472,42 +472,42 @@ enum BACKGROUNDSTATES {
472 EBS_DISABLED = 3,472 EBS_DISABLED = 3,
473 EBS_FOCUSED = 4,473 EBS_FOCUSED = 4,
474 EBS_READONLY = 5,474 EBS_READONLY = 5,
475 EBS_ASSIST = 6,475 EBS_ASSIST = 6
476};476};
477477
478enum BACKGROUNDWITHBORDERSTATES {478enum BACKGROUNDWITHBORDERSTATES {
479 EBWBS_NORMAL = 1,479 EBWBS_NORMAL = 1,
480 EBWBS_HOT = 2,480 EBWBS_HOT = 2,
481 EBWBS_DISABLED = 3,481 EBWBS_DISABLED = 3,
482 EBWBS_FOCUSED = 4,482 EBWBS_FOCUSED = 4
483};483};
484484
485enum EDITBORDER_NOSCROLLSTATES {485enum EDITBORDER_NOSCROLLSTATES {
486 EPSN_NORMAL = 1,486 EPSN_NORMAL = 1,
487 EPSN_HOT = 2,487 EPSN_HOT = 2,
488 EPSN_FOCUSED = 3,488 EPSN_FOCUSED = 3,
489 EPSN_DISABLED = 4,489 EPSN_DISABLED = 4
490};490};
491491
492enum EDITBORDER_HSCROLLSTATES {492enum EDITBORDER_HSCROLLSTATES {
493 EPSH_NORMAL = 1,493 EPSH_NORMAL = 1,
494 EPSH_HOT = 2,494 EPSH_HOT = 2,
495 EPSH_FOCUSED = 3,495 EPSH_FOCUSED = 3,
496 EPSH_DISABLED = 4,496 EPSH_DISABLED = 4
497};497};
498498
499enum EDITBORDER_VSCROLLSTATES {499enum EDITBORDER_VSCROLLSTATES {
500 EPSV_NORMAL = 1,500 EPSV_NORMAL = 1,
501 EPSV_HOT = 2,501 EPSV_HOT = 2,
502 EPSV_FOCUSED = 3,502 EPSV_FOCUSED = 3,
503 EPSV_DISABLED = 4,503 EPSV_DISABLED = 4
504};504};
505505
506enum EDITBORDER_HVSCROLLSTATES {506enum EDITBORDER_HVSCROLLSTATES {
507 EPSHV_NORMAL = 1,507 EPSHV_NORMAL = 1,
508 EPSHV_HOT = 2,508 EPSHV_HOT = 2,
509 EPSHV_FOCUSED = 3,509 EPSHV_FOCUSED = 3,
510 EPSHV_DISABLED = 4,510 EPSHV_DISABLED = 4
511};511};
512512
513/* EXPLORERBARSTYLE class */513/* EXPLORERBARSTYLE class */
...@@ -534,7 +534,7 @@ enum EXPLORERBARPARTS {...@@ -534,7 +534,7 @@ enum EXPLORERBARPARTS {
534 EBP_SPECIALGROUPBACKGROUND = 9,534 EBP_SPECIALGROUPBACKGROUND = 9,
535 EBP_SPECIALGROUPCOLLAPSE = 10,535 EBP_SPECIALGROUPCOLLAPSE = 10,
536 EBP_SPECIALGROUPEXPAND = 11,536 EBP_SPECIALGROUPEXPAND = 11,
537 EBP_SPECIALGROUPHEAD = 12,537 EBP_SPECIALGROUPHEAD = 12
538};538};
539539
540#define EXPLORERBARSTYLEPARTS EXPLORERBARPARTS;540#define EXPLORERBARSTYLEPARTS EXPLORERBARPARTS;
...@@ -542,7 +542,7 @@ enum EXPLORERBARPARTS {...@@ -542,7 +542,7 @@ enum EXPLORERBARPARTS {
542enum HEADERCLOSESTATES {542enum HEADERCLOSESTATES {
543 EBHC_NORMAL = 1,543 EBHC_NORMAL = 1,
544 EBHC_HOT = 2,544 EBHC_HOT = 2,
545 EBHC_PRESSED = 3,545 EBHC_PRESSED = 3
546};546};
547547
548enum HEADERPINSTATES {548enum HEADERPINSTATES {
...@@ -551,37 +551,37 @@ enum HEADERPINSTATES {...@@ -551,37 +551,37 @@ enum HEADERPINSTATES {
551 EBHP_PRESSED = 3,551 EBHP_PRESSED = 3,
552 EBHP_SELECTEDNORMAL = 4,552 EBHP_SELECTEDNORMAL = 4,
553 EBHP_SELECTEDHOT = 5,553 EBHP_SELECTEDHOT = 5,
554 EBHP_SELECTEDPRESSED = 6,554 EBHP_SELECTEDPRESSED = 6
555};555};
556556
557enum IEBARMENUSTATES {557enum IEBARMENUSTATES {
558 EBM_NORMAL = 1,558 EBM_NORMAL = 1,
559 EBM_HOT = 2,559 EBM_HOT = 2,
560 EBM_PRESSED = 3,560 EBM_PRESSED = 3
561};561};
562562
563enum NORMALGROUPCOLLAPSESTATES {563enum NORMALGROUPCOLLAPSESTATES {
564 EBNGC_NORMAL = 1,564 EBNGC_NORMAL = 1,
565 EBNGC_HOT = 2,565 EBNGC_HOT = 2,
566 EBNGC_PRESSED = 3,566 EBNGC_PRESSED = 3
567};567};
568568
569enum NORMALGROUPEXPANDSTATES {569enum NORMALGROUPEXPANDSTATES {
570 EBNGE_NORMAL = 1,570 EBNGE_NORMAL = 1,
571 EBNGE_HOT = 2,571 EBNGE_HOT = 2,
572 EBNGE_PRESSED = 3,572 EBNGE_PRESSED = 3
573};573};
574574
575enum SPECIALGROUPCOLLAPSESTATES {575enum SPECIALGROUPCOLLAPSESTATES {
576 EBSGC_NORMAL = 1,576 EBSGC_NORMAL = 1,
577 EBSGC_HOT = 2,577 EBSGC_HOT = 2,
578 EBSGC_PRESSED = 3,578 EBSGC_PRESSED = 3
579};579};
580580
581enum SPECIALGROUPEXPANDSTATES {581enum SPECIALGROUPEXPANDSTATES {
582 EBSGE_NORMAL = 1,582 EBSGE_NORMAL = 1,
583 EBSGE_HOT = 2,583 EBSGE_HOT = 2,
584 EBSGE_PRESSED = 3,584 EBSGE_PRESSED = 3
585};585};
586586
587/* FLYOUTSTYLE class */587/* FLYOUTSTYLE class */
...@@ -604,7 +604,7 @@ enum FLYOUTPARTS {...@@ -604,7 +604,7 @@ enum FLYOUTPARTS {
604 FLYOUT_DIVIDER = 5,604 FLYOUT_DIVIDER = 5,
605 FLYOUT_WINDOW = 6,605 FLYOUT_WINDOW = 6,
606 FLYOUT_LINKAREA = 7,606 FLYOUT_LINKAREA = 7,
607 FLYOUT_LINKHEADER = 8,607 FLYOUT_LINKHEADER = 8
608};608};
609609
610#define FLYOUTSTYLEPARTS FLYOUTPARTS;610#define FLYOUTSTYLEPARTS FLYOUTPARTS;
...@@ -613,22 +613,22 @@ enum LABELSTATES {...@@ -613,22 +613,22 @@ enum LABELSTATES {
613 FLS_NORMAL = 1,613 FLS_NORMAL = 1,
614 FLS_SELECTED = 2,614 FLS_SELECTED = 2,
615 FLS_EMPHASIZED = 3,615 FLS_EMPHASIZED = 3,
616 FLS_DISABLED = 4,616 FLS_DISABLED = 4
617};617};
618618
619enum LINKSTATES {619enum LINKSTATES {
620 FLYOUTLINK_NORMAL = 1,620 FLYOUTLINK_NORMAL = 1,
621 FLYOUTLINK_HOVER = 2,621 FLYOUTLINK_HOVER = 2
622};622};
623623
624enum BODYSTATES {624enum BODYSTATES {
625 FBS_NORMAL = 1,625 FBS_NORMAL = 1,
626 FBS_EMPHASIZED = 2,626 FBS_EMPHASIZED = 2
627};627};
628628
629enum LINKHEADERSTATES {629enum LINKHEADERSTATES {
630 FLH_NORMAL = 1,630 FLH_NORMAL = 1,
631 FLH_HOVER = 2,631 FLH_HOVER = 2
632};632};
633633
634/* HEADERSTYLE class */634/* HEADERSTYLE class */
...@@ -650,14 +650,14 @@ enum HEADERPARTS {...@@ -650,14 +650,14 @@ enum HEADERPARTS {
650 HP_HEADERSORTARROW = 4,650 HP_HEADERSORTARROW = 4,
651 HP_HEADERDROPDOWN = 5,651 HP_HEADERDROPDOWN = 5,
652 HP_HEADERDROPDOWNFILTER = 6,652 HP_HEADERDROPDOWNFILTER = 6,
653 HP_HEADEROVERFLOW = 7,653 HP_HEADEROVERFLOW = 7
654};654};
655655
656#define HEADERSTYLEPARTS HEADERPARTS;656#define HEADERSTYLEPARTS HEADERPARTS;
657657
658enum HEADERSTYLESTATES {658enum HEADERSTYLESTATES {
659 HBG_DETAILS = 1,659 HBG_DETAILS = 1,
660 HBG_ICON = 2,660 HBG_ICON = 2
661};661};
662662
663enum HEADERITEMSTATES {663enum HEADERITEMSTATES {
...@@ -672,41 +672,41 @@ enum HEADERITEMSTATES {...@@ -672,41 +672,41 @@ enum HEADERITEMSTATES {
672 HIS_ICONPRESSED = 9,672 HIS_ICONPRESSED = 9,
673 HIS_ICONSORTEDNORMAL = 10,673 HIS_ICONSORTEDNORMAL = 10,
674 HIS_ICONSORTEDHOT = 11,674 HIS_ICONSORTEDHOT = 11,
675 HIS_ICONSORTEDPRESSED = 12,675 HIS_ICONSORTEDPRESSED = 12
676};676};
677677
678enum HEADERITEMLEFTSTATES {678enum HEADERITEMLEFTSTATES {
679 HILS_NORMAL = 1,679 HILS_NORMAL = 1,
680 HILS_HOT = 2,680 HILS_HOT = 2,
681 HILS_PRESSED = 3,681 HILS_PRESSED = 3
682};682};
683683
684enum HEADERITEMRIGHTSTATES {684enum HEADERITEMRIGHTSTATES {
685 HIRS_NORMAL = 1,685 HIRS_NORMAL = 1,
686 HIRS_HOT = 2,686 HIRS_HOT = 2,
687 HIRS_PRESSED = 3,687 HIRS_PRESSED = 3
688};688};
689689
690enum HEADERSORTARROWSTATES {690enum HEADERSORTARROWSTATES {
691 HSAS_SORTEDUP = 1,691 HSAS_SORTEDUP = 1,
692 HSAS_SORTEDDOWN = 2,692 HSAS_SORTEDDOWN = 2
693};693};
694694
695enum HEADERDROPDOWNSTATES {695enum HEADERDROPDOWNSTATES {
696 HDDS_NORMAL = 1,696 HDDS_NORMAL = 1,
697 HDDS_SOFTHOT = 2,697 HDDS_SOFTHOT = 2,
698 HDDS_HOT = 3,698 HDDS_HOT = 3
699};699};
700700
701enum HEADERDROPDOWNFILTERSTATES {701enum HEADERDROPDOWNFILTERSTATES {
702 HDDFS_NORMAL = 1,702 HDDFS_NORMAL = 1,
703 HDDFS_SOFTHOT = 2,703 HDDFS_SOFTHOT = 2,
704 HDDFS_HOT = 3,704 HDDFS_HOT = 3
705};705};
706706
707enum HEADEROVERFLOWSTATES {707enum HEADEROVERFLOWSTATES {
708 HOFS_NORMAL = 1,708 HOFS_NORMAL = 1,
709 HOFS_HOT = 2,709 HOFS_HOT = 2
710};710};
711711
712/* LISTBOXSTYLE class */712/* LISTBOXSTYLE class */
...@@ -726,7 +726,7 @@ enum LISTBOXPARTS {...@@ -726,7 +726,7 @@ enum LISTBOXPARTS {
726 LBCP_BORDER_HVSCROLL = 2,726 LBCP_BORDER_HVSCROLL = 2,
727 LBCP_BORDER_NOSCROLL = 3,727 LBCP_BORDER_NOSCROLL = 3,
728 LBCP_BORDER_VSCROLL = 4,728 LBCP_BORDER_VSCROLL = 4,
729 LBCP_ITEM = 5,729 LBCP_ITEM = 5
730};730};
731731
732#define LISTBOXSTYLEPARTS LISTBOXPARTS;732#define LISTBOXSTYLEPARTS LISTBOXPARTS;
...@@ -735,35 +735,35 @@ enum BORDER_HSCROLLSTATES {...@@ -735,35 +735,35 @@ enum BORDER_HSCROLLSTATES {
735 LBPSH_NORMAL = 1,735 LBPSH_NORMAL = 1,
736 LBPSH_FOCUSED = 2,736 LBPSH_FOCUSED = 2,
737 LBPSH_HOT = 3,737 LBPSH_HOT = 3,
738 LBPSH_DISABLED = 4,738 LBPSH_DISABLED = 4
739};739};
740740
741enum BORDER_HVSCROLLSTATES {741enum BORDER_HVSCROLLSTATES {
742 LBPSHV_NORMAL = 1,742 LBPSHV_NORMAL = 1,
743 LBPSHV_FOCUSED = 2,743 LBPSHV_FOCUSED = 2,
744 LBPSHV_HOT = 3,744 LBPSHV_HOT = 3,
745 LBPSHV_DISABLED = 4,745 LBPSHV_DISABLED = 4
746};746};
747747
748enum BORDER_NOSCROLLSTATES {748enum BORDER_NOSCROLLSTATES {
749 LBPSN_NORMAL = 1,749 LBPSN_NORMAL = 1,
750 LBPSN_FOCUSED = 2,750 LBPSN_FOCUSED = 2,
751 LBPSN_HOT = 3,751 LBPSN_HOT = 3,
752 LBPSN_DISABLED = 4,752 LBPSN_DISABLED = 4
753};753};
754754
755enum BORDER_VSCROLLSTATES {755enum BORDER_VSCROLLSTATES {
756 LBPSV_NORMAL = 1,756 LBPSV_NORMAL = 1,
757 LBPSV_FOCUSED = 2,757 LBPSV_FOCUSED = 2,
758 LBPSV_HOT = 3,758 LBPSV_HOT = 3,
759 LBPSV_DISABLED = 4,759 LBPSV_DISABLED = 4
760};760};
761761
762enum ITEMSTATES {762enum ITEMSTATES {
763 LBPSI_HOT = 1,763 LBPSI_HOT = 1,
764 LBPSI_HOTSELECTED = 2,764 LBPSI_HOTSELECTED = 2,
765 LBPSI_SELECTED = 3,765 LBPSI_SELECTED = 3,
766 LBPSI_SELECTEDNOTFOCUS = 4,766 LBPSI_SELECTEDNOTFOCUS = 4
767};767};
768768
769/* LISTVIEWSTYLE class */769/* LISTVIEWSTYLE class */
...@@ -788,7 +788,7 @@ enum LISTVIEWPARTS {...@@ -788,7 +788,7 @@ enum LISTVIEWPARTS {
788 LVP_GROUPHEADERLINE = 7,788 LVP_GROUPHEADERLINE = 7,
789 LVP_EXPANDBUTTON = 8,789 LVP_EXPANDBUTTON = 8,
790 LVP_COLLAPSEBUTTON = 9,790 LVP_COLLAPSEBUTTON = 9,
791 LVP_COLUMNDETAIL = 10,791 LVP_COLUMNDETAIL = 10
792};792};
793793
794#define LISTVIEWSTYLEPARTS LISTVIEWPARTS;794#define LISTVIEWSTYLEPARTS LISTVIEWPARTS;
...@@ -799,7 +799,7 @@ enum LISTITEMSTATES {...@@ -799,7 +799,7 @@ enum LISTITEMSTATES {
799 LISS_SELECTED = 3,799 LISS_SELECTED = 3,
800 LISS_DISABLED = 4,800 LISS_DISABLED = 4,
801 LISS_SELECTEDNOTFOCUS = 5,801 LISS_SELECTEDNOTFOCUS = 5,
802 LISS_HOTSELECTED = 6,802 LISS_HOTSELECTED = 6
803};803};
804804
805enum GROUPHEADERSTATES {805enum GROUPHEADERSTATES {
...@@ -818,7 +818,7 @@ enum GROUPHEADERSTATES {...@@ -818,7 +818,7 @@ enum GROUPHEADERSTATES {
818 LVGH_CLOSESELECTEDNOTFOCUSED = 13,818 LVGH_CLOSESELECTEDNOTFOCUSED = 13,
819 LVGH_CLOSESELECTEDNOTFOCUSEDHOT = 14,819 LVGH_CLOSESELECTEDNOTFOCUSEDHOT = 14,
820 LVGH_CLOSEMIXEDSELECTION = 15,820 LVGH_CLOSEMIXEDSELECTION = 15,
821 LVGH_CLOSEMIXEDSELECTIONHOT = 16,821 LVGH_CLOSEMIXEDSELECTIONHOT = 16
822};822};
823823
824enum GROUPHEADERLINESTATES {824enum GROUPHEADERLINESTATES {
...@@ -837,19 +837,19 @@ enum GROUPHEADERLINESTATES {...@@ -837,19 +837,19 @@ enum GROUPHEADERLINESTATES {
837 LVGHL_CLOSESELECTEDNOTFOCUSED = 13,837 LVGHL_CLOSESELECTEDNOTFOCUSED = 13,
838 LVGHL_CLOSESELECTEDNOTFOCUSEDHOT = 14,838 LVGHL_CLOSESELECTEDNOTFOCUSEDHOT = 14,
839 LVGHL_CLOSEMIXEDSELECTION = 15,839 LVGHL_CLOSEMIXEDSELECTION = 15,
840 LVGHL_CLOSEMIXEDSELECTIONHOT = 16,840 LVGHL_CLOSEMIXEDSELECTIONHOT = 16
841};841};
842842
843enum EXPANDBUTTONSTATES {843enum EXPANDBUTTONSTATES {
844 LVEB_NORMAL = 1,844 LVEB_NORMAL = 1,
845 LVEB_HOVER = 2,845 LVEB_HOVER = 2,
846 LVEB_PUSHED = 3,846 LVEB_PUSHED = 3
847};847};
848848
849enum COLLAPSEBUTTONSTATES {849enum COLLAPSEBUTTONSTATES {
850 LVCB_NORMAL = 1,850 LVCB_NORMAL = 1,
851 LVCB_HOVER = 2,851 LVCB_HOVER = 2,
852 LVCB_PUSHED = 3,852 LVCB_PUSHED = 3
853};853};
854854
855/* MENUSTYLE class */855/* MENUSTYLE class */
...@@ -884,14 +884,14 @@ enum MENUPARTS {...@@ -884,14 +884,14 @@ enum MENUPARTS {
884 MENU_SYSTEMCLOSE = 17,884 MENU_SYSTEMCLOSE = 17,
885 MENU_SYSTEMMAXIMIZE = 18,885 MENU_SYSTEMMAXIMIZE = 18,
886 MENU_SYSTEMMINIMIZE = 19,886 MENU_SYSTEMMINIMIZE = 19,
887 MENU_SYSTEMRESTORE = 20,887 MENU_SYSTEMRESTORE = 20
888};888};
889889
890#define MENUSTYLEPARTS MENUPARTS;890#define MENUSTYLEPARTS MENUPARTS;
891891
892enum BARBACKGROUNDSTATES {892enum BARBACKGROUNDSTATES {
893 MB_ACTIVE = 1,893 MB_ACTIVE = 1,
894 MB_INACTIVE = 2,894 MB_INACTIVE = 2
895};895};
896896
897enum BARITEMSTATES {897enum BARITEMSTATES {
...@@ -900,52 +900,52 @@ enum BARITEMSTATES {...@@ -900,52 +900,52 @@ enum BARITEMSTATES {
900 MBI_PUSHED = 3,900 MBI_PUSHED = 3,
901 MBI_DISABLED = 4,901 MBI_DISABLED = 4,
902 MBI_DISABLEDHOT = 5,902 MBI_DISABLEDHOT = 5,
903 MBI_DISABLEDPUSHED = 6,903 MBI_DISABLEDPUSHED = 6
904};904};
905905
906enum POPUPCHECKSTATES {906enum POPUPCHECKSTATES {
907 MC_CHECKMARKNORMAL = 1,907 MC_CHECKMARKNORMAL = 1,
908 MC_CHECKMARKDISABLED = 2,908 MC_CHECKMARKDISABLED = 2,
909 MC_BULLETNORMAL = 3,909 MC_BULLETNORMAL = 3,
910 MC_BULLETDISABLED = 4,910 MC_BULLETDISABLED = 4
911};911};
912912
913enum POPUPCHECKBACKGROUNDSTATES {913enum POPUPCHECKBACKGROUNDSTATES {
914 MCB_DISABLED = 1,914 MCB_DISABLED = 1,
915 MCB_NORMAL = 2,915 MCB_NORMAL = 2,
916 MCB_BITMAP = 3,916 MCB_BITMAP = 3
917};917};
918918
919enum POPUPITEMSTATES {919enum POPUPITEMSTATES {
920 MPI_NORMAL = 1,920 MPI_NORMAL = 1,
921 MPI_HOT = 2,921 MPI_HOT = 2,
922 MPI_DISABLED = 3,922 MPI_DISABLED = 3,
923 MPI_DISABLEDHOT = 4,923 MPI_DISABLEDHOT = 4
924};924};
925925
926enum POPUPSUBMENUSTATES {926enum POPUPSUBMENUSTATES {
927 MSM_NORMAL = 1,927 MSM_NORMAL = 1,
928 MSM_DISABLED = 2,928 MSM_DISABLED = 2
929};929};
930930
931enum SYSTEMCLOSESTATES {931enum SYSTEMCLOSESTATES {
932 MSYSC_NORMAL = 1,932 MSYSC_NORMAL = 1,
933 MSYSC_DISABLED = 2,933 MSYSC_DISABLED = 2
934};934};
935935
936enum SYSTEMMAXIMIZESTATES {936enum SYSTEMMAXIMIZESTATES {
937 MSYSMX_NORMAL = 1,937 MSYSMX_NORMAL = 1,
938 MSYSMX_DISABLED = 2,938 MSYSMX_DISABLED = 2
939};939};
940940
941enum SYSTEMMINIMIZESTATES {941enum SYSTEMMINIMIZESTATES {
942 MSYSMN_NORMAL = 1,942 MSYSMN_NORMAL = 1,
943 MSYSMN_DISABLED = 2,943 MSYSMN_DISABLED = 2
944};944};
945945
946enum SYSTEMRESTORESTATES {946enum SYSTEMRESTORESTATES {
947 MSYSR_NORMAL = 1,947 MSYSR_NORMAL = 1,
948 MSYSR_DISABLED = 2,948 MSYSR_DISABLED = 2
949};949};
950950
951/* NAVIGATION class */951/* NAVIGATION class */
...@@ -960,28 +960,28 @@ static const WCHAR VSCLASS_NAVIGATION [] = {'N','A','V','I','G','A','T','I','O',...@@ -960,28 +960,28 @@ static const WCHAR VSCLASS_NAVIGATION [] = {'N','A','V','I','G','A','T','I','O',
960enum NAVIGATIONPARTS {960enum NAVIGATIONPARTS {
961 NAV_BACKBUTTON = 1,961 NAV_BACKBUTTON = 1,
962 NAV_FORWARDBUTTON = 2,962 NAV_FORWARDBUTTON = 2,
963 NAV_MENUBUTTON = 3,963 NAV_MENUBUTTON = 3
964};964};
965965
966enum NAV_BACKBUTTONSTATES {966enum NAV_BACKBUTTONSTATES {
967 NAV_BB_NORMAL = 1,967 NAV_BB_NORMAL = 1,
968 NAV_BB_HOT = 2,968 NAV_BB_HOT = 2,
969 NAV_BB_PRESSED = 3,969 NAV_BB_PRESSED = 3,
970 NAV_BB_DISABLED = 4,970 NAV_BB_DISABLED = 4
971};971};
972972
973enum NAV_FORWARDBUTTONSTATES {973enum NAV_FORWARDBUTTONSTATES {
974 NAV_FB_NORMAL = 1,974 NAV_FB_NORMAL = 1,
975 NAV_FB_HOT = 2,975 NAV_FB_HOT = 2,
976 NAV_FB_PRESSED = 3,976 NAV_FB_PRESSED = 3,
977 NAV_FB_DISABLED = 4,977 NAV_FB_DISABLED = 4
978};978};
979979
980enum NAV_MENUBUTTONSTATES {980enum NAV_MENUBUTTONSTATES {
981 NAV_MB_NORMAL = 1,981 NAV_MB_NORMAL = 1,
982 NAV_MB_HOT = 2,982 NAV_MB_HOT = 2,
983 NAV_MB_PRESSED = 3,983 NAV_MB_PRESSED = 3,
984 NAV_MB_DISABLED = 4,984 NAV_MB_DISABLED = 4
985};985};
986986
987/* PROGRESSSTYLE class */987/* PROGRESSSTYLE class */
...@@ -1008,33 +1008,33 @@ enum PROGRESSPARTS {...@@ -1008,33 +1008,33 @@ enum PROGRESSPARTS {
1008 PP_PULSEOVERLAYVERT = 9,1008 PP_PULSEOVERLAYVERT = 9,
1009 PP_MOVEOVERLAYVERT = 10,1009 PP_MOVEOVERLAYVERT = 10,
1010 PP_TRANSPARENTBAR = 11,1010 PP_TRANSPARENTBAR = 11,
1011 PP_TRANSPARENTBARVERT = 12,1011 PP_TRANSPARENTBARVERT = 12
1012};1012};
10131013
1014#define PROGRESSSTYLEPARTS PROGRESSPARTS;1014#define PROGRESSSTYLEPARTS PROGRESSPARTS;
10151015
1016enum TRANSPARENTBARSTATES {1016enum TRANSPARENTBARSTATES {
1017 PBBS_NORMAL = 1,1017 PBBS_NORMAL = 1,
1018 PBBS_PARTIAL = 2,1018 PBBS_PARTIAL = 2
1019};1019};
10201020
1021enum TRANSPARENTBARVERTSTATES {1021enum TRANSPARENTBARVERTSTATES {
1022 PBBVS_NORMAL = 1,1022 PBBVS_NORMAL = 1,
1023 PBBVS_PARTIAL = 2,1023 PBBVS_PARTIAL = 2
1024};1024};
10251025
1026enum FILLSTATES {1026enum FILLSTATES {
1027 PBFS_NORMAL = 1,1027 PBFS_NORMAL = 1,
1028 PBFS_ERROR = 2,1028 PBFS_ERROR = 2,
1029 PBFS_PAUSED = 3,1029 PBFS_PAUSED = 3,
1030 PBFS_PARTIAL = 4,1030 PBFS_PARTIAL = 4
1031};1031};
10321032
1033enum FILLVERTSTATES {1033enum FILLVERTSTATES {
1034 PBFVS_NORMAL = 1,1034 PBFVS_NORMAL = 1,
1035 PBFVS_ERROR = 2,1035 PBFVS_ERROR = 2,
1036 PBFVS_PAUSED = 3,1036 PBFVS_PAUSED = 3,
1037 PBFVS_PARTIAL = 4,1037 PBFVS_PARTIAL = 4
1038};1038};
10391039
1040/* REBARSTYLE class */1040/* REBARSTYLE class */
...@@ -1057,7 +1057,7 @@ enum REBARPARTS {...@@ -1057,7 +1057,7 @@ enum REBARPARTS {
1057 RP_CHEVRONVERT = 5,1057 RP_CHEVRONVERT = 5,
1058 RP_BACKGROUND = 6,1058 RP_BACKGROUND = 6,
1059 RP_SPLITTER = 7,1059 RP_SPLITTER = 7,
1060 RP_SPLITTERVERT = 8,1060 RP_SPLITTERVERT = 8
1061};1061};
10621062
1063#define REBARSTYLEPARTS REBARPARTS;1063#define REBARSTYLEPARTS REBARPARTS;
...@@ -1065,25 +1065,25 @@ enum REBARPARTS {...@@ -1065,25 +1065,25 @@ enum REBARPARTS {
1065enum CHEVRONSTATES {1065enum CHEVRONSTATES {
1066 CHEVS_NORMAL = 1,1066 CHEVS_NORMAL = 1,
1067 CHEVS_HOT = 2,1067 CHEVS_HOT = 2,
1068 CHEVS_PRESSED = 3,1068 CHEVS_PRESSED = 3
1069};1069};
10701070
1071enum CHEVRONVERTSTATES {1071enum CHEVRONVERTSTATES {
1072 CHEVSV_NORMAL = 1,1072 CHEVSV_NORMAL = 1,
1073 CHEVSV_HOT = 2,1073 CHEVSV_HOT = 2,
1074 CHEVSV_PRESSED = 3,1074 CHEVSV_PRESSED = 3
1075};1075};
10761076
1077enum SPLITTERSTATES {1077enum SPLITTERSTATES {
1078 SPLITS_NORMAL = 1,1078 SPLITS_NORMAL = 1,
1079 SPLITS_HOT = 2,1079 SPLITS_HOT = 2,
1080 SPLITS_PRESSED = 3,1080 SPLITS_PRESSED = 3
1081};1081};
10821082
1083enum SPLITTERVERTSTATES {1083enum SPLITTERVERTSTATES {
1084 SPLITSV_NORMAL = 1,1084 SPLITSV_NORMAL = 1,
1085 SPLITSV_HOT = 2,1085 SPLITSV_HOT = 2,
1086 SPLITSV_PRESSED = 3,1086 SPLITSV_PRESSED = 3
1087};1087};
10881088
1089/* SCROLLBARSTYLE class */1089/* SCROLLBARSTYLE class */
...@@ -1108,7 +1108,7 @@ enum SCROLLBARPARTS {...@@ -1108,7 +1108,7 @@ enum SCROLLBARPARTS {
1108 SBP_UPPERTRACKVERT = 7,1108 SBP_UPPERTRACKVERT = 7,
1109 SBP_GRIPPERHORZ = 8,1109 SBP_GRIPPERHORZ = 8,
1110 SBP_GRIPPERVERT = 9,1110 SBP_GRIPPERVERT = 9,
1111 SBP_SIZEBOX = 10,1111 SBP_SIZEBOX = 10
1112};1112};
11131113
1114#define SCROLLBARSTYLEPARTS SCROLLBARPARTS;1114#define SCROLLBARSTYLEPARTS SCROLLBARPARTS;
...@@ -1133,7 +1133,7 @@ enum ARROWBTNSTATES {...@@ -1133,7 +1133,7 @@ enum ARROWBTNSTATES {
1133 ABS_UPHOVER = 17,1133 ABS_UPHOVER = 17,
1134 ABS_DOWNHOVER = 18,1134 ABS_DOWNHOVER = 18,
1135 ABS_LEFTHOVER = 19,1135 ABS_LEFTHOVER = 19,
1136 ABS_RIGHTHOVER = 20,1136 ABS_RIGHTHOVER = 20
1137};1137};
11381138
1139enum SCROLLBARSTYLESTATES {1139enum SCROLLBARSTYLESTATES {
...@@ -1141,7 +1141,7 @@ enum SCROLLBARSTYLESTATES {...@@ -1141,7 +1141,7 @@ enum SCROLLBARSTYLESTATES {
1141 SCRBS_HOT = 2,1141 SCRBS_HOT = 2,
1142 SCRBS_PRESSED = 3,1142 SCRBS_PRESSED = 3,
1143 SCRBS_DISABLED = 4,1143 SCRBS_DISABLED = 4,
1144 SCRBS_HOVER = 5,1144 SCRBS_HOVER = 5
1145};1145};
11461146
1147enum SIZEBOXSTATES {1147enum SIZEBOXSTATES {
...@@ -1152,7 +1152,7 @@ enum SIZEBOXSTATES {...@@ -1152,7 +1152,7 @@ enum SIZEBOXSTATES {
1152 SZB_HALFBOTTOMRIGHTALIGN = 5,1152 SZB_HALFBOTTOMRIGHTALIGN = 5,
1153 SZB_HALFBOTTOMLEFTALIGN = 6,1153 SZB_HALFBOTTOMLEFTALIGN = 6,
1154 SZB_HALFTOPRIGHTALIGN = 7,1154 SZB_HALFTOPRIGHTALIGN = 7,
1155 SZB_HALFTOPLEFTALIGN = 8,1155 SZB_HALFTOPLEFTALIGN = 8
1156};1156};
11571157
1158/* SPINSTYLE class */1158/* SPINSTYLE class */
...@@ -1175,7 +1175,7 @@ enum SPINPARTS {...@@ -1175,7 +1175,7 @@ enum SPINPARTS {
1175 SPNP_UP = 1,1175 SPNP_UP = 1,
1176 SPNP_DOWN = 2,1176 SPNP_DOWN = 2,
1177 SPNP_UPHORZ = 3,1177 SPNP_UPHORZ = 3,
1178 SPNP_DOWNHORZ = 4,1178 SPNP_DOWNHORZ = 4
1179};1179};
11801180
1181#define SPINSTYLEPARTS SPINPARTS;1181#define SPINSTYLEPARTS SPINPARTS;
...@@ -1184,28 +1184,28 @@ enum UPSTATES {...@@ -1184,28 +1184,28 @@ enum UPSTATES {
1184 UPS_NORMAL = 1,1184 UPS_NORMAL = 1,
1185 UPS_HOT = 2,1185 UPS_HOT = 2,
1186 UPS_PRESSED = 3,1186 UPS_PRESSED = 3,
1187 UPS_DISABLED = 4,1187 UPS_DISABLED = 4
1188};1188};
11891189
1190enum DOWNSTATES {1190enum DOWNSTATES {
1191 DNS_NORMAL = 1,1191 DNS_NORMAL = 1,
1192 DNS_HOT = 2,1192 DNS_HOT = 2,
1193 DNS_PRESSED = 3,1193 DNS_PRESSED = 3,
1194 DNS_DISABLED = 4,1194 DNS_DISABLED = 4
1195};1195};
11961196
1197enum UPHORZSTATES {1197enum UPHORZSTATES {
1198 UPHZS_NORMAL = 1,1198 UPHZS_NORMAL = 1,
1199 UPHZS_HOT = 2,1199 UPHZS_HOT = 2,
1200 UPHZS_PRESSED = 3,1200 UPHZS_PRESSED = 3,
1201 UPHZS_DISABLED = 4,1201 UPHZS_DISABLED = 4
1202};1202};
12031203
1204enum DOWNHORZSTATES {1204enum DOWNHORZSTATES {
1205 DNHZS_NORMAL = 1,1205 DNHZS_NORMAL = 1,
1206 DNHZS_HOT = 2,1206 DNHZS_HOT = 2,
1207 DNHZS_PRESSED = 3,1207 DNHZS_PRESSED = 3,
1208 DNHZS_DISABLED = 4,1208 DNHZS_DISABLED = 4
1209};1209};
12101210
1211/* STATUSSTYLE class */1211/* STATUSSTYLE class */
...@@ -1223,7 +1223,7 @@ static const WCHAR VSCLASS_STATUS [] = {'S','T','A','T','U','S',0};...@@ -1223,7 +1223,7 @@ static const WCHAR VSCLASS_STATUS [] = {'S','T','A','T','U','S',0};
1223enum STATUSPARTS {1223enum STATUSPARTS {
1224 SP_PANE = 1,1224 SP_PANE = 1,
1225 SP_GRIPPERPANE = 2,1225 SP_GRIPPERPANE = 2,
1226 SP_GRIPPER = 3,1226 SP_GRIPPER = 3
1227};1227};
12281228
1229#define STATUSSTYLEPARTS STATUSPARTS;1229#define STATUSSTYLEPARTS STATUSPARTS;
...@@ -1251,7 +1251,7 @@ enum TABPARTS {...@@ -1251,7 +1251,7 @@ enum TABPARTS {
1251 TABP_TOPTABITEMBOTHEDGE = 8,1251 TABP_TOPTABITEMBOTHEDGE = 8,
1252 TABP_PANE = 9,1252 TABP_PANE = 9,
1253 TABP_BODY = 10,1253 TABP_BODY = 10,
1254 TABP_AEROWIZARDBODY = 11,1254 TABP_AEROWIZARDBODY = 11
1255};1255};
12561256
1257#define TABSTYLEPARTS TABPARTS;1257#define TABSTYLEPARTS TABPARTS;
...@@ -1261,7 +1261,7 @@ enum TABITEMSTATES {...@@ -1261,7 +1261,7 @@ enum TABITEMSTATES {
1261 TIS_HOT = 2,1261 TIS_HOT = 2,
1262 TIS_SELECTED = 3,1262 TIS_SELECTED = 3,
1263 TIS_DISABLED = 4,1263 TIS_DISABLED = 4,
1264 TIS_FOCUSED = 5,1264 TIS_FOCUSED = 5
1265};1265};
12661266
1267enum TABITEMLEFTEDGESTATES {1267enum TABITEMLEFTEDGESTATES {
...@@ -1269,7 +1269,7 @@ enum TABITEMLEFTEDGESTATES {...@@ -1269,7 +1269,7 @@ enum TABITEMLEFTEDGESTATES {
1269 TILES_HOT = 2,1269 TILES_HOT = 2,
1270 TILES_SELECTED = 3,1270 TILES_SELECTED = 3,
1271 TILES_DISABLED = 4,1271 TILES_DISABLED = 4,
1272 TILES_FOCUSED = 5,1272 TILES_FOCUSED = 5
1273};1273};
12741274
1275enum TABITEMRIGHTEDGESTATES {1275enum TABITEMRIGHTEDGESTATES {
...@@ -1277,7 +1277,7 @@ enum TABITEMRIGHTEDGESTATES {...@@ -1277,7 +1277,7 @@ enum TABITEMRIGHTEDGESTATES {
1277 TIRES_HOT = 2,1277 TIRES_HOT = 2,
1278 TIRES_SELECTED = 3,1278 TIRES_SELECTED = 3,
1279 TIRES_DISABLED = 4,1279 TIRES_DISABLED = 4,
1280 TIRES_FOCUSED = 5,1280 TIRES_FOCUSED = 5
1281};1281};
12821282
1283enum TABITEMBOTHEDGESTATES {1283enum TABITEMBOTHEDGESTATES {
...@@ -1285,7 +1285,7 @@ enum TABITEMBOTHEDGESTATES {...@@ -1285,7 +1285,7 @@ enum TABITEMBOTHEDGESTATES {
1285 TIBES_HOT = 2,1285 TIBES_HOT = 2,
1286 TIBES_SELECTED = 3,1286 TIBES_SELECTED = 3,
1287 TIBES_DISABLED = 4,1287 TIBES_DISABLED = 4,
1288 TIBES_FOCUSED = 5,1288 TIBES_FOCUSED = 5
1289};1289};
12901290
1291enum TOPTABITEMSTATES {1291enum TOPTABITEMSTATES {
...@@ -1293,7 +1293,7 @@ enum TOPTABITEMSTATES {...@@ -1293,7 +1293,7 @@ enum TOPTABITEMSTATES {
1293 TTIS_HOT = 2,1293 TTIS_HOT = 2,
1294 TTIS_SELECTED = 3,1294 TTIS_SELECTED = 3,
1295 TTIS_DISABLED = 4,1295 TTIS_DISABLED = 4,
1296 TTIS_FOCUSED = 5,1296 TTIS_FOCUSED = 5
1297};1297};
12981298
1299enum TOPTABITEMLEFTEDGESTATES {1299enum TOPTABITEMLEFTEDGESTATES {
...@@ -1301,7 +1301,7 @@ enum TOPTABITEMLEFTEDGESTATES {...@@ -1301,7 +1301,7 @@ enum TOPTABITEMLEFTEDGESTATES {
1301 TTILES_HOT = 2,1301 TTILES_HOT = 2,
1302 TTILES_SELECTED = 3,1302 TTILES_SELECTED = 3,
1303 TTILES_DISABLED = 4,1303 TTILES_DISABLED = 4,
1304 TTILES_FOCUSED = 5,1304 TTILES_FOCUSED = 5
1305};1305};
13061306
1307enum TOPTABITEMRIGHTEDGESTATES {1307enum TOPTABITEMRIGHTEDGESTATES {
...@@ -1309,7 +1309,7 @@ enum TOPTABITEMRIGHTEDGESTATES {...@@ -1309,7 +1309,7 @@ enum TOPTABITEMRIGHTEDGESTATES {
1309 TTIRES_HOT = 2,1309 TTIRES_HOT = 2,
1310 TTIRES_SELECTED = 3,1310 TTIRES_SELECTED = 3,
1311 TTIRES_DISABLED = 4,1311 TTIRES_DISABLED = 4,
1312 TTIRES_FOCUSED = 5,1312 TTIRES_FOCUSED = 5
1313};1313};
13141314
1315enum TOPTABITEMBOTHEDGESTATES {1315enum TOPTABITEMBOTHEDGESTATES {
...@@ -1317,7 +1317,7 @@ enum TOPTABITEMBOTHEDGESTATES {...@@ -1317,7 +1317,7 @@ enum TOPTABITEMBOTHEDGESTATES {
1317 TTIBES_HOT = 2,1317 TTIBES_HOT = 2,
1318 TTIBES_SELECTED = 3,1318 TTIBES_SELECTED = 3,
1319 TTIBES_DISABLED = 4,1319 TTIBES_DISABLED = 4,
1320 TTIBES_FOCUSED = 5,1320 TTIBES_FOCUSED = 5
1321};1321};
13221322
1323/* TASKDIALOGSTYLE class */1323/* TASKDIALOGSTYLE class */
...@@ -1353,13 +1353,13 @@ enum TASKDIALOGPARTS {...@@ -1353,13 +1353,13 @@ enum TASKDIALOGPARTS {
1353 TDLG_EXPANDEDFOOTERAREA = 18,1353 TDLG_EXPANDEDFOOTERAREA = 18,
1354 TDLG_PROGRESSBAR = 19,1354 TDLG_PROGRESSBAR = 19,
1355 TDLG_IMAGEALIGNMENT = 20,1355 TDLG_IMAGEALIGNMENT = 20,
1356 TDLG_RADIOBUTTONPANE = 21,1356 TDLG_RADIOBUTTONPANE = 21
1357};1357};
13581358
1359#define TASKDIALOGSTYLEPARTS TASKDIALOGPARTS;1359#define TASKDIALOGSTYLEPARTS TASKDIALOGPARTS;
13601360
1361enum CONTENTPANESTATES {1361enum CONTENTPANESTATES {
1362 TDLGCPS_STANDALONE = 1,1362 TDLGCPS_STANDALONE = 1
1363};1363};
13641364
1365enum EXPANDOBUTTONSTATES {1365enum EXPANDOBUTTONSTATES {
...@@ -1368,7 +1368,7 @@ enum EXPANDOBUTTONSTATES {...@@ -1368,7 +1368,7 @@ enum EXPANDOBUTTONSTATES {
1368 TDLGEBS_PRESSED = 3,1368 TDLGEBS_PRESSED = 3,
1369 TDLGEBS_EXPANDEDNORMAL = 4,1369 TDLGEBS_EXPANDEDNORMAL = 4,
1370 TDLGEBS_EXPANDEDHOVER = 5,1370 TDLGEBS_EXPANDEDHOVER = 5,
1371 TDLGEBS_EXPANDEDPRESSED = 6,1371 TDLGEBS_EXPANDEDPRESSED = 6
1372};1372};
13731373
1374/* TEXTSTYLE class */1374/* TEXTSTYLE class */
...@@ -1389,19 +1389,19 @@ enum TEXTSTYLEPARTS {...@@ -1389,19 +1389,19 @@ enum TEXTSTYLEPARTS {
1389 TEXT_HYPERLINKTEXT = 6,1389 TEXT_HYPERLINKTEXT = 6,
1390 TEXT_EXPANDED = 7,1390 TEXT_EXPANDED = 7,
1391 TEXT_LABEL = 8,1391 TEXT_LABEL = 8,
1392 TEXT_CONTROLLABEL = 9,1392 TEXT_CONTROLLABEL = 9
1393};1393};
13941394
1395enum HYPERLINKTEXTSTATES {1395enum HYPERLINKTEXTSTATES {
1396 TS_HYPERLINK_NORMAL = 1,1396 TS_HYPERLINK_NORMAL = 1,
1397 TS_HYPERLINK_HOT = 2,1397 TS_HYPERLINK_HOT = 2,
1398 TS_HYPERLINK_PRESSED = 3,1398 TS_HYPERLINK_PRESSED = 3,
1399 TS_HYPERLINK_DISABLED = 4,1399 TS_HYPERLINK_DISABLED = 4
1400};1400};
14011401
1402enum CONTROLLABELSTATES {1402enum CONTROLLABELSTATES {
1403 TS_CONTROLLABEL_NORMAL = 1,1403 TS_CONTROLLABEL_NORMAL = 1,
1404 TS_CONTROLLABEL_DISABLED = 2,1404 TS_CONTROLLABEL_DISABLED = 2
1405};1405};
14061406
1407/* TOOLBARSTYLE class */1407/* TOOLBARSTYLE class */
...@@ -1423,7 +1423,7 @@ enum TOOLBARPARTS {...@@ -1423,7 +1423,7 @@ enum TOOLBARPARTS {
1423 TP_SPLITBUTTONDROPDOWN = 4,1423 TP_SPLITBUTTONDROPDOWN = 4,
1424 TP_SEPARATOR = 5,1424 TP_SEPARATOR = 5,
1425 TP_SEPARATORVERT = 6,1425 TP_SEPARATORVERT = 6,
1426 TP_DROPDOWNBUTTONGLYPH = 7,1426 TP_DROPDOWNBUTTONGLYPH = 7
1427};1427};
14281428
1429#define TOOLBARSTYLEPARTS TOOLBARPARTS;1429#define TOOLBARSTYLEPARTS TOOLBARPARTS;
...@@ -1436,7 +1436,7 @@ enum TOOLBARSTYLESTATES {...@@ -1436,7 +1436,7 @@ enum TOOLBARSTYLESTATES {
1436 TS_CHECKED = 5,1436 TS_CHECKED = 5,
1437 TS_HOTCHECKED = 6,1437 TS_HOTCHECKED = 6,
1438 TS_NEARHOT = 7,1438 TS_NEARHOT = 7,
1439 TS_OTHERSIDEHOT = 8,1439 TS_OTHERSIDEHOT = 8
1440};1440};
14411441
1442/* TOOLTIPSTYLE class */1442/* TOOLTIPSTYLE class */
...@@ -1458,7 +1458,7 @@ enum TOOLTIPPARTS {...@@ -1458,7 +1458,7 @@ enum TOOLTIPPARTS {
1458 TTP_BALLOONTITLE = 4,1458 TTP_BALLOONTITLE = 4,
1459 TTP_CLOSE = 5,1459 TTP_CLOSE = 5,
1460 TTP_BALLOONSTEM = 6,1460 TTP_BALLOONSTEM = 6,
1461 TTP_WRENCH = 7,1461 TTP_WRENCH = 7
1462};1462};
14631463
1464#define TOOLTIPSTYLEPARTS TOOLTIPPARTS;1464#define TOOLTIPSTYLEPARTS TOOLTIPPARTS;
...@@ -1466,17 +1466,17 @@ enum TOOLTIPPARTS {...@@ -1466,17 +1466,17 @@ enum TOOLTIPPARTS {
1466enum CLOSESTATES {1466enum CLOSESTATES {
1467 TTCS_NORMAL = 1,1467 TTCS_NORMAL = 1,
1468 TTCS_HOT = 2,1468 TTCS_HOT = 2,
1469 TTCS_PRESSED = 3,1469 TTCS_PRESSED = 3
1470};1470};
14711471
1472enum STANDARDSTATES {1472enum STANDARDSTATES {
1473 TTSS_NORMAL = 1,1473 TTSS_NORMAL = 1,
1474 TTSS_LINK = 2,1474 TTSS_LINK = 2
1475};1475};
14761476
1477enum BALLOONSTATES {1477enum BALLOONSTATES {
1478 TTBS_NORMAL = 1,1478 TTBS_NORMAL = 1,
1479 TTBS_LINK = 2,1479 TTBS_LINK = 2
1480};1480};
14811481
1482enum BALLOONSTEMSTATES {1482enum BALLOONSTEMSTATES {
...@@ -1485,13 +1485,13 @@ enum BALLOONSTEMSTATES {...@@ -1485,13 +1485,13 @@ enum BALLOONSTEMSTATES {
1485 TTBSS_POINTINGUPRIGHTWALL = 3,1485 TTBSS_POINTINGUPRIGHTWALL = 3,
1486 TTBSS_POINTINGDOWNRIGHTWALL = 4,1486 TTBSS_POINTINGDOWNRIGHTWALL = 4,
1487 TTBSS_POINTINGDOWNCENTERED = 5,1487 TTBSS_POINTINGDOWNCENTERED = 5,
1488 TTBSS_POINTINGDOWNLEFTWALL = 6,1488 TTBSS_POINTINGDOWNLEFTWALL = 6
1489};1489};
14901490
1491enum WRENCHSTATES {1491enum WRENCHSTATES {
1492 TTWS_NORMAL = 1,1492 TTWS_NORMAL = 1,
1493 TTWS_HOT = 2,1493 TTWS_HOT = 2,
1494 TTWS_PRESSED = 3,1494 TTWS_PRESSED = 3
1495};1495};
14961496
1497/* TRACKBARSTYLE class */1497/* TRACKBARSTYLE class */
...@@ -1516,21 +1516,21 @@ enum TRACKBARPARTS {...@@ -1516,21 +1516,21 @@ enum TRACKBARPARTS {
1516 TKP_THUMBLEFT = 7,1516 TKP_THUMBLEFT = 7,
1517 TKP_THUMBRIGHT = 8,1517 TKP_THUMBRIGHT = 8,
1518 TKP_TICS = 9,1518 TKP_TICS = 9,
1519 TKP_TICSVERT = 10,1519 TKP_TICSVERT = 10
1520};1520};
15211521
1522#define TRACKBARSTYLEPARTS TRACKBARPARTS;1522#define TRACKBARSTYLEPARTS TRACKBARPARTS;
15231523
1524enum TRACKBARSTYLESTATES {1524enum TRACKBARSTYLESTATES {
1525 TKS_NORMAL = 1,1525 TKS_NORMAL = 1
1526};1526};
15271527
1528enum TRACKSTATES {1528enum TRACKSTATES {
1529 TRS_NORMAL = 1,1529 TRS_NORMAL = 1
1530};1530};
15311531
1532enum TRACKVERTSTATES {1532enum TRACKVERTSTATES {
1533 TRVS_NORMAL = 1,1533 TRVS_NORMAL = 1
1534};1534};
15351535
1536enum THUMBSTATES {1536enum THUMBSTATES {
...@@ -1538,7 +1538,7 @@ enum THUMBSTATES {...@@ -1538,7 +1538,7 @@ enum THUMBSTATES {
1538 TUS_HOT = 2,1538 TUS_HOT = 2,
1539 TUS_PRESSED = 3,1539 TUS_PRESSED = 3,
1540 TUS_FOCUSED = 4,1540 TUS_FOCUSED = 4,
1541 TUS_DISABLED = 5,1541 TUS_DISABLED = 5
1542};1542};
15431543
1544enum THUMBBOTTOMSTATES {1544enum THUMBBOTTOMSTATES {
...@@ -1546,7 +1546,7 @@ enum THUMBBOTTOMSTATES {...@@ -1546,7 +1546,7 @@ enum THUMBBOTTOMSTATES {
1546 TUBS_HOT = 2,1546 TUBS_HOT = 2,
1547 TUBS_PRESSED = 3,1547 TUBS_PRESSED = 3,
1548 TUBS_FOCUSED = 4,1548 TUBS_FOCUSED = 4,
1549 TUBS_DISABLED = 5,1549 TUBS_DISABLED = 5
1550};1550};
15511551
1552enum THUMBTOPSTATES {1552enum THUMBTOPSTATES {
...@@ -1554,7 +1554,7 @@ enum THUMBTOPSTATES {...@@ -1554,7 +1554,7 @@ enum THUMBTOPSTATES {
1554 TUTS_HOT = 2,1554 TUTS_HOT = 2,
1555 TUTS_PRESSED = 3,1555 TUTS_PRESSED = 3,
1556 TUTS_FOCUSED = 4,1556 TUTS_FOCUSED = 4,
1557 TUTS_DISABLED = 5,1557 TUTS_DISABLED = 5
1558};1558};
15591559
1560enum THUMBVERTSTATES {1560enum THUMBVERTSTATES {
...@@ -1562,7 +1562,7 @@ enum THUMBVERTSTATES {...@@ -1562,7 +1562,7 @@ enum THUMBVERTSTATES {
1562 TUVS_HOT = 2,1562 TUVS_HOT = 2,
1563 TUVS_PRESSED = 3,1563 TUVS_PRESSED = 3,
1564 TUVS_FOCUSED = 4,1564 TUVS_FOCUSED = 4,
1565 TUVS_DISABLED = 5,1565 TUVS_DISABLED = 5
1566};1566};
15671567
1568enum THUMBLEFTSTATES {1568enum THUMBLEFTSTATES {
...@@ -1570,7 +1570,7 @@ enum THUMBLEFTSTATES {...@@ -1570,7 +1570,7 @@ enum THUMBLEFTSTATES {
1570 TUVLS_HOT = 2,1570 TUVLS_HOT = 2,
1571 TUVLS_PRESSED = 3,1571 TUVLS_PRESSED = 3,
1572 TUVLS_FOCUSED = 4,1572 TUVLS_FOCUSED = 4,
1573 TUVLS_DISABLED = 5,1573 TUVLS_DISABLED = 5
1574};1574};
15751575
1576enum THUMBRIGHTSTATES {1576enum THUMBRIGHTSTATES {
...@@ -1578,15 +1578,15 @@ enum THUMBRIGHTSTATES {...@@ -1578,15 +1578,15 @@ enum THUMBRIGHTSTATES {
1578 TUVRS_HOT = 2,1578 TUVRS_HOT = 2,
1579 TUVRS_PRESSED = 3,1579 TUVRS_PRESSED = 3,
1580 TUVRS_FOCUSED = 4,1580 TUVRS_FOCUSED = 4,
1581 TUVRS_DISABLED = 5,1581 TUVRS_DISABLED = 5
1582};1582};
15831583
1584enum TICSSTATES {1584enum TICSSTATES {
1585 TSS_NORMAL = 1,1585 TSS_NORMAL = 1
1586};1586};
15871587
1588enum TICSVERTSTATES {1588enum TICSVERTSTATES {
1589 TSVS_NORMAL = 1,1589 TSVS_NORMAL = 1
1590};1590};
15911591
1592/* TREEVIEWSTYLE class */1592/* TREEVIEWSTYLE class */
...@@ -1605,7 +1605,7 @@ enum TREEVIEWPARTS {...@@ -1605,7 +1605,7 @@ enum TREEVIEWPARTS {
1605 TVP_TREEITEM = 1,1605 TVP_TREEITEM = 1,
1606 TVP_GLYPH = 2,1606 TVP_GLYPH = 2,
1607 TVP_BRANCH = 3,1607 TVP_BRANCH = 3,
1608 TVP_HOTGLYPH = 4,1608 TVP_HOTGLYPH = 4
1609};1609};
16101610
1611#define TREEVIEWSTYLEPARTS TREEVIEWPARTS;1611#define TREEVIEWSTYLEPARTS TREEVIEWPARTS;
...@@ -1616,17 +1616,17 @@ enum TREEITEMSTATES {...@@ -1616,17 +1616,17 @@ enum TREEITEMSTATES {
1616 TREIS_SELECTED = 3,1616 TREIS_SELECTED = 3,
1617 TREIS_DISABLED = 4,1617 TREIS_DISABLED = 4,
1618 TREIS_SELECTEDNOTFOCUS = 5,1618 TREIS_SELECTEDNOTFOCUS = 5,
1619 TREIS_HOTSELECTED = 6,1619 TREIS_HOTSELECTED = 6
1620};1620};
16211621
1622enum GLYPHSTATES {1622enum GLYPHSTATES {
1623 GLPS_CLOSED = 1,1623 GLPS_CLOSED = 1,
1624 GLPS_OPENED = 2,1624 GLPS_OPENED = 2
1625};1625};
16261626
1627enum HOTGLYPHSTATES {1627enum HOTGLYPHSTATES {
1628 HGLPS_CLOSED = 1,1628 HGLPS_CLOSED = 1,
1629 HGLPS_OPENED = 2,1629 HGLPS_OPENED = 2
1630};1630};
16311631
1632/* WINDOWSTYLE class */1632/* WINDOWSTYLE class */
...@@ -1679,102 +1679,102 @@ enum WINDOWPARTS {...@@ -1679,102 +1679,102 @@ enum WINDOWPARTS {
1679 WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,1679 WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,
1680 WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,1680 WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,
1681 WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37,1681 WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37,
1682 WP_FRAME = 38,1682 WP_FRAME = 38
1683};1683};
16841684
1685#define WINDOWSTYLEPARTS WINDOWPARTS;1685#define WINDOWSTYLEPARTS WINDOWPARTS;
16861686
1687enum FRAMESTATES {1687enum FRAMESTATES {
1688 FS_ACTIVE = 1,1688 FS_ACTIVE = 1,
1689 FS_INACTIVE = 2,1689 FS_INACTIVE = 2
1690};1690};
16911691
1692enum CAPTIONSTATES {1692enum CAPTIONSTATES {
1693 CS_ACTIVE = 1,1693 CS_ACTIVE = 1,
1694 CS_INACTIVE = 2,1694 CS_INACTIVE = 2,
1695 CS_DISABLED = 3,1695 CS_DISABLED = 3
1696};1696};
16971697
1698enum MAXCAPTIONSTATES {1698enum MAXCAPTIONSTATES {
1699 MXCS_ACTIVE = 1,1699 MXCS_ACTIVE = 1,
1700 MXCS_INACTIVE = 2,1700 MXCS_INACTIVE = 2,
1701 MXCS_DISABLED = 3,1701 MXCS_DISABLED = 3
1702};1702};
17031703
1704enum MINCAPTIONSTATES {1704enum MINCAPTIONSTATES {
1705 MNCS_ACTIVE = 1,1705 MNCS_ACTIVE = 1,
1706 MNCS_INACTIVE = 2,1706 MNCS_INACTIVE = 2,
1707 MNCS_DISABLED = 3,1707 MNCS_DISABLED = 3
1708};1708};
17091709
1710enum HORZSCROLLSTATES {1710enum HORZSCROLLSTATES {
1711 HSS_NORMAL = 1,1711 HSS_NORMAL = 1,
1712 HSS_HOT = 2,1712 HSS_HOT = 2,
1713 HSS_PUSHED = 3,1713 HSS_PUSHED = 3,
1714 HSS_DISABLED = 4,1714 HSS_DISABLED = 4
1715};1715};
17161716
1717enum HORZTHUMBSTATES {1717enum HORZTHUMBSTATES {
1718 HTS_NORMAL = 1,1718 HTS_NORMAL = 1,
1719 HTS_HOT = 2,1719 HTS_HOT = 2,
1720 HTS_PUSHED = 3,1720 HTS_PUSHED = 3,
1721 HTS_DISABLED = 4,1721 HTS_DISABLED = 4
1722};1722};
17231723
1724enum VERTSCROLLSTATES {1724enum VERTSCROLLSTATES {
1725 VSS_NORMAL = 1,1725 VSS_NORMAL = 1,
1726 VSS_HOT = 2,1726 VSS_HOT = 2,
1727 VSS_PUSHED = 3,1727 VSS_PUSHED = 3,
1728 VSS_DISABLED = 4,1728 VSS_DISABLED = 4
1729};1729};
17301730
1731enum VERTTHUMBSTATES {1731enum VERTTHUMBSTATES {
1732 VTS_NORMAL = 1,1732 VTS_NORMAL = 1,
1733 VTS_HOT = 2,1733 VTS_HOT = 2,
1734 VTS_PUSHED = 3,1734 VTS_PUSHED = 3,
1735 VTS_DISABLED = 4,1735 VTS_DISABLED = 4
1736};1736};
17371737
1738enum SYSBUTTONSTATES {1738enum SYSBUTTONSTATES {
1739 SBS_NORMAL = 1,1739 SBS_NORMAL = 1,
1740 SBS_HOT = 2,1740 SBS_HOT = 2,
1741 SBS_PUSHED = 3,1741 SBS_PUSHED = 3,
1742 SBS_DISABLED = 4,1742 SBS_DISABLED = 4
1743};1743};
17441744
1745enum MINBUTTONSTATES {1745enum MINBUTTONSTATES {
1746 MINBS_NORMAL = 1,1746 MINBS_NORMAL = 1,
1747 MINBS_HOT = 2,1747 MINBS_HOT = 2,
1748 MINBS_PUSHED = 3,1748 MINBS_PUSHED = 3,
1749 MINBS_DISABLED = 4,1749 MINBS_DISABLED = 4
1750};1750};
17511751
1752enum MAXBUTTONSTATES {1752enum MAXBUTTONSTATES {
1753 MAXBS_NORMAL = 1,1753 MAXBS_NORMAL = 1,
1754 MAXBS_HOT = 2,1754 MAXBS_HOT = 2,
1755 MAXBS_PUSHED = 3,1755 MAXBS_PUSHED = 3,
1756 MAXBS_DISABLED = 4,1756 MAXBS_DISABLED = 4
1757};1757};
17581758
1759enum RESTOREBUTTONSTATES {1759enum RESTOREBUTTONSTATES {
1760 RBS_NORMAL = 1,1760 RBS_NORMAL = 1,
1761 RBS_HOT = 2,1761 RBS_HOT = 2,
1762 RBS_PUSHED = 3,1762 RBS_PUSHED = 3,
1763 RBS_DISABLED = 4,1763 RBS_DISABLED = 4
1764};1764};
17651765
1766enum HELPBUTTONSTATES {1766enum HELPBUTTONSTATES {
1767 HBS_NORMAL = 1,1767 HBS_NORMAL = 1,
1768 HBS_HOT = 2,1768 HBS_HOT = 2,
1769 HBS_PUSHED = 3,1769 HBS_PUSHED = 3,
1770 HBS_DISABLED = 4,1770 HBS_DISABLED = 4
1771};1771};
17721772
1773enum CLOSEBUTTONSTATES {1773enum CLOSEBUTTONSTATES {
1774 CBS_NORMAL = 1,1774 CBS_NORMAL = 1,
1775 CBS_HOT = 2,1775 CBS_HOT = 2,
1776 CBS_PUSHED = 3,1776 CBS_PUSHED = 3,
1777 CBS_DISABLED = 4,1777 CBS_DISABLED = 4
1778};1778};
17791779
1780#endif /* __VSSTYLE_H__ */1780#endif /* __VSSTYLE_H__ */
lib/libc/include/any-windows-any/vssym32.h+43-43
...@@ -51,18 +51,18 @@...@@ -51,18 +51,18 @@
51enum BGTYPE {51enum BGTYPE {
52 BT_IMAGEFILE = 0,52 BT_IMAGEFILE = 0,
53 BT_BORDERFILL = 1,53 BT_BORDERFILL = 1,
54 BT_NONE = 2,54 BT_NONE = 2
55};55};
5656
57enum IMAGELAYOUT {57enum IMAGELAYOUT {
58 IL_VERTICAL = 0,58 IL_VERTICAL = 0,
59 IL_HORIZONTAL = 1,59 IL_HORIZONTAL = 1
60};60};
6161
62enum BORDERTYPE {62enum BORDERTYPE {
63 BT_RECT = 0,63 BT_RECT = 0,
64 BT_ROUNDRECT = 1,64 BT_ROUNDRECT = 1,
65 BT_ELLIPSE = 2,65 BT_ELLIPSE = 2
66};66};
6767
68enum FILLTYPE {68enum FILLTYPE {
...@@ -70,31 +70,31 @@ enum FILLTYPE {...@@ -70,31 +70,31 @@ enum FILLTYPE {
70 FT_VERTGRADIENT = 1,70 FT_VERTGRADIENT = 1,
71 FT_HORZGRADIENT = 2,71 FT_HORZGRADIENT = 2,
72 FT_RADIALGRADIENT = 3,72 FT_RADIALGRADIENT = 3,
73 FT_TILEIMAGE = 4,73 FT_TILEIMAGE = 4
74};74};
7575
76enum SIZINGTYPE {76enum SIZINGTYPE {
77 ST_TRUESIZE = 0,77 ST_TRUESIZE = 0,
78 ST_STRETCH = 1,78 ST_STRETCH = 1,
79 ST_TILE = 2,79 ST_TILE = 2
80};80};
8181
82enum HALIGN {82enum HALIGN {
83 HA_LEFT = 0,83 HA_LEFT = 0,
84 HA_CENTER = 1,84 HA_CENTER = 1,
85 HA_RIGHT = 2,85 HA_RIGHT = 2
86};86};
8787
88enum CONTENTALIGNMENT {88enum CONTENTALIGNMENT {
89 CA_LEFT = 0,89 CA_LEFT = 0,
90 CA_CENTER = 1,90 CA_CENTER = 1,
91 CA_RIGHT = 2,91 CA_RIGHT = 2
92};92};
9393
94enum VALIGN {94enum VALIGN {
95 VA_TOP = 0,95 VA_TOP = 0,
96 VA_CENTER = 1,96 VA_CENTER = 1,
97 VA_BOTTOM = 2,97 VA_BOTTOM = 2
98};98};
9999
100enum OFFSETTYPE {100enum OFFSETTYPE {
...@@ -111,7 +111,7 @@ enum OFFSETTYPE {...@@ -111,7 +111,7 @@ enum OFFSETTYPE {
111 OT_LEFTOFLASTBUTTON = 10,111 OT_LEFTOFLASTBUTTON = 10,
112 OT_RIGHTOFLASTBUTTON = 11,112 OT_RIGHTOFLASTBUTTON = 11,
113 OT_ABOVELASTBUTTON = 12,113 OT_ABOVELASTBUTTON = 12,
114 OT_BELOWLASTBUTTON = 13,114 OT_BELOWLASTBUTTON = 13
115};115};
116116
117enum ICONEFFECT {117enum ICONEFFECT {
...@@ -119,37 +119,37 @@ enum ICONEFFECT {...@@ -119,37 +119,37 @@ enum ICONEFFECT {
119 ICE_GLOW = 1,119 ICE_GLOW = 1,
120 ICE_SHADOW = 2,120 ICE_SHADOW = 2,
121 ICE_PULSE = 3,121 ICE_PULSE = 3,
122 ICE_ALPHA = 4,122 ICE_ALPHA = 4
123};123};
124124
125enum TEXTSHADOWTYPE {125enum TEXTSHADOWTYPE {
126 TST_NONE = 0,126 TST_NONE = 0,
127 TST_SINGLE = 1,127 TST_SINGLE = 1,
128 TST_CONTINUOUS = 2,128 TST_CONTINUOUS = 2
129};129};
130130
131enum GLYPHTYPE {131enum GLYPHTYPE {
132 GT_NONE = 0,132 GT_NONE = 0,
133 GT_IMAGEGLYPH = 1,133 GT_IMAGEGLYPH = 1,
134 GT_FONTGLYPH = 2,134 GT_FONTGLYPH = 2
135};135};
136136
137enum IMAGESELECTTYPE {137enum IMAGESELECTTYPE {
138 IST_NONE = 0,138 IST_NONE = 0,
139 IST_SIZE = 1,139 IST_SIZE = 1,
140 IST_DPI = 2,140 IST_DPI = 2
141};141};
142142
143enum TRUESIZESCALINGTYPE {143enum TRUESIZESCALINGTYPE {
144 TSST_NONE = 0,144 TSST_NONE = 0,
145 TSST_SIZE = 1,145 TSST_SIZE = 1,
146 TSST_DPI = 2,146 TSST_DPI = 2
147};147};
148148
149enum GLYPHFONTSIZINGTYPE {149enum GLYPHFONTSIZINGTYPE {
150 GFST_NONE = 0,150 GFST_NONE = 0,
151 GFST_SIZE = 1,151 GFST_SIZE = 1,
152 GFST_DPI = 2,152 GFST_DPI = 2
153};153};
154154
155#define TMT_RESERVEDLOW 0155#define TMT_RESERVEDLOW 0
...@@ -413,12 +413,12 @@ static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0};...@@ -413,12 +413,12 @@ static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0};
413#endif413#endif
414414
415enum LINKPARTS {415enum LINKPARTS {
416 LP_HYPERLINK = 1,416 LP_HYPERLINK = 1
417};417};
418418
419enum HYPERLINKSTATES {419enum HYPERLINKSTATES {
420 HLS_NORMALTEXT = 1,420 HLS_NORMALTEXT = 1,
421 HLS_LINKTEXT = 2,421 HLS_LINKTEXT = 2
422};422};
423423
424/* EMPTYMARKUP class */424/* EMPTYMARKUP class */
...@@ -431,12 +431,12 @@ static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K',...@@ -431,12 +431,12 @@ static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K',
431#endif431#endif
432432
433enum EMPTYMARKUPPARTS {433enum EMPTYMARKUPPARTS {
434 EMP_MARKUPTEXT = 1,434 EMP_MARKUPTEXT = 1
435};435};
436436
437enum MARKUPTEXTSTATES {437enum MARKUPTEXTSTATES {
438 EMT_NORMALTEXT = 1,438 EMT_NORMALTEXT = 1,
439 EMT_LINKTEXT = 2,439 EMT_LINKTEXT = 2
440};440};
441441
442/* STATIC class */442/* STATIC class */
...@@ -449,7 +449,7 @@ static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0};...@@ -449,7 +449,7 @@ static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0};
449#endif449#endif
450450
451enum STATICPARTS {451enum STATICPARTS {
452 STAT_TEXT = 1,452 STAT_TEXT = 1
453};453};
454454
455/* PAGE class */455/* PAGE class */
...@@ -465,7 +465,7 @@ enum PAGEPARTS {...@@ -465,7 +465,7 @@ enum PAGEPARTS {
465 PGRP_UP = 1,465 PGRP_UP = 1,
466 PGRP_DOWN = 2,466 PGRP_DOWN = 2,
467 PGRP_UPHORZ = 3,467 PGRP_UPHORZ = 3,
468 PGRP_DOWNHORZ = 4,468 PGRP_DOWNHORZ = 4
469};469};
470470
471/* MONTHCAL class */471/* MONTHCAL class */
...@@ -488,7 +488,7 @@ enum MONTHCALPARTS {...@@ -488,7 +488,7 @@ enum MONTHCALPARTS {
488 MC_TRAILINGGRIDCELL = 8,488 MC_TRAILINGGRIDCELL = 8,
489 MC_TRAILINGGRIDCELLUPPER = 9,489 MC_TRAILINGGRIDCELLUPPER = 9,
490 MC_NAVNEXT = 10,490 MC_NAVNEXT = 10,
491 MC_NAVPREV = 11,491 MC_NAVPREV = 11
492};492};
493493
494enum GRIDCELLBACKGROUNDSTATES {494enum GRIDCELLBACKGROUNDSTATES {
...@@ -496,47 +496,47 @@ enum GRIDCELLBACKGROUNDSTATES {...@@ -496,47 +496,47 @@ enum GRIDCELLBACKGROUNDSTATES {
496 MCGCB_HOT = 2,496 MCGCB_HOT = 2,
497 MCGCB_SELECTEDHOT = 3,497 MCGCB_SELECTEDHOT = 3,
498 MCGCB_SELECTEDNOTFOCUSED = 4,498 MCGCB_SELECTEDNOTFOCUSED = 4,
499 MCGCB_TODAY = 5,499 MCGCB_TODAY = 5
500};500};
501501
502enum GRIDCELLSTATES {502enum GRIDCELLSTATES {
503 MCGC_HOT = 1,503 MCGC_HOT = 1,
504 MCGC_HASSTATE = 2,504 MCGC_HASSTATE = 2,
505 MCGC_HASSTATEHOT = 3,505 MCGC_HASSTATEHOT = 3,
506 MCGC_TODAY = 4,506 MCGC_TODAY = 4
507};507};
508508
509enum GRIDCELLUPPERSTATES {509enum GRIDCELLUPPERSTATES {
510 MCGCU_HOT = 1,510 MCGCU_HOT = 1,
511 MCGCU_HASSTATE = 2,511 MCGCU_HASSTATE = 2,
512 MCGCU_HASSTATEHOT = 3,512 MCGCU_HASSTATEHOT = 3
513};513};
514514
515enum TRAILINGGRIDCELLSTATES {515enum TRAILINGGRIDCELLSTATES {
516 MCTGC_HOT = 1,516 MCTGC_HOT = 1,
517 MCTGC_HASSTATE = 2,517 MCTGC_HASSTATE = 2,
518 MCTGC_HASSTATEHOT = 3,518 MCTGC_HASSTATEHOT = 3,
519 MCTGC_TODAY = 4,519 MCTGC_TODAY = 4
520};520};
521521
522enum TRAILINGGRIDCELLUPPERSTATES {522enum TRAILINGGRIDCELLUPPERSTATES {
523 MCTGCU_HOT = 1,523 MCTGCU_HOT = 1,
524 MCTGCU_HASSTATE = 2,524 MCTGCU_HASSTATE = 2,
525 MCTGCU_HASSTATEHOT = 3,525 MCTGCU_HASSTATEHOT = 3
526};526};
527527
528enum NAVNEXTSTATES {528enum NAVNEXTSTATES {
529 MCNN_NORMAL = 1,529 MCNN_NORMAL = 1,
530 MCNN_HOT = 2,530 MCNN_HOT = 2,
531 MCNN_PRESSED = 3,531 MCNN_PRESSED = 3,
532 MCNN_DISABLED = 4,532 MCNN_DISABLED = 4
533};533};
534534
535enum NAVPREVSTATES {535enum NAVPREVSTATES {
536 MCNP_NORMAL = 1,536 MCNP_NORMAL = 1,
537 MCNP_HOT = 2,537 MCNP_HOT = 2,
538 MCNP_PRESSED = 3,538 MCNP_PRESSED = 3,
539 MCNP_DISABLED = 4,539 MCNP_DISABLED = 4
540};540};
541541
542/* CLOCK class */542/* CLOCK class */
...@@ -549,13 +549,13 @@ static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0};...@@ -549,13 +549,13 @@ static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0};
549#endif549#endif
550550
551enum CLOCKPARTS {551enum CLOCKPARTS {
552 CLP_TIME = 1,552 CLP_TIME = 1
553};553};
554554
555enum CLOCKSTATES {555enum CLOCKSTATES {
556 CLS_NORMAL = 1,556 CLS_NORMAL = 1,
557 CLS_HOT = 2,557 CLS_HOT = 2,
558 CLS_PRESSED = 3,558 CLS_PRESSED = 3
559};559};
560560
561/* TRAYNOTIFY class */561/* TRAYNOTIFY class */
...@@ -569,7 +569,7 @@ static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F','...@@ -569,7 +569,7 @@ static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F','
569569
570enum TRAYNOTIFYPARTS {570enum TRAYNOTIFYPARTS {
571 TNP_BACKGROUND = 1,571 TNP_BACKGROUND = 1,
572 TNP_ANIMBACKGROUND = 2,572 TNP_ANIMBACKGROUND = 2
573};573};
574574
575/* TASKBAR class */575/* TASKBAR class */
...@@ -589,7 +589,7 @@ enum TASKBARPARTS {...@@ -589,7 +589,7 @@ enum TASKBARPARTS {
589 TBP_SIZINGBARBOTTOM = 5,589 TBP_SIZINGBARBOTTOM = 5,
590 TBP_SIZINGBARRIGHT = 6,590 TBP_SIZINGBARRIGHT = 6,
591 TBP_SIZINGBARTOP = 7,591 TBP_SIZINGBARTOP = 7,
592 TBP_SIZINGBARLEFT = 8,592 TBP_SIZINGBARLEFT = 8
593};593};
594594
595/* TASKBAND class */595/* TASKBAND class */
...@@ -604,7 +604,7 @@ static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0};...@@ -604,7 +604,7 @@ static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0};
604enum TASKBANDPARTS {604enum TASKBANDPARTS {
605 TDP_GROUPCOUNT = 1,605 TDP_GROUPCOUNT = 1,
606 TDP_FLASHBUTTON = 2,606 TDP_FLASHBUTTON = 2,
607 TDP_FLASHBUTTONGROUPMENU = 3,607 TDP_FLASHBUTTONGROUPMENU = 3
608};608};
609609
610/* STARTPANEL class */610/* STARTPANEL class */
...@@ -635,7 +635,7 @@ enum STARTPANELPARTS {...@@ -635,7 +635,7 @@ enum STARTPANELPARTS {
635 SPP_SEARCHVIEW = 16,635 SPP_SEARCHVIEW = 16,
636 SPP_MOREPROGRAMSARROWBACK = 17,636 SPP_MOREPROGRAMSARROWBACK = 17,
637 SPP_TOPMATCH = 18,637 SPP_TOPMATCH = 18,
638 SPP_LOGOFFSPLITBUTTONDROPDOWN = 19,638 SPP_LOGOFFSPLITBUTTONDROPDOWN = 19
639};639};
640640
641enum MOREPROGRAMSTABSTATES {641enum MOREPROGRAMSTABSTATES {
...@@ -643,7 +643,7 @@ enum MOREPROGRAMSTABSTATES {...@@ -643,7 +643,7 @@ enum MOREPROGRAMSTABSTATES {
643 SPMPT_HOT = 2,643 SPMPT_HOT = 2,
644 SPMPT_SELECTED = 3,644 SPMPT_SELECTED = 3,
645 SPMPT_DISABLED = 4,645 SPMPT_DISABLED = 4,
646 SPMPT_FOCUSED = 5,646 SPMPT_FOCUSED = 5
647};647};
648648
649enum SOFTWAREEXPLORERSTATES {649enum SOFTWAREEXPLORERSTATES {
...@@ -651,7 +651,7 @@ enum SOFTWAREEXPLORERSTATES {...@@ -651,7 +651,7 @@ enum SOFTWAREEXPLORERSTATES {
651 SPSE_HOT = 2,651 SPSE_HOT = 2,
652 SPSE_SELECTED = 3,652 SPSE_SELECTED = 3,
653 SPSE_DISABLED = 4,653 SPSE_DISABLED = 4,
654 SPSE_FOCUSED = 5,654 SPSE_FOCUSED = 5
655};655};
656656
657enum OPENBOXSTATES {657enum OPENBOXSTATES {
...@@ -659,25 +659,25 @@ enum OPENBOXSTATES {...@@ -659,25 +659,25 @@ enum OPENBOXSTATES {
659 SPOB_HOT = 2,659 SPOB_HOT = 2,
660 SPOB_SELECTED = 3,660 SPOB_SELECTED = 3,
661 SPOB_DISABLED = 4,661 SPOB_DISABLED = 4,
662 SPOB_FOCUSED = 5,662 SPOB_FOCUSED = 5
663};663};
664664
665enum MOREPROGRAMSARROWSTATES {665enum MOREPROGRAMSARROWSTATES {
666 SPS_NORMAL = 1,666 SPS_NORMAL = 1,
667 SPS_HOT = 2,667 SPS_HOT = 2,
668 SPS_PRESSED = 3,668 SPS_PRESSED = 3
669};669};
670670
671enum MOREPROGRAMSARROWBACKSTATES {671enum MOREPROGRAMSARROWBACKSTATES {
672 SPSB_NORMAL = 1,672 SPSB_NORMAL = 1,
673 SPSB_HOT = 2,673 SPSB_HOT = 2,
674 SPSB_PRESSED = 3,674 SPSB_PRESSED = 3
675};675};
676676
677enum LOGOFFBUTTONSSTATES {677enum LOGOFFBUTTONSSTATES {
678 SPLS_NORMAL = 1,678 SPLS_NORMAL = 1,
679 SPLS_HOT = 2,679 SPLS_HOT = 2,
680 SPLS_PRESSED = 3,680 SPLS_PRESSED = 3
681};681};
682682
683/* MENUBAND class */683/* MENUBAND class */
...@@ -691,7 +691,7 @@ static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0};...@@ -691,7 +691,7 @@ static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0};
691691
692enum MENUBANDPARTS {692enum MENUBANDPARTS {
693 MDP_NEWAPPBUTTON = 1,693 MDP_NEWAPPBUTTON = 1,
694 MDP_SEPERATOR = 2,694 MDP_SEPERATOR = 2
695};695};
696696
697enum MENUBANDSTATES {697enum MENUBANDSTATES {
...@@ -700,7 +700,7 @@ enum MENUBANDSTATES {...@@ -700,7 +700,7 @@ enum MENUBANDSTATES {
700 MDS_PRESSED = 3,700 MDS_PRESSED = 3,
701 MDS_DISABLED = 4,701 MDS_DISABLED = 4,
702 MDS_CHECKED = 5,702 MDS_CHECKED = 5,
703 MDS_HOTCHECKED = 6,703 MDS_HOTCHECKED = 6
704};704};
705705
706#endif /* __VSSYM32_H__ */706#endif /* __VSSYM32_H__ */
lib/libc/include/any-windows-any/vswriter.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/vswriter.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/vswriter.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wbemads.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wbemads.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wbemads.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wbemcli.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wbemcli.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wbemcli.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wbemdisp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wbemdisp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wbemdisp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wbemidl.h+2-2
...@@ -6,8 +6,8 @@...@@ -6,8 +6,8 @@
6#ifndef __WBEMIDL_H_6#ifndef __WBEMIDL_H_
7#define __WBEMIDL_H_7#define __WBEMIDL_H_
88
9#include <winapifamily.h> 9#include <winapifamily.h>
10 10
11#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)11#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
1212
13#include <wbemcli.h>13#include <wbemcli.h>
lib/libc/include/any-windows-any/wbemprov.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wbemprov.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wbemprov.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wbemtran.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wbemtran.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wbemtran.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wchar.h+59-287
...@@ -9,6 +9,7 @@...@@ -9,6 +9,7 @@
9#include <corecrt.h>9#include <corecrt.h>
10#include <corecrt_stdio_config.h>10#include <corecrt_stdio_config.h>
11#include <corecrt_wstdlib.h>11#include <corecrt_wstdlib.h>
12#include <corecrt_wctype.h>
1213
13#if __USE_MINGW_ANSI_STDIO && !defined (__USE_MINGW_STRTOX) && !defined(_CRTBLD)14#if __USE_MINGW_ANSI_STDIO && !defined (__USE_MINGW_STRTOX) && !defined(_CRTBLD)
14#define __USE_MINGW_STRTOX 115#define __USE_MINGW_STRTOX 1
...@@ -148,109 +149,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);...@@ -148,109 +149,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
148149
149#define _WConst_return _CONST_RETURN150#define _WConst_return _CONST_RETURN
150151
151#ifndef _CRT_CTYPEDATA_DEFINED
152#define _CRT_CTYPEDATA_DEFINED
153#ifndef _CTYPE_DISABLE_MACROS
154
155#ifndef __PCTYPE_FUNC
156#define __PCTYPE_FUNC __pctype_func()
157 _CRTIMP const unsigned short* __pctype_func(void);
158#endif
159
160#ifndef _pctype
161#define _pctype (__pctype_func())
162#endif
163#endif
164#endif
165
166#ifndef _CRT_WCTYPEDATA_DEFINED
167#define _CRT_WCTYPEDATA_DEFINED
168#ifndef _CTYPE_DISABLE_MACROS
169#if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
170 extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
171#define _wctype (* __MINGW_IMP_SYMBOL(_wctype))
172#endif
173
174 _CRTIMP const wctype_t * __cdecl __pwctype_func(void);
175#ifndef _pwctype
176#define _pwctype (__pwctype_func())
177#endif
178
179#endif
180#endif
181
182#define _UPPER 0x1
183#define _LOWER 0x2
184#define _DIGIT 0x4
185#define _SPACE 0x8
186
187#define _PUNCT 0x10
188#define _CONTROL 0x20
189#define _BLANK 0x40
190#define _HEX 0x80
191
192#define _LEADBYTE 0x8000
193#define _ALPHA (0x0100|_UPPER|_LOWER)
194
195#ifndef _WCTYPE_DEFINED
196#define _WCTYPE_DEFINED
197
198 int __cdecl iswalpha(wint_t _C);
199 int __cdecl iswupper(wint_t _C);
200 int __cdecl iswlower(wint_t _C);
201 int __cdecl iswdigit(wint_t _C);
202 int __cdecl iswxdigit(wint_t _C);
203 int __cdecl iswspace(wint_t _C);
204 int __cdecl iswpunct(wint_t _C);
205 int __cdecl iswalnum(wint_t _C);
206 int __cdecl iswprint(wint_t _C);
207 int __cdecl iswgraph(wint_t _C);
208 int __cdecl iswcntrl(wint_t _C);
209 int __cdecl iswascii(wint_t _C);
210#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
211 int __cdecl isleadbyte(int _C);
212#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
213 wint_t __cdecl towupper(wint_t _C);
214 wint_t __cdecl towlower(wint_t _C);
215 int __cdecl iswctype(wint_t _C,wctype_t _Type);
216#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
217 /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in
218 * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */
219 _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale);
220 _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale);
221 _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale);
222 _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale);
223 _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale);
224 _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale);
225 _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale);
226 _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale);
227 _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale);
228 _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale);
229 _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale);
230# ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
231 _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale);
232# endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
233 _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale);
234 _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale);
235 _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale);
236 _CRTIMP int __cdecl __iswcsymf(wint_t _C);
237 _CRTIMP int __cdecl __iswcsym(wint_t _C);
238#endif
239#if __MSVCRT_VERSION__ >= 0x800
240 /* These are only available since msvcr80.dll, never in msvcrt.dll. */
241 _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale);
242 _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale);
243#endif
244#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
245 int __cdecl is_wctype(wint_t _C,wctype_t _Type);
246#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
247
248#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) || defined (__cplusplus)
249 int __cdecl iswblank(wint_t _C);
250#endif
251
252#endif
253
254#ifndef _WDIRECT_DEFINED152#ifndef _WDIRECT_DEFINED
255#define _WDIRECT_DEFINED153#define _WDIRECT_DEFINED
256154
...@@ -304,6 +202,10 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);...@@ -304,6 +202,10 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
304 _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale);202 _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale);
305#endif203#endif
306204
205#if __MSVCRT_VERSION__ >= 0xB00
206 _CRTIMP _locale_t __cdecl _wcreate_locale(int _Category, const wchar_t *_Locale);
207#endif
208
307#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP209#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP
308#ifndef _WEXEC_DEFINED210#ifndef _WEXEC_DEFINED
309#define _WEXEC_DEFINED211#define _WEXEC_DEFINED
...@@ -335,41 +237,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);...@@ -335,41 +237,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
335#endif237#endif
336#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */238#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
337239
338#ifndef _WCTYPE_INLINE_DEFINED
339#undef _CRT_WCTYPE_NOINLINE
340#if !defined(__cplusplus) || defined(_CRT_WCTYPE_NOINLINE)
341#define iswalpha(_c) (iswctype(_c,_ALPHA))
342#define iswupper(_c) (iswctype(_c,_UPPER))
343#define iswlower(_c) (iswctype(_c,_LOWER))
344#define iswdigit(_c) (iswctype(_c,_DIGIT))
345#define iswxdigit(_c) (iswctype(_c,_HEX))
346#define iswspace(_c) (iswctype(_c,_SPACE))
347#define iswpunct(_c) (iswctype(_c,_PUNCT))
348#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT))
349#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT))
350#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
351#define iswcntrl(_c) (iswctype(_c,_CONTROL))
352#define iswascii(_c) ((unsigned)(_c) < 0x80)
353#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
354# define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p))
355# define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p))
356# define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p))
357# define _iswdigit_l(_c,_p) (_iswctype_l(_c,_DIGIT,_p))
358# define _iswxdigit_l(_c,_p) (_iswctype_l(_c,_HEX,_p))
359# define _iswspace_l(_c,_p) (_iswctype_l(_c,_SPACE,_p))
360# define _iswpunct_l(_c,_p) (_iswctype_l(_c,_PUNCT,_p))
361# define _iswalnum_l(_c,_p) (_iswctype_l(_c,_ALPHA|_DIGIT,_p))
362# define _iswprint_l(_c,_p) (_iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT,_p))
363# define _iswgraph_l(_c,_p) (_iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT,_p))
364# define _iswcntrl_l(_c,_p) (_iswctype_l(_c,_CONTROL,_p))
365#endif /* __MSVCRT_VERSION__ >= 0x800 */
366#if !defined(_CTYPE_DISABLE_MACROS) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
367#define isleadbyte(_c) (__PCTYPE_FUNC[(unsigned char)(_c)] & _LEADBYTE)
368#endif
369#endif
370#define _WCTYPE_INLINE_DEFINED
371#endif
372
373#if !defined(_POSIX_) || defined(__GNUC__)240#if !defined(_POSIX_) || defined(__GNUC__)
374#ifndef _INO_T_DEFINED241#ifndef _INO_T_DEFINED
375#define _INO_T_DEFINED242#define _INO_T_DEFINED
...@@ -395,7 +262,7 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);...@@ -395,7 +262,7 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
395262
396 _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat);263 _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat);
397 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat);264 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat);
398 int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat);265 _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat);
399 _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat);266 _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat);
400#endif267#endif
401#endif268#endif
...@@ -472,24 +339,49 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);...@@ -472,24 +339,49 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
472 int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);339 int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);
473340
474/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)341/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
475 int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);342 int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...)
343 __MINGW_UCRT_ASM_CALL(swscanf);
344/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
345 int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,va_list)
346 __MINGW_ASM_CALL(vswscanf);
476/* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)347/* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
477 int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...);348 int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...)
349 __MINGW_UCRT_ASM_CALL(wscanf);
350/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
351 int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list)
352 __MINGW_ASM_CALL(vwscanf);
478/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)353/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
479 int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);354 int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...)
355 __MINGW_UCRT_ASM_CALL(fwscanf);
356/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
357 int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list)
358 __MINGW_ASM_CALL(vfwscanf);
480359
481/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)360/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
482 int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);361 int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
362 /* No __MINGW_UCRT_ASM_CALL for __ms_fwprintf; this is provided as an
363 * actual function in the ucrt import libraries. */
483/* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)364/* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1)
484 int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...);365 int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...)
366 __MINGW_UCRT_ASM_CALL(wprintf);
485/* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2)367/* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2)
486 int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);368 int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList)
369 __MINGW_UCRT_ASM_CALL(vfwprintf);
487/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)370/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
488 int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);371 int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList)
372 __MINGW_UCRT_ASM_CALL(vwprintf);
489/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)373/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
490 int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);374 int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...)
375 __MINGW_UCRT_ASM_CALL(swprintf);
491/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)376/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
492 int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);377 int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list)
378 __MINGW_UCRT_ASM_CALL(vswprintf);
379/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
380 int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...)
381 __MINGW_UCRT_ASM_CALL(snwprintf);
382/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
383 int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list)
384 __MINGW_UCRT_ASM_CALL(vsnwprintf);
493385
494#ifdef _UCRT386#ifdef _UCRT
495 int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);387 int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);
...@@ -570,145 +462,41 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);...@@ -570,145 +462,41 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
570#else /* !__USE_MINGW_ANSI_STDIO */462#else /* !__USE_MINGW_ANSI_STDIO */
571463
572#ifdef _UCRT464#ifdef _UCRT
573 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN465 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
574 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...)466 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
575 {467 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
576 __builtin_va_list __ap;468 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);
577 int __ret;469 __MINGW_ATTRIB_DEPRECATED_SEC_WARN
578 __builtin_va_start(__ap, _Format);470 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...);
579 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap);
580 __builtin_va_end(__ap);
581 return __ret;
582 }
583 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN
584 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...)
585 {
586 __builtin_va_list __ap;
587 int __ret;
588 __builtin_va_start(__ap, _Format);
589 __ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap);
590 __builtin_va_end(__ap);
591 return __ret;
592 }
593 __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN
594 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...)
595 {
596 __builtin_va_list __ap;
597 int __ret;
598 __builtin_va_start(__ap, _Format);
599 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap);
600 __builtin_va_end(__ap);
601 return __ret;
602 }
603 __mingw_ovr
604 __MINGW_ATTRIB_NONNULL(2)471 __MINGW_ATTRIB_NONNULL(2)
605 int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv)472 int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv);
606 {
607 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv);
608 }
609473
610 __mingw_ovr
611 __MINGW_ATTRIB_NONNULL(2)474 __MINGW_ATTRIB_NONNULL(2)
612 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv)475 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv);
613 {
614 return __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, (size_t)-1, __format, NULL, __local_argv);
615 }
616 __mingw_ovr
617 __MINGW_ATTRIB_NONNULL(1)476 __MINGW_ATTRIB_NONNULL(1)
618 int vwscanf(const wchar_t *__format, va_list __local_argv)477 int vwscanf(const wchar_t *__format, va_list __local_argv);
619 {
620 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv);
621 }
622478
623 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);479 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
624 __mingw_ovr480 int __cdecl wprintf(const wchar_t * __restrict__ _Format,...);
625 int __cdecl wprintf(const wchar_t * __restrict__ _Format,...)481 int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);
626 {482 int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);
627 __builtin_va_list __ap;
628 int __ret;
629 __builtin_va_start(__ap, _Format);
630 __ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, __ap);
631 __builtin_va_end(__ap);
632 return __ret;
633 }
634 __mingw_ovr
635 int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList)
636 {
637 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList);
638 }
639 __mingw_ovr
640 int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList)
641 {
642 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList);
643 }
644483
645 __mingw_ovr484 int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...);
646 int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...)485 int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args);
647 {
648 __builtin_va_list __ap;
649 int __ret;
650 /*
651 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
652 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
653 * executed in "standard snprintf behavior" and returns number of (wide)
654 * chars required to allocate. For all other cases it is executed in a way
655 * that returns negative value on error. But C95+ compliant swprintf() for
656 * case _Count == 0 returns negative value, so handle this case specially.
657 */
658 if (_Dest == NULL && _Count == 0)
659 return -1;
660 __builtin_va_start(__ap, _Format);
661 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap);
662 __builtin_va_end(__ap);
663 return __ret < 0 ? -1 : __ret;
664 }
665 __mingw_ovr
666 int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args)
667 {
668 int __ret;
669 /*
670 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
671 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
672 * executed in "standard snprintf behavior" and returns number of (wide)
673 * chars required to allocate. For all other cases it is executed in a way
674 * that returns negative value on error. But C95+ compliant vswprintf() for
675 * case _Count == 0 returns negative value, so handle this case specially.
676 */
677 if (_Dest == NULL && _Count == 0)
678 return -1;
679 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args);
680 return __ret < 0 ? -1 : __ret;
681 }
682#else486#else
683487
684 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;488 int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
685 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;489 int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
686 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;490 int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
687#ifndef __NO_ISOCEXT /* externs in libmingwex.a */491#ifndef __NO_ISOCEXT /* externs in libmingwex.a */
688 int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list);
689 int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list);
690 int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list);
691
692 __mingw_ovr
693 __MINGW_ATTRIB_NONNULL(2)492 __MINGW_ATTRIB_NONNULL(2)
694 int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv)493 int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv);
695 {
696 return __ms_vfwscanf (__stream, __format, __local_argv);
697 }
698494
699 __mingw_ovr
700 __MINGW_ATTRIB_NONNULL(2)495 __MINGW_ATTRIB_NONNULL(2)
701 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv)496 int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv);
702 {
703 return __ms_vswscanf( __source, __format, __local_argv );
704 }
705 __mingw_ovr
706 __MINGW_ATTRIB_NONNULL(1)
707 int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv)
708 {
709 return __ms_vwscanf (__format, __local_argv);
710 }
711497
498 __MINGW_ATTRIB_NONNULL(1)
499 int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv);
712#endif /* __NO_ISOCEXT */500#endif /* __NO_ISOCEXT */
713501
714 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);502 int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...);
...@@ -765,22 +553,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);...@@ -765,22 +553,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
765 }553 }
766554
767#if __USE_MINGW_ANSI_STDIO == 0555#if __USE_MINGW_ANSI_STDIO == 0
768 __mingw_ovr556 int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
769 int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)557 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg);
770 {
771 __builtin_va_list __ap;
772 int __ret;
773 __builtin_va_start(__ap, format);
774 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, __ap);
775 __builtin_va_end(__ap);
776 return __ret < 0 ? -1 : __ret;
777 }
778 __mingw_ovr
779 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
780 {
781 int __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg);
782 return __ret < 0 ? -1 : __ret;
783 }
784#endif558#endif
785559
786#else560#else
...@@ -798,8 +572,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);...@@ -798,8 +572,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
798#pragma push_macro("vsnwprintf")572#pragma push_macro("vsnwprintf")
799# undef snwprintf573# undef snwprintf
800# undef vsnwprintf574# undef vsnwprintf
801 int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
802 int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
803 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);575 int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
804 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);576 int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
805#pragma pop_macro ("vsnwprintf")577#pragma pop_macro ("vsnwprintf")
lib/libc/include/any-windows-any/wctype.h+1-137
...@@ -6,145 +6,10 @@...@@ -6,145 +6,10 @@
6#ifndef _INC_WCTYPE6#ifndef _INC_WCTYPE
7#define _INC_WCTYPE7#define _INC_WCTYPE
88
9#ifndef _WIN329#include <corecrt_wctype.h>
10#error Only Win32 target is supported!
11#endif
12
13#include <crtdefs.h>
14
15#pragma pack(push,_CRT_PACKING)
1610
17#ifdef __cplusplus11#ifdef __cplusplus
18extern "C" {12extern "C" {
19#endif
20
21#ifndef _CRTIMP
22#define _CRTIMP __declspec(dllimport)
23#endif
24
25#ifndef _WCHAR_T_DEFINED
26#define _WCHAR_T_DEFINED
27#ifndef __cplusplus
28 typedef unsigned short wchar_t;
29#endif /* C++ */
30#endif /* _WCHAR_T_DEFINED */
31
32#ifndef _WCTYPE_T_DEFINED
33#define _WCTYPE_T_DEFINED
34 typedef unsigned short wint_t;
35 typedef unsigned short wctype_t;
36#endif /* _WCTYPE_T_DEFINED */
37
38#ifndef WEOF
39#define WEOF (wint_t)(0xFFFF)
40#endif
41
42#ifndef _CRT_CTYPEDATA_DEFINED
43#define _CRT_CTYPEDATA_DEFINED
44#ifndef _CTYPE_DISABLE_MACROS
45
46#ifndef __PCTYPE_FUNC
47#define __PCTYPE_FUNC __pctype_func()
48 _CRTIMP const unsigned short* __pctype_func(void);
49#endif
50
51#ifndef _pctype
52#define _pctype (__pctype_func())
53#endif
54
55#endif
56#endif
57
58#ifndef _CRT_WCTYPEDATA_DEFINED
59#define _CRT_WCTYPEDATA_DEFINED
60#ifndef _CTYPE_DISABLE_MACROS
61#if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP)
62 extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype);
63#define _wctype (* __MINGW_IMP_SYMBOL(_wctype))
64#endif
65
66 _CRTIMP const wctype_t * __cdecl __pwctype_func(void);
67#ifndef _pwctype
68#define _pwctype (__pwctype_func())
69#endif
70#endif
71#endif
72
73#define _UPPER 0x1
74#define _LOWER 0x2
75#define _DIGIT 0x4
76#define _SPACE 0x8
77
78#define _PUNCT 0x10
79#define _CONTROL 0x20
80#define _BLANK 0x40
81#define _HEX 0x80
82
83#define _LEADBYTE 0x8000
84#define _ALPHA (0x0100|_UPPER|_LOWER)
85
86#ifndef _WCTYPE_DEFINED
87#define _WCTYPE_DEFINED
88
89 int __cdecl iswalpha(wint_t);
90 int __cdecl iswupper(wint_t);
91 int __cdecl iswlower(wint_t);
92 int __cdecl iswdigit(wint_t);
93 int __cdecl iswxdigit(wint_t);
94 int __cdecl iswspace(wint_t);
95 int __cdecl iswpunct(wint_t);
96 int __cdecl iswalnum(wint_t);
97 int __cdecl iswprint(wint_t);
98 int __cdecl iswgraph(wint_t);
99 int __cdecl iswcntrl(wint_t);
100 int __cdecl iswascii(wint_t);
101 int __cdecl isleadbyte(int);
102 wint_t __cdecl towupper(wint_t);
103 wint_t __cdecl towlower(wint_t);
104 int __cdecl iswctype(wint_t,wctype_t);
105#if __MSVCRT_VERSION__ >= 0x800
106 _CRTIMP int __cdecl __iswcsymf(wint_t);
107 _CRTIMP int __cdecl __iswcsym(wint_t);
108#endif
109 int __cdecl is_wctype(wint_t,wctype_t);
110#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) || defined (__cplusplus)
111int __cdecl iswblank(wint_t _C);
112#endif
113#endif
114
115#ifndef _WCTYPE_INLINE_DEFINED
116#define _WCTYPE_INLINE_DEFINED
117#ifndef __cplusplus
118#define iswalpha(_c) (iswctype(_c,_ALPHA))
119#define iswupper(_c) (iswctype(_c,_UPPER))
120#define iswlower(_c) (iswctype(_c,_LOWER))
121#define iswdigit(_c) (iswctype(_c,_DIGIT))
122#define iswxdigit(_c) (iswctype(_c,_HEX))
123#define iswspace(_c) (iswctype(_c,_SPACE))
124#define iswpunct(_c) (iswctype(_c,_PUNCT))
125#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT))
126#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT))
127#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
128#define iswcntrl(_c) (iswctype(_c,_CONTROL))
129#define iswascii(_c) ((unsigned)(_c) < 0x80)
130#define isleadbyte(c) (__pctype_func()[(unsigned char)(c)] & _LEADBYTE)
131#else
132#ifndef __CRT__NO_INLINE
133 __CRT_INLINE int __cdecl iswalpha(wint_t _C) {return (iswctype(_C,_ALPHA)); }
134 __CRT_INLINE int __cdecl iswupper(wint_t _C) {return (iswctype(_C,_UPPER)); }
135 __CRT_INLINE int __cdecl iswlower(wint_t _C) {return (iswctype(_C,_LOWER)); }
136 __CRT_INLINE int __cdecl iswdigit(wint_t _C) {return (iswctype(_C,_DIGIT)); }
137 __CRT_INLINE int __cdecl iswxdigit(wint_t _C) {return (iswctype(_C,_HEX)); }
138 __CRT_INLINE int __cdecl iswspace(wint_t _C) {return (iswctype(_C,_SPACE)); }
139 __CRT_INLINE int __cdecl iswpunct(wint_t _C) {return (iswctype(_C,_PUNCT)); }
140 __CRT_INLINE int __cdecl iswalnum(wint_t _C) {return (iswctype(_C,_ALPHA|_DIGIT)); }
141 __CRT_INLINE int __cdecl iswprint(wint_t _C) {return (iswctype(_C,_BLANK|_PUNCT|_ALPHA|_DIGIT)); }
142 __CRT_INLINE int __cdecl iswgraph(wint_t _C) {return (iswctype(_C,_PUNCT|_ALPHA|_DIGIT)); }
143 __CRT_INLINE int __cdecl iswcntrl(wint_t _C) {return (iswctype(_C,_CONTROL)); }
144 __CRT_INLINE int __cdecl iswascii(wint_t _C) {return ((unsigned)(_C) < 0x80); }
145 __CRT_INLINE int __cdecl isleadbyte(int _C) {return (__pctype_func()[(unsigned char)(_C)] & _LEADBYTE); }
146#endif /* !__CRT__NO_INLINE */
147#endif /* __cplusplus */
148#endif13#endif
14914
150 typedef wchar_t wctrans_t;15 typedef wchar_t wctrans_t;
...@@ -156,5 +21,4 @@ int __cdecl iswblank(wint_t _C);...@@ -156,5 +21,4 @@ int __cdecl iswblank(wint_t _C);
156}21}
157#endif22#endif
15823
159#pragma pack(pop)
160#endif24#endif
lib/libc/include/any-windows-any/wdstptmgmt.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wdstptmgmt.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wdstptmgmt.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/weakreference.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/weakreference.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/weakreference.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wia_lh.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wia_lh.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wia_lh.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wia_xp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wia_xp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wia_xp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wiadef.h+3-3
...@@ -253,9 +253,9 @@ extern "C" {...@@ -253,9 +253,9 @@ extern "C" {
253#define WIA_DIP_DRIVER_VERSION_STR L"Driver Version"253#define WIA_DIP_DRIVER_VERSION_STR L"Driver Version"
254254
255#ifdef WIA_DECLARE_DEVINFO_PROP_ARRAY255#ifdef WIA_DECLARE_DEVINFO_PROP_ARRAY
256 PROPSPEC g_psDeviceInfo[WIA_NUM_DIP] = { {PRSPEC_PROPID,WIA_DIP_DEV_ID},{PRSPEC_PROPID,WIA_DIP_VEND_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_TYPE},{PRSPEC_PROPID,WIA_DIP_PORT_NAME},{PRSPEC_PROPID,WIA_DIP_DEV_NAME},{PRSPEC_PROPID,WIA_DIP_SERVER_NAME},{PRSPEC_PROPID,WIA_DIP_REMOTE_DEV_ID},{PRSPEC_PROPID,WIA_DIP_UI_CLSID},{PRSPEC_PROPID,WIA_DIP_HW_CONFIG},{PRSPEC_PROPID,WIA_DIP_BAUDRATE},{PRSPEC_PROPID,WIA_DIP_STI_GEN_CAPABILITIES},{PRSPEC_PROPID,WIA_DIP_WIA_VERSION},{PRSPEC_PROPID,WIA_DIP_DRIVER_VERSION},};256 PROPSPEC g_psDeviceInfo[WIA_NUM_DIP] = { {PRSPEC_PROPID,WIA_DIP_DEV_ID},{PRSPEC_PROPID,WIA_DIP_VEND_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_TYPE},{PRSPEC_PROPID,WIA_DIP_PORT_NAME},{PRSPEC_PROPID,WIA_DIP_DEV_NAME},{PRSPEC_PROPID,WIA_DIP_SERVER_NAME},{PRSPEC_PROPID,WIA_DIP_REMOTE_DEV_ID},{PRSPEC_PROPID,WIA_DIP_UI_CLSID},{PRSPEC_PROPID,WIA_DIP_HW_CONFIG},{PRSPEC_PROPID,WIA_DIP_BAUDRATE},{PRSPEC_PROPID,WIA_DIP_STI_GEN_CAPABILITIES},{PRSPEC_PROPID,WIA_DIP_WIA_VERSION},{PRSPEC_PROPID,WIA_DIP_DRIVER_VERSION}};
257 PROPID g_piDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID,WIA_DIP_VEND_DESC,WIA_DIP_DEV_DESC,WIA_DIP_DEV_TYPE,WIA_DIP_PORT_NAME,WIA_DIP_DEV_NAME,WIA_DIP_SERVER_NAME,WIA_DIP_REMOTE_DEV_ID,WIA_DIP_UI_CLSID,WIA_DIP_HW_CONFIG,WIA_DIP_BAUDRATE,WIA_DIP_STI_GEN_CAPABILITIES,WIA_DIP_WIA_VERSION,WIA_DIP_DRIVER_VERSION,};257 PROPID g_piDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID,WIA_DIP_VEND_DESC,WIA_DIP_DEV_DESC,WIA_DIP_DEV_TYPE,WIA_DIP_PORT_NAME,WIA_DIP_DEV_NAME,WIA_DIP_SERVER_NAME,WIA_DIP_REMOTE_DEV_ID,WIA_DIP_UI_CLSID,WIA_DIP_HW_CONFIG,WIA_DIP_BAUDRATE,WIA_DIP_STI_GEN_CAPABILITIES,WIA_DIP_WIA_VERSION,WIA_DIP_DRIVER_VERSION};
258 LPOLESTR g_pszDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID_STR,WIA_DIP_VEND_DESC_STR,WIA_DIP_DEV_DESC_STR,WIA_DIP_DEV_TYPE_STR,WIA_DIP_PORT_NAME_STR,WIA_DIP_DEV_NAME_STR,WIA_DIP_SERVER_NAME_STR,WIA_DIP_REMOTE_DEV_ID_STR,WIA_DIP_UI_CLSID_STR,WIA_DIP_HW_CONFIG_STR,WIA_DIP_BAUDRATE_STR,WIA_DIP_STI_GEN_CAPABILITIES_STR,WIA_DIP_WIA_VERSION_STR,WIA_DIP_DRIVER_VERSION_STR,};258 LPOLESTR g_pszDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID_STR,WIA_DIP_VEND_DESC_STR,WIA_DIP_DEV_DESC_STR,WIA_DIP_DEV_TYPE_STR,WIA_DIP_PORT_NAME_STR,WIA_DIP_DEV_NAME_STR,WIA_DIP_SERVER_NAME_STR,WIA_DIP_REMOTE_DEV_ID_STR,WIA_DIP_UI_CLSID_STR,WIA_DIP_HW_CONFIG_STR,WIA_DIP_BAUDRATE_STR,WIA_DIP_STI_GEN_CAPABILITIES_STR,WIA_DIP_WIA_VERSION_STR,WIA_DIP_DRIVER_VERSION_STR};
259#else259#else
260 extern PROPSPEC g_psDeviceInfo[WIA_NUM_DIP];260 extern PROPSPEC g_psDeviceInfo[WIA_NUM_DIP];
261 extern PROPID g_piDeviceInfo[WIA_NUM_DIP];261 extern PROPID g_piDeviceInfo[WIA_NUM_DIP];
lib/libc/include/any-windows-any/winbase.h+3-3
...@@ -2311,7 +2311,7 @@ typedef enum FILE_FLUSH_MODE {...@@ -2311,7 +2311,7 @@ typedef enum FILE_FLUSH_MODE {
2311 COPYFILE2_CALLBACK_STREAM_FINISHED,2311 COPYFILE2_CALLBACK_STREAM_FINISHED,
2312 COPYFILE2_CALLBACK_POLL_CONTINUE,2312 COPYFILE2_CALLBACK_POLL_CONTINUE,
2313 COPYFILE2_CALLBACK_ERROR,2313 COPYFILE2_CALLBACK_ERROR,
2314 COPYFILE2_CALLBACK_MAX,2314 COPYFILE2_CALLBACK_MAX
2315 } COPYFILE2_MESSAGE_TYPE;2315 } COPYFILE2_MESSAGE_TYPE;
23162316
2317 typedef enum _COPYFILE2_MESSAGE_ACTION {2317 typedef enum _COPYFILE2_MESSAGE_ACTION {
...@@ -2319,7 +2319,7 @@ typedef enum FILE_FLUSH_MODE {...@@ -2319,7 +2319,7 @@ typedef enum FILE_FLUSH_MODE {
2319 COPYFILE2_PROGRESS_CANCEL,2319 COPYFILE2_PROGRESS_CANCEL,
2320 COPYFILE2_PROGRESS_STOP,2320 COPYFILE2_PROGRESS_STOP,
2321 COPYFILE2_PROGRESS_QUIET,2321 COPYFILE2_PROGRESS_QUIET,
2322 COPYFILE2_PROGRESS_PAUSE,2322 COPYFILE2_PROGRESS_PAUSE
2323 } COPYFILE2_MESSAGE_ACTION;2323 } COPYFILE2_MESSAGE_ACTION;
23242324
2325 typedef enum _COPYFILE2_COPY_PHASE {2325 typedef enum _COPYFILE2_COPY_PHASE {
...@@ -2330,7 +2330,7 @@ typedef enum FILE_FLUSH_MODE {...@@ -2330,7 +2330,7 @@ typedef enum FILE_FLUSH_MODE {
2330 COPYFILE2_PHASE_WRITE_DESTINATION,2330 COPYFILE2_PHASE_WRITE_DESTINATION,
2331 COPYFILE2_PHASE_SERVER_COPY,2331 COPYFILE2_PHASE_SERVER_COPY,
2332 COPYFILE2_PHASE_NAMEGRAFT_COPY,2332 COPYFILE2_PHASE_NAMEGRAFT_COPY,
2333 COPYFILE2_PHASE_MAX,2333 COPYFILE2_PHASE_MAX
2334 } COPYFILE2_COPY_PHASE;2334 } COPYFILE2_COPY_PHASE;
23352335
2336#define COPYFILE2_MESSAGE_COPY_OFFLOAD (__MSABI_LONG (0x00000001))2336#define COPYFILE2_MESSAGE_COPY_OFFLOAD (__MSABI_LONG (0x00000001))
lib/libc/include/any-windows-any/wincodec.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wincodec.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wincodec.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wincodecsdk.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wincodecsdk.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wincodecsdk.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/winddi.h+1-1
...@@ -2027,7 +2027,7 @@ typedef enum _ENG_SYSTEM_ATTRIBUTE {...@@ -2027,7 +2027,7 @@ typedef enum _ENG_SYSTEM_ATTRIBUTE {
2027 EngProcessorFeature = 1,2027 EngProcessorFeature = 1,
2028 EngNumberOfProcessors,2028 EngNumberOfProcessors,
2029 EngOptimumAvailableUserMemory,2029 EngOptimumAvailableUserMemory,
2030 EngOptimumAvailableSystemMemory,2030 EngOptimumAvailableSystemMemory
2031} ENG_SYSTEM_ATTRIBUTE;2031} ENG_SYSTEM_ATTRIBUTE;
20322032
2033#define QSA_MMX 0x000001002033#define QSA_MMX 0x00000100
lib/libc/include/any-windows-any/windot11.h+1-1
...@@ -1444,7 +1444,7 @@ typedef struct _DOT11_SEND_EXTENSION_INFO {...@@ -1444,7 +1444,7 @@ typedef struct _DOT11_SEND_EXTENSION_INFO {
1444typedef enum _DOT11_ACK_POLICY {1444typedef enum _DOT11_ACK_POLICY {
1445 dot11_ack_policy_none = 0,1445 dot11_ack_policy_none = 0,
1446 dot11_ack_policy_acknowledge = 1,1446 dot11_ack_policy_acknowledge = 1,
1447 dot11_ack_policy_do_not_acknowledge = 2,1447 dot11_ack_policy_do_not_acknowledge = 2
1448} DOT11_ACK_POLICY, *PDOT11_ACK_POLICY;1448} DOT11_ACK_POLICY, *PDOT11_ACK_POLICY;
14491449
1450typedef struct _DOT11_SEND_EXTENSION_INFO_V2 {1450typedef struct _DOT11_SEND_EXTENSION_INFO_V2 {
lib/libc/include/any-windows-any/windowsnumerics.impl.h+15-15
...@@ -372,7 +372,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -372,7 +372,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
372 return {372 return {
373 1.0f, 0.0f,373 1.0f, 0.0f,
374 0.0f, 1.0f,374 0.0f, 1.0f,
375 0.0f, 0.0f,375 0.0f, 0.0f
376 };376 };
377 }377 }
378378
...@@ -422,21 +422,21 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -422,21 +422,21 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
422 return {422 return {
423 dot(v1r1, v2c1), dot(v1r1, v2c2),423 dot(v1r1, v2c1), dot(v1r1, v2c2),
424 dot(v1r2, v2c1), dot(v1r2, v2c2),424 dot(v1r2, v2c1), dot(v1r2, v2c2),
425 dot(v1r3, v2c1), dot(v1r3, v2c2),425 dot(v1r3, v2c1), dot(v1r3, v2c2)
426 };426 };
427 }427 }
428 inline float3x2 operator*(const float3x2 &val1, float val2) {428 inline float3x2 operator*(const float3x2 &val1, float val2) {
429 return {429 return {
430 val1.m11 * val2, val1.m12 * val2,430 val1.m11 * val2, val1.m12 * val2,
431 val1.m21 * val2, val1.m22 * val2,431 val1.m21 * val2, val1.m22 * val2,
432 val1.m31 * val2, val1.m32 * val2,432 val1.m31 * val2, val1.m32 * val2
433 };433 };
434 }434 }
435 inline float3x2 operator-(const float3x2 &val) {435 inline float3x2 operator-(const float3x2 &val) {
436 return {436 return {
437 -val.m11, -val.m12,437 -val.m11, -val.m12,
438 -val.m21, -val.m22,438 -val.m21, -val.m22,
439 -val.m31, -val.m32,439 -val.m31, -val.m32
440 };440 };
441 }441 }
442#undef _WINDOWS_NUMERICS_IMPL_BINARY_OP442#undef _WINDOWS_NUMERICS_IMPL_BINARY_OP
...@@ -479,7 +479,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -479,7 +479,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
479 1.0f, 0.0f, 0.0f, 0.0f,479 1.0f, 0.0f, 0.0f, 0.0f,
480 0.0f, 1.0f, 0.0f, 0.0f,480 0.0f, 1.0f, 0.0f, 0.0f,
481 0.0f, 0.0f, 1.0f, 0.0f,481 0.0f, 0.0f, 1.0f, 0.0f,
482 0.0f, 0.0f, 0.0f, 1.0f,482 0.0f, 0.0f, 0.0f, 1.0f
483 };483 };
484 }484 }
485485
...@@ -552,7 +552,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -552,7 +552,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
552 dot(v1r1, v2c1), dot(v1r1, v2c2), dot(v1r1, v2c3), dot(v1r1, v2c4),552 dot(v1r1, v2c1), dot(v1r1, v2c2), dot(v1r1, v2c3), dot(v1r1, v2c4),
553 dot(v1r2, v2c1), dot(v1r2, v2c2), dot(v1r2, v2c3), dot(v1r2, v2c4),553 dot(v1r2, v2c1), dot(v1r2, v2c2), dot(v1r2, v2c3), dot(v1r2, v2c4),
554 dot(v1r3, v2c1), dot(v1r3, v2c2), dot(v1r3, v2c3), dot(v1r3, v2c4),554 dot(v1r3, v2c1), dot(v1r3, v2c2), dot(v1r3, v2c3), dot(v1r3, v2c4),
555 dot(v1r4, v2c1), dot(v1r4, v2c2), dot(v1r4, v2c3), dot(v1r4, v2c4),555 dot(v1r4, v2c1), dot(v1r4, v2c2), dot(v1r4, v2c3), dot(v1r4, v2c4)
556 };556 };
557 }557 }
558 inline float4x4 operator*(const float4x4 &val1, float val2) {558 inline float4x4 operator*(const float4x4 &val1, float val2) {
...@@ -560,7 +560,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -560,7 +560,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
560 val1.m11 * val2, val1.m12 * val2, val1.m13 * val2, val1.m14 * val2,560 val1.m11 * val2, val1.m12 * val2, val1.m13 * val2, val1.m14 * val2,
561 val1.m21 * val2, val1.m22 * val2, val1.m23 * val2, val1.m24 * val2,561 val1.m21 * val2, val1.m22 * val2, val1.m23 * val2, val1.m24 * val2,
562 val1.m31 * val2, val1.m32 * val2, val1.m33 * val2, val1.m34 * val2,562 val1.m31 * val2, val1.m32 * val2, val1.m33 * val2, val1.m34 * val2,
563 val1.m41 * val2, val1.m42 * val2, val1.m43 * val2, val1.m44 * val2,563 val1.m41 * val2, val1.m42 * val2, val1.m43 * val2, val1.m44 * val2
564 };564 };
565 }565 }
566 inline float4x4 operator-(const float4x4 &val) {566 inline float4x4 operator-(const float4x4 &val) {
...@@ -568,7 +568,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -568,7 +568,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
568 -val.m11, -val.m12, -val.m13, -val.m14,568 -val.m11, -val.m12, -val.m13, -val.m14,
569 -val.m21, -val.m22, -val.m23, -val.m24,569 -val.m21, -val.m22, -val.m23, -val.m24,
570 -val.m31, -val.m32, -val.m33, -val.m34,570 -val.m31, -val.m32, -val.m33, -val.m34,
571 -val.m41, -val.m42, -val.m43, -val.m44,571 -val.m41, -val.m42, -val.m43, -val.m44
572 };572 };
573 }573 }
574#undef _WINDOWS_NUMERICS_IMPL_BINARY_OP574#undef _WINDOWS_NUMERICS_IMPL_BINARY_OP
...@@ -678,7 +678,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -678,7 +678,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
678 val1.w * val2.x + val1.x * val2.w + val1.y * val2.z - val1.z * val2.y,678 val1.w * val2.x + val1.x * val2.w + val1.y * val2.z - val1.z * val2.y,
679 val1.w * val2.y - val1.x * val2.z + val1.y * val2.w + val1.z * val2.x,679 val1.w * val2.y - val1.x * val2.z + val1.y * val2.w + val1.z * val2.x,
680 val1.w * val2.z + val1.x * val2.y - val1.y * val2.x + val1.z * val2.w,680 val1.w * val2.z + val1.x * val2.y - val1.y * val2.x + val1.z * val2.w,
681 val1.w * val2.w - val1.x * val2.x - val1.y * val2.y - val1.z * val2.z,681 val1.w * val2.w - val1.x * val2.x - val1.y * val2.y - val1.z * val2.z
682 }; }682 }; }
683 inline quaternion operator*(const quaternion &val1, float val2) {683 inline quaternion operator*(const quaternion &val1, float val2) {
684 return { val1.x * val2, val1.y * val2, val1.z * val2, val1.w * val2 };684 return { val1.x * val2, val1.y * val2, val1.z * val2, val1.w * val2 };
...@@ -783,7 +783,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -783,7 +783,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
783 return {783 return {
784 val1.y * val2.z - val2.y * val1.z,784 val1.y * val2.z - val2.y * val1.z,
785 val1.z * val2.x - val2.z * val1.x,785 val1.z * val2.x - val2.z * val1.x,
786 val1.x * val2.y - val2.x * val1.y,786 val1.x * val2.y - val2.x * val1.y
787 };787 };
788 }788 }
789 inline float3 reflect(const float3 &vec, const float3 &norm) {789 inline float3 reflect(const float3 &vec, const float3 &norm) {
...@@ -845,7 +845,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -845,7 +845,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
845 ::std::min(val1.x, val2.x),845 ::std::min(val1.x, val2.x),
846 ::std::min(val1.y, val2.y),846 ::std::min(val1.y, val2.y),
847 ::std::min(val1.z, val2.z),847 ::std::min(val1.z, val2.z),
848 ::std::min(val1.w, val2.w),848 ::std::min(val1.w, val2.w)
849 };849 };
850 }850 }
851 inline float4 max(const float4 &val1, const float4 &val2) {851 inline float4 max(const float4 &val1, const float4 &val2) {
...@@ -853,7 +853,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -853,7 +853,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
853 ::std::max(val1.x, val2.x),853 ::std::max(val1.x, val2.x),
854 ::std::max(val1.y, val2.y),854 ::std::max(val1.y, val2.y),
855 ::std::max(val1.z, val2.z),855 ::std::max(val1.z, val2.z),
856 ::std::max(val1.w, val2.w),856 ::std::max(val1.w, val2.w)
857 };857 };
858 }858 }
859 inline float4 clamp(const float4 &val, const float4 &min, const float4 &max) {859 inline float4 clamp(const float4 &val, const float4 &min, const float4 &max) {
...@@ -861,7 +861,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -861,7 +861,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
861 _impl::clamp(val.x, min.x, max.x),861 _impl::clamp(val.x, min.x, max.x),
862 _impl::clamp(val.y, min.y, max.y),862 _impl::clamp(val.y, min.y, max.y),
863 _impl::clamp(val.z, min.z, max.z),863 _impl::clamp(val.z, min.z, max.z),
864 _impl::clamp(val.w, min.w, max.w),864 _impl::clamp(val.w, min.w, max.w)
865 };865 };
866 }866 }
867 inline float4 lerp(const float4 &val1, const float4 &val2, float amount) {867 inline float4 lerp(const float4 &val1, const float4 &val2, float amount) {
...@@ -869,7 +869,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -869,7 +869,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
869 _impl::lerp(val1.x, val2.x, amount),869 _impl::lerp(val1.x, val2.x, amount),
870 _impl::lerp(val1.y, val2.y, amount),870 _impl::lerp(val1.y, val2.y, amount),
871 _impl::lerp(val1.z, val2.z, amount),871 _impl::lerp(val1.z, val2.z, amount),
872 _impl::lerp(val1.w, val2.w, amount),872 _impl::lerp(val1.w, val2.w, amount)
873 };873 };
874 }874 }
875 // TODO: impl875 // TODO: impl
...@@ -1018,7 +1018,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {...@@ -1018,7 +1018,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ {
1018 val.m11, val.m21, val.m31, val.m41,1018 val.m11, val.m21, val.m31, val.m41,
1019 val.m12, val.m22, val.m32, val.m42,1019 val.m12, val.m22, val.m32, val.m42,
1020 val.m13, val.m23, val.m33, val.m43,1020 val.m13, val.m23, val.m33, val.m43,
1021 val.m14, val.m24, val.m34, val.m44,1021 val.m14, val.m24, val.m34, val.m44
1022 };1022 };
1023 }1023 }
1024 inline float4x4 lerp(const float4x4 &val1, const float4x4 &val2, float amount);1024 inline float4x4 lerp(const float4x4 &val1, const float4x4 &val2, float amount);
lib/libc/include/any-windows-any/winhttp.h+60-4
...@@ -20,9 +20,9 @@...@@ -20,9 +20,9 @@
20#define __WINE_WINHTTP_H20#define __WINE_WINHTTP_H
2121
22#ifdef _WIN6422#ifdef _WIN64
23#include <pshpack8.h>23#pragma pack(push,8)
24#else24#else
25#include <pshpack4.h>25#pragma pack(push,4)
26#endif26#endif
2727
28#ifdef _WINHTTP_INTERNAL_28#ifdef _WINHTTP_INTERNAL_
...@@ -178,7 +178,53 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME;...@@ -178,7 +178,53 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME;
178#define WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED 145178#define WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED 145
179#define WINHTTP_OPTION_REQUEST_STATS 146179#define WINHTTP_OPTION_REQUEST_STATS 146
180#define WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT 147180#define WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT 147
181#define WINHTTP_LAST_OPTION WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT181#define WINHTTP_OPTION_CONNECTION_STATS_V1 150
182#define WINHTTP_OPTION_SECURITY_INFO 151
183#define WINHTTP_OPTION_TCP_KEEPALIVE 152
184#define WINHTTP_OPTION_TCP_FAST_OPEN 153
185#define WINHTTP_OPTION_TCP_FALSE_START 154
186#define WINHTTP_OPTION_IGNORE_CERT_REVOCATION_OFFLINE 155
187#define WINHTTP_OPTION_TLS_PROTOCOL_INSECURE_FALLBACK 158
188#define WINHTTP_OPTION_STREAM_ERROR_CODE 159
189#define WINHTTP_OPTION_REQUIRE_STREAM_END 160
190#define WINHTTP_OPTION_ENABLE_HTTP2_PLUS_CLIENT_CERT 161
191#define WINHTTP_OPTION_FAILED_CONNECTION_RETRIES 162
192#define WINHTTP_OPTION_HTTP2_KEEPALIVE 164
193#define WINHTTP_OPTION_RESOLUTION_HOSTNAME 165
194#define WINHTTP_OPTION_SET_TOKEN_BINDING 166
195#define WINHTTP_OPTION_TOKEN_BINDING_PUBLIC_KEY 167
196#define WINHTTP_OPTION_REFERER_TOKEN_BINDING_HOSTNAME 168
197#define WINHTTP_OPTION_HTTP2_PLUS_TRANSFER_ENCODING 169
198#define WINHTTP_OPTION_RESOLVER_CACHE_CONFIG 170
199#define WINHTTP_OPTION_DISABLE_CERT_CHAIN_BUILDING 171
200#define WINHTTP_OPTION_BACKGROUND_CONNECTIONS 172
201#define WINHTTP_OPTION_FIRST_AVAILABLE_CONNECTION 173
202#define WINHTTP_OPTION_TCP_PRIORITY_STATUS 177
203#define WINHTTP_OPTION_CONNECTION_GUID 178
204#define WINHTTP_OPTION_MATCH_CONNECTION_GUID 179
205#define WINHTTP_OPTION_HTTP2_RECEIVE_WINDOW 183
206#define WINHTTP_OPTION_FEATURE_SUPPORTED 184
207#define WINHTTP_OPTION_QUIC_STATS 185
208#define WINHTTP_OPTION_HTTP3_KEEPALIVE 188
209#define WINHTTP_OPTION_HTTP3_HANDSHAKE_TIMEOUT 189
210#define WINHTTP_OPTION_HTTP3_INITIAL_RTT 190
211#define WINHTTP_OPTION_HTTP3_STREAM_ERROR_CODE 191
212#define WINHTTP_OPTION_REQUEST_ANNOTATION 192
213#define WINHTTP_OPTION_DISABLE_PROXY_AUTH_SCHEMES 193
214#define WINHTTP_OPTION_REVERT_IMPERSONATION_SERVER_CERT 194
215#define WINHTTP_OPTION_DISABLE_GLOBAL_POOLING 195
216#define WINHTTP_OPTION_USE_SESSION_SCH_CRED 196
217#define WINHTTP_OPTION_QUIC_STATS_V2 200
218#define WINHTTP_OPTION_QUIC_STREAM_STATS 202
219#define WINHTTP_OPTION_USE_LOOKASIDE 203
220#define WINHTTP_OPTION_ERROR_LOG_GUID 204
221#define WINHTTP_OPTION_ENABLE_FAST_FORWARDING 205
222#define WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_DATA 206
223#define WINHTTP_OPTION_UPGRADE_TO_PROTOCOL 207
224#define WINHTTP_OPTION_CONNECTION_STATS_V2 208
225#define WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_STATUS 209
226
227#define WINHTTP_LAST_OPTION WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_STATUS
182#define WINHTTP_OPTION_USERNAME 0x1000228#define WINHTTP_OPTION_USERNAME 0x1000
183#define WINHTTP_OPTION_PASSWORD 0x1001229#define WINHTTP_OPTION_PASSWORD 0x1001
184#define WINHTTP_OPTION_PROXY_USERNAME 0x1002230#define WINHTTP_OPTION_PROXY_USERNAME 0x1002
...@@ -816,6 +862,16 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS...@@ -816,6 +862,16 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS
816#define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123862#define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123
817#define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000863#define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000
818864
865#ifdef __SCHANNEL_H__
866
867typedef struct _WINHTTP_SECURITY_INFO
868{
869 SecPkgContext_ConnectionInfo ConnectionInfo;
870 SecPkgContext_CipherInfo CipherInfo;
871} WINHTTP_SECURITY_INFO, *PWINHTTP_SECURITY_INFO;
872
873#endif
874
819#ifdef __cplusplus875#ifdef __cplusplus
820extern "C" {876extern "C" {
821#endif877#endif
...@@ -872,6 +928,6 @@ WINHTTPAPI DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,WINBOOL,WINHTT...@@ -872,6 +928,6 @@ WINHTTPAPI DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,WINBOOL,WINHTT
872}928}
873#endif929#endif
874930
875#include <poppack.h>931#pragma pack(pop)
876932
877#endif /* __WINE_WINHTTP_H */933#endif /* __WINE_WINHTTP_H */
lib/libc/include/any-windows-any/winhvemulation.h+5-1
...@@ -15,6 +15,8 @@...@@ -15,6 +15,8 @@
1515
16#include <winhvplatformdefs.h>16#include <winhvplatformdefs.h>
1717
18#if defined(__x86_64__)
19
18typedef union WHV_EMULATOR_STATUS {20typedef union WHV_EMULATOR_STATUS {
19 __C89_NAMELESS struct {21 __C89_NAMELESS struct {
20 UINT32 EmulationSuccessful : 1;22 UINT32 EmulationSuccessful : 1;
...@@ -77,6 +79,8 @@ HRESULT WINAPI WHvEmulatorTryMmioEmulation(WHV_EMULATOR_HANDLE Emulator, VOID *C...@@ -77,6 +79,8 @@ HRESULT WINAPI WHvEmulatorTryMmioEmulation(WHV_EMULATOR_HANDLE Emulator, VOID *C
77}79}
78#endif80#endif
7981
80#endif82#endif /* defined(__x86_64__) */
83
84#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
8185
82#endif86#endif
lib/libc/include/any-windows-any/winhvplatform.h+105
...@@ -15,6 +15,8 @@...@@ -15,6 +15,8 @@
1515
16#include <winhvplatformdefs.h>16#include <winhvplatformdefs.h>
1717
18#if defined(__x86_64__) || defined(__aarch64__)
19
18#ifdef __cplusplus20#ifdef __cplusplus
19extern "C" {21extern "C" {
20#endif22#endif
...@@ -39,16 +41,22 @@ HRESULT WINAPI WHvRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpI...@@ -39,16 +41,22 @@ HRESULT WINAPI WHvRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpI
39HRESULT WINAPI WHvCancelRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Flags);41HRESULT WINAPI WHvCancelRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Flags);
40HRESULT WINAPI WHvGetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, WHV_REGISTER_VALUE *RegisterValues);42HRESULT WINAPI WHvGetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, WHV_REGISTER_VALUE *RegisterValues);
41HRESULT WINAPI WHvSetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, const WHV_REGISTER_VALUE *RegisterValues);43HRESULT WINAPI WHvSetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, const WHV_REGISTER_VALUE *RegisterValues);
44#if defined(__x86_64__)
42HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize);45HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize);
43HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize);46HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize);
47#endif
44HRESULT WINAPI WHvRequestInterrupt(WHV_PARTITION_HANDLE Partition, const WHV_INTERRUPT_CONTROL *Interrupt, UINT32 InterruptControlSize);48HRESULT WINAPI WHvRequestInterrupt(WHV_PARTITION_HANDLE Partition, const WHV_INTERRUPT_CONTROL *Interrupt, UINT32 InterruptControlSize);
49#if defined(__x86_64__)
45HRESULT WINAPI WHvGetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);50HRESULT WINAPI WHvGetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);
46HRESULT WINAPI WHvSetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *Buffer, UINT32 BufferSizeInBytes);51HRESULT WINAPI WHvSetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *Buffer, UINT32 BufferSizeInBytes);
52#endif
47HRESULT WINAPI WHvQueryGpaRangeDirtyBitmap(WHV_PARTITION_HANDLE Partition, WHV_GUEST_PHYSICAL_ADDRESS GuestAddress, UINT64 RangeSizeInBytes, UINT64 *Bitmap, UINT32 BitmapSizeInBytes);53HRESULT WINAPI WHvQueryGpaRangeDirtyBitmap(WHV_PARTITION_HANDLE Partition, WHV_GUEST_PHYSICAL_ADDRESS GuestAddress, UINT64 RangeSizeInBytes, UINT64 *Bitmap, UINT32 BitmapSizeInBytes);
48HRESULT WINAPI WHvGetPartitionCounters(WHV_PARTITION_HANDLE Partition, WHV_PARTITION_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);54HRESULT WINAPI WHvGetPartitionCounters(WHV_PARTITION_HANDLE Partition, WHV_PARTITION_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);
49HRESULT WINAPI WHvGetVirtualProcessorCounters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, WHV_PROCESSOR_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);55HRESULT WINAPI WHvGetVirtualProcessorCounters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, WHV_PROCESSOR_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten);
56#if defined(__x86_64__)
50HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize);57HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize);
51HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize);58HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize);
59#endif
52HRESULT WINAPI WHvRegisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData, HANDLE EventHandle);60HRESULT WINAPI WHvRegisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData, HANDLE EventHandle);
53HRESULT WINAPI WHvUnregisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData);61HRESULT WINAPI WHvUnregisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData);
54HRESULT WINAPI WHvAdviseGpaRange(WHV_PARTITION_HANDLE Partition, const WHV_MEMORY_RANGE_ENTRY *GpaRanges, UINT32 GpaRangesCount, WHV_ADVISE_GPA_RANGE_CODE Advice, const VOID *AdviceBuffer, UINT32 AdviceBufferSizeInBytes);62HRESULT WINAPI WHvAdviseGpaRange(WHV_PARTITION_HANDLE Partition, const WHV_MEMORY_RANGE_ENTRY *GpaRanges, UINT32 GpaRangesCount, WHV_ADVISE_GPA_RANGE_CODE Advice, const VOID *AdviceBuffer, UINT32 AdviceBufferSizeInBytes);
...@@ -79,8 +87,10 @@ HRESULT WINAPI WHvCreateNotificationPort(WHV_PARTITION_HANDLE Partition, const W...@@ -79,8 +87,10 @@ HRESULT WINAPI WHvCreateNotificationPort(WHV_PARTITION_HANDLE Partition, const W
79HRESULT WINAPI WHvSetNotificationPortProperty(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle, WHV_NOTIFICATION_PORT_PROPERTY_CODE PropertyCode, WHV_NOTIFICATION_PORT_PROPERTY PropertyValue);87HRESULT WINAPI WHvSetNotificationPortProperty(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle, WHV_NOTIFICATION_PORT_PROPERTY_CODE PropertyCode, WHV_NOTIFICATION_PORT_PROPERTY PropertyValue);
80HRESULT WINAPI WHvDeleteNotificationPort(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle);88HRESULT WINAPI WHvDeleteNotificationPort(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle);
81HRESULT WINAPI WHvPostVirtualProcessorSynicMessage(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 SintIndex, const VOID *Message, UINT32 MessageSizeInBytes);89HRESULT WINAPI WHvPostVirtualProcessorSynicMessage(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 SintIndex, const VOID *Message, UINT32 MessageSizeInBytes);
90#if defined(__x86_64__)
82HRESULT WINAPI WHvGetVirtualProcessorCpuidOutput(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Eax, UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput);91HRESULT WINAPI WHvGetVirtualProcessorCpuidOutput(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Eax, UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput);
83HRESULT WINAPI WHvGetInterruptTargetVpSet(WHV_PARTITION_HANDLE Partition, UINT64 Destination, WHV_INTERRUPT_DESTINATION_MODE DestinationMode, UINT32 *TargetVps, UINT32 VpCount, UINT32 *TargetVpCount);92HRESULT WINAPI WHvGetInterruptTargetVpSet(WHV_PARTITION_HANDLE Partition, UINT64 Destination, WHV_INTERRUPT_DESTINATION_MODE DestinationMode, UINT32 *TargetVps, UINT32 VpCount, UINT32 *TargetVpCount);
93#endif
84HRESULT WINAPI WHvStartPartitionMigration(WHV_PARTITION_HANDLE Partition, HANDLE *MigrationHandle);94HRESULT WINAPI WHvStartPartitionMigration(WHV_PARTITION_HANDLE Partition, HANDLE *MigrationHandle);
85HRESULT WHvCancelPartitionMigration(WHV_PARTITION_HANDLE Partition);95HRESULT WHvCancelPartitionMigration(WHV_PARTITION_HANDLE Partition);
86HRESULT WHvCompletePartitionMigration(WHV_PARTITION_HANDLE Partition);96HRESULT WHvCompletePartitionMigration(WHV_PARTITION_HANDLE Partition);
...@@ -90,6 +100,101 @@ HRESULT WINAPI WHvAcceptPartitionMigration(HANDLE MigrationHandle, WHV_PARTITION...@@ -90,6 +100,101 @@ HRESULT WINAPI WHvAcceptPartitionMigration(HANDLE MigrationHandle, WHV_PARTITION
90}100}
91#endif101#endif
92102
103#endif /* defined(__x86_64__) || defined(__aarch64__) */
104
93#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */105#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
94106
95#endif /* _WINHVAPI_H_ */107#endif /* _WINHVAPI_H_ */
108
109
110#ifndef ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines
111#define ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines
112
113#ifdef __cplusplus
114extern "C" {
115#endif
116
117#if defined(__x86_64__) || defined(__aarch64__)
118
119BOOLEAN WINAPI IsWHvGetCapabilityPresent(VOID);
120BOOLEAN WINAPI IsWHvCreatePartitionPresent(VOID);
121BOOLEAN WINAPI IsWHvSetupPartitionPresent(VOID);
122BOOLEAN WINAPI IsWHvResetPartitionPresent(VOID);
123BOOLEAN WINAPI IsWHvDeletePartitionPresent(VOID);
124BOOLEAN WINAPI IsWHvGetPartitionPropertyPresent(VOID);
125BOOLEAN WINAPI IsWHvSetPartitionPropertyPresent(VOID);
126BOOLEAN WINAPI IsWHvSuspendPartitionTimePresent(VOID);
127BOOLEAN WINAPI IsWHvResumePartitionTimePresent(VOID);
128BOOLEAN WINAPI IsWHvMapGpaRangePresent(VOID);
129BOOLEAN WINAPI IsWHvMapGpaRange2Present(VOID);
130BOOLEAN WINAPI IsWHvUnmapGpaRangePresent(VOID);
131BOOLEAN WINAPI IsWHvTranslateGvaPresent(VOID);
132BOOLEAN WINAPI IsWHvCreateVirtualProcessorPresent(VOID);
133BOOLEAN WINAPI IsWHvCreateVirtualProcessor2Present(VOID);
134BOOLEAN WINAPI IsWHvDeleteVirtualProcessorPresent(VOID);
135BOOLEAN WINAPI IsWHvRunVirtualProcessorPresent(VOID);
136BOOLEAN WINAPI IsWHvCancelRunVirtualProcessorPresent(VOID);
137BOOLEAN WINAPI IsWHvGetVirtualProcessorRegistersPresent(VOID);
138BOOLEAN WINAPI IsWHvSetVirtualProcessorRegistersPresent(VOID);
139#if defined(__x86_64__)
140BOOLEAN WINAPI IsWHvGetVirtualProcessorInterruptControllerStatePresent(VOID);
141BOOLEAN WINAPI IsWHvSetVirtualProcessorInterruptControllerStatePresent(VOID);
142#endif
143BOOLEAN WINAPI IsWHvRequestInterruptPresent(VOID);
144#if defined(__x86_64__)
145BOOLEAN WINAPI IsWHvGetVirtualProcessorXsaveStatePresent(VOID);
146BOOLEAN WINAPI IsWHvSetVirtualProcessorXsaveStatePresent(VOID);
147#endif
148BOOLEAN WINAPI IsWHvQueryGpaRangeDirtyBitmapPresent(VOID);
149BOOLEAN WINAPI IsWHvGetPartitionCountersPresent(VOID);
150BOOLEAN WINAPI IsWHvGetVirtualProcessorCountersPresent(VOID);
151#if defined(__x86_64__)
152BOOLEAN WINAPI IsWHvGetVirtualProcessorInterruptControllerState2Present(VOID);
153BOOLEAN WINAPI IsWHvSetVirtualProcessorInterruptControllerState2Present(VOID);
154#endif
155BOOLEAN WINAPI IsWHvRegisterPartitionDoorbellEventPresent(VOID);
156BOOLEAN WINAPI IsWHvUnregisterPartitionDoorbellEventPresent(VOID);
157BOOLEAN WINAPI IsWHvAdviseGpaRangePresent(VOID);
158BOOLEAN WINAPI IsWHvReadGpaRangePresent(VOID);
159BOOLEAN WINAPI IsWHvWriteGpaRangePresent(VOID);
160BOOLEAN WINAPI IsWHvSignalVirtualProcessorSynicEventPresent(VOID);
161BOOLEAN WINAPI IsWHvGetVirtualProcessorStatePresent(VOID);
162BOOLEAN WINAPI IsWHvSetVirtualProcessorStatePresent(VOID);
163BOOLEAN WINAPI IsWHvAllocateVpciResourcePresent(VOID);
164BOOLEAN WINAPI IsWHvCreateVpciDevicePresent(VOID);
165BOOLEAN WINAPI IsWHvDeleteVpciDevicePresent(VOID);
166BOOLEAN WINAPI IsWHvGetVpciDevicePropertyPresent(VOID);
167BOOLEAN WINAPI IsWHvGetVpciDeviceNotificationPresent(VOID);
168BOOLEAN WINAPI IsWHvMapVpciDeviceMmioRangesPresent(VOID);
169BOOLEAN WINAPI IsWHvUnmapVpciDeviceMmioRangesPresent(VOID);
170BOOLEAN WINAPI IsWHvSetVpciDevicePowerStatePresent(VOID);
171BOOLEAN WINAPI IsWHvReadVpciDeviceRegisterPresent(VOID);
172BOOLEAN WINAPI IsWHvWriteVpciDeviceRegisterPresent(VOID);
173BOOLEAN WINAPI IsWHvMapVpciDeviceInterruptPresent(VOID);
174BOOLEAN WINAPI IsWHvUnmapVpciDeviceInterruptPresent(VOID);
175BOOLEAN WINAPI IsWHvRetargetVpciDeviceInterruptPresent(VOID);
176BOOLEAN WINAPI IsWHvRequestVpciDeviceInterruptPresent(VOID);
177BOOLEAN WINAPI IsWHvGetVpciDeviceInterruptTargetPresent(VOID);
178BOOLEAN WINAPI IsWHvCreateTriggerPresent(VOID);
179BOOLEAN WINAPI IsWHvUpdateTriggerParametersPresent(VOID);
180BOOLEAN WINAPI IsWHvDeleteTriggerPresent(VOID);
181BOOLEAN WINAPI IsWHvCreateNotificationPortPresent(VOID);
182BOOLEAN WINAPI IsWHvSetNotificationPortPropertyPresent(VOID);
183BOOLEAN WINAPI IsWHvDeleteNotificationPortPresent(VOID);
184BOOLEAN WINAPI IsWHvPostVirtualProcessorSynicMessagePresent(VOID);
185#if defined(__x86_64__)
186BOOLEAN WINAPI IsWHvGetVirtualProcessorCpuidOutputPresent(VOID);
187BOOLEAN WINAPI IsWHvGetInterruptTargetVpSetPresent(VOID);
188#endif
189BOOLEAN WINAPI IsWHvStartPartitionMigrationPresent(VOID);
190BOOLEAN WINAPI IsWHvCancelPartitionMigrationPresent(VOID);
191BOOLEAN WINAPI IsWHvCompletePartitionMigrationPresent(VOID);
192BOOLEAN WINAPI IsWHvAcceptPartitionMigrationPresent(VOID);
193
194#endif /* defined(__x86_64__) || defined(__aarch64__) */
195
196#ifdef __cplusplus
197}
198#endif
199
200#endif /* ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines */
lib/libc/include/any-windows-any/winhvplatformdefs.h+1977-1160
...@@ -6,790 +6,7 @@...@@ -6,790 +6,7 @@
6#ifndef _WINHVAPIDEFS_H_6#ifndef _WINHVAPIDEFS_H_
7#define _WINHVAPIDEFS_H_7#define _WINHVAPIDEFS_H_
88
9typedef enum WHV_CAPABILITY_CODE {9#if defined(__x86_64__) || defined(__aarch64__)
10 WHvCapabilityCodeHypervisorPresent = 0x00000000
11 ,WHvCapabilityCodeFeatures = 0x00000001
12 ,WHvCapabilityCodeExtendedVmExits = 0x00000002
13#if defined(__x86_64__)
14 ,WHvCapabilityCodeExceptionExitBitmap = 0x00000003
15 ,WHvCapabilityCodeX64MsrExitBitmap = 0x00000004
16#endif
17 ,WHvCapabilityCodeGpaRangePopulateFlags = 0x00000005
18 ,WHvCapabilityCodeSchedulerFeatures = 0x00000006
19 ,WHvCapabilityCodeProcessorVendor = 0x00001000
20 ,WHvCapabilityCodeProcessorFeatures = 0x00001001
21 ,WHvCapabilityCodeProcessorClFlushSize = 0x00001002
22#if defined(__x86_64__)
23 ,WHvCapabilityCodeProcessorXsaveFeatures = 0x00001003
24#endif
25 ,WHvCapabilityCodeProcessorClockFrequency = 0x00001004
26#if defined(__x86_64__)
27 ,WHvCapabilityCodeInterruptClockFrequency = 0x00001005
28#endif
29 ,WHvCapabilityCodeProcessorFeaturesBanks = 0x00001006
30 ,WHvCapabilityCodeProcessorFrequencyCap = 0x00001007
31 ,WHvCapabilityCodeSyntheticProcessorFeaturesBanks = 0x00001008
32#if defined(__x86_64__)
33 ,WHvCapabilityCodeProcessorPerfmonFeatures = 0x00001009
34#endif
35 ,WHvCapabilityCodePhysicalAddressWidth = 0x0000100A
36#if defined(__x86_64__)
37 ,WHvCapabilityCodeVmxBasic = 0x00002000
38 ,WHvCapabilityCodeVmxPinbasedCtls = 0x00002001
39 ,WHvCapabilityCodeVmxProcbasedCtls = 0x00002002
40 ,WHvCapabilityCodeVmxExitCtls = 0x00002003
41 ,WHvCapabilityCodeVmxEntryCtls = 0x00002004
42 ,WHvCapabilityCodeVmxMisc = 0x00002005
43 ,WHvCapabilityCodeVmxCr0Fixed0 = 0x00002006
44 ,WHvCapabilityCodeVmxCr0Fixed1 = 0x00002007
45 ,WHvCapabilityCodeVmxCr4Fixed0 = 0x00002008
46 ,WHvCapabilityCodeVmxCr4Fixed1 = 0x00002009
47 ,WHvCapabilityCodeVmxVmcsEnum = 0x0000200A
48 ,WHvCapabilityCodeVmxProcbasedCtls2 = 0x0000200B
49 ,WHvCapabilityCodeVmxEptVpidCap = 0x0000200C
50 ,WHvCapabilityCodeVmxTruePinbasedCtls = 0x0000200D
51 ,WHvCapabilityCodeVmxTrueProcbasedCtls = 0x0000200E
52 ,WHvCapabilityCodeVmxTrueExitCtls = 0x0000200F
53 ,WHvCapabilityCodeVmxTrueEntryCtls = 0x00002010
54#endif
55} WHV_CAPABILITY_CODE;
56
57typedef union WHV_CAPABILITY_FEATURES {
58 __C89_NAMELESS struct {
59 UINT64 PartialUnmap : 1;
60#if defined(__x86_64__)
61 UINT64 LocalApicEmulation : 1;
62 UINT64 Xsave : 1;
63#else
64 UINT64 ReservedArm0 : 2;
65#endif
66 UINT64 DirtyPageTracking : 1;
67 UINT64 SpeculationControl : 1;
68#if defined(__x86_64__)
69 UINT64 ApicRemoteRead : 1;
70#else
71 UINT64 ReservedArm1 : 1;
72#endif
73 UINT64 IdleSuspend : 1;
74 UINT64 VirtualPciDeviceSupport : 1;
75 UINT64 IommuSupport : 1;
76 UINT64 VpHotAddRemove : 1;
77 UINT64 Reserved : 54;
78 };
79 UINT64 AsUINT64;
80} WHV_CAPABILITY_FEATURES;
81
82C_ASSERT(sizeof(WHV_CAPABILITY_FEATURES) == sizeof(UINT64));
83
84typedef union WHV_EXTENDED_VM_EXITS {
85 __C89_NAMELESS struct {
86#if defined(__x86_64__)
87 UINT64 X64CpuidExit : 1;
88 UINT64 X64MsrExit : 1;
89 UINT64 ExceptionExit : 1;
90 UINT64 X64RdtscExit : 1;
91 UINT64 X64ApicSmiExitTrap : 1;
92#else
93 UINT64 ReservedArm0 : 5;
94#endif
95 UINT64 HypercallExit : 1;
96#if defined(__x86_64__)
97 UINT64 X64ApicInitSipiExitTrap : 1;
98 UINT64 X64ApicWriteLint0ExitTrap : 1;
99 UINT64 X64ApicWriteLint1ExitTrap : 1;
100 UINT64 X64ApicWriteSvrExitTrap : 1;
101#else
102 UINT64 ReservedArm1 : 4;
103#endif
104 UINT64 UnknownSynicConnection : 1;
105 UINT64 RetargetUnknownVpciDevice : 1;
106#if defined(__x86_64__)
107 UINT64 X64ApicWriteLdrExitTrap : 1;
108 UINT64 X64ApicWriteDfrExitTrap : 1;
109#else
110 UINT64 ReservedArm2 : 2;
111#endif
112 UINT64 GpaAccessFaultExit : 1;
113 UINT64 Reserved : 49;
114 };
115 UINT64 AsUINT64;
116} WHV_EXTENDED_VM_EXITS;
117
118C_ASSERT(sizeof(WHV_EXTENDED_VM_EXITS) == sizeof(UINT64));
119
120typedef enum WHV_PROCESSOR_VENDOR {
121 WHvProcessorVendorAmd = 0x0000,
122 WHvProcessorVendorIntel = 0x0001,
123 WHvProcessorVendorHygon = 0x0002,
124 WHvProcessorVendorArm = 0x0010
125} WHV_PROCESSOR_VENDOR;
126
127#if defined(__x86_64__)
128
129typedef union WHV_X64_PROCESSOR_FEATURES {
130 __C89_NAMELESS struct {
131 UINT64 Sse3Support : 1;
132 UINT64 LahfSahfSupport : 1;
133 UINT64 Ssse3Support : 1;
134 UINT64 Sse4_1Support : 1;
135 UINT64 Sse4_2Support : 1;
136 UINT64 Sse4aSupport : 1;
137 UINT64 XopSupport : 1;
138 UINT64 PopCntSupport : 1;
139 UINT64 Cmpxchg16bSupport : 1;
140 UINT64 Altmovcr8Support : 1;
141 UINT64 LzcntSupport : 1;
142 UINT64 MisAlignSseSupport : 1;
143 UINT64 MmxExtSupport : 1;
144 UINT64 Amd3DNowSupport : 1;
145 UINT64 ExtendedAmd3DNowSupport : 1;
146 UINT64 Page1GbSupport : 1;
147 UINT64 AesSupport : 1;
148 UINT64 PclmulqdqSupport : 1;
149 UINT64 PcidSupport : 1;
150 UINT64 Fma4Support : 1;
151 UINT64 F16CSupport : 1;
152 UINT64 RdRandSupport : 1;
153 UINT64 RdWrFsGsSupport : 1;
154 UINT64 SmepSupport : 1;
155 UINT64 EnhancedFastStringSupport : 1;
156 UINT64 Bmi1Support : 1;
157 UINT64 Bmi2Support : 1;
158 UINT64 Reserved1 : 2;
159 UINT64 MovbeSupport : 1;
160 UINT64 Npiep1Support : 1;
161 UINT64 DepX87FPUSaveSupport : 1;
162 UINT64 RdSeedSupport : 1;
163 UINT64 AdxSupport : 1;
164 UINT64 IntelPrefetchSupport : 1;
165 UINT64 SmapSupport : 1;
166 UINT64 HleSupport : 1;
167 UINT64 RtmSupport : 1;
168 UINT64 RdtscpSupport : 1;
169 UINT64 ClflushoptSupport : 1;
170 UINT64 ClwbSupport : 1;
171 UINT64 ShaSupport : 1;
172 UINT64 X87PointersSavedSupport : 1;
173 UINT64 InvpcidSupport : 1;
174 UINT64 IbrsSupport : 1;
175 UINT64 StibpSupport : 1;
176 UINT64 IbpbSupport : 1;
177 UINT64 UnrestrictedGuestSupport : 1;
178 UINT64 SsbdSupport : 1;
179 UINT64 FastShortRepMovSupport : 1;
180 UINT64 Reserved3 : 1;
181 UINT64 RdclNo : 1;
182 UINT64 IbrsAllSupport : 1;
183 UINT64 Reserved4 : 1;
184 UINT64 SsbNo : 1;
185 UINT64 RsbANo : 1;
186 UINT64 Reserved5 : 1;
187 UINT64 RdPidSupport : 1;
188 UINT64 UmipSupport : 1;
189 UINT64 MdsNoSupport : 1;
190 UINT64 MdClearSupport : 1;
191 UINT64 TaaNoSupport : 1;
192 UINT64 TsxCtrlSupport : 1;
193 UINT64 Reserved6 : 1;
194 };
195 UINT64 AsUINT64;
196} WHV_X64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES;
197
198C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES) == sizeof(UINT64));
199
200typedef union WHV_X64_PROCESSOR_FEATURES1 {
201 __C89_NAMELESS struct {
202 UINT64 ACountMCountSupport : 1;
203 UINT64 TscInvariantSupport : 1;
204 UINT64 ClZeroSupport : 1;
205 UINT64 RdpruSupport : 1;
206 UINT64 La57Support : 1;
207 UINT64 MbecSupport : 1;
208 UINT64 NestedVirtSupport : 1;
209 UINT64 PsfdSupport: 1;
210 UINT64 CetSsSupport : 1;
211 UINT64 CetIbtSupport : 1;
212 UINT64 VmxExceptionInjectSupport : 1;
213 UINT64 Reserved2 : 1;
214 UINT64 UmwaitTpauseSupport : 1;
215 UINT64 MovdiriSupport : 1;
216 UINT64 Movdir64bSupport : 1;
217 UINT64 CldemoteSupport : 1;
218 UINT64 SerializeSupport : 1;
219 UINT64 TscDeadlineTmrSupport : 1;
220 UINT64 TscAdjustSupport : 1;
221 UINT64 FZLRepMovsb : 1;
222 UINT64 FSRepStosb : 1;
223 UINT64 FSRepCmpsb : 1;
224 UINT64 TsxLdTrkSupport : 1;
225 UINT64 VmxInsOutsExitInfoSupport : 1;
226 UINT64 Reserved3 : 1;
227 UINT64 SbdrSsdpNoSupport : 1;
228 UINT64 FbsdpNoSupport : 1;
229 UINT64 PsdpNoSupport : 1;
230 UINT64 FbClearSupport : 1;
231 UINT64 BtcNoSupport : 1;
232 UINT64 IbpbRsbFlushSupport : 1;
233 UINT64 StibpAlwaysOnSupport : 1;
234 UINT64 PerfGlobalCtrlSupport : 1;
235 UINT64 NptExecuteOnlySupport : 1;
236 UINT64 NptADFlagsSupport : 1;
237 UINT64 Npt1GbPageSupport : 1;
238 UINT64 Reserved4 : 1;
239 UINT64 Reserved5 : 1;
240 UINT64 Reserved6 : 1;
241 UINT64 Reserved7 : 1;
242 UINT64 CmpccxaddSupport : 1;
243 UINT64 Reserved8 : 1;
244 UINT64 Reserved9 : 1;
245 UINT64 Reserved10 : 1;
246 UINT64 Reserved11 : 1;
247 UINT64 PrefetchISupport : 1;
248 UINT64 Sha512Support : 1;
249 UINT64 Reserved12 : 1;
250 UINT64 Reserved13 : 1;
251 UINT64 Reserved14 : 1;
252 UINT64 SM3Support : 1;
253 UINT64 SM4Support : 1;
254 UINT64 Reserved15 : 12;
255 };
256 UINT64 AsUINT64;
257} WHV_X64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1;
258
259C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES1) == sizeof(UINT64));
260
261#elif defined(__aarch64__)
262
263typedef union WHV_ARM64_PROCESSOR_FEATURES {
264 __C89_NAMELESS struct {
265 UINT64 Asid16 : 1;
266 UINT64 TGran16 : 1;
267 UINT64 TGran64 : 1;
268 UINT64 Haf : 1;
269 UINT64 Hdbs : 1;
270 UINT64 Pan : 1;
271 UINT64 AtS1E1 : 1;
272 UINT64 Uao : 1;
273 UINT64 El0Aarch32 : 1;
274 UINT64 Fp : 1;
275 UINT64 FpHp : 1;
276 UINT64 AdvSimd : 1;
277 UINT64 AdvSimdHp : 1;
278 UINT64 GicV3V4 : 1;
279 UINT64 GicV41 : 1;
280 UINT64 Ras : 1;
281 UINT64 PmuV3 : 1;
282 UINT64 PmuV3ArmV81 : 1;
283 UINT64 PmuV3ArmV84 : 1;
284 UINT64 PmuV3ArmV85 : 1;
285 UINT64 Aes : 1;
286 UINT64 PolyMul : 1;
287 UINT64 Sha1 : 1;
288 UINT64 Sha256 : 1;
289 UINT64 Sha512 : 1;
290 UINT64 Crc32 : 1;
291 UINT64 Atomic : 1;
292 UINT64 Rdm : 1;
293 UINT64 Sha3 : 1;
294 UINT64 Sm3 : 1;
295 UINT64 Sm4 : 1;
296 UINT64 Dp : 1;
297 UINT64 Fhm : 1;
298 UINT64 DcCvap : 1;
299 UINT64 DcCvadp : 1;
300 UINT64 ApaBase : 1;
301 UINT64 ApaEp : 1;
302 UINT64 ApaEp2 : 1;
303 UINT64 ApaEp2Fp : 1;
304 UINT64 ApaEp2Fpc : 1;
305 UINT64 Jscvt : 1;
306 UINT64 Fcma : 1;
307 UINT64 RcpcV83 : 1;
308 UINT64 RcpcV84 : 1;
309 UINT64 Gpa : 1;
310 UINT64 L1ipPipt : 1;
311 UINT64 DzPermitted : 1;
312 UINT64 Reserved : 17;
313 };
314 UINT64 AsUINT64;
315} WHV_ARM64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES;
316
317typedef union WHV_ARM64_PROCESSOR_FEATURES1 {
318 __C89_NAMELESS struct {
319 UINT64 Reserved : 64;
320 };
321 UINT64 AsUINT64;
322} WHV_ARM64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1;
323
324#endif /* __x86_64__ || __aarch64__ */
325
326#define WHV_PROCESSOR_FEATURES_BANKS_COUNT 2
327
328typedef struct WHV_PROCESSOR_FEATURES_BANKS {
329 UINT32 BanksCount;
330 UINT32 Reserved0;
331 __C89_NAMELESS union {
332 __C89_NAMELESS struct {
333 WHV_PROCESSOR_FEATURES Bank0;
334 WHV_PROCESSOR_FEATURES1 Bank1;
335 };
336 UINT64 AsUINT64[WHV_PROCESSOR_FEATURES_BANKS_COUNT];
337 };
338} WHV_PROCESSOR_FEATURES_BANKS;
339
340C_ASSERT(sizeof(WHV_PROCESSOR_FEATURES_BANKS) == sizeof(UINT64) * (WHV_PROCESSOR_FEATURES_BANKS_COUNT + 1));
341
342typedef union WHV_SYNTHETIC_PROCESSOR_FEATURES {
343 __C89_NAMELESS struct {
344 UINT64 HypervisorPresent : 1;
345 UINT64 Hv1 : 1;
346 UINT64 AccessVpRunTimeReg : 1;
347 UINT64 AccessPartitionReferenceCounter : 1;
348 UINT64 AccessSynicRegs : 1;
349 UINT64 AccessSyntheticTimerRegs : 1;
350 UINT64 AccessIntrCtrlRegs : 1;
351 UINT64 AccessHypercallRegs : 1;
352 UINT64 AccessVpIndex : 1;
353 UINT64 AccessPartitionReferenceTsc : 1;
354#ifdef __x86_64__
355 UINT64 AccessGuestIdleReg : 1;
356 UINT64 AccessFrequencyRegs : 1;
357#else
358 UINT64 ReservedZ10 : 1;
359 UINT64 ReservedZ11 : 1;
360#endif
361 UINT64 ReservedZ12 : 1;
362 UINT64 ReservedZ13 : 1;
363 UINT64 ReservedZ14 : 1;
364#ifdef __x86_64__
365 UINT64 EnableExtendedGvaRangesForFlushVirtualAddressList : 1;
366#else
367 UINT64 ReservedZ15 : 1;
368#endif
369 UINT64 ReservedZ16 : 1;
370 UINT64 ReservedZ17 : 1;
371 UINT64 FastHypercallOutput : 1;
372 UINT64 ReservedZ19 : 1;
373 UINT64 ReservedZ20 : 1;
374 UINT64 ReservedZ21 : 1;
375 UINT64 DirectSyntheticTimers : 1;
376 UINT64 ReservedZ23 : 1;
377 UINT64 ExtendedProcessorMasks : 1;
378#ifdef __x86_64__
379 UINT64 TbFlushHypercalls : 1;
380#else
381 UINT64 ReservedZ25 : 1;
382#endif
383 UINT64 SyntheticClusterIpi : 1;
384 UINT64 NotifyLongSpinWait : 1;
385 UINT64 QueryNumaDistance : 1;
386 UINT64 SignalEvents : 1;
387 UINT64 RetargetDeviceInterrupt : 1;
388#ifdef __x86_64__
389 UINT64 RestoreTime : 1;
390 UINT64 EnlightenedVmcs : 1;
391 UINT64 NestedDebugCtl : 1;
392 UINT64 SyntheticTimeUnhaltedTimer : 1;
393 UINT64 IdleSpecCtrl : 1;
394#else
395 UINT64 ReservedZ31 : 1;
396 UINT64 ReservedZ32 : 1;
397 UINT64 ReservedZ33 : 1;
398 UINT64 ReservedZ34 : 1;
399 UINT64 ReservedZ35 : 1;
400#endif
401 UINT64 ReservedZ36 : 1;
402 UINT64 WakeVps : 1;
403 UINT64 AccessVpRegs : 1;
404#ifdef __aarch64__
405 UINT64 SyncContext : 1;
406#else
407 UINT64 ReservedZ39 : 1;
408#endif
409 UINT64 ReservedZ40 : 1;
410 UINT64 Reserved : 23;
411 };
412 UINT64 AsUINT64;
413} WHV_SYNTHETIC_PROCESSOR_FEATURES;
414
415C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES) == 8);
416
417#define WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT 1
418
419typedef struct WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS {
420 UINT32 BanksCount;
421 UINT32 Reserved0;
422 __C89_NAMELESS union {
423 __C89_NAMELESS struct {
424 WHV_SYNTHETIC_PROCESSOR_FEATURES Bank0;
425 };
426 UINT64 AsUINT64[WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT];
427 };
428} WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS;
429
430C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS) == 16);
431
432typedef union _WHV_PROCESSOR_XSAVE_FEATURES {
433 __C89_NAMELESS struct {
434 UINT64 XsaveSupport : 1;
435 UINT64 XsaveoptSupport : 1;
436 UINT64 AvxSupport : 1;
437 UINT64 Avx2Support : 1;
438 UINT64 FmaSupport : 1;
439 UINT64 MpxSupport : 1;
440 UINT64 Avx512Support : 1;
441 UINT64 Avx512DQSupport : 1;
442 UINT64 Avx512CDSupport : 1;
443 UINT64 Avx512BWSupport : 1;
444 UINT64 Avx512VLSupport : 1;
445 UINT64 XsaveCompSupport : 1;
446 UINT64 XsaveSupervisorSupport : 1;
447 UINT64 Xcr1Support : 1;
448 UINT64 Avx512BitalgSupport : 1;
449 UINT64 Avx512IfmaSupport : 1;
450 UINT64 Avx512VBmiSupport : 1;
451 UINT64 Avx512VBmi2Support : 1;
452 UINT64 Avx512VnniSupport : 1;
453 UINT64 GfniSupport : 1;
454 UINT64 VaesSupport : 1;
455 UINT64 Avx512VPopcntdqSupport : 1;
456 UINT64 VpclmulqdqSupport : 1;
457 UINT64 Avx512Bf16Support : 1;
458 UINT64 Avx512Vp2IntersectSupport : 1;
459 UINT64 Avx512Fp16Support : 1;
460 UINT64 XfdSupport : 1;
461 UINT64 AmxTileSupport : 1;
462 UINT64 AmxBf16Support : 1;
463 UINT64 AmxInt8Support : 1;
464 UINT64 AvxVnniSupport : 1;
465 UINT64 Reserved : 33;
466 };
467 UINT64 AsUINT64;
468} WHV_PROCESSOR_XSAVE_FEATURES, *PWHV_PROCESSOR_XSAVE_FEATURES;
469
470C_ASSERT(sizeof(WHV_PROCESSOR_XSAVE_FEATURES) == sizeof(UINT64));
471
472typedef union WHV_PROCESSOR_PERFMON_FEATURES {
473 __C89_NAMELESS struct {
474 UINT64 PmuSupport : 1;
475 UINT64 LbrSupport : 1;
476 UINT64 Reserved : 62;
477 };
478 UINT64 AsUINT64;
479} WHV_PROCESSOR_PERFMON_FEATURES, *PWHV_PROCESSOR_PERFMON_FEATURES;
480
481C_ASSERT(sizeof(WHV_PROCESSOR_PERFMON_FEATURES) == 8);
482
483typedef union WHV_X64_MSR_EXIT_BITMAP {
484 UINT64 AsUINT64;
485 __C89_NAMELESS struct {
486 UINT64 UnhandledMsrs : 1;
487 UINT64 TscMsrWrite : 1;
488 UINT64 TscMsrRead : 1;
489 UINT64 ApicBaseMsrWrite : 1;
490 UINT64 MiscEnableMsrRead:1;
491 UINT64 McUpdatePatchLevelMsrRead:1;
492 UINT64 Reserved:58;
493 };
494} WHV_X64_MSR_EXIT_BITMAP;
495
496C_ASSERT(sizeof(WHV_X64_MSR_EXIT_BITMAP) == sizeof(UINT64));
497
498typedef struct WHV_MEMORY_RANGE_ENTRY {
499 UINT64 GuestAddress;
500 UINT64 SizeInBytes;
501} WHV_MEMORY_RANGE_ENTRY;
502
503C_ASSERT(sizeof(WHV_MEMORY_RANGE_ENTRY) == 16);
504
505typedef union WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS {
506 UINT32 AsUINT32;
507 __C89_NAMELESS struct {
508 UINT32 Prefetch:1;
509 UINT32 AvoidHardFaults:1;
510 UINT32 Reserved:30;
511 };
512} WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS;
513
514C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS) == 4);
515
516typedef enum WHV_MEMORY_ACCESS_TYPE {
517 WHvMemoryAccessRead = 0,
518 WHvMemoryAccessWrite = 1,
519 WHvMemoryAccessExecute = 2
520} WHV_MEMORY_ACCESS_TYPE;
521
522typedef struct WHV_ADVISE_GPA_RANGE_POPULATE {
523 WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS Flags;
524 WHV_MEMORY_ACCESS_TYPE AccessType;
525} WHV_ADVISE_GPA_RANGE_POPULATE;
526
527C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE) == 8);
528
529typedef struct WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP {
530 UINT32 IsSupported:1;
531 UINT32 Reserved:31;
532 UINT32 HighestFrequencyMhz;
533 UINT32 NominalFrequencyMhz;
534 UINT32 LowestFrequencyMhz;
535 UINT32 FrequencyStepMhz;
536} WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP;
537
538C_ASSERT(sizeof(WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP) == 20);
539
540typedef union WHV_SCHEDULER_FEATURES {
541 __C89_NAMELESS struct {
542 UINT64 CpuReserve: 1;
543 UINT64 CpuCap: 1;
544 UINT64 CpuWeight: 1;
545 UINT64 CpuGroupId: 1;
546 UINT64 DisableSmt: 1;
547 UINT64 Reserved: 59;
548 };
549 UINT64 AsUINT64;
550} WHV_SCHEDULER_FEATURES;
551
552C_ASSERT(sizeof(WHV_SCHEDULER_FEATURES) == 8);
553
554typedef union WHV_CAPABILITY {
555 WINBOOL HypervisorPresent;
556 WHV_CAPABILITY_FEATURES Features;
557 WHV_EXTENDED_VM_EXITS ExtendedVmExits;
558 WHV_PROCESSOR_VENDOR ProcessorVendor;
559 WHV_PROCESSOR_FEATURES ProcessorFeatures;
560 WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks;
561 WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures;
562 UINT8 ProcessorClFlushSize;
563 UINT64 ExceptionExitBitmap;
564 WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap;
565 UINT64 ProcessorClockFrequency;
566 UINT64 InterruptClockFrequency;
567 WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks;
568 WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS GpaRangePopulateFlags;
569 WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP ProcessorFrequencyCap;
570 WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures;
571 WHV_SCHEDULER_FEATURES SchedulerFeatures;
572} WHV_CAPABILITY;
573
574typedef VOID* WHV_PARTITION_HANDLE;
575
576typedef enum WHV_PARTITION_PROPERTY_CODE {
577 WHvPartitionPropertyCodeExtendedVmExits = 0x00000001,
578 WHvPartitionPropertyCodeExceptionExitBitmap = 0x00000002,
579 WHvPartitionPropertyCodeSeparateSecurityDomain = 0x00000003,
580 WHvPartitionPropertyCodeNestedVirtualization = 0x00000004,
581 WHvPartitionPropertyCodeX64MsrExitBitmap = 0x00000005,
582 WHvPartitionPropertyCodePrimaryNumaNode = 0x00000006,
583 WHvPartitionPropertyCodeCpuReserve = 0x00000007,
584 WHvPartitionPropertyCodeCpuCap = 0x00000008,
585 WHvPartitionPropertyCodeCpuWeight = 0x00000009,
586 WHvPartitionPropertyCodeCpuGroupId = 0x0000000A,
587 WHvPartitionPropertyCodeProcessorFrequencyCap = 0x0000000B,
588 WHvPartitionPropertyCodeAllowDeviceAssignment = 0x0000000C,
589 WHvPartitionPropertyCodeDisableSmt = 0x0000000D,
590 WHvPartitionPropertyCodeProcessorFeatures = 0x00001001,
591 WHvPartitionPropertyCodeProcessorClFlushSize = 0x00001002,
592 WHvPartitionPropertyCodeCpuidExitList = 0x00001003,
593 WHvPartitionPropertyCodeCpuidResultList = 0x00001004,
594 WHvPartitionPropertyCodeLocalApicEmulationMode = 0x00001005,
595 WHvPartitionPropertyCodeProcessorXsaveFeatures = 0x00001006,
596 WHvPartitionPropertyCodeProcessorClockFrequency = 0x00001007,
597 WHvPartitionPropertyCodeInterruptClockFrequency = 0x00001008,
598 WHvPartitionPropertyCodeApicRemoteReadSupport = 0x00001009,
599 WHvPartitionPropertyCodeProcessorFeaturesBanks = 0x0000100A,
600 WHvPartitionPropertyCodeReferenceTime = 0x0000100B,
601 WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks = 0x0000100C,
602 WHvPartitionPropertyCodeCpuidResultList2 = 0x0000100D,
603 WHvPartitionPropertyCodeProcessorPerfmonFeatures = 0x0000100E,
604 WHvPartitionPropertyCodeMsrActionList = 0x0000100F,
605 WHvPartitionPropertyCodeUnimplementedMsrAction = 0x00001010,
606 WHvPartitionPropertyCodeProcessorCount = 0x00001fff
607} WHV_PARTITION_PROPERTY_CODE;
608
609typedef struct WHV_X64_CPUID_RESULT {
610 UINT32 Function;
611 UINT32 Reserved[3];
612 UINT32 Eax;
613 UINT32 Ebx;
614 UINT32 Ecx;
615 UINT32 Edx;
616} WHV_X64_CPUID_RESULT;
617
618C_ASSERT(sizeof(WHV_X64_CPUID_RESULT) == 32);
619
620typedef enum WHV_X64_CPUID_RESULT2_FLAGS {
621 WHvX64CpuidResult2FlagSubleafSpecific = 0x00000001,
622 WHvX64CpuidResult2FlagVpSpecific = 0x00000002
623} WHV_X64_CPUID_RESULT2_FLAGS;
624
625DEFINE_ENUM_FLAG_OPERATORS(WHV_X64_CPUID_RESULT2_FLAGS);
626
627typedef struct WHV_CPUID_OUTPUT {
628 UINT32 Eax;
629 UINT32 Ebx;
630 UINT32 Ecx;
631 UINT32 Edx;
632} WHV_CPUID_OUTPUT;
633
634C_ASSERT(sizeof(WHV_CPUID_OUTPUT) == 16);
635
636typedef struct WHV_X64_CPUID_RESULT2 {
637 UINT32 Function;
638 UINT32 Index;
639 UINT32 VpIndex;
640 WHV_X64_CPUID_RESULT2_FLAGS Flags;
641 WHV_CPUID_OUTPUT Output;
642 WHV_CPUID_OUTPUT Mask;
643} WHV_X64_CPUID_RESULT2;
644
645C_ASSERT(sizeof(WHV_X64_CPUID_RESULT2) == 48);
646
647typedef struct WHV_MSR_ACTION_ENTRY {
648 UINT32 Index;
649 UINT8 ReadAction;
650 UINT8 WriteAction;
651 UINT16 Reserved;
652} WHV_MSR_ACTION_ENTRY;
653
654C_ASSERT(sizeof(WHV_MSR_ACTION_ENTRY) == 8);
655
656typedef enum WHV_MSR_ACTION {
657 WHvMsrActionArchitectureDefault = 0,
658 WHvMsrActionIgnoreWriteReadZero = 1,
659 WHvMsrActionExit = 2
660} WHV_MSR_ACTION;
661
662typedef enum WHV_EXCEPTION_TYPE {
663 WHvX64ExceptionTypeDivideErrorFault = 0x0,
664 WHvX64ExceptionTypeDebugTrapOrFault = 0x1,
665 WHvX64ExceptionTypeBreakpointTrap = 0x3,
666 WHvX64ExceptionTypeOverflowTrap = 0x4,
667 WHvX64ExceptionTypeBoundRangeFault = 0x5,
668 WHvX64ExceptionTypeInvalidOpcodeFault = 0x6,
669 WHvX64ExceptionTypeDeviceNotAvailableFault = 0x7,
670 WHvX64ExceptionTypeDoubleFaultAbort = 0x8,
671 WHvX64ExceptionTypeInvalidTaskStateSegmentFault = 0x0A,
672 WHvX64ExceptionTypeSegmentNotPresentFault = 0x0B,
673 WHvX64ExceptionTypeStackFault = 0x0C,
674 WHvX64ExceptionTypeGeneralProtectionFault = 0x0D,
675 WHvX64ExceptionTypePageFault = 0x0E,
676 WHvX64ExceptionTypeFloatingPointErrorFault = 0x10,
677 WHvX64ExceptionTypeAlignmentCheckFault = 0x11,
678 WHvX64ExceptionTypeMachineCheckAbort = 0x12,
679 WHvX64ExceptionTypeSimdFloatingPointFault = 0x13
680} WHV_EXCEPTION_TYPE;
681
682typedef enum WHV_X64_LOCAL_APIC_EMULATION_MODE {
683 WHvX64LocalApicEmulationModeNone,
684 WHvX64LocalApicEmulationModeXApic,
685 WHvX64LocalApicEmulationModeX2Apic
686} WHV_X64_LOCAL_APIC_EMULATION_MODE;
687
688typedef union WHV_PARTITION_PROPERTY {
689 WHV_EXTENDED_VM_EXITS ExtendedVmExits;
690 WHV_PROCESSOR_FEATURES ProcessorFeatures;
691 WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks;
692 WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures;
693 UINT8 ProcessorClFlushSize;
694 UINT32 ProcessorCount;
695 UINT32 CpuidExitList[1];
696 WHV_X64_CPUID_RESULT CpuidResultList[1];
697 WHV_X64_CPUID_RESULT2 CpuidResultList2[1];
698 WHV_MSR_ACTION_ENTRY MsrActionList[1];
699 WHV_MSR_ACTION UnimplementedMsrAction;
700 UINT64 ExceptionExitBitmap;
701 WHV_X64_LOCAL_APIC_EMULATION_MODE LocalApicEmulationMode;
702 WINBOOL SeparateSecurityDomain;
703 WINBOOL NestedVirtualization;
704 WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap;
705 UINT64 ProcessorClockFrequency;
706 UINT64 InterruptClockFrequency;
707 WINBOOL ApicRemoteRead;
708 WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks;
709 UINT64 ReferenceTime;
710 USHORT PrimaryNumaNode;
711 UINT32 CpuReserve;
712 UINT32 CpuCap;
713 UINT32 CpuWeight;
714 UINT64 CpuGroupId;
715 UINT32 ProcessorFrequencyCap;
716 WINBOOL AllowDeviceAssignment;
717 WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures;
718 WINBOOL DisableSmt;
719} WHV_PARTITION_PROPERTY;
720
721typedef UINT64 WHV_GUEST_PHYSICAL_ADDRESS;
722typedef UINT64 WHV_GUEST_VIRTUAL_ADDRESS;
723
724typedef enum WHV_MAP_GPA_RANGE_FLAGS {
725 WHvMapGpaRangeFlagNone = 0x00000000,
726 WHvMapGpaRangeFlagRead = 0x00000001,
727 WHvMapGpaRangeFlagWrite = 0x00000002,
728 WHvMapGpaRangeFlagExecute = 0x00000004,
729 WHvMapGpaRangeFlagTrackDirtyPages = 0x00000008
730} WHV_MAP_GPA_RANGE_FLAGS;
731
732DEFINE_ENUM_FLAG_OPERATORS(WHV_MAP_GPA_RANGE_FLAGS);
733
734typedef enum WHV_TRANSLATE_GVA_FLAGS {
735 WHvTranslateGvaFlagNone = 0x00000000,
736 WHvTranslateGvaFlagValidateRead = 0x00000001,
737 WHvTranslateGvaFlagValidateWrite = 0x00000002,
738 WHvTranslateGvaFlagValidateExecute = 0x00000004,
739 WHvTranslateGvaFlagPrivilegeExempt = 0x00000008,
740 WHvTranslateGvaFlagSetPageTableBits = 0x00000010,
741 WHvTranslateGvaFlagEnforceSmap = 0x00000100,
742 WHvTranslateGvaFlagOverrideSmap = 0x00000200
743} WHV_TRANSLATE_GVA_FLAGS;
744
745DEFINE_ENUM_FLAG_OPERATORS(WHV_TRANSLATE_GVA_FLAGS);
746
747typedef enum WHV_TRANSLATE_GVA_RESULT_CODE {
748 WHvTranslateGvaResultSuccess = 0,
749 WHvTranslateGvaResultPageNotPresent = 1,
750 WHvTranslateGvaResultPrivilegeViolation = 2,
751 WHvTranslateGvaResultInvalidPageTableFlags = 3,
752 WHvTranslateGvaResultGpaUnmapped = 4,
753 WHvTranslateGvaResultGpaNoReadAccess = 5,
754 WHvTranslateGvaResultGpaNoWriteAccess = 6,
755 WHvTranslateGvaResultGpaIllegalOverlayAccess = 7,
756 WHvTranslateGvaResultIntercept = 8
757} WHV_TRANSLATE_GVA_RESULT_CODE;
758
759typedef struct WHV_TRANSLATE_GVA_RESULT {
760 WHV_TRANSLATE_GVA_RESULT_CODE ResultCode;
761 UINT32 Reserved;
762} WHV_TRANSLATE_GVA_RESULT;
763
764C_ASSERT(sizeof(WHV_TRANSLATE_GVA_RESULT) == 8);
765
766typedef union WHV_ADVISE_GPA_RANGE {
767 WHV_ADVISE_GPA_RANGE_POPULATE Populate;
768} WHV_ADVISE_GPA_RANGE;
769
770C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE) == 8);
771
772typedef enum WHV_CACHE_TYPE {
773 WHvCacheTypeUncached = 0,
774 WHvCacheTypeWriteCombining = 1,
775 WHvCacheTypeWriteThrough = 4,
776#ifdef __x86_64__
777 WHvCacheTypeWriteProtected = 5,
778#endif
779 WHvCacheTypeWriteBack = 6
780} WHV_CACHE_TYPE;
781
782typedef union WHV_ACCESS_GPA_CONTROLS {
783 UINT64 AsUINT64;
784 __C89_NAMELESS struct {
785 WHV_CACHE_TYPE CacheType;
786 UINT32 Reserved;
787 };
788} WHV_ACCESS_GPA_CONTROLS;
789
790C_ASSERT(sizeof(WHV_ACCESS_GPA_CONTROLS) == 8);
791
792#define WHV_READ_WRITE_GPA_RANGE_MAX_SIZE 16
79310
794#if defined(__x86_64__)11#if defined(__x86_64__)
79512
...@@ -1086,7 +303,6 @@ typedef enum WHV_REGISTER_NAME {...@@ -1086,7 +303,6 @@ typedef enum WHV_REGISTER_NAME {
1086 WHvArm64RegisterFp = 0x0002001D,303 WHvArm64RegisterFp = 0x0002001D,
1087 WHvArm64RegisterLr = 0x0002001E,304 WHvArm64RegisterLr = 0x0002001E,
1088 WHvArm64RegisterPc = 0x00020022,305 WHvArm64RegisterPc = 0x00020022,
1089 WHvArm64RegisterXzr = 0x0002FFFE,
1090 WHvArm64RegisterQ0 = 0x00030000,306 WHvArm64RegisterQ0 = 0x00030000,
1091 WHvArm64RegisterQ1 = 0x00030001,307 WHvArm64RegisterQ1 = 0x00030001,
1092 WHvArm64RegisterQ2 = 0x00030002,308 WHvArm64RegisterQ2 = 0x00030002,
...@@ -1119,52 +335,143 @@ typedef enum WHV_REGISTER_NAME {...@@ -1119,52 +335,143 @@ typedef enum WHV_REGISTER_NAME {
1119 WHvArm64RegisterQ29 = 0x0003001D,335 WHvArm64RegisterQ29 = 0x0003001D,
1120 WHvArm64RegisterQ30 = 0x0003001E,336 WHvArm64RegisterQ30 = 0x0003001E,
1121 WHvArm64RegisterQ31 = 0x0003001F,337 WHvArm64RegisterQ31 = 0x0003001F,
1122 WHvArm64RegisterCurrentEl = 0x00021003,
1123 WHvArm64RegisterDaif = 0x00021004,
1124 WHvArm64RegisterDit = 0x00021005,
1125 WHvArm64RegisterPstate = 0x00020023,338 WHvArm64RegisterPstate = 0x00020023,
1126 WHvArm64RegisterElrEl1 = 0x00040015,339 WHvArm64RegisterElrEl1 = 0x00040015,
1127 WHvArm64RegisterFpcr = 0x00040012,340 WHvArm64RegisterFpcr = 0x00040012,
1128 WHvArm64RegisterFpsr = 0x00040013,341 WHvArm64RegisterFpsr = 0x00040013,
1129 WHvArm64RegisterNzcv = 0x00021006,
1130 WHvArm64RegisterPan = 0x00021007,
1131 WHvArm64RegisterSp = 0x0002001F,342 WHvArm64RegisterSp = 0x0002001F,
1132 WHvArm64RegisterSpEl0 = 0x00020020,343 WHvArm64RegisterSpEl0 = 0x00020020,
1133 WHvArm64RegisterSpEl1 = 0x00020021,344 WHvArm64RegisterSpEl1 = 0x00020021,
1134 WHvArm64RegisterSpSel = 0x00021008,
1135 WHvArm64RegisterSpsrEl1 = 0x00040014,345 WHvArm64RegisterSpsrEl1 = 0x00040014,
1136 WHvArm64RegisterSsbs = 0x00021009,346 WHvArm64RegisterIdMidrEl1 = 0x00022000,
1137 WHvArm64RegisterTco = 0x0002100A,347 WHvArm64RegisterIdRes01El1 = 0x00022001,
1138 WHvArm64RegisterUao = 0x0002100B,348 WHvArm64RegisterIdRes02El1 = 0x00022002,
349 WHvArm64RegisterIdRes03El1 = 0x00022003,
350 WHvArm64RegisterIdRes04El1 = 0x00022004,
351 WHvArm64RegisterIdMpidrEl1 = 0x00022005,
352 WHvArm64RegisterIdRevidrEl1 = 0x00022006,
353 WHvArm64RegisterIdRes07El1 = 0x00022007,
354 WHvArm64RegisterIdPfr0El1 = 0x00022008,
355 WHvArm64RegisterIdPfr1El1 = 0x00022009,
356 WHvArm64RegisterIdDfr0El1 = 0x0002200A,
357 WHvArm64RegisterIdRes13El1 = 0x0002200B,
358 WHvArm64RegisterIdMmfr0El1 = 0x0002200C,
359 WHvArm64RegisterIdMmfr1El1 = 0x0002200D,
360 WHvArm64RegisterIdMmfr2El1 = 0x0002200E,
361 WHvArm64RegisterIdMmfr3El1 = 0x0002200F,
362 WHvArm64RegisterIdIsar0El1 = 0x00022010,
363 WHvArm64RegisterIdIsar1El1 = 0x00022011,
364 WHvArm64RegisterIdIsar2El1 = 0x00022012,
365 WHvArm64RegisterIdIsar3El1 = 0x00022013,
366 WHvArm64RegisterIdIsar4El1 = 0x00022014,
367 WHvArm64RegisterIdIsar5El1 = 0x00022015,
368 WHvArm64RegisterIdRes26El1 = 0x00022016,
369 WHvArm64RegisterIdRes27El1 = 0x00022017,
370 WHvArm64RegisterIdMvfr0El1 = 0x00022018,
371 WHvArm64RegisterIdMvfr1El1 = 0x00022019,
372 WHvArm64RegisterIdMvfr2El1 = 0x0002201A,
373 WHvArm64RegisterIdRes33El1 = 0x0002201B,
374 WHvArm64RegisterIdPfr2El1 = 0x0002201C,
375 WHvArm64RegisterIdRes35El1 = 0x0002201D,
376 WHvArm64RegisterIdRes36El1 = 0x0002201E,
377 WHvArm64RegisterIdRes37El1 = 0x0002201F,
378 WHvArm64RegisterIdAa64Pfr0El1 = 0x00022020,
379 WHvArm64RegisterIdAa64Pfr1El1 = 0x00022021,
380 WHvArm64RegisterIdAa64Pfr2El1 = 0x00022022,
381 WHvArm64RegisterIdRes43El1 = 0x00022023,
382 WHvArm64RegisterIdAa64Zfr0El1 = 0x00022024,
383 WHvArm64RegisterIdAa64Smfr0El1 = 0x00022025,
384 WHvArm64RegisterIdRes46El1 = 0x00022026,
385 WHvArm64RegisterIdRes47El1 = 0x00022027,
1139 WHvArm64RegisterIdAa64Dfr0El1 = 0x00022028,386 WHvArm64RegisterIdAa64Dfr0El1 = 0x00022028,
1140 WHvArm64RegisterIdAa64Dfr1El1 = 0x00022029,387 WHvArm64RegisterIdAa64Dfr1El1 = 0x00022029,
388 WHvArm64RegisterIdRes52El1 = 0x0002202A,
389 WHvArm64RegisterIdRes53El1 = 0x0002202B,
390 WHvArm64RegisterIdRes54El1 = 0x0002202C,
391 WHvArm64RegisterIdRes55El1 = 0x0002202D,
392 WHvArm64RegisterIdRes56El1 = 0x0002202E,
393 WHvArm64RegisterIdRes57El1 = 0x0002202F,
1141 WHvArm64RegisterIdAa64Isar0El1 = 0x00022030,394 WHvArm64RegisterIdAa64Isar0El1 = 0x00022030,
1142 WHvArm64RegisterIdAa64Isar1El1 = 0x00022031,395 WHvArm64RegisterIdAa64Isar1El1 = 0x00022031,
1143 WHvArm64RegisterIdAa64Isar2El1 = 0x00022032,396 WHvArm64RegisterIdAa64Isar2El1 = 0x00022032,
397 WHvArm64RegisterIdRes63El1 = 0x00022033,
398 WHvArm64RegisterIdRes64El1 = 0x00022034,
399 WHvArm64RegisterIdRes65El1 = 0x00022035,
400 WHvArm64RegisterIdRes66El1 = 0x00022036,
401 WHvArm64RegisterIdRes67El1 = 0x00022037,
1144 WHvArm64RegisterIdAa64Mmfr0El1 = 0x00022038,402 WHvArm64RegisterIdAa64Mmfr0El1 = 0x00022038,
1145 WHvArm64RegisterIdAa64Mmfr1El1 = 0x00022039,403 WHvArm64RegisterIdAa64Mmfr1El1 = 0x00022039,
1146 WHvArm64RegisterIdAa64Mmfr2El1 = 0x0002203A,404 WHvArm64RegisterIdAa64Mmfr2El1 = 0x0002203A,
1147 WHvArm64RegisterIdAa64Mmfr3El1 = 0x0002203B,405 WHvArm64RegisterIdAa64Mmfr3El1 = 0x0002203B,
1148 WHvArm64RegisterIdAa64Mmfr4El1 = 0x0002203C,406 WHvArm64RegisterIdAa64Mmfr4El1 = 0x0002203C,
1149 WHvArm64RegisterIdAa64Pfr0El1 = 0x00022020,407 WHvArm64RegisterIdRes75El1 = 0x0002203D,
1150 WHvArm64RegisterIdAa64Pfr1El1 = 0x00022021,408 WHvArm64RegisterIdRes76El1 = 0x0002203E,
1151 WHvArm64RegisterIdAa64Pfr2El1 = 0x00022022,409 WHvArm64RegisterIdRes77El1 = 0x0002203F,
1152 WHvArm64RegisterIdAa64Smfr0El1 = 0x00022025,410 WHvArm64RegisterIdRes80El1 = 0x00022040,
1153 WHvArm64RegisterIdAa64Zfr0El1 = 0x00022024,411 WHvArm64RegisterIdRes81El1 = 0x00022041,
1154 WHvArm64RegisterIdDfr0El1 = 0x0002200A,412 WHvArm64RegisterIdRes82El1 = 0x00022042,
1155 WHvArm64RegisterIdIsar0El1 = 0x00022010,413 WHvArm64RegisterIdRes83El1 = 0x00022043,
1156 WHvArm64RegisterIdIsar1El1 = 0x00022011,414 WHvArm64RegisterIdRes84El1 = 0x00022044,
1157 WHvArm64RegisterIdIsar2El1 = 0x00022012,415 WHvArm64RegisterIdRes85El1 = 0x00022045,
1158 WHvArm64RegisterIdIsar3El1 = 0x00022013,416 WHvArm64RegisterIdRes86El1 = 0x00022046,
1159 WHvArm64RegisterIdIsar4El1 = 0x00022014,417 WHvArm64RegisterIdRes87El1 = 0x00022047,
1160 WHvArm64RegisterIdIsar5El1 = 0x00022015,418 WHvArm64RegisterIdRes90El1 = 0x00022048,
1161 WHvArm64RegisterIdMmfr0El1 = 0x0002200C,419 WHvArm64RegisterIdRes91El1 = 0x00022049,
1162 WHvArm64RegisterIdMmfr1El1 = 0x0002200D,420 WHvArm64RegisterIdRes92El1 = 0x0002204A,
1163 WHvArm64RegisterIdMmfr2El1 = 0x0002200E,421 WHvArm64RegisterIdRes93El1 = 0x0002204B,
1164 WHvArm64RegisterIdMmfr3El1 = 0x0002200F,422 WHvArm64RegisterIdRes94El1 = 0x0002204C,
1165 WHvArm64RegisterIdPfr0El1 = 0x00022008,423 WHvArm64RegisterIdRes95El1 = 0x0002204D,
1166 WHvArm64RegisterIdPfr1El1 = 0x00022009,424 WHvArm64RegisterIdRes96El1 = 0x0002204E,
1167 WHvArm64RegisterIdPfr2El1 = 0x0002201C,425 WHvArm64RegisterIdRes97El1 = 0x0002204F,
426 WHvArm64RegisterIdRes100El1 = 0x00022050,
427 WHvArm64RegisterIdRes101El1 = 0x00022051,
428 WHvArm64RegisterIdRes102El1 = 0x00022052,
429 WHvArm64RegisterIdRes103El1 = 0x00022053,
430 WHvArm64RegisterIdRes104El1 = 0x00022054,
431 WHvArm64RegisterIdRes105El1 = 0x00022055,
432 WHvArm64RegisterIdRes106El1 = 0x00022056,
433 WHvArm64RegisterIdRes107El1 = 0x00022057,
434 WHvArm64RegisterIdRes110El1 = 0x00022058,
435 WHvArm64RegisterIdRes111El1 = 0x00022059,
436 WHvArm64RegisterIdRes112El1 = 0x0002205A,
437 WHvArm64RegisterIdRes113El1 = 0x0002205B,
438 WHvArm64RegisterIdRes114El1 = 0x0002205C,
439 WHvArm64RegisterIdRes115El1 = 0x0002205D,
440 WHvArm64RegisterIdRes116El1 = 0x0002205E,
441 WHvArm64RegisterIdRes117El1 = 0x0002205F,
442 WHvArm64RegisterIdRes120El1 = 0x00022060,
443 WHvArm64RegisterIdRes121El1 = 0x00022061,
444 WHvArm64RegisterIdRes122El1 = 0x00022062,
445 WHvArm64RegisterIdRes123El1 = 0x00022063,
446 WHvArm64RegisterIdRes124El1 = 0x00022064,
447 WHvArm64RegisterIdRes125El1 = 0x00022065,
448 WHvArm64RegisterIdRes126El1 = 0x00022066,
449 WHvArm64RegisterIdRes127El1 = 0x00022067,
450 WHvArm64RegisterIdRes130El1 = 0x00022068,
451 WHvArm64RegisterIdRes131El1 = 0x00022069,
452 WHvArm64RegisterIdRes132El1 = 0x0002206A,
453 WHvArm64RegisterIdRes133El1 = 0x0002206B,
454 WHvArm64RegisterIdRes134El1 = 0x0002206C,
455 WHvArm64RegisterIdRes135El1 = 0x0002206D,
456 WHvArm64RegisterIdRes136El1 = 0x0002206E,
457 WHvArm64RegisterIdRes137El1 = 0x0002206F,
458 WHvArm64RegisterIdRes140El1 = 0x00022070,
459 WHvArm64RegisterIdRes141El1 = 0x00022071,
460 WHvArm64RegisterIdRes142El1 = 0x00022072,
461 WHvArm64RegisterIdRes143El1 = 0x00022073,
462 WHvArm64RegisterIdRes144El1 = 0x00022074,
463 WHvArm64RegisterIdRes145El1 = 0x00022075,
464 WHvArm64RegisterIdRes146El1 = 0x00022076,
465 WHvArm64RegisterIdRes147El1 = 0x00022077,
466 WHvArm64RegisterIdRes150El1 = 0x00022078,
467 WHvArm64RegisterIdRes151El1 = 0x00022079,
468 WHvArm64RegisterIdRes152El1 = 0x0002207A,
469 WHvArm64RegisterIdRes153El1 = 0x0002207B,
470 WHvArm64RegisterIdRes154El1 = 0x0002207C,
471 WHvArm64RegisterIdRes155El1 = 0x0002207D,
472 WHvArm64RegisterIdRes156El1 = 0x0002207E,
473 WHvArm64RegisterIdRes157El1 = 0x0002207F,
474 WHvArm64RegisterActlrEl1 = 0x00040003,
1168 WHvArm64RegisterApdAKeyHiEl1 = 0x00040026,475 WHvArm64RegisterApdAKeyHiEl1 = 0x00040026,
1169 WHvArm64RegisterApdAKeyLoEl1 = 0x00040027,476 WHvArm64RegisterApdAKeyLoEl1 = 0x00040027,
1170 WHvArm64RegisterApdBKeyHiEl1 = 0x00040028,477 WHvArm64RegisterApdBKeyHiEl1 = 0x00040028,
...@@ -1175,28 +482,15 @@ typedef enum WHV_REGISTER_NAME {...@@ -1175,28 +482,15 @@ typedef enum WHV_REGISTER_NAME {
1175 WHvArm64RegisterApiAKeyLoEl1 = 0x0004002D,482 WHvArm64RegisterApiAKeyLoEl1 = 0x0004002D,
1176 WHvArm64RegisterApiBKeyHiEl1 = 0x0004002E,483 WHvArm64RegisterApiBKeyHiEl1 = 0x0004002E,
1177 WHvArm64RegisterApiBKeyLoEl1 = 0x0004002F,484 WHvArm64RegisterApiBKeyLoEl1 = 0x0004002F,
1178 WHvArm64RegisterCcsidrEl1 = 0x00040030,
1179 WHvArm64RegisterCcsidr2El1 = 0x00040031,
1180 WHvArm64RegisterClidrEl1 = 0x00040032,
1181 WHvArm64RegisterContextidrEl1 = 0x0004000D,485 WHvArm64RegisterContextidrEl1 = 0x0004000D,
1182 WHvArm64RegisterCpacrEl1 = 0x00040004,486 WHvArm64RegisterCpacrEl1 = 0x00040004,
1183 WHvArm64RegisterCsselrEl1 = 0x00040035,487 WHvArm64RegisterCsselrEl1 = 0x00040035,
1184 WHvArm64RegisterCtrEl0 = 0x00040036,
1185 WHvArm64RegisterDczidEl0 = 0x00040038,
1186 WHvArm64RegisterEsrEl1 = 0x00040008,488 WHvArm64RegisterEsrEl1 = 0x00040008,
1187 WHvArm64RegisterFarEl1 = 0x00040009,489 WHvArm64RegisterFarEl1 = 0x00040009,
1188 WHvArm64RegisterIsrEl1 = 0x0004004A,
1189 WHvArm64RegisterMairEl1 = 0x0004000B,490 WHvArm64RegisterMairEl1 = 0x0004000B,
1190 WHvArm64RegisterMidrEl1 = 0x00040051,491 WHvArm64RegisterMidrEl1 = 0x00040051,
1191 WHvArm64RegisterMpidrEl1 = 0x00040001,492 WHvArm64RegisterMpidrEl1 = 0x00040001,
1192 WHvArm64RegisterMvfr0El1 = 0x00040052,
1193 WHvArm64RegisterMvfr1El1 = 0x00040053,
1194 WHvArm64RegisterMvfr2El1 = 0x00040054,
1195 WHvArm64RegisterParEl1 = 0x0004000A,493 WHvArm64RegisterParEl1 = 0x0004000A,
1196 WHvArm64RegisterRevidrEl1 = 0x00040055,
1197 WHvArm64RegisterRgsrEl1 = 0x00040056,
1198 WHvArm64RegisterRndr = 0x00040057,
1199 WHvArm64RegisterRndrrs = 0x00040058,
1200 WHvArm64RegisterSctlrEl1 = 0x00040002,494 WHvArm64RegisterSctlrEl1 = 0x00040002,
1201 WHvArm64RegisterTcrEl1 = 0x00040007,495 WHvArm64RegisterTcrEl1 = 0x00040007,
1202 WHvArm64RegisterTpidrEl0 = 0x00040011,496 WHvArm64RegisterTpidrEl0 = 0x00040011,
...@@ -1205,6 +499,7 @@ typedef enum WHV_REGISTER_NAME {...@@ -1205,6 +499,7 @@ typedef enum WHV_REGISTER_NAME {
1205 WHvArm64RegisterTtbr0El1 = 0x00040005,499 WHvArm64RegisterTtbr0El1 = 0x00040005,
1206 WHvArm64RegisterTtbr1El1 = 0x00040006,500 WHvArm64RegisterTtbr1El1 = 0x00040006,
1207 WHvArm64RegisterVbarEl1 = 0x0004000C,501 WHvArm64RegisterVbarEl1 = 0x0004000C,
502 WHvArm64RegisterZcrEl1 = 0x00040071,
1208 WHvArm64RegisterDbgbcr0El1 = 0x00050000,503 WHvArm64RegisterDbgbcr0El1 = 0x00050000,
1209 WHvArm64RegisterDbgbcr1El1 = 0x00050001,504 WHvArm64RegisterDbgbcr1El1 = 0x00050001,
1210 WHvArm64RegisterDbgbcr2El1 = 0x00050002,505 WHvArm64RegisterDbgbcr2El1 = 0x00050002,
...@@ -1349,32 +644,12 @@ typedef enum WHV_REGISTER_NAME {...@@ -1349,32 +644,12 @@ typedef enum WHV_REGISTER_NAME {
1349 WHvArm64RegisterPmovsclrEl0 = 0x00052048,644 WHvArm64RegisterPmovsclrEl0 = 0x00052048,
1350 WHvArm64RegisterPmovssetEl0 = 0x00052049,645 WHvArm64RegisterPmovssetEl0 = 0x00052049,
1351 WHvArm64RegisterPmselrEl0 = 0x0005204A,646 WHvArm64RegisterPmselrEl0 = 0x0005204A,
1352 WHvArm64RegisterPmswincEl0 = 0x0005204B,
1353 WHvArm64RegisterPmuserenrEl0 = 0x0005204C,647 WHvArm64RegisterPmuserenrEl0 = 0x0005204C,
1354 WHvArm64RegisterPmxevcntrEl0 = 0x0005204D,
1355 WHvArm64RegisterPmxevtyperEl0 = 0x0005204E,
1356 WHvArm64RegisterCntfrqEl0 = 0x00058000,
1357 WHvArm64RegisterCntkctlEl1 = 0x00058008,648 WHvArm64RegisterCntkctlEl1 = 0x00058008,
1358 WHvArm64RegisterCntvCtlEl0 = 0x0005800E,649 WHvArm64RegisterCntvCtlEl0 = 0x0005800E,
1359 WHvArm64RegisterCntvCvalEl0 = 0x0005800F,650 WHvArm64RegisterCntvCvalEl0 = 0x0005800F,
1360 WHvArm64RegisterCntvTvalEl0 = 0x00058010,
1361 WHvArm64RegisterCntvctEl0 = 0x00058011,651 WHvArm64RegisterCntvctEl0 = 0x00058011,
1362 WHvArm64RegisterIccAp1R0El1 = 0x00060000,652 WHvArm64RegisterGicrBaseGpa = 0x00063000,
1363 WHvArm64RegisterIccAp1R1El1 = 0x00060001,
1364 WHvArm64RegisterIccAp1R2El1 = 0x00060002,
1365 WHvArm64RegisterIccAp1R3El1 = 0x00060003,
1366 WHvArm64RegisterIccAsgi1REl1 = 0x00060004,
1367 WHvArm64RegisterIccBpr1El1 = 0x00060005,
1368 WHvArm64RegisterIccCtlrEl1 = 0x00060006,
1369 WHvArm64RegisterIccDirEl1 = 0x00060007,
1370 WHvArm64RegisterIccEoir1El1 = 0x00060008,
1371 WHvArm64RegisterIccHppir1El1 = 0x00060009,
1372 WHvArm64RegisterIccIar1El1 = 0x0006000A,
1373 WHvArm64RegisterIccIgrpen1El1 = 0x0006000B,
1374 WHvArm64RegisterIccPmrEl1 = 0x0006000C,
1375 WHvArm64RegisterIccRprEl1 = 0x0006000D,
1376 WHvArm64RegisterIccSgi1REl1 = 0x0006000E,
1377 WHvArm64RegisterIccSreEl1 = 0x0006000F,
1378 WHvRegisterSint0 = 0x000A0000,653 WHvRegisterSint0 = 0x000A0000,
1379 WHvRegisterSint1 = 0x000A0001,654 WHvRegisterSint1 = 0x000A0001,
1380 WHvRegisterSint2 = 0x000A0002,655 WHvRegisterSint2 = 0x000A0002,
...@@ -1396,6 +671,19 @@ typedef enum WHV_REGISTER_NAME {...@@ -1396,6 +671,19 @@ typedef enum WHV_REGISTER_NAME {
1396 WHvRegisterSifp = 0x000A0012,671 WHvRegisterSifp = 0x000A0012,
1397 WHvRegisterSipp = 0x000A0013,672 WHvRegisterSipp = 0x000A0013,
1398 WHvRegisterEom = 0x000A0014,673 WHvRegisterEom = 0x000A0014,
674 WHvRegisterHypervisorVersion = 0x00000100,
675 WHvRegisterPrivilegesAndFeaturesInfo = 0x00000200,
676 WHvRegisterFeaturesInfo = 0x00000201,
677 WHvRegisterImplementationLimitsInfo = 0x00000202,
678 WHvRegisterHardwareFeaturesInfo = 0x00000203,
679 WHvRegisterCpuManagementFeaturesInfo = 0x00000204,
680 WHvRegisterPasidFeaturesInfo = 0x00000205,
681 WHvRegisterGuestCrashP0 = 0x00000210,
682 WHvRegisterGuestCrashP1 = 0x00000211,
683 WHvRegisterGuestCrashP2 = 0x00000212,
684 WHvRegisterGuestCrashP3 = 0x00000213,
685 WHvRegisterGuestCrashP4 = 0x00000214,
686 WHvRegisterGuestCrashCtl = 0x00000215,
1399 WHvRegisterVpRuntime = 0x00090000,687 WHvRegisterVpRuntime = 0x00090000,
1400 WHvRegisterGuestOsId = 0x00090002,688 WHvRegisterGuestOsId = 0x00090002,
1401 WHvRegisterVpAssistPage = 0x00090013,689 WHvRegisterVpAssistPage = 0x00090013,
...@@ -1410,362 +698,1463 @@ typedef enum WHV_REGISTER_NAME {...@@ -1410,362 +698,1463 @@ typedef enum WHV_REGISTER_NAME {
1410 WHvRegisterPendingEvent3 = 0x00010009698 WHvRegisterPendingEvent3 = 0x00010009
1411} WHV_REGISTER_NAME;699} WHV_REGISTER_NAME;
1412700
1413#define WHvRegisterSiefp WHvRegisterSifp701#define WHvRegisterSiefp WHvRegisterSifp
1414#define WHvRegisterSimp WHvRegisterSipp702#define WHvRegisterSimp WHvRegisterSipp
1415#define WHvRegisterPendingEvent WHvRegisterPendingEvent0703#define WHvRegisterPendingEvent WHvRegisterPendingEvent0
704
705#endif /* __x86_64__ || __aarch64__ */
706
707typedef UINT64 WHV_GUEST_PHYSICAL_ADDRESS;
708typedef UINT64 WHV_GUEST_VIRTUAL_ADDRESS;
709
710typedef union DECLSPEC_ALIGN(16) WHV_UINT128 {
711 __C89_NAMELESS struct {
712 UINT64 Low64;
713 UINT64 High64;
714 };
715 UINT32 Dword[4];
716} WHV_UINT128;
717
718C_ASSERT(sizeof(WHV_UINT128) == 16);
719
720#if defined(__x86_64__)
721
722typedef union WHV_X64_FP_REGISTER {
723 __C89_NAMELESS struct {
724 UINT64 Mantissa;
725 UINT64 BiasedExponent:15;
726 UINT64 Sign:1;
727 UINT64 Reserved:48;
728 };
729 WHV_UINT128 AsUINT128;
730} WHV_X64_FP_REGISTER;
731
732C_ASSERT(sizeof(WHV_X64_FP_REGISTER) == 16);
733
734typedef union WHV_X64_FP_CONTROL_STATUS_REGISTER {
735 __C89_NAMELESS struct {
736 UINT16 FpControl;
737 UINT16 FpStatus;
738 UINT8 FpTag;
739 UINT8 Reserved;
740 UINT16 LastFpOp;
741 __C89_NAMELESS union {
742 UINT64 LastFpRip;
743 __C89_NAMELESS struct {
744 UINT32 LastFpEip;
745 UINT16 LastFpCs;
746 UINT16 Reserved2;
747 };
748 };
749 };
750 WHV_UINT128 AsUINT128;
751} WHV_X64_FP_CONTROL_STATUS_REGISTER;
752
753C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16);
754
755typedef union WHV_X64_XMM_CONTROL_STATUS_REGISTER {
756 __C89_NAMELESS struct {
757 __C89_NAMELESS union {
758 UINT64 LastFpRdp;
759 __C89_NAMELESS struct {
760 UINT32 LastFpDp;
761 UINT16 LastFpDs;
762 UINT16 Reserved;
763 };
764 };
765 UINT32 XmmStatusControl;
766 UINT32 XmmStatusControlMask;
767 };
768 WHV_UINT128 AsUINT128;
769} WHV_X64_XMM_CONTROL_STATUS_REGISTER;
770
771C_ASSERT(sizeof(WHV_X64_XMM_CONTROL_STATUS_REGISTER) == 16);
772
773typedef struct WHV_X64_SEGMENT_REGISTER {
774 UINT64 Base;
775 UINT32 Limit;
776 UINT16 Selector;
777 __C89_NAMELESS union {
778 __C89_NAMELESS struct {
779 UINT16 SegmentType:4;
780 UINT16 NonSystemSegment:1;
781 UINT16 DescriptorPrivilegeLevel:2;
782 UINT16 Present:1;
783 UINT16 Reserved:4;
784 UINT16 Available:1;
785 UINT16 Long:1;
786 UINT16 Default:1;
787 UINT16 Granularity:1;
788 };
789 UINT16 Attributes;
790 };
791} WHV_X64_SEGMENT_REGISTER;
792
793C_ASSERT(sizeof(WHV_X64_SEGMENT_REGISTER) == 16);
794
795typedef struct WHV_X64_TABLE_REGISTER {
796 UINT16 Pad[3];
797 UINT16 Limit;
798 UINT64 Base;
799} WHV_X64_TABLE_REGISTER;
800
801C_ASSERT(sizeof(WHV_X64_TABLE_REGISTER) == 16);
802
803typedef union WHV_X64_INTERRUPT_STATE_REGISTER {
804 __C89_NAMELESS struct {
805 UINT64 InterruptShadow:1;
806 UINT64 NmiMasked:1;
807 UINT64 Reserved:62;
808 };
809 UINT64 AsUINT64;
810} WHV_X64_INTERRUPT_STATE_REGISTER;
811
812C_ASSERT(sizeof(WHV_X64_INTERRUPT_STATE_REGISTER) == 8);
813
814typedef union WHV_X64_PENDING_INTERRUPTION_REGISTER {
815 __C89_NAMELESS struct {
816 UINT32 InterruptionPending:1;
817 UINT32 InterruptionType:3;
818 UINT32 DeliverErrorCode:1;
819 UINT32 InstructionLength:4;
820 UINT32 NestedEvent:1;
821 UINT32 Reserved:6;
822 UINT32 InterruptionVector:16;
823 UINT32 ErrorCode;
824 };
825 UINT64 AsUINT64;
826} WHV_X64_PENDING_INTERRUPTION_REGISTER;
827
828C_ASSERT(sizeof(WHV_X64_PENDING_INTERRUPTION_REGISTER) == sizeof(UINT64));
829
830typedef enum WHV_X64_PENDING_EVENT_TYPE {
831 WHvX64PendingEventException = 0,
832 WHvX64PendingEventExtInt = 5,
833 WHvX64PendingEventSvmNestedExit = 7,
834 WHvX64PendingEventVmxNestedExit = 8
835} WHV_X64_PENDING_EVENT_TYPE;
836
837typedef union WHV_X64_PENDING_EXCEPTION_EVENT {
838 __C89_NAMELESS struct {
839 UINT32 EventPending : 1;
840 UINT32 EventType : 3;
841 UINT32 Reserved0 : 4;
842 UINT32 DeliverErrorCode : 1;
843 UINT32 Reserved1 : 7;
844 UINT32 Vector : 16;
845 UINT32 ErrorCode;
846 UINT64 ExceptionParameter;
847 };
848 WHV_UINT128 AsUINT128;
849} WHV_X64_PENDING_EXCEPTION_EVENT;
850
851C_ASSERT(sizeof(WHV_X64_PENDING_EXCEPTION_EVENT) == sizeof(WHV_UINT128));
852
853typedef union WHV_X64_PENDING_EXT_INT_EVENT {
854 __C89_NAMELESS struct {
855 UINT64 EventPending : 1;
856 UINT64 EventType : 3;
857 UINT64 Reserved0 : 4;
858 UINT64 Vector : 8;
859 UINT64 Reserved1 : 48;
860 UINT64 Reserved2;
861 };
862 WHV_UINT128 AsUINT128;
863} WHV_X64_PENDING_EXT_INT_EVENT;
864
865C_ASSERT(sizeof(WHV_X64_PENDING_EXT_INT_EVENT) == sizeof(WHV_UINT128));
866
867typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 {
868 __C89_NAMELESS struct {
869 UINT64 EventPending : 1;
870 UINT64 EventType : 4;
871 UINT64 Reserved0 : 3;
872 UINT64 InstructionBytesValid : 1;
873 UINT64 Reserved1 : 55;
874 UINT64 ExitCode;
875 };
876 WHV_UINT128 AsUINT128;
877} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0;
878
879typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 {
880 __C89_NAMELESS struct {
881 UINT64 ExitInfo1;
882 UINT64 ExitInfo2;
883 };
884 WHV_UINT128 AsUINT128;
885} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1;
886
887typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 {
888 __C89_NAMELESS struct {
889 UINT64 NextRip;
890 UINT8 InstructionBytesFetchedCount;
891 UINT8 InstructionBytes[7];
892 };
893 WHV_UINT128 AsUINT128;
894} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2;
895
896typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 {
897 __C89_NAMELESS struct {
898 UINT8 InstructionBytes[8];
899 UINT64 Reserved2;
900 };
901 WHV_UINT128 AsUINT128;
902} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3;
903
904C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0) == 16);
905C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1) == 16);
906C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2) == 16);
907C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3) == 16);
908
909typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 {
910 __C89_NAMELESS struct {
911 UINT32 EventPending : 1;
912 UINT32 EventType : 4;
913 UINT32 Reserved0 : 27;
914 UINT32 ExitReason;
915 UINT64 ExitQualification;
916 };
917 WHV_UINT128 AsUINT128;
918} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0;
919
920typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 {
921 __C89_NAMELESS struct {
922 UINT32 InstructionLength;
923 UINT32 InstructionInfo;
924 UINT32 ExitInterruptionInfo;
925 UINT32 ExitExceptionErrorCode;
926 };
927 WHV_UINT128 AsUINT128;
928} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1;
929
930typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 {
931 __C89_NAMELESS struct {
932 UINT64 GuestLinearAddress;
933 UINT64 GuestPhysicalAddress;
934 };
935 WHV_UINT128 AsUINT128;
936} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2;
937
938C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0) == 16);
939C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1) == 16);
940C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2) == 16);
941
942typedef union WHV_X64_NESTED_INVEPT_REGISTER {
943 __C89_NAMELESS struct {
944 UINT8 Type;
945 UINT8 Reserved[7];
946 UINT64 Eptp;
947 };
948 WHV_UINT128 AsUINT128;
949} WHV_X64_NESTED_INVEPT_REGISTER;
950
951C_ASSERT(sizeof(WHV_X64_NESTED_INVEPT_REGISTER) == 16);
952
953typedef union WHV_X64_NESTED_INVVPID_REGISTER {
954 __C89_NAMELESS struct {
955 UINT8 Type;
956 UINT8 Reserved[3];
957 UINT32 Vpid;
958 UINT64 LinearAddress;
959 };
960 WHV_UINT128 AsUINT128;
961} WHV_X64_NESTED_INVVPID_REGISTER;
962
963C_ASSERT(sizeof(WHV_X64_NESTED_INVVPID_REGISTER) == 16);
964
965typedef union WHV_X64_NESTED_GUEST_STATE {
966 __C89_NAMELESS struct {
967 UINT64 NestedVirtActive : 1;
968 UINT64 NestedGuestMode : 1;
969 UINT64 VmEntryPending : 1;
970 UINT64 Reserved0 : 61;
971 UINT64 Reserved1;
972 };
973 WHV_UINT128 AsUINT128;
974} WHV_X64_NESTED_GUEST_STATE;
975
976C_ASSERT(sizeof(WHV_X64_NESTED_GUEST_STATE) == 16);
977
978#endif /* defined(__x86_64__) */
979
980typedef union WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER {
981 __C89_NAMELESS struct {
982#if defined(__x86_64__)
983 UINT64 NmiNotification:1;
984 UINT64 InterruptNotification:1;
985 UINT64 InterruptPriority:4;
986 UINT64 Reserved:42;
987#elif defined(__aarch64__)
988 UINT64 Reserved:48;
989#endif
990 UINT64 Sint:16;
991 };
992 UINT64 AsUINT64;
993} WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER, WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER;
994
995C_ASSERT(sizeof(WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER) == 8);
996
997typedef union WHV_INTERNAL_ACTIVITY_REGISTER {
998 __C89_NAMELESS struct {
999 UINT64 StartupSuspend : 1;
1000 UINT64 HaltSuspend : 1;
1001 UINT64 IdleSuspend : 1;
1002 UINT64 Reserved :61;
1003 };
1004 UINT64 AsUINT64;
1005} WHV_INTERNAL_ACTIVITY_REGISTER;
1006
1007C_ASSERT(sizeof(WHV_INTERNAL_ACTIVITY_REGISTER) == 8);
1008
1009#if defined(__x86_64__)
1010
1011typedef union WHV_X64_PENDING_DEBUG_EXCEPTION {
1012 UINT64 AsUINT64;
1013 __C89_NAMELESS struct {
1014 UINT64 Breakpoint0 : 1;
1015 UINT64 Breakpoint1 : 1;
1016 UINT64 Breakpoint2 : 1;
1017 UINT64 Breakpoint3 : 1;
1018 UINT64 SingleStep : 1;
1019 UINT64 Reserved0 : 59;
1020 };
1021} WHV_X64_PENDING_DEBUG_EXCEPTION;
1022
1023C_ASSERT(sizeof(WHV_X64_PENDING_DEBUG_EXCEPTION) == 8);
1024
1025#elif defined(__aarch64__)
1026
1027typedef enum WHV_ARM64_PENDING_EVENT_TYPE {
1028 WHvArm64PendingEventException = 0,
1029 WHvArm64PendingEventSyntheticException = 1
1030} WHV_ARM64_PENDING_EVENT_TYPE;
1031
1032#define WHV_ARM64_PENDING_EVENT_HEADER \
1033 UINT8 EventPending : 1; \
1034 UINT8 EventType : 3; \
1035 UINT8 Reserved : 4
1036
1037typedef union WHV_ARM64_PENDING_EXCEPTION_EVENT {
1038 UINT64 AsUINT64[3];
1039 __C89_NAMELESS struct {
1040 WHV_ARM64_PENDING_EVENT_HEADER;
1041 UINT8 Reserved1;
1042 UINT16 Reserved2;
1043 UINT32 Reserved3;
1044 UINT64 EsrElx;
1045 UINT64 FarElx;
1046 };
1047} WHV_ARM64_PENDING_EXCEPTION_EVENT;
1048
1049typedef enum WHV_ARM64_SYNTHETIC_EXCEPTION_TYPE {
1050 WHvArm64SyntheticExceptionTypeSmc = 0x0,
1051 WHvArm64SyntheticExceptionTypeSecure = 0x1,
1052 WHvArm64SyntheticExceptionTypeCrashdump = 0x2,
1053 WHvArm64SyntheticExceptionTypeVirtualizationFault = 0x3,
1054 WHvArm64SyntheticExceptionTypeMax = 0x3F + 1
1055} WHV_ARM64_SYNTHETIC_EXCEPTION_TYPE;
1056
1057typedef union WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT {
1058 UINT64 AsUINT64[2];
1059 __C89_NAMELESS struct {
1060 WHV_ARM64_PENDING_EVENT_HEADER;
1061 UINT8 Reserved1;
1062 UINT16 Reserved2;
1063 UINT32 ExceptionType;
1064 UINT64 Context;
1065 };
1066} WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT;
1067
1068typedef union WHV_ARM64_PENDING_EVENT {
1069 __C89_NAMELESS struct {
1070 WHV_UINT128 Reg0;
1071 WHV_UINT128 Reg1;
1072 };
1073 __C89_NAMELESS struct {
1074 WHV_ARM64_PENDING_EVENT_HEADER;
1075 UINT8 EventData[15];
1076 };
1077 WHV_ARM64_PENDING_EXCEPTION_EVENT Exception;
1078 WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT SyntheticException;
1079} WHV_ARM64_PENDING_EVENT;
1080
1081#endif /* defined(__x86_64__) || defined(__aarch64__) */
1082
1083typedef union WHV_REGISTER_VALUE {
1084 WHV_UINT128 Reg128;
1085 UINT64 Reg64;
1086 UINT32 Reg32;
1087 UINT16 Reg16;
1088 UINT8 Reg8;
1089 WHV_INTERNAL_ACTIVITY_REGISTER InternalActivity;
1090 WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER DeliverabilityNotifications;
1091#if defined(__x86_64__)
1092 WHV_X64_FP_REGISTER Fp;
1093 WHV_X64_FP_CONTROL_STATUS_REGISTER FpControlStatus;
1094 WHV_X64_XMM_CONTROL_STATUS_REGISTER XmmControlStatus;
1095 WHV_X64_SEGMENT_REGISTER Segment;
1096 WHV_X64_TABLE_REGISTER Table;
1097 WHV_X64_INTERRUPT_STATE_REGISTER InterruptState;
1098 WHV_X64_PENDING_INTERRUPTION_REGISTER PendingInterruption;
1099 WHV_X64_PENDING_EXCEPTION_EVENT ExceptionEvent;
1100 WHV_X64_PENDING_EXT_INT_EVENT ExtIntEvent;
1101 WHV_X64_PENDING_DEBUG_EXCEPTION PendingDebugException;
1102 WHV_X64_NESTED_GUEST_STATE NestedState;
1103 WHV_X64_NESTED_INVEPT_REGISTER InvEpt;
1104 WHV_X64_NESTED_INVVPID_REGISTER InvVpid;
1105 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 SvmNestedExit0;
1106 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 SvmNestedExit1;
1107 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 SvmNestedExit2;
1108 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 SvmNestedExit3;
1109 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 VmxNestedExit0;
1110 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 VmxNestedExit1;
1111 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 VmxNestedExit2;
1112#endif
1113} WHV_REGISTER_VALUE;
1114
1115C_ASSERT(sizeof(WHV_REGISTER_VALUE) == 16);
1116
1117typedef enum WHV_CAPABILITY_CODE {
1118 WHvCapabilityCodeHypervisorPresent = 0x00000000
1119 ,WHvCapabilityCodeFeatures = 0x00000001
1120 ,WHvCapabilityCodeExtendedVmExits = 0x00000002
1121#if defined(__x86_64__)
1122 ,WHvCapabilityCodeExceptionExitBitmap = 0x00000003
1123 ,WHvCapabilityCodeX64MsrExitBitmap = 0x00000004
1124#endif
1125 ,WHvCapabilityCodeGpaRangePopulateFlags = 0x00000005
1126 ,WHvCapabilityCodeSchedulerFeatures = 0x00000006
1127 ,WHvCapabilityCodeProcessorVendor = 0x00001000
1128 ,WHvCapabilityCodeProcessorFeatures = 0x00001001
1129 ,WHvCapabilityCodeProcessorClFlushSize = 0x00001002
1130#if defined(__x86_64__)
1131 ,WHvCapabilityCodeProcessorXsaveFeatures = 0x00001003
1132#endif
1133 ,WHvCapabilityCodeProcessorClockFrequency = 0x00001004
1134#if defined(__x86_64__)
1135 ,WHvCapabilityCodeInterruptClockFrequency = 0x00001005
1136#endif
1137 ,WHvCapabilityCodeProcessorFeaturesBanks = 0x00001006
1138 ,WHvCapabilityCodeProcessorFrequencyCap = 0x00001007
1139 ,WHvCapabilityCodeSyntheticProcessorFeaturesBanks = 0x00001008
1140#if defined(__x86_64__)
1141 ,WHvCapabilityCodeProcessorPerfmonFeatures = 0x00001009
1142#endif
1143 ,WHvCapabilityCodePhysicalAddressWidth = 0x0000100A
1144#if defined(__x86_64__)
1145 ,WHvCapabilityCodeVmxBasic = 0x00002000
1146 ,WHvCapabilityCodeVmxPinbasedCtls = 0x00002001
1147 ,WHvCapabilityCodeVmxProcbasedCtls = 0x00002002
1148 ,WHvCapabilityCodeVmxExitCtls = 0x00002003
1149 ,WHvCapabilityCodeVmxEntryCtls = 0x00002004
1150 ,WHvCapabilityCodeVmxMisc = 0x00002005
1151 ,WHvCapabilityCodeVmxCr0Fixed0 = 0x00002006
1152 ,WHvCapabilityCodeVmxCr0Fixed1 = 0x00002007
1153 ,WHvCapabilityCodeVmxCr4Fixed0 = 0x00002008
1154 ,WHvCapabilityCodeVmxCr4Fixed1 = 0x00002009
1155 ,WHvCapabilityCodeVmxVmcsEnum = 0x0000200A
1156 ,WHvCapabilityCodeVmxProcbasedCtls2 = 0x0000200B
1157 ,WHvCapabilityCodeVmxEptVpidCap = 0x0000200C
1158 ,WHvCapabilityCodeVmxTruePinbasedCtls = 0x0000200D
1159 ,WHvCapabilityCodeVmxTrueProcbasedCtls = 0x0000200E
1160 ,WHvCapabilityCodeVmxTrueExitCtls = 0x0000200F
1161 ,WHvCapabilityCodeVmxTrueEntryCtls = 0x00002010
1162#elif defined (__aarch64__)
1163 ,WHvCapabilityCodeGicLpiIntIdBits = 0x00002011
1164 ,WHvCapabilityCodeMaxSveVectorLength = 0x00002012
1165#endif
1166} WHV_CAPABILITY_CODE;
1167
1168typedef union WHV_CAPABILITY_FEATURES {
1169 __C89_NAMELESS struct {
1170 UINT64 PartialUnmap : 1;
1171#if defined(__x86_64__)
1172 UINT64 LocalApicEmulation : 1;
1173 UINT64 Xsave : 1;
1174#else
1175 UINT64 ReservedArm0 : 2;
1176#endif
1177 UINT64 DirtyPageTracking : 1;
1178 UINT64 SpeculationControl : 1;
1179#if defined(__x86_64__)
1180 UINT64 ApicRemoteRead : 1;
1181#else
1182 UINT64 ReservedArm1 : 1;
1183#endif
1184 UINT64 IdleSuspend : 1;
1185 UINT64 VirtualPciDeviceSupport : 1;
1186 UINT64 IommuSupport : 1;
1187 UINT64 VpHotAddRemove : 1;
1188 UINT64 DeviceAccessTracking : 1;
1189#if defined(__x86_64__)
1190 UINT64 ReservedX640 : 1;
1191#else
1192 UINT64 Arm64Support : 1;
1193#endif
1194 UINT64 Reserved : 52;
1195 };
1196 UINT64 AsUINT64;
1197} WHV_CAPABILITY_FEATURES;
1198
1199C_ASSERT(sizeof(WHV_CAPABILITY_FEATURES) == sizeof(UINT64));
1200
1201typedef union WHV_EXTENDED_VM_EXITS {
1202 __C89_NAMELESS struct {
1203#if defined(__x86_64__)
1204 UINT64 X64CpuidExit : 1;
1205 UINT64 X64MsrExit : 1;
1206 UINT64 ExceptionExit : 1;
1207 UINT64 X64RdtscExit : 1;
1208 UINT64 X64ApicSmiExitTrap : 1;
1209#else
1210 UINT64 ReservedArm0 : 5;
1211#endif
1212 UINT64 HypercallExit : 1;
1213#if defined(__x86_64__)
1214 UINT64 X64ApicInitSipiExitTrap : 1;
1215 UINT64 X64ApicWriteLint0ExitTrap : 1;
1216 UINT64 X64ApicWriteLint1ExitTrap : 1;
1217 UINT64 X64ApicWriteSvrExitTrap : 1;
1218#else
1219 UINT64 ReservedArm1 : 4;
1220#endif
1221 UINT64 UnknownSynicConnection : 1;
1222 UINT64 RetargetUnknownVpciDevice : 1;
1223#if defined(__x86_64__)
1224 UINT64 X64ApicWriteLdrExitTrap : 1;
1225 UINT64 X64ApicWriteDfrExitTrap : 1;
1226#else
1227 UINT64 ReservedArm2 : 2;
1228#endif
1229 UINT64 GpaAccessFaultExit : 1;
1230 UINT64 Reserved : 49;
1231 };
1232 UINT64 AsUINT64;
1233} WHV_EXTENDED_VM_EXITS;
1234
1235C_ASSERT(sizeof(WHV_EXTENDED_VM_EXITS) == sizeof(UINT64));
1236
1237typedef enum WHV_PROCESSOR_VENDOR {
1238 WHvProcessorVendorAmd = 0x0000,
1239 WHvProcessorVendorIntel = 0x0001,
1240 WHvProcessorVendorHygon = 0x0002,
1241 WHvProcessorVendorArm = 0x0010
1242} WHV_PROCESSOR_VENDOR;
1243
1244#if defined(__x86_64__)
1245
1246typedef union WHV_X64_PROCESSOR_FEATURES {
1247 __C89_NAMELESS struct {
1248 UINT64 Sse3Support : 1;
1249 UINT64 LahfSahfSupport : 1;
1250 UINT64 Ssse3Support : 1;
1251 UINT64 Sse4_1Support : 1;
1252 UINT64 Sse4_2Support : 1;
1253 UINT64 Sse4aSupport : 1;
1254 UINT64 XopSupport : 1;
1255 UINT64 PopCntSupport : 1;
1256 UINT64 Cmpxchg16bSupport : 1;
1257 UINT64 Altmovcr8Support : 1;
1258 UINT64 LzcntSupport : 1;
1259 UINT64 MisAlignSseSupport : 1;
1260 UINT64 MmxExtSupport : 1;
1261 UINT64 Amd3DNowSupport : 1;
1262 UINT64 ExtendedAmd3DNowSupport : 1;
1263 UINT64 Page1GbSupport : 1;
1264 UINT64 AesSupport : 1;
1265 UINT64 PclmulqdqSupport : 1;
1266 UINT64 PcidSupport : 1;
1267 UINT64 Fma4Support : 1;
1268 UINT64 F16CSupport : 1;
1269 UINT64 RdRandSupport : 1;
1270 UINT64 RdWrFsGsSupport : 1;
1271 UINT64 SmepSupport : 1;
1272 UINT64 EnhancedFastStringSupport : 1;
1273 UINT64 Bmi1Support : 1;
1274 UINT64 Bmi2Support : 1;
1275 UINT64 Reserved1 : 2;
1276 UINT64 MovbeSupport : 1;
1277 UINT64 Npiep1Support : 1;
1278 UINT64 DepX87FPUSaveSupport : 1;
1279 UINT64 RdSeedSupport : 1;
1280 UINT64 AdxSupport : 1;
1281 UINT64 IntelPrefetchSupport : 1;
1282 UINT64 SmapSupport : 1;
1283 UINT64 HleSupport : 1;
1284 UINT64 RtmSupport : 1;
1285 UINT64 RdtscpSupport : 1;
1286 UINT64 ClflushoptSupport : 1;
1287 UINT64 ClwbSupport : 1;
1288 UINT64 ShaSupport : 1;
1289 UINT64 X87PointersSavedSupport : 1;
1290 UINT64 InvpcidSupport : 1;
1291 UINT64 IbrsSupport : 1;
1292 UINT64 StibpSupport : 1;
1293 UINT64 IbpbSupport : 1;
1294 UINT64 UnrestrictedGuestSupport : 1;
1295 UINT64 SsbdSupport : 1;
1296 UINT64 FastShortRepMovSupport : 1;
1297 UINT64 Reserved3 : 1;
1298 UINT64 RdclNo : 1;
1299 UINT64 IbrsAllSupport : 1;
1300 UINT64 Reserved4 : 1;
1301 UINT64 SsbNo : 1;
1302 UINT64 RsbANo : 1;
1303 UINT64 Reserved5 : 1;
1304 UINT64 RdPidSupport : 1;
1305 UINT64 UmipSupport : 1;
1306 UINT64 MdsNoSupport : 1;
1307 UINT64 MdClearSupport : 1;
1308 UINT64 TaaNoSupport : 1;
1309 UINT64 TsxCtrlSupport : 1;
1310 UINT64 Reserved6 : 1;
1311 };
1312 UINT64 AsUINT64;
1313} WHV_X64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES;
1314
1315C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES) == sizeof(UINT64));
1316
1317typedef union WHV_X64_PROCESSOR_FEATURES1 {
1318 __C89_NAMELESS struct {
1319 UINT64 ACountMCountSupport : 1;
1320 UINT64 TscInvariantSupport : 1;
1321 UINT64 ClZeroSupport : 1;
1322 UINT64 RdpruSupport : 1;
1323 UINT64 La57Support : 1;
1324 UINT64 MbecSupport : 1;
1325 UINT64 NestedVirtSupport : 1;
1326 UINT64 PsfdSupport: 1;
1327 UINT64 CetSsSupport : 1;
1328 UINT64 CetIbtSupport : 1;
1329 UINT64 VmxExceptionInjectSupport : 1;
1330 UINT64 Reserved2 : 1;
1331 UINT64 UmwaitTpauseSupport : 1;
1332 UINT64 MovdiriSupport : 1;
1333 UINT64 Movdir64bSupport : 1;
1334 UINT64 CldemoteSupport : 1;
1335 UINT64 SerializeSupport : 1;
1336 UINT64 TscDeadlineTmrSupport : 1;
1337 UINT64 TscAdjustSupport : 1;
1338 UINT64 FZLRepMovsb : 1;
1339 UINT64 FSRepStosb : 1;
1340 UINT64 FSRepCmpsb : 1;
1341 UINT64 TsxLdTrkSupport : 1;
1342 UINT64 VmxInsOutsExitInfoSupport : 1;
1343 UINT64 Reserved3 : 1;
1344 UINT64 SbdrSsdpNoSupport : 1;
1345 UINT64 FbsdpNoSupport : 1;
1346 UINT64 PsdpNoSupport : 1;
1347 UINT64 FbClearSupport : 1;
1348 UINT64 BtcNoSupport : 1;
1349 UINT64 IbpbRsbFlushSupport : 1;
1350 UINT64 StibpAlwaysOnSupport : 1;
1351 UINT64 PerfGlobalCtrlSupport : 1;
1352 UINT64 NptExecuteOnlySupport : 1;
1353 UINT64 NptADFlagsSupport : 1;
1354 UINT64 Npt1GbPageSupport : 1;
1355 UINT64 Reserved4 : 1;
1356 UINT64 Reserved5 : 1;
1357 UINT64 Reserved6 : 1;
1358 UINT64 Reserved7 : 1;
1359 UINT64 CmpccxaddSupport : 1;
1360 UINT64 Reserved8 : 1;
1361 UINT64 Reserved9 : 1;
1362 UINT64 Reserved10 : 1;
1363 UINT64 Reserved11 : 1;
1364 UINT64 PrefetchISupport : 1;
1365 UINT64 Sha512Support : 1;
1366 UINT64 Reserved12 : 1;
1367 UINT64 Reserved13 : 1;
1368 UINT64 Reserved14 : 1;
1369 UINT64 SM3Support : 1;
1370 UINT64 SM4Support : 1;
1371 UINT64 Reserved15 : 1;
1372 UINT64 Reserved16 : 1;
1373 UINT64 SbpbSupported : 1;
1374 UINT64 IbpbBrTypeSupported : 1;
1375 UINT64 SrsoNoSupported : 1;
1376 UINT64 SrsoUserKernelNoSupported : 1;
1377 UINT64 Reserved17 : 1;
1378 UINT64 Reserved18 : 1;
1379 UINT64 Reserved19 : 1;
1380 UINT64 Reserved20 : 3;
1381 };
1382 UINT64 AsUINT64;
1383} WHV_X64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1;
1384
1385C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES1) == sizeof(UINT64));
1386
1387#elif defined(__aarch64__)
1388
1389typedef union WHV_ARM64_PROCESSOR_FEATURES {
1390 __C89_NAMELESS struct {
1391 UINT64 Asid16 : 1;
1392 UINT64 TGran16 : 1;
1393 UINT64 TGran64 : 1;
1394 UINT64 Haf : 1;
1395 UINT64 Hdbs : 1;
1396 UINT64 Pan : 1;
1397 UINT64 AtS1E1 : 1;
1398 UINT64 Uao : 1;
1399 UINT64 El0Aarch32 : 1;
1400 UINT64 Fp : 1;
1401 UINT64 FpHp : 1;
1402 UINT64 AdvSimd : 1;
1403 UINT64 AdvSimdHp : 1;
1404 UINT64 GicV3V4 : 1;
1405 UINT64 GicV41 : 1;
1406 UINT64 Ras : 1;
1407 UINT64 PmuV3 : 1;
1408 UINT64 PmuV3ArmV81 : 1;
1409 UINT64 PmuV3ArmV84 : 1;
1410 UINT64 PmuV3ArmV85 : 1;
1411 UINT64 Aes : 1;
1412 UINT64 PolyMul : 1;
1413 UINT64 Sha1 : 1;
1414 UINT64 Sha256 : 1;
1415 UINT64 Sha512 : 1;
1416 UINT64 Crc32 : 1;
1417 UINT64 Atomic : 1;
1418 UINT64 Rdm : 1;
1419 UINT64 Sha3 : 1;
1420 UINT64 Sm3 : 1;
1421 UINT64 Sm4 : 1;
1422 UINT64 Dp : 1;
1423 UINT64 Fhm : 1;
1424 UINT64 DcCvap : 1;
1425 UINT64 DcCvadp : 1;
1426 UINT64 ApaBase : 1;
1427 UINT64 ApaEp : 1;
1428 UINT64 ApaEp2 : 1;
1429 UINT64 ApaEp2Fp : 1;
1430 UINT64 ApaEp2Fpc : 1;
1431 UINT64 Jscvt : 1;
1432 UINT64 Fcma : 1;
1433 UINT64 RcpcV83 : 1;
1434 UINT64 RcpcV84 : 1;
1435 UINT64 Gpa : 1;
1436 UINT64 L1ipPipt : 1;
1437 UINT64 DzPermitted : 1;
1438 UINT64 Ssbs : 1;
1439 UINT64 SsbsRw : 1;
1440 UINT64 Reserved49 : 1;
1441 UINT64 Reserved50 : 1;
1442 UINT64 Reserved51 : 1;
1443 UINT64 Reserved52 : 1;
1444 UINT64 Csv2 : 1;
1445 UINT64 Csv3 : 1;
1446 UINT64 Sb : 1;
1447 UINT64 Idc : 1;
1448 UINT64 Dic : 1;
1449 UINT64 TlbiOs : 1;
1450 UINT64 TlbiOsRange : 1;
1451 UINT64 FlagsM : 1;
1452 UINT64 FlagsM2 : 1;
1453 UINT64 Bf16 : 1;
1454 UINT64 Ebf16 : 1;
1455 };
1456 UINT64 AsUINT64;
1457} WHV_ARM64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES;
1458
1459typedef union WHV_ARM64_PROCESSOR_FEATURES1 {
1460 __C89_NAMELESS struct {
1461 UINT64 SveBf16 : 1;
1462 UINT64 SveEbf16 : 1;
1463 UINT64 I8mm : 1;
1464 UINT64 SveI8mm : 1;
1465 UINT64 Frintts : 1;
1466 UINT64 Specres : 1;
1467 UINT64 Reserved6 : 1;
1468 UINT64 Rpres : 1;
1469 UINT64 Exs : 1;
1470 UINT64 SpecSei : 1;
1471 UINT64 Ets : 1;
1472 UINT64 Afp : 1;
1473 UINT64 Iesb : 1;
1474 UINT64 Rng : 1;
1475 UINT64 Lse2 : 1;
1476 UINT64 Idst : 1;
1477 UINT64 Reserved16 : 1;
1478 UINT64 Reserved17 : 1;
1479 UINT64 Reserved18 : 1;
1480 UINT64 Reserved19 : 1;
1481 UINT64 Reserved20 : 1;
1482 UINT64 Reserved21 : 1;
1483 UINT64 Ccidx : 1;
1484 UINT64 Reserved23 : 1;
1485 UINT64 Reserved24 : 1;
1486 UINT64 Reserved25 : 1;
1487 UINT64 Reserved26 : 1;
1488 UINT64 Reserved27 : 1;
1489 UINT64 Reserved28 : 1;
1490 UINT64 Reserved29 : 1;
1491 UINT64 Reserved30 : 1;
1492 UINT64 Reserved31 : 1;
1493 UINT64 Reserved32 : 1;
1494 UINT64 Reserved33 : 1;
1495 UINT64 Reserved34 : 1;
1496 UINT64 TtCnp : 1;
1497 UINT64 Hpds : 1;
1498 UINT64 Sve : 1;
1499 UINT64 SveV2 : 1;
1500 UINT64 SveV2P1 : 1;
1501 UINT64 SpecFpacc : 1;
1502 UINT64 SveAes : 1;
1503 UINT64 SveBitPerm : 1;
1504 UINT64 SveSha3 : 1;
1505 UINT64 SveSm4 : 1;
1506 UINT64 E0PD : 1;
1507 UINT64 Reserved : 8;
1508 };
1509 UINT64 AsUINT64;
1510} WHV_ARM64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1;
1511
1512#endif /* __x86_64__ || __aarch64__ */
1513
1514#define WHV_PROCESSOR_FEATURES_BANKS_COUNT 2
1515
1516typedef struct WHV_PROCESSOR_FEATURES_BANKS {
1517 UINT32 BanksCount;
1518 UINT32 Reserved0;
1519 __C89_NAMELESS union {
1520 __C89_NAMELESS struct {
1521 WHV_PROCESSOR_FEATURES Bank0;
1522 WHV_PROCESSOR_FEATURES1 Bank1;
1523 };
1524 UINT64 AsUINT64[WHV_PROCESSOR_FEATURES_BANKS_COUNT];
1525 };
1526} WHV_PROCESSOR_FEATURES_BANKS;
1527
1528C_ASSERT(sizeof(WHV_PROCESSOR_FEATURES_BANKS) == sizeof(UINT64) * (WHV_PROCESSOR_FEATURES_BANKS_COUNT + 1));
1529
1530typedef union WHV_SYNTHETIC_PROCESSOR_FEATURES {
1531 __C89_NAMELESS struct {
1532 UINT64 HypervisorPresent : 1;
1533 UINT64 Hv1 : 1;
1534 UINT64 AccessVpRunTimeReg : 1;
1535 UINT64 AccessPartitionReferenceCounter : 1;
1536 UINT64 AccessSynicRegs : 1;
1537 UINT64 AccessSyntheticTimerRegs : 1;
1538 UINT64 AccessIntrCtrlRegs : 1;
1539 UINT64 AccessHypercallRegs : 1;
1540 UINT64 AccessVpIndex : 1;
1541 UINT64 AccessPartitionReferenceTsc : 1;
1542#ifdef __x86_64__
1543 UINT64 AccessGuestIdleReg : 1;
1544 UINT64 AccessFrequencyRegs : 1;
1545#else
1546 UINT64 ReservedZ10 : 1;
1547 UINT64 ReservedZ11 : 1;
1548#endif
1549 UINT64 ReservedZ12 : 1;
1550 UINT64 ReservedZ13 : 1;
1551 UINT64 ReservedZ14 : 1;
1552#ifdef __x86_64__
1553 UINT64 EnableExtendedGvaRangesForFlushVirtualAddressList : 1;
1554#else
1555 UINT64 ReservedZ15 : 1;
1556#endif
1557 UINT64 ReservedZ16 : 1;
1558 UINT64 ReservedZ17 : 1;
1559 UINT64 FastHypercallOutput : 1;
1560 UINT64 ReservedZ19 : 1;
1561 UINT64 ReservedZ20 : 1;
1562 UINT64 ReservedZ21 : 1;
1563 UINT64 DirectSyntheticTimers : 1;
1564 UINT64 ReservedZ23 : 1;
1565 UINT64 ExtendedProcessorMasks : 1;
1566 UINT64 TbFlushHypercalls : 1;
1567 UINT64 SyntheticClusterIpi : 1;
1568 UINT64 NotifyLongSpinWait : 1;
1569 UINT64 QueryNumaDistance : 1;
1570 UINT64 SignalEvents : 1;
1571 UINT64 RetargetDeviceInterrupt : 1;
1572#ifdef __x86_64__
1573 UINT64 RestoreTime : 1;
1574 UINT64 EnlightenedVmcs : 1;
1575 UINT64 NestedDebugCtl : 1;
1576 UINT64 SyntheticTimeUnhaltedTimer : 1;
1577 UINT64 IdleSpecCtrl : 1;
1578#else
1579 UINT64 ReservedZ31 : 1;
1580 UINT64 ReservedZ32 : 1;
1581 UINT64 ReservedZ33 : 1;
1582 UINT64 ReservedZ34 : 1;
1583 UINT64 ReservedZ35 : 1;
1584#endif
1585 UINT64 ReservedZ36 : 1;
1586 UINT64 WakeVps : 1;
1587 UINT64 AccessVpRegs : 1;
1588#ifdef __aarch64__
1589 UINT64 SyncContext : 1;
1590#else
1591 UINT64 ReservedZ39 : 1;
1592#endif
1593 UINT64 ReservedZ40 : 1;
1594 UINT64 ReservedZ41 : 1;
1595 UINT64 ReservedZ42 : 1;
1596 UINT64 ReservedZ43 : 1;
1597 UINT64 ReservedZ44 : 1;
1598 UINT64 Reserved : 19;
1599 };
1600 UINT64 AsUINT64;
1601} WHV_SYNTHETIC_PROCESSOR_FEATURES;
1602
1603C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES) == 8);
1604
1605#define WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT 1
1606
1607typedef struct WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS {
1608 UINT32 BanksCount;
1609 UINT32 Reserved0;
1610 __C89_NAMELESS union {
1611 __C89_NAMELESS struct {
1612 WHV_SYNTHETIC_PROCESSOR_FEATURES Bank0;
1613 };
1614 UINT64 AsUINT64[WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT];
1615 };
1616} WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS;
1617
1618C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS) == 16);
1619
1620typedef UINT8 WHV_VTL;
1621
1622#define WHV_VTL_ALL 0xF
1623
1624typedef union WHV_INPUT_VTL {
1625 UINT8 AsUINT8;
1626 __C89_NAMELESS struct {
1627 UINT8 TargetVtl : 4;
1628 UINT8 UseTargetVtl : 1;
1629 UINT8 Reserved : 3;
1630 };
1631} WHV_INPUT_VTL;
1632
1633typedef union WHV_ENABLE_PARTITION_VTL_FLAGS {
1634 UINT8 AsUINT8;
1635 __C89_NAMELESS struct {
1636 UINT8 EnableMbec : 1;
1637 UINT8 EnableSupervisorShadowStack : 1;
1638 UINT8 EnableHardwareHvpt : 1;
1639 UINT8 Reserved : 5;
1640 };
1641} WHV_ENABLE_PARTITION_VTL_FLAGS;
1642
1643typedef union WHV_DISABLE_PARTITION_VTL_FLAGS {
1644 UINT8 AsUINT8;
1645 __C89_NAMELESS struct {
1646 UINT8 ScrubOnly : 1;
1647 UINT8 Reserved : 7;
1648 };
1649} WHV_DISABLE_PARTITION_VTL_FLAGS;
1650
1651typedef struct WHV_INITIAL_VP_CONTEXT {
1652#if defined(__aarch64__)
1653 UINT64 Pc;
1654 UINT64 Sp_ELh;
1655 UINT64 SCTLR_EL1;
1656 UINT64 MAIR_EL1;
1657 UINT64 TCR_EL1;
1658 UINT64 VBAR_EL1;
1659 UINT64 TTBR0_EL1;
1660 UINT64 TTBR1_EL1;
1661 UINT64 X18;
1662#else
1663 UINT64 Rip;
1664 UINT64 Rsp;
1665 UINT64 Rflags;
1666 WHV_X64_SEGMENT_REGISTER Cs;
1667 WHV_X64_SEGMENT_REGISTER Ds;
1668 WHV_X64_SEGMENT_REGISTER Es;
1669 WHV_X64_SEGMENT_REGISTER Fs;
1670 WHV_X64_SEGMENT_REGISTER Gs;
1671 WHV_X64_SEGMENT_REGISTER Ss;
1672 WHV_X64_SEGMENT_REGISTER Tr;
1673 WHV_X64_SEGMENT_REGISTER Ldtr;
1674 WHV_X64_TABLE_REGISTER Idtr;
1675 WHV_X64_TABLE_REGISTER Gdtr;
1676 UINT64 Efer;
1677 UINT64 Cr0;
1678 UINT64 Cr3;
1679 UINT64 Cr4;
1680 UINT64 MsrCrPat;
1681#endif
1682} WHV_INITIAL_VP_CONTEXT;
1683
1684typedef union WHV_DISABLE_VP_VTL_FLAGS {
1685 UINT8 AsUINT8;
1686 __C89_NAMELESS struct {
1687 UINT8 ScrubOnly : 1;
1688 UINT8 Reserved : 7;
1689 };
1690} WHV_DISABLE_VP_VTL_FLAGS;
1691
1692typedef VOID* WHV_PARTITION_HANDLE;
1693
1694typedef enum WHV_PARTITION_PROPERTY_CODE {
1695 WHvPartitionPropertyCodeExtendedVmExits = 0x00000001,
1696#if defined(__x86_64__)
1697 WHvPartitionPropertyCodeExceptionExitBitmap = 0x00000002,
1698#endif
1699 WHvPartitionPropertyCodeSeparateSecurityDomain = 0x00000003,
1700 WHvPartitionPropertyCodeNestedVirtualization = 0x00000004,
1701#if defined(__x86_64__)
1702 WHvPartitionPropertyCodeX64MsrExitBitmap = 0x00000005,
1703#endif
1704 WHvPartitionPropertyCodePrimaryNumaNode = 0x00000006,
1705 WHvPartitionPropertyCodeCpuReserve = 0x00000007,
1706 WHvPartitionPropertyCodeCpuCap = 0x00000008,
1707 WHvPartitionPropertyCodeCpuWeight = 0x00000009,
1708 WHvPartitionPropertyCodeCpuGroupId = 0x0000000A,
1709 WHvPartitionPropertyCodeProcessorFrequencyCap = 0x0000000B,
1710 WHvPartitionPropertyCodeAllowDeviceAssignment = 0x0000000C,
1711 WHvPartitionPropertyCodeDisableSmt = 0x0000000D,
1712 WHvPartitionPropertyCodeProcessorFeatures = 0x00001001,
1713 WHvPartitionPropertyCodeProcessorClFlushSize = 0x00001002,
1714#if defined(__x86_64__)
1715 WHvPartitionPropertyCodeCpuidExitList = 0x00001003,
1716 WHvPartitionPropertyCodeCpuidResultList = 0x00001004,
1717 WHvPartitionPropertyCodeLocalApicEmulationMode = 0x00001005,
1718 WHvPartitionPropertyCodeProcessorXsaveFeatures = 0x00001006,
1719#endif
1720 WHvPartitionPropertyCodeProcessorClockFrequency = 0x00001007,
1721#if defined(__x86_64__)
1722 WHvPartitionPropertyCodeInterruptClockFrequency = 0x00001008,
1723 WHvPartitionPropertyCodeApicRemoteReadSupport = 0x00001009,
1724#endif
1725 WHvPartitionPropertyCodeProcessorFeaturesBanks = 0x0000100A,
1726 WHvPartitionPropertyCodeReferenceTime = 0x0000100B,
1727 WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks = 0x0000100C,
1728#if defined(__x86_64__)
1729 WHvPartitionPropertyCodeCpuidResultList2 = 0x0000100D,
1730 WHvPartitionPropertyCodeProcessorPerfmonFeatures = 0x0000100E,
1731 WHvPartitionPropertyCodeMsrActionList = 0x0000100F,
1732 WHvPartitionPropertyCodeUnimplementedMsrAction = 0x00001010,
1733#endif
1734 WHvPartitionPropertyCodePhysicalAddressWidth = 0x00001011,
1735#if defined(__aarch64__)
1736 WHvPartitionPropertyCodeArm64IcParameters = 0x00001012,
1737#endif
1738 WHvPartitionPropertyCodeProcessorCount = 0x00001fff
1739} WHV_PARTITION_PROPERTY_CODE;
14161740
1417#endif /* __x86_64__ || __aarch64__ */1741#if defined(__x86_64__)
14181742
1419typedef union DECLSPEC_ALIGN(16) WHV_UINT128 {1743typedef union WHV_PROCESSOR_XSAVE_FEATURES {
1420 __C89_NAMELESS struct {1744 __C89_NAMELESS struct {
1421 UINT64 Low64;1745 UINT64 XsaveSupport : 1;
1422 UINT64 High64;1746 UINT64 XsaveoptSupport : 1;
1747 UINT64 AvxSupport : 1;
1748 UINT64 Avx2Support : 1;
1749 UINT64 FmaSupport : 1;
1750 UINT64 MpxSupport : 1;
1751 UINT64 Avx512Support : 1;
1752 UINT64 Avx512DQSupport : 1;
1753 UINT64 Avx512CDSupport : 1;
1754 UINT64 Avx512BWSupport : 1;
1755 UINT64 Avx512VLSupport : 1;
1756 UINT64 XsaveCompSupport : 1;
1757 UINT64 XsaveSupervisorSupport : 1;
1758 UINT64 Xcr1Support : 1;
1759 UINT64 Avx512BitalgSupport : 1;
1760 UINT64 Avx512IfmaSupport : 1;
1761 UINT64 Avx512VBmiSupport : 1;
1762 UINT64 Avx512VBmi2Support : 1;
1763 UINT64 Avx512VnniSupport : 1;
1764 UINT64 GfniSupport : 1;
1765 UINT64 VaesSupport : 1;
1766 UINT64 Avx512VPopcntdqSupport : 1;
1767 UINT64 VpclmulqdqSupport : 1;
1768 UINT64 Avx512Bf16Support : 1;
1769 UINT64 Avx512Vp2IntersectSupport : 1;
1770 UINT64 Avx512Fp16Support : 1;
1771 UINT64 XfdSupport : 1;
1772 UINT64 AmxTileSupport : 1;
1773 UINT64 AmxBf16Support : 1;
1774 UINT64 AmxInt8Support : 1;
1775 UINT64 AvxVnniSupport : 1;
1776 UINT64 AvxIfmaSupport : 1;
1777 UINT64 AvxNeConvertSupport : 1;
1778 UINT64 AvxVnniInt8Support : 1;
1779 UINT64 AvxVnniInt16Support : 1;
1780 UINT64 Avx10_1_256Support : 1;
1781 UINT64 Avx10_1_512Support : 1;
1782 UINT64 AmxFp16Support : 1;
1783 UINT64 Reserved : 26;
1423 };1784 };
1424 UINT32 Dword[4];1785 UINT64 AsUINT64;
1425} WHV_UINT128;1786} WHV_PROCESSOR_XSAVE_FEATURES, *PWHV_PROCESSOR_XSAVE_FEATURES;
14261787
1427C_ASSERT(sizeof(WHV_UINT128) == 16);1788C_ASSERT(sizeof(WHV_PROCESSOR_XSAVE_FEATURES) == sizeof(UINT64));
14281789
1429typedef union WHV_X64_FP_REGISTER {1790typedef union WHV_PROCESSOR_PERFMON_FEATURES {
1430 __C89_NAMELESS struct {1791 __C89_NAMELESS struct {
1431 UINT64 Mantissa;1792 UINT64 PmuSupport : 1;
1432 UINT64 BiasedExponent:15;1793 UINT64 LbrSupport : 1;
1433 UINT64 Sign:1;1794 UINT64 Reserved : 62;
1434 UINT64 Reserved:48;
1435 };1795 };
1436 WHV_UINT128 AsUINT128;1796 UINT64 AsUINT64;
1437} WHV_X64_FP_REGISTER;1797} WHV_PROCESSOR_PERFMON_FEATURES, *PWHV_PROCESSOR_PERFMON_FEATURES;
14381798
1439C_ASSERT(sizeof(WHV_X64_FP_REGISTER) == 16);1799C_ASSERT(sizeof(WHV_PROCESSOR_PERFMON_FEATURES) == 8);
14401800
1441typedef union WHV_X64_FP_CONTROL_STATUS_REGISTER {1801typedef union WHV_X64_MSR_EXIT_BITMAP {
1802 UINT64 AsUINT64;
1442 __C89_NAMELESS struct {1803 __C89_NAMELESS struct {
1443 UINT16 FpControl;1804 UINT64 UnhandledMsrs : 1;
1444 UINT16 FpStatus;1805 UINT64 TscMsrWrite : 1;
1445 UINT8 FpTag;1806 UINT64 TscMsrRead : 1;
1446 UINT8 Reserved;1807 UINT64 ApicBaseMsrWrite : 1;
1447 UINT16 LastFpOp;1808 UINT64 MiscEnableMsrRead : 1;
1448 __C89_NAMELESS union {1809 UINT64 McUpdatePatchLevelMsrRead : 1;
1449 UINT64 LastFpRip;1810 UINT64 Reserved : 58;
1450 __C89_NAMELESS struct {
1451 UINT32 LastFpEip;
1452 UINT16 LastFpCs;
1453 UINT16 Reserved2;
1454 };
1455 };
1456 };1811 };
1457 WHV_UINT128 AsUINT128;1812} WHV_X64_MSR_EXIT_BITMAP;
1458} WHV_X64_FP_CONTROL_STATUS_REGISTER;
1459
1460C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16);
14611813
1462typedef union WHV_X64_XMM_CONTROL_STATUS_REGISTER {1814C_ASSERT(sizeof(WHV_X64_MSR_EXIT_BITMAP) == sizeof(UINT64));
1463 __C89_NAMELESS struct {
1464 __C89_NAMELESS union {
1465 UINT64 LastFpRdp;
1466 __C89_NAMELESS struct {
1467 UINT32 LastFpDp;
1468 UINT16 LastFpDs;
1469 UINT16 Reserved;
1470 };
1471 };
1472 UINT32 XmmStatusControl;
1473 UINT32 XmmStatusControlMask;
1474 };
1475 WHV_UINT128 AsUINT128;
1476} WHV_X64_XMM_CONTROL_STATUS_REGISTER;
14771815
1478C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16);1816#endif /* defined(__x86_64__) */
14791817
1480typedef struct WHV_X64_SEGMENT_REGISTER {1818typedef enum WHV_MAP_GPA_RANGE_FLAGS {
1481 UINT64 Base;1819 WHvMapGpaRangeFlagNone = 0x00000000,
1482 UINT32 Limit;1820 WHvMapGpaRangeFlagRead = 0x00000001,
1483 UINT16 Selector;1821 WHvMapGpaRangeFlagWrite = 0x00000002,
1484 __C89_NAMELESS union {1822 WHvMapGpaRangeFlagExecute = 0x00000004,
1485 __C89_NAMELESS struct {1823 WHvMapGpaRangeFlagTrackDirtyPages = 0x00000008
1486 UINT16 SegmentType:4;1824} WHV_MAP_GPA_RANGE_FLAGS;
1487 UINT16 NonSystemSegment:1;
1488 UINT16 DescriptorPrivilegeLevel:2;
1489 UINT16 Present:1;
1490 UINT16 Reserved:4;
1491 UINT16 Available:1;
1492 UINT16 Long:1;
1493 UINT16 Default:1;
1494 UINT16 Granularity:1;
1495 };
1496 UINT16 Attributes;
1497 };
1498} WHV_X64_SEGMENT_REGISTER;
14991825
1500C_ASSERT(sizeof(WHV_X64_SEGMENT_REGISTER) == 16);1826DEFINE_ENUM_FLAG_OPERATORS(WHV_MAP_GPA_RANGE_FLAGS);
15011827
1502typedef struct WHV_X64_TABLE_REGISTER {1828typedef enum WHV_TRANSLATE_GVA_FLAGS {
1503 UINT16 Pad[3];1829 WHvTranslateGvaFlagNone = 0x00000000,
1504 UINT16 Limit;1830 WHvTranslateGvaFlagValidateRead = 0x00000001,
1505 UINT64 Base;1831 WHvTranslateGvaFlagValidateWrite = 0x00000002,
1506} WHV_X64_TABLE_REGISTER;1832 WHvTranslateGvaFlagValidateExecute = 0x00000004
1833#if defined(__x86_64__)
1834 ,WHvTranslateGvaFlagPrivilegeExempt = 0x00000008
1835#endif
1836 ,WHvTranslateGvaFlagSetPageTableBits = 0x00000010
1837#if defined(__x86_64__)
1838 ,WHvTranslateGvaFlagEnforceSmap = 0x00000100
1839 ,WHvTranslateGvaFlagOverrideSmap = 0x00000200
1840#endif
1841} WHV_TRANSLATE_GVA_FLAGS;
15071842
1508C_ASSERT(sizeof(WHV_X64_TABLE_REGISTER) == 16);1843DEFINE_ENUM_FLAG_OPERATORS(WHV_TRANSLATE_GVA_FLAGS);
15091844
1510typedef union WHV_X64_INTERRUPT_STATE_REGISTER {1845typedef union WHV_TRANSLATE_GVA_2_FLAGS {
1511 __C89_NAMELESS struct {1846 __C89_NAMELESS struct {
1512 UINT64 InterruptShadow:1;1847 UINT64 ValidateRead : 1;
1513 UINT64 NmiMasked:1;1848 UINT64 ValidateWrite : 1;
1514 UINT64 Reserved:62;1849 UINT64 ValidateExecute : 1;
1850#if defined(__x86_64__)
1851 UINT64 PrivilegeExempt : 1;
1852#else
1853 UINT64 Reserved0 : 1;
1854#endif
1855 UINT64 SetPageTableBits : 1;
1856 UINT64 Reserved1 : 3;
1857#if defined(__x86_64__)
1858 UINT64 EnforceSmap : 1;
1859 UINT64 OverrideSmap : 1;
1860#else
1861 UINT64 Reserved2 : 1;
1862 UINT64 Reserved3 : 1;
1863#endif
1864 UINT64 Reserved4 : 46;
1865 UINT64 InputVtl : 8;
1515 };1866 };
1516 UINT64 AsUINT64;1867 UINT64 AsUINT64;
1517} WHV_X64_INTERRUPT_STATE_REGISTER;1868} WHV_TRANSLATE_GVA_2_FLAGS;
15181869
1519C_ASSERT(sizeof(WHV_X64_INTERRUPT_STATE_REGISTER) == 8);1870C_ASSERT(sizeof(WHV_TRANSLATE_GVA_2_FLAGS) == 8);
15201871
1521typedef union WHV_X64_PENDING_INTERRUPTION_REGISTER {1872typedef enum WHV_TRANSLATE_GVA_RESULT_CODE {
1522 __C89_NAMELESS struct {1873 WHvTranslateGvaResultSuccess = 0,
1523 UINT32 InterruptionPending:1;1874 WHvTranslateGvaResultPageNotPresent = 1,
1524 UINT32 InterruptionType:3;1875 WHvTranslateGvaResultPrivilegeViolation = 2,
1525 UINT32 DeliverErrorCode:1;1876 WHvTranslateGvaResultInvalidPageTableFlags = 3,
1526 UINT32 InstructionLength:4;1877 WHvTranslateGvaResultGpaUnmapped = 4,
1527 UINT32 NestedEvent:1;1878 WHvTranslateGvaResultGpaNoReadAccess = 5,
1528 UINT32 Reserved:6;1879 WHvTranslateGvaResultGpaNoWriteAccess = 6,
1529 UINT32 InterruptionVector:16;1880 WHvTranslateGvaResultGpaIllegalOverlayAccess = 7,
1530 UINT32 ErrorCode;1881 WHvTranslateGvaResultIntercept = 8
1531 };1882} WHV_TRANSLATE_GVA_RESULT_CODE;
1532 UINT64 AsUINT64;
1533} WHV_X64_PENDING_INTERRUPTION_REGISTER;
15341883
1535C_ASSERT(sizeof(WHV_X64_PENDING_INTERRUPTION_REGISTER) == sizeof(UINT64));1884typedef struct WHV_TRANSLATE_GVA_RESULT {
1885 WHV_TRANSLATE_GVA_RESULT_CODE ResultCode;
1886 UINT32 Reserved;
1887} WHV_TRANSLATE_GVA_RESULT;
15361888
1537typedef union WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER {1889C_ASSERT(sizeof(WHV_TRANSLATE_GVA_RESULT) == 8);
1890
1891#define WHV_READ_WRITE_GPA_RANGE_MAX_SIZE 16
1892
1893typedef struct WHV_MEMORY_RANGE_ENTRY {
1894 UINT64 GuestAddress;
1895 UINT64 SizeInBytes;
1896} WHV_MEMORY_RANGE_ENTRY;
1897
1898C_ASSERT(sizeof(WHV_MEMORY_RANGE_ENTRY) == 16);
1899
1900typedef union WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS {
1901 UINT32 AsUINT32;
1538 __C89_NAMELESS struct {1902 __C89_NAMELESS struct {
1539#if defined(__x86_64__)1903 UINT32 Prefetch:1;
1540 UINT64 NmiNotification:1;1904 UINT32 AvoidHardFaults:1;
1541 UINT64 InterruptNotification:1;1905 UINT32 Reserved:30;
1542 UINT64 InterruptPriority:4;
1543 UINT64 Reserved:42;
1544#elif defined(__aarch64__)
1545 UINT64 Reserved:48;
1546#endif
1547 UINT64 Sint:16;
1548 };1906 };
1549 UINT64 AsUINT64;1907} WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS;
1550} WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER, WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER;1908
1909C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS) == 4);
1910
1911typedef enum WHV_MEMORY_ACCESS_TYPE {
1912 WHvMemoryAccessRead = 0,
1913 WHvMemoryAccessWrite = 1,
1914 WHvMemoryAccessExecute = 2
1915} WHV_MEMORY_ACCESS_TYPE;
1916
1917typedef struct WHV_ADVISE_GPA_RANGE_POPULATE {
1918 WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS Flags;
1919 WHV_MEMORY_ACCESS_TYPE AccessType;
1920} WHV_ADVISE_GPA_RANGE_POPULATE;
1921
1922C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE) == 8);
1923
1924typedef union WHV_ADVISE_GPA_RANGE {
1925 WHV_ADVISE_GPA_RANGE_POPULATE Populate;
1926} WHV_ADVISE_GPA_RANGE;
15511927
1552C_ASSERT(sizeof(WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER) == sizeof(UINT64));1928C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE) == 8);
15531929
1554typedef enum WHV_X64_PENDING_EVENT_TYPE {1930typedef enum WHV_CACHE_TYPE {
1555 WHvX64PendingEventException = 0,1931 WHvCacheTypeUncached = 0,
1556 WHvX64PendingEventExtInt = 5,1932 WHvCacheTypeWriteCombining = 1,
1557 WHvX64PendingEventSvmNestedExit = 7,1933 WHvCacheTypeWriteThrough = 4,
1558 WHvX64PendingEventVmxNestedExit = 81934#ifdef __x86_64__
1559} WHV_X64_PENDING_EVENT_TYPE;1935 WHvCacheTypeWriteProtected = 5,
1936#endif
1937 WHvCacheTypeWriteBack = 6
1938} WHV_CACHE_TYPE;
15601939
1561typedef union WHV_X64_PENDING_EXCEPTION_EVENT {1940typedef union WHV_ACCESS_GPA_CONTROLS {
1941 UINT64 AsUINT64;
1562 __C89_NAMELESS struct {1942 __C89_NAMELESS struct {
1563 UINT32 EventPending : 1;1943 WHV_CACHE_TYPE CacheType;
1564 UINT32 EventType : 3;1944 WHV_INPUT_VTL InputVtl;
1565 UINT32 Reserved0 : 4;1945 UINT8 Reserved;
1566 UINT32 DeliverErrorCode : 1;1946 UINT16 Reserved1;
1567 UINT32 Reserved1 : 7;
1568 UINT32 Vector : 16;
1569 UINT32 ErrorCode;
1570 UINT64 ExceptionParameter;
1571 };1947 };
1572 WHV_UINT128 AsUINT128;1948} WHV_ACCESS_GPA_CONTROLS;
1573} WHV_X64_PENDING_EXCEPTION_EVENT;
15741949
1575C_ASSERT(sizeof(WHV_X64_PENDING_EXCEPTION_EVENT) == sizeof(WHV_UINT128));1950C_ASSERT(sizeof(WHV_ACCESS_GPA_CONTROLS) == 8);
15761951
1577typedef union WHV_X64_PENDING_EXT_INT_EVENT {1952typedef struct WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP {
1578 __C89_NAMELESS struct {1953 UINT32 IsSupported:1;
1579 UINT64 EventPending : 1;1954 UINT32 Reserved:31;
1580 UINT64 EventType : 3;1955 UINT32 HighestFrequencyMhz;
1581 UINT64 Reserved0 : 4;1956 UINT32 NominalFrequencyMhz;
1582 UINT64 Vector : 8;1957 UINT32 LowestFrequencyMhz;
1583 UINT64 Reserved1 : 48;1958 UINT32 FrequencyStepMhz;
1584 UINT64 Reserved2;1959} WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP;
1585 };
1586 WHV_UINT128 AsUINT128;
1587} WHV_X64_PENDING_EXT_INT_EVENT;
15881960
1589C_ASSERT(sizeof(WHV_X64_PENDING_EXT_INT_EVENT) == sizeof(WHV_UINT128));1961C_ASSERT(sizeof(WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP) == 20);
15901962
1591typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 {1963typedef union WHV_SCHEDULER_FEATURES {
1592 __C89_NAMELESS struct {1964 __C89_NAMELESS struct {
1593 UINT64 EventPending : 1;1965 UINT64 CpuReserve: 1;
1594 UINT64 EventType : 4;1966 UINT64 CpuCap: 1;
1595 UINT64 Reserved0 : 3;1967 UINT64 CpuWeight: 1;
1596 UINT64 InstructionBytesValid : 1;1968 UINT64 CpuGroupId: 1;
1597 UINT64 Reserved1 : 55;1969 UINT64 DisableSmt: 1;
1598 UINT64 ExitCode;1970 UINT64 Reserved: 59;
1599 };1971 };
1600 WHV_UINT128 AsUINT128;1972 UINT64 AsUINT64;
1601} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0;1973} WHV_SCHEDULER_FEATURES;
16021974
1603typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 {1975C_ASSERT(sizeof(WHV_SCHEDULER_FEATURES) == 8);
1604 __C89_NAMELESS struct {
1605 UINT64 ExitInfo1;
1606 UINT64 ExitInfo2;
1607 };
1608 WHV_UINT128 AsUINT128;
1609} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1;
16101976
1611typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 {1977typedef union WHV_CAPABILITY {
1612 __C89_NAMELESS struct {1978 WINBOOL HypervisorPresent;
1613 UINT64 NextRip;1979 WHV_CAPABILITY_FEATURES Features;
1614 UINT8 InstructionBytesFetchedCount;1980 WHV_EXTENDED_VM_EXITS ExtendedVmExits;
1615 UINT8 InstructionBytes[7];1981 WHV_PROCESSOR_VENDOR ProcessorVendor;
1616 };1982 WHV_PROCESSOR_FEATURES ProcessorFeatures;
1617 WHV_UINT128 AsUINT128;1983 WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks;
1618} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2;1984 UINT8 ProcessorClFlushSize;
1985 UINT64 ProcessorClockFrequency;
1986 WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks;
1987 WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS GpaRangePopulateFlags;
1988 WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP ProcessorFrequencyCap;
1989 WHV_SCHEDULER_FEATURES SchedulerFeatures;
1990 UINT32 PhysicalAddressWidth;
1991 UINT64 NestedFeatureRegister;
1992#if defined(__x86_64__)
1993 WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures;
1994 UINT64 InterruptClockFrequency;
1995 WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures;
1996 WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap;
1997 UINT64 ExceptionExitBitmap;
1998#elif defined (__aarch64__)
1999 UINT32 GicLpiIntIdBits;
2000 UINT32 MaxSveVectorLength;
2001#endif
2002} WHV_CAPABILITY;
16192003
1620typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 {2004#if defined(__x86_64__)
1621 __C89_NAMELESS struct {
1622 UINT8 InstructionBytes[8];
1623 UINT64 Reserved2;
1624 };
1625 WHV_UINT128 AsUINT128;
1626} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3;
16272005
1628C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0) == 16);2006typedef struct WHV_X64_CPUID_RESULT {
1629C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1) == 16);2007 UINT32 Function;
1630C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2) == 16);2008 UINT32 Reserved[3];
1631C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3) == 16);2009 UINT32 Eax;
2010 UINT32 Ebx;
2011 UINT32 Ecx;
2012 UINT32 Edx;
2013} WHV_X64_CPUID_RESULT;
16322014
1633typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 {2015C_ASSERT(sizeof(WHV_X64_CPUID_RESULT) == 32);
1634 __C89_NAMELESS struct {
1635 UINT32 EventPending : 1;
1636 UINT32 EventType : 4;
1637 UINT32 Reserved0 : 27;
1638 UINT32 ExitReason;
1639 UINT64 ExitQualification;
1640 };
1641 WHV_UINT128 AsUINT128;
1642} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0;
16432016
1644typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 {2017typedef enum WHV_X64_CPUID_RESULT2_FLAGS {
1645 __C89_NAMELESS struct {2018 WHvX64CpuidResult2FlagSubleafSpecific = 0x00000001,
1646 UINT32 InstructionLength;2019 WHvX64CpuidResult2FlagVpSpecific = 0x00000002
1647 UINT32 InstructionInfo;2020} WHV_X64_CPUID_RESULT2_FLAGS;
1648 UINT32 ExitInterruptionInfo;
1649 UINT32 ExitExceptionErrorCode;
1650 };
1651 WHV_UINT128 AsUINT128;
1652} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1;
16532021
1654typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 {2022DEFINE_ENUM_FLAG_OPERATORS(WHV_X64_CPUID_RESULT2_FLAGS);
1655 __C89_NAMELESS struct {
1656 UINT64 GuestLinearAddress;
1657 UINT64 GuestPhysicalAddress;
1658 };
1659 WHV_UINT128 AsUINT128;
1660} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2;
16612023
1662C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0) == 16);2024typedef struct WHV_CPUID_OUTPUT {
1663C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1) == 16);2025 UINT32 Eax;
1664C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2) == 16);2026 UINT32 Ebx;
2027 UINT32 Ecx;
2028 UINT32 Edx;
2029} WHV_CPUID_OUTPUT;
16652030
1666typedef union WHV_X64_NESTED_INVEPT_REGISTER {2031C_ASSERT(sizeof(WHV_CPUID_OUTPUT) == 16);
1667 __C89_NAMELESS struct {
1668 UINT8 Type;
1669 UINT8 Reserved[7];
1670 UINT64 Eptp;
1671 };
1672 WHV_UINT128 AsUINT128;
1673} WHV_X64_NESTED_INVEPT_REGISTER;
16742032
1675C_ASSERT(sizeof(WHV_X64_NESTED_INVEPT_REGISTER) == 16);2033typedef struct WHV_X64_CPUID_RESULT2 {
2034 UINT32 Function;
2035 UINT32 Index;
2036 UINT32 VpIndex;
2037 WHV_X64_CPUID_RESULT2_FLAGS Flags;
2038 WHV_CPUID_OUTPUT Output;
2039 WHV_CPUID_OUTPUT Mask;
2040} WHV_X64_CPUID_RESULT2;
16762041
1677typedef union WHV_X64_NESTED_INVVPID_REGISTER {2042C_ASSERT(sizeof(WHV_X64_CPUID_RESULT2) == 48);
1678 __C89_NAMELESS struct {
1679 UINT8 Type;
1680 UINT8 Reserved[3];
1681 UINT32 Vpid;
1682 UINT64 LinearAddress;
1683 };
1684 WHV_UINT128 AsUINT128;
1685} WHV_X64_NESTED_INVVPID_REGISTER;
16862043
1687C_ASSERT(sizeof(WHV_X64_NESTED_INVVPID_REGISTER) == 16);2044typedef struct WHV_MSR_ACTION_ENTRY {
2045 UINT32 Index;
2046 UINT8 ReadAction;
2047 UINT8 WriteAction;
2048 UINT16 Reserved;
2049} WHV_MSR_ACTION_ENTRY;
16882050
1689typedef union WHV_X64_NESTED_GUEST_STATE {2051C_ASSERT(sizeof(WHV_MSR_ACTION_ENTRY) == 8);
1690 __C89_NAMELESS struct {
1691 UINT64 NestedVirtActive : 1;
1692 UINT64 NestedGuestMode : 1;
1693 UINT64 VmEntryPending : 1;
1694 UINT64 Reserved0 : 61;
1695 UINT64 Reserved1;
1696 };
1697 WHV_UINT128 AsUINT128;
1698} WHV_X64_NESTED_GUEST_STATE;
16992052
1700C_ASSERT(sizeof(WHV_X64_NESTED_GUEST_STATE) == 16);2053typedef enum WHV_MSR_ACTION {
2054 WHvMsrActionArchitectureDefault = 0,
2055 WHvMsrActionIgnoreWriteReadZero = 1,
2056 WHvMsrActionExit = 2
2057} WHV_MSR_ACTION;
17012058
1702typedef union WHV_INTERNAL_ACTIVITY_REGISTER {2059typedef enum WHV_EXCEPTION_TYPE {
1703 __C89_NAMELESS struct {2060 WHvX64ExceptionTypeDivideErrorFault = 0x0,
1704 UINT64 StartupSuspend : 1;2061 WHvX64ExceptionTypeDebugTrapOrFault = 0x1,
1705 UINT64 HaltSuspend : 1;2062 WHvX64ExceptionTypeBreakpointTrap = 0x3,
1706 UINT64 IdleSuspend : 1;2063 WHvX64ExceptionTypeOverflowTrap = 0x4,
1707 UINT64 Reserved :61;2064 WHvX64ExceptionTypeBoundRangeFault = 0x5,
1708 };2065 WHvX64ExceptionTypeInvalidOpcodeFault = 0x6,
1709 UINT64 AsUINT64;2066 WHvX64ExceptionTypeDeviceNotAvailableFault = 0x7,
1710} WHV_INTERNAL_ACTIVITY_REGISTER;2067 WHvX64ExceptionTypeDoubleFaultAbort = 0x8,
2068 WHvX64ExceptionTypeInvalidTaskStateSegmentFault = 0x0A,
2069 WHvX64ExceptionTypeSegmentNotPresentFault = 0x0B,
2070 WHvX64ExceptionTypeStackFault = 0x0C,
2071 WHvX64ExceptionTypeGeneralProtectionFault = 0x0D,
2072 WHvX64ExceptionTypePageFault = 0x0E,
2073 WHvX64ExceptionTypeFloatingPointErrorFault = 0x10,
2074 WHvX64ExceptionTypeAlignmentCheckFault = 0x11,
2075 WHvX64ExceptionTypeMachineCheckAbort = 0x12,
2076 WHvX64ExceptionTypeSimdFloatingPointFault = 0x13,
2077 WHvX64ExceptionTypeControlProtectionFault = 0x15
2078} WHV_EXCEPTION_TYPE;
2079
2080typedef enum WHV_X64_LOCAL_APIC_EMULATION_MODE {
2081 WHvX64LocalApicEmulationModeNone,
2082 WHvX64LocalApicEmulationModeXApic,
2083 WHvX64LocalApicEmulationModeX2Apic
2084} WHV_X64_LOCAL_APIC_EMULATION_MODE;
17112085
1712C_ASSERT(sizeof(WHV_INTERNAL_ACTIVITY_REGISTER) == sizeof(UINT64));2086#elif defined(__aarch64__)
17132087
1714typedef union WHV_X64_PENDING_DEBUG_EXCEPTION {2088typedef enum WHV_ARM64_IC_EMULATION_MODE {
1715 UINT64 AsUINT64;2089 WHvArm64IcEmulationModeNone = 0,
1716 __C89_NAMELESS struct {2090 WHvArm64IcEmulationModeGicV3
1717 UINT64 Breakpoint0 : 1;2091} WHV_ARM64_IC_EMULATION_MODE;
1718 UINT64 Breakpoint1 : 1;
1719 UINT64 Breakpoint2 : 1;
1720 UINT64 Breakpoint3 : 1;
1721 UINT64 SingleStep : 1;
1722 UINT64 Reserved0 : 59;
1723 };
1724} WHV_X64_PENDING_DEBUG_EXCEPTION;
17252092
1726C_ASSERT(sizeof(WHV_X64_PENDING_DEBUG_EXCEPTION) == sizeof(UINT64));2093typedef UINT32 WHV_ARM64_INTERRUPT_VECTOR;
17272094
1728typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT {2095typedef struct WHV_ARM64_IC_GIC_V3_PARAMETERS {
1729 UINT16 DeliverableSints;2096 WHV_GUEST_PHYSICAL_ADDRESS GicdBaseAddress;
1730 UINT16 Reserved1;2097 WHV_GUEST_PHYSICAL_ADDRESS GitsTranslaterBaseAddress;
1731 UINT32 Reserved2;2098 UINT32 Reserved;
1732} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT;2099 UINT32 GicLpiIntIdBits;
2100 WHV_ARM64_INTERRUPT_VECTOR GicPpiOverflowInterruptFromCntv;
2101 WHV_ARM64_INTERRUPT_VECTOR GicPpiPerformanceMonitorsInterrupt;
2102 UINT32 Reserved1[6];
2103} WHV_ARM64_IC_GIC_V3_PARAMETERS;
17332104
1734C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 8);2105C_ASSERT(sizeof(WHV_ARM64_IC_GIC_V3_PARAMETERS) == 56);
17352106
1736typedef union WHV_REGISTER_VALUE {2107typedef struct WHV_ARM64_IC_PARAMETERS {
1737 WHV_UINT128 Reg128;2108 WHV_ARM64_IC_EMULATION_MODE EmulationMode;
1738 UINT64 Reg64;2109 UINT32 Reserved;
1739 UINT32 Reg32;2110 __C89_NAMELESS union {
1740 UINT16 Reg16;2111 WHV_ARM64_IC_GIC_V3_PARAMETERS GicV3Parameters;
1741 UINT8 Reg8;2112 };
1742 WHV_INTERNAL_ACTIVITY_REGISTER InternalActivity;2113} WHV_ARM64_IC_PARAMETERS;
1743 WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER DeliverabilityNotifications;2114
2115C_ASSERT(sizeof(WHV_ARM64_IC_PARAMETERS) == 64);
2116
2117#endif /* defined(__x86_64__) || defined(__aarch64__) */
2118
2119typedef union WHV_PARTITION_PROPERTY {
2120 WHV_EXTENDED_VM_EXITS ExtendedVmExits;
2121 WHV_PROCESSOR_FEATURES ProcessorFeatures;
2122 WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks;
2123 UINT8 ProcessorClFlushSize;
2124 UINT32 ProcessorCount;
2125 WINBOOL SeparateSecurityDomain;
2126 WINBOOL NestedVirtualization;
2127 UINT64 ProcessorClockFrequency;
2128 WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks;
2129 UINT64 ReferenceTime;
2130 USHORT PrimaryNumaNode;
2131 UINT32 CpuReserve;
2132 UINT32 CpuCap;
2133 UINT32 CpuWeight;
2134 UINT64 CpuGroupId;
2135 UINT32 ProcessorFrequencyCap;
2136 WINBOOL AllowDeviceAssignment;
2137 WINBOOL DisableSmt;
2138 UINT32 PhysicalAddressWidth;
1744#if defined(__x86_64__)2139#if defined(__x86_64__)
1745 WHV_X64_FP_REGISTER Fp;2140 WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures;
1746 WHV_X64_FP_CONTROL_STATUS_REGISTER FpControlStatus;2141 UINT32 CpuidExitList[1];
1747 WHV_X64_XMM_CONTROL_STATUS_REGISTER XmmControlStatus;2142 UINT64 ExceptionExitBitmap;
1748 WHV_X64_SEGMENT_REGISTER Segment;2143 WINBOOL ApicRemoteRead;
1749 WHV_X64_TABLE_REGISTER Table;2144 WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap;
1750 WHV_X64_INTERRUPT_STATE_REGISTER InterruptState;2145 WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures;
1751 WHV_X64_PENDING_INTERRUPTION_REGISTER PendingInterruption;2146 UINT64 InterruptClockFrequency;
1752 WHV_X64_PENDING_EXCEPTION_EVENT ExceptionEvent;2147 WHV_X64_CPUID_RESULT CpuidResultList[1];
1753 WHV_X64_PENDING_EXT_INT_EVENT ExtIntEvent;2148 WHV_X64_CPUID_RESULT2 CpuidResultList2[1];
1754 WHV_X64_PENDING_DEBUG_EXCEPTION PendingDebugException;2149 WHV_MSR_ACTION_ENTRY MsrActionList[1];
1755 WHV_X64_NESTED_GUEST_STATE NestedState;2150 WHV_MSR_ACTION UnimplementedMsrAction;
1756 WHV_X64_NESTED_INVEPT_REGISTER InvEpt;2151 WHV_X64_LOCAL_APIC_EMULATION_MODE LocalApicEmulationMode;
1757 WHV_X64_NESTED_INVVPID_REGISTER InvVpid;2152#elif defined(__aarch64__)
1758 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 SvmNestedExit0;2153 WHV_ARM64_IC_PARAMETERS Arm64IcParameters;
1759 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 SvmNestedExit1;
1760 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 SvmNestedExit2;
1761 WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 SvmNestedExit3;
1762 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 VmxNestedExit0;
1763 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 VmxNestedExit1;
1764 WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 VmxNestedExit2;
1765#endif2154#endif
1766} WHV_REGISTER_VALUE;2155} WHV_PARTITION_PROPERTY;
17672156
1768C_ASSERT(sizeof(WHV_REGISTER_VALUE) == 16);2157#if defined(__x86_64__)
17692158
1770typedef enum WHV_RUN_VP_EXIT_REASON {2159typedef enum WHV_RUN_VP_EXIT_REASON {
1771 WHvRunVpExitReasonNone = 0x00000000,2160 WHvRunVpExitReasonNone = 0x00000000,
...@@ -1789,6 +2178,26 @@ typedef enum WHV_RUN_VP_EXIT_REASON {...@@ -1789,6 +2178,26 @@ typedef enum WHV_RUN_VP_EXIT_REASON {
1789 WHvRunVpExitReasonCanceled = 0x000020012178 WHvRunVpExitReasonCanceled = 0x00002001
1790} WHV_RUN_VP_EXIT_REASON;2179} WHV_RUN_VP_EXIT_REASON;
17912180
2181#elif defined(__aarch64__)
2182
2183typedef enum WHV_RUN_VP_EXIT_REASON {
2184 WHvRunVpExitReasonNone = 0x00000000,
2185 WHvRunVpExitReasonUnmappedGpa = 0x80000000,
2186 WHvRunVpExitReasonGpaIntercept = 0x80000001,
2187 WHvRunVpExitReasonUnrecoverableException = 0x80000021,
2188 WHvRunVpExitReasonInvalidVpRegisterValue = 0x80000020,
2189 WHvRunVpExitReasonUnsupportedFeature = 0x80000022,
2190 WHvRunVpExitReasonSynicSintDeliverable = 0x80000062,
2191 WHvMessageTypeRegisterIntercept = 0x80010006,
2192 WHvRunVpExitReasonArm64Reset = 0x8001000c,
2193 WHvRunVpExitReasonHypercall = 0x80000050,
2194 WHvRunVpExitReasonCanceled = 0xFFFFFFFF
2195} WHV_RUN_VP_EXIT_REASON;
2196
2197#endif /* defined(__x86_64__) || defined(__aarch64__) */
2198
2199#if defined(__x86_64__)
2200
1792typedef union WHV_X64_VP_EXECUTION_STATE {2201typedef union WHV_X64_VP_EXECUTION_STATE {
1793 __C89_NAMELESS struct {2202 __C89_NAMELESS struct {
1794 UINT16 Cpl : 2;2203 UINT16 Cpl : 2;
...@@ -1806,7 +2215,7 @@ typedef union WHV_X64_VP_EXECUTION_STATE {...@@ -1806,7 +2215,7 @@ typedef union WHV_X64_VP_EXECUTION_STATE {
18062215
1807C_ASSERT(sizeof(WHV_X64_VP_EXECUTION_STATE) == sizeof(UINT16));2216C_ASSERT(sizeof(WHV_X64_VP_EXECUTION_STATE) == sizeof(UINT16));
18082217
1809typedef struct WHV_VP_EXIT_CONTEXT {2218typedef struct WHV_X64_VP_EXIT_CONTEXT {
1810 WHV_X64_VP_EXECUTION_STATE ExecutionState;2219 WHV_X64_VP_EXECUTION_STATE ExecutionState;
1811 UINT8 InstructionLength : 4;2220 UINT8 InstructionLength : 4;
1812 UINT8 Cr8 : 4;2221 UINT8 Cr8 : 4;
...@@ -1815,9 +2224,17 @@ typedef struct WHV_VP_EXIT_CONTEXT {...@@ -1815,9 +2224,17 @@ typedef struct WHV_VP_EXIT_CONTEXT {
1815 WHV_X64_SEGMENT_REGISTER Cs;2224 WHV_X64_SEGMENT_REGISTER Cs;
1816 UINT64 Rip;2225 UINT64 Rip;
1817 UINT64 Rflags;2226 UINT64 Rflags;
1818} WHV_VP_EXIT_CONTEXT;2227} WHV_X64_VP_EXIT_CONTEXT, WHV_VP_EXIT_CONTEXT;
2228
2229C_ASSERT(sizeof(WHV_X64_VP_EXIT_CONTEXT) == 40);
2230
2231typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT {
2232 UINT16 DeliverableSints;
2233 UINT16 Reserved1;
2234 UINT32 Reserved2;
2235} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT;
18192236
1820C_ASSERT(sizeof(WHV_VP_EXIT_CONTEXT) == 40);2237C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 8);
18212238
1822typedef union WHV_MEMORY_ACCESS_INFO {2239typedef union WHV_MEMORY_ACCESS_INFO {
1823 __C89_NAMELESS struct {2240 __C89_NAMELESS struct {
...@@ -1853,7 +2270,7 @@ typedef union WHV_X64_IO_PORT_ACCESS_INFO {...@@ -1853,7 +2270,7 @@ typedef union WHV_X64_IO_PORT_ACCESS_INFO {
1853 UINT32 AsUINT32;2270 UINT32 AsUINT32;
1854} WHV_X64_IO_PORT_ACCESS_INFO;2271} WHV_X64_IO_PORT_ACCESS_INFO;
18552272
1856C_ASSERT(sizeof(WHV_X64_IO_PORT_ACCESS_INFO) == sizeof(UINT32));2273C_ASSERT(sizeof(WHV_X64_IO_PORT_ACCESS_INFO) == 4);
18572274
1858typedef struct WHV_X64_IO_PORT_ACCESS_CONTEXT {2275typedef struct WHV_X64_IO_PORT_ACCESS_CONTEXT {
1859 UINT8 InstructionByteCount;2276 UINT8 InstructionByteCount;
...@@ -1913,7 +2330,7 @@ typedef union WHV_VP_EXCEPTION_INFO {...@@ -1913,7 +2330,7 @@ typedef union WHV_VP_EXCEPTION_INFO {
1913 UINT32 AsUINT32;2330 UINT32 AsUINT32;
1914} WHV_VP_EXCEPTION_INFO;2331} WHV_VP_EXCEPTION_INFO;
19152332
1916C_ASSERT(sizeof(WHV_VP_EXCEPTION_INFO) == sizeof(UINT32));2333C_ASSERT(sizeof(WHV_VP_EXCEPTION_INFO) == 4);
19172334
1918typedef struct WHV_VP_EXCEPTION_CONTEXT {2335typedef struct WHV_VP_EXCEPTION_CONTEXT {
1919 UINT8 InstructionByteCount;2336 UINT8 InstructionByteCount;
...@@ -1941,16 +2358,128 @@ typedef struct WHV_X64_UNSUPPORTED_FEATURE_CONTEXT {...@@ -1941,16 +2358,128 @@ typedef struct WHV_X64_UNSUPPORTED_FEATURE_CONTEXT {
19412358
1942C_ASSERT(sizeof(WHV_X64_UNSUPPORTED_FEATURE_CONTEXT) == 16);2359C_ASSERT(sizeof(WHV_X64_UNSUPPORTED_FEATURE_CONTEXT) == 16);
19432360
2361#elif defined(__aarch64__)
2362
2363typedef union WHV_VP_EXECUTION_STATE {
2364 UINT16 AsUINT16;
2365 __C89_NAMELESS struct {
2366 UINT16 Cpl : 2;
2367 UINT16 DebugActive : 1;
2368 UINT16 InterruptionPending : 1;
2369 UINT16 Vtl : 4;
2370 UINT16 VirtualizationFaultActive : 1;
2371 UINT16 Reserved : 7;
2372 };
2373} WHV_VP_EXECUTION_STATE;
2374
2375C_ASSERT(sizeof(WHV_VP_EXECUTION_STATE) == 2);
2376
2377typedef struct WHV_INTERCEPT_MESSAGE_HEADER {
2378 UINT32 VpIndex;
2379 UINT8 InstructionLength;
2380 UINT8 InterceptAccessType;
2381 WHV_VP_EXECUTION_STATE ExecutionState;
2382 UINT64 Pc;
2383 UINT64 Cpsr;
2384} WHV_INTERCEPT_MESSAGE_HEADER;
2385
2386C_ASSERT(sizeof(WHV_INTERCEPT_MESSAGE_HEADER) == 24);
2387
2388typedef union WHV_MEMORY_ACCESS_INFO {
2389 UINT8 AsUINT8;
2390 __C89_NAMELESS struct {
2391 UINT8 GvaValid : 1;
2392 UINT8 GvaGpaValid : 1;
2393 UINT8 HypercallOutputPending : 1;
2394 UINT8 Reserved : 5;
2395 };
2396} WHV_MEMORY_ACCESS_INFO;
2397
2398typedef struct WHV_MEMORY_ACCESS_CONTEXT {
2399 WHV_INTERCEPT_MESSAGE_HEADER Header;
2400 UINT32 Reserved0;
2401 UINT8 InstructionByteCount;
2402 WHV_MEMORY_ACCESS_INFO AccessInfo;
2403 UINT16 Reserved1;
2404 UINT8 InstructionBytes[4];
2405 UINT32 Reserved2;
2406 UINT64 Gva;
2407 UINT64 Gpa;
2408 UINT64 Syndrome;
2409} WHV_MEMORY_ACCESS_CONTEXT;
2410
2411C_ASSERT(sizeof(WHV_MEMORY_ACCESS_CONTEXT) == 64);
2412
2413typedef struct WHV_UNRECOVERABLE_EXCEPTION_CONTEXT {
2414 WHV_INTERCEPT_MESSAGE_HEADER Header;
2415} WHV_UNRECOVERABLE_EXCEPTION_CONTEXT;
2416
2417C_ASSERT(sizeof(WHV_UNRECOVERABLE_EXCEPTION_CONTEXT) == 24);
2418
2419typedef struct WHV_INVALID_VP_REGISTER_CONTEXT {
2420 UINT32 VpIndex;
2421 UINT32 Reserved;
2422} WHV_INVALID_VP_REGISTER_CONTEXT;
2423
2424C_ASSERT(sizeof(WHV_INVALID_VP_REGISTER_CONTEXT) == 8);
2425
2426typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT {
2427 WHV_INTERCEPT_MESSAGE_HEADER Header;
2428 UINT16 DeliverableSints;
2429 UINT16 Reserved1;
2430 UINT32 Reserved2;
2431} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT;
2432
2433C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 32);
2434
2435typedef union WHV_REGISTER_ACCESS_INFO {
2436 WHV_REGISTER_VALUE SourceValue;
2437 WHV_REGISTER_NAME DestinationRegister;
2438} WHV_REGISTER_ACCESS_INFO;
2439
2440typedef struct WHV_REGISTER_CONTEXT {
2441 WHV_INTERCEPT_MESSAGE_HEADER Header;
2442 __C89_NAMELESS struct {
2443 UINT8 IsMemoryOp:1;
2444 UINT8 Reserved:7;
2445 };
2446 UINT8 Reserved8;
2447 UINT16 Reserved16;
2448 WHV_REGISTER_NAME RegisterName;
2449 WHV_REGISTER_ACCESS_INFO AccessInfo;
2450} WHV_REGISTER_CONTEXT;
2451
2452C_ASSERT(sizeof(WHV_REGISTER_CONTEXT) == 48);
2453
2454typedef enum WHV_ARM64_RESET_TYPE {
2455 WHvArm64ResetTypePowerOff = 0,
2456 WHvArm64ResetTypeReboot
2457} WHV_ARM64_RESET_TYPE;
2458
2459typedef struct WHV_ARM64_RESET_CONTEXT {
2460 WHV_INTERCEPT_MESSAGE_HEADER Header;
2461 WHV_ARM64_RESET_TYPE ResetType;
2462 UINT32 Reserved;
2463} WHV_ARM64_RESET_CONTEXT;
2464
2465C_ASSERT(sizeof(WHV_ARM64_RESET_CONTEXT) == 32);
2466
2467#endif /* defined(__x86_64__) || defined(__aarch64__) */
2468
1944typedef enum WHV_RUN_VP_CANCEL_REASON {2469typedef enum WHV_RUN_VP_CANCEL_REASON {
1945 WhvRunVpCancelReasonUser = 02470 WHvRunVpCancelReasonUser = 0
1946} WHV_RUN_VP_CANCEL_REASON;2471} WHV_RUN_VP_CANCEL_REASON;
19472472
2473#define WhvRunVpCancelReasonUser WHvRunVpCancelReasonUser
2474
1948typedef struct WHV_RUN_VP_CANCELED_CONTEXT {2475typedef struct WHV_RUN_VP_CANCELED_CONTEXT {
1949 WHV_RUN_VP_CANCEL_REASON CancelReason;2476 WHV_RUN_VP_CANCEL_REASON CancelReason;
1950} WHV_RUN_VP_CANCELED_CONTEXT;2477} WHV_RUN_VP_CANCELED_CONTEXT;
19512478
1952C_ASSERT(sizeof(WHV_RUN_VP_CANCELED_CONTEXT) == 4);2479C_ASSERT(sizeof(WHV_RUN_VP_CANCELED_CONTEXT) == 4);
19532480
2481#if defined(__x86_64__)
2482
1954typedef enum WHV_X64_PENDING_INTERRUPTION_TYPE {2483typedef enum WHV_X64_PENDING_INTERRUPTION_TYPE {
1955 WHvX64PendingInterrupt = 0,2484 WHvX64PendingInterrupt = 0,
1956 WHvX64PendingNmi = 2,2485 WHvX64PendingNmi = 2,
...@@ -1995,9 +2524,13 @@ typedef struct WHV_X64_APIC_SMI_CONTEXT {...@@ -1995,9 +2524,13 @@ typedef struct WHV_X64_APIC_SMI_CONTEXT {
19952524
1996C_ASSERT(sizeof(WHV_X64_APIC_SMI_CONTEXT) == 8);2525C_ASSERT(sizeof(WHV_X64_APIC_SMI_CONTEXT) == 8);
19972526
2527#endif /* defined(__x86_64__) */
2528
2529#if defined(__x86_64__)
2530
1998#define WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS 62531#define WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS 6
19992532
2000typedef struct _WHV_HYPERCALL_CONTEXT {2533typedef struct WHV_X64_HYPERCALL_CONTEXT {
2001 UINT64 Rax;2534 UINT64 Rax;
2002 UINT64 Rbx;2535 UINT64 Rbx;
2003 UINT64 Rcx;2536 UINT64 Rcx;
...@@ -2008,10 +2541,24 @@ typedef struct _WHV_HYPERCALL_CONTEXT {...@@ -2008,10 +2541,24 @@ typedef struct _WHV_HYPERCALL_CONTEXT {
2008 UINT64 Reserved0;2541 UINT64 Reserved0;
2009 WHV_UINT128 XmmRegisters[WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS];2542 WHV_UINT128 XmmRegisters[WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS];
2010 UINT64 Reserved1[2];2543 UINT64 Reserved1[2];
2011} WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT;2544} WHV_X64_HYPERCALL_CONTEXT, WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT;
20122545
2013C_ASSERT(sizeof(WHV_HYPERCALL_CONTEXT) == 176);2546C_ASSERT(sizeof(WHV_HYPERCALL_CONTEXT) == 176);
20142547
2548#elif defined(__aarch64__)
2549
2550typedef struct WHV_ARM64_HYPERCALL_CONTEXT {
2551 WHV_INTERCEPT_MESSAGE_HEADER Header;
2552 UINT16 Immediate;
2553 UINT16 Reserved1;
2554 UINT32 Reserved2;
2555 UINT64 X[18];
2556} WHV_ARM64_HYPERCALL_CONTEXT, WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT;
2557
2558#endif /* defined(__x86_64__) || defined(__aarch64__) */
2559
2560#if defined(__x86_64__)
2561
2015typedef struct WHV_X64_APIC_INIT_SIPI_CONTEXT {2562typedef struct WHV_X64_APIC_INIT_SIPI_CONTEXT {
2016 UINT64 ApicIcr;2563 UINT64 ApicIcr;
2017} WHV_X64_APIC_INIT_SIPI_CONTEXT;2564} WHV_X64_APIC_INIT_SIPI_CONTEXT;
...@@ -2034,30 +2581,51 @@ typedef struct WHV_X64_APIC_WRITE_CONTEXT {...@@ -2034,30 +2581,51 @@ typedef struct WHV_X64_APIC_WRITE_CONTEXT {
20342581
2035C_ASSERT(sizeof(WHV_X64_APIC_WRITE_CONTEXT) == 16);2582C_ASSERT(sizeof(WHV_X64_APIC_WRITE_CONTEXT) == 16);
20362583
2584#endif /* defined(__x86_64__) */
2585
2037typedef struct WHV_RUN_VP_EXIT_CONTEXT {2586typedef struct WHV_RUN_VP_EXIT_CONTEXT {
2038 WHV_RUN_VP_EXIT_REASON ExitReason;2587 WHV_RUN_VP_EXIT_REASON ExitReason;
2039 UINT32 Reserved;2588 UINT32 Reserved;
2589#if defined(__x86_64__)
2040 WHV_VP_EXIT_CONTEXT VpContext;2590 WHV_VP_EXIT_CONTEXT VpContext;
2591#elif defined(__aarch64__)
2592 UINT64 Reserved1;
2593#endif
2041 __C89_NAMELESS union {2594 __C89_NAMELESS union {
2042 WHV_MEMORY_ACCESS_CONTEXT MemoryAccess;2595 WHV_MEMORY_ACCESS_CONTEXT MemoryAccess;
2596 WHV_RUN_VP_CANCELED_CONTEXT CancelReason;
2597 WHV_HYPERCALL_CONTEXT Hypercall;
2598 WHV_SYNIC_SINT_DELIVERABLE_CONTEXT SynicSintDeliverable;
2599#if defined(__x86_64__)
2043 WHV_X64_IO_PORT_ACCESS_CONTEXT IoPortAccess;2600 WHV_X64_IO_PORT_ACCESS_CONTEXT IoPortAccess;
2044 WHV_X64_MSR_ACCESS_CONTEXT MsrAccess;2601 WHV_X64_MSR_ACCESS_CONTEXT MsrAccess;
2045 WHV_X64_CPUID_ACCESS_CONTEXT CpuidAccess;2602 WHV_X64_CPUID_ACCESS_CONTEXT CpuidAccess;
2046 WHV_VP_EXCEPTION_CONTEXT VpException;2603 WHV_VP_EXCEPTION_CONTEXT VpException;
2047 WHV_X64_INTERRUPTION_DELIVERABLE_CONTEXT InterruptWindow;2604 WHV_X64_INTERRUPTION_DELIVERABLE_CONTEXT InterruptWindow;
2048 WHV_X64_UNSUPPORTED_FEATURE_CONTEXT UnsupportedFeature;2605 WHV_X64_UNSUPPORTED_FEATURE_CONTEXT UnsupportedFeature;
2049 WHV_RUN_VP_CANCELED_CONTEXT CancelReason;
2050 WHV_X64_APIC_EOI_CONTEXT ApicEoi;2606 WHV_X64_APIC_EOI_CONTEXT ApicEoi;
2051 WHV_X64_RDTSC_CONTEXT ReadTsc;2607 WHV_X64_RDTSC_CONTEXT ReadTsc;
2052 WHV_X64_APIC_SMI_CONTEXT ApicSmi;2608 WHV_X64_APIC_SMI_CONTEXT ApicSmi;
2053 WHV_HYPERCALL_CONTEXT Hypercall;
2054 WHV_X64_APIC_INIT_SIPI_CONTEXT ApicInitSipi;2609 WHV_X64_APIC_INIT_SIPI_CONTEXT ApicInitSipi;
2055 WHV_X64_APIC_WRITE_CONTEXT ApicWrite;2610 WHV_X64_APIC_WRITE_CONTEXT ApicWrite;
2056 WHV_SYNIC_SINT_DELIVERABLE_CONTEXT SynicSintDeliverable;2611 UINT64 AsUINT64[22];
2612#elif defined(__aarch64__)
2613 WHV_UNRECOVERABLE_EXCEPTION_CONTEXT UnrecoverableException;
2614 WHV_INVALID_VP_REGISTER_CONTEXT InvalidVpRegister;
2615 WHV_REGISTER_CONTEXT Register;
2616 WHV_ARM64_RESET_CONTEXT Arm64Reset;
2617 UINT64 AsUINT64[32];
2618#endif
2057 };2619 };
2058} WHV_RUN_VP_EXIT_CONTEXT;2620} WHV_RUN_VP_EXIT_CONTEXT;
20592621
2622#if defined(__x86_64__)
2060C_ASSERT(sizeof(WHV_RUN_VP_EXIT_CONTEXT) == 224);2623C_ASSERT(sizeof(WHV_RUN_VP_EXIT_CONTEXT) == 224);
2624#elif defined(__aarch64__)
2625C_ASSERT(sizeof(WHV_RUN_VP_EXIT_CONTEXT) == 272);
2626#endif
2627
2628#if defined(__x86_64__)
20612629
2062typedef enum WHV_INTERRUPT_TYPE {2630typedef enum WHV_INTERRUPT_TYPE {
2063 WHvX64InterruptTypeFixed = 0,2631 WHvX64InterruptTypeFixed = 0,
...@@ -2082,13 +2650,48 @@ typedef struct WHV_INTERRUPT_CONTROL {...@@ -2082,13 +2650,48 @@ typedef struct WHV_INTERRUPT_CONTROL {
2082 UINT64 Type : 8;2650 UINT64 Type : 8;
2083 UINT64 DestinationMode : 4;2651 UINT64 DestinationMode : 4;
2084 UINT64 TriggerMode : 4;2652 UINT64 TriggerMode : 4;
2085 UINT64 Reserved : 48;2653 UINT64 TargetVtl : 8;
2654 UINT64 Reserved : 40;
2086 UINT32 Destination;2655 UINT32 Destination;
2087 UINT32 Vector;2656 UINT32 Vector;
2088} WHV_INTERRUPT_CONTROL;2657} WHV_INTERRUPT_CONTROL;
20892658
2090C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL) == 16);2659C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL) == 16);
20912660
2661#elif defined(__aarch64__)
2662
2663typedef enum WHV_INTERRUPT_TYPE {
2664 WHvArm64InterruptTypeFixed = 0x0000,
2665 WHvArm64InterruptTypeMaximum = 0x0008
2666} WHV_INTERRUPT_TYPE;
2667
2668typedef union WHV_INTERRUPT_CONTROL2 {
2669 UINT64 AsUINT64;
2670 __C89_NAMELESS struct {
2671 WHV_INTERRUPT_TYPE InterruptType;
2672 UINT32 Reserved1 : 2;
2673 UINT32 Asserted : 1;
2674 UINT32 Retarget : 1;
2675 UINT32 Reserved2 : 28;
2676 };
2677} WHV_INTERRUPT_CONTROL2;
2678
2679C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL2) == 8);
2680
2681typedef struct WHV_INTERRUPT_CONTROL {
2682 UINT64 TargetPartition;
2683 WHV_INTERRUPT_CONTROL2 InterruptControl;
2684 UINT64 DestinationAddress;
2685 UINT32 RequestedVector;
2686 UINT8 TargetVtl;
2687 UINT8 ReservedZ0;
2688 UINT16 ReservedZ1;
2689} WHV_INTERRUPT_CONTROL;
2690
2691C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL) == 32);
2692
2693#endif /* defined(__x86_64__) || defined(__aarch64__) */
2694
2092typedef struct WHV_DOORBELL_MATCH_DATA {2695typedef struct WHV_DOORBELL_MATCH_DATA {
2093 WHV_GUEST_PHYSICAL_ADDRESS GuestAddress;2696 WHV_GUEST_PHYSICAL_ADDRESS GuestAddress;
2094 UINT64 Value;2697 UINT64 Value;
...@@ -2113,11 +2716,13 @@ typedef struct WHV_PARTITION_MEMORY_COUNTERS {...@@ -2113,11 +2716,13 @@ typedef struct WHV_PARTITION_MEMORY_COUNTERS {
2113C_ASSERT(sizeof(WHV_PARTITION_MEMORY_COUNTERS) == 24);2716C_ASSERT(sizeof(WHV_PARTITION_MEMORY_COUNTERS) == 24);
21142717
2115typedef enum WHV_PROCESSOR_COUNTER_SET {2718typedef enum WHV_PROCESSOR_COUNTER_SET {
2116 WHvProcessorCounterSetRuntime,2719 WHvProcessorCounterSetRuntime = 0,
2117 WHvProcessorCounterSetIntercepts,2720 WHvProcessorCounterSetIntercepts = 1,
2118 WHvProcessorCounterSetEvents,2721 WHvProcessorCounterSetEvents = 2,
2119 WHvProcessorCounterSetApic,2722#if defined(__x86_64__)
2120 WHvProcessorCounterSetSyntheticFeatures2723 WHvProcessorCounterSetApic = 3,
2724#endif
2725 WHvProcessorCounterSetSyntheticFeatures = 4
2121} WHV_PROCESSOR_COUNTER_SET;2726} WHV_PROCESSOR_COUNTER_SET;
21222727
2123typedef struct WHV_PROCESSOR_RUNTIME_COUNTERS {2728typedef struct WHV_PROCESSOR_RUNTIME_COUNTERS {
...@@ -2135,6 +2740,7 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTER {...@@ -2135,6 +2740,7 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTER {
2135C_ASSERT(sizeof(WHV_PROCESSOR_INTERCEPT_COUNTER) == 16);2740C_ASSERT(sizeof(WHV_PROCESSOR_INTERCEPT_COUNTER) == 16);
21362741
2137typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS {2742typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS {
2743#if defined(__x86_64__)
2138 WHV_PROCESSOR_INTERCEPT_COUNTER PageInvalidations;2744 WHV_PROCESSOR_INTERCEPT_COUNTER PageInvalidations;
2139 WHV_PROCESSOR_INTERCEPT_COUNTER ControlRegisterAccesses;2745 WHV_PROCESSOR_INTERCEPT_COUNTER ControlRegisterAccesses;
2140 WHV_PROCESSOR_INTERCEPT_COUNTER IoInstructions;2746 WHV_PROCESSOR_INTERCEPT_COUNTER IoInstructions;
...@@ -2149,6 +2755,13 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS {...@@ -2149,6 +2755,13 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS {
2149 WHV_PROCESSOR_INTERCEPT_COUNTER NestedPageFaultIntercepts;2755 WHV_PROCESSOR_INTERCEPT_COUNTER NestedPageFaultIntercepts;
2150 WHV_PROCESSOR_INTERCEPT_COUNTER Hypercalls;2756 WHV_PROCESSOR_INTERCEPT_COUNTER Hypercalls;
2151 WHV_PROCESSOR_INTERCEPT_COUNTER RdpmcInstructions;2757 WHV_PROCESSOR_INTERCEPT_COUNTER RdpmcInstructions;
2758#elif defined(__aarch64__)
2759 WHV_PROCESSOR_INTERCEPT_COUNTER OtherIntercepts;
2760 WHV_PROCESSOR_INTERCEPT_COUNTER PendingInterrupts;
2761 WHV_PROCESSOR_INTERCEPT_COUNTER NestedPageFaultIntercepts;
2762 WHV_PROCESSOR_INTERCEPT_COUNTER Hypercalls;
2763 WHV_PROCESSOR_INTERCEPT_COUNTER Reserved[10];
2764#endif /* defined(__x86_64__) || defined(__aarch64__) */
2152} WHV_PROCESSOR_ACTIVITY_COUNTERS;2765} WHV_PROCESSOR_ACTIVITY_COUNTERS;
21532766
2154C_ASSERT(sizeof(WHV_PROCESSOR_ACTIVITY_COUNTERS) == 224);2767C_ASSERT(sizeof(WHV_PROCESSOR_ACTIVITY_COUNTERS) == 224);
...@@ -2161,6 +2774,8 @@ typedef struct WHV_PROCESSOR_EVENT_COUNTERS {...@@ -2161,6 +2774,8 @@ typedef struct WHV_PROCESSOR_EVENT_COUNTERS {
21612774
2162C_ASSERT(sizeof(WHV_PROCESSOR_GUEST_EVENT_COUNTERS) == 24);2775C_ASSERT(sizeof(WHV_PROCESSOR_GUEST_EVENT_COUNTERS) == 24);
21632776
2777#if defined(__x86_64__)
2778
2164typedef struct WHV_PROCESSOR_APIC_COUNTERS {2779typedef struct WHV_PROCESSOR_APIC_COUNTERS {
2165 UINT64 MmioAccessCount;2780 UINT64 MmioAccessCount;
2166 UINT64 EoiAccessCount;2781 UINT64 EoiAccessCount;
...@@ -2171,6 +2786,8 @@ typedef struct WHV_PROCESSOR_APIC_COUNTERS {...@@ -2171,6 +2786,8 @@ typedef struct WHV_PROCESSOR_APIC_COUNTERS {
21712786
2172C_ASSERT(sizeof(WHV_PROCESSOR_APIC_COUNTERS) == 40);2787C_ASSERT(sizeof(WHV_PROCESSOR_APIC_COUNTERS) == 40);
21732788
2789#endif /* defined(__x86_64__) */
2790
2174typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS {2791typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS {
2175 UINT64 SyntheticInterruptsCount;2792 UINT64 SyntheticInterruptsCount;
2176 UINT64 LongSpinWaitHypercallsCount;2793 UINT64 LongSpinWaitHypercallsCount;
...@@ -2182,24 +2799,216 @@ typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS {...@@ -2182,24 +2799,216 @@ typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS {
21822799
2183C_ASSERT(sizeof(WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS) == 48);2800C_ASSERT(sizeof(WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS) == 48);
21842801
2802typedef union WHV_VTL_PERMISSION_SET {
2803 UINT32 AsUINT32;
2804 __C89_NAMELESS struct {
2805 UINT16 VtlPermissionFrom1[2];
2806 };
2807} WHV_VTL_PERMISSION_SET;
2808
2185typedef enum WHV_ADVISE_GPA_RANGE_CODE {2809typedef enum WHV_ADVISE_GPA_RANGE_CODE {
2186 WHvAdviseGpaRangeCodePopulate = 0x00000000,2810 WHvAdviseGpaRangeCodePopulate = 0x00000000,
2187 WHvAdviseGpaRangeCodePin = 0x00000001,2811 WHvAdviseGpaRangeCodePin = 0x00000001,
2188 WHvAdviseGpaRangeCodeUnpin = 0x000000022812 WHvAdviseGpaRangeCodeUnpin = 0x00000002
2189} WHV_ADVISE_GPA_RANGE_CODE;2813} WHV_ADVISE_GPA_RANGE_CODE;
21902814
2815#if defined(__x86_64__)
2816
2191typedef enum WHV_VIRTUAL_PROCESSOR_STATE_TYPE {2817typedef enum WHV_VIRTUAL_PROCESSOR_STATE_TYPE {
2192 WHvVirtualProcessorStateTypeSynicMessagePage = 0x00000000,2818 WHvVirtualProcessorStateTypeSynicMessagePage = 0x00000000,
2193 WHvVirtualProcessorStateTypeSynicEventFlagPage = 0x00000001,2819 WHvVirtualProcessorStateTypeSynicEventFlagPage = 0x00000001,
2194 WHvVirtualProcessorStateTypeSynicTimerState = 0x00000002,2820 WHvVirtualProcessorStateTypeSynicTimerState = 0x00000002,
2195 WHvVirtualProcessorStateTypeInterruptControllerState2 = 0x00001000,2821 WHvVirtualProcessorStateTypeInterruptControllerState2 = 0x00001000,
2196 WHvVirtualProcessorStateTypeXsaveState = 0x000010012822 WHvVirtualProcessorStateTypeXsaveState = 0x00001001,
2823 WHvVirtualProcessorStateTypeNestedState = 0x00001002
2824} WHV_VIRTUAL_PROCESSOR_STATE_TYPE;
2825
2826#elif defined(__aarch64__)
2827
2828#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN (1U << 31)
2829#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP (1U << 30)
2830
2831typedef enum WHV_VIRTUAL_PROCESSOR_STATE_TYPE {
2832 WHvVirtualProcessorStateTypeInterruptControllerState = 0x00000000 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN,
2833 WHvVirtualProcessorStateTypeSynicMessagePage = 0x00000002 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN,
2834 WHvVirtualProcessorStateTypeSynicEventFlagPage = 0x00000003 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN,
2835 WHvVirtualProcessorStateTypeSynicTimerState = 0x00000004,
2836 WHvVirtualProcessorStateTypeGlobalInterruptState = 0x00000006 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP,
2837 WHvVirtualProcessorStateTypeSveState = 0x00000007 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN
2197} WHV_VIRTUAL_PROCESSOR_STATE_TYPE;2838} WHV_VIRTUAL_PROCESSOR_STATE_TYPE;
21982839
2840#endif /* defined(__x86_64__) || defined(__aarch64__) */
2841
2842typedef enum WHV_NESTED_STATE_TYPE {
2843 WHvNestedStateTypeVmx,
2844 WHvNestedStateTypeSvm
2845} WHV_NESTED_STATE_TYPE;
2846
2847typedef struct WHV_NESTED_ENLIGHTENMENTS_CONTROL {
2848 __C89_NAMELESS union {
2849 UINT32 AsUINT32;
2850 __C89_NAMELESS struct {
2851 UINT32 DirectHypercall:1;
2852 UINT32 VirtualizationException:1;
2853 UINT32 Reserved:30;
2854 };
2855 } Features;
2856 __C89_NAMELESS union {
2857 UINT32 AsUINT32;
2858 __C89_NAMELESS struct {
2859 UINT32 InterPartitionCommunication:1;
2860 UINT32 Reserved:31;
2861 };
2862 } HypercallControls;
2863} WHV_NESTED_ENLIGHTENMENTS_CONTROL;
2864
2865typedef struct WHV_X64_VMX_NESTED_STATE {
2866 WHV_NESTED_STATE_TYPE Vendor;
2867 __C89_NAMELESS struct {
2868 UINT32 GuestMode : 1;
2869 UINT32 Vmxon : 1;
2870 UINT32 CurrentVmcsValid : 1;
2871 UINT32 VmEntryPending : 1;
2872 UINT32 VmcsEnlightened : 1;
2873 UINT32 EnlightenedVmEntry : 1;
2874 UINT32 Reserved : 26;
2875 } Flags;
2876 WHV_NESTED_ENLIGHTENMENTS_CONTROL NestedEnlightenmentsControl;
2877 UINT64 Pdpt[4];
2878 UINT64 VmxonRegionGpa;
2879 UINT64 VmcsGpa;
2880 UINT64 CurrentEnlightenedVmcs;
2881 __C89_NAMELESS struct {
2882 UINT32 Tpr;
2883 UINT32 Ppr;
2884 UINT32 Isr[8];
2885 UINT32 Irr[8];
2886 UINT32 IcrLow;
2887 UINT32 IcrHigh;
2888 } VirtualApicRegs;
2889 UINT8 Reserved[3944];
2890 DECLSPEC_ALIGN(4096) UINT8 VmcsBytes[4096];
2891} WHV_X64_VMX_NESTED_STATE;
2892
2893typedef struct WHV_SVM_VMCB_SELECTOR {
2894 UINT16 Selector;
2895 UINT16 Attrib;
2896 UINT32 Limit;
2897 UINT64 Base;
2898} WHV_SVM_VMCB_SELECTOR;
2899
2900typedef struct WHV_SVM_NESTED_HOST_STATE {
2901 UINT64 Rip;
2902 UINT64 Rsp;
2903 UINT64 Rflags;
2904 UINT64 Rax;
2905 WHV_SVM_VMCB_SELECTOR Es;
2906 WHV_SVM_VMCB_SELECTOR Cs;
2907 WHV_SVM_VMCB_SELECTOR Ss;
2908 WHV_SVM_VMCB_SELECTOR Ds;
2909 WHV_SVM_VMCB_SELECTOR Gdtr;
2910 WHV_SVM_VMCB_SELECTOR Idtr;
2911 UINT64 Efer;
2912 UINT64 Cr0;
2913 UINT64 Cr3;
2914 UINT64 Cr4;
2915 UINT64 VirtualTpr;
2916 UINT64 Reserved[6];
2917} WHV_SVM_NESTED_HOST_STATE;
2918
2919typedef struct WHV_X64_SVM_NESTED_STATE {
2920 WHV_NESTED_STATE_TYPE Vendor;
2921 __C89_NAMELESS struct {
2922 UINT32 GuestMode : 1;
2923 UINT32 VmEntryPending : 1;
2924 UINT32 HostSaveGpaValid : 1;
2925 UINT32 CurrentVmcbValid : 1;
2926 UINT32 Reserved : 28;
2927 } Flags;
2928 WHV_NESTED_ENLIGHTENMENTS_CONTROL NestedEnlightenmentsControl;
2929 UINT64 HostSaveGpa;
2930 UINT64 VmControlMsr;
2931 UINT64 VirtualTscRatioMsr;
2932 UINT64 VmcbGpa;
2933 WHV_SVM_NESTED_HOST_STATE HostState;
2934 UINT8 Reserved[3832];
2935 DECLSPEC_ALIGN(4096) UINT8 VmcbBytes[4096];
2936} WHV_X64_SVM_NESTED_STATE;
2937
2938typedef union WHV_X64_NESTED_STATE {
2939 WHV_X64_VMX_NESTED_STATE Vmx;
2940 WHV_X64_SVM_NESTED_STATE Svm;
2941} WHV_X64_NESTED_STATE;
2942
2943C_ASSERT(sizeof(WHV_X64_NESTED_STATE) == (2 * 4096));
2944
2945#if defined (__aarch64__)
2946
2947typedef struct WHV_ARM64_INTERRUPT_STATE {
2948 __C89_NAMELESS struct {
2949 UINT8 Enabled : 1;
2950 UINT8 EdgeTriggered : 1;
2951 UINT8 Asserted : 1;
2952 UINT8 SetPending : 1;
2953 UINT8 Active : 1;
2954 UINT8 Direct : 1;
2955 UINT8 Reserved0 : 2;
2956 };
2957 UINT8 GicrIpriorityrConfigured;
2958 UINT8 GicrIpriorityrActive;
2959 UINT8 Reserved1;
2960} WHV_ARM64_INTERRUPT_STATE;
2961
2962typedef struct WHV_ARM64_GLOBAL_INTERRUPT_STATE {
2963 UINT32 InterruptId;
2964 UINT32 ActiveVpIndex;
2965 __C89_NAMELESS union {
2966 UINT32 TargetMpidr;
2967 UINT32 TargetVpIndex;
2968 };
2969 WHV_ARM64_INTERRUPT_STATE InterruptState;
2970} WHV_ARM64_GLOBAL_INTERRUPT_STATE;
2971
2972#define WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE_VERSION_CURRENT (1)
2973
2974typedef struct WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE {
2975 UINT8 Version;
2976 UINT8 GicVersion;
2977 UINT8 Reserved0[2];
2978 UINT32 NumInterrupts;
2979 UINT64 GicdCtlrEnableGrp1A;
2980 WHV_ARM64_GLOBAL_INTERRUPT_STATE Interrupts[ANYSIZE_ARRAY];
2981} WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE;
2982
2983#define WHV_ARM64_INTERRUPT_CONTROLLER_STATE_VERSION_CURRENT (1)
2984
2985typedef struct WHV_ARM64_LOCAL_INTERRUPT_CONTROLLER_STATE {
2986 UINT8 Version;
2987 UINT8 GicVersion;
2988 UINT8 Reserved0[6];
2989 UINT64 IccIgrpen1El1;
2990 UINT64 GicrCtlrEnableLpis;
2991 UINT64 IccBpr1El1;
2992 UINT64 IccPmrEl1;
2993 UINT64 GicrPropbaser;
2994 UINT64 GicrPendbaser;
2995 UINT32 IchAp1REl2[4];
2996 WHV_ARM64_INTERRUPT_STATE BankedInterruptState[32];
2997} WHV_ARM64_LOCAL_INTERRUPT_CONTROLLER_STATE;
2998
2999typedef struct WHV_ARM64_VP_STATE_SVE {
3000 USHORT Version;
3001 USHORT RegisterDataOffset;
3002 UINT32 VectorLength;
3003 UINT64 Reserved0;
3004} WHV_ARM64_VP_STATE_SVE;
3005
3006#endif /* defined(__aarch64__) */
3007
2199typedef struct WHV_SYNIC_EVENT_PARAMETERS {3008typedef struct WHV_SYNIC_EVENT_PARAMETERS {
2200 UINT32 VpIndex;3009 UINT32 VpIndex;
2201 UINT8 TargetSint;3010 UINT8 TargetSint;
2202 UINT8 Reserved;3011 WHV_VTL TargetVtl;
2203 UINT16 FlagNumber;3012 UINT16 FlagNumber;
2204} WHV_SYNIC_EVENT_PARAMETERS;3013} WHV_SYNIC_EVENT_PARAMETERS;
22053014
...@@ -2326,7 +3135,9 @@ typedef struct WHV_VPCI_INTERRUPT_TARGET {...@@ -2326,7 +3135,9 @@ typedef struct WHV_VPCI_INTERRUPT_TARGET {
2326C_ASSERT(sizeof(WHV_VPCI_INTERRUPT_TARGET) == 16);3135C_ASSERT(sizeof(WHV_VPCI_INTERRUPT_TARGET) == 16);
23273136
2328typedef enum WHV_TRIGGER_TYPE {3137typedef enum WHV_TRIGGER_TYPE {
3138#if defined(__x86_64__)
2329 WHvTriggerTypeInterrupt = 0,3139 WHvTriggerTypeInterrupt = 0,
3140#endif
2330 WHvTriggerTypeSynicEvent = 1,3141 WHvTriggerTypeSynicEvent = 1,
2331 WHvTriggerTypeDeviceInterrupt = 23142 WHvTriggerTypeDeviceInterrupt = 2
2332} WHV_TRIGGER_TYPE;3143} WHV_TRIGGER_TYPE;
...@@ -2335,7 +3146,9 @@ typedef struct WHV_TRIGGER_PARAMETERS {...@@ -2335,7 +3146,9 @@ typedef struct WHV_TRIGGER_PARAMETERS {
2335 WHV_TRIGGER_TYPE TriggerType;3146 WHV_TRIGGER_TYPE TriggerType;
2336 UINT32 Reserved;3147 UINT32 Reserved;
2337 __C89_NAMELESS union {3148 __C89_NAMELESS union {
3149#if defined(__x86_64__)
2338 WHV_INTERRUPT_CONTROL Interrupt;3150 WHV_INTERRUPT_CONTROL Interrupt;
3151#endif
2339 WHV_SYNIC_EVENT_PARAMETERS SynicEvent;3152 WHV_SYNIC_EVENT_PARAMETERS SynicEvent;
2340 __C89_NAMELESS struct {3153 __C89_NAMELESS struct {
2341 UINT64 LogicalDeviceId;3154 UINT64 LogicalDeviceId;
...@@ -2372,7 +3185,9 @@ typedef enum WHV_NOTIFICATION_PORT_TYPE {...@@ -2372,7 +3185,9 @@ typedef enum WHV_NOTIFICATION_PORT_TYPE {
23723185
2373typedef struct WHV_NOTIFICATION_PORT_PARAMETERS {3186typedef struct WHV_NOTIFICATION_PORT_PARAMETERS {
2374 WHV_NOTIFICATION_PORT_TYPE NotificationPortType;3187 WHV_NOTIFICATION_PORT_TYPE NotificationPortType;
2375 UINT32 Reserved;3188 UINT16 Reserved;
3189 UINT8 Reserved1;
3190 UINT8 ConnectionVtl;
2376 __C89_NAMELESS union {3191 __C89_NAMELESS union {
2377 WHV_DOORBELL_MATCH_DATA Doorbell;3192 WHV_DOORBELL_MATCH_DATA Doorbell;
2378 __C89_NAMELESS struct {3193 __C89_NAMELESS struct {
...@@ -2398,4 +3213,6 @@ typedef PVOID WHV_NOTIFICATION_PORT_HANDLE;...@@ -2398,4 +3213,6 @@ typedef PVOID WHV_NOTIFICATION_PORT_HANDLE;
23983213
2399#define WHV_SYNIC_MESSAGE_SIZE 2563214#define WHV_SYNIC_MESSAGE_SIZE 256
24003215
3216#endif /* defined(__x86_64__) || defined(__aarch64__) */
3217
2401#endif /* _WINHVAPIDEFS_H_ */3218#endif /* _WINHVAPIDEFS_H_ */
lib/libc/include/any-windows-any/winioctl.h+48
...@@ -3229,6 +3229,54 @@ typedef struct _CSV_NAMESPACE_INFO {...@@ -3229,6 +3229,54 @@ typedef struct _CSV_NAMESPACE_INFO {
3229#define FSCTL_LMR_QUERY_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 286, METHOD_BUFFERED, FILE_ANY_ACCESS)3229#define FSCTL_LMR_QUERY_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 286, METHOD_BUFFERED, FILE_ANY_ACCESS)
3230#endif3230#endif
32313231
3232#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE)
3233typedef struct _DUPLICATE_EXTENTS_DATA {
3234 HANDLE FileHandle;
3235 LARGE_INTEGER SourceFileOffset;
3236 LARGE_INTEGER TargetFileOffset;
3237 LARGE_INTEGER ByteCount;
3238} DUPLICATE_EXTENTS_DATA, *PDUPLICATE_EXTENTS_DATA;
3239
3240#if ((NTDDI_VERSION >= NTDDI_WIN10_RS2) && defined(_WIN64))
3241typedef struct _DUPLICATE_EXTENTS_DATA32 {
3242 UINT32 FileHandle;
3243 LARGE_INTEGER SourceFileOffset;
3244 LARGE_INTEGER TargetFileOffset;
3245 LARGE_INTEGER ByteCount;
3246} DUPLICATE_EXTENTS_DATA32, *PDUPLICATE_EXTENTS_DATA32;
3247#endif /* ((NTDDI_VERSION >= NTDDI_WIN10_RS2) && defined(_WIN64)) */
3248
3249#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) */
3250
3251#if (NTDDI_VERSION >= NTDDI_WIN10_RS3)
3252#define DUPLICATE_EXTENTS_DATA_EX_SOURCE_ATOMIC 0x00000001
3253
3254#if (NTDDI_VERSION >= NTDDI_WIN10_VB)
3255#define DUPLICATE_EXTENTS_DATA_EX_ASYNC 0x00000002
3256#endif /* (NTDDI_VERSION >= NTDDI_WIN10_VB) */
3257
3258typedef struct _DUPLICATE_EXTENTS_DATA_EX {
3259 SIZE_T Size;
3260 HANDLE FileHandle;
3261 LARGE_INTEGER SourceFileOffset;
3262 LARGE_INTEGER TargetFileOffset;
3263 LARGE_INTEGER ByteCount;
3264 DWORD Flags;
3265} DUPLICATE_EXTENTS_DATA_EX, *PDUPLICATE_EXTENTS_DATA_EX;
3266
3267#if ((NTDDI_VERSION >= NTDDI_WIN10_RS3) && defined(_WIN64))
3268typedef struct _DUPLICATE_EXTENTS_DATA_EX32 {
3269 DWORD32 Size;
3270 DWORD32 FileHandle;
3271 LARGE_INTEGER SourceFileOffset;
3272 LARGE_INTEGER TargetFileOffset;
3273 LARGE_INTEGER ByteCount;
3274 DWORD Flags;
3275} DUPLICATE_EXTENTS_DATA_EX32, *PDUPLICATE_EXTENTS_DATA_EX32;
3276#endif /* ((NTDDI_VERSION >= NTDDI_WIN10_RS3) && defined(_WIN64)) */
3277
3278#endif /* (NTDDI_VERSION >= NTDDI_WIN10_RS3) */
3279
3232#endif /* _FILESYSTEMFSCTL_ */3280#endif /* _FILESYSTEMFSCTL_ */
32333281
32343282
lib/libc/include/any-windows-any/winnt.h+26-11
...@@ -2454,6 +2454,21 @@ extern "C" {...@@ -2454,6 +2454,21 @@ extern "C" {
2454#define UNW_FLAG_EHANDLER 0x12454#define UNW_FLAG_EHANDLER 0x1
2455#define UNW_FLAG_UHANDLER 0x22455#define UNW_FLAG_UHANDLER 0x2
24562456
2457#define NONVOL_INT_NUMREG_ARM64 (11)
2458#define NONVOL_FP_NUMREG_ARM64 (8)
2459
2460#define NONVOL_INT_SIZE_ARM64 (NONVOL_INT_NUMREG_ARM64 * sizeof(DWORD64))
2461#define NONVOL_FP_SIZE_ARM64 (NONVOL_FP_NUMREG_ARM64 * sizeof(double))
2462
2463 typedef union _DISPATCHER_CONTEXT_NONVOLREG_ARM64 {
2464 BYTE Buffer[NONVOL_INT_SIZE_ARM64 + NONVOL_FP_SIZE_ARM64];
2465
2466 __C89_NAMELESS struct {
2467 DWORD64 GpNvRegs[NONVOL_INT_NUMREG_ARM64];
2468 double FpNvRegs[NONVOL_FP_NUMREG_ARM64];
2469 } DUMMYSTRUCTNAME;
2470 } DISPATCHER_CONTEXT_NONVOLREG_ARM64;
2471
2457 typedef struct _DISPATCHER_CONTEXT_ARM64 {2472 typedef struct _DISPATCHER_CONTEXT_ARM64 {
2458 ULONG_PTR ControlPc;2473 ULONG_PTR ControlPc;
2459 ULONG_PTR ImageBase;2474 ULONG_PTR ImageBase;
...@@ -5401,7 +5416,7 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)...@@ -5401,7 +5416,7 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)
5401 SERVERSILO_STARTED,5416 SERVERSILO_STARTED,
5402 SERVERSILO_SHUTTING_DOWN,5417 SERVERSILO_SHUTTING_DOWN,
5403 SERVERSILO_TERMINATING,5418 SERVERSILO_TERMINATING,
5404 SERVERSILO_TERMINATED,5419 SERVERSILO_TERMINATED
5405 } SERVERSILO_STATE, *PSERVERSILO_STATE;5420 } SERVERSILO_STATE, *PSERVERSILO_STATE;
54065421
5407 typedef struct _SERVERSILO_BASIC_INFORMATION {5422 typedef struct _SERVERSILO_BASIC_INFORMATION {
...@@ -8805,14 +8820,14 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)...@@ -8805,14 +8820,14 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)
8805 typedef enum ARM64_FNPDATA_FLAGS {8820 typedef enum ARM64_FNPDATA_FLAGS {
8806 PdataRefToFullXdata = 0,8821 PdataRefToFullXdata = 0,
8807 PdataPackedUnwindFunction = 1,8822 PdataPackedUnwindFunction = 1,
8808 PdataPackedUnwindFragment = 2,8823 PdataPackedUnwindFragment = 2
8809 } ARM64_FNPDATA_FLAGS;8824 } ARM64_FNPDATA_FLAGS;
88108825
8811 typedef enum ARM64_FNPDATA_CR {8826 typedef enum ARM64_FNPDATA_CR {
8812 PdataCrUnchained = 0,8827 PdataCrUnchained = 0,
8813 PdataCrUnchainedSavedLr = 1,8828 PdataCrUnchainedSavedLr = 1,
8814 PdataCrChainedWithPac = 2,8829 PdataCrChainedWithPac = 2,
8815 PdataCrChained = 3,8830 PdataCrChained = 3
8816 } ARM64_FNPDATA_CR;8831 } ARM64_FNPDATA_CR;
88178832
8818 typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY {8833 typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY {
...@@ -9125,27 +9140,27 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)...@@ -9125,27 +9140,27 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS)
9125#endif9140#endif
91269141
9127#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)9142#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
9128 NTSYSAPI VOID NTAPI RtlUnwind (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue);9143 NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwind (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue);
9129 NTSYSAPI PVOID NTAPI RtlPcToFileHeader (PVOID PcValue, PVOID *BaseOfImage);9144 NTSYSAPI PVOID NTAPI RtlPcToFileHeader (PVOID PcValue, PVOID *BaseOfImage);
9130#if defined (__x86_64__)9145#if defined (__x86_64__)
9131 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (DWORD64 ControlPc, PDWORD64 ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);9146 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (DWORD64 ControlPc, PDWORD64 ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);
9132 NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);9147 NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);
9133 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD64 ImageBase, DWORD64 ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD64 EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);9148 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD64 ImageBase, DWORD64 ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD64 EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);
9134 NTSYSAPI BOOLEAN NTAPI RtlIsEcCode(DWORD64 CodePointer);9149 NTSYSAPI BOOLEAN NTAPI RtlIsEcCode(DWORD64 CodePointer);
9135#endif9150#endif
9136#if defined (__arm__)9151#if defined (__arm__)
9137 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PDWORD ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);9152 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PDWORD ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);
9138 NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);9153 NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);
9139 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD ImageBase, DWORD ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);9154 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD ImageBase, DWORD ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);
9140#endif9155#endif
9141#if defined (__aarch64__)9156#if defined (__aarch64__)
9142 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PULONG_PTR ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);9157 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PULONG_PTR ImageBase, PUNWIND_HISTORY_TABLE HistoryTable);
9143 NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);9158 NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);
9144 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, ULONG_PTR ImageBase, ULONG_PTR ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PULONG_PTR EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);9159 NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, ULONG_PTR ImageBase, ULONG_PTR ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PULONG_PTR EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);
9145#endif9160#endif
9146#if defined (__ia64__)9161#if defined (__ia64__)
9147 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONGLONG ControlPc, PULONGLONG ImageBase, PULONGLONG TargetGp);9162 NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONGLONG ControlPc, PULONGLONG ImageBase, PULONGLONG TargetGp);
9148 NTSYSAPI VOID NTAPI RtlUnwindEx (FRAME_POINTERS TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);9163 NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (FRAME_POINTERS TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable);
9149 NTSYSAPI ULONGLONG NTAPI RtlVirtualUnwind (ULONGLONG ImageBase, ULONGLONG ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PBOOLEAN InFunction, PFRAME_POINTERS EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);9164 NTSYSAPI ULONGLONG NTAPI RtlVirtualUnwind (ULONGLONG ImageBase, ULONGLONG ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PBOOLEAN InFunction, PFRAME_POINTERS EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers);
9150#endif9165#endif
9151#endif9166#endif
...@@ -9470,7 +9485,7 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);...@@ -9470,7 +9485,7 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
9470 typedef enum _RTL_UMS_SCHEDULER_REASON {9485 typedef enum _RTL_UMS_SCHEDULER_REASON {
9471 UmsSchedulerStartup = 0,9486 UmsSchedulerStartup = 0,
9472 UmsSchedulerThreadBlocked,9487 UmsSchedulerThreadBlocked,
9473 UmsSchedulerThreadYield,9488 UmsSchedulerThreadYield
9474 } RTL_UMS_SCHEDULER_REASON,*PRTL_UMS_SCHEDULER_REASON;9489 } RTL_UMS_SCHEDULER_REASON,*PRTL_UMS_SCHEDULER_REASON;
94759490
9476 typedef VOID NTAPI RTL_UMS_SCHEDULER_ENTRY_POINT (RTL_UMS_SCHEDULER_REASON Reason, ULONG_PTR ActivationPayload, PVOID SchedulerParam);9491 typedef VOID NTAPI RTL_UMS_SCHEDULER_ENTRY_POINT (RTL_UMS_SCHEDULER_REASON Reason, ULONG_PTR ActivationPayload, PVOID SchedulerParam);
...@@ -10457,13 +10472,13 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);...@@ -10457,13 +10472,13 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
10457 typedef enum _TRANSACTION_OUTCOME {10472 typedef enum _TRANSACTION_OUTCOME {
10458 TransactionOutcomeUndetermined = 1,10473 TransactionOutcomeUndetermined = 1,
10459 TransactionOutcomeCommitted,10474 TransactionOutcomeCommitted,
10460 TransactionOutcomeAborted,10475 TransactionOutcomeAborted
10461 } TRANSACTION_OUTCOME;10476 } TRANSACTION_OUTCOME;
1046210477
10463 typedef enum _TRANSACTION_STATE {10478 typedef enum _TRANSACTION_STATE {
10464 TransactionStateNormal = 1,10479 TransactionStateNormal = 1,
10465 TransactionStateIndoubt,10480 TransactionStateIndoubt,
10466 TransactionStateCommittedNotify,10481 TransactionStateCommittedNotify
10467 } TRANSACTION_STATE;10482 } TRANSACTION_STATE;
1046810483
10469 typedef struct _TRANSACTION_BASIC_INFORMATION {10484 typedef struct _TRANSACTION_BASIC_INFORMATION {
lib/libc/include/any-windows-any/winuser.h+2-2
...@@ -2836,7 +2836,7 @@ DIALOG_DPI_CHANGE_BEHAVIORS WINAPI GetDialogDpiChangeBehavior(HWND hDlg);...@@ -2836,7 +2836,7 @@ DIALOG_DPI_CHANGE_BEHAVIORS WINAPI GetDialogDpiChangeBehavior(HWND hDlg);
2836 POINTER_CHANGE_FOURTHBUTTON_DOWN,2836 POINTER_CHANGE_FOURTHBUTTON_DOWN,
2837 POINTER_CHANGE_FOURTHBUTTON_UP,2837 POINTER_CHANGE_FOURTHBUTTON_UP,
2838 POINTER_CHANGE_FIFTHBUTTON_DOWN,2838 POINTER_CHANGE_FIFTHBUTTON_DOWN,
2839 POINTER_CHANGE_FIFTHBUTTON_UP,2839 POINTER_CHANGE_FIFTHBUTTON_UP
2840 } POINTER_BUTTON_CHANGE_TYPE;2840 } POINTER_BUTTON_CHANGE_TYPE;
28412841
2842 typedef struct tagPOINTER_INFO {2842 typedef struct tagPOINTER_INFO {
...@@ -6705,7 +6705,7 @@ WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetDpiAwarenessContextForProcess(HANDLE...@@ -6705,7 +6705,7 @@ WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetDpiAwarenessContextForProcess(HANDLE
6705 IMO_UNAVAILABLE = 0x00000000,6705 IMO_UNAVAILABLE = 0x00000000,
6706 IMO_HARDWARE = 0x00000001,6706 IMO_HARDWARE = 0x00000001,
6707 IMO_INJECTED = 0x00000002,6707 IMO_INJECTED = 0x00000002,
6708 IMO_SYSTEM = 0x00000004,6708 IMO_SYSTEM = 0x00000004
6709 } INPUT_MESSAGE_ORIGIN_ID;6709 } INPUT_MESSAGE_ORIGIN_ID;
67106710
6711 typedef struct tagINPUT_MESSAGE_SOURCE {6711 typedef struct tagINPUT_MESSAGE_SOURCE {
lib/libc/include/any-windows-any/wmcodecdsp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmcodecdsp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmcodecdsp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmcontainer.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmcontainer.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmcontainer.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmdrmsdk.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmdrmsdk.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmdrmsdk.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmprealestate.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmprealestate.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmprealestate.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmpservices.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmpservices.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmpservices.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmsbuffer.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmsbuffer.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmsbuffer.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wmsdkidl.h+3-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmsdkidl.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmsdkidl.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
...@@ -652,6 +652,7 @@ typedef enum tagWMT_STORAGE_FORMAT {...@@ -652,6 +652,7 @@ typedef enum tagWMT_STORAGE_FORMAT {
652 WMT_Storage_Format_MP3 = 0,652 WMT_Storage_Format_MP3 = 0,
653 WMT_Storage_Format_V1 = 1653 WMT_Storage_Format_V1 = 1
654} WMT_STORAGE_FORMAT;654} WMT_STORAGE_FORMAT;
655#pragma pack(push,2)
655typedef struct _WMStreamPrioritizationRecord {656typedef struct _WMStreamPrioritizationRecord {
656 WORD wStreamNumber;657 WORD wStreamNumber;
657 WINBOOL fMandatory;658 WINBOOL fMandatory;
...@@ -662,6 +663,7 @@ typedef struct _WMT_TIMECODE_EXTENSION_DATA {...@@ -662,6 +663,7 @@ typedef struct _WMT_TIMECODE_EXTENSION_DATA {
662 DWORD dwUserbits;663 DWORD dwUserbits;
663 DWORD dwAmFlags;664 DWORD dwAmFlags;
664} WMT_TIMECODE_EXTENSION_DATA;665} WMT_TIMECODE_EXTENSION_DATA;
666#pragma pack(pop)
665typedef struct _WM_PORT_NUMBER_RANGE {667typedef struct _WM_PORT_NUMBER_RANGE {
666 WORD wPortBegin;668 WORD wPortBegin;
667 WORD wPortEnd;669 WORD wPortEnd;
lib/libc/include/any-windows-any/wmsecure.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wmsecure.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wmsecure.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wpcapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wpcapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wpcapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wrl/client.h+46-1
...@@ -7,7 +7,7 @@...@@ -7,7 +7,7 @@
7#ifndef _WRL_CLIENT_H_7#ifndef _WRL_CLIENT_H_
8#define _WRL_CLIENT_H_8#define _WRL_CLIENT_H_
99
10#include <stddef.h>10#include <cstddef>
11#include <unknwn.h>11#include <unknwn.h>
12/* #include <weakreference.h> */12/* #include <weakreference.h> */
13#include <roapi.h>13#include <roapi.h>
...@@ -263,6 +263,51 @@ namespace Microsoft {...@@ -263,6 +263,51 @@ namespace Microsoft {
263 return tmp->Release();263 return tmp->Release();
264 }264 }
265 };265 };
266
267 template <class T, class U>
268 bool operator==(const ComPtr<T> &a, const ComPtr<U> &b) throw()
269 {
270 static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible");
271 return a.Get() == b.Get();
272 }
273
274 template <class T>
275 bool operator==(const ComPtr<T> &a, std::nullptr_t) throw()
276 {
277 return a.Get() == nullptr;
278 }
279
280 template <class T>
281 bool operator==(std::nullptr_t, const ComPtr<T> &a) throw()
282 {
283 return a.Get() == nullptr;
284 }
285
286 template <class T, class U>
287 bool operator!=(const ComPtr<T> &a, const ComPtr<U> &b) throw()
288 {
289 static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible");
290 return a.Get() != b.Get();
291 }
292
293 template <class T>
294 bool operator!=(const ComPtr<T> &a, std::nullptr_t) throw()
295 {
296 return a.Get() != nullptr;
297 }
298
299 template <class T>
300 bool operator!=(std::nullptr_t, const ComPtr<T> &a) throw()
301 {
302 return a.Get() != nullptr;
303 }
304
305 template <class T, class U>
306 bool operator<(const ComPtr<T> &a, const ComPtr<U> &b) throw()
307 {
308 static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible");
309 return a.Get() < b.Get();
310 }
266 }311 }
267}312}
268313
lib/libc/include/any-windows-any/wsdattachment.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsdattachment.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsdattachment.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsdbase.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsdbase.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsdbase.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsdclient.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsdclient.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsdclient.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsddisco.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsddisco.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsddisco.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsdhost.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsdhost.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsdhost.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsdtypes.h+1-1
...@@ -55,7 +55,7 @@ typedef enum _WSD_PROTOCOL_TYPE {...@@ -55,7 +55,7 @@ typedef enum _WSD_PROTOCOL_TYPE {
55 WSD_PT_UDP = 0x01,55 WSD_PT_UDP = 0x01,
56 WSD_PT_HTTP = 0x02,56 WSD_PT_HTTP = 0x02,
57 WSD_PT_HTTPS = 0x04,57 WSD_PT_HTTPS = 0x04,
58 WSD_PT_ALL = 0xff,58 WSD_PT_ALL = 0xff
59} WSD_PROTOCOL_TYPE;59} WSD_PROTOCOL_TYPE;
6060
61typedef enum _WSDEventType {61typedef enum _WSDEventType {
lib/libc/include/any-windows-any/wsdxml.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsdxml.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsdxml.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wsman.h+1-1
...@@ -101,7 +101,7 @@ extern "C" {...@@ -101,7 +101,7 @@ extern "C" {
101 WSMAN_OPTION_PROXY_IE_PROXY_CONFIG = 1,101 WSMAN_OPTION_PROXY_IE_PROXY_CONFIG = 1,
102 WSMAN_OPTION_PROXY_WINHTTP_PROXY_CONFIG = 2,102 WSMAN_OPTION_PROXY_WINHTTP_PROXY_CONFIG = 2,
103 WSMAN_OPTION_PROXY_AUTO_DETECT = 4,103 WSMAN_OPTION_PROXY_AUTO_DETECT = 4,
104 WSMAN_OPTION_PROXY_NO_PROXY_SERVER = 8,104 WSMAN_OPTION_PROXY_NO_PROXY_SERVER = 8
105 };105 };
106106
107 typedef enum WSManSessionOption {107 typedef enum WSManSessionOption {
lib/libc/include/any-windows-any/wsmandisp.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wsmandisp.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wsmandisp.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wtypes.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wtypes.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wtypes.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wtypesbase.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wtypesbase.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wtypesbase.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/wuapi.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/wuapi.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/wuapi.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xamlom.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xamlom.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xamlom.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xapo.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xapo.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xapo.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xaudio2.h+4-27
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xaudio2.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xaudio2.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
...@@ -87,36 +87,13 @@ interface IXAudio2Extension;...@@ -87,36 +87,13 @@ interface IXAudio2Extension;
87#include <unknwn.h>87#include <unknwn.h>
88#include <mmdeviceapi.h>88#include <mmdeviceapi.h>
89#include <audiosessiontypes.h>89#include <audiosessiontypes.h>
90#include <mmreg.h>
9091
91#ifdef __cplusplus92#ifdef __cplusplus
92extern "C" {93extern "C" {
93#endif94#endif
9495
95#include <pshpack1.h>96#pragma pack(push,1)
96#if 0
97typedef struct WAVEFORMATEX {
98 WORD wFormatTag;
99 WORD nChannels;
100 DWORD nSamplesPerSec;
101 DWORD nAvgBytesPerSec;
102 WORD nBlockAlign;
103 WORD wBitsPerSample;
104 WORD cbSize;
105} WAVEFORMATEX;
106typedef struct __WIDL_xaudio2_generated_name_00000020 {
107 WAVEFORMATEX Format;
108 union {
109 WORD wValidBitsPerSample;
110 WORD wSamplesPerBlock;
111 WORD wReserved;
112 } Samples;
113 DWORD dwChannelMask;
114 GUID SubFormat;
115} WAVEFORMATEXTENSIBLE;
116typedef struct __WIDL_xaudio2_generated_name_00000020 *PWAVEFORMATEXTENSIBLE;
117#else
118#include <mmreg.h>
119#endif
120#ifndef __IXAudio2Voice_FWD_DEFINED__97#ifndef __IXAudio2Voice_FWD_DEFINED__
121#define __IXAudio2Voice_FWD_DEFINED__98#define __IXAudio2Voice_FWD_DEFINED__
122typedef interface IXAudio2Voice IXAudio2Voice;99typedef interface IXAudio2Voice IXAudio2Voice;
...@@ -1879,7 +1856,7 @@ inline static float XAudio2FrequencyRatioToSemitones(float freqratio) { return 3...@@ -1879,7 +1856,7 @@ inline static float XAudio2FrequencyRatioToSemitones(float freqratio) { return 3
1879inline static float XAudio2CutoffFrequencyToRadians(float cutofffreq, UINT32 samplerate) { if ((UINT32)(cutofffreq * 6.0f) >= samplerate) { return XAUDIO2_MAX_FILTER_FREQUENCY; } return 2.0f * sinf((float)M_PI * cutofffreq / samplerate); }1856inline static float XAudio2CutoffFrequencyToRadians(float cutofffreq, UINT32 samplerate) { if ((UINT32)(cutofffreq * 6.0f) >= samplerate) { return XAUDIO2_MAX_FILTER_FREQUENCY; } return 2.0f * sinf((float)M_PI * cutofffreq / samplerate); }
1880inline static float XAudio2RadiansToCutoffFrequency(float radians, float samplerate) { return samplerate * asinf(radians/2.0f) / (float)M_PI; }1857inline static float XAudio2RadiansToCutoffFrequency(float radians, float samplerate) { return samplerate * asinf(radians/2.0f) / (float)M_PI; }
1881#endif1858#endif
1882#include <poppack.h>1859#pragma pack(pop)
1883HRESULT WINAPI XAudio2Create(IXAudio2** pxaudio2, UINT32 flags, XAUDIO2_PROCESSOR processor);1860HRESULT WINAPI XAudio2Create(IXAudio2** pxaudio2, UINT32 flags, XAUDIO2_PROCESSOR processor);
1884/* Begin additional prototypes for all interfaces */1861/* Begin additional prototypes for all interfaces */
18851862
lib/libc/include/any-windows-any/xaudio2fx.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xaudio2fx.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xaudio2fx.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xmllite.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xmllite.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xmllite.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xpsdigitalsignature.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xpsdigitalsignature.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xpsdigitalsignature.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xpsobjectmodel.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xpsobjectmodel.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xpsobjectmodel.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xpsobjectmodel_1.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xpsobjectmodel_1.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xpsobjectmodel_1.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xpsprint.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xpsprint.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xpsprint.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/include/any-windows-any/xpsrassvc.h+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1/*** Autogenerated by WIDL 10.0-rc1 from include/xpsrassvc.idl - Do not edit ***/1/*** Autogenerated by WIDL 10.4 from include/xpsrassvc.idl - Do not edit ***/
22
3#ifdef _WIN323#ifdef _WIN32
4#ifndef __REQUIRED_RPCNDR_H_VERSION__4#ifndef __REQUIRED_RPCNDR_H_VERSION__
lib/libc/mingw/cfguard/mingw_cfguard_support.c-8
...@@ -17,14 +17,6 @@...@@ -17,14 +17,6 @@
17// really matter here because this is a no-op anyway.17// really matter here because this is a no-op anyway.
18static void __guard_check_icall_dummy(void) {}18static void __guard_check_icall_dummy(void) {}
1919
20// When CFGuard is not active, directly tail-call the target address, which
21// is passed via %rax.
22__asm__(
23 ".globl __guard_dispatch_icall_dummy\n"
24 "__guard_dispatch_icall_dummy:\n"
25 " jmp *%rax\n"
26);
27
28// This is intentionally declared as _not_ a function pointer, so that the20// This is intentionally declared as _not_ a function pointer, so that the
29// jmp instruction is not included as a valid call target for CFGuard.21// jmp instruction is not included as a valid call target for CFGuard.
30extern void *__guard_dispatch_icall_dummy;22extern void *__guard_dispatch_icall_dummy;
lib/libc/mingw/crt/CRT_fp10.c-8
...@@ -8,19 +8,11 @@ void _fpreset (void);...@@ -8,19 +8,11 @@ void _fpreset (void);
88
9void _fpreset (void)9void _fpreset (void)
10{10{
11#if defined(_ARM_) || defined(__arm__)
12 __asm__ __volatile__ (
13 "vmsr fpscr, %0\n\t" : : "r"(0 /* INITIAL_FPSCR */));
14#elif defined(_ARM64_) || defined(__aarch64__)
15 __asm__ __volatile__ (
16 "msr fpcr, %0\n\t" : : "r"(0LL /* INITIAL_FPSCR */));
17#else
18#ifdef __GNUC__11#ifdef __GNUC__
19 __asm__ ("fninit");12 __asm__ ("fninit");
20#else /* msvc: */13#else /* msvc: */
21 __asm fninit;14 __asm fninit;
22#endif15#endif
23#endif
24}16}
2517
26#ifdef __GNUC__18#ifdef __GNUC__
lib/libc/mingw/crt/crtdll.c+47-80
...@@ -4,12 +4,6 @@...@@ -4,12 +4,6 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#ifdef CRTDLL
8#undef CRTDLL
9#ifndef _DLL
10#define _DLL
11#endif
12
13#include <oscalls.h>7#include <oscalls.h>
14#include <internal.h>8#include <internal.h>
15#include <stdlib.h>9#include <stdlib.h>
...@@ -19,20 +13,14 @@...@@ -19,20 +13,14 @@
19#include <crtdbg.h>13#include <crtdbg.h>
2014
21#ifndef _CRTIMP15#ifndef _CRTIMP
22#ifdef CRTDLL
23#define _CRTIMP __declspec(dllexport)
24#else
25#ifdef _DLL
26#define _CRTIMP __declspec(dllimport)16#define _CRTIMP __declspec(dllimport)
27#else
28#define _CRTIMP
29#endif
30#endif
31#endif17#endif
32#include <sect_attribs.h>18#include <sect_attribs.h>
33#include <locale.h>19#include <locale.h>
3420
35extern void __cdecl _initterm(_PVFV *,_PVFV *);21#if defined(__x86_64__) && !defined(__SEH__)
22extern int __mingw_init_ehandler (void);
23#endif
36extern void __main ();24extern void __main ();
37extern void _pei386_runtime_relocator (void);25extern void _pei386_runtime_relocator (void);
38extern _PIFV __xi_a[];26extern _PIFV __xi_a[];
...@@ -50,20 +38,6 @@ static _onexit_table_t atexit_table;...@@ -50,20 +38,6 @@ static _onexit_table_t atexit_table;
5038
51extern int __mingw_app_type;39extern int __mingw_app_type;
5240
53extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved);
54
55extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID);
56
57static int pre_c_init (void);
58
59_CRTALLOC(".CRT$XIAA") _PIFV pcinit = pre_c_init;
60
61static int
62pre_c_init (void)
63{
64 return _initialize_onexit_table(&atexit_table);
65}
66
67WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)41WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
68{42{
69 if (dwReason == DLL_PROCESS_DETACH)43 if (dwReason == DLL_PROCESS_DETACH)
...@@ -77,10 +51,11 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)...@@ -77,10 +51,11 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
77 {51 {
78 void *lock_free = NULL;52 void *lock_free = NULL;
79 void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase;53 void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase;
80 int nested = FALSE;54 BOOL nested = FALSE;
55 int ret = 0;
81 56
82 while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,57 while ((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock,
83 fiberid, 0)) != 0)58 fiberid, NULL)) != 0)
84 {59 {
85 if (lock_free == fiberid)60 if (lock_free == fiberid)
86 {61 {
...@@ -89,25 +64,37 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)...@@ -89,25 +64,37 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
89 }64 }
90 Sleep(1000);65 Sleep(1000);
91 }66 }
92 if (__native_startup_state == __initializing)67 if (__native_startup_state != __uninitialized)
93 {68 {
94 _amsg_exit (31);69 _amsg_exit (31);
95 }70 }
96 else if (__native_startup_state == __uninitialized)71 else
97 {72 {
98 __native_startup_state = __initializing;73 __native_startup_state = __initializing;
99 74
100 if (_initterm_e (__xi_a, __xi_z) != 0)75 _pei386_runtime_relocator ();
101 return FALSE;76#if defined(__x86_64__) && !defined(__SEH__)
102 }77 __mingw_init_ehandler ();
103 if (__native_startup_state == __initializing)78#endif
104 {79 ret = _initialize_onexit_table (&atexit_table);
80 if (ret != 0)
81 goto i__leave;
82 ret = _initterm_e (__xi_a, __xi_z);
83 if (ret != 0)
84 goto i__leave;
105 _initterm (__xc_a, __xc_z);85 _initterm (__xc_a, __xc_z);
86 __main ();
87
106 __native_startup_state = __initialized;88 __native_startup_state = __initialized;
107 }89 }
90i__leave:
108 if (! nested)91 if (! nested)
109 {92 {
110 (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);93 (void) InterlockedExchangePointer (&__native_startup_lock, NULL);
94 }
95 if (ret != 0)
96 {
97 return FALSE;
111 }98 }
112 if (__dyn_tls_init_callback != NULL)99 if (__dyn_tls_init_callback != NULL)
113 {100 {
...@@ -118,8 +105,16 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)...@@ -118,8 +105,16 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
118 else if (dwReason == DLL_PROCESS_DETACH)105 else if (dwReason == DLL_PROCESS_DETACH)
119 {106 {
120 void *lock_free = NULL;107 void *lock_free = NULL;
121 while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,(PVOID) 1, 0)) != 0)108 void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase;
109 BOOL nested = FALSE;
110
111 while ((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock, fiberid, NULL)) != 0)
122 {112 {
113 if (lock_free == fiberid)
114 {
115 nested = TRUE;
116 break;
117 }
123 Sleep(1000);118 Sleep(1000);
124 }119 }
125 if (__native_startup_state != __initialized)120 if (__native_startup_state != __initialized)
...@@ -130,84 +125,56 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)...@@ -130,84 +125,56 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
130 {125 {
131 _execute_onexit_table(&atexit_table);126 _execute_onexit_table(&atexit_table);
132 __native_startup_state = __uninitialized;127 __native_startup_state = __uninitialized;
133 (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);128 }
129 if (! nested)
130 {
131 (void) InterlockedExchangePointer (&__native_startup_lock, NULL);
134 }132 }
135 }133 }
136 return TRUE;134 return TRUE;
137}135}
138136
139static WINBOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID);
140
141WINBOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID);137WINBOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID);
142#if defined(__x86_64__) && !defined(__SEH__)
143int __mingw_init_ehandler (void);
144#endif
145138
146__attribute__((used)) /* required due to GNU LD bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30300 */
147WINBOOL WINAPI
148DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
149{
150 __mingw_app_type = 0;
151 return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved);
152}
153
154static
155#if defined(__i386__) || defined(_X86_)139#if defined(__i386__) || defined(_X86_)
156/* We need to make sure that we align the stack to 16 bytes for the sake of SSE140/* We need to make sure that we align the stack to 16 bytes for the sake of SSE
157 opts in DllMain/DllEntryPoint or in functions called from DllMain/DllEntryPoint. */141 opts in DllMain or in functions called from DllMain. */
158__attribute__((force_align_arg_pointer))142__attribute__((force_align_arg_pointer))
159#endif143#endif
160__declspec(noinline) WINBOOL144__attribute__((used)) /* required due to GNU LD bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30300 */
161__DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)145WINBOOL WINAPI
146DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
162{147{
163 WINBOOL retcode = TRUE;148 WINBOOL retcode = TRUE;
164149
150 __mingw_app_type = 0;
165 __native_dllmain_reason = dwReason;151 __native_dllmain_reason = dwReason;
166 if (dwReason == DLL_PROCESS_DETACH && __proc_attached == 0)152 if (dwReason == DLL_PROCESS_DETACH && __proc_attached <= 0)
167 {153 {
168 retcode = FALSE;154 retcode = FALSE;
169 goto i__leave;155 goto i__leave;
170 }156 }
171 _pei386_runtime_relocator ();
172
173#if defined(__x86_64__) && !defined(__SEH__)
174 if (dwReason == DLL_PROCESS_ATTACH)
175 __mingw_init_ehandler ();
176#endif
177157
178 if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH)158 if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH)
179 {159 {
180 retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved);160 retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved);
181 if (!retcode)161 if (!retcode)
182 goto i__leave;162 goto i__leave;
183 retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved);
184 if (! retcode)
185 {
186 if (dwReason == DLL_PROCESS_ATTACH)
187 _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
188 goto i__leave;
189 }
190 }163 }
191 if (dwReason == DLL_PROCESS_ATTACH)
192 __main ();
193 retcode = DllMain(hDllHandle,dwReason,lpreserved);164 retcode = DllMain(hDllHandle,dwReason,lpreserved);
194 if (dwReason == DLL_PROCESS_ATTACH && ! retcode)165 if (dwReason == DLL_PROCESS_ATTACH && ! retcode)
195 {166 {
196 DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved);167 DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
197 DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
198 _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved);168 _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
199 }169 }
200 if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH)170 if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH)
201 {171 {
202 retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved);172 retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved);
203 if (_CRT_INIT (hDllHandle, dwReason, lpreserved) == FALSE)
204 retcode = FALSE;
205 }173 }
206i__leave:174i__leave:
207 __native_dllmain_reason = UINT_MAX;175 __native_dllmain_reason = UINT_MAX;
208 return retcode ;176 return retcode ;
209}177}
210#endif
211178
212int __cdecl atexit (_PVFV func)179int __cdecl atexit (_PVFV func)
213{180{
lib/libc/mingw/crt/crtexe.c+4-11
...@@ -4,13 +4,6 @@...@@ -4,13 +4,6 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#undef CRTDLL
8#ifndef _DLL
9#define _DLL
10#endif
11
12#define SPECIAL_CRTEXE
13
14#include <oscalls.h>7#include <oscalls.h>
15#include <internal.h>8#include <internal.h>
16#include <process.h>9#include <process.h>
...@@ -211,9 +204,9 @@ __tmainCRTStartup (void)...@@ -211,9 +204,9 @@ __tmainCRTStartup (void)
211{204{
212 void *lock_free = NULL;205 void *lock_free = NULL;
213 void *fiberid = ((PNT_TIB)NtCurrentTeb())->StackBase;206 void *fiberid = ((PNT_TIB)NtCurrentTeb())->StackBase;
214 int nested = FALSE;207 BOOL nested = FALSE;
215 while((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,208 while((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock,
216 fiberid, 0)) != 0)209 fiberid, NULL)) != 0)
217 {210 {
218 if (lock_free == fiberid)211 if (lock_free == fiberid)
219 {212 {
...@@ -242,7 +235,7 @@ __tmainCRTStartup (void)...@@ -242,7 +235,7 @@ __tmainCRTStartup (void)
242 }235 }
243 _ASSERTE(__native_startup_state == __initialized);236 _ASSERTE(__native_startup_state == __initialized);
244 if (! nested)237 if (! nested)
245 (VOID)InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);238 (VOID)InterlockedExchangePointer (&__native_startup_lock, NULL);
246 239
247 if (__dyn_tls_init_callback != NULL)240 if (__dyn_tls_init_callback != NULL)
248 __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL);241 __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL);
lib/libc/mingw/crt/crtexewin.c-1
...@@ -56,7 +56,6 @@ int _tmain (int __UNUSED_PARAM(argc),...@@ -56,7 +56,6 @@ int _tmain (int __UNUSED_PARAM(argc),
5656
57 {57 {
58 STARTUPINFO StartupInfo;58 STARTUPINFO StartupInfo;
59 memset (&StartupInfo, 0, sizeof (STARTUPINFO));
60 GetStartupInfo (&StartupInfo);59 GetStartupInfo (&StartupInfo);
61 if (StartupInfo.dwFlags & STARTF_USESHOWWINDOW)60 if (StartupInfo.dwFlags & STARTF_USESHOWWINDOW)
62 nShowCmd = StartupInfo.wShowWindow;61 nShowCmd = StartupInfo.wShowWindow;
lib/libc/mingw/crt/dll_argv.c-4
...@@ -4,10 +4,6 @@...@@ -4,10 +4,6 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#ifdef CRTDLL
8#undef CRTDLL
9#endif
10
11#include <internal.h>7#include <internal.h>
128
13extern int _dowildcard;9extern int _dowildcard;
lib/libc/mingw/crt/dllargv.c-4
...@@ -4,10 +4,6 @@...@@ -4,10 +4,6 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#ifdef CRTDLL
8#undef CRTDLL
9#endif
10
11#include <internal.h>7#include <internal.h>
128
13int __CRTDECL9int __CRTDECL
lib/libc/mingw/crt/natstart.c+2-2
...@@ -10,5 +10,5 @@...@@ -10,5 +10,5 @@
10_PGLOBAL10_PGLOBAL
11volatile unsigned int __native_dllmain_reason = UINT_MAX;11volatile unsigned int __native_dllmain_reason = UINT_MAX;
12volatile unsigned int __native_vcclrit_reason = UINT_MAX;12volatile unsigned int __native_vcclrit_reason = UINT_MAX;
13volatile __enative_startup_state __native_startup_state;13volatile __enative_startup_state __native_startup_state = __uninitialized;
14volatile void *__native_startup_lock;14void *volatile __native_startup_lock = NULL;
lib/libc/mingw/crt/tlssup.c-4
...@@ -6,10 +6,6 @@...@@ -6,10 +6,6 @@
6 * Written by Kai Tietz <kai.tietz@onevision.com>6 * Written by Kai Tietz <kai.tietz@onevision.com>
7 */7 */
88
9#ifdef CRTDLL
10#undef CRTDLL
11#endif
12
13#include <sect_attribs.h>9#include <sect_attribs.h>
1410
15#ifndef WIN32_LEAN_AND_MEAN11#ifndef WIN32_LEAN_AND_MEAN
lib/libc/mingw/def-include/crt-aliases.def.in+56-26
...@@ -137,8 +137,11 @@ ADD_UNDERSCORE(spawnve)...@@ -137,8 +137,11 @@ ADD_UNDERSCORE(spawnve)
137ADD_UNDERSCORE(spawnvp)137ADD_UNDERSCORE(spawnvp)
138ADD_UNDERSCORE(spawnvpe)138ADD_UNDERSCORE(spawnvpe)
139#endif139#endif
140#ifndef CRTDLL140#ifdef UCRTBASE
141; stat is provided by mingw to workaround trailing slash issue in _stat141F32(stat == _stat32)
142F64(stat == _stat64i32)
143#else
144; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
142#endif145#endif
143#ifdef NO_STRCMPI_ALIAS146#ifdef NO_STRCMPI_ALIAS
144; Symbol _strcmpi is natively present and defined in the library def file147; Symbol _strcmpi is natively present and defined in the library def file
...@@ -208,7 +211,11 @@ ADD_UNDERSCORE(write)...@@ -208,7 +211,11 @@ ADD_UNDERSCORE(write)
208; This is list of symbol aliases added in the Visual C++ 2.0 oldnames.lib library211; This is list of symbol aliases added in the Visual C++ 2.0 oldnames.lib library
209; All these symbols with leading underscore are present also in pre-2.0 CRT versions: crtdll.dll and msvcrt10.dll212; All these symbols with leading underscore are present also in pre-2.0 CRT versions: crtdll.dll and msvcrt10.dll
210; ADD_UNDERSCORE(control87)213; ADD_UNDERSCORE(control87)
214#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
215ADD_UNDERSCORE(fpreset)
216#else
211; ADD_UNDERSCORE(fpreset) ; Alias fpreset is set in CRT_fp10.c and CRT_fp8.c217; ADD_UNDERSCORE(fpreset) ; Alias fpreset is set in CRT_fp10.c and CRT_fp8.c
218#endif
212ADD_UNDERSCORE(wcsdup)219ADD_UNDERSCORE(wcsdup)
213ADD_UNDERSCORE(wcsicmp)220ADD_UNDERSCORE(wcsicmp)
214ADD_UNDERSCORE(wcsicoll)221ADD_UNDERSCORE(wcsicoll)
...@@ -222,7 +229,11 @@ ADD_UNDERSCORE(wcsupr)...@@ -222,7 +229,11 @@ ADD_UNDERSCORE(wcsupr)
222; This is list of symbol aliases added in the Visual C++ 4.0 oldnames.lib library229; This is list of symbol aliases added in the Visual C++ 4.0 oldnames.lib library
223; All these symbols with leading underscore are present also in pre-4.0 CRT versions: crtdll.dll, msvcrt10.dll and msvcrt20.dll230; All these symbols with leading underscore are present also in pre-4.0 CRT versions: crtdll.dll, msvcrt10.dll and msvcrt20.dll
224; ADD_UNDERSCORE(cabs)231; ADD_UNDERSCORE(cabs)
232#ifdef UCRTBASE
233; hypot is natively exported from UCRT
234#else
225ADD_UNDERSCORE(hypot)235ADD_UNDERSCORE(hypot)
236#endif
226ADD_UNDERSCORE(j0)237ADD_UNDERSCORE(j0)
227ADD_UNDERSCORE(j1)238ADD_UNDERSCORE(j1)
228ADD_UNDERSCORE(jn)239ADD_UNDERSCORE(jn)
...@@ -247,27 +258,26 @@ wcstok == wcstok_s...@@ -247,27 +258,26 @@ wcstok == wcstok_s
247ADD_UNDERSCORE(nextafter)258ADD_UNDERSCORE(nextafter)
248#endif259#endif
249260
250#if defined(DEF_ARM32) || defined(DEF_ARM64)
251; This is list of symbol aliases for C99 ARM long double functions261; This is list of symbol aliases for C99 ARM long double functions
252; They are defined as aliases to regular double symbols as on ARM, long double is equal to regular double262; They are defined as aliases to regular double symbols as on ARM, long double is equal to regular double
253acosl == acos263F_LD64(acosl == acos)
254asinl == asin264F_LD64(asinl == asin)
255atan2l == atan2265F_LD64(atan2l == atan2)
256atanl == atan266F_LD64(atanl == atan)
257ceill == ceil267F_LD64(ceill == ceil)
258cosl == cos268F_LD64(cosl == cos)
259expl == exp269F_LD64(expl == exp)
260floorl == floor270F_LD64(floorl == floor)
261fmodl == fmod271F_LD64(fmodl == fmod)
262log10l == log10272F_LD64(log10l == log10)
263logl == log273F_LD64(logl == log)
264; FIXME: Why is powl alias defined only for UCRT?274; FIXME: Why is powl alias defined only for UCRT?
265#ifdef UCRTBASE275#ifdef UCRTBASE
266powl == pow276F_LD64(powl == pow)
267#endif
268sinl == sin
269tanl == tan
270#endif277#endif
278F_LD64(sinl == sin)
279F_LD64(tanl == tan)
280F_LD64(_chgsignl == _chgsign)
271281
272; This is list of symbol aliases for C11 functions282; This is list of symbol aliases for C11 functions
273#ifdef UCRTBASE283#ifdef UCRTBASE
...@@ -290,6 +300,22 @@ ADD_UNDERSCORE(popen)...@@ -290,6 +300,22 @@ ADD_UNDERSCORE(popen)
290fgetpos64 == fgetpos300fgetpos64 == fgetpos
291fsetpos64 == fsetpos301fsetpos64 == fsetpos
292#endif302#endif
303#ifdef UCRTBASE
304stat32 == _stat32
305stat32i64 == _stat32i64
306stat64 == _stat64
307stat64i32 == _stat64i32
308#else
309; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
310#endif
311#ifdef FIXED_SIZE_SYMBOLS
312// NO_FIXED_SIZE_64_ALIAS means that DLL provides the native _fstat64 symbol
313#if defined(NO_FIXED_SIZE_64_ALIAS) && !defined(NO_FSTAT64_ALIAS)
314fstat64 == _fstat64
315#endif
316#else
317fstat64 == _fstat64
318#endif
293319
294; This is list of symbol aliases for GNU functions which are not part of POSIX or ISO C320; This is list of symbol aliases for GNU functions which are not part of POSIX or ISO C
295strcasecmp == _stricmp321strcasecmp == _stricmp
...@@ -545,19 +571,23 @@ __ms_vsprintf == vsprintf...@@ -545,19 +571,23 @@ __ms_vsprintf == vsprintf
545__ms_vwprintf == vwprintf571__ms_vwprintf == vwprintf
546__ms_wprintf == wprintf572__ms_wprintf == wprintf
547__ms_wscanf == wscanf573__ms_wscanf == wscanf
548#ifdef WITH_MS_VSCANF_ALIASES
549__ms_vfscanf == vfscanf
550__ms_vfwscanf == vfwscanf
551__ms_vscanf == vscanf
552__ms_vsscanf == vsscanf
553__ms_vswscanf == vswscanf
554__ms_vwscanf == vwscanf
555#endif
556#endif574#endif
557575
558; This is list of additional symbol aliases not available in any library as neither native symbols nor aliases576; This is list of additional symbol aliases not available in any library as neither native symbols nor aliases
559; FIXME: check if these really are needed577; FIXME: check if these really are needed
560578
579; This is wstat and wstat64 symbol available only in mingw but for a long time
580#ifdef UCRTBASE
581F32(wstat == _wstat32)
582F64(wstat == _wstat64i32)
583wstat32 == _wstat32
584wstat32i64 == _wstat32i64
585wstat64 == _wstat64
586wstat64i32 == _wstat64i32
587#else
588; wstat for non-UCRT is provided by mingw to workaround trailing slash issue in _wstat
589#endif
590
561; Origin of the symbol wcscmpi is unknown. This symbol is not present in591; Origin of the symbol wcscmpi is unknown. This symbol is not present in
562; crtdll.dll and neither in any msvcr* version. The only source of wcscmpi is592; crtdll.dll and neither in any msvcr* version. The only source of wcscmpi is
563; wcstr.h header file from the Microsoft Visual C++ 1.0 (32-bit for NT) and593; wcstr.h header file from the Microsoft Visual C++ 1.0 (32-bit for NT) and
lib/libc/mingw/def-include/func.def.in+13-5
...@@ -12,26 +12,26 @@...@@ -12,26 +12,26 @@
12// F_NON_I386 - function available on everything but i38612// F_NON_I386 - function available on everything but i386
13// F_NON_X64 - function available on everything but x86_6413// F_NON_X64 - function available on everything but x86_64
14// F_NON_ARM64 - function available on everything but arm6414// F_NON_ARM64 - function available on everything but arm64
15#if defined(DEF_X64)15#if defined(__x86_64__)
16#define F64(x) x16#define F64(x) x
17#define F_X64(x) x17#define F_X64(x) x
18#define F_X86_ANY(x) x18#define F_X86_ANY(x) x
19#define F_NON_I386(x) x19#define F_NON_I386(x) x
20#define F_NON_ARM64(x) x20#define F_NON_ARM64(x) x
21#elif defined(DEF_I386)21#elif defined(__i386__)
22#define F32(x) x22#define F32(x) x
23#define F_I386(x) x23#define F_I386(x) x
24#define F_X86_ANY(x) x24#define F_X86_ANY(x) x
25#define F_NON_X64(x) x25#define F_NON_X64(x) x
26#define F_NON_ARM64(x) x26#define F_NON_ARM64(x) x
27#elif defined(DEF_ARM32)27#elif defined(__arm__)
28#define F32(x) x28#define F32(x) x
29#define F_ARM32(x) x29#define F_ARM32(x) x
30#define F_ARM_ANY(x) x30#define F_ARM_ANY(x) x
31#define F_NON_I386(x) x31#define F_NON_I386(x) x
32#define F_NON_X64(x) x32#define F_NON_X64(x) x
33#define F_NON_ARM64(x) x33#define F_NON_ARM64(x) x
34#elif defined(DEF_ARM64)34#elif defined(__aarch64__)
35#define F64(x) x35#define F64(x) x
36#define F_ARM64(x) x36#define F_ARM64(x) x
37#define F_ARM_ANY(x) x37#define F_ARM_ANY(x) x
...@@ -75,9 +75,17 @@...@@ -75,9 +75,17 @@
75#define F_NON_ARM64(x)75#define F_NON_ARM64(x)
76#endif76#endif
7777
78#if defined(DEF_I386)78#if defined(__i386__)
79#define STDCALL_DECORATED_EXPORT(symbol) symbol == _ ## symbol79#define STDCALL_DECORATED_EXPORT(symbol) symbol == _ ## symbol
80#define FASTCALL_DECORATED_EXPORT(symbol) symbol == symbol80#define FASTCALL_DECORATED_EXPORT(symbol) symbol == symbol
81#endif81#endif
8282
83#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
84#define F_LD64(x) x
85#define F_LD80(x)
86#else
87#define F_LD64(x)
88#define F_LD80(x) x
89#endif
90
83#endif // FUNC_DEF_IN91#endif // FUNC_DEF_IN
lib/libc/mingw/gdtoa/strtodnrp.c+1-2
...@@ -85,8 +85,7 @@ double __cdecl...@@ -85,8 +85,7 @@ double __cdecl
85__mingw_strtod (const char * __restrict__ src, char ** __restrict__ endptr)85__mingw_strtod (const char * __restrict__ src, char ** __restrict__ endptr)
86 __attribute__((alias("__strtod")));86 __attribute__((alias("__strtod")));
8787
88#if !(defined(_AMD64_) || defined(__x86_64__) || \88#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
89 defined(_X86_) || defined(__i386__))
90/* For systems other than x86, where long double == double, provide the89/* For systems other than x86, where long double == double, provide the
91 * long double functions as aliases to __strtod. */90 * long double functions as aliases to __strtod. */
9291
lib/libc/mingw/gdtoa/strtopx.c+12-11
...@@ -53,8 +53,19 @@ THIS SOFTWARE....@@ -53,8 +53,19 @@ THIS SOFTWARE.
53#define _4 053#define _4 0
54#endif54#endif
5555
56#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
57/* For ARM, where long double == double, provide the long double function as
58 * an alias for __strtod. Do this in a separate object file from other
59 * functions, to avoid linker conflicts if object files import both 'strtold'
60 * from libucrt*.a and the object file providing '__strtod'. */
61long double __cdecl
62strtold (const char * __restrict__ src, char ** __restrict__ endptr)
63{
64 return __mingw_strtod(src, endptr);
65}
66
56/* This is specific to the x86 80 bit long doubles. */67/* This is specific to the x86 80 bit long doubles. */
57#if defined(_AMD64_) || defined(__x86_64__) || \68#elif defined(_AMD64_) || defined(__x86_64__) || \
58 defined(_X86_) || defined(__i386__)69 defined(_X86_) || defined(__i386__)
5970
60typedef union lD {71typedef union lD {
...@@ -133,14 +144,4 @@ long double __cdecl...@@ -133,14 +144,4 @@ long double __cdecl
133strtold (const char * __restrict__ src, char ** __restrict__ endptr)144strtold (const char * __restrict__ src, char ** __restrict__ endptr)
134 __attribute__((alias("__strtold")));145 __attribute__((alias("__strtold")));
135146
136#elif defined(__arm__) || defined(__aarch64__) || defined(_ARM_) || defined(_ARM64_)
137/* For ARM, where long double == double, provide the long double function as
138 * an alias for __strtod. Do this in a separate object file from other
139 * functions, to avoid linker conflicts if object files import both 'strtold'
140 * from libucrt*.a and the object file providing '__strtod'. */
141long double __cdecl
142strtold (const char * __restrict__ src, char ** __restrict__ endptr)
143{
144 return __mingw_strtod(src, endptr);
145}
146#endif147#endif
lib/libc/mingw/include/internal.h+155-1
...@@ -14,6 +14,7 @@ extern "C" {...@@ -14,6 +14,7 @@ extern "C" {
14#endif14#endif
1515
16#include <limits.h>16#include <limits.h>
17#include <fenv.h>
17#include <windows.h>18#include <windows.h>
1819
19#pragma pack(push,_CRT_PACKING)20#pragma pack(push,_CRT_PACKING)
...@@ -130,7 +131,7 @@ extern "C" {...@@ -130,7 +131,7 @@ extern "C" {
130 } __enative_startup_state;131 } __enative_startup_state;
131132
132 extern volatile __enative_startup_state __native_startup_state;133 extern volatile __enative_startup_state __native_startup_state;
133 extern volatile void *__native_startup_lock;134 extern void *volatile __native_startup_lock;
134135
135 extern volatile unsigned int __native_dllmain_reason;136 extern volatile unsigned int __native_dllmain_reason;
136 extern volatile unsigned int __native_vcclrit_reason;137 extern volatile unsigned int __native_vcclrit_reason;
...@@ -154,6 +155,159 @@ extern "C" {...@@ -154,6 +155,159 @@ extern "C" {
154# define __mingw_has_sse() 0155# define __mingw_has_sse() 0
155#endif156#endif
156157
158#if defined(__i386__) || defined(__x86_64__)
159enum fenv_masks
160{
161 /* x87 encoding constants */
162 FENV_X_INVALID = 0x00100010,
163 FENV_X_DENORMAL = 0x00200020,
164 FENV_X_ZERODIVIDE = 0x00080008,
165 FENV_X_OVERFLOW = 0x00040004,
166 FENV_X_UNDERFLOW = 0x00020002,
167 FENV_X_INEXACT = 0x00010001,
168 FENV_X_AFFINE = 0x00004000,
169 FENV_X_UP = 0x00800200,
170 FENV_X_DOWN = 0x00400100,
171 FENV_X_24 = 0x00002000,
172 FENV_X_53 = 0x00001000,
173 /* SSE encoding constants: they share the same lower word as their x87 counterparts
174 * but differ in the upper word */
175 FENV_Y_INVALID = 0x10000010,
176 FENV_Y_DENORMAL = 0x20000020,
177 FENV_Y_ZERODIVIDE = 0x08000008,
178 FENV_Y_OVERFLOW = 0x04000004,
179 FENV_Y_UNDERFLOW = 0x02000002,
180 FENV_Y_INEXACT = 0x01000001,
181 FENV_Y_UP = 0x80000200,
182 FENV_Y_DOWN = 0x40000100,
183 FENV_Y_FLUSH = 0x00000400,
184 FENV_Y_FLUSH_SAVE = 0x00000800
185};
186
187/* encodes the x87 (represented as x) or SSE (represented as y) control/status word in a ulong */
188static inline unsigned long fenv_encode(unsigned int x, unsigned int y)
189{
190 unsigned long ret = 0;
191
192 if (x & _EM_INVALID) ret |= FENV_X_INVALID;
193 if (x & _EM_DENORMAL) ret |= FENV_X_DENORMAL;
194 if (x & _EM_ZERODIVIDE) ret |= FENV_X_ZERODIVIDE;
195 if (x & _EM_OVERFLOW) ret |= FENV_X_OVERFLOW;
196 if (x & _EM_UNDERFLOW) ret |= FENV_X_UNDERFLOW;
197 if (x & _EM_INEXACT) ret |= FENV_X_INEXACT;
198 if (x & _IC_AFFINE) ret |= FENV_X_AFFINE;
199 if (x & _RC_UP) ret |= FENV_X_UP;
200 if (x & _RC_DOWN) ret |= FENV_X_DOWN;
201 if (x & _PC_24) ret |= FENV_X_24;
202 if (x & _PC_53) ret |= FENV_X_53;
203
204 if (y & _EM_INVALID) ret |= FENV_Y_INVALID;
205 if (y & _EM_DENORMAL) ret |= FENV_Y_DENORMAL;
206 if (y & _EM_ZERODIVIDE) ret |= FENV_Y_ZERODIVIDE;
207 if (y & _EM_OVERFLOW) ret |= FENV_Y_OVERFLOW;
208 if (y & _EM_UNDERFLOW) ret |= FENV_Y_UNDERFLOW;
209 if (y & _EM_INEXACT) ret |= FENV_Y_INEXACT;
210 if (y & _RC_UP) ret |= FENV_Y_UP;
211 if (y & _RC_DOWN) ret |= FENV_Y_DOWN;
212 if (y & _DN_FLUSH) ret |= FENV_Y_FLUSH;
213 if (y & _DN_FLUSH_OPERANDS_SAVE_RESULTS) ret |= FENV_Y_FLUSH_SAVE;
214
215 return ret;
216}
217
218/* decodes the x87 (represented as x) or SSE (represented as y) control/status word in a ulong */
219static inline BOOL fenv_decode(unsigned long enc, unsigned int *x, unsigned int *y)
220{
221 *x = *y = 0;
222 if ((enc & FENV_X_INVALID) == FENV_X_INVALID) *x |= _EM_INVALID;
223 if ((enc & FENV_X_DENORMAL) == FENV_X_DENORMAL) *x |= _EM_DENORMAL;
224 if ((enc & FENV_X_ZERODIVIDE) == FENV_X_ZERODIVIDE) *x |= _EM_ZERODIVIDE;
225 if ((enc & FENV_X_OVERFLOW) == FENV_X_OVERFLOW) *x |= _EM_OVERFLOW;
226 if ((enc & FENV_X_UNDERFLOW) == FENV_X_UNDERFLOW) *x |= _EM_UNDERFLOW;
227 if ((enc & FENV_X_INEXACT) == FENV_X_INEXACT) *x |= _EM_INEXACT;
228 if ((enc & FENV_X_AFFINE) == FENV_X_AFFINE) *x |= _IC_AFFINE;
229 if ((enc & FENV_X_UP) == FENV_X_UP) *x |= _RC_UP;
230 if ((enc & FENV_X_DOWN) == FENV_X_DOWN) *x |= _RC_DOWN;
231 if ((enc & FENV_X_24) == FENV_X_24) *x |= _PC_24;
232 if ((enc & FENV_X_53) == FENV_X_53) *x |= _PC_53;
233
234 if ((enc & FENV_Y_INVALID) == FENV_Y_INVALID) *y |= _EM_INVALID;
235 if ((enc & FENV_Y_DENORMAL) == FENV_Y_DENORMAL) *y |= _EM_DENORMAL;
236 if ((enc & FENV_Y_ZERODIVIDE) == FENV_Y_ZERODIVIDE) *y |= _EM_ZERODIVIDE;
237 if ((enc & FENV_Y_OVERFLOW) == FENV_Y_OVERFLOW) *y |= _EM_OVERFLOW;
238 if ((enc & FENV_Y_UNDERFLOW) == FENV_Y_UNDERFLOW) *y |= _EM_UNDERFLOW;
239 if ((enc & FENV_Y_INEXACT) == FENV_Y_INEXACT) *y |= _EM_INEXACT;
240 if ((enc & FENV_Y_UP) == FENV_Y_UP) *y |= _RC_UP;
241 if ((enc & FENV_Y_DOWN) == FENV_Y_DOWN) *y |= _RC_DOWN;
242 if ((enc & FENV_Y_FLUSH) == FENV_Y_FLUSH) *y |= _DN_FLUSH;
243 if ((enc & FENV_Y_FLUSH_SAVE) == FENV_Y_FLUSH_SAVE) *y |= _DN_FLUSH_OPERANDS_SAVE_RESULTS;
244
245 return fenv_encode(*x, *y) == enc;
246}
247#else
248static inline unsigned long fenv_encode(unsigned int x, unsigned int y)
249{
250 /* Encode _EM_DENORMAL as 0x20 for Windows compatibility. */
251 if (y & _EM_DENORMAL)
252 y = (y & ~_EM_DENORMAL) | 0x20;
253
254 return x | y;
255}
256
257static inline BOOL fenv_decode(unsigned long enc, unsigned int *x, unsigned int *y)
258{
259 /* Decode 0x20 as _EM_DENORMAL. */
260 if (enc & 0x20)
261 enc = (enc & ~0x20) | _EM_DENORMAL;
262
263 *x = *y = enc;
264 return TRUE;
265}
266#endif
267
268void __mingw_setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask );
269void __mingw_setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask );
270unsigned int __mingw_controlfp(unsigned int newval, unsigned int mask);
271#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
272int __mingw_control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *);
273#endif
274
275static inline unsigned int __mingw_statusfp(void)
276{
277 unsigned int flags = 0;
278#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
279 unsigned int x86_sw, sse2_sw = 0;
280 __mingw_setfp(NULL, 0, &x86_sw, 0);
281 if (__mingw_has_sse())
282 __mingw_setfp_sse(NULL, 0, &sse2_sw, 0);
283 flags = x86_sw | sse2_sw;
284#else
285 __mingw_setfp(NULL, 0, &flags, 0);
286#endif
287 return flags;
288}
289
290/* Use naked functions only on Clang. GCC doesn’t support them on ARM targets and
291 * has broken behavior on x86_64 by emitting .seh_endprologue. */
292#ifndef __clang__
293
294#define __ASM_DEFINE_FUNC(rettype, name, args, code) \
295 asm(".text\n\t" \
296 ".p2align 2\n\t" \
297 ".globl " __MINGW64_STRINGIFY(__MINGW_USYMBOL(name)) "\n\t" \
298 ".def " __MINGW64_STRINGIFY(__MINGW_USYMBOL(name)) "; .scl 2; .type 32; .endef\n\t" \
299 __MINGW64_STRINGIFY(__MINGW_USYMBOL(name)) ":\n\t" \
300 code "\n\t");
301
302#else
303
304#define __ASM_DEFINE_FUNC(rettype, name, args, code) \
305 rettype __attribute__((naked)) name args { \
306 asm(code "\n\t"); \
307 }
308
309#endif
310
157#ifdef __cplusplus311#ifdef __cplusplus
158}312}
159#endif313#endif
lib/libc/mingw/intrincs/RtlSecureZeroMemory.c+1-1
...@@ -4,7 +4,7 @@...@@ -4,7 +4,7 @@
4PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt)4PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt)
5{5{
6 volatile char *vptr = (volatile char *)ptr;6 volatile char *vptr = (volatile char *)ptr;
7#ifdef __x86_647#if defined(__x86_64__) && !defined(__arm64ec__)
8 __stosb ((PBYTE)((DWORD64)vptr),0,cnt);8 __stosb ((PBYTE)((DWORD64)vptr),0,cnt);
9#else9#else
10 while (cnt != 0)10 while (cnt != 0)
lib/libc/mingw/lib-common/api-ms-win-crt-convert-l1-1-0.def.in+4-4
...@@ -47,7 +47,7 @@ _strtoi64...@@ -47,7 +47,7 @@ _strtoi64
47_strtoi64_l47_strtoi64_l
48_strtoimax_l48_strtoimax_l
49_strtol_l49_strtol_l
50F_ARM_ANY(_strtold_l) ; Can't use long double functions from the CRT on x8650F_LD64(_strtold_l) ; Can't use long double functions from the CRT on x86
51_strtoll_l51_strtoll_l
52_strtoui6452_strtoui64
53_strtoui64_l53_strtoui64_l
...@@ -68,7 +68,7 @@ _wcstoi64...@@ -68,7 +68,7 @@ _wcstoi64
68_wcstoi64_l68_wcstoi64_l
69_wcstoimax_l69_wcstoimax_l
70_wcstol_l70_wcstol_l
71F_ARM_ANY(_wcstold_l) ; Can't use long double functions from the CRT on x8671F_LD64(_wcstold_l) ; Can't use long double functions from the CRT on x86
72_wcstoll_l72_wcstoll_l
73_wcstombs_l73_wcstombs_l
74_wcstombs_s_l74_wcstombs_s_l
...@@ -108,7 +108,7 @@ strtod...@@ -108,7 +108,7 @@ strtod
108strtof108strtof
109strtoimax109strtoimax
110strtol110strtol
111F_ARM_ANY(strtold) ; Can't use long double functions from the CRT on x86111F_LD64(strtold) ; Can't use long double functions from the CRT on x86
112strtoll112strtoll
113strtoul113strtoul
114strtoull114strtoull
...@@ -121,7 +121,7 @@ wcstod...@@ -121,7 +121,7 @@ wcstod
121wcstof121wcstof
122wcstoimax122wcstoimax
123wcstol123wcstol
124F_ARM_ANY(wcstold) ; Can't use long double functions from the CRT on x86124F_LD64(wcstold) ; Can't use long double functions from the CRT on x86
125wcstoll125wcstoll
126wcstombs126wcstombs
127wcstombs_s127wcstombs_s
lib/libc/mingw/lib-common/api-ms-win-crt-filesystem-l1-1-0.def.in+13
...@@ -39,6 +39,7 @@ F64(_fstati64 == _fstat64)...@@ -39,6 +39,7 @@ F64(_fstati64 == _fstat64)
39_fstat3239_fstat32
40_fstat32i6440_fstat32i64
41_fstat6441_fstat64
42fstat64 == _fstat64
42_fstat64i3243_fstat64i32
43_fullpath44_fullpath
44_getdiskfree45_getdiskfree
...@@ -53,14 +54,20 @@ _rmdir...@@ -53,14 +54,20 @@ _rmdir
53rmdir == _rmdir54rmdir == _rmdir
54_splitpath55_splitpath
55_splitpath_s56_splitpath_s
57F32(stat == _stat32)
58F64(stat == _stat64i32)
56F32(_stat == _stat32)59F32(_stat == _stat32)
57F64(_stat == _stat64i32)60F64(_stat == _stat64i32)
58F32(_stati64 == _stat32i64)61F32(_stati64 == _stat32i64)
59F64(_stati64 == _stat64)62F64(_stati64 == _stat64)
60_stat3263_stat32
64stat32 == _stat32
61_stat32i6465_stat32i64
66stat32i64 == _stat32i64
62_stat6467_stat64
68stat64 == _stat64
63_stat64i3269_stat64i32
70stat64i32 == _stat64i32
64_umask71_umask
65umask == _umask72umask == _umask
66_umask_s73_umask_s
...@@ -96,14 +103,20 @@ _wrename...@@ -96,14 +103,20 @@ _wrename
96_wrmdir103_wrmdir
97_wsplitpath104_wsplitpath
98_wsplitpath_s105_wsplitpath_s
106F32(wstat == _wstat32)
107F64(wstat == _wstat64i32)
99F32(_wstat == _wstat32)108F32(_wstat == _wstat32)
100F64(_wstat == _wstat64i32)109F64(_wstat == _wstat64i32)
101F32(_wstati64 == _wstat32i64)110F32(_wstati64 == _wstat32i64)
102F64(_wstati64 == _wstat64)111F64(_wstati64 == _wstat64)
103_wstat32112_wstat32
113wstat32 == _wstat32
104_wstat32i64114_wstat32i64
115wstat32i64 == _wstat32i64
105_wstat64116_wstat64
117wstat64 == _wstat64
106_wstat64i32118_wstat64i32
119wstat64i32 == _wstat64i32
107_wunlink120_wunlink
108remove121remove
109rename122rename
lib/libc/mingw/lib-common/api-ms-win-crt-math-l1-1-0.def.in+80-79
...@@ -4,7 +4,7 @@ EXPORTS...@@ -4,7 +4,7 @@ EXPORTS
44
5#include "func.def.in"5#include "func.def.in"
66
7#ifdef DEF_I3867#ifdef __i386__
8_CIacos8_CIacos
9_CIasin9_CIasin
10_CIatan10_CIatan
...@@ -31,7 +31,7 @@ _FCmulcr...@@ -31,7 +31,7 @@ _FCmulcr
31_LCbuild31_LCbuild
32_LCmulcc32_LCmulcc
33_LCmulcr33_LCmulcr
34#ifdef DEF_I38634#ifdef __i386__
35__libm_sse2_acos35__libm_sse2_acos
36__libm_sse2_acosf36__libm_sse2_acosf
37__libm_sse2_asin37__libm_sse2_asin
...@@ -59,6 +59,7 @@ __setusermatherr...@@ -59,6 +59,7 @@ __setusermatherr
59_cabs DATA59_cabs DATA
60_chgsign60_chgsign
61chgsign == _chgsign61chgsign == _chgsign
62F_LD64(_chgsignl == _chgsign)
62_chgsignf63_chgsignf
63_copysign64_copysign
64_copysignf65_copysignf
...@@ -94,9 +95,9 @@ finite == _finite...@@ -94,9 +95,9 @@ finite == _finite
94F_NON_I386(_finitef)95F_NON_I386(_finitef)
95_fpclass96_fpclass
96fpclass == _fpclass97fpclass == _fpclass
97_fpclassf98F_X64(_fpclassf)
98F_I386(_ftol)99F_I386(_ftol)
99_get_FMA3_enable100F_X64(_get_FMA3_enable)
100_hypot101_hypot
101_hypotf102_hypotf
102_isnan103_isnan
...@@ -118,7 +119,7 @@ _ldsign...@@ -118,7 +119,7 @@ _ldsign
118_ldsin119_ldsin
119_ldtest120_ldtest
120_ldunscale121_ldunscale
121#ifdef DEF_I386122#ifdef __i386__
122_libm_sse2_acos_precise123_libm_sse2_acos_precise
123_libm_sse2_asin_precise124_libm_sse2_asin_precise
124_libm_sse2_atan_precise125_libm_sse2_atan_precise
...@@ -137,7 +138,7 @@ _nextafter...@@ -137,7 +138,7 @@ _nextafter
137F_X64(_nextafterf)138F_X64(_nextafterf)
138_scalb139_scalb
139F_X64(_scalbf)140F_X64(_scalbf)
140F64(_set_FMA3_enable)141F_X64(_set_FMA3_enable)
141F_I386(_set_SSE2_enable)142F_I386(_set_SSE2_enable)
142_y0143_y0
143y0 == _y0144y0 == _y0
...@@ -147,224 +148,224 @@ _yn...@@ -147,224 +148,224 @@ _yn
147yn == _yn148yn == _yn
148acos149acos
149F_NON_I386(acosf)150F_NON_I386(acosf)
150F_ARM_ANY(acosl == acos)151F_LD64(acosl == acos)
151acosh152acosh
152acoshf153acoshf
153F_ARM_ANY(acoshl) ; Can't use long double functions from the CRT on x86154F_LD64(acoshl) ; Can't use long double functions from the CRT on x86
154asin155asin
155F_NON_I386(asinf)156F_NON_I386(asinf)
156F_ARM_ANY(asinl == asin)157F_LD64(asinl == asin)
157asinh158asinh
158asinhf159asinhf
159F_ARM_ANY(asinhl) ; Can't use long double functions from the CRT on x86160F_LD64(asinhl) ; Can't use long double functions from the CRT on x86
160atan161atan
161atan2162atan2
162F_NON_I386(atan2f)163F_NON_I386(atan2f)
163F_ARM_ANY(atan2l == atan2)164F_LD64(atan2l == atan2)
164F_NON_I386(atanf)165F_NON_I386(atanf)
165F_ARM_ANY(atanl == atan)166F_LD64(atanl == atan)
166atanh167atanh
167atanhf168atanhf
168F_ARM_ANY(atanhl) ; Can't use long double functions from the CRT on x86169F_LD64(atanhl) ; Can't use long double functions from the CRT on x86
169cabs170cabs
170cabsf171cabsf
171F_ARM_ANY(cabsl) ; Can't use long double functions from the CRT on x86172F_LD64(cabsl) ; Can't use long double functions from the CRT on x86
172cacos173cacos
173cacosf174cacosf
174cacosh175cacosh
175cacoshf176cacoshf
176F_ARM_ANY(cacoshl) ; Can't use long double functions from the CRT on x86177F_LD64(cacoshl) ; Can't use long double functions from the CRT on x86
177F_ARM_ANY(cacosl) ; Can't use long double functions from the CRT on x86178F_LD64(cacosl) ; Can't use long double functions from the CRT on x86
178carg179carg
179cargf180cargf
180F_ARM_ANY(cargl) ; Can't use long double functions from the CRT on x86181F_LD64(cargl) ; Can't use long double functions from the CRT on x86
181casin182casin
182casinf183casinf
183casinh184casinh
184casinhf185casinhf
185F_ARM_ANY(casinhl) ; Can't use long double functions from the CRT on x86186F_LD64(casinhl) ; Can't use long double functions from the CRT on x86
186F_ARM_ANY(casinl) ; Can't use long double functions from the CRT on x86187F_LD64(casinl) ; Can't use long double functions from the CRT on x86
187catan188catan
188catanf189catanf
189catanh190catanh
190catanhf191catanhf
191F_ARM_ANY(catanhl) ; Can't use long double functions from the CRT on x86192F_LD64(catanhl) ; Can't use long double functions from the CRT on x86
192F_ARM_ANY(catanl) ; Can't use long double functions from the CRT on x86193F_LD64(catanl) ; Can't use long double functions from the CRT on x86
193cbrt194cbrt
194cbrtf195cbrtf
195F_ARM_ANY(cbrtl) ; Can't use long double functions from the CRT on x86196F_LD64(cbrtl) ; Can't use long double functions from the CRT on x86
196ccos197ccos
197ccosf198ccosf
198ccosh199ccosh
199ccoshf200ccoshf
200F_ARM_ANY(ccoshl) ; Can't use long double functions from the CRT on x86201F_LD64(ccoshl) ; Can't use long double functions from the CRT on x86
201F_ARM_ANY(ccosl) ; Can't use long double functions from the CRT on x86202F_LD64(ccosl) ; Can't use long double functions from the CRT on x86
202ceil203ceil
203F_NON_I386(ceilf)204F_NON_I386(ceilf)
204F_ARM_ANY(ceill == ceil)205F_LD64(ceill == ceil)
205cexp206cexp
206cexpf207cexpf
207F_ARM_ANY(cexpl) ; Can't use long double functions from the CRT on x86208F_LD64(cexpl) ; Can't use long double functions from the CRT on x86
208cimag209cimag
209cimagf210cimagf
210F_ARM_ANY(cimagl) ; Can't use long double functions from the CRT on x86211F_LD64(cimagl) ; Can't use long double functions from the CRT on x86
211clog212clog
212clog10213clog10
213clog10f214clog10f
214F_ARM_ANY(clog10l) ; Can't use long double functions from the CRT on x86215F_LD64(clog10l) ; Can't use long double functions from the CRT on x86
215clogf216clogf
216F_ARM_ANY(clogl) ; Can't use long double functions from the CRT on x86217F_LD64(clogl) ; Can't use long double functions from the CRT on x86
217conj218conj
218conjf219conjf
219F_ARM_ANY(conjl) ; Can't use long double functions from the CRT on x86220F_LD64(conjl) ; Can't use long double functions from the CRT on x86
220copysign221copysign
221copysignf222copysignf
222F_ARM_ANY(copysignl) ; Can't use long double functions from the CRT on x86223F_LD64(copysignl) ; Can't use long double functions from the CRT on x86
223cos224cos
224F_NON_I386(cosf)225F_NON_I386(cosf)
225F_ARM_ANY(cosl == cos)226F_LD64(cosl == cos)
226cosh227cosh
227F_NON_I386(coshf)228F_NON_I386(coshf)
228cpow229cpow
229cpowf230cpowf
230F_ARM_ANY(cpowl) ; Can't use long double functions from the CRT on x86231F_LD64(cpowl) ; Can't use long double functions from the CRT on x86
231cproj232cproj
232cprojf233cprojf
233F_ARM_ANY(cprojl) ; Can't use long double functions from the CRT on x86234F_LD64(cprojl) ; Can't use long double functions from the CRT on x86
234creal235creal
235crealf236crealf
236F_ARM_ANY(creall) ; Can't use long double functions from the CRT on x86237F_LD64(creall) ; Can't use long double functions from the CRT on x86
237csin238csin
238csinf239csinf
239csinh240csinh
240csinhf241csinhf
241F_ARM_ANY(csinhl) ; Can't use long double functions from the CRT on x86242F_LD64(csinhl) ; Can't use long double functions from the CRT on x86
242F_ARM_ANY(csinl) ; Can't use long double functions from the CRT on x86243F_LD64(csinl) ; Can't use long double functions from the CRT on x86
243csqrt244csqrt
244csqrtf245csqrtf
245F_ARM_ANY(csqrtl) ; Can't use long double functions from the CRT on x86246F_LD64(csqrtl) ; Can't use long double functions from the CRT on x86
246ctan247ctan
247ctanf248ctanf
248ctanh249ctanh
249ctanhf250ctanhf
250F_ARM_ANY(ctanhl) ; Can't use long double functions from the CRT on x86251F_LD64(ctanhl) ; Can't use long double functions from the CRT on x86
251F_ARM_ANY(ctanl) ; Can't use long double functions from the CRT on x86252F_LD64(ctanl) ; Can't use long double functions from the CRT on x86
252erf253erf
253erfc254erfc
254erfcf255erfcf
255F_ARM_ANY(erfcl) ; Can't use long double functions from the CRT on x86256F_LD64(erfcl) ; Can't use long double functions from the CRT on x86
256erff257erff
257F_ARM_ANY(erfl) ; Can't use long double functions from the CRT on x86258F_LD64(erfl) ; Can't use long double functions from the CRT on x86
258exp259exp
259exp2260exp2
260exp2f261exp2f
261F_ARM_ANY(exp2l) ; Can't use long double functions from the CRT on x86262F_LD64(exp2l) ; Can't use long double functions from the CRT on x86
262F_NON_I386(expf)263F_NON_I386(expf)
263F_ARM_ANY(expl == exp)264F_LD64(expl == exp)
264expm1265expm1
265expm1f266expm1f
266F_ARM_ANY(expm1l) ; Can't use long double functions from the CRT on x86267F_LD64(expm1l) ; Can't use long double functions from the CRT on x86
267fabs268fabs
268F_ARM_ANY(fabsf)269F_ARM_ANY(fabsf)
269fdim270fdim
270fdimf271fdimf
271F_ARM_ANY(fdiml) ; Can't use long double functions from the CRT on x86272F_LD64(fdiml) ; Can't use long double functions from the CRT on x86
272floor273floor
273F_NON_I386(floorf)274F_NON_I386(floorf)
274F_ARM_ANY(floorl == floor)275F_LD64(floorl == floor)
275fma276fma
276fmaf277fmaf
277F_ARM_ANY(fmal) ; Can't use long double functions from the CRT on x86278F_LD64(fmal) ; Can't use long double functions from the CRT on x86
278fmax279fmax
279fmaxf280fmaxf
280F_ARM_ANY(fmaxl) ; Can't use long double functions from the CRT on x86281F_LD64(fmaxl) ; Can't use long double functions from the CRT on x86
281fmin282fmin
282fminf283fminf
283F_ARM_ANY(fminl) ; Can't use long double functions from the CRT on x86284F_LD64(fminl) ; Can't use long double functions from the CRT on x86
284fmod285fmod
285F_NON_I386(fmodf)286F_NON_I386(fmodf)
286F_ARM_ANY(fmodl == fmod)287F_LD64(fmodl == fmod)
287frexp288frexp
288hypot289hypot
289ilogb290ilogb
290ilogbf291ilogbf
291F_ARM_ANY(ilogbl) ; Can't use long double functions from the CRT on x86292F_LD64(ilogbl) ; Can't use long double functions from the CRT on x86
292ldexp293ldexp
293; The UCRT lgamma functions don't set/provide the signgam variable like294; The UCRT lgamma functions don't set/provide the signgam variable like
294; the mingw ones do. Therefore prefer the libmingwex version instead.295; the mingw ones do. Therefore prefer the libmingwex version instead.
295lgamma DATA296lgamma DATA
296lgammaf DATA297lgammaf DATA
297F_ARM_ANY(lgammal DATA) ; Can't use long double functions from the CRT on x86298F_LD64(lgammal DATA) ; Can't use long double functions from the CRT on x86
298llrint299llrint
299llrintf300llrintf
300F_ARM_ANY(llrintl) ; Can't use long double functions from the CRT on x86301F_LD64(llrintl) ; Can't use long double functions from the CRT on x86
301llround302llround
302llroundf303llroundf
303F_ARM_ANY(llroundl) ; Can't use long double functions from the CRT on x86304F_LD64(llroundl) ; Can't use long double functions from the CRT on x86
304log305log
305log10306log10
306F_NON_I386(log10f)307F_NON_I386(log10f)
307F_ARM_ANY(log10l == log10)308F_LD64(log10l == log10)
308log1p309log1p
309log1pf310log1pf
310F_ARM_ANY(log1pl) ; Can't use long double functions from the CRT on x86311F_LD64(log1pl) ; Can't use long double functions from the CRT on x86
311log2312log2
312log2f313log2f
313F_ARM_ANY(log2l) ; Can't use long double functions from the CRT on x86314F_LD64(log2l) ; Can't use long double functions from the CRT on x86
314logb315logb
315logbf316logbf
316F_ARM_ANY(logbl) ; Can't use long double functions from the CRT on x86317F_LD64(logbl) ; Can't use long double functions from the CRT on x86
317F_NON_I386(logf)318F_NON_I386(logf)
318F_ARM_ANY(logl == log)319F_LD64(logl == log)
319lrint320lrint
320lrintf321lrintf
321F_ARM_ANY(lrintl) ; Can't use long double functions from the CRT on x86322F_LD64(lrintl) ; Can't use long double functions from the CRT on x86
322lround323lround
323lroundf324lroundf
324F_ARM_ANY(lroundl) ; Can't use long double functions from the CRT on x86325F_LD64(lroundl) ; Can't use long double functions from the CRT on x86
325modf326modf
326F_NON_I386(modff)327F_NON_I386(modff)
327nan328nan
328nanf329nanf
329F_ARM_ANY(nanl) ; Can't use long double functions from the CRT on x86330F_LD64(nanl) ; Can't use long double functions from the CRT on x86
330nearbyint331nearbyint
331nearbyintf332nearbyintf
332F_ARM_ANY(nearbyintl) ; Can't use long double functions from the CRT on x86333F_LD64(nearbyintl) ; Can't use long double functions from the CRT on x86
333nextafter334nextafter
334nextafterf335nextafterf
335F_ARM_ANY(nextafterl) ; Can't use long double functions from the CRT on x86336F_LD64(nextafterl) ; Can't use long double functions from the CRT on x86
336; All of the nexttoward functions take the second parameter as long double,337; All of the nexttoward functions take the second parameter as long double,
337; making them unusable for x86.338; making them unusable for x86.
338F_ARM_ANY(nexttoward) ; Can't use long double functions from the CRT on x86339F_LD64(nexttoward) ; Can't use long double functions from the CRT on x86
339F_ARM_ANY(nexttowardf) ; Can't use long double functions from the CRT on x86340F_LD64(nexttowardf) ; Can't use long double functions from the CRT on x86
340F_ARM_ANY(nexttowardl) ; Can't use long double functions from the CRT on x86341F_LD64(nexttowardl) ; Can't use long double functions from the CRT on x86
341norm342norm
342normf343normf
343norml344norml
344pow345pow
345F_NON_I386(powf) ; Missing in Wine's ucrtbase.dll for i386 in Wine 9.15 and older346F_NON_I386(powf) ; Missing in Wine's ucrtbase.dll for i386 in Wine 9.15 and older
346F_ARM_ANY(powl == pow)347F_LD64(powl == pow)
347remainder348remainder
348remainderf349remainderf
349F_ARM_ANY(remainderl) ; Can't use long double functions from the CRT on x86350F_LD64(remainderl) ; Can't use long double functions from the CRT on x86
350remquo351remquo
351remquof352remquof
352F_ARM_ANY(remquol) ; Can't use long double functions from the CRT on x86353F_LD64(remquol) ; Can't use long double functions from the CRT on x86
353rint354rint
354rintf355rintf
355F_ARM_ANY(rintl) ; Can't use long double functions from the CRT on x86356F_LD64(rintl) ; Can't use long double functions from the CRT on x86
356round357round
357roundf358roundf
358F_ARM_ANY(roundl) ; Can't use long double functions from the CRT on x86359F_LD64(roundl) ; Can't use long double functions from the CRT on x86
359scalbln360scalbln
360scalblnf361scalblnf
361F_ARM_ANY(scalblnl) ; Can't use long double functions from the CRT on x86362F_LD64(scalblnl) ; Can't use long double functions from the CRT on x86
362scalbn363scalbn
363scalbnf364scalbnf
364F_ARM_ANY(scalbnl) ; Can't use long double functions from the CRT on x86365F_LD64(scalbnl) ; Can't use long double functions from the CRT on x86
365sin366sin
366F_NON_I386(sinf)367F_NON_I386(sinf)
367F_ARM_ANY(sinl == sin)368F_LD64(sinl == sin)
368; if we implement sinh, we can set it DATA only.369; if we implement sinh, we can set it DATA only.
369sinh370sinh
370F_NON_I386(sinhf)371F_NON_I386(sinhf)
...@@ -372,13 +373,13 @@ sqrt...@@ -372,13 +373,13 @@ sqrt
372F_NON_I386(sqrtf)373F_NON_I386(sqrtf)
373tan374tan
374F_NON_I386(tanf)375F_NON_I386(tanf)
375F_ARM_ANY(tanl == tan)376F_LD64(tanl == tan)
376; if we implement tanh, we can set it to DATA only.377; if we implement tanh, we can set it to DATA only.
377tanh378tanh
378F_NON_I386(tanhf)379F_NON_I386(tanhf)
379tgamma380tgamma
380tgammaf381tgammaf
381F_ARM_ANY(tgammal) ; Can't use long double functions from the CRT on x86382F_LD64(tgammal) ; Can't use long double functions from the CRT on x86
382trunc383trunc
383truncf384truncf
384F_ARM_ANY(truncl) ; Can't use long double functions from the CRT on x86385F_LD64(truncl) ; Can't use long double functions from the CRT on x86
lib/libc/mingw/lib-common/api-ms-win-crt-private-l1-1-0.def.in+144-114
...@@ -9,14 +9,14 @@ F_I386(_CxxThrowException@8)...@@ -9,14 +9,14 @@ F_I386(_CxxThrowException@8)
9F_NON_I386(_CxxThrowException)9F_NON_I386(_CxxThrowException)
10F_I386(_EH_prolog)10F_I386(_EH_prolog)
11_FindAndUnlinkFrame11_FindAndUnlinkFrame
12_GetImageBase12F_X64(_GetImageBase)
13_GetThrowImageBase13F_X64(_GetThrowImageBase)
14_IsExceptionObjectToBeDestroyed14_IsExceptionObjectToBeDestroyed
15_NLG_Dispatch215F_I386(_NLG_Dispatch2@4)
16_NLG_Return16F_I386(_NLG_Return@12)
17_NLG_Return217F_I386(_NLG_Return2)
18_SetImageBase18F_X64(_SetImageBase)
19_SetThrowImageBase19F_X64(_SetThrowImageBase)
20_SetWinRTOutOfMemoryExceptionCallback20_SetWinRTOutOfMemoryExceptionCallback
21__AdjustPointer21__AdjustPointer
22__BuildCatchObject22__BuildCatchObject
...@@ -34,8 +34,8 @@ __CxxUnregisterExceptionObject...@@ -34,8 +34,8 @@ __CxxUnregisterExceptionObject
34__DestructExceptionObject34__DestructExceptionObject
35__FrameUnwindFilter35__FrameUnwindFilter
36__GetPlatformExceptionInfo36__GetPlatformExceptionInfo
37__NLG_Dispatch237F_NON_I386(__NLG_Dispatch2)
38__NLG_Return238F_NON_I386(__NLG_Return2)
39__RTCastToVoid39__RTCastToVoid
40__RTDynamicCast40__RTDynamicCast
41__RTtypeid41__RTtypeid
...@@ -44,8 +44,8 @@ __current_exception...@@ -44,8 +44,8 @@ __current_exception
44__current_exception_context44__current_exception_context
45__dcrt_get_wide_environment_from_os45__dcrt_get_wide_environment_from_os
46__dcrt_initial_narrow_environment DATA46__dcrt_initial_narrow_environment DATA
47__intrinsic_abnormal_termination47F_I386(__intrinsic_abnormal_termination)
48__intrinsic_setjmp48F_NON_ARM64(__intrinsic_setjmp)
49F64(__intrinsic_setjmpex)49F64(__intrinsic_setjmpex)
50__processing_throw50__processing_throw
51__report_gsfailure51__report_gsfailure
...@@ -66,26 +66,26 @@ _get_purecall_handler...@@ -66,26 +66,26 @@ _get_purecall_handler
66_get_unexpected66_get_unexpected
67F_I386(_global_unwind2)67F_I386(_global_unwind2)
68_is_exception_typeof68_is_exception_typeof
69F_X64(_local_unwind)69F64(_local_unwind)
70F_I386(_local_unwind2)70F_I386(_local_unwind2)
71F_I386(_local_unwind4)71F_I386(_local_unwind4)
72F_I386(_longjmpex)72F_I386(_longjmpex)
73_o__CIacos73F_I386(_o__CIacos)
74_o__CIasin74F_I386(_o__CIasin)
75_o__CIatan75F_I386(_o__CIatan)
76_o__CIatan276F_I386(_o__CIatan2)
77_o__CIcos77F_I386(_o__CIcos)
78_o__CIcosh78F_I386(_o__CIcosh)
79_o__CIexp79F_I386(_o__CIexp)
80_o__CIfmod80F_I386(_o__CIfmod)
81_o__CIlog81F_I386(_o__CIlog)
82_o__CIlog1082F_I386(_o__CIlog10)
83_o__CIpow83F_I386(_o__CIpow)
84_o__CIsin84F_I386(_o__CIsin)
85_o__CIsinh85F_I386(_o__CIsinh)
86_o__CIsqrt86F_I386(_o__CIsqrt)
87_o__CItan87F_I386(_o__CItan)
88_o__CItanh88F_I386(_o__CItanh)
89_o__Getdays89_o__Getdays
90_o__Getmonths90_o__Getmonths
91_o__Gettnames91_o__Gettnames
...@@ -106,27 +106,27 @@ _o___conio_common_vcwscanf...@@ -106,27 +106,27 @@ _o___conio_common_vcwscanf
106_o___daylight106_o___daylight
107_o___dstbias107_o___dstbias
108_o___fpe_flt_rounds108_o___fpe_flt_rounds
109_o___libm_sse2_acos109F_I386(_o___libm_sse2_acos)
110_o___libm_sse2_acosf110F_I386(_o___libm_sse2_acosf)
111_o___libm_sse2_asin111F_I386(_o___libm_sse2_asin)
112_o___libm_sse2_asinf112F_I386(_o___libm_sse2_asinf)
113_o___libm_sse2_atan113F_I386(_o___libm_sse2_atan)
114_o___libm_sse2_atan2114F_I386(_o___libm_sse2_atan2)
115_o___libm_sse2_atanf115F_I386(_o___libm_sse2_atanf)
116_o___libm_sse2_cos116F_I386(_o___libm_sse2_cos)
117_o___libm_sse2_cosf117F_I386(_o___libm_sse2_cosf)
118_o___libm_sse2_exp118F_I386(_o___libm_sse2_exp)
119_o___libm_sse2_expf119F_I386(_o___libm_sse2_expf)
120_o___libm_sse2_log120F_I386(_o___libm_sse2_log)
121_o___libm_sse2_log10121F_I386(_o___libm_sse2_log10)
122_o___libm_sse2_log10f122F_I386(_o___libm_sse2_log10f)
123_o___libm_sse2_logf123F_I386(_o___libm_sse2_logf)
124_o___libm_sse2_pow124F_I386(_o___libm_sse2_pow)
125_o___libm_sse2_powf125F_I386(_o___libm_sse2_powf)
126_o___libm_sse2_sin126F_I386(_o___libm_sse2_sin)
127_o___libm_sse2_sinf127F_I386(_o___libm_sse2_sinf)
128_o___libm_sse2_tan128F_I386(_o___libm_sse2_tan)
129_o___libm_sse2_tanf129F_I386(_o___libm_sse2_tanf)
130_o___p___argc130_o___p___argc
131_o___p___argv131_o___p___argv
132_o___p___wargv132_o___p___wargv
...@@ -272,7 +272,7 @@ _o__findnext64...@@ -272,7 +272,7 @@ _o__findnext64
272_o__findnext64i32272_o__findnext64i32
273_o__flushall273_o__flushall
274_o__fpclass274_o__fpclass
275_o__fpclassf275F_X64(_o__fpclassf)
276_o__fputc_nolock276_o__fputc_nolock
277_o__fputchar277_o__fputchar
278_o__fputwc_nolock278_o__fputwc_nolock
...@@ -443,17 +443,17 @@ _o__ldtest...@@ -443,17 +443,17 @@ _o__ldtest
443_o__ldunscale443_o__ldunscale
444_o__lfind444_o__lfind
445_o__lfind_s445_o__lfind_s
446_o__libm_sse2_acos_precise446F_I386(_o__libm_sse2_acos_precise)
447_o__libm_sse2_asin_precise447F_I386(_o__libm_sse2_asin_precise)
448_o__libm_sse2_atan_precise448F_I386(_o__libm_sse2_atan_precise)
449_o__libm_sse2_cos_precise449F_I386(_o__libm_sse2_cos_precise)
450_o__libm_sse2_exp_precise450F_I386(_o__libm_sse2_exp_precise)
451_o__libm_sse2_log10_precise451F_I386(_o__libm_sse2_log10_precise)
452_o__libm_sse2_log_precise452F_I386(_o__libm_sse2_log_precise)
453_o__libm_sse2_pow_precise453F_I386(_o__libm_sse2_pow_precise)
454_o__libm_sse2_sin_precise454F_I386(_o__libm_sse2_sin_precise)
455_o__libm_sse2_sqrt_precise455F_I386(_o__libm_sse2_sqrt_precise)
456_o__libm_sse2_tan_precise456F_I386(_o__libm_sse2_tan_precise)
457_o__loaddll457_o__loaddll
458_o__localtime32458_o__localtime32
459_o__localtime32_s459_o__localtime32_s
...@@ -462,7 +462,7 @@ _o__localtime64_s...@@ -462,7 +462,7 @@ _o__localtime64_s
462_o__lock_file462_o__lock_file
463_o__locking463_o__locking
464_o__logb464_o__logb
465_o__logbf465F_NON_I386(_o__logbf)
466_o__lsearch466_o__lsearch
467_o__lsearch_s467_o__lsearch_s
468_o__lseek468_o__lseek
...@@ -619,7 +619,7 @@ _o__mktime32...@@ -619,7 +619,7 @@ _o__mktime32
619_o__mktime64619_o__mktime64
620_o__msize620_o__msize
621_o__nextafter621_o__nextafter
622_o__nextafterf622F_X64(_o__nextafterf)
623_o__open_osfhandle623_o__open_osfhandle
624_o__pclose624_o__pclose
625_o__pipe625_o__pipe
...@@ -642,7 +642,7 @@ _o__resetstkoflw...@@ -642,7 +642,7 @@ _o__resetstkoflw
642_o__rmdir642_o__rmdir
643_o__rmtmp643_o__rmtmp
644_o__scalb644_o__scalb
645_o__scalbf645F_X64(_o__scalbf)
646_o__searchenv646_o__searchenv
647_o__searchenv_s647_o__searchenv_s
648_o__set_abort_behavior648_o__set_abort_behavior
...@@ -700,7 +700,7 @@ _o__strtof_l...@@ -700,7 +700,7 @@ _o__strtof_l
700_o__strtoi64700_o__strtoi64
701_o__strtoi64_l701_o__strtoi64_l
702_o__strtol_l702_o__strtol_l
703_o__strtold_l703F_LD64(_o__strtold_l) ; Can't use long double functions from the CRT on x86
704_o__strtoll_l704_o__strtoll_l
705_o__strtoui64705_o__strtoui64
706_o__strtoui64_l706_o__strtoui64_l
...@@ -780,7 +780,7 @@ _o__wcstof_l...@@ -780,7 +780,7 @@ _o__wcstof_l
780_o__wcstoi64780_o__wcstoi64
781_o__wcstoi64_l781_o__wcstoi64_l
782_o__wcstol_l782_o__wcstol_l
783_o__wcstold_l783F_LD64(_o__wcstold_l) ; Can't use long double functions from the CRT on x86
784_o__wcstoll_l784_o__wcstoll_l
785_o__wcstombs_l785_o__wcstombs_l
786_o__wcstombs_s_l786_o__wcstombs_s_l
...@@ -875,24 +875,24 @@ _o__y1...@@ -875,24 +875,24 @@ _o__y1
875_o__yn875_o__yn
876_o_abort876_o_abort
877_o_acos877_o_acos
878_o_acosf878F_NON_I386(_o_acosf)
879_o_acosh879_o_acosh
880_o_acoshf880_o_acoshf
881_o_acoshl881F_LD64(_o_acoshl) ; Can't use long double functions from the CRT on x86
882_o_asctime882_o_asctime
883_o_asctime_s883_o_asctime_s
884_o_asin884_o_asin
885_o_asinf885F_NON_I386(_o_asinf)
886_o_asinh886_o_asinh
887_o_asinhf887_o_asinhf
888_o_asinhl888F_LD64(_o_asinhl) ; Can't use long double functions from the CRT on x86
889_o_atan889_o_atan
890_o_atan2890_o_atan2
891_o_atan2f891F_NON_I386(_o_atan2f)
892_o_atanf892F_NON_I386(_o_atanf)
893_o_atanh893_o_atanh
894_o_atanhf894_o_atanhf
895_o_atanhl895F_LD64(_o_atanhl) ; Can't use long double functions from the CRT on x86
896_o_atof896_o_atof
897_o_atoi897_o_atoi
898_o_atol898_o_atol
...@@ -904,24 +904,24 @@ _o_calloc...@@ -904,24 +904,24 @@ _o_calloc
904_o_cbrt904_o_cbrt
905_o_cbrtf905_o_cbrtf
906_o_ceil906_o_ceil
907_o_ceilf907F_NON_I386(_o_ceilf)
908_o_clearerr908_o_clearerr
909_o_clearerr_s909_o_clearerr_s
910_o_cos910_o_cos
911_o_cosf911F_NON_I386(_o_cosf)
912_o_cosh912_o_cosh
913_o_coshf913F_NON_I386(_o_coshf)
914_o_erf914_o_erf
915_o_erfc915_o_erfc
916_o_erfcf916_o_erfcf
917_o_erfcl917F_LD64(_o_erfcl) ; Can't use long double functions from the CRT on x86
918_o_erff918_o_erff
919_o_erfl919F_LD64(_o_erfl) ; Can't use long double functions from the CRT on x86
920_o_exp920_o_exp
921_o_exp2921_o_exp2
922_o_exp2f922_o_exp2f
923_o_exp2l923F_LD64(_o_exp2l) ; Can't use long double functions from the CRT on x86
924_o_expf924F_NON_I386(_o_expf)
925_o_fabs925_o_fabs
926_o_fclose926_o_fclose
927_o_feof927_o_feof
...@@ -933,12 +933,12 @@ _o_fgets...@@ -933,12 +933,12 @@ _o_fgets
933_o_fgetwc933_o_fgetwc
934_o_fgetws934_o_fgetws
935_o_floor935_o_floor
936_o_floorf936F_NON_I386(_o_floorf)
937_o_fma937_o_fma
938_o_fmaf938_o_fmaf
939_o_fmal939F_LD64(_o_fmal) ; Can't use long double functions from the CRT on x86
940_o_fmod940_o_fmod
941_o_fmodf941F_NON_I386(_o_fmodf)
942_o_fopen942_o_fopen
943_o_fopen_s943_o_fopen_s
944_o_fputc944_o_fputc
...@@ -995,33 +995,33 @@ _o_isxdigit...@@ -995,33 +995,33 @@ _o_isxdigit
995_o_ldexp995_o_ldexp
996_o_lgamma996_o_lgamma
997_o_lgammaf997_o_lgammaf
998_o_lgammal998F_LD64(_o_lgammal) ; Can't use long double functions from the CRT on x86
999_o_llrint999_o_llrint
1000_o_llrintf1000_o_llrintf
1001_o_llrintl1001F_LD64(_o_llrintl) ; Can't use long double functions from the CRT on x86
1002_o_llround1002_o_llround
1003_o_llroundf1003_o_llroundf
1004_o_llroundl1004F_LD64(_o_llroundl) ; Can't use long double functions from the CRT on x86
1005_o_localeconv1005_o_localeconv
1006_o_log1006_o_log
1007_o_log101007_o_log10
1008_o_log10f1008F_NON_I386(_o_log10f)
1009_o_log1p1009_o_log1p
1010_o_log1pf1010_o_log1pf
1011_o_log1pl1011F_LD64(_o_log1pl) ; Can't use long double functions from the CRT on x86
1012_o_log21012_o_log2
1013_o_log2f1013_o_log2f
1014_o_log2l1014F_LD64(_o_log2l) ; Can't use long double functions from the CRT on x86
1015_o_logb1015_o_logb
1016_o_logbf1016_o_logbf
1017_o_logbl1017F_LD64(_o_logbl) ; Can't use long double functions from the CRT on x86
1018_o_logf1018F_NON_I386(_o_logf)
1019_o_lrint1019_o_lrint
1020_o_lrintf1020_o_lrintf
1021_o_lrintl1021F_LD64(_o_lrintl) ; Can't use long double functions from the CRT on x86
1022_o_lround1022_o_lround
1023_o_lroundf1023_o_lroundf
1024_o_lroundl1024F_LD64(_o_lroundl) ; Can't use long double functions from the CRT on x86
1025_o_malloc1025_o_malloc
1026_o_mblen1026_o_mblen
1027_o_mbrlen1027_o_mbrlen
...@@ -1035,19 +1035,19 @@ _o_mbstowcs_s...@@ -1035,19 +1035,19 @@ _o_mbstowcs_s
1035_o_mbtowc1035_o_mbtowc
1036_o_memset1036_o_memset
1037_o_modf1037_o_modf
1038_o_modff1038F_NON_I386(_o_modff)
1039_o_nan1039_o_nan
1040_o_nanf1040_o_nanf
1041_o_nanl1041F_LD64(_o_nanl) ; Can't use long double functions from the CRT on x86
1042_o_nearbyint1042_o_nearbyint
1043_o_nearbyintf1043_o_nearbyintf
1044_o_nearbyintl1044F_LD64(_o_nearbyintl) ; Can't use long double functions from the CRT on x86
1045_o_nextafter1045_o_nextafter
1046_o_nextafterf1046_o_nextafterf
1047_o_nextafterl1047F_LD64(_o_nextafterl) ; Can't use long double functions from the CRT on x86
1048_o_nexttoward1048F_LD64(_o_nexttoward) ; Can't use long double functions from the CRT on x86
1049_o_nexttowardf1049F_LD64(_o_nexttowardf) ; Can't use long double functions from the CRT on x86
1050_o_nexttowardl1050F_LD64(_o_nexttowardl) ; Can't use long double functions from the CRT on x86
1051_o_pow1051_o_pow
1052_o_powf1052_o_powf
1053_o_putc1053_o_putc
...@@ -1063,33 +1063,33 @@ _o_rand_s...@@ -1063,33 +1063,33 @@ _o_rand_s
1063_o_realloc1063_o_realloc
1064_o_remainder1064_o_remainder
1065_o_remainderf1065_o_remainderf
1066_o_remainderl1066F_LD64(_o_remainderl) ; Can't use long double functions from the CRT on x86
1067_o_remove1067_o_remove
1068_o_remquo1068_o_remquo
1069_o_remquof1069_o_remquof
1070_o_remquol1070F_LD64(_o_remquol) ; Can't use long double functions from the CRT on x86
1071_o_rewind1071_o_rewind
1072_o_rint1072_o_rint
1073_o_rintf1073_o_rintf
1074_o_rintl1074F_LD64(_o_rintl) ; Can't use long double functions from the CRT on x86
1075_o_round1075_o_round
1076_o_roundf1076_o_roundf
1077_o_roundl1077F_LD64(_o_roundl) ; Can't use long double functions from the CRT on x86
1078_o_scalbln1078_o_scalbln
1079_o_scalblnf1079_o_scalblnf
1080_o_scalblnl1080F_LD64(_o_scalblnl) ; Can't use long double functions from the CRT on x86
1081_o_scalbn1081_o_scalbn
1082_o_scalbnf1082_o_scalbnf
1083_o_scalbnl1083F_LD64(_o_scalbnl) ; Can't use long double functions from the CRT on x86
1084_o_set_terminate1084_o_set_terminate
1085_o_setbuf1085_o_setbuf
1086_o_setvbuf1086_o_setvbuf
1087_o_sin1087_o_sin
1088_o_sinf1088F_NON_I386(_o_sinf)
1089_o_sinh1089_o_sinh
1090_o_sinhf1090F_NON_I386(_o_sinhf)
1091_o_sqrt1091_o_sqrt
1092_o_sqrtf1092F_NON_I386(_o_sqrtf)
1093_o_srand1093_o_srand
1094_o_strcat_s1094_o_strcat_s
1095_o_strcoll1095_o_strcoll
...@@ -1104,19 +1104,19 @@ _o_strtof...@@ -1104,19 +1104,19 @@ _o_strtof
1104_o_strtok1104_o_strtok
1105_o_strtok_s1105_o_strtok_s
1106_o_strtol1106_o_strtol
1107_o_strtold1107F_LD64(_o_strtold) ; Can't use long double functions from the CRT on x86
1108_o_strtoll1108_o_strtoll
1109_o_strtoul1109_o_strtoul
1110_o_strtoull1110_o_strtoull
1111_o_system1111_o_system
1112_o_tan1112_o_tan
1113_o_tanf1113F_NON_I386(_o_tanf)
1114_o_tanh1114_o_tanh
1115_o_tanhf1115F_NON_I386(_o_tanhf)
1116_o_terminate1116_o_terminate
1117_o_tgamma1117_o_tgamma
1118_o_tgammaf1118_o_tgammaf
1119_o_tgammal1119F_LD64(_o_tgammal) ; Can't use long double functions from the CRT on x86
1120_o_tmpfile_s1120_o_tmpfile_s
1121_o_tmpnam_s1121_o_tmpnam_s
1122_o_tolower1122_o_tolower
...@@ -1141,7 +1141,7 @@ _o_wcstof...@@ -1141,7 +1141,7 @@ _o_wcstof
1141_o_wcstok1141_o_wcstok
1142_o_wcstok_s1142_o_wcstok_s
1143_o_wcstol1143_o_wcstol
1144_o_wcstold1144F_LD64(_o_wcstold) ; Can't use long double functions from the CRT on x86
1145_o_wcstoll1145_o_wcstoll
1146_o_wcstombs1146_o_wcstombs
1147_o_wcstombs_s1147_o_wcstombs_s
...@@ -1172,3 +1172,33 @@ unexpected...@@ -1172,3 +1172,33 @@ unexpected
1172wcschr1172wcschr
1173wcsrchr1173wcsrchr
1174wcsstr1174wcsstr
1175
1176; These symbols were added in api-ms-win-crt-private-l1-1-0.dll version 10.0.10563.0
1177; It is part of the Microsoft Visual C++ 2015 Redistributable version 14.0.23506.0
1178_o____lc_codepage_func
1179_o____lc_collate_cp_func
1180_o____lc_locale_name_func
1181_o____mb_cur_max_func
1182_o___std_exception_copy
1183_o___std_exception_destroy
1184_o___std_type_info_destroy_list
1185_o___std_type_info_name
1186_o__cexit
1187_o__configthreadlocale
1188_o__configure_narrow_argv
1189_o__controlfp_s
1190_o__crt_atexit
1191_o__exit
1192_o__get_initial_narrow_environment
1193_o__get_initial_wide_environment
1194_o__initialize_narrow_environment
1195_o__initialize_wide_environment
1196_o__purecall
1197_o__seh_filter_dll
1198_o__seh_filter_exe
1199_o__set_app_type
1200_o__set_fmode
1201_o_exit
1202_o_memcpy_s
1203_o_rename
1204_o_setlocale
lib/libc/mingw/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in+3-4
...@@ -37,15 +37,14 @@ _controlfp...@@ -37,15 +37,14 @@ _controlfp
37_controlfp_s37_controlfp_s
38_crt_at_quick_exit38_crt_at_quick_exit
39_crt_atexit39_crt_atexit
40_crt_debugger_hook40F_I386(_crt_debugger_hook)
41_endthread41_endthread
42_endthreadex42_endthreadex
43_errno43_errno
44_execute_onexit_table44_execute_onexit_table
45_exit45_exit
46F_NON_I386(_fpieee_flt)46_fpieee_flt
47; DATA added manually47_fpreset F_LD80(DATA) ; DATA added manually
48_fpreset DATA
49_get_doserrno48_get_doserrno
50_get_errno49_get_errno
51_get_initial_narrow_environment50_get_initial_narrow_environment
lib/libc/mingw/lib-common/api-ms-win-crt-time-l1-1-0.def.in+6
...@@ -5,9 +5,13 @@ EXPORTS...@@ -5,9 +5,13 @@ EXPORTS
5#include "func.def.in"5#include "func.def.in"
66
7__daylight7__daylight
8__p__daylight == __daylight
8__dstbias9__dstbias
10__p__dstbias == __dstbias
9__timezone11__timezone
12__p__timezone == __timezone
10__tzname13__tzname
14__p__tzname == __tzname
11_ctime3215_ctime32
12_ctime32_s16_ctime32_s
13_ctime6417_ctime64
...@@ -18,6 +22,8 @@ _difftime32...@@ -18,6 +22,8 @@ _difftime32
18_difftime6422_difftime64
19F32(_ftime == _ftime32)23F32(_ftime == _ftime32)
20F64(_ftime == _ftime64)24F64(_ftime == _ftime64)
25F32(ftime == _ftime32)
26F64(ftime == _ftime64)
21_ftime3227_ftime32
22_ftime32_s28_ftime32_s
23_ftime6429_ftime64
lib/libc/mingw/lib-common/ntdll.def.in+14-14
...@@ -2,7 +2,7 @@...@@ -2,7 +2,7 @@
22
3LIBRARY "ntdll.dll"3LIBRARY "ntdll.dll"
4EXPORTS4EXPORTS
5#ifdef DEF_X645#ifdef __x86_64__
6PropertyLengthAsVariant6PropertyLengthAsVariant
7RtlConvertPropertyToVariant7RtlConvertPropertyToVariant
8RtlConvertVariantToProperty8RtlConvertVariantToProperty
...@@ -38,7 +38,7 @@ CsrClientConnectToServer...@@ -38,7 +38,7 @@ CsrClientConnectToServer
38CsrFreeCaptureBuffer38CsrFreeCaptureBuffer
39CsrGetProcessId39CsrGetProcessId
40CsrIdentifyAlertableThread40CsrIdentifyAlertableThread
41#if defined(DEF_I386) || defined(DEF_X64)41#if defined(__i386__) || defined(__x86_64__)
42CsrNewThread42CsrNewThread
43CsrProbeForRead43CsrProbeForRead
44CsrProbeForWrite44CsrProbeForWrite
...@@ -65,12 +65,12 @@ DbgUiStopDebugging...@@ -65,12 +65,12 @@ DbgUiStopDebugging
65DbgUiWaitStateChange65DbgUiWaitStateChange
66DbgUserBreakPoint66DbgUserBreakPoint
67EtwCheckCoverage67EtwCheckCoverage
68#ifdef DEF_X6468#ifdef __x86_64__
69EtwControlTraceA69EtwControlTraceA
70EtwControlTraceW70EtwControlTraceW
71#endif71#endif
72EtwCreateTraceInstanceId72EtwCreateTraceInstanceId
73#ifdef DEF_X6473#ifdef __x86_64__
74EtwEnableTrace74EtwEnableTrace
75EtwEnumerateTraceGuids75EtwEnumerateTraceGuids
76EtwFlushTraceA76EtwFlushTraceA
...@@ -95,7 +95,7 @@ EtwEventWriteTransfer...@@ -95,7 +95,7 @@ EtwEventWriteTransfer
95EtwGetTraceEnableFlags95EtwGetTraceEnableFlags
96EtwGetTraceEnableLevel96EtwGetTraceEnableLevel
97EtwGetTraceLoggerHandle97EtwGetTraceLoggerHandle
98#ifdef DEF_X6498#ifdef __x86_64__
99EtwNotificationRegistrationA99EtwNotificationRegistrationA
100EtwNotificationRegistrationW100EtwNotificationRegistrationW
101EtwQueryAllTracesA101EtwQueryAllTracesA
...@@ -112,7 +112,7 @@ EtwProcessPrivateLoggerRequest...@@ -112,7 +112,7 @@ EtwProcessPrivateLoggerRequest
112EtwRegisterSecurityProvider112EtwRegisterSecurityProvider
113EtwRegisterTraceGuidsA113EtwRegisterTraceGuidsA
114EtwRegisterTraceGuidsW114EtwRegisterTraceGuidsW
115#ifdef DEF_X64115#ifdef __x86_64__
116EtwStartTraceA116EtwStartTraceA
117EtwStartTraceW117EtwStartTraceW
118EtwStopTraceA118EtwStopTraceA
...@@ -126,7 +126,7 @@ EtwTraceEventInstance...@@ -126,7 +126,7 @@ EtwTraceEventInstance
126EtwTraceMessage126EtwTraceMessage
127EtwTraceMessageVa127EtwTraceMessageVa
128EtwUnregisterTraceGuids128EtwUnregisterTraceGuids
129#ifdef DEF_X64129#ifdef __x86_64__
130EtwUpdateTraceA130EtwUpdateTraceA
131EtwUpdateTraceW131EtwUpdateTraceW
132EtwpGetTraceBuffer132EtwpGetTraceBuffer
...@@ -138,7 +138,7 @@ EtwpGetCpuSpeed...@@ -138,7 +138,7 @@ EtwpGetCpuSpeed
138F_X64(EtwpNotificationThread)138F_X64(EtwpNotificationThread)
139EvtIntReportAuthzEventAndSourceAsync139EvtIntReportAuthzEventAndSourceAsync
140EvtIntReportEventAndSourceAsync140EvtIntReportEventAndSourceAsync
141#ifndef DEF_ARM32141#ifndef __arm__
142ExpInterlockedPopEntrySListEnd142ExpInterlockedPopEntrySListEnd
143F_X64(ExpInterlockedPopEntrySListEnd16)143F_X64(ExpInterlockedPopEntrySListEnd16)
144ExpInterlockedPopEntrySListFault144ExpInterlockedPopEntrySListFault
...@@ -729,7 +729,7 @@ NtWaitForWorkViaWorkerFactory...@@ -729,7 +729,7 @@ NtWaitForWorkViaWorkerFactory
729NtWaitHighEventPair729NtWaitHighEventPair
730NtWaitLowEventPair730NtWaitLowEventPair
731NtWorkerFactoryWorkerReady731NtWorkerFactoryWorkerReady
732#ifdef DEF_ARM32732#ifdef __arm__
733NtWow64AllocateVirtualMemory64733NtWow64AllocateVirtualMemory64
734NtWow64CallFunction64734NtWow64CallFunction64
735NtWow64CsrAllocateCaptureBuffer735NtWow64CsrAllocateCaptureBuffer
...@@ -946,7 +946,7 @@ RtlCreateSystemVolumeInformationFolder...@@ -946,7 +946,7 @@ RtlCreateSystemVolumeInformationFolder
946RtlCreateTagHeap946RtlCreateTagHeap
947RtlCreateTimer947RtlCreateTimer
948RtlCreateTimerQueue948RtlCreateTimerQueue
949#ifdef DEF_X64949#ifdef __x86_64__
950RtlCreateUmsCompletionList950RtlCreateUmsCompletionList
951RtlCreateUmsThread951RtlCreateUmsThread
952RtlCreateUmsThreadContext952RtlCreateUmsThreadContext
...@@ -995,7 +995,7 @@ RtlDeleteSecurityObject...@@ -995,7 +995,7 @@ RtlDeleteSecurityObject
995RtlDeleteTimer995RtlDeleteTimer
996RtlDeleteTimerQueue996RtlDeleteTimerQueue
997RtlDeleteTimerQueueEx997RtlDeleteTimerQueueEx
998#ifdef DEF_X64998#ifdef __x86_64__
999RtlDeleteUmsCompletionList999RtlDeleteUmsCompletionList
1000RtlDeleteUmsThreadContext1000RtlDeleteUmsThreadContext
1001RtlDequeueUmsCompletionListItems1001RtlDequeueUmsCompletionListItems
...@@ -1732,7 +1732,7 @@ F64(RtlWow64GetThreadContext)...@@ -1732,7 +1732,7 @@ F64(RtlWow64GetThreadContext)
1732F64(RtlWow64GetThreadSelectorEntry)1732F64(RtlWow64GetThreadSelectorEntry)
1733RtlWow64IsWowGuestMachineSupported1733RtlWow64IsWowGuestMachineSupported
1734RtlWow64LogMessageInEventLogger1734RtlWow64LogMessageInEventLogger
1735#if defined(DEF_X64) || defined(DEF_ARM64)1735#if defined(__x86_64__) || defined(__aarch64__)
1736RtlWow64PopAllCrossProcessWorkFromWorkList1736RtlWow64PopAllCrossProcessWorkFromWorkList
1737RtlWow64PopCrossProcessWorkFromFreeList1737RtlWow64PopCrossProcessWorkFromFreeList
1738RtlWow64PushCrossProcessWorkOntoFreeList1738RtlWow64PushCrossProcessWorkOntoFreeList
...@@ -1794,7 +1794,7 @@ F_X64(RtlpUmsThreadYield)...@@ -1794,7 +1794,7 @@ F_X64(RtlpUmsThreadYield)
1794RtlpUnWaitCriticalSection1794RtlpUnWaitCriticalSection
1795RtlpVerifyAndCommitUILanguageSettings1795RtlpVerifyAndCommitUILanguageSettings
1796RtlpWaitForCriticalSection1796RtlpWaitForCriticalSection
1797#ifdef DEF_X641797#ifdef __x86_64__
1798RtlpWow64CtxFromAmd641798RtlpWow64CtxFromAmd64
1799RtlpWow64GetContextOnAmd641799RtlpWow64GetContextOnAmd64
1800RtlpWow64SetContextOnAmd641800RtlpWow64SetContextOnAmd64
...@@ -2388,7 +2388,7 @@ ZwWaitForWorkViaWorkerFactory...@@ -2388,7 +2388,7 @@ ZwWaitForWorkViaWorkerFactory
2388ZwWaitHighEventPair2388ZwWaitHighEventPair
2389ZwWaitLowEventPair2389ZwWaitLowEventPair
2390ZwWorkerFactoryWorkerReady2390ZwWorkerFactoryWorkerReady
2391#ifdef DEF_ARM322391#ifdef __arm__
2392ZwWow64AllocateVirtualMemory642392ZwWow64AllocateVirtualMemory64
2393ZwWow64CallFunction642393ZwWow64CallFunction64
2394ZwWow64CsrAllocateCaptureBuffer2394ZwWow64CsrAllocateCaptureBuffer
lib/libc/mingw/lib-common/ntdllcrt.def.in+4-4
...@@ -2,7 +2,7 @@...@@ -2,7 +2,7 @@
22
3LIBRARY "ntdll.dll"3LIBRARY "ntdll.dll"
4EXPORTS4EXPORTS
5#ifdef DEF_I3865#ifdef __i386__
6_CIcos6_CIcos
7_CIlog7_CIlog
8_CIpow8_CIpow
...@@ -17,7 +17,7 @@ __iscsymf...@@ -17,7 +17,7 @@ __iscsymf
17F_X64(__misaligned_access)17F_X64(__misaligned_access)
18F_ARM32(__jump_unwind)18F_ARM32(__jump_unwind)
19__toascii19__toascii
20#ifdef DEF_I38620#ifdef __i386__
21_alldiv21_alldiv
22_alldvrm@1622_alldvrm@16
23_allmul@1623_allmul@16
...@@ -29,7 +29,7 @@ _allshl...@@ -29,7 +29,7 @@ _allshl
29_allshr29_allshr
30#endif30#endif
31_atoi6431_atoi64
32#ifdef DEF_I38632#ifdef __i386__
33_aulldiv@1633_aulldiv@16
34_aulldvrm@1634_aulldvrm@16
35_aullrem@1635_aullrem@16
...@@ -39,7 +39,7 @@ _aullshr...@@ -39,7 +39,7 @@ _aullshr
39_errno39_errno
40F_I386(_except_handler4_common)40F_I386(_except_handler4_common)
41_fltused DATA41_fltused DATA
42#ifdef DEF_I38642#ifdef __i386__
43_ftol43_ftol
44_ftol244_ftol2
45_ftol2_sse45_ftol2_sse
lib/libc/mingw/lib-common/ole32.def.in+3
...@@ -390,7 +390,9 @@ OleBuildVersion...@@ -390,7 +390,9 @@ OleBuildVersion
390OleConvertIStorageToOLESTREAM390OleConvertIStorageToOLESTREAM
391OleConvertIStorageToOLESTREAMEx391OleConvertIStorageToOLESTREAMEx
392OleConvertOLESTREAMToIStorage392OleConvertOLESTREAMToIStorage
393OleConvertOLESTREAMToIStorage2
393OleConvertOLESTREAMToIStorageEx394OleConvertOLESTREAMToIStorageEx
395OleConvertOLESTREAMToIStorageEx2
394OleCreate396OleCreate
395OleCreateDefaultHandler397OleCreateDefaultHandler
396OleCreateEmbeddingHelper398OleCreateEmbeddingHelper
...@@ -417,6 +419,7 @@ OleDuplicateData...@@ -417,6 +419,7 @@ OleDuplicateData
417OleFlushClipboard419OleFlushClipboard
418OleGetAutoConvert420OleGetAutoConvert
419OleGetClipboard421OleGetClipboard
422OleGetClipboardWithEnterpriseInfo
420OleGetIconOfClass423OleGetIconOfClass
421OleGetIconOfFile424OleGetIconOfFile
422OleIconToCursorExt425OleIconToCursorExt
lib/libc/mingw/lib-common/quartz.def created+17
...@@ -0,0 +1,17 @@
1;
2; Exports of file QUARTZ.dll
3;
4; Autogenerated by gen_exportdef
5; Written by Kai Tietz, 2007
6;
7LIBRARY QUARTZ.dll
8EXPORTS
9AMGetErrorTextA
10AMGetErrorTextW
11AmpFactorToDB
12DBToAmpFactor
13DllCanUnloadNow
14DllGetClassObject
15DllRegisterServer
16DllUnregisterServer
17GetProxyDllInfo
lib/libc/mingw/lib-common/ucrtbase-common.def.in+98-98
...@@ -218,7 +218,7 @@ __threadid...@@ -218,7 +218,7 @@ __threadid
218__timezone218__timezone
219__toascii219__toascii
220__tzname220__tzname
221#if !defined(DEF_DEBUG) || !defined(DEF_ARM64)221#if !defined(DEF_DEBUG) || !defined(__aarch64__)
222; symbols __unDName and __unDNameEx are available in all versions except ARM64 ucrtbased.dll222; symbols __unDName and __unDNameEx are available in all versions except ARM64 ucrtbased.dll
223__unDName223__unDName
224__unDNameEx224__unDNameEx
...@@ -388,7 +388,7 @@ _flushall...@@ -388,7 +388,7 @@ _flushall
388_fpclass388_fpclass
389F_X64(_fpclassf)389F_X64(_fpclassf)
390_fpieee_flt390_fpieee_flt
391_fpreset DATA ; DATA added manually391_fpreset F_LD80(DATA) ; DATA added manually
392_fputc_nolock392_fputc_nolock
393_fputchar393_fputchar
394_fputwc_nolock394_fputwc_nolock
...@@ -493,7 +493,7 @@ F_DEBUG(_invalid_parameter)...@@ -493,7 +493,7 @@ F_DEBUG(_invalid_parameter)
493_invalid_parameter_noinfo493_invalid_parameter_noinfo
494_invalid_parameter_noinfo_noreturn494_invalid_parameter_noinfo_noreturn
495_invoke_watson495_invoke_watson
496#if !defined(DEF_DEBUG) || !defined(DEF_ARM64)496#if !defined(DEF_DEBUG) || !defined(__aarch64__)
497; symbol _is_exception_typeof is available in all versions except ARM64 ucrtbased.dll497; symbol _is_exception_typeof is available in all versions except ARM64 ucrtbased.dll
498_is_exception_typeof498_is_exception_typeof
499#endif499#endif
...@@ -1433,7 +1433,7 @@ _o__strtof_l...@@ -1433,7 +1433,7 @@ _o__strtof_l
1433_o__strtoi641433_o__strtoi64
1434_o__strtoi64_l1434_o__strtoi64_l
1435_o__strtol_l1435_o__strtol_l
1436F_ARM_ANY(_o__strtold_l) ; Can't use long double functions from the CRT on x861436F_LD64(_o__strtold_l) ; Can't use long double functions from the CRT on x86
1437_o__strtoll_l1437_o__strtoll_l
1438_o__strtoui641438_o__strtoui64
1439_o__strtoui64_l1439_o__strtoui64_l
...@@ -1513,7 +1513,7 @@ _o__wcstof_l...@@ -1513,7 +1513,7 @@ _o__wcstof_l
1513_o__wcstoi641513_o__wcstoi64
1514_o__wcstoi64_l1514_o__wcstoi64_l
1515_o__wcstol_l1515_o__wcstol_l
1516F_ARM_ANY(_o__wcstold_l) ; Can't use long double functions from the CRT on x861516F_LD64(_o__wcstold_l) ; Can't use long double functions from the CRT on x86
1517_o__wcstoll_l1517_o__wcstoll_l
1518_o__wcstombs_l1518_o__wcstombs_l
1519_o__wcstombs_s_l1519_o__wcstombs_s_l
...@@ -1611,21 +1611,21 @@ _o_acos...@@ -1611,21 +1611,21 @@ _o_acos
1611F_NON_I386(_o_acosf)1611F_NON_I386(_o_acosf)
1612_o_acosh1612_o_acosh
1613_o_acoshf1613_o_acoshf
1614F_ARM_ANY(_o_acoshl) ; Can't use long double functions from the CRT on x861614F_LD64(_o_acoshl) ; Can't use long double functions from the CRT on x86
1615_o_asctime1615_o_asctime
1616_o_asctime_s1616_o_asctime_s
1617_o_asin1617_o_asin
1618F_NON_I386(_o_asinf)1618F_NON_I386(_o_asinf)
1619_o_asinh1619_o_asinh
1620_o_asinhf1620_o_asinhf
1621F_ARM_ANY(_o_asinhl) ; Can't use long double functions from the CRT on x861621F_LD64(_o_asinhl) ; Can't use long double functions from the CRT on x86
1622_o_atan1622_o_atan
1623_o_atan21623_o_atan2
1624F_NON_I386(_o_atan2f)1624F_NON_I386(_o_atan2f)
1625F_NON_I386(_o_atanf)1625F_NON_I386(_o_atanf)
1626_o_atanh1626_o_atanh
1627_o_atanhf1627_o_atanhf
1628F_ARM_ANY(_o_atanhl) ; Can't use long double functions from the CRT on x861628F_LD64(_o_atanhl) ; Can't use long double functions from the CRT on x86
1629_o_atof1629_o_atof
1630_o_atoi1630_o_atoi
1631_o_atol1631_o_atol
...@@ -1647,13 +1647,13 @@ F_NON_I386(_o_coshf)...@@ -1647,13 +1647,13 @@ F_NON_I386(_o_coshf)
1647_o_erf1647_o_erf
1648_o_erfc1648_o_erfc
1649_o_erfcf1649_o_erfcf
1650F_ARM_ANY(_o_erfcl) ; Can't use long double functions from the CRT on x861650F_LD64(_o_erfcl) ; Can't use long double functions from the CRT on x86
1651_o_erff1651_o_erff
1652F_ARM_ANY(_o_erfl) ; Can't use long double functions from the CRT on x861652F_LD64(_o_erfl) ; Can't use long double functions from the CRT on x86
1653_o_exp1653_o_exp
1654_o_exp21654_o_exp2
1655_o_exp2f1655_o_exp2f
1656F_ARM_ANY(_o_exp2l) ; Can't use long double functions from the CRT on x861656F_LD64(_o_exp2l) ; Can't use long double functions from the CRT on x86
1657F_NON_I386(_o_expf)1657F_NON_I386(_o_expf)
1658_o_fabs1658_o_fabs
1659F_ARM_ANY(_o_fabsf)1659F_ARM_ANY(_o_fabsf)
...@@ -1670,7 +1670,7 @@ _o_floor...@@ -1670,7 +1670,7 @@ _o_floor
1670F_NON_I386(_o_floorf)1670F_NON_I386(_o_floorf)
1671_o_fma1671_o_fma
1672_o_fmaf1672_o_fmaf
1673F_ARM_ANY(_o_fmal) ; Can't use long double functions from the CRT on x861673F_LD64(_o_fmal) ; Can't use long double functions from the CRT on x86
1674_o_fmod1674_o_fmod
1675F_NON_I386(_o_fmodf)1675F_NON_I386(_o_fmodf)
1676_o_fopen1676_o_fopen
...@@ -1729,33 +1729,33 @@ _o_isxdigit...@@ -1729,33 +1729,33 @@ _o_isxdigit
1729_o_ldexp1729_o_ldexp
1730_o_lgamma1730_o_lgamma
1731_o_lgammaf1731_o_lgammaf
1732F_ARM_ANY(_o_lgammal) ; Can't use long double functions from the CRT on x861732F_LD64(_o_lgammal) ; Can't use long double functions from the CRT on x86
1733_o_llrint1733_o_llrint
1734_o_llrintf1734_o_llrintf
1735F_ARM_ANY(_o_llrintl) ; Can't use long double functions from the CRT on x861735F_LD64(_o_llrintl) ; Can't use long double functions from the CRT on x86
1736_o_llround1736_o_llround
1737_o_llroundf1737_o_llroundf
1738F_ARM_ANY(_o_llroundl) ; Can't use long double functions from the CRT on x861738F_LD64(_o_llroundl) ; Can't use long double functions from the CRT on x86
1739_o_localeconv1739_o_localeconv
1740_o_log1740_o_log
1741_o_log101741_o_log10
1742F_NON_I386(_o_log10f)1742F_NON_I386(_o_log10f)
1743_o_log1p1743_o_log1p
1744_o_log1pf1744_o_log1pf
1745F_ARM_ANY(_o_log1pl) ; Can't use long double functions from the CRT on x861745F_LD64(_o_log1pl) ; Can't use long double functions from the CRT on x86
1746_o_log21746_o_log2
1747_o_log2f1747_o_log2f
1748F_ARM_ANY(_o_log2l) ; Can't use long double functions from the CRT on x861748F_LD64(_o_log2l) ; Can't use long double functions from the CRT on x86
1749_o_logb1749_o_logb
1750_o_logbf1750_o_logbf
1751F_ARM_ANY(_o_logbl) ; Can't use long double functions from the CRT on x861751F_LD64(_o_logbl) ; Can't use long double functions from the CRT on x86
1752F_NON_I386(_o_logf)1752F_NON_I386(_o_logf)
1753_o_lrint1753_o_lrint
1754_o_lrintf1754_o_lrintf
1755F_ARM_ANY(_o_lrintl) ; Can't use long double functions from the CRT on x861755F_LD64(_o_lrintl) ; Can't use long double functions from the CRT on x86
1756_o_lround1756_o_lround
1757_o_lroundf1757_o_lroundf
1758F_ARM_ANY(_o_lroundl) ; Can't use long double functions from the CRT on x861758F_LD64(_o_lroundl) ; Can't use long double functions from the CRT on x86
1759_o_malloc1759_o_malloc
1760_o_mblen1760_o_mblen
1761_o_mbrlen1761_o_mbrlen
...@@ -1772,16 +1772,16 @@ _o_modf...@@ -1772,16 +1772,16 @@ _o_modf
1772F_NON_I386(_o_modff)1772F_NON_I386(_o_modff)
1773_o_nan1773_o_nan
1774_o_nanf1774_o_nanf
1775F_ARM_ANY(_o_nanl) ; Can't use long double functions from the CRT on x861775F_LD64(_o_nanl) ; Can't use long double functions from the CRT on x86
1776_o_nearbyint1776_o_nearbyint
1777_o_nearbyintf1777_o_nearbyintf
1778F_ARM_ANY(_o_nearbyintl) ; Can't use long double functions from the CRT on x861778F_LD64(_o_nearbyintl) ; Can't use long double functions from the CRT on x86
1779_o_nextafter1779_o_nextafter
1780_o_nextafterf1780_o_nextafterf
1781F_ARM_ANY(_o_nextafterl) ; Can't use long double functions from the CRT on x861781F_LD64(_o_nextafterl) ; Can't use long double functions from the CRT on x86
1782F_ARM_ANY(_o_nexttoward) ; Can't use long double functions from the CRT on x861782F_LD64(_o_nexttoward) ; Can't use long double functions from the CRT on x86
1783F_ARM_ANY(_o_nexttowardf) ; Can't use long double functions from the CRT on x861783F_LD64(_o_nexttowardf) ; Can't use long double functions from the CRT on x86
1784F_ARM_ANY(_o_nexttowardl) ; Can't use long double functions from the CRT on x861784F_LD64(_o_nexttowardl) ; Can't use long double functions from the CRT on x86
1785_o_pow1785_o_pow
1786_o_powf1786_o_powf
1787_o_putc1787_o_putc
...@@ -1797,24 +1797,24 @@ _o_rand_s...@@ -1797,24 +1797,24 @@ _o_rand_s
1797_o_realloc1797_o_realloc
1798_o_remainder1798_o_remainder
1799_o_remainderf1799_o_remainderf
1800F_ARM_ANY(_o_remainderl) ; Can't use long double functions from the CRT on x861800F_LD64(_o_remainderl) ; Can't use long double functions from the CRT on x86
1801_o_remove1801_o_remove
1802_o_remquo1802_o_remquo
1803_o_remquof1803_o_remquof
1804F_ARM_ANY(_o_remquol) ; Can't use long double functions from the CRT on x861804F_LD64(_o_remquol) ; Can't use long double functions from the CRT on x86
1805_o_rewind1805_o_rewind
1806_o_rint1806_o_rint
1807_o_rintf1807_o_rintf
1808F_ARM_ANY(_o_rintl) ; Can't use long double functions from the CRT on x861808F_LD64(_o_rintl) ; Can't use long double functions from the CRT on x86
1809_o_round1809_o_round
1810_o_roundf1810_o_roundf
1811F_ARM_ANY(_o_roundl) ; Can't use long double functions from the CRT on x861811F_LD64(_o_roundl) ; Can't use long double functions from the CRT on x86
1812_o_scalbln1812_o_scalbln
1813_o_scalblnf1813_o_scalblnf
1814F_ARM_ANY(_o_scalblnl) ; Can't use long double functions from the CRT on x861814F_LD64(_o_scalblnl) ; Can't use long double functions from the CRT on x86
1815_o_scalbn1815_o_scalbn
1816_o_scalbnf1816_o_scalbnf
1817F_ARM_ANY(_o_scalbnl) ; Can't use long double functions from the CRT on x861817F_LD64(_o_scalbnl) ; Can't use long double functions from the CRT on x86
1818_o_set_terminate1818_o_set_terminate
1819_o_setbuf1819_o_setbuf
1820_o_setvbuf1820_o_setvbuf
...@@ -1838,7 +1838,7 @@ _o_strtof...@@ -1838,7 +1838,7 @@ _o_strtof
1838_o_strtok1838_o_strtok
1839_o_strtok_s1839_o_strtok_s
1840_o_strtol1840_o_strtol
1841F_ARM_ANY(_o_strtold) ; Can't use long double functions from the CRT on x861841F_LD64(_o_strtold) ; Can't use long double functions from the CRT on x86
1842_o_strtoll1842_o_strtoll
1843_o_strtoul1843_o_strtoul
1844_o_strtoull1844_o_strtoull
...@@ -1850,7 +1850,7 @@ F_NON_I386(_o_tanhf)...@@ -1850,7 +1850,7 @@ F_NON_I386(_o_tanhf)
1850_o_terminate1850_o_terminate
1851_o_tgamma1851_o_tgamma
1852_o_tgammaf1852_o_tgammaf
1853F_ARM_ANY(_o_tgammal) ; Can't use long double functions from the CRT on x861853F_LD64(_o_tgammal) ; Can't use long double functions from the CRT on x86
1854_o_tmpfile_s1854_o_tmpfile_s
1855_o_tmpnam_s1855_o_tmpnam_s
1856_o_tolower1856_o_tolower
...@@ -1875,7 +1875,7 @@ _o_wcstof...@@ -1875,7 +1875,7 @@ _o_wcstof
1875_o_wcstok1875_o_wcstok
1876_o_wcstok_s1876_o_wcstok_s
1877_o_wcstol1877_o_wcstol
1878F_ARM_ANY(_o_wcstold) ; Can't use long double functions from the CRT on x861878F_LD64(_o_wcstold) ; Can't use long double functions from the CRT on x86
1879_o_wcstoll1879_o_wcstoll
1880_o_wcstombs1880_o_wcstombs
1881_o_wcstombs_s1881_o_wcstombs_s
...@@ -2004,7 +2004,7 @@ _strtoi64...@@ -2004,7 +2004,7 @@ _strtoi64
2004_strtoi64_l2004_strtoi64_l
2005_strtoimax_l2005_strtoimax_l
2006_strtol_l2006_strtol_l
2007F_ARM_ANY(_strtold_l) ; Can't use long double functions from the CRT on x862007F_LD64(_strtold_l) ; Can't use long double functions from the CRT on x86
2008_strtoll_l2008_strtoll_l
2009_strtoui642009_strtoui64
2010_strtoui64_l2010_strtoui64_l
...@@ -2094,7 +2094,7 @@ _wcstoi64...@@ -2094,7 +2094,7 @@ _wcstoi64
2094_wcstoi64_l2094_wcstoi64_l
2095_wcstoimax_l2095_wcstoimax_l
2096_wcstol_l2096_wcstol_l
2097F_ARM_ANY(_wcstold_l) ; Can't use long double functions from the CRT on x862097F_LD64(_wcstold_l) ; Can't use long double functions from the CRT on x86
2098_wcstoll_l2098_wcstoll_l
2099_wcstombs_l2099_wcstombs_l
2100_wcstombs_s_l2100_wcstombs_s_l
...@@ -2212,21 +2212,21 @@ acos...@@ -2212,21 +2212,21 @@ acos
2212F_NON_I386(acosf)2212F_NON_I386(acosf)
2213acosh2213acosh
2214acoshf2214acoshf
2215F_ARM_ANY(acoshl) ; Can't use long double functions from the CRT on x862215F_LD64(acoshl) ; Can't use long double functions from the CRT on x86
2216asctime2216asctime
2217asctime_s2217asctime_s
2218asin2218asin
2219F_NON_I386(asinf)2219F_NON_I386(asinf)
2220asinh2220asinh
2221asinhf2221asinhf
2222F_ARM_ANY(asinhl) ; Can't use long double functions from the CRT on x862222F_LD64(asinhl) ; Can't use long double functions from the CRT on x86
2223atan2223atan
2224atan22224atan2
2225F_NON_I386(atan2f)2225F_NON_I386(atan2f)
2226F_NON_I386(atanf)2226F_NON_I386(atanf)
2227atanh2227atanh
2228atanhf2228atanhf
2229F_ARM_ANY(atanhl) ; Can't use long double functions from the CRT on x862229F_LD64(atanhl) ; Can't use long double functions from the CRT on x86
2230atof2230atof
2231atoi2231atoi
2232atol2232atol
...@@ -2238,111 +2238,111 @@ c16rtomb...@@ -2238,111 +2238,111 @@ c16rtomb
2238c32rtomb2238c32rtomb
2239cabs2239cabs
2240cabsf2240cabsf
2241F_ARM_ANY(cabsl) ; Can't use long double functions from the CRT on x862241F_LD64(cabsl) ; Can't use long double functions from the CRT on x86
2242cacos2242cacos
2243cacosf2243cacosf
2244cacosh2244cacosh
2245cacoshf2245cacoshf
2246F_ARM_ANY(cacoshl) ; Can't use long double functions from the CRT on x862246F_LD64(cacoshl) ; Can't use long double functions from the CRT on x86
2247F_ARM_ANY(cacosl) ; Can't use long double functions from the CRT on x862247F_LD64(cacosl) ; Can't use long double functions from the CRT on x86
2248calloc2248calloc
2249carg2249carg
2250cargf2250cargf
2251F_ARM_ANY(cargl) ; Can't use long double functions from the CRT on x862251F_LD64(cargl) ; Can't use long double functions from the CRT on x86
2252casin2252casin
2253casinf2253casinf
2254casinh2254casinh
2255casinhf2255casinhf
2256F_ARM_ANY(casinhl) ; Can't use long double functions from the CRT on x862256F_LD64(casinhl) ; Can't use long double functions from the CRT on x86
2257F_ARM_ANY(casinl) ; Can't use long double functions from the CRT on x862257F_LD64(casinl) ; Can't use long double functions from the CRT on x86
2258catan2258catan
2259catanf2259catanf
2260catanh2260catanh
2261catanhf2261catanhf
2262F_ARM_ANY(catanhl) ; Can't use long double functions from the CRT on x862262F_LD64(catanhl) ; Can't use long double functions from the CRT on x86
2263F_ARM_ANY(catanl) ; Can't use long double functions from the CRT on x862263F_LD64(catanl) ; Can't use long double functions from the CRT on x86
2264cbrt2264cbrt
2265cbrtf2265cbrtf
2266F_ARM_ANY(cbrtl) ; Can't use long double functions from the CRT on x862266F_LD64(cbrtl) ; Can't use long double functions from the CRT on x86
2267ccos2267ccos
2268ccosf2268ccosf
2269ccosh2269ccosh
2270ccoshf2270ccoshf
2271F_ARM_ANY(ccoshl) ; Can't use long double functions from the CRT on x862271F_LD64(ccoshl) ; Can't use long double functions from the CRT on x86
2272F_ARM_ANY(ccosl) ; Can't use long double functions from the CRT on x862272F_LD64(ccosl) ; Can't use long double functions from the CRT on x86
2273ceil2273ceil
2274F_NON_I386(ceilf)2274F_NON_I386(ceilf)
2275cexp2275cexp
2276cexpf2276cexpf
2277F_ARM_ANY(cexpl) ; Can't use long double functions from the CRT on x862277F_LD64(cexpl) ; Can't use long double functions from the CRT on x86
2278cimag2278cimag
2279cimagf2279cimagf
2280F_ARM_ANY(cimagl) ; Can't use long double functions from the CRT on x862280F_LD64(cimagl) ; Can't use long double functions from the CRT on x86
2281clearerr2281clearerr
2282clearerr_s2282clearerr_s
2283clock2283clock
2284clog2284clog
2285clog102285clog10
2286clog10f2286clog10f
2287F_ARM_ANY(clog10l) ; Can't use long double functions from the CRT on x862287F_LD64(clog10l) ; Can't use long double functions from the CRT on x86
2288clogf2288clogf
2289F_ARM_ANY(clogl) ; Can't use long double functions from the CRT on x862289F_LD64(clogl) ; Can't use long double functions from the CRT on x86
2290conj2290conj
2291conjf2291conjf
2292F_ARM_ANY(conjl) ; Can't use long double functions from the CRT on x862292F_LD64(conjl) ; Can't use long double functions from the CRT on x86
2293copysign2293copysign
2294copysignf2294copysignf
2295F_ARM_ANY(copysignl) ; Can't use long double functions from the CRT on x862295F_LD64(copysignl) ; Can't use long double functions from the CRT on x86
2296cos2296cos
2297F_NON_I386(cosf)2297F_NON_I386(cosf)
2298cosh2298cosh
2299F_NON_I386(coshf)2299F_NON_I386(coshf)
2300cpow2300cpow
2301cpowf2301cpowf
2302F_ARM_ANY(cpowl) ; Can't use long double functions from the CRT on x862302F_LD64(cpowl) ; Can't use long double functions from the CRT on x86
2303cproj2303cproj
2304cprojf2304cprojf
2305F_ARM_ANY(cprojl) ; Can't use long double functions from the CRT on x862305F_LD64(cprojl) ; Can't use long double functions from the CRT on x86
2306creal2306creal
2307crealf2307crealf
2308F_ARM_ANY(creall) ; Can't use long double functions from the CRT on x862308F_LD64(creall) ; Can't use long double functions from the CRT on x86
2309csin2309csin
2310csinf2310csinf
2311csinh2311csinh
2312csinhf2312csinhf
2313F_ARM_ANY(csinhl) ; Can't use long double functions from the CRT on x862313F_LD64(csinhl) ; Can't use long double functions from the CRT on x86
2314F_ARM_ANY(csinl) ; Can't use long double functions from the CRT on x862314F_LD64(csinl) ; Can't use long double functions from the CRT on x86
2315csqrt2315csqrt
2316csqrtf2316csqrtf
2317F_ARM_ANY(csqrtl) ; Can't use long double functions from the CRT on x862317F_LD64(csqrtl) ; Can't use long double functions from the CRT on x86
2318ctan2318ctan
2319ctanf2319ctanf
2320ctanh2320ctanh
2321ctanhf2321ctanhf
2322F_ARM_ANY(ctanhl) ; Can't use long double functions from the CRT on x862322F_LD64(ctanhl) ; Can't use long double functions from the CRT on x86
2323F_ARM_ANY(ctanl) ; Can't use long double functions from the CRT on x862323F_LD64(ctanl) ; Can't use long double functions from the CRT on x86
2324div2324div
2325erf2325erf
2326erfc2326erfc
2327erfcf2327erfcf
2328F_ARM_ANY(erfcl) ; Can't use long double functions from the CRT on x862328F_LD64(erfcl) ; Can't use long double functions from the CRT on x86
2329erff2329erff
2330F_ARM_ANY(erfl) ; Can't use long double functions from the CRT on x862330F_LD64(erfl) ; Can't use long double functions from the CRT on x86
2331exit2331exit
2332exp2332exp
2333exp22333exp2
2334exp2f2334exp2f
2335F_ARM_ANY(exp2l) ; Can't use long double functions from the CRT on x862335F_LD64(exp2l) ; Can't use long double functions from the CRT on x86
2336F_NON_I386(expf)2336F_NON_I386(expf)
2337expm12337expm1
2338expm1f2338expm1f
2339F_ARM_ANY(expm1l) ; Can't use long double functions from the CRT on x862339F_LD64(expm1l) ; Can't use long double functions from the CRT on x86
2340fabs2340fabs
2341F_ARM_ANY(fabsf)2341F_ARM_ANY(fabsf)
2342fclose2342fclose
2343fdim2343fdim
2344fdimf2344fdimf
2345F_ARM_ANY(fdiml) ; Can't use long double functions from the CRT on x862345F_LD64(fdiml) ; Can't use long double functions from the CRT on x86
2346; Don't use the float env functions from UCRT; fesetround doesn't seem to have2346; Don't use the float env functions from UCRT; fesetround doesn't seem to have
2347; any effect on the FPU control word as required by other libmingwex math2347; any effect on the FPU control word as required by other libmingwex math
2348; routines.2348; routines.
...@@ -2367,13 +2367,13 @@ floor...@@ -2367,13 +2367,13 @@ floor
2367F_NON_I386(floorf)2367F_NON_I386(floorf)
2368fma2368fma
2369fmaf2369fmaf
2370F_ARM_ANY(fmal) ; Can't use long double functions from the CRT on x862370F_LD64(fmal) ; Can't use long double functions from the CRT on x86
2371fmax2371fmax
2372fmaxf2372fmaxf
2373F_ARM_ANY(fmaxl) ; Can't use long double functions from the CRT on x862373F_LD64(fmaxl) ; Can't use long double functions from the CRT on x86
2374fmin2374fmin
2375fminf2375fminf
2376F_ARM_ANY(fminl) ; Can't use long double functions from the CRT on x862376F_LD64(fminl) ; Can't use long double functions from the CRT on x86
2377fmod2377fmod
2378F_NON_I386(fmodf)2378F_NON_I386(fmodf)
2379fopen2379fopen
...@@ -2403,7 +2403,7 @@ getwchar...@@ -2403,7 +2403,7 @@ getwchar
2403hypot2403hypot
2404ilogb2404ilogb
2405ilogbf2405ilogbf
2406F_ARM_ANY(ilogbl) ; Can't use long double functions from the CRT on x862406F_LD64(ilogbl) ; Can't use long double functions from the CRT on x86
2407imaxabs2407imaxabs
2408imaxdiv2408imaxdiv
2409is_wctype2409is_wctype
...@@ -2441,36 +2441,36 @@ ldiv...@@ -2441,36 +2441,36 @@ ldiv
2441; the mingw ones do. Therefore prefer the libmingwex version instead.2441; the mingw ones do. Therefore prefer the libmingwex version instead.
2442lgamma DATA2442lgamma DATA
2443lgammaf DATA2443lgammaf DATA
2444F_ARM_ANY(lgammal DATA) ; Can't use long double functions from the CRT on x862444F_LD64(lgammal DATA) ; Can't use long double functions from the CRT on x86
2445llabs2445llabs
2446lldiv2446lldiv
2447llrint2447llrint
2448llrintf2448llrintf
2449F_ARM_ANY(llrintl) ; Can't use long double functions from the CRT on x862449F_LD64(llrintl) ; Can't use long double functions from the CRT on x86
2450llround2450llround
2451llroundf2451llroundf
2452F_ARM_ANY(llroundl) ; Can't use long double functions from the CRT on x862452F_LD64(llroundl) ; Can't use long double functions from the CRT on x86
2453localeconv2453localeconv
2454log2454log
2455log102455log10
2456F_NON_I386(log10f)2456F_NON_I386(log10f)
2457log1p2457log1p
2458log1pf2458log1pf
2459F_ARM_ANY(log1pl) ; Can't use long double functions from the CRT on x862459F_LD64(log1pl) ; Can't use long double functions from the CRT on x86
2460log22460log2
2461log2f2461log2f
2462F_ARM_ANY(log2l) ; Can't use long double functions from the CRT on x862462F_LD64(log2l) ; Can't use long double functions from the CRT on x86
2463logb2463logb
2464logbf2464logbf
2465F_ARM_ANY(logbl) ; Can't use long double functions from the CRT on x862465F_LD64(logbl) ; Can't use long double functions from the CRT on x86
2466F_NON_I386(logf)2466F_NON_I386(logf)
2467longjmp2467longjmp
2468lrint2468lrint
2469lrintf2469lrintf
2470F_ARM_ANY(lrintl) ; Can't use long double functions from the CRT on x862470F_LD64(lrintl) ; Can't use long double functions from the CRT on x86
2471lround2471lround
2472lroundf2472lroundf
2473F_ARM_ANY(lroundl) ; Can't use long double functions from the CRT on x862473F_LD64(lroundl) ; Can't use long double functions from the CRT on x86
2474malloc2474malloc
2475mblen2475mblen
2476mbrlen2476mbrlen
...@@ -2493,18 +2493,18 @@ modf...@@ -2493,18 +2493,18 @@ modf
2493F_NON_I386(modff)2493F_NON_I386(modff)
2494nan2494nan
2495nanf2495nanf
2496F_ARM_ANY(nanl) ; Can't use long double functions from the CRT on x862496F_LD64(nanl) ; Can't use long double functions from the CRT on x86
2497nearbyint2497nearbyint
2498nearbyintf2498nearbyintf
2499F_ARM_ANY(nearbyintl) ; Can't use long double functions from the CRT on x862499F_LD64(nearbyintl) ; Can't use long double functions from the CRT on x86
2500nextafter2500nextafter
2501nextafterf2501nextafterf
2502F_ARM_ANY(nextafterl) ; Can't use long double functions from the CRT on x862502F_LD64(nextafterl) ; Can't use long double functions from the CRT on x86
2503; All of the nexttoward functions take the second parameter as long double,2503; All of the nexttoward functions take the second parameter as long double,
2504; making them unusable for x86.2504; making them unusable for x86.
2505F_ARM_ANY(nexttoward) ; Can't use long double functions from the CRT on x862505F_LD64(nexttoward) ; Can't use long double functions from the CRT on x86
2506F_ARM_ANY(nexttowardf) ; Can't use long double functions from the CRT on x862506F_LD64(nexttowardf) ; Can't use long double functions from the CRT on x86
2507F_ARM_ANY(nexttowardl) ; Can't use long double functions from the CRT on x862507F_LD64(nexttowardl) ; Can't use long double functions from the CRT on x86
2508norm2508norm
2509normf2509normf
2510norml2510norml
...@@ -2525,25 +2525,25 @@ rand_s...@@ -2525,25 +2525,25 @@ rand_s
2525realloc2525realloc
2526remainder2526remainder
2527remainderf2527remainderf
2528F_ARM_ANY(remainderl) ; Can't use long double functions from the CRT on x862528F_LD64(remainderl) ; Can't use long double functions from the CRT on x86
2529remove2529remove
2530remquo2530remquo
2531remquof2531remquof
2532F_ARM_ANY(remquol) ; Can't use long double functions from the CRT on x862532F_LD64(remquol) ; Can't use long double functions from the CRT on x86
2533rename2533rename
2534rewind2534rewind
2535rint2535rint
2536rintf2536rintf
2537F_ARM_ANY(rintl) ; Can't use long double functions from the CRT on x862537F_LD64(rintl) ; Can't use long double functions from the CRT on x86
2538round2538round
2539roundf2539roundf
2540F_ARM_ANY(roundl) ; Can't use long double functions from the CRT on x862540F_LD64(roundl) ; Can't use long double functions from the CRT on x86
2541scalbln2541scalbln
2542scalblnf2542scalblnf
2543F_ARM_ANY(scalblnl) ; Can't use long double functions from the CRT on x862543F_LD64(scalblnl) ; Can't use long double functions from the CRT on x86
2544scalbn2544scalbn
2545scalbnf2545scalbnf
2546F_ARM_ANY(scalbnl) ; Can't use long double functions from the CRT on x862546F_LD64(scalbnl) ; Can't use long double functions from the CRT on x86
2547set_terminate2547set_terminate
2548set_unexpected2548set_unexpected
2549setbuf2549setbuf
...@@ -2587,7 +2587,7 @@ strtoimax...@@ -2587,7 +2587,7 @@ strtoimax
2587strtok2587strtok
2588strtok_s2588strtok_s
2589strtol2589strtol
2590F_ARM_ANY(strtold) ; Can't use long double functions from the CRT on x862590F_LD64(strtold) ; Can't use long double functions from the CRT on x86
2591strtoll2591strtoll
2592strtoul2592strtoul
2593strtoull2593strtoull
...@@ -2602,7 +2602,7 @@ F_NON_I386(tanhf)...@@ -2602,7 +2602,7 @@ F_NON_I386(tanhf)
2602terminate2602terminate
2603tgamma2603tgamma
2604tgammaf2604tgammaf
2605F_ARM_ANY(tgammal) ; Can't use long double functions from the CRT on x862605F_LD64(tgammal) ; Can't use long double functions from the CRT on x86
2606tmpfile2606tmpfile
2607tmpfile_s2607tmpfile_s
2608tmpnam2608tmpnam
...@@ -2614,7 +2614,7 @@ towlower...@@ -2614,7 +2614,7 @@ towlower
2614towupper2614towupper
2615trunc2615trunc
2616truncf2616truncf
2617F_ARM_ANY(truncl) ; Can't use long double functions from the CRT on x862617F_LD64(truncl) ; Can't use long double functions from the CRT on x86
2618unexpected2618unexpected
2619ungetc2619ungetc
2620ungetwc2620ungetwc
...@@ -2648,7 +2648,7 @@ wcstoimax...@@ -2648,7 +2648,7 @@ wcstoimax
2648wcstok2648wcstok
2649wcstok_s2649wcstok_s
2650wcstol2650wcstol
2651F_ARM_ANY(wcstold) ; Can't use long double functions from the CRT on x862651F_LD64(wcstold) ; Can't use long double functions from the CRT on x86
2652wcstoll2652wcstoll
2653wcstombs2653wcstombs
2654wcstombs_s2654wcstombs_s
lib/libc/mingw/lib-common/ws2_32.def.in+181-181
...@@ -2,200 +2,200 @@...@@ -2,200 +2,200 @@
22
3LIBRARY "WS2_32.dll"3LIBRARY "WS2_32.dll"
4EXPORTS4EXPORTS
5accept5__WSAFDIsSet@8
6bind6FreeAddrInfoEx@4
7closesocket7FreeAddrInfoExW@4
8connect8FreeAddrInfoW@4
9getpeername9GetAddrInfoExA@40
10getsockname10GetAddrInfoExCancel@4
11getsockopt11GetAddrInfoExOverlappedResult@4
12htonl12GetAddrInfoExW@40
13htons13GetAddrInfoW@16
14ioctlsocket14GetHostNameW@8
15inet_addr15GetNameInfoW@28
16inet_ntoa16InetNtopW@16
17listen17InetPtonW@12
18ntohl18ProcessSocketNotifications@28
19ntohs19SetAddrInfoExA@48
20recv20SetAddrInfoExW@48
21recvfrom21WEP@0
22select22WPUCompleteOverlappedRequest@20
23send23WPUGetProviderPathEx@20
24sendto24WSAAccept@20
25setsockopt25WSAAddressToStringA@20
26shutdown26WSAAddressToStringW@20
27socket27WSAAdvertiseProvider@8
28WSApSetPostRoutine28WSAAsyncGetHostByAddr@28
29FreeAddrInfoEx29WSAAsyncGetHostByName@20
30FreeAddrInfoExW30WSAAsyncGetProtoByName@20
31FreeAddrInfoW31WSAAsyncGetProtoByNumber@20
32GetAddrInfoExA32WSAAsyncGetServByName@24
33GetAddrInfoExCancel33WSAAsyncGetServByPort@24
34GetAddrInfoExOverlappedResult34WSAAsyncSelect@16
35GetAddrInfoExW35WSACancelAsyncRequest@4
36GetAddrInfoW36WSACancelBlockingCall@0
37GetHostNameW37WSACleanup@0
38GetNameInfoW38WSACloseEvent@4
39InetNtopW39WSAConnect@28
40InetPtonW40WSAConnectByList@32
41ProcessSocketNotifications41WSAConnectByNameA@36
42SetAddrInfoExA42WSAConnectByNameW@36
43SetAddrInfoExW43WSACreateEvent@0
44WPUCompleteOverlappedRequest44WSADuplicateSocketA@12
45WPUGetProviderPathEx45WSADuplicateSocketW@12
46WSAAccept46WSAEnumNameSpaceProvidersA@8
47WSAAddressToStringA47WSAEnumNameSpaceProvidersExA@8
48WSAAddressToStringW48WSAEnumNameSpaceProvidersExW@8
49WSAAdvertiseProvider49WSAEnumNameSpaceProvidersW@8
50WSACloseEvent50WSAEnumNetworkEvents@12
51WSAConnect51WSAEnumProtocolsA@12
52WSAConnectByList52WSAEnumProtocolsW@12
53WSAConnectByNameA53WSAEventSelect@12
54WSAConnectByNameW54WSAGetLastError@0
55WSACreateEvent55WSAGetOverlappedResult@20
56gethostbyaddr56WSAGetQOSByName@12
57gethostbyname57WSAGetServiceClassInfoA@16
58getprotobyname58WSAGetServiceClassInfoW@16
59getprotobynumber59WSAGetServiceClassNameByClassIdA@12
60getservbyname60WSAGetServiceClassNameByClassIdW@12
61getservbyport61WSAHtonl@12
62gethostname62WSAHtons@12
63WSADuplicateSocketA63WSAInstallServiceClassA@4
64WSADuplicateSocketW64WSAInstallServiceClassW@4
65WSAEnumNameSpaceProvidersA65WSAIoctl@36
66WSAEnumNameSpaceProvidersExA66WSAIsBlocking@0
67WSAEnumNameSpaceProvidersExW67WSAJoinLeaf@32
68WSAEnumNameSpaceProvidersW68WSALookupServiceBeginA@12
69WSAEnumNetworkEvents69WSALookupServiceBeginW@12
70WSAEnumProtocolsA70WSALookupServiceEnd@4
71WSAEnumProtocolsW71WSALookupServiceNextA@16
72WSAEventSelect72WSALookupServiceNextW@16
73WSAGetOverlappedResult73WSANSPIoctl@32
74WSAGetQOSByName74WSANtohl@12
75WSAGetServiceClassInfoA75WSANtohs@12
76WSAGetServiceClassInfoW76WSAPoll@12
77WSAGetServiceClassNameByClassIdA77WSAProviderCompleteAsyncCall@8
78WSAGetServiceClassNameByClassIdW78WSAProviderConfigChange@12
79WSAHtonl79WSARecv@28
80WSAHtons80WSARecvDisconnect@8
81WSAInstallServiceClassA81WSARecvFrom@36
82WSAInstallServiceClassW82WSARemoveServiceClass@4
83WSAIoctl83WSAResetEvent@4
84WSAJoinLeaf84WSASend@28
85WSALookupServiceBeginA85WSASendDisconnect@8
86WSALookupServiceBeginW86WSASendMsg@24
87WSALookupServiceEnd87WSASendTo@36
88WSALookupServiceNextA88WSASetBlockingHook@4
89WSALookupServiceNextW89WSASetEvent@4
90WSANSPIoctl90WSASetLastError@4
91WSANtohl91WSASetServiceA@12
92WSANtohs92WSASetServiceW@12
93WSAPoll93WSASocketA@24
94WSAProviderCompleteAsyncCall94WSASocketW@24
95WSAProviderConfigChange95WSAStartup@8
96WSARecv96WSAStringToAddressA@20
97WSARecvDisconnect97WSAStringToAddressW@20
98WSARecvFrom98WSAUnadvertiseProvider@4
99WSARemoveServiceClass99WSAUnhookBlockingHook@0
100WSAResetEvent100WSAWaitForMultipleEvents@20
101WSASend101WSApSetPostRoutine@4
102WSASendDisconnect102WSCDeinstallProvider@8
103WSASendMsg
104WSASendTo
105WSASetEvent
106WSAAsyncSelect
107WSAAsyncGetHostByAddr
108WSAAsyncGetHostByName
109WSAAsyncGetProtoByNumber
110WSAAsyncGetProtoByName
111WSAAsyncGetServByPort
112WSAAsyncGetServByName
113WSACancelAsyncRequest
114WSASetBlockingHook
115WSAUnhookBlockingHook
116WSAGetLastError
117WSASetLastError
118WSACancelBlockingCall
119WSAIsBlocking
120WSAStartup
121WSACleanup
122WSASetServiceA
123WSASetServiceW
124WSASocketA
125WSASocketW
126WSAStringToAddressA
127WSAStringToAddressW
128WSAUnadvertiseProvider
129WSAWaitForMultipleEvents
130WSCDeinstallProvider
131F64(WSCDeinstallProvider32)103F64(WSCDeinstallProvider32)
132WSCDeinstallProviderEx104WSCDeinstallProviderEx@12
133WSCEnableNSProvider105WSCEnableNSProvider@8
134F64(WSCEnableNSProvider32)106F64(WSCEnableNSProvider32)
135F64(WSCEnumNameSpaceProviders32)107F64(WSCEnumNameSpaceProviders32)
136F64(WSCEnumNameSpaceProvidersEx32)108F64(WSCEnumNameSpaceProvidersEx32)
137WSCEnumProtocols109WSCEnumProtocols@16
138WSCEnumProtocolsEx
139F64(WSCEnumProtocols32)110F64(WSCEnumProtocols32)
140WSCGetApplicationCategory111WSCEnumProtocolsEx@20
141WSCGetApplicationCategoryEx112WSCGetApplicationCategory@24
142WSCGetProviderInfo113WSCGetApplicationCategoryEx@28
114WSCGetProviderInfo@24
143F64(WSCGetProviderInfo32)115F64(WSCGetProviderInfo32)
144WSCGetProviderPath116WSCGetProviderPath@16
145F64(WSCGetProviderPath32)117F64(WSCGetProviderPath32)
146WSCInstallNameSpace118WSCInstallNameSpace@20
147F64(WSCInstallNameSpace32)119F64(WSCInstallNameSpace32)
148WSCInstallNameSpaceEx120WSCInstallNameSpaceEx@24
149WSCInstallNameSpaceEx2121WSCInstallNameSpaceEx2@28
150F64(WSCInstallNameSpaceEx32)122F64(WSCInstallNameSpaceEx32)
151WSCInstallProvider123WSCInstallProvider@20
152F64(WSCInstallProvider64_32)124F64(WSCInstallProvider64_32)
153WSCInstallProviderAndChains125WSCInstallProviderAndChains@32
154F64(WSCInstallProviderAndChains64_32)126F64(WSCInstallProviderAndChains64_32)
155WSCInstallProviderEx127WSCInstallProviderEx@28
156WSCSetApplicationCategory128WSCSetApplicationCategory@28
157WSCSetApplicationCategoryEx129WSCSetApplicationCategoryEx@32
158WSCSetProviderInfo130WSCSetProviderInfo@24
159F64(WSCSetProviderInfo32)131F64(WSCSetProviderInfo32)
160WSCUnInstallNameSpace132WSCUnInstallNameSpace@4
161F64(WSCUnInstallNameSpace32)133F64(WSCUnInstallNameSpace32)
162WSCUnInstallNameSpaceEx2134WSCUnInstallNameSpaceEx2@8
163WSCUpdateProvider135WSCUpdateProvider@20
164F64(WSCUpdateProvider32)136F64(WSCUpdateProvider32)
165WSCUpdateProviderEx137WSCUpdateProviderEx@24
166WSCWriteNameSpaceOrder138WSCWriteNameSpaceOrder@8
167F64(WSCWriteNameSpaceOrder32)139F64(WSCWriteNameSpaceOrder32)
168WSCWriteProviderOrder140WSCWriteProviderOrder@8
169F64(WSCWriteProviderOrder32)141F64(WSCWriteProviderOrder32)
170WSCWriteProviderOrderEx142WSCWriteProviderOrderEx@12
171WahCloseApcHelper143WahCloseApcHelper@4
172__WSAFDIsSet144WahCloseHandleHelper@4
173WahCloseHandleHelper145WahCloseNotificationHandleHelper@4
174WahCloseNotificationHandleHelper146WahCloseSocketHandle@8
175WahCloseSocketHandle147WahCloseThread@8
176WahCloseThread148WahCompleteRequest@20
177WahCompleteRequest149WahCreateHandleContextTable@4
178WahCreateHandleContextTable150WahCreateNotificationHandle@8
179WahCreateNotificationHandle151WahCreateSocketHandle@8
180WahCreateSocketHandle152WahDestroyHandleContextTable@4
181WahDestroyHandleContextTable153WahDisableNonIFSHandleSupport@0
182WahDisableNonIFSHandleSupport154WahEnableNonIFSHandleSupport@0
183WahEnableNonIFSHandleSupport155WahEnumerateHandleContexts@12
184WahEnumerateHandleContexts156WahInsertHandleContext@8
185WahInsertHandleContext157WahNotifyAllProcesses@4
186WahNotifyAllProcesses158WahOpenApcHelper@4
187WahOpenApcHelper159WahOpenCurrentThread@8
188WahOpenCurrentThread160WahOpenHandleHelper@4
189WahOpenHandleHelper161WahOpenNotificationHandleHelper@4
190WahOpenNotificationHandleHelper162WahQueueUserApc@16
191WahQueueUserApc163WahReferenceContextByHandle@8
192WahReferenceContextByHandle164WahRemoveHandleContext@8
193WahRemoveHandleContext165WahWaitForNotification@16
194WahWaitForNotification166WahWriteLSPEvent@8
195WahWriteLSPEvent167accept@12
196freeaddrinfo168bind@12
197getaddrinfo169closesocket@4
198getnameinfo170connect@12
199inet_ntop171freeaddrinfo@4
200inet_pton172getaddrinfo@16
201WEP173gethostbyaddr@12
174gethostbyname@4
175gethostname@8
176getnameinfo@28
177getpeername@12
178getprotobyname@4
179getprotobynumber@4
180getservbyname@8
181getservbyport@8
182getsockname@12
183getsockopt@20
184htonl@4
185htons@4
186inet_addr@4
187inet_ntoa@4
188inet_ntop@16
189inet_pton@12
190ioctlsocket@12
191listen@8
192ntohl@4
193ntohs@4
194recv@16
195recvfrom@24
196select@20
197send@16
198sendto@24
199setsockopt@20
200shutdown@8
201socket@12
lib/libc/mingw/lib32/ole32.def+28
...@@ -25,6 +25,7 @@ CLSIDFromProgIDEx@8...@@ -25,6 +25,7 @@ CLSIDFromProgIDEx@8
25CLSIDFromString@825CLSIDFromString@8
26CoAddRefServerProcess@026CoAddRefServerProcess@0
27CoAllowSetForegroundWindow@827CoAllowSetForegroundWindow@8
28CoAllowUnmarshalerCLSID@4
28CoBuildVersion@029CoBuildVersion@0
29CoCancelCall@830CoCancelCall@8
30CoCopyProxy@831CoCopyProxy@8
...@@ -35,6 +36,8 @@ CoCreateInstanceEx@24...@@ -35,6 +36,8 @@ CoCreateInstanceEx@24
35CoCreateInstanceFromApp@2436CoCreateInstanceFromApp@24
36CoCreateObjectInContext@1637CoCreateObjectInContext@16
37CoDeactivateObject@838CoDeactivateObject@8
39CoDecodeProxy@16
40CoDecrementMTAUsage@4
38CoDisableCallCancellation@441CoDisableCallCancellation@4
39CoDisconnectContext@442CoDisconnectContext@4
40CoDisconnectObject@843CoDisconnectObject@8
...@@ -77,7 +80,9 @@ CoGetState@4...@@ -77,7 +80,9 @@ CoGetState@4
77CoGetStdMarshalEx@1280CoGetStdMarshalEx@12
78CoGetSystemSecurityPermissions@881CoGetSystemSecurityPermissions@8
79CoGetTreatAsClass@882CoGetTreatAsClass@8
83CoHandlePriorityEventsFromMessagePump@0
80CoImpersonateClient@084CoImpersonateClient@0
85CoIncrementMTAUsage@4
81CoInitialize@486CoInitialize@4
82CoInitializeEx@887CoInitializeEx@8
83CoInitializeSecurity@3688CoInitializeSecurity@36
...@@ -98,6 +103,7 @@ CoQueryClientBlanket@28...@@ -98,6 +103,7 @@ CoQueryClientBlanket@28
98CoQueryProxyBlanket@32103CoQueryProxyBlanket@32
99CoQueryReleaseObject@4104CoQueryReleaseObject@4
100CoReactivateObject@8105CoReactivateObject@8
106CoRegisterActivationFilter@4
101CoRegisterChannelHook@8107CoRegisterChannelHook@8
102CoRegisterClassObject@20108CoRegisterClassObject@20
103CoRegisterInitializeSpy@8109CoRegisterInitializeSpy@8
...@@ -115,6 +121,7 @@ CoRevokeClassObject@4...@@ -115,6 +121,7 @@ CoRevokeClassObject@4
115CoRevokeInitializeSpy@8121CoRevokeInitializeSpy@8
116CoRevokeMallocSpy@0122CoRevokeMallocSpy@0
117CoSetCancelObject@4123CoSetCancelObject@4
124CoSetMessageDispatcher@4
118CoSetProxyBlanket@32125CoSetProxyBlanket@32
119CoSetState@4126CoSetState@4
120CoSuspendClassObjects@0127CoSuspendClassObjects@0
...@@ -129,6 +136,7 @@ CoUnloadingWOW@4...@@ -129,6 +136,7 @@ CoUnloadingWOW@4
129CoUnmarshalHresult@8136CoUnmarshalHresult@8
130CoUnmarshalInterface@12137CoUnmarshalInterface@12
131CoWaitForMultipleHandles@20138CoWaitForMultipleHandles@20
139CoWaitForMultipleObjects@20
132ComPs_NdrDllCanUnloadNow@4140ComPs_NdrDllCanUnloadNow@4
133ComPs_NdrDllGetClassObject@24141ComPs_NdrDllGetClassObject@24
134ComPs_NdrDllRegisterProxy@20142ComPs_NdrDllRegisterProxy@20
...@@ -157,6 +165,7 @@ DoDragDrop@16...@@ -157,6 +165,7 @@ DoDragDrop@16
157EnableHookObject@8165EnableHookObject@8
158FmtIdToPropStgName@8166FmtIdToPropStgName@8
159FreePropVariantArray@8167FreePropVariantArray@8
168GetActiveObjectExt@12
160GetClassFile@8169GetClassFile@8
161GetConvertStg@4170GetConvertStg@4
162GetDocumentBitStg@4171GetDocumentBitStg@4
...@@ -205,6 +214,10 @@ HMETAFILE_UserFree@8...@@ -205,6 +214,10 @@ HMETAFILE_UserFree@8
205HMETAFILE_UserMarshal@12214HMETAFILE_UserMarshal@12
206HMETAFILE_UserSize@12215HMETAFILE_UserSize@12
207HMETAFILE_UserUnmarshal@12216HMETAFILE_UserUnmarshal@12
217HMONITOR_UserFree@8
218HMONITOR_UserMarshal@12
219HMONITOR_UserSize@12
220HMONITOR_UserUnmarshal@12
208HPALETTE_UserFree@8221HPALETTE_UserFree@8
209HPALETTE_UserMarshal@12222HPALETTE_UserMarshal@12
210HPALETTE_UserSize@12223HPALETTE_UserSize@12
...@@ -288,11 +301,14 @@ OleBuildVersion@0...@@ -288,11 +301,14 @@ OleBuildVersion@0
288OleConvertIStorageToOLESTREAM@8301OleConvertIStorageToOLESTREAM@8
289OleConvertIStorageToOLESTREAMEx@28302OleConvertIStorageToOLESTREAMEx@28
290OleConvertOLESTREAMToIStorage@12303OleConvertOLESTREAMToIStorage@12
304OleConvertOLESTREAMToIStorage2@24
291OleConvertOLESTREAMToIStorageEx@28305OleConvertOLESTREAMToIStorageEx@28
306OleConvertOLESTREAMToIStorageEx2@40
292OleCreate@28307OleCreate@28
293OleCreateDefaultHandler@16308OleCreateDefaultHandler@16
294OleCreateEmbeddingHelper@24309OleCreateEmbeddingHelper@24
295OleCreateEx@48310OleCreateEx@48
311OleCreateFontIndirectExt@12
296OleCreateFromData@28312OleCreateFromData@28
297OleCreateFromDataEx@48313OleCreateFromDataEx@48
298OleCreateFromFile@32314OleCreateFromFile@32
...@@ -304,6 +320,8 @@ OleCreateLinkFromDataEx@48...@@ -304,6 +320,8 @@ OleCreateLinkFromDataEx@48
304OleCreateLinkToFile@28320OleCreateLinkToFile@28
305OleCreateLinkToFileEx@48321OleCreateLinkToFileEx@48
306OleCreateMenuDescriptor@8322OleCreateMenuDescriptor@8
323OleCreatePictureIndirectExt@16
324OleCreatePropertyFrameIndirectExt@4
307OleCreateStaticFromData@28325OleCreateStaticFromData@28
308OleDestroyMenuDescriptor@4326OleDestroyMenuDescriptor@4
309OleDoAutoConvert@8327OleDoAutoConvert@8
...@@ -312,14 +330,19 @@ OleDuplicateData@12...@@ -312,14 +330,19 @@ OleDuplicateData@12
312OleFlushClipboard@0330OleFlushClipboard@0
313OleGetAutoConvert@8331OleGetAutoConvert@8
314OleGetClipboard@4332OleGetClipboard@4
333OleGetClipboardWithEnterpriseInfo@20
315OleGetIconOfClass@12334OleGetIconOfClass@12
316OleGetIconOfFile@8335OleGetIconOfFile@8
336OleIconToCursorExt@8
317OleInitialize@4337OleInitialize@4
318OleInitializeWOW@8338OleInitializeWOW@8
319OleIsCurrentClipboard@4339OleIsCurrentClipboard@4
320OleIsRunning@4340OleIsRunning@4
321OleLoad@16341OleLoad@16
322OleLoadFromStream@12342OleLoadFromStream@12
343OleLoadPictureExt@32
344OleLoadPictureFileExt@32
345OleLoadPicturePathExt@24
323OleLockRunning@12346OleLockRunning@12
324OleMetafilePictFromIconAndLabel@16347OleMetafilePictFromIconAndLabel@16
325OleNoteObjectVisible@8348OleNoteObjectVisible@8
...@@ -331,12 +354,14 @@ OleRegGetMiscStatus@12...@@ -331,12 +354,14 @@ OleRegGetMiscStatus@12
331OleRegGetUserType@12354OleRegGetUserType@12
332OleRun@4355OleRun@4
333OleSave@12356OleSave@12
357OleSavePictureFileExt@8
334OleSaveToStream@8358OleSaveToStream@8
335OleSetAutoConvert@8359OleSetAutoConvert@8
336OleSetClipboard@4360OleSetClipboard@4
337OleSetContainedObject@8361OleSetContainedObject@8
338OleSetMenuDescriptor@20362OleSetMenuDescriptor@20
339OleTranslateAccelerator@12363OleTranslateAccelerator@12
364OleTranslateColorExt@12
340OleUninitialize@0365OleUninitialize@0
341OpenOrCreateStream@12366OpenOrCreateStream@12
342ProgIDFromCLSID@8367ProgIDFromCLSID@8
...@@ -350,9 +375,12 @@ ReadClassStm@8...@@ -350,9 +375,12 @@ ReadClassStm@8
350ReadFmtUserTypeStg@12375ReadFmtUserTypeStg@12
351ReadOleStg@24376ReadOleStg@24
352ReadStringStream@8377ReadStringStream@8
378RegisterActiveObjectExt@16
353RegisterDragDrop@8379RegisterDragDrop@8
354ReleaseStgMedium@4380ReleaseStgMedium@4
381RevokeActiveObjectExt@8
355RevokeDragDrop@4382RevokeDragDrop@4
383RoGetAgileReference@16
356SNB_UserFree@8384SNB_UserFree@8
357SNB_UserMarshal@12385SNB_UserMarshal@12
358SNB_UserSize@12386SNB_UserSize@12
lib/libc/mingw/lib32/ws2_32.def deleted-188
...@@ -1,188 +0,0 @@
1;
2; Definition file of WS2_32.dll
3; Automatic generated by gendef
4; written by Kai Tietz 2008
5;
6LIBRARY "WS2_32.dll"
7EXPORTS
8accept@12
9bind@12
10closesocket@4
11connect@12
12getpeername@12
13getsockname@12
14getsockopt@20
15htonl@4
16htons@4
17ioctlsocket@12
18inet_addr@4
19inet_ntoa@4
20listen@8
21ntohl@4
22ntohs@4
23recv@16
24recvfrom@24
25select@20
26send@16
27sendto@24
28setsockopt@20
29shutdown@8
30socket@12
31WSApSetPostRoutine@4
32FreeAddrInfoEx@4
33FreeAddrInfoExW@4
34FreeAddrInfoW@4
35GetAddrInfoExA@40
36GetAddrInfoExCancel@4
37GetAddrInfoExOverlappedResult@4
38GetAddrInfoExW@40
39GetAddrInfoW@16
40GetHostNameW@8
41GetNameInfoW@28
42InetNtopW@16
43InetPtonW@12
44ProcessSocketNotifications@28
45SetAddrInfoExA@48
46SetAddrInfoExW@48
47WPUCompleteOverlappedRequest@20
48WPUGetProviderPathEx@20
49WSAAccept@20
50WSAAddressToStringA@20
51WSAAddressToStringW@20
52WSAAdvertiseProvider@8
53WSACloseEvent@4
54WSAConnect@28
55WSAConnectByList@32
56WSAConnectByNameA@36
57WSAConnectByNameW@36
58WSACreateEvent@0
59WSADuplicateSocketA@12
60WSADuplicateSocketW@12
61WSAEnumNameSpaceProvidersA@8
62WSAEnumNameSpaceProvidersExA@8
63gethostbyaddr@12
64gethostbyname@4
65getprotobyname@4
66getprotobynumber@4
67getservbyname@8
68getservbyport@8
69gethostname@8
70WSAEnumNameSpaceProvidersExW@8
71WSAEnumNameSpaceProvidersW@8
72WSAEnumNetworkEvents@12
73WSAEnumProtocolsA@12
74WSAEnumProtocolsW@12
75WSAEventSelect@12
76WSAGetOverlappedResult@20
77WSAGetQOSByName@12
78WSAGetServiceClassInfoA@16
79WSAGetServiceClassInfoW@16
80WSAGetServiceClassNameByClassIdA@12
81WSAGetServiceClassNameByClassIdW@12
82WSAHtonl@12
83WSAHtons@12
84WSAInstallServiceClassA@4
85WSAInstallServiceClassW@4
86WSAIoctl@36
87WSAJoinLeaf@32
88WSALookupServiceBeginA@12
89WSALookupServiceBeginW@12
90WSALookupServiceEnd@4
91WSALookupServiceNextA@16
92WSALookupServiceNextW@16
93WSANSPIoctl@32
94WSANtohl@12
95WSANtohs@12
96WSAPoll@12
97WSAProviderCompleteAsyncCall@8
98WSAProviderConfigChange@12
99WSARecv@28
100WSARecvDisconnect@8
101WSARecvFrom@36
102WSARemoveServiceClass@4
103WSAResetEvent@4
104WSASend@28
105WSASendDisconnect@8
106WSASendMsg@24
107WSASendTo@36
108WSASetEvent@4
109WSASetServiceA@12
110WSASetServiceW@12
111WSASocketA@24
112WSASocketW@24
113WSAAsyncSelect@16
114WSAAsyncGetHostByAddr@28
115WSAAsyncGetHostByName@20
116WSAAsyncGetProtoByNumber@20
117WSAAsyncGetProtoByName@20
118WSAAsyncGetServByPort@24
119WSAAsyncGetServByName@24
120WSACancelAsyncRequest@4
121WSASetBlockingHook@4
122WSAUnhookBlockingHook@0
123WSAGetLastError@0
124WSASetLastError@4
125WSACancelBlockingCall@0
126WSAIsBlocking@0
127WSAStartup@8
128WSACleanup@0
129WSAStringToAddressA@20
130WSAStringToAddressW@20
131WSAUnadvertiseProvider@4
132WSAWaitForMultipleEvents@20
133WSCDeinstallProvider@8
134WSCDeinstallProviderEx@12
135WSCEnableNSProvider@8
136WSCEnumProtocols@16
137WSCEnumProtocolsEx@20
138WSCGetApplicationCategory@24
139WSCGetApplicationCategoryEx@28
140WSCGetProviderInfo@24
141WSCGetProviderPath@16
142WSCInstallNameSpace@20
143WSCInstallNameSpaceEx2@28
144WSCInstallNameSpaceEx@24
145WSCInstallProvider@20
146WSCInstallProviderAndChains@32
147WSCInstallProviderEx@28
148WSCSetApplicationCategory@28
149WSCSetApplicationCategoryEx@32
150WSCSetProviderInfo@24
151WSCUnInstallNameSpace@4
152WSCUnInstallNameSpaceEx2@8
153WSCUpdateProvider@20
154WSCUpdateProviderEx@24
155WSCWriteNameSpaceOrder@8
156WSCWriteProviderOrder@8
157WSCWriteProviderOrderEx@12
158WahCloseApcHelper@4
159WahCloseHandleHelper@4
160WahCloseNotificationHandleHelper@4
161WahCloseSocketHandle@8
162WahCloseThread@8
163WahCompleteRequest@20
164WahCreateHandleContextTable@4
165WahCreateNotificationHandle@8
166WahCreateSocketHandle@8
167WahDestroyHandleContextTable@4
168WahDisableNonIFSHandleSupport@0
169WahEnableNonIFSHandleSupport@0
170WahEnumerateHandleContexts@12
171WahInsertHandleContext@8
172__WSAFDIsSet@8
173WahNotifyAllProcesses@4
174WahOpenApcHelper@4
175WahOpenCurrentThread@8
176WahOpenHandleHelper@4
177WahOpenNotificationHandleHelper@4
178WahQueueUserApc@16
179WahReferenceContextByHandle@8
180WahRemoveHandleContext@8
181WahWaitForNotification@16
182WahWriteLSPEvent@8
183freeaddrinfo@4
184getaddrinfo@16
185getnameinfo@28
186inet_ntop@16
187inet_pton@12
188WEP@0
lib/libc/mingw/lib64/kernel32.def deleted-1745
...@@ -1,1745 +0,0 @@
1
2LIBRARY "KERNEL32.dll"
3EXPORTS
4AcquireSRWLockExclusive
5AcquireSRWLockShared
6ActivateActCtx
7ActivateActCtxWorker
8ActivatePackageVirtualizationContext
9AddAtomA
10AddAtomW
11AddConsoleAliasA
12AddConsoleAliasW
13AddDllDirectory
14AddIntegrityLabelToBoundaryDescriptor
15AddLocalAlternateComputerNameA
16AddLocalAlternateComputerNameW
17AddRefActCtx
18AddRefActCtxWorker
19AddResourceAttributeAce
20AddSIDToBoundaryDescriptor
21AddScopedPolicyIDAce
22AddSecureMemoryCacheCallback
23AddVectoredContinueHandler
24AddVectoredExceptionHandler
25AdjustCalendarDate
26AllocConsole
27AllocConsoleWithOptions
28AllocateUserPhysicalPages
29AllocateUserPhysicalPagesNuma
30AppPolicyGetClrCompat
31AppPolicyGetCreateFileAccess
32AppPolicyGetLifecycleManagement
33AppPolicyGetMediaFoundationCodecLoading
34AppPolicyGetProcessTerminationMethod
35AppPolicyGetShowDeveloperDiagnostic
36AppPolicyGetThreadInitializationType
37AppPolicyGetWindowingModel
38AppXGetOSMaxVersionTested
39ApplicationRecoveryFinished
40ApplicationRecoveryInProgress
41AreFileApisANSI
42AreShortNamesEnabled
43AssignProcessToJobObject
44AttachConsole
45BackupRead
46BackupSeek
47BackupWrite
48BaseCheckAppcompatCache
49BaseCheckAppcompatCacheEx
50BaseCheckAppcompatCacheExWorker
51BaseCheckAppcompatCacheWorker
52BaseCheckElevation
53BaseCheckRunApp
54BaseCleanupAppcompatCacheSupport
55BaseCleanupAppcompatCacheSupportWorker
56BaseDestroyVDMEnvironment
57BaseDllReadWriteIniFile
58BaseDumpAppcompatCache
59BaseDumpAppcompatCacheWorker
60BaseElevationPostProcessing
61BaseFlushAppcompatCache
62BaseFlushAppcompatCacheWorker
63BaseFormatObjectAttributes
64BaseFormatTimeOut
65BaseFreeAppCompatDataForProcessWorker
66BaseGenerateAppCompatData
67BaseGetNamedObjectDirectory
68BaseInitAppcompatCacheSupport
69BaseInitAppcompatCacheSupportWorker
70BaseIsAppcompatInfrastructureDisabled
71BaseIsAppcompatInfrastructureDisabledWorker
72BaseIsDosApplication
73BaseProcessInitPostImport
74BaseProcessStart
75BaseQueryModuleData
76BaseReadAppCompatDataForProcessWorker
77BaseThreadStart
78BaseSetLastNTError
79BaseThreadInitThunk
80BaseUpdateAppcompatCache
81BaseUpdateAppcompatCacheWorker
82BaseUpdateVDMEntry
83BaseVerifyUnicodeString
84BaseWriteErrorElevationRequiredEvent
85Basep8BitStringToDynamicUnicodeString
86BasepAllocateActivationContextActivationBlock
87BasepAnsiStringToDynamicUnicodeString
88BasepAppContainerEnvironmentExtension
89BasepAppXExtension
90BasepCheckAppCompat
91BasepCheckBadapp
92BasepCheckWebBladeHashes
93BasepCheckWinSaferRestrictions
94BasepConstructSxsCreateProcessMessage
95BasepCopyEncryption
96BasepFreeActivationContextActivationBlock
97BasepFreeAppCompatData
98BasepGetAppCompatData
99BasepGetComputerNameFromNtPath
100BasepGetExeArchType
101BasepInitAppCompatData
102BasepIsProcessAllowed
103BasepMapModuleHandle
104BasepNotifyLoadStringResource
105BasepPostSuccessAppXExtension
106BasepProcessInvalidImage
107BasepQueryAppCompat
108BasepQueryModuleChpeSettings
109BasepReleaseAppXContext
110BasepReleaseSxsCreateProcessUtilityStruct
111BasepReportFault
112BasepSetFileEncryptionCompression
113Beep
114BeginUpdateResourceA
115BeginUpdateResourceW
116BindIoCompletionCallback
117BuildCommDCBA
118BuildCommDCBAndTimeoutsA
119BuildCommDCBAndTimeoutsW
120BuildCommDCBW
121BuildIoRingCancelRequest
122BuildIoRingFlushFile
123BuildIoRingReadFile
124BuildIoRingReadFileScatter
125BuildIoRingRegisterBuffers
126BuildIoRingRegisterFileHandles
127BuildIoRingWriteFile
128BuildIoRingWriteFileGather
129CallNamedPipeA
130CallNamedPipeW
131CallbackMayRunLong
132CalloutOnFiberStack
133CancelDeviceWakeupRequest
134CancelIo
135CancelIoEx
136CancelSynchronousIo
137CancelThreadpoolIo
138CancelTimerQueueTimer
139CancelWaitableTimer
140CeipIsOptedIn
141ChangeTimerQueueTimer
142CheckAllowDecryptedRemoteDestinationPolicy
143CheckElevation
144CheckElevationEnabled
145CheckForReadOnlyResource
146CheckForReadOnlyResourceFilter
147CheckNameLegalDOS8Dot3A
148CheckNameLegalDOS8Dot3W
149CheckRemoteDebuggerPresent
150CheckTokenCapability
151CheckTokenMembershipEx
152ClearCommBreak
153ClearCommError
154CloseConsoleHandle
155CloseHandle
156CloseIoRing
157ClosePackageInfo
158ClosePrivateNamespace
159CloseProfileUserMapping
160ClosePseudoConsole
161CloseState
162CloseThreadpool
163CloseThreadpoolCleanupGroup
164CloseThreadpoolCleanupGroupMembers
165CloseThreadpoolIo
166CloseThreadpoolTimer
167CloseThreadpoolWait
168CloseThreadpoolWork
169CmdBatNotification
170CommConfigDialogA
171CommConfigDialogW
172CompareCalendarDates
173CompareFileTime
174CompareStringA
175CompareStringEx
176CompareStringOrdinal
177CompareStringW
178ConnectNamedPipe
179ConsoleIMERoutine
180ConsoleMenuControl
181ContinueDebugEvent
182ConvertCalDateTimeToSystemTime
183ConvertDefaultLocale
184ConvertFiberToThread
185ConvertNLSDayOfWeekToWin32DayOfWeek
186ConvertSystemTimeToCalDateTime
187ConvertThreadToFiber
188ConvertThreadToFiberEx
189CopyContext
190CopyExtendedContext
191CopyFile2
192CopyFileA
193CopyFileExA
194CopyFileExW
195CopyFileTransactedA
196CopyFileTransactedW
197CopyFileW
198CopyLZFile
199CreateActCtxA
200CreateActCtxW
201CreateActCtxWWorker
202CreateBoundaryDescriptorA
203CreateBoundaryDescriptorW
204CreateConsoleScreenBuffer
205CreateDirectoryA
206CreateDirectoryExA
207CreateDirectoryExW
208CreateDirectoryTransactedA
209CreateDirectoryTransactedW
210CreateDirectoryW
211CreateEnclave
212CreateEventA
213CreateEventExA
214CreateEventExW
215CreateEventW
216CreateFiber
217CreateFiberEx
218CreateFile2
219CreateFileA
220CreateFileMappingA
221CreateFileMappingFromApp
222CreateFileMappingNumaA
223CreateFileMappingNumaW
224CreateFileMappingW
225CreateFileTransactedA
226CreateFileTransactedW
227CreateFileW
228CreateHardLinkA
229CreateHardLinkTransactedA
230CreateHardLinkTransactedW
231CreateHardLinkW
232CreateIoCompletionPort
233CreateIoRing
234CreateJobObjectA
235CreateJobObjectW
236CreateJobSet
237CreateMailslotA
238CreateMailslotW
239CreateMemoryResourceNotification
240CreateMutexA
241CreateMutexExA
242CreateMutexExW
243CreateMutexW
244CreateNamedPipeA
245CreateNamedPipeW
246CreateNlsSecurityDescriptor
247CreatePackageVirtualizationContext
248CreatePipe
249CreatePrivateNamespaceA
250CreatePrivateNamespaceW
251CreateProcessA
252; MSDN says these are exported from ADVAPI32.DLL.
253; CreateProcessAsUserA
254; CreateProcessAsUserW
255CreateProcessInternalA
256CreateProcessInternalW
257CreateProcessW
258CreatePseudoConsole
259CreateRemoteThread
260CreateRemoteThreadEx
261CreateSemaphoreA
262CreateSemaphoreExA
263CreateSemaphoreExW
264CreateSemaphoreW
265CreateSymbolicLinkA
266CreateSymbolicLinkTransactedA
267CreateSymbolicLinkTransactedW
268CreateSymbolicLinkW
269CreateTapePartition
270CreateThread
271CreateThreadpool
272CreateThreadpoolCleanupGroup
273CreateThreadpoolIo
274CreateThreadpoolTimer
275CreateThreadpoolWait
276CreateThreadpoolWork
277CreateTimerQueue
278CreateTimerQueueTimer
279CreateToolhelp32Snapshot
280CreateUmsCompletionList
281CreateUmsThreadContext
282CreateWaitableTimerA
283CreateWaitableTimerExA
284CreateWaitableTimerExW
285CreateWaitableTimerW
286CtrlRoutine
287DeactivateActCtx
288DeactivateActCtxWorker
289DeactivatePackageVirtualizationContext
290DebugActiveProcess
291DebugActiveProcessStop
292DebugBreak
293DebugBreakProcess
294DebugSetProcessKillOnExit
295DecodePointer
296DecodeSystemPointer
297DefineDosDeviceA
298DefineDosDeviceW
299DelayLoadFailureHook
300DeleteAtom
301DeleteBoundaryDescriptor
302DeleteCriticalSection
303DeleteFiber
304DeleteFileA
305DeleteFileTransactedA
306DeleteFileTransactedW
307DeleteFileW
308DeleteProcThreadAttributeList
309DeleteSynchronizationBarrier
310DeleteTimerQueue
311DeleteTimerQueueEx
312DeleteTimerQueueTimer
313DeleteUmsCompletionList
314DeleteUmsThreadContext
315DeleteVolumeMountPointA
316DeleteVolumeMountPointW
317DequeueUmsCompletionListItems
318DeviceIoControl
319DisableThreadLibraryCalls
320DisableThreadProfiling
321DisassociateCurrentThreadFromCallback
322DiscardVirtualMemory
323DisconnectNamedPipe
324DnsHostnameToComputerNameA
325DnsHostnameToComputerNameExW
326DnsHostnameToComputerNameW
327DosDateTimeToFileTime
328DosPathToSessionPathA
329DosPathToSessionPathW
330DuplicateConsoleHandle
331DuplicateEncryptionInfoFileExt
332DuplicateHandle
333DuplicatePackageVirtualizationContext
334EnableProcessOptionalXStateFeatures
335EnableThreadProfiling
336EncodePointer
337EncodeSystemPointer
338EndUpdateResourceA
339EndUpdateResourceW
340EnterCriticalSection
341EnterUmsSchedulingMode
342EnterSynchronizationBarrier
343EnumCalendarInfoA
344EnumCalendarInfoExA
345EnumCalendarInfoExEx
346EnumCalendarInfoExW
347EnumCalendarInfoW
348EnumDateFormatsA
349EnumDateFormatsExA
350EnumDateFormatsExEx
351EnumDateFormatsExW
352EnumDateFormatsW
353EnumLanguageGroupLocalesA
354EnumLanguageGroupLocalesW
355EnumResourceLanguagesA
356EnumResourceLanguagesExA
357EnumResourceLanguagesExW
358EnumResourceLanguagesW
359EnumResourceNamesA
360EnumResourceNamesExA
361EnumResourceNamesExW
362EnumResourceNamesW
363EnumResourceTypesA
364EnumResourceTypesExA
365EnumResourceTypesExW
366EnumResourceTypesW
367EnumSystemCodePagesA
368EnumSystemCodePagesW
369EnumSystemFirmwareTables
370EnumSystemGeoID
371EnumSystemGeoNames
372EnumSystemLanguageGroupsA
373EnumSystemLanguageGroupsW
374EnumSystemLocalesA
375EnumSystemLocalesEx
376EnumSystemLocalesW
377EnumTimeFormatsA
378EnumTimeFormatsEx
379EnumTimeFormatsW
380EnumUILanguagesA
381EnumUILanguagesW
382EnumerateLocalComputerNamesA
383EnumerateLocalComputerNamesW
384EraseTape
385EscapeCommFunction
386ExecuteUmsThread
387ExitProcess
388ExitThread
389ExitVDM
390ExpandEnvironmentStringsA
391ExpandEnvironmentStringsW
392ExpungeConsoleCommandHistoryA
393ExpungeConsoleCommandHistoryW
394FatalAppExitA
395FatalAppExitW
396FatalExit
397FileTimeToDosDateTime
398FileTimeToLocalFileTime
399FileTimeToSystemTime
400FillConsoleOutputAttribute
401FillConsoleOutputCharacterA
402FillConsoleOutputCharacterW
403FindActCtxSectionGuid
404FindActCtxSectionGuidWorker
405FindActCtxSectionStringA
406FindActCtxSectionStringW
407FindActCtxSectionStringWWorker
408FindAtomA
409FindAtomW
410FindClose
411FindCloseChangeNotification
412FindFirstChangeNotificationA
413FindFirstChangeNotificationW
414FindFirstFileA
415FindFirstFileExA
416FindFirstFileExW
417FindFirstFileNameTransactedW
418FindFirstFileNameW
419FindFirstFileTransactedA
420FindFirstFileTransactedW
421FindFirstFileW
422FindFirstStreamTransactedW
423FindFirstStreamW
424FindFirstVolumeA
425FindFirstVolumeMountPointA
426FindFirstVolumeMountPointW
427FindFirstVolumeW
428FindNLSString
429FindNLSStringEx
430FindNextChangeNotification
431FindNextFileA
432FindNextFileNameW
433FindNextFileW
434FindNextStreamW
435FindNextVolumeA
436FindNextVolumeMountPointA
437FindNextVolumeMountPointW
438FindNextVolumeW
439FindPackagesByPackageFamily
440FindResourceA
441FindResourceExA
442FindResourceExW
443FindResourceW
444FindStringOrdinal
445FindVolumeClose
446FindVolumeMountPointClose
447FlsAlloc
448FlsFree
449FlsGetValue
450FlsGetValue2
451FlsSetValue
452FlushConsoleInputBuffer
453FlushFileBuffers
454FlushInstructionCache
455FlushProcessWriteBuffers
456FlushViewOfFile
457FoldStringA
458FoldStringW
459FormatApplicationUserModelId
460FormatMessageA
461FormatMessageW
462FreeConsole
463FreeEnvironmentStringsA
464FreeEnvironmentStringsW
465FreeLibrary
466FreeLibraryAndExitThread
467FreeLibraryWhenCallbackReturns
468FreeMemoryJobObject
469FreeResource
470FreeUserPhysicalPages
471GenerateConsoleCtrlEvent
472GetACP
473GetActiveProcessorCount
474GetActiveProcessorGroupCount
475GetAppContainerAce
476GetAppContainerNamedObjectPath
477GetApplicationRecoveryCallback
478GetApplicationRecoveryCallbackWorker
479GetApplicationRestartSettings
480GetApplicationRestartSettingsWorker
481GetApplicationUserModelId
482GetAtomNameA
483GetAtomNameW
484GetBinaryType
485GetBinaryTypeA
486GetBinaryTypeW
487GetCPFileNameFromRegistry
488GetCPInfo
489GetCPInfoExA
490GetCPInfoExW
491GetCachedSigningLevel
492GetCalendarDateFormat
493GetCalendarDateFormatEx
494GetCalendarDaysInMonth
495GetCalendarDifferenceInDays
496GetCalendarInfoA
497GetCalendarInfoEx
498GetCalendarInfoW
499GetCalendarMonthsInYear
500GetCalendarSupportedDateRange
501GetCalendarWeekNumber
502GetComPlusPackageInstallStatus
503GetCommConfig
504GetCommMask
505GetCommModemStatus
506GetCommProperties
507GetCommState
508GetCommTimeouts
509GetCommandLineA
510GetCommandLineW
511GetCompressedFileSizeA
512GetCompressedFileSizeTransactedA
513GetCompressedFileSizeTransactedW
514GetCompressedFileSizeW
515GetComputerNameA
516GetComputerNameExA
517GetComputerNameExW
518GetComputerNameW
519GetConsoleAliasA
520GetConsoleAliasExesA
521GetConsoleAliasExesLengthA
522GetConsoleAliasExesLengthW
523GetConsoleAliasExesW
524GetConsoleAliasW
525GetConsoleAliasesA
526GetConsoleAliasesLengthA
527GetConsoleAliasesLengthW
528GetConsoleAliasesW
529GetConsoleCP
530GetConsoleCharType
531GetConsoleCommandHistoryA
532GetConsoleCommandHistoryLengthA
533GetConsoleCommandHistoryLengthW
534GetConsoleCommandHistoryW
535GetConsoleCursorInfo
536GetConsoleCursorMode
537GetConsoleDisplayMode
538GetConsoleFontInfo
539GetConsoleFontSize
540GetConsoleHardwareState
541GetConsoleHistoryInfo
542GetConsoleInputExeNameA
543GetConsoleInputExeNameW
544GetConsoleInputWaitHandle
545GetConsoleKeyboardLayoutNameA
546GetConsoleKeyboardLayoutNameW
547GetConsoleMode
548GetConsoleNlsMode
549GetConsoleOriginalTitleA
550GetConsoleOriginalTitleW
551GetConsoleOutputCP
552GetConsoleProcessList
553GetConsoleScreenBufferInfo
554GetConsoleScreenBufferInfoEx
555GetConsoleSelectionInfo
556GetConsoleTitleA
557GetConsoleTitleW
558GetConsoleWindow
559GetCurrencyFormatA
560GetCurrencyFormatEx
561GetCurrencyFormatW
562GetCurrentActCtx
563GetCurrentActCtxWorker
564GetCurrentApplicationUserModelId
565GetCurrentConsoleFont
566GetCurrentConsoleFontEx
567GetCurrentDirectoryA
568GetCurrentDirectoryW
569GetCurrentPackageFamilyName
570GetCurrentPackageFullName
571GetCurrentPackageId
572GetCurrentPackageInfo
573GetCurrentPackagePath
574GetCurrentPackageVirtualizationContext
575GetCurrentProcess
576GetCurrentProcessId
577GetCurrentProcessorNumber
578GetCurrentProcessorNumberEx
579GetCurrentThread
580GetCurrentThreadId
581GetCurrentThreadStackLimits
582GetCurrentUmsThread
583GetDateFormatA
584GetDateFormatAWorker
585GetDateFormatEx
586GetDateFormatW
587GetDateFormatWWorker
588GetDefaultCommConfigA
589GetDefaultCommConfigW
590GetDefaultSortkeySize
591GetDevicePowerState
592GetDiskFreeSpaceA
593GetDiskFreeSpaceExA
594GetDiskFreeSpaceExW
595GetDiskFreeSpaceW
596GetDiskSpaceInformationA
597GetDiskSpaceInformationW
598GetDllDirectoryA
599GetDllDirectoryW
600GetDriveTypeA
601GetDriveTypeW
602GetDurationFormat
603GetDurationFormatEx
604GetDynamicTimeZoneInformation
605GetEnabledExtendedFeatures
606GetEnabledXStateFeatures
607GetEncryptedFileVersionExt
608GetEnvironmentStrings
609GetEnvironmentStringsA
610GetEnvironmentStringsW
611GetEnvironmentVariableA
612GetEnvironmentVariableW
613GetEraNameCountedString
614GetErrorMode
615GetExitCodeProcess
616GetExitCodeThread
617GetExpandedNameA
618GetExpandedNameW
619GetExtendedContextLength
620GetExtendedFeaturesMask
621GetFileAttributesA
622GetFileAttributesExA
623GetFileAttributesExW
624GetFileAttributesTransactedA
625GetFileAttributesTransactedW
626GetFileAttributesW
627GetFileBandwidthReservation
628GetFileInformationByHandle
629GetFileInformationByHandleEx
630GetFileInformationByName
631GetFileMUIInfo
632GetFileMUIPath
633GetFileSize
634GetFileSizeEx
635GetFileTime
636GetFileType
637GetFinalPathNameByHandleA
638GetFinalPathNameByHandleW
639GetFirmwareEnvironmentVariableA
640GetFirmwareEnvironmentVariableExA
641GetFirmwareEnvironmentVariableExW
642GetFirmwareEnvironmentVariableW
643GetFirmwareType
644GetFullPathNameA
645GetFullPathNameTransactedA
646GetFullPathNameTransactedW
647GetFullPathNameW
648GetGeoInfoA
649GetGeoInfoW
650GetGeoInfoEx
651GetHandleInformation
652GetIoRingInfo
653GetLargePageMinimum
654GetLargestConsoleWindowSize
655GetLastError
656GetLinguistLangSize
657GetLocalTime
658GetLocaleInfoA
659GetLocaleInfoEx
660GetLocaleInfoW
661GetLogicalDriveStringsA
662GetLogicalDriveStringsW
663GetLogicalDrives
664GetLogicalProcessorInformation
665GetLogicalProcessorInformationEx
666GetLongPathNameA
667GetLongPathNameTransactedA
668GetLongPathNameTransactedW
669GetLongPathNameW
670GetMachineTypeAttributes
671GetMailslotInfo
672GetMaximumProcessorCount
673GetMaximumProcessorGroupCount
674GetMemoryErrorHandlingCapabilities
675GetModuleFileNameA
676GetModuleFileNameW
677GetModuleHandleA
678GetModuleHandleExA
679GetModuleHandleExW
680GetModuleHandleW
681GetNLSVersion
682GetNLSVersionEx
683GetNamedPipeAttribute
684GetNamedPipeClientComputerNameA
685GetNamedPipeClientComputerNameW
686GetNamedPipeClientProcessId
687GetNamedPipeClientSessionId
688GetNamedPipeHandleStateA
689GetNamedPipeHandleStateW
690GetNamedPipeInfo
691GetNamedPipeServerProcessId
692GetNamedPipeServerSessionId
693GetNativeSystemInfo
694GetNextUmsListItem
695GetNextVDMCommand
696GetNlsSectionName
697GetNumaAvailableMemoryNode
698GetNumaAvailableMemoryNodeEx
699GetNumaHighestNodeNumber
700GetNumaNodeNumberFromHandle
701GetNumaNodeProcessorMask
702GetNumaNodeProcessorMask2
703GetNumaNodeProcessorMaskEx
704GetNumaProcessorNode
705GetNumaProcessorNodeEx
706GetNumaProximityNode
707GetNumaProximityNodeEx
708GetNumberFormatA
709GetNumberFormatEx
710GetNumberFormatW
711GetNumberOfConsoleFonts
712GetNumberOfConsoleInputEvents
713GetNumberOfConsoleMouseButtons
714GetOEMCP
715GetOverlappedResult
716GetOverlappedResultEx
717GetPackageApplicationIds
718GetPackageFamilyName
719GetPackageFullName
720GetPackageId
721GetPackageInfo
722GetPackagePath
723GetPackagePathByFullName
724GetPackagesByPackageFamily
725GetPhysicallyInstalledSystemMemory
726GetPriorityClass
727GetPrivateProfileIntA
728GetPrivateProfileIntW
729GetPrivateProfileSectionA
730GetPrivateProfileSectionNamesA
731GetPrivateProfileSectionNamesW
732GetPrivateProfileSectionW
733GetPrivateProfileStringA
734GetPrivateProfileStringW
735GetPrivateProfileStructA
736GetPrivateProfileStructW
737GetProcAddress
738GetProcessAffinityMask
739GetProcessDefaultCpuSetMasks
740GetProcessDefaultCpuSets
741GetProcessDEPPolicy
742GetProcessGroupAffinity
743GetProcessHandleCount
744GetProcessHeap
745GetProcessHeaps
746GetProcessId
747GetProcessIdOfThread
748GetProcessInformation
749GetProcessIoCounters
750GetProcessMitigationPolicy
751GetProcessPreferredUILanguages
752GetProcessPriorityBoost
753GetProcessShutdownParameters
754GetProcessTimes
755GetProcessVersion
756GetProcessWorkingSetSize
757GetProcessWorkingSetSizeEx
758GetProcessesInVirtualizationContext
759GetProcessorSystemCycleTime
760GetProductInfo
761GetProfileIntA
762GetProfileIntW
763GetProfileSectionA
764GetProfileSectionW
765GetProfileStringA
766GetProfileStringW
767GetQueuedCompletionStatus
768GetQueuedCompletionStatusEx
769GetShortPathNameA
770GetShortPathNameW
771GetStagedPackagePathByFullName
772GetStartupInfoA
773GetStartupInfoW
774GetStateFolder
775GetStdHandle
776GetStringScripts
777GetStringTypeA
778GetStringTypeExA
779GetStringTypeExW
780GetStringTypeW
781GetSystemAppDataKey
782GetSystemCpuSetInformation
783GetSystemDEPPolicy
784GetSystemDefaultLCID
785GetSystemDefaultLangID
786GetSystemDefaultLocaleName
787GetSystemDefaultUILanguage
788GetSystemDirectoryA
789GetSystemDirectoryW
790GetSystemFileCacheSize
791GetSystemFirmwareTable
792GetSystemInfo
793GetSystemPowerStatus
794GetSystemPreferredUILanguages
795GetSystemRegistryQuota
796GetSystemTime
797GetSystemTimeAdjustment
798GetSystemTimeAsFileTime
799GetSystemTimePreciseAsFileTime
800GetSystemTimes
801GetSystemWindowsDirectoryA
802GetSystemWindowsDirectoryW
803GetSystemWow64DirectoryA
804GetSystemWow64DirectoryW
805GetTapeParameters
806GetTapePosition
807GetTapeStatus
808GetTempFileNameA
809GetTempFileNameW
810GetTempPathA
811GetTempPathW
812GetTempPath2A
813GetTempPath2W
814GetThreadContext
815GetThreadDescription
816GetThreadEnabledXStateFeatures
817GetThreadErrorMode
818GetThreadGroupAffinity
819GetThreadIOPendingFlag
820GetThreadId
821GetThreadIdealProcessorEx
822GetThreadInformation
823GetThreadLocale
824GetThreadPreferredUILanguages
825GetThreadPriority
826GetThreadPriorityBoost
827GetThreadSelectedCpuSetMasks
828GetThreadSelectedCpuSets
829GetThreadSelectorEntry
830GetThreadTimes
831GetThreadUILanguage
832GetTickCount
833GetTickCount64
834GetTimeFormatA
835GetTimeFormatAWorker
836GetTimeFormatEx
837GetTimeFormatW
838GetTimeFormatWWorker
839GetTimeZoneInformation
840GetTimeZoneInformationForYear
841GetUILanguageInfo
842GetUmsCompletionListEvent
843GetUmsSystemThreadInformation
844GetUserDefaultGeoName
845GetUserDefaultLCID
846GetUserDefaultLangID
847GetUserDefaultLocaleName
848GetUserDefaultUILanguage
849GetUserGeoID
850GetUserPreferredUILanguages
851GetVDMCurrentDirectories
852GetVersion
853GetVersionExA
854GetVersionExW
855GetVolumeInformationA
856GetVolumeInformationByHandleW
857GetVolumeInformationW
858GetVolumeNameForVolumeMountPointA
859GetVolumeNameForVolumeMountPointW
860GetVolumePathNameA
861GetVolumePathNameW
862GetVolumePathNamesForVolumeNameA
863GetVolumePathNamesForVolumeNameW
864GetWindowsDirectoryA
865GetWindowsDirectoryW
866GetWriteWatch
867GetXStateFeaturesMask
868GlobalAddAtomA
869GlobalAddAtomExA
870GlobalAddAtomExW
871GlobalAddAtomW
872GlobalAlloc
873GlobalCompact
874GlobalDeleteAtom
875GlobalFindAtomA
876GlobalFindAtomW
877GlobalFix
878GlobalFlags
879GlobalFree
880GlobalGetAtomNameA
881GlobalGetAtomNameW
882GlobalHandle
883GlobalLock
884GlobalMemoryStatus
885GlobalMemoryStatusEx
886GlobalReAlloc
887GlobalSize
888GlobalUnWire
889GlobalUnfix
890GlobalUnlock
891GlobalWire
892Heap32First
893Heap32ListFirst
894Heap32ListNext
895Heap32Next
896HeapAlloc
897HeapCompact
898HeapCreate
899HeapCreateTagsW
900HeapDestroy
901HeapExtend
902HeapFree
903HeapLock
904HeapQueryInformation
905HeapQueryTagW
906HeapReAlloc
907HeapSetInformation
908HeapSize
909HeapSummary
910HeapUnlock
911HeapUsage
912HeapValidate
913HeapWalk
914IdnToAscii
915IdnToNameprepUnicode
916IdnToUnicode
917InitAtomTable
918InitOnceBeginInitialize
919InitOnceComplete
920InitOnceExecuteOnce
921InitOnceInitialize
922InitializeConditionVariable
923InitializeContext
924InitializeContext2
925InitializeCriticalSection
926InitializeCriticalSectionAndSpinCount
927InitializeCriticalSectionEx
928InitializeEnclave
929InitializeExtendedContext
930InitializeProcThreadAttributeList
931InitializeSListHead
932InitializeSRWLock
933InitializeSynchronizationBarrier
934InstallELAMCertificateInfo
935InterlockedFlushSList
936InterlockedPopEntrySList
937InterlockedPushEntrySList
938InterlockedPushListSList
939InterlockedPushListSListEx
940InvalidateConsoleDIBits
941IsBadCodePtr
942IsBadHugeReadPtr
943IsBadHugeWritePtr
944IsBadReadPtr
945IsBadStringPtrA
946IsBadStringPtrW
947IsBadWritePtr
948IsCalendarLeapDay
949IsCalendarLeapMonth
950IsCalendarLeapYear
951IsDBCSLeadByte
952IsDBCSLeadByteEx
953IsDebuggerPresent
954IsEnclaveTypeSupported
955IsIoRingOpSupported
956IsNLSDefinedString
957IsNativeVhdBoot
958IsNormalizedString
959IsProcessCritical
960IsProcessInJob
961IsProcessorFeaturePresent
962IsSystemResumeAutomatic
963IsThreadAFiber
964IsThreadpoolTimerSet
965IsTimeZoneRedirectionEnabled
966IsUserCetAvailableInEnvironment
967IsValidCalDateTime
968IsValidCodePage
969IsValidLanguageGroup
970IsValidLocale
971IsValidUILanguage
972IsValidLocaleName
973IsValidNLSVersion
974IsWow64GuestMachineSupported
975IsWow64Process
976IsWow64Process2
977K32EmptyWorkingSet
978K32EnumDeviceDrivers
979K32EnumPageFilesA
980K32EnumPageFilesW
981K32EnumProcessModules
982K32EnumProcessModulesEx
983K32EnumProcesses
984K32GetDeviceDriverBaseNameA
985K32GetDeviceDriverBaseNameW
986K32GetDeviceDriverFileNameA
987K32GetDeviceDriverFileNameW
988K32GetMappedFileNameA
989K32GetMappedFileNameW
990K32GetModuleBaseNameA
991K32GetModuleBaseNameW
992K32GetModuleFileNameExA
993K32GetModuleFileNameExW
994K32GetModuleInformation
995K32GetPerformanceInfo
996K32GetProcessImageFileNameA
997K32GetProcessImageFileNameW
998K32GetProcessMemoryInfo
999K32GetWsChanges
1000K32GetWsChangesEx
1001K32InitializeProcessForWsWatch
1002K32QueryWorkingSet
1003K32QueryWorkingSetEx
1004LCIDToLocaleName
1005LCMapStringA
1006LCMapStringEx
1007LCMapStringW
1008LZClose
1009LZCloseFile
1010LZCopy
1011LZCreateFileW
1012LZDone
1013LZInit
1014LZOpenFileA
1015LZOpenFileW
1016LZRead
1017LZSeek
1018LZStart
1019LeaveCriticalSection
1020LeaveCriticalSectionWhenCallbackReturns
1021LoadAppInitDlls
1022LoadEnclaveData
1023LoadLibraryA
1024LoadLibraryExA
1025LoadLibraryExW
1026LoadLibraryW
1027LoadModule
1028LoadPackagedLibrary
1029LoadResource
1030LoadStringBaseExW
1031LoadStringBaseW
1032LocalAlloc
1033LocalCompact
1034LocalFileTimeToFileTime
1035LocalFileTimeToLocalSystemTime
1036LocalFlags
1037LocalFree
1038LocalHandle
1039LocalLock
1040LocalReAlloc
1041LocalShrink
1042LocalSize
1043LocalSystemTimeToLocalFileTime
1044LocalUnlock
1045LocaleNameToLCID
1046LocateExtendedFeature
1047LocateLegacyContext
1048LocateXStateFeature
1049LockFile
1050LockFileEx
1051LockResource
1052MapUserPhysicalPages
1053MapUserPhysicalPagesScatter
1054MapViewOfFile
1055MapViewOfFileEx
1056MapViewOfFileExNuma
1057MapViewOfFileFromApp
1058Module32First
1059Module32FirstW
1060Module32Next
1061Module32NextW
1062MoveFileA
1063MoveFileExA
1064MoveFileExW
1065MoveFileTransactedA
1066MoveFileTransactedW
1067MoveFileW
1068MoveFileWithProgressA
1069MoveFileWithProgressW
1070MulDiv
1071MultiByteToWideChar
1072NeedCurrentDirectoryForExePathA
1073NeedCurrentDirectoryForExePathW
1074NlsConvertIntegerToString
1075NlsCheckPolicy
1076NlsEventDataDescCreate
1077NlsGetCacheUpdateCount
1078NlsUpdateLocale
1079NlsUpdateSystemLocale
1080NlsResetProcessLocale
1081NlsWriteEtwEvent
1082NormalizeString
1083NotifyMountMgr
1084NotifyUILanguageChange
1085NtVdm64CreateProcessInternalW
1086OOBEComplete
1087OfferVirtualMemory
1088OpenConsoleW
1089OpenConsoleWStub
1090OpenDataFile
1091OpenEventA
1092OpenEventW
1093OpenFile
1094OpenFileById
1095OpenFileMappingA
1096OpenFileMappingW
1097OpenJobObjectA
1098OpenJobObjectW
1099OpenMutexA
1100OpenMutexW
1101OpenPackageInfoByFullName
1102OpenPrivateNamespaceA
1103OpenPrivateNamespaceW
1104OpenProcess
1105; MSDN says OpenProcessToken is from Advapi32.dll, not Kernel32.dll
1106; OpenProcessToken
1107OpenProfileUserMapping
1108OpenSemaphoreA
1109OpenSemaphoreW
1110OpenState
1111OpenStateExplicit
1112OpenThread
1113; MSDN says this is exported from ADVAPI32.DLL.
1114; OpenThreadToken
1115OpenWaitableTimerA
1116OpenWaitableTimerW
1117OutputDebugStringA
1118OutputDebugStringW
1119PackageFamilyNameFromFullName
1120PackageFamilyNameFromId
1121PackageFullNameFromId
1122PackageIdFromFullName
1123PackageNameAndPublisherIdFromFamilyName
1124ParseApplicationUserModelId
1125PeekConsoleInputA
1126PeekConsoleInputW
1127PeekNamedPipe
1128PopIoRingCompletion
1129PostQueuedCompletionStatus
1130PowerClearRequest
1131PowerCreateRequest
1132PowerSetRequest
1133PrefetchVirtualMemory
1134PrepareTape
1135PrivCopyFileExW
1136PrivMoveFileIdentityW
1137Process32First
1138Process32FirstW
1139Process32Next
1140Process32NextW
1141ProcessIdToSessionId
1142PssCaptureSnapshot
1143PssDuplicateSnapshot
1144PssFreeSnapshot
1145PssQuerySnapshot
1146PssWalkMarkerCreate
1147PssWalkMarkerFree
1148PssWalkMarkerGetPosition
1149PssWalkMarkerRewind
1150PssWalkMarkerSeek
1151PssWalkMarkerSeekToBeginning
1152PssWalkMarkerSetPosition
1153PssWalkMarkerTell
1154PssWalkSnapshot
1155PulseEvent
1156PurgeComm
1157QueryActCtxSettingsW
1158QueryActCtxSettingsWWorker
1159QueryActCtxW
1160QueryActCtxWWorker
1161QueryDepthSList
1162QueryDosDeviceA
1163QueryDosDeviceW
1164QueryFullProcessImageNameA
1165QueryFullProcessImageNameW
1166QueryIdleProcessorCycleTime
1167QueryIdleProcessorCycleTimeEx
1168QueryInformationJobObject
1169QueryIoRateControlInformationJobObject
1170QueryIoRingCapabilities
1171QueryMemoryResourceNotification
1172QueryPerformanceCounter
1173QueryPerformanceFrequency
1174QueryProcessAffinityUpdateMode
1175QueryProcessCycleTime
1176QueryProtectedPolicy
1177QueryThreadCycleTime
1178QueryThreadProfiling
1179QueryThreadpoolStackInformation
1180QueryUmsThreadInformation
1181QueryUnbiasedInterruptTime
1182QueueUserAPC
1183QueueUserAPC2
1184QueueUserWorkItem
1185QuirkGetData2Worker
1186QuirkGetDataWorker
1187QuirkIsEnabled2Worker
1188QuirkIsEnabled3Worker
1189QuirkIsEnabledForPackage2Worker
1190QuirkIsEnabledForPackage3Worker
1191QuirkIsEnabledForPackage4Worker
1192QuirkIsEnabledForPackageWorker
1193QuirkIsEnabledForProcessWorker
1194QuirkIsEnabledWorker
1195RaiseException
1196RaiseFailFastException
1197RaiseInvalid16BitExeError
1198ReOpenFile
1199ReclaimVirtualMemory
1200ReadConsoleA
1201ReadConsoleInputA
1202ReadConsoleInputExA
1203ReadConsoleInputExW
1204ReadConsoleInputW
1205ReadConsoleOutputA
1206ReadConsoleOutputAttribute
1207ReadConsoleOutputCharacterA
1208ReadConsoleOutputCharacterW
1209ReadConsoleOutputW
1210ReadConsoleW
1211ReadDirectoryChangesExW
1212ReadDirectoryChangesW
1213ReadFile
1214ReadFileEx
1215ReadFileScatter
1216ReadProcessMemory
1217ReadThreadProfilingData
1218;
1219; MSDN says these functions are exported
1220; from advapi32.dll. Commented out for
1221; compatibility with older versions of
1222; Windows.
1223;
1224; RegKrnGetGlobalState and RegKrnInitialize
1225; are known exceptions.
1226;
1227;RegCloseKey
1228;RegCopyTreeW
1229;RegCreateKeyExA
1230;RegCreateKeyExW
1231;RegDeleteKeyExA
1232;RegDeleteKeyExW
1233;RegDeleteTreeA
1234;RegDeleteTreeW
1235;RegDeleteValueA
1236;RegDeleteValueW
1237;RegDisablePredefinedCacheEx
1238;RegEnumKeyExA
1239;RegEnumKeyExW
1240;RegEnumValueA
1241;RegEnumValueW
1242;RegFlushKey
1243;RegGetKeySecurity
1244;RegGetValueA
1245;RegGetValueW
1246RegKrnGetGlobalState
1247RegKrnInitialize
1248;RegLoadKeyA
1249;RegLoadKeyW
1250;RegLoadMUIStringA
1251;RegLoadMUIStringW
1252;RegNotifyChangeKeyValue
1253;RegOpenCurrentUser
1254;RegOpenKeyExA
1255;RegOpenKeyExW
1256;RegOpenUserClassesRoot
1257;RegQueryInfoKeyA
1258;RegQueryInfoKeyW
1259;RegQueryValueExA
1260;RegQueryValueExW
1261;RegRestoreKeyA
1262;RegRestoreKeyW
1263;RegSaveKeyExA
1264;RegSaveKeyExW
1265;RegSetKeySecurity
1266;RegSetValueExA
1267;RegSetValueExW
1268;RegUnLoadKeyA
1269;RegUnLoadKeyW
1270RegisterApplicationRecoveryCallback
1271RegisterApplicationRestart
1272RegisterBadMemoryNotification
1273RegisterConsoleIME
1274RegisterConsoleOS2
1275RegisterConsoleVDM
1276RegisterWaitForInputIdle
1277RegisterWaitForSingleObject
1278RegisterWaitForSingleObjectEx
1279RegisterWaitUntilOOBECompleted
1280RegisterWowBaseHandlers
1281RegisterWowExec
1282ReleaseActCtx
1283ReleaseActCtxWorker
1284ReleaseMutex
1285ReleaseMutexWhenCallbackReturns
1286ReleasePackageVirtualizationContext
1287ReleasePseudoConsole
1288ReleaseSRWLockExclusive
1289ReleaseSRWLockShared
1290ReleaseSemaphore
1291ReleaseSemaphoreWhenCallbackReturns
1292RemoveDirectoryA
1293RemoveDirectoryTransactedA
1294RemoveDirectoryTransactedW
1295RemoveDirectoryW
1296RemoveDllDirectory
1297RemoveLocalAlternateComputerNameA
1298RemoveLocalAlternateComputerNameW
1299RemoveSecureMemoryCacheCallback
1300RemoveVectoredContinueHandler
1301RemoveVectoredExceptionHandler
1302ReplaceFile
1303ReplaceFileA
1304ReplaceFileW
1305ReplacePartitionUnit
1306RequestDeviceWakeup
1307RequestWakeupLatency
1308ResetEvent
1309ResetWriteWatch
1310ResizePseudoConsole
1311ResolveDelayLoadedAPI
1312ResolveDelayLoadsFromDll
1313ResolveLocaleName
1314RestoreLastError
1315ResumeThread
1316RtlAddFunctionTable
1317RtlCaptureContext
1318RtlCaptureStackBackTrace
1319RtlCompareMemory
1320RtlCopyMemory
1321RtlDeleteFunctionTable
1322RtlFillMemory
1323RtlInstallFunctionTableCallback
1324RtlIsEcCode
1325RtlLookupFunctionEntry
1326RtlMoveMemory
1327RtlPcToFileHeader
1328RtlRaiseException
1329RtlRestoreContext
1330RtlUnwind
1331RtlUnwindEx
1332RtlVirtualUnwind
1333RtlVirtualUnwind2
1334RtlZeroMemory
1335ScrollConsoleScreenBufferA
1336ScrollConsoleScreenBufferW
1337SearchPathA
1338SearchPathW
1339SetCachedSigningLevel
1340SetCPGlobal
1341SetCalendarInfoA
1342SetCalendarInfoW
1343SetComPlusPackageInstallStatus
1344SetCommBreak
1345SetCommConfig
1346SetCommMask
1347SetCommState
1348SetCommTimeouts
1349SetComputerNameA
1350SetComputerNameEx2W
1351SetComputerNameExA
1352SetComputerNameExW
1353SetComputerNameW
1354SetConsoleActiveScreenBuffer
1355SetConsoleCP
1356SetConsoleCommandHistoryMode
1357SetConsoleCtrlHandler
1358SetConsoleCursor
1359SetConsoleCursorInfo
1360SetConsoleCursorMode
1361SetConsoleCursorPosition
1362SetConsoleDisplayMode
1363SetConsoleFont
1364SetConsoleHardwareState
1365SetConsoleHistoryInfo
1366SetConsoleIcon
1367SetConsoleInputExeNameA
1368SetConsoleInputExeNameW
1369SetConsoleKeyShortcuts
1370SetConsoleLocalEUDC
1371SetConsoleMaximumWindowSize
1372SetConsoleMenuClose
1373SetConsoleMode
1374SetConsoleNlsMode
1375SetConsoleNumberOfCommandsA
1376SetConsoleNumberOfCommandsW
1377SetConsoleOS2OemFormat
1378SetConsoleOutputCP
1379SetConsolePalette
1380SetConsoleScreenBufferInfoEx
1381SetConsoleScreenBufferSize
1382SetConsoleTextAttribute
1383SetConsoleTitleA
1384SetConsoleTitleW
1385SetConsoleWindowInfo
1386SetCriticalSectionSpinCount
1387SetCurrentConsoleFontEx
1388SetCurrentDirectoryA
1389SetCurrentDirectoryW
1390SetDefaultCommConfigA
1391SetDefaultCommConfigW
1392SetDefaultDllDirectories
1393SetDllDirectoryA
1394SetDllDirectoryW
1395SetDynamicTimeZoneInformation
1396SetEndOfFile
1397SetEnvironmentStringsA
1398SetEnvironmentStringsW
1399SetEnvironmentVariableA
1400SetEnvironmentVariableW
1401SetErrorMode
1402SetEvent
1403SetEventWhenCallbackReturns
1404SetExtendedFeaturesMask
1405SetFileApisToANSI
1406SetFileApisToOEM
1407SetFileAttributesA
1408SetFileAttributesTransactedA
1409SetFileAttributesTransactedW
1410SetFileAttributesW
1411SetFileBandwidthReservation
1412SetFileCompletionNotificationModes
1413SetFileInformationByHandle
1414SetFileIoOverlappedRange
1415SetFilePointer
1416SetFilePointerEx
1417SetFileShortNameA
1418SetFileShortNameW
1419SetFileTime
1420SetFileValidData
1421SetFirmwareEnvironmentVariableA
1422SetFirmwareEnvironmentVariableExA
1423SetFirmwareEnvironmentVariableExW
1424SetFirmwareEnvironmentVariableW
1425SetHandleCount
1426SetHandleInformation
1427SetInformationJobObject
1428SetIoRateControlInformationJobObject
1429SetIoRingCompletionEvent
1430SetLastConsoleEventActive
1431SetLastError
1432SetLocalPrimaryComputerNameA
1433SetLocalPrimaryComputerNameW
1434SetLocalTime
1435SetLocaleInfoA
1436SetLocaleInfoW
1437SetMailslotInfo
1438SetMessageWaitingIndicator
1439SetNamedPipeAttribute
1440SetNamedPipeHandleState
1441SetPriorityClass
1442SetProcessAffinityMask
1443SetProcessAffinityUpdateMode
1444SetProcessDEPPolicy
1445SetProcessDefaultCpuSetMasks
1446SetProcessDefaultCpuSets
1447SetProcessDynamicEHContinuationTargets
1448SetProcessDynamicEnforcedCetCompatibleRanges
1449SetProcessInformation
1450SetProcessMitigationPolicy
1451SetProcessPreferredUILanguages
1452SetProcessPriorityBoost
1453SetProcessShutdownParameters
1454SetProcessWorkingSetSize
1455SetProcessWorkingSetSizeEx
1456SetProtectedPolicy
1457SetSearchPathMode
1458SetStdHandle
1459SetStdHandleEx
1460SetSystemFileCacheSize
1461SetSystemPowerState
1462SetSystemTime
1463SetSystemTimeAdjustment
1464SetTapeParameters
1465SetTapePosition
1466SetTermsrvAppInstallMode
1467SetThreadAffinityMask
1468SetThreadContext
1469SetThreadDescription
1470SetThreadErrorMode
1471SetThreadExecutionState
1472SetThreadGroupAffinity
1473SetThreadIdealProcessor
1474SetThreadIdealProcessorEx
1475SetThreadInformation
1476SetThreadLocale
1477SetThreadPreferredUILanguages
1478SetThreadPriority
1479SetThreadPriorityBoost
1480SetThreadSelectedCpuSetMasks
1481SetThreadSelectedCpuSets
1482SetThreadStackGuarantee
1483; MSDN says this is exported from ADVAPI32.DLL.
1484; SetThreadToken
1485SetThreadUILanguage
1486SetThreadpoolStackInformation
1487SetThreadpoolThreadMaximum
1488SetThreadpoolThreadMinimum
1489SetThreadpoolTimer
1490SetThreadpoolTimerEx
1491SetThreadpoolWait
1492SetThreadpoolWaitEx
1493SetTimeZoneInformation
1494SetTimerQueueTimer
1495SetUmsThreadInformation
1496SetUnhandledExceptionFilter
1497SetUserGeoID
1498SetUserGeoName
1499SetVDMCurrentDirectories
1500SetVolumeLabelA
1501SetVolumeLabelW
1502SetVolumeMountPointA
1503SetVolumeMountPointW
1504SetVolumeMountPointWStub
1505SetWaitableTimer
1506SetWaitableTimerEx
1507SetXStateFeaturesMask
1508SetupComm
1509ShowConsoleCursor
1510SignalObjectAndWait
1511SizeofResource
1512Sleep
1513SleepConditionVariableCS
1514SleepConditionVariableSRW
1515SleepEx
1516SortCloseHandle
1517SortGetHandle
1518StartThreadpoolIo
1519SubmitIoRing
1520SubmitThreadpoolWork
1521SuspendThread
1522SwitchToFiber
1523SwitchToThread
1524SystemTimeToFileTime
1525SystemTimeToTzSpecificLocalTime
1526SystemTimeToTzSpecificLocalTimeEx
1527TerminateJobObject
1528TerminateProcess
1529TerminateThread
1530TermsrvAppInstallMode
1531TermsrvConvertSysRootToUserDir
1532TermsrvCreateRegEntry
1533TermsrvDeleteKey
1534TermsrvDeleteValue
1535TermsrvGetPreSetValue
1536TermsrvGetWindowsDirectoryA
1537TermsrvGetWindowsDirectoryW
1538TermsrvOpenRegEntry
1539TermsrvOpenUserClasses
1540TermsrvRestoreKey
1541TermsrvSetKeySecurity
1542TermsrvSetValueKey
1543TermsrvSyncUserIniFileExt
1544Thread32First
1545Thread32Next
1546TlsAlloc
1547TlsFree
1548TlsGetValue
1549TlsGetValue2
1550TlsSetValue
1551Toolhelp32ReadProcessMemory
1552TransactNamedPipe
1553TransmitCommChar
1554TryAcquireSRWLockExclusive
1555TryAcquireSRWLockShared
1556TryEnterCriticalSection
1557TrySubmitThreadpoolCallback
1558TzSpecificLocalTimeToSystemTime
1559TzSpecificLocalTimeToSystemTimeEx
1560UTRegister
1561UTUnRegister
1562UmsThreadYield
1563UnhandledExceptionFilter
1564UnlockFile
1565UnlockFileEx
1566UnmapViewOfFile
1567UnmapViewOfFileEx
1568UnregisterApplicationRecoveryCallback
1569UnregisterApplicationRestart
1570UnregisterBadMemoryNotification
1571UnregisterConsoleIME
1572UnregisterWait
1573UnregisterWaitEx
1574UnregisterWaitUntilOOBECompleted
1575UpdateCalendarDayOfWeek
1576UpdateProcThreadAttribute
1577UpdateResourceA
1578UpdateResourceW
1579VDMConsoleOperation
1580VDMOperationStarted
1581ValidateLCType
1582ValidateLocale
1583VerLanguageNameA
1584VerLanguageNameW
1585VerSetConditionMask
1586VerifyConsoleIoHandle
1587VerifyScripts
1588VerifyVersionInfoA
1589VerifyVersionInfoW
1590VirtualAlloc
1591VirtualAllocEx
1592VirtualAllocExNuma
1593VirtualFree
1594VirtualFreeEx
1595VirtualLock
1596VirtualProtect
1597VirtualProtectEx
1598VirtualQuery
1599VirtualQueryEx
1600VirtualUnlock
1601WTSGetActiveConsoleSessionId
1602WaitCommEvent
1603WaitForDebugEvent
1604WaitForDebugEventEx
1605WaitForMultipleObjects
1606WaitForMultipleObjectsEx
1607WaitForSingleObject
1608WaitForSingleObjectEx
1609WaitForThreadpoolIoCallbacks
1610WaitForThreadpoolTimerCallbacks
1611WaitForThreadpoolWaitCallbacks
1612WaitForThreadpoolWorkCallbacks
1613WaitNamedPipeA
1614WaitNamedPipeW
1615WakeAllConditionVariable
1616; MSDN says it's in Kernel32.dll but it's not.
1617; Link with libsynchronization.a instead.
1618; Commented out for compatibility with older
1619; versions of Windows.
1620;WaitOnAddress
1621;WakeByAddressSingle
1622;WakeByAddressAll
1623WakeConditionVariable
1624WerGetFlags
1625WerGetFlagsWorker
1626WerRegisterAdditionalProcess
1627WerRegisterAppLocalDump
1628WerRegisterCustomMetadata
1629WerRegisterExcludedMemoryBlock
1630WerRegisterFile
1631WerRegisterFileWorker
1632WerRegisterMemoryBlock
1633WerRegisterMemoryBlockWorker
1634WerRegisterRuntimeExceptionModule
1635WerRegisterRuntimeExceptionModuleWorker
1636WerSetFlags
1637WerSetFlagsWorker
1638WerUnregisterAdditionalProcess
1639WerUnregisterAppLocalDump
1640WerUnregisterCustomMetadata
1641WerUnregisterExcludedMemoryBlock
1642WerUnregisterFile
1643WerUnregisterFileWorker
1644WerUnregisterMemoryBlock
1645WerUnregisterMemoryBlockWorker
1646WerUnregisterRuntimeExceptionModule
1647WerUnregisterRuntimeExceptionModuleWorker
1648WerpCleanupMessageMapping
1649WerpGetDebugger
1650WerpInitiateRemoteRecovery
1651WerpLaunchAeDebug
1652WerpNotifyLoadStringResource
1653WerpNotifyLoadStringResourceEx
1654WerpNotifyLoadStringResourceWorker
1655WerpNotifyUseStringResource
1656WerpNotifyUseStringResourceWorker
1657WerpStringLookup
1658WideCharToMultiByte
1659WinExec
1660Wow64DisableWow64FsRedirection
1661Wow64EnableWow64FsRedirection
1662Wow64GetThreadContext
1663Wow64GetThreadSelectorEntry
1664Wow64RevertWow64FsRedirection
1665Wow64SetThreadContext
1666Wow64SuspendThread
1667WriteConsoleA
1668WriteConsoleInputA
1669WriteConsoleInputVDMA
1670WriteConsoleInputVDMW
1671WriteConsoleInputW
1672WriteConsoleOutputA
1673WriteConsoleOutputAttribute
1674WriteConsoleOutputCharacterA
1675WriteConsoleOutputCharacterW
1676WriteConsoleOutputW
1677WriteConsoleW
1678WriteFile
1679WriteFileEx
1680WriteFileGather
1681WritePrivateProfileSectionA
1682WritePrivateProfileSectionW
1683WritePrivateProfileStringA
1684WritePrivateProfileStringW
1685WritePrivateProfileStructA
1686WritePrivateProfileStructW
1687WriteProcessMemory
1688WriteProfileSectionA
1689WriteProfileSectionW
1690WriteProfileStringA
1691WriteProfileStringW
1692WriteTapemark
1693ZombifyActCtx
1694ZombifyActCtxWorker
1695__C_specific_handler
1696; This isn't always available and shouldn't be linked from here, but should
1697; be statically linked from the compiler support library.
1698;
1699__misaligned_access
1700_hread
1701_hwrite
1702_lclose
1703_lcreat
1704_llseek
1705_local_unwind
1706_lopen
1707_lread
1708_lwrite
1709lstrcat
1710lstrcatA
1711lstrcatW
1712lstrcmp
1713lstrcmpA
1714lstrcmpW
1715lstrcmpi
1716lstrcmpiA
1717lstrcmpiW
1718lstrcpy
1719lstrcpyA
1720lstrcpyW
1721lstrcpyn
1722lstrcpynA
1723lstrcpynW
1724lstrlen
1725lstrlenA
1726lstrlenW
1727;
1728; MSDN says these functions are exported
1729; from winmm.dll. Commented out for
1730; compatibility with older versions of
1731; Windows.
1732;
1733;timeBeginPeriod
1734;timeEndPeriod
1735;timeGetDevCaps
1736;timeGetSystemTime
1737;timeGetTime
1738uaw_lstrcmpW
1739uaw_lstrcmpiW
1740uaw_lstrlenW
1741uaw_wcschr
1742uaw_wcscpy
1743uaw_wcsicmp
1744uaw_wcslen
1745uaw_wcsrchr
lib/libc/mingw/lib64/quartz.def deleted-17
...@@ -1,17 +0,0 @@
1;
2; Exports of file QUARTZ.dll
3;
4; Autogenerated by gen_exportdef
5; Written by Kai Tietz, 2007
6;
7LIBRARY QUARTZ.dll
8EXPORTS
9AMGetErrorTextA
10AMGetErrorTextW
11AmpFactorToDB
12DBToAmpFactor
13DllCanUnloadNow
14DllGetClassObject
15DllRegisterServer
16DllUnregisterServer
17GetProxyDllInfo
lib/libc/mingw/lib64/ws2_32.def deleted-200
...@@ -1,200 +0,0 @@
1
2LIBRARY "WS2_32.dll"
3EXPORTS
4accept
5bind
6closesocket
7connect
8getpeername
9getsockname
10getsockopt
11htonl
12htons
13ioctlsocket
14inet_addr
15inet_ntoa
16listen
17ntohl
18ntohs
19recv
20recvfrom
21select
22send
23sendto
24setsockopt
25shutdown
26socket
27WSApSetPostRoutine
28FreeAddrInfoEx
29FreeAddrInfoExW
30FreeAddrInfoW
31GetAddrInfoExA
32GetAddrInfoExCancel
33GetAddrInfoExOverlappedResult
34GetAddrInfoExW
35GetAddrInfoW
36GetHostNameW
37GetNameInfoW
38InetNtopW
39InetPtonW
40ProcessSocketNotifications
41SetAddrInfoExA
42SetAddrInfoExW
43WPUCompleteOverlappedRequest
44WPUGetProviderPathEx
45WSAAccept
46WSAAddressToStringA
47WSAAddressToStringW
48WSAAdvertiseProvider
49WSACloseEvent
50WSAConnect
51WSAConnectByList
52WSAConnectByNameA
53WSAConnectByNameW
54WSACreateEvent
55gethostbyaddr
56gethostbyname
57getprotobyname
58getprotobynumber
59getservbyname
60getservbyport
61gethostname
62WSADuplicateSocketA
63WSADuplicateSocketW
64WSAEnumNameSpaceProvidersA
65WSAEnumNameSpaceProvidersExA
66WSAEnumNameSpaceProvidersExW
67WSAEnumNameSpaceProvidersW
68WSAEnumNetworkEvents
69WSAEnumProtocolsA
70WSAEnumProtocolsW
71WSAEventSelect
72WSAGetOverlappedResult
73WSAGetQOSByName
74WSAGetServiceClassInfoA
75WSAGetServiceClassInfoW
76WSAGetServiceClassNameByClassIdA
77WSAGetServiceClassNameByClassIdW
78WSAHtonl
79WSAHtons
80WSAInstallServiceClassA
81WSAInstallServiceClassW
82WSAIoctl
83WSAJoinLeaf
84WSALookupServiceBeginA
85WSALookupServiceBeginW
86WSALookupServiceEnd
87WSALookupServiceNextA
88WSALookupServiceNextW
89WSANSPIoctl
90WSANtohl
91WSANtohs
92WSAPoll
93WSAProviderCompleteAsyncCall
94WSAProviderConfigChange
95WSARecv
96WSARecvDisconnect
97WSARecvFrom
98WSARemoveServiceClass
99WSAResetEvent
100WSASend
101WSASendDisconnect
102WSASendMsg
103WSASendTo
104WSASetEvent
105WSAAsyncSelect
106WSAAsyncGetHostByAddr
107WSAAsyncGetHostByName
108WSAAsyncGetProtoByNumber
109WSAAsyncGetProtoByName
110WSAAsyncGetServByPort
111WSAAsyncGetServByName
112WSACancelAsyncRequest
113WSASetBlockingHook
114WSAUnhookBlockingHook
115WSAGetLastError
116WSASetLastError
117WSACancelBlockingCall
118WSAIsBlocking
119WSAStartup
120WSACleanup
121WSASetServiceA
122WSASetServiceW
123WSASocketA
124WSASocketW
125WSAStringToAddressA
126WSAStringToAddressW
127WSAUnadvertiseProvider
128WSAWaitForMultipleEvents
129WSCDeinstallProvider
130WSCDeinstallProvider32
131WSCDeinstallProviderEx
132WSCEnableNSProvider
133WSCEnableNSProvider32
134WSCEnumNameSpaceProviders32
135WSCEnumNameSpaceProvidersEx32
136WSCEnumProtocols
137WSCEnumProtocolsEx
138WSCEnumProtocols32
139WSCGetApplicationCategory
140WSCGetApplicationCategoryEx
141WSCGetProviderInfo
142WSCGetProviderInfo32
143WSCGetProviderPath
144WSCGetProviderPath32
145WSCInstallNameSpace
146WSCInstallNameSpace32
147WSCInstallNameSpaceEx
148WSCInstallNameSpaceEx2
149WSCInstallNameSpaceEx32
150WSCInstallProvider
151WSCInstallProvider64_32
152WSCInstallProviderAndChains
153WSCInstallProviderAndChains64_32
154WSCInstallProviderEx
155WSCSetApplicationCategory
156WSCSetApplicationCategoryEx
157WSCSetProviderInfo
158WSCSetProviderInfo32
159WSCUnInstallNameSpace
160WSCUnInstallNameSpace32
161WSCUnInstallNameSpaceEx2
162WSCUpdateProvider
163WSCUpdateProvider32
164WSCUpdateProviderEx
165WSCWriteNameSpaceOrder
166WSCWriteNameSpaceOrder32
167WSCWriteProviderOrder
168WSCWriteProviderOrder32
169WSCWriteProviderOrderEx
170WahCloseApcHelper
171__WSAFDIsSet
172WahCloseHandleHelper
173WahCloseNotificationHandleHelper
174WahCloseSocketHandle
175WahCloseThread
176WahCompleteRequest
177WahCreateHandleContextTable
178WahCreateNotificationHandle
179WahCreateSocketHandle
180WahDestroyHandleContextTable
181WahDisableNonIFSHandleSupport
182WahEnableNonIFSHandleSupport
183WahEnumerateHandleContexts
184WahInsertHandleContext
185WahNotifyAllProcesses
186WahOpenApcHelper
187WahOpenCurrentThread
188WahOpenHandleHelper
189WahOpenNotificationHandleHelper
190WahQueueUserApc
191WahReferenceContextByHandle
192WahRemoveHandleContext
193WahWaitForNotification
194WahWriteLSPEvent
195freeaddrinfo
196getaddrinfo
197getnameinfo
198inet_ntop
199inet_pton
200WEP
lib/libc/mingw/libsrc/uuid.c+1
...@@ -15,6 +15,7 @@...@@ -15,6 +15,7 @@
15#include <basetyps.h>15#include <basetyps.h>
1616
17#include <credentialprovider.h>17#include <credentialprovider.h>
18#include <httprequest.h>
18#include <functiondiscoverykeys.h>19#include <functiondiscoverykeys.h>
19#include <textstor.h>20#include <textstor.h>
20#include <shobjidl.h>21#include <shobjidl.h>
lib/libc/mingw/libsrc/ws2tcpip/in6_set_addr_loopback.c+1-1
...@@ -8,6 +8,6 @@...@@ -8,6 +8,6 @@
88
9void IN6_SET_ADDR_LOOPBACK(struct in6_addr *a)9void IN6_SET_ADDR_LOOPBACK(struct in6_addr *a)
10{10{
11 memset(a->s6_bytes, 0, sizeof(struct in6_addr));11 *a = (struct in6_addr){0};
12 a->s6_bytes[15] = 1;12 a->s6_bytes[15] = 1;
13}13}
lib/libc/mingw/libsrc/ws2tcpip/in6_set_addr_unspecified.c+1-1
...@@ -8,5 +8,5 @@...@@ -8,5 +8,5 @@
88
9void IN6_SET_ADDR_UNSPECIFIED(struct in6_addr *a)9void IN6_SET_ADDR_UNSPECIFIED(struct in6_addr *a)
10{10{
11 memset(a->s6_bytes, 0, sizeof(struct in6_addr));11 *a = (struct in6_addr){0};
12}12}
lib/libc/mingw/libsrc/ws2tcpip/in6addr_setany.c+1-4
...@@ -6,14 +6,11 @@...@@ -6,14 +6,11 @@
6#include <winsock2.h>6#include <winsock2.h>
7#include <ws2tcpip.h>7#include <ws2tcpip.h>
88
9#undef IN6_SET_ADDR_UNSPECIFIED
10#define IN6_SET_ADDR_UNSPECIFIED(a) memset((a)->s6_bytes,0,sizeof(struct in6_addr))
11
12void IN6ADDR_SETANY(struct sockaddr_in6 *a)9void IN6ADDR_SETANY(struct sockaddr_in6 *a)
13{10{
14 a->sin6_family = AF_INET6;11 a->sin6_family = AF_INET6;
15 a->sin6_port = 0;12 a->sin6_port = 0;
16 a->sin6_flowinfo = 0;13 a->sin6_flowinfo = 0;
17 IN6_SET_ADDR_UNSPECIFIED(&a->sin6_addr);14 a->sin6_addr = (struct in6_addr){0};
18 a->sin6_scope_id = 0;15 a->sin6_scope_id = 0;
19}16}
lib/libc/mingw/libsrc/ws2tcpip/in6addr_setloopback.c-7
...@@ -6,13 +6,6 @@...@@ -6,13 +6,6 @@
6#include <winsock2.h>6#include <winsock2.h>
7#include <ws2tcpip.h>7#include <ws2tcpip.h>
88
9#undef IN6_SET_ADDR_LOOPBACK
10#define IN6_SET_ADDR_LOOPBACK(a) \
11 do { \
12 memset((a)->s6_bytes,0,sizeof(struct in6_addr));\
13 (a)->s6_bytes[15] = 1; \
14 } while (0)
15
16void IN6ADDR_SETLOOPBACK(struct sockaddr_in6 *a)9void IN6ADDR_SETLOOPBACK(struct sockaddr_in6 *a)
17{10{
18 a->sin6_family = AF_INET6;11 a->sin6_family = AF_INET6;
lib/libc/mingw/math/arm-common/ldexpl.c-4
...@@ -8,9 +8,5 @@...@@ -8,9 +8,5 @@
88
9long double ldexpl(long double x, int n)9long double ldexpl(long double x, int n)
10{10{
11#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
12 return ldexp(x, n);11 return ldexp(x, n);
13#else
14#error Not supported on your platform yet
15#endif
16}12}
lib/libc/mingw/math/arm-common/sincosl.c created+13
...@@ -0,0 +1,13 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <math.h>
8
9void sincosl(long double x, long double *s, long double *c)
10{
11 *s = sinl(x);
12 *c = cosl(x);
13}
lib/libc/mingw/math/arm/_chgsignl.S deleted-16
...@@ -1,16 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <_mingw_mac.h>
8
9 .file "_chgignl.S"
10 .text
11 .align 4
12 .globl __MINGW_USYMBOL(_chgsignl)
13 .def __MINGW_USYMBOL(_chgsignl); .scl 2; .type 32; .endef
14__MINGW_USYMBOL(_chgsignl):
15 vneg.f64 d0, d0
16 bx lr
lib/libc/mingw/math/arm64/_chgsignl.S deleted-16
...@@ -1,16 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <_mingw_mac.h>
8
9 .file "_chgignl.S"
10 .text
11 .align 2
12 .globl __MINGW_USYMBOL(_chgsignl)
13 .def __MINGW_USYMBOL(_chgsignl); .scl 2; .type 32; .endef
14__MINGW_USYMBOL(_chgsignl):
15 fneg d0, d0
16 ret
lib/libc/mingw/math/cephes_mconf.h+2-2
...@@ -66,7 +66,7 @@ extern double __QNAN;...@@ -66,7 +66,7 @@ extern double __QNAN;
66#endif66#endif
6767
68/*long double*/68/*long double*/
69#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)69#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
70#define MAXNUML 1.7976931348623158E30870#define MAXNUML 1.7976931348623158E308
71#define MAXLOGL 7.09782712893383996843E271#define MAXLOGL 7.09782712893383996843E2
72#define MINLOGL -7.08396418532264106224E272#define MINLOGL -7.08396418532264106224E2
...@@ -84,7 +84,7 @@ extern double __QNAN;...@@ -84,7 +84,7 @@ extern double __QNAN;
84#define PIL 3.1415926535897932384626L84#define PIL 3.1415926535897932384626L
85#define PIO2L 1.5707963267948966192313L85#define PIO2L 1.5707963267948966192313L
86#define PIO4L 7.8539816339744830961566E-1L86#define PIO4L 7.8539816339744830961566E-1L
87#endif /* defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */87#endif /* __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ */
8888
89#define isfinitel isfinite89#define isfinitel isfinite
90#define isinfl isinf90#define isinfl isinf
lib/libc/mingw/math/coshl.c+1-1
...@@ -5,7 +5,7 @@...@@ -5,7 +5,7 @@
5 */5 */
6#include "cephes_mconf.h"6#include "cephes_mconf.h"
77
8#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)8#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
9#include <math.h>9#include <math.h>
1010
11long double coshl(long double x)11long double coshl(long double x)
lib/libc/mingw/math/erfl.c+1-1
...@@ -108,7 +108,7 @@ Copyright 1984, 1995 by Stephen L. Moshier...@@ -108,7 +108,7 @@ Copyright 1984, 1995 by Stephen L. Moshier
108108
109long double erfl(long double x);109long double erfl(long double x);
110110
111#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)111#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
112long double erfcl(long double x)112long double erfcl(long double x)
113{113{
114 return erfc(x);114 return erfc(x);
lib/libc/mingw/math/fmal.c+1-1
...@@ -5,7 +5,7 @@...@@ -5,7 +5,7 @@
5 */5 */
6long double fmal(long double x, long double y, long double z);6long double fmal(long double x, long double y, long double z);
77
8#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)8#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
99
10double fma(double x, double y, double z);10double fma(double x, double y, double z);
1111
lib/libc/mingw/math/fp_constsl.c+1-1
...@@ -16,7 +16,7 @@ const union _ieee_rep __DENORML = { __LONG_DOUBLE_DENORM_REP };...@@ -16,7 +16,7 @@ const union _ieee_rep __DENORML = { __LONG_DOUBLE_DENORM_REP };
16long double nanl (const char *);16long double nanl (const char *);
17long double nanl (const char * tagp __attribute__((unused)) )17long double nanl (const char * tagp __attribute__((unused)) )
18{18{
19#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)19#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
20 return nan("");20 return nan("");
21#else21#else
22 return __QNANL.ldouble_val;22 return __QNANL.ldouble_val;
lib/libc/mingw/math/fpclassifyl.c+3-3
...@@ -6,7 +6,9 @@...@@ -6,7 +6,9 @@
6#include <math.h>6#include <math.h>
77
8int __fpclassifyl (long double _x){8int __fpclassifyl (long double _x){
9#if defined(__x86_64__) || defined(_AMD64_)9#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
10 return __fpclassify(_x);
11#elif defined(_AMD64_) || defined(__x86_64__)
10 __mingw_ldbl_type_t hlp;12 __mingw_ldbl_type_t hlp;
11 unsigned int e;13 unsigned int e;
12 hlp.x = _x;14 hlp.x = _x;
...@@ -23,8 +25,6 @@ int __fpclassifyl (long double _x){...@@ -23,8 +25,6 @@ int __fpclassifyl (long double _x){
23 return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ?25 return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ?
24 FP_INFINITE : FP_NAN);26 FP_INFINITE : FP_NAN);
25 return FP_NORMAL;27 return FP_NORMAL;
26#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
27 return __fpclassify(_x);
28#elif defined(__i386__) || defined(_X86_)28#elif defined(__i386__) || defined(_X86_)
29 unsigned short sw;29 unsigned short sw;
30 __asm__ __volatile__ (30 __asm__ __volatile__ (
lib/libc/mingw/math/frexpl.c+1-1
...@@ -5,7 +5,7 @@...@@ -5,7 +5,7 @@
5 */5 */
6long double frexpl(long double value, int* exp);6long double frexpl(long double value, int* exp);
77
8#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)8#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
99
10double frexp(double value, int* exp);10double frexp(double value, int* exp);
1111
lib/libc/mingw/math/isnanl.c+3-3
...@@ -8,7 +8,9 @@...@@ -8,7 +8,9 @@
8int8int
9__isnanl (long double _x)9__isnanl (long double _x)
10{10{
11#if defined(__x86_64__) || defined(_AMD64_)11#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
12 return __isnan(_x);
13#elif defined(__x86_64__) || defined(_AMD64_)
12 __mingw_ldbl_type_t ld;14 __mingw_ldbl_type_t ld;
13 int xx, signexp;15 int xx, signexp;
1416
...@@ -18,8 +20,6 @@ __isnanl (long double _x)...@@ -18,8 +20,6 @@ __isnanl (long double _x)
18 signexp |= (unsigned int) (xx | (-xx)) >> 31;20 signexp |= (unsigned int) (xx | (-xx)) >> 31;
19 signexp = 0xfffe - signexp;21 signexp = 0xfffe - signexp;
20 return (int) ((unsigned int) signexp) >> 16;22 return (int) ((unsigned int) signexp) >> 16;
21#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
22 return __isnan(_x);
23#elif defined(__i386__) || defined(_X86_)23#elif defined(__i386__) || defined(_X86_)
24 unsigned short _sw;24 unsigned short _sw;
25 __asm__ __volatile__ ("fxam;"25 __asm__ __volatile__ ("fxam;"
lib/libc/mingw/math/lgammal.c+1-1
...@@ -5,7 +5,7 @@...@@ -5,7 +5,7 @@
5 */5 */
6#include "cephes_mconf.h"6#include "cephes_mconf.h"
77
8#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)8#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
9double lgamma(double x);9double lgamma(double x);
1010
11long double lgammal(long double x)11long double lgammal(long double x)
lib/libc/mingw/math/llrintl.c+2-1
...@@ -9,7 +9,8 @@...@@ -9,7 +9,8 @@
9long long llrintl (long double x) 9long long llrintl (long double x)
10{10{
11 long long retval = 0ll;11 long long retval = 0ll;
12#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)12#if (defined(_AMD64_) && !defined(_ARM64EC_)) || (defined(__x86_64__) && !defined(__arm64ec__)) || \
13 defined(_X86_) || defined(__i386__)
13 __asm__ __volatile__ ("fistpll %0" : "=m" (retval) : "t" (x) : "st");14 __asm__ __volatile__ ("fistpll %0" : "=m" (retval) : "t" (x) : "st");
14#else15#else
15 int mode = fegetround();16 int mode = fegetround();
lib/libc/mingw/math/lrintl.c+3-3
...@@ -8,10 +8,10 @@...@@ -8,10 +8,10 @@
8long lrintl (long double x) 8long lrintl (long double x)
9{9{
10 long retval = 0l;10 long retval = 0l;
11#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)11#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
12 __asm__ __volatile__ ("fistpl %0" : "=m" (retval) : "t" (x) : "st");
13#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
14 retval = lrint(x);12 retval = lrint(x);
13#elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
14 __asm__ __volatile__ ("fistpl %0" : "=m" (retval) : "t" (x) : "st");
15#endif15#endif
16 return retval;16 return retval;
17}17}
lib/libc/mingw/math/modff.c+1-1
...@@ -13,7 +13,7 @@ modff (float value, float* iptr)...@@ -13,7 +13,7 @@ modff (float value, float* iptr)
13 float int_part = 0.0F;13 float int_part = 0.0F;
14 /* truncate */ 14 /* truncate */
15 /* truncate */15 /* truncate */
16#if defined(_AMD64_) || defined(__x86_64__)16#if (defined(_AMD64_) && !defined(_ARM64EC_)) || (defined(__x86_64__) && !defined(__arm64ec__))
17 asm volatile ("subq $8, %%rsp\n"17 asm volatile ("subq $8, %%rsp\n"
18 "fnstcw 4(%%rsp)\n"18 "fnstcw 4(%%rsp)\n"
19 "movzwl 4(%%rsp), %%eax\n"19 "movzwl 4(%%rsp), %%eax\n"
lib/libc/mingw/math/modfl.c+1-1
...@@ -12,7 +12,7 @@ modfl (long double value, long double* iptr)...@@ -12,7 +12,7 @@ modfl (long double value, long double* iptr)
12{12{
13 long double int_part = 0.0L;13 long double int_part = 0.0L;
14 /* truncate */14 /* truncate */
15#if defined(_AMD64_) || defined(__x86_64__)15#if (defined(_AMD64_) && !defined(_ARM64EC_)) || (defined(__x86_64__) && !defined(__arm64ec__))
16 asm volatile ("subq $8, %%rsp\n"16 asm volatile ("subq $8, %%rsp\n"
17 "fnstcw 4(%%rsp)\n"17 "fnstcw 4(%%rsp)\n"
18 "movzwl 4(%%rsp), %%eax\n"18 "movzwl 4(%%rsp), %%eax\n"
lib/libc/mingw/math/rintl.c+3-3
...@@ -7,10 +7,10 @@...@@ -7,10 +7,10 @@
77
8long double rintl (long double x) {8long double rintl (long double x) {
9 long double retval = 0.0L;9 long double retval = 0.0L;
10#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)10#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
11 __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x));
12#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
13 retval = rint(x);11 retval = rint(x);
12#elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)
13 __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x));
14#endif14#endif
15 return retval;15 return retval;
16}16}
lib/libc/mingw/math/signbitl.c+2-2
...@@ -9,11 +9,11 @@...@@ -9,11 +9,11 @@
99
1010
11int __signbitl (long double x) {11int __signbitl (long double x) {
12#if defined(__x86_64__) || defined(_AMD64_)12#if (defined(_AMD64_) && !defined(_ARM64EC_)) || (defined(__x86_64__) && !defined(__arm64ec__))
13 __mingw_ldbl_type_t ld;13 __mingw_ldbl_type_t ld;
14 ld.x = x;14 ld.x = x;
15 return ((ld.lh.sign_exponent & 0x8000) != 0);15 return ((ld.lh.sign_exponent & 0x8000) != 0);
16#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)16#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
17 return __signbit(x);17 return __signbit(x);
18#elif defined(__i386__) || defined(_X86_)18#elif defined(__i386__) || defined(_X86_)
19 unsigned short sw;19 unsigned short sw;
lib/libc/mingw/math/sinhl.c+1-1
...@@ -6,7 +6,7 @@...@@ -6,7 +6,7 @@
6#include "cephes_mconf.h"6#include "cephes_mconf.h"
7#include <errno.h>7#include <errno.h>
88
9#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)9#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
10#include <math.h>10#include <math.h>
1111
12long double sinhl(long double x)12long double sinhl(long double x)
lib/libc/mingw/math/sqrt.def.h+1-1
...@@ -77,7 +77,7 @@ __FLT_ABI (sqrt) (__FLT_TYPE x)...@@ -77,7 +77,7 @@ __FLT_ABI (sqrt) (__FLT_TYPE x)
77#else77#else
78 asm volatile ("fsqrtd %[dst], %[src];\n" : [dst] "=w" (res) : [src] "w" (x));78 asm volatile ("fsqrtd %[dst], %[src];\n" : [dst] "=w" (res) : [src] "w" (x));
79#endif79#endif
80#elif defined(__aarch64__) || defined(_ARM64_)80#elif defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
81#if _NEW_COMPLEX_FLOAT81#if _NEW_COMPLEX_FLOAT
82 asm volatile ("fsqrt %s[dst], %s[src]\n" : [dst] "=w" (res) : [src] "w" (x));82 asm volatile ("fsqrt %s[dst], %s[src]\n" : [dst] "=w" (res) : [src] "w" (x));
83#else83#else
lib/libc/mingw/math/tanhl.c+1-1
...@@ -8,7 +8,7 @@...@@ -8,7 +8,7 @@
8#define _SET_ERRNO(x)8#define _SET_ERRNO(x)
9#endif9#endif
1010
11#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)11#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
12#include <math.h>12#include <math.h>
1313
14long double tanhl(long double x)14long double tanhl(long double x)
lib/libc/mingw/math/tgammal.c+1-1
...@@ -5,7 +5,7 @@...@@ -5,7 +5,7 @@
5 */5 */
6#include "cephes_mconf.h"6#include "cephes_mconf.h"
77
8#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)8#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
9double tgamma(double x);9double tgamma(double x);
1010
11long double tgammal(long double x)11long double tgammal(long double x)
lib/libc/mingw/math/truncl.c+3-4
...@@ -3,21 +3,20 @@...@@ -3,21 +3,20 @@
3 * This file is part of the mingw-w64 runtime package.3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
6#include <fenv.h>6
7#include <math.h>7#include <math.h>
88
9long double9long double
10truncl (long double _x)10truncl (long double _x)
11{11{
12#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)12#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
13 return trunc(_x);13 return trunc(_x);
14#else14#else
15 long double retval = 0.0L;15 long double retval = 0.0L;
16 unsigned short saved_cw;16 unsigned short saved_cw;
17 unsigned short tmp_cw;17 unsigned short tmp_cw;
18 __asm__ __volatile__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */18 __asm__ __volatile__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
19 tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))19 tmp_cw = saved_cw | 0xc00; /* round towards zero */
20 | FE_TOWARDZERO;
21 __asm__ __volatile__ ("fldcw %0;" : : "m" (tmp_cw));20 __asm__ __volatile__ ("fldcw %0;" : : "m" (tmp_cw));
22 __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */21 __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */
23 __asm__ __volatile__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */22 __asm__ __volatile__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
lib/libc/mingw/math/x86/pow.def.h-3
...@@ -69,11 +69,8 @@...@@ -69,11 +69,8 @@
69#include "../complex/complex_internal.h"69#include "../complex/complex_internal.h"
70#include <errno.h>70#include <errno.h>
71#include <limits.h>71#include <limits.h>
72#include <fenv.h>
73#include <math.h>72#include <math.h>
74#include <errno.h>73#include <errno.h>
75#define FE_ROUNDING_MASK \
76 (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
7774
78static __FLT_TYPE75static __FLT_TYPE
79internal_modf (__FLT_TYPE value, __FLT_TYPE *iptr)76internal_modf (__FLT_TYPE value, __FLT_TYPE *iptr)
lib/libc/mingw/misc/dllentrypoint.c deleted-18
...@@ -1,18 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <oscalls.h>
8#define _DECL_DLLMAIN
9#include <process.h>
10
11BOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID);
12
13BOOL WINAPI DllEntryPoint (HANDLE __UNUSED_PARAM(hDllHandle),
14 DWORD __UNUSED_PARAM(dwReason),
15 LPVOID __UNUSED_PARAM(lpreserved))
16{
17 return TRUE;
18}
lib/libc/mingw/misc/feclearexcept.c+7-33
...@@ -4,44 +4,18 @@...@@ -4,44 +4,18 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#include <fenv.h>
8#include <internal.h>7#include <internal.h>
98
10/* 7.6.2.19/* 7.6.2.1
11 The feclearexcept function clears the supported exceptions10 The feclearexcept function clears the supported exceptions
12 represented by its argument. */11 represented by its argument. */
1312
14int feclearexcept (int excepts)13int feclearexcept(int flags)
15{14{
16 fenv_t _env;15 fenv_t env;
17#if defined(_ARM_) || defined(__arm__)16
18 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));17 fegetenv(&env);
19 _env.__cw &= ~(excepts & FE_ALL_EXCEPT);18 flags &= FE_ALL_EXCEPT;
20 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (_env));19 env._Fe_stat &= ~fenv_encode(flags, flags);
21#elif defined(_ARM64_) || defined(__aarch64__)20 return fesetenv(&env);
22 unsigned __int64 fpcr;
23 (void) _env;
24 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
25 fpcr &= ~(excepts & FE_ALL_EXCEPT);
26 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
27#else
28 int _mxcsr;
29 if (excepts == FE_ALL_EXCEPT)
30 {
31 __asm__ volatile ("fnclex");
32 }
33 else
34 {
35 __asm__ volatile ("fnstenv %0" : "=m" (_env));
36 _env.__status_word &= ~(excepts & FE_ALL_EXCEPT);
37 __asm__ volatile ("fldenv %0" : : "m" (_env));
38 }
39 if (__mingw_has_sse ())
40 {
41 __asm__ volatile ("stmxcsr %0" : "=m" (_mxcsr));
42 _mxcsr &= ~(((excepts & FE_ALL_EXCEPT)));
43 __asm__ volatile ("ldmxcsr %0" : : "m" (_mxcsr));
44 }
45#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
46 return (0);
47}21}
lib/libc/mingw/misc/fegetenv.c+11-20
...@@ -4,34 +4,25 @@...@@ -4,34 +4,25 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#include <fenv.h>
8#include <internal.h>7#include <internal.h>
98
10/* 7.6.4.19/* 7.6.4.1
11 The fegetenv function stores the current floating-point environment10 The fegetenv function stores the current floating-point environment
12 in the object pointed to by envp. */11 in the object pointed to by envp. */
1312
14int fegetenv (fenv_t * envp)13int fegetenv(fenv_t *env)
15{14{
16#if defined(_ARM_) || defined(__arm__)15#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
17 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (*envp));16 unsigned int x87, sse;
18#elif defined(_ARM64_) || defined(__aarch64__)17 __mingw_control87_2(0, 0, &x87, &sse);
19 unsigned __int64 fpcr;18 env->_Fe_ctl = fenv_encode(x87, sse);
20 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));19 __mingw_setfp(NULL, 0, &x87, 0);
21 envp->__cw = fpcr;20 __mingw_setfp_sse(NULL, 0, &sse, 0);
21 env->_Fe_stat = fenv_encode(x87, sse);
22#else22#else
23 __asm__ __volatile__ ("fnstenv %0;": "=m" (*envp));23 env->_Fe_ctl = fenv_encode(0, __mingw_controlfp(0, 0));
24 /* fnstenv sets control word to non-stop for all exceptions, so we24 env->_Fe_stat = fenv_encode(0, __mingw_statusfp());
25 need to reload our env to restore the original mask. */25#endif
26 __asm__ __volatile__ ("fldenv %0" : : "m" (*envp));
27 if (__mingw_has_sse ())
28 {
29 int _mxcsr;
30 __asm__ __volatile__ ("stmxcsr %0" : "=m" (_mxcsr));
31 envp->__unused0 = (((unsigned int) _mxcsr) >> 16);
32 envp->__unused1 = (((unsigned int) _mxcsr) & 0xffff);
33 }
34#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
35 return 0;26 return 0;
36}27}
3728
lib/libc/mingw/misc/fegetexceptflag.c+9-20
...@@ -12,26 +12,15 @@...@@ -12,26 +12,15 @@
12 representation of the exception flags indicated by the argument12 representation of the exception flags indicated by the argument
13 excepts in the object pointed to by the argument flagp. */13 excepts in the object pointed to by the argument flagp. */
1414
15int fegetexceptflag (fexcept_t * flagp, int excepts)15int fegetexceptflag(fexcept_t *status, int excepts)
16{16{
17#if defined(_ARM_) || defined(__arm__)17#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
18 fenv_t _env;18 unsigned int x87, sse;
19 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));19 __mingw_setfp(NULL, 0, &x87, 0);
20 *flagp = _env.__cw & excepts & FE_ALL_EXCEPT;20 __mingw_setfp_sse(NULL, 0, &sse, 0);
21#elif defined(_ARM64_) || defined(__aarch64__)21 *status = fenv_encode(x87 & excepts, sse & excepts);
22 unsigned __int64 fpcr;
23 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
24 *flagp = fpcr & excepts & FE_ALL_EXCEPT;
25#else22#else
26 int _mxcsr;23 *status = fenv_encode(0, __mingw_statusfp() & excepts);
27 unsigned short _status;24#endif
2825 return 0;
29 __asm__ volatile ("fnstsw %0" : "=am" (_status));
30 _mxcsr = 0;
31 if (__mingw_has_sse ())
32 __asm__ volatile ("stmxcsr %0" : "=m" (_mxcsr));
33
34 *flagp = (_mxcsr | _status) & excepts & FE_ALL_EXCEPT;
35#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
36 return 0;
37}26}
lib/libc/mingw/misc/fegetround.c+3-16
...@@ -3,26 +3,13 @@...@@ -3,26 +3,13 @@
3 * This file is part of the mingw-w64 runtime package.3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
6#include <fenv.h>6#include <internal.h>
77
8/* 7.6.3.18/* 7.6.3.1
9 The fegetround function returns the value of the rounding direction9 The fegetround function returns the value of the rounding direction
10 macro representing the current rounding direction. */10 macro representing the current rounding direction. */
1111
12int12int fegetround(void)
13fegetround (void)
14{13{
15#if defined(_ARM_) || defined(__arm__)14 return __mingw_controlfp(0, 0) & _MCW_RC;
16 fenv_t _env;
17 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));
18 return (_env.__cw & (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO));
19#elif defined(_ARM64_) || defined(__aarch64__)
20 unsigned __int64 fpcr;
21 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
22 return (fpcr & (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO));
23#else
24 int _control;
25 __asm__ volatile ("fnstcw %0" : "=m" (*&_control));
26 return (_control & (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO));
27#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
28}15}
lib/libc/mingw/misc/feholdexcept.c+3-20
...@@ -11,25 +11,8 @@...@@ -11,25 +11,8 @@
11 flags, and then installs a non-stop (continue on exceptions) mode,11 flags, and then installs a non-stop (continue on exceptions) mode,
12 if available, for all exceptions. */12 if available, for all exceptions. */
1313
14int feholdexcept (fenv_t * envp)14int feholdexcept(fenv_t *env)
15{15{
16#if defined(_ARM_) || defined(__arm__)16 fegetenv(env);
17 fenv_t _env;17 return feclearexcept(FE_ALL_EXCEPT);
18 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));
19 envp->__cw = _env.__cw;
20 _env.__cw &= ~(FE_ALL_EXCEPT);
21 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (_env));
22#elif defined(_ARM64_) || defined(__aarch64__)
23 unsigned __int64 fpcr;
24 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
25 envp->__cw = fpcr;
26 fpcr &= ~(FE_ALL_EXCEPT);
27 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
28#else
29 __asm__ __volatile__ ("fnstenv %0;" : "=m" (* envp)); /* save current into envp */
30 /* fnstenv sets control word to non-stop for all exceptions, so all we
31 need to do is clear the exception flags. */
32 __asm__ __volatile__ ("fnclex");
33#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
34 return 0;
35}18}
lib/libc/mingw/misc/feraiseexcept.c+12-20
...@@ -3,7 +3,7 @@...@@ -3,7 +3,7 @@
3 * This file is part of the mingw-w64 runtime package.3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
6#include <fenv.h> 6#include <internal.h>
77
8/* 7.6.2.38/* 7.6.2.3
9 The feraiseexcept function raises the supported exceptions9 The feraiseexcept function raises the supported exceptions
...@@ -13,24 +13,16 @@...@@ -13,24 +13,16 @@
13 the inexact exception whenever it raises the overflow13 the inexact exception whenever it raises the overflow
14 or underflow exception is implementation-defined. */14 or underflow exception is implementation-defined. */
1515
16int feraiseexcept (int excepts)16int feraiseexcept(int flags)
17{17{
18 fenv_t _env;18 fenv_t env;
19#if defined(_ARM_) || defined(__arm__)19
20 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));20 flags &= FE_ALL_EXCEPT;
21 _env.__cw |= excepts & FE_ALL_EXCEPT;21 fegetenv(&env);
22 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (_env));22 env._Fe_stat |= fenv_encode(flags, flags);
23#elif defined(_ARM64_) || defined(__aarch64__)23 fesetenv(&env);
24 unsigned __int64 fpcr;24#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
25 (void) _env;25 __asm__ volatile ("fwait\n\t");
26 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));26#endif
27 fpcr |= excepts & FE_ALL_EXCEPT;27 return 0;
28 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
29#else
30 __asm__ volatile ("fnstenv %0;" : "=m" (_env));
31 _env.__status_word |= excepts & FE_ALL_EXCEPT;
32 __asm__ volatile ("fldenv %0;"
33 "fwait;" : : "m" (_env));
34#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
35 return 0;
36}28}
lib/libc/mingw/misc/fesetenv.c+35-56
...@@ -4,11 +4,24 @@...@@ -4,11 +4,24 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#include <_mingw.h>
8#include <fenv.h>
9#include <float.h>
10#include <internal.h>7#include <internal.h>
118
9/* The FE_DFL_ENV macro is required by standard.
10 fesetenv will use the environment set at app startup.*/
11const fenv_t __mingw_fe_dfl_env = { 0, 0 };
12
13/* The C99 standard (7.6.9) allows us to define implementation-specific macros for
14 different fp environments */
15#if defined(__i386__) || defined(__x86_64__)
16
17/* The default Intel x87 floating point environment (64-bit mantissa) */
18const fenv_t __mingw_fe_pc64_env = { 0x3f3f003f, 0 };
19
20/* The floating point environment set by MSVCRT _fpreset (53-bit mantissa) */
21const fenv_t __mingw_fe_pc53_env = { 0x3f3f103f, 0 };
22
23#endif
24
12/* 7.6.4.325/* 7.6.4.3
13 The fesetenv function establishes the floating-point environment26 The fesetenv function establishes the floating-point environment
14 represented by the object pointed to by envp. The argument envp27 represented by the object pointed to by envp. The argument envp
...@@ -22,61 +35,27 @@...@@ -22,61 +35,27 @@
22extern void (* __MINGW_IMP_SYMBOL(_fpreset))(void);35extern void (* __MINGW_IMP_SYMBOL(_fpreset))(void);
23extern void _fpreset(void);36extern void _fpreset(void);
2437
25int fesetenv (const fenv_t * envp)38int fesetenv(const fenv_t *env)
26{39{
27#if defined(_ARM_) || defined(__arm__)40 unsigned int x87_cw, cw, x87_stat, stat;
28 if (envp == FE_DFL_ENV)41 unsigned int mask = ~0u;
29 /* Use the choice made at app startup */
30 _fpreset();
31 else
32 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (*envp));
33#elif defined(_ARM64_) || defined(__aarch64__)
34 if (envp == FE_DFL_ENV) {
35 /* Use the choice made at app startup */
36 _fpreset();
37 } else {
38 unsigned __int64 fpcr = envp->__cw;
39 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
40 }
41#else
42 if (envp == FE_PC64_ENV)
43 /*
44 * fninit initializes the control register to 0x37f,
45 * the status register to zero and the tag word to 0FFFFh.
46 * The other registers are unaffected.
47 */
48 __asm__ __volatile__ ("fninit");
4942
50 else if (envp == FE_PC53_ENV)43 if (!env->_Fe_ctl && !env->_Fe_stat) {
51 /*44 _fpreset();
52 * MS _fpreset() does same *except* it sets control word45 return 0;
53 * to 0x27f (53-bit precision).
54 * We force calling _fpreset in msvcrt.dll
55 */
56
57 (* __MINGW_IMP_SYMBOL(_fpreset))();
58
59 else if (envp == FE_DFL_ENV)
60 /* Use the choice made at app startup */
61 _fpreset();
62
63 else
64 {
65 fenv_t env = *envp;
66 int has_sse = __mingw_has_sse ();
67 int _mxcsr;
68 /*_mxcsr = ((int)envp->__unused0 << 16) | (int)envp->__unused1; *//* mxcsr low and high */
69 if (has_sse)
70 __asm__ ("stmxcsr %0" : "=m" (*&_mxcsr));
71 env.__unused0 = 0xffff;
72 env.__unused1 = 0xffff;
73 __asm__ volatile ("fldenv %0" : : "m" (env)
74 : "st", "st(1)", "st(2)", "st(3)", "st(4)",
75 "st(5)", "st(6)", "st(7)");
76 if (has_sse)
77 __asm__ volatile ("ldmxcsr %0" : : "m" (*&_mxcsr));
78 }46 }
7947
80#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */48 if (!fenv_decode(env->_Fe_ctl, &x87_cw, &cw))
81 return 0;49 return 1;
50 if (!fenv_decode(env->_Fe_stat, &x87_stat, &stat))
51 return 1;
52
53#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
54 __mingw_setfp(&x87_cw, mask, &x87_stat, ~0);
55 if (__mingw_has_sse())
56 __mingw_setfp_sse(&cw, mask, &stat, ~0);
57#else
58 __mingw_setfp(&cw, mask, &stat, ~0);
59#endif
60 return 0;
82}61}
lib/libc/mingw/misc/fesetexceptflag.c+9-33
...@@ -4,7 +4,6 @@...@@ -4,7 +4,6 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#include <fenv.h>
8#include <internal.h>7#include <internal.h>
98
10/* 7.6.2.49/* 7.6.2.4
...@@ -16,39 +15,16 @@...@@ -16,39 +15,16 @@
16 represented by the argument excepts. This function does not raise15 represented by the argument excepts. This function does not raise
17 exceptions, but only sets the state of the flags. */16 exceptions, but only sets the state of the flags. */
1817
19int fesetexceptflag (const fexcept_t * flagp, int excepts)18int fesetexceptflag(const fexcept_t *status, int excepts)
20{19{
21 fenv_t _env;20 fenv_t env;
2221
23 excepts &= FE_ALL_EXCEPT;22 excepts &= FE_ALL_EXCEPT;
23 if(!excepts)
24 return 0;
2425
25#if defined(_ARM_) || defined(__arm__)26 fegetenv(&env);
26 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));27 env._Fe_stat &= ~fenv_encode(excepts, excepts);
27 _env.__cw &= ~excepts;28 env._Fe_stat |= *status & fenv_encode(excepts, excepts);
28 _env.__cw |= (*flagp & excepts);29 return fesetenv(&env);
29 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (_env));
30#elif defined(_ARM64_) || defined(__aarch64__)
31 unsigned __int64 fpcr;
32 (void) _env;
33 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
34 fpcr &= ~excepts;
35 fpcr |= (*flagp & excepts);
36 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
37#else
38 __asm__ volatile ("fnstenv %0;" : "=m" (_env));
39 _env.__status_word &= ~excepts;
40 _env.__status_word |= (*flagp & excepts);
41 __asm__ volatile ("fldenv %0;" : : "m" (_env));
42
43 if (__mingw_has_sse ())
44 {
45 int sse_cw;
46 __asm__ volatile ("stmxcsr %0;" : "=m" (sse_cw));
47 sse_cw &= ~(excepts << 7);
48 sse_cw |= ((*flagp & excepts) << 7);
49 __asm__ volatile ("ldmxcsr %0" : : "m" (sse_cw));
50 }
51
52#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
53 return 0;
54}30}
lib/libc/mingw/misc/fesetround.c+5-38
...@@ -13,43 +13,10 @@...@@ -13,43 +13,10 @@
13 to the value of a rounding direction macro, the rounding direction13 to the value of a rounding direction macro, the rounding direction
14 is not changed. */14 is not changed. */
1515
16int fesetround (int mode)16int fesetround(int round_mode)
17{17{
18#if defined(_ARM_) || defined(__arm__)18 if (round_mode & (~_MCW_RC))
19 fenv_t _env;19 return 1;
20 if ((mode & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)) != 0)20 __mingw_controlfp(round_mode, _MCW_RC);
21 return -1;21 return 0;
22 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));
23 _env.__cw &= ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO);
24 _env.__cw |= mode;
25 __asm__ volatile ("fmxr FPSCR, %0" : : "r" (_env));
26#elif defined(_ARM64_) || defined(__aarch64__)
27 unsigned __int64 fpcr;
28 if ((mode & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)) != 0)
29 return -1;
30 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
31 fpcr &= ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO);
32 fpcr |= mode;
33 __asm__ volatile ("msr fpcr, %0" : : "r" (fpcr));
34#else
35 unsigned short _cw;
36 if ((mode & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
37 != 0)
38 return -1;
39 __asm__ volatile ("fnstcw %0;": "=m" (*&_cw));
40 _cw &= ~0xc00;
41 _cw |= mode;
42 __asm__ volatile ("fldcw %0;" : : "m" (*&_cw));
43
44 if (__mingw_has_sse ())
45 {
46 int mxcsr;
47
48 __asm__ volatile ("stmxcsr %0" : "=m" (*&mxcsr));
49 mxcsr &= ~0x6000;
50 mxcsr |= mode << 3;
51 __asm__ volatile ("ldmxcsr %0" : : "m" (*&mxcsr));
52 }
53#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
54 return 0;
55}22}
lib/libc/mingw/misc/fetestexcept.c+2-21
...@@ -15,26 +15,7 @@...@@ -15,26 +15,7 @@
15 exception macros corresponding to the currently set exceptions15 exception macros corresponding to the currently set exceptions
16 included in excepts. */16 included in excepts. */
1717
18int fetestexcept (int excepts)18int fetestexcept(int flags)
19{19{
20#if defined(_ARM_) || defined(__arm__)20 return __mingw_statusfp() & flags;
21 fenv_t _env;
22 __asm__ volatile ("fmrx %0, FPSCR" : "=r" (_env));
23 return _env.__cw & excepts & FE_ALL_EXCEPT;
24#elif defined(_ARM64_) || defined(__aarch64__)
25 unsigned __int64 fpcr;
26 __asm__ volatile ("mrs %0, fpcr" : "=r" (fpcr));
27 return fpcr & excepts & FE_ALL_EXCEPT;
28#else
29 unsigned short _sw;
30 __asm__ __volatile__ ("fnstsw %%ax" : "=a" (_sw));
31
32 if (__mingw_has_sse ())
33 {
34 int sse_sw;
35 __asm__ __volatile__ ("stmxcsr %0;" : "=m" (sse_sw));
36 _sw |= sse_sw;
37 }
38 return _sw & excepts & FE_ALL_EXCEPT;
39#endif /* defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) */
40}21}
lib/libc/mingw/misc/feupdateenv.c+3-7
...@@ -13,13 +13,9 @@...@@ -13,13 +13,9 @@
13 set by a call to feholdexcept or fegetenv, or equal the macro13 set by a call to feholdexcept or fegetenv, or equal the macro
14 FE_DFL_ENV or an implementation-defined environment macro. */14 FE_DFL_ENV or an implementation-defined environment macro. */
1515
16/* FIXME: this works but surely there must be a better way. */16int feupdateenv(const fenv_t *env)
17
18int feupdateenv (const fenv_t * envp)
19{17{
20 unsigned int _fexcept = fetestexcept (FE_ALL_EXCEPT); /*save excepts */18 int except = fetestexcept(FE_ALL_EXCEPT);
21 fesetenv (envp); /* install the env */19 return fesetenv(env) || feraiseexcept(except);
22 feraiseexcept (_fexcept); /* raise the except */
23 return 0;
24}20}
2521
lib/libc/mingw/misc/ftw.c+18-16
...@@ -15,11 +15,9 @@...@@ -15,11 +15,9 @@
15#include <dirent.h>15#include <dirent.h>
16#include <ftw.h>16#include <ftw.h>
1717
18#ifdef IMPL_FTW6418int __cdecl stat32(const char *_Filename, struct _stat32 *_Stat);
19#define stat stat6419int __cdecl stat32i64(const char *_Filename, struct _stat32i64 *_Stat);
20#define nftw nftw6420int __cdecl stat64i32(const char *_Filename, struct _stat64i32 *_Stat);
21#define ftw ftw64
22#endif
2321
24typedef struct dir_data_t {22typedef struct dir_data_t {
25 DIR *h;23 DIR *h;
...@@ -36,14 +34,14 @@ typedef struct ctx_t {...@@ -36,14 +34,14 @@ typedef struct ctx_t {
36 dir_data_t **dirs;34 dir_data_t **dirs;
37 char *buf;35 char *buf;
38 struct FTW ftw;36 struct FTW ftw;
39 int (*fcb) (const char *, const struct stat *, int , struct FTW *);37 int (*fcb) (const char *, const STRUCT_STAT *, int , struct FTW *);
40 size_t cur_dir, msz_dir, buf_sz;38 size_t cur_dir, msz_dir, buf_sz;
41 int flags;39 int flags;
42 dev_t dev;40 dev_t dev;
43} ctx_t;41} ctx_t;
4442
45static int add_object (ctx_t *);43static int add_object (ctx_t *);
46static int do_dir (ctx_t *, struct stat *, dir_data_t *);44static int do_dir (ctx_t *, STRUCT_STAT *, dir_data_t *);
47static int do_entity (ctx_t *, dir_data_t *, const char *, size_t);45static int do_entity (ctx_t *, dir_data_t *, const char *, size_t);
48static int do_it (const char *, int, void *, int, int);46static int do_it (const char *, int, void *, int, int);
4947
...@@ -225,7 +223,7 @@ open_directory (ctx_t *ctx, dir_data_t *dirp)...@@ -225,7 +223,7 @@ open_directory (ctx_t *ctx, dir_data_t *dirp)
225static int223static int
226do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)224do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)
227{225{
228 struct stat st;226 STRUCT_STAT st;
229 char *h;227 char *h;
230 size_t cnt_sz;228 size_t cnt_sz;
231 int ret = 0, flag = 0;229 int ret = 0, flag = 0;
...@@ -249,7 +247,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)...@@ -249,7 +247,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)
249247
250 name = ctx->buf;248 name = ctx->buf;
251249
252 if (stat (name, &st) < 0)250 if (FUNC_STAT (name, &st) < 0)
253 {251 {
254 if (errno != EACCES && errno != ENOENT)252 if (errno != EACCES && errno != ENOENT)
255 ret = -1;253 ret = -1;
...@@ -257,7 +255,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)...@@ -257,7 +255,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)
257 flag = FTW_NS;255 flag = FTW_NS;
258256
259 if (!(ctx->flags & FTW_PHYS))257 if (!(ctx->flags & FTW_PHYS))
260 stat (name, &st);258 FUNC_STAT (name, &st);
261 }259 }
262 else260 else
263 flag = (S_ISDIR (st.st_mode) ? FTW_D : FTW_F);261 flag = (S_ISDIR (st.st_mode) ? FTW_D : FTW_F);
...@@ -281,7 +279,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)...@@ -281,7 +279,7 @@ do_entity (ctx_t *ctx, dir_data_t *dir, const char *name, size_t namlen)
281279
282280
283static int281static int
284do_dir (ctx_t *ctx, struct stat *st, __UNUSED_PARAM(dir_data_t *old_dir))282do_dir (ctx_t *ctx, STRUCT_STAT *st, __UNUSED_PARAM(dir_data_t *old_dir))
285{283{
286 dir_data_t dir;284 dir_data_t dir;
287 struct dirent *d;285 struct dirent *d;
...@@ -378,7 +376,7 @@ static int...@@ -378,7 +376,7 @@ static int
378do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors, int flags)376do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors, int flags)
379{377{
380 struct ctx_t ctx;378 struct ctx_t ctx;
381 struct stat st;379 STRUCT_STAT st;
382 int ret = 0;380 int ret = 0;
383 int sv_e;381 int sv_e;
384 char *cp;382 char *cp;
...@@ -417,12 +415,12 @@ do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors,...@@ -417,12 +415,12 @@ do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors,
417 ctx.ftw.level = 0;415 ctx.ftw.level = 0;
418 ctx.ftw.base = cp - ctx.buf;416 ctx.ftw.base = cp - ctx.buf;
419 ctx.flags = flags;417 ctx.flags = flags;
420 ctx.fcb = (int (*) (const char *, const struct stat *, int , struct FTW *)) fcb;418 ctx.fcb = (int (*) (const char *, const STRUCT_STAT *, int , struct FTW *)) fcb;
421 ctx.objs = NULL;419 ctx.objs = NULL;
422420
423 if (!ret)421 if (!ret)
424 {422 {
425 if (stat (ctx.buf, &st) < 0)423 if (FUNC_STAT (ctx.buf, &st) < 0)
426 ret = -1;424 ret = -1;
427 else if (S_ISDIR (st.st_mode))425 else if (S_ISDIR (st.st_mode))
428 {426 {
...@@ -451,13 +449,17 @@ do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors,...@@ -451,13 +449,17 @@ do_it (const char *dir, __UNUSED_PARAM(int is_nftw), void *fcb, int descriptors,
451}449}
452450
453int451int
454ftw (const char *path, int (*fcb) (const char *, const struct stat *, int), int descriptors)452FUNC_FTW (const char *path, int (*fcb) (const char *, const STRUCT_STAT *, int), int descriptors);
453int
454FUNC_FTW (const char *path, int (*fcb) (const char *, const STRUCT_STAT *, int), int descriptors)
455{455{
456 return do_it (path, 0, fcb, descriptors, 0);456 return do_it (path, 0, fcb, descriptors, 0);
457}457}
458458
459int459int
460nftw (const char *path, int (*fcb) (const char *, const struct stat *, int , struct FTW *), int descriptors, int flags)460FUNC_NFTW (const char *path, int (*fcb) (const char *, const STRUCT_STAT *, int , struct FTW *), int descriptors, int flags);
461int
462FUNC_NFTW (const char *path, int (*fcb) (const char *, const STRUCT_STAT *, int , struct FTW *), int descriptors, int flags)
461{463{
462 return do_it (path, 1, fcb, descriptors, flags);464 return do_it (path, 1, fcb, descriptors, flags);
463}465}
lib/libc/mingw/misc/ftw32.c created+19
...@@ -0,0 +1,19 @@
1/**
2 * This file is part of the mingw-w64 runtime package.
3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */
5
6#define FUNC_FTW ftw32
7#define FUNC_NFTW nftw32
8#define FUNC_STAT stat32
9#define STRUCT_STAT struct _stat32
10#include "ftw.c"
11
12/* On 32-bit systems is stat ABI compatible with stat32 */
13#ifndef _WIN64
14#undef nftw
15#undef ftw
16struct stat;
17int __attribute__ ((alias ("nftw32"))) __cdecl nftw(const char *, int (*) (const char *, const struct stat *, int, struct FTW *), int, int);
18int __attribute__ ((alias ("ftw32"))) __cdecl ftw(const char *, int (*) (const char *, const struct stat *, int), int);
19#endif
lib/libc/mingw/misc/ftw32i64.c created+10
...@@ -0,0 +1,10 @@
1/**
2 * This file is part of the mingw-w64 runtime package.
3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */
5
6#define FUNC_FTW ftw32i64
7#define FUNC_NFTW nftw32i64
8#define FUNC_STAT stat32i64
9#define STRUCT_STAT struct _stat32i64
10#include "ftw.c"
lib/libc/mingw/misc/ftw64.c+4-2
...@@ -3,6 +3,8 @@...@@ -3,6 +3,8 @@
3 * No warranty is given; refer to the file DISCLAIMER within this package.3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */4 */
55
6#define IMPL_FTW64 16#define FUNC_FTW ftw64
77#define FUNC_NFTW nftw64
8#define FUNC_STAT stat64
9#define STRUCT_STAT struct stat64
8#include "ftw.c"10#include "ftw.c"
lib/libc/mingw/misc/ftw64i32.c created+19
...@@ -0,0 +1,19 @@
1/**
2 * This file is part of the mingw-w64 runtime package.
3 * No warranty is given; refer to the file DISCLAIMER within this package.
4 */
5
6#define FUNC_FTW ftw64i32
7#define FUNC_NFTW nftw64i32
8#define FUNC_STAT stat64i32
9#define STRUCT_STAT struct _stat64i32
10#include "ftw.c"
11
12/* On 64-bit systems is stat ABI compatible with stat64i32 */
13#ifdef _WIN64
14#undef nftw
15#undef ftw
16struct stat;
17int __attribute__ ((alias ("nftw64i32"))) __cdecl nftw(const char *, int (*) (const char *, const struct stat *, int, struct FTW *), int, int);
18int __attribute__ ((alias ("ftw64i32"))) __cdecl ftw(const char *, int (*) (const char *, const struct stat *, int), int);
19#endif
lib/libc/mingw/misc/mingw-aligned-malloc.c+33-7
...@@ -18,16 +18,14 @@...@@ -18,16 +18,14 @@
18#include <stdint.h> /* uintptr_t */18#include <stdint.h> /* uintptr_t */
19#include <string.h> /* memmove */19#include <string.h> /* memmove */
2020
21/* Forward declarations: */
22void *__mingw_aligned_offset_malloc (size_t, size_t, size_t);
23
24#define NOT_POWER_OF_TWO(n) (((n) & ((n) - 1)))21#define NOT_POWER_OF_TWO(n) (((n) & ((n) - 1)))
25#define UI(p) ((uintptr_t) (p))22#define UI(p) ((uintptr_t) (p))
26#define CP(p) ((char *) p)23#define CP(p) ((char *) p)
2724
25#define GAP(offset) ((0 - offset) & (sizeof (void *) -1))
28#define PTR_ALIGN(p0, alignment, offset) \26#define PTR_ALIGN(p0, alignment, offset) \
29 ((void *) (((UI(p0) + (alignment + sizeof(void*)) + offset) \27 ((void *) (((UI(p0) + (alignment + GAP(offset) + sizeof(void*)) + offset) \
30 & (~UI(alignment - 1))) \28 & (~UI(alignment))) \
31 - offset))29 - offset))
3230
33/* Pointer must sometimes be aligned; assume sizeof(void*) is a power of two. */31/* Pointer must sometimes be aligned; assume sizeof(void*) is a power of two. */
...@@ -47,12 +45,13 @@ __mingw_aligned_offset_malloc (size_t size, size_t alignment, size_t offset)...@@ -47,12 +45,13 @@ __mingw_aligned_offset_malloc (size_t size, size_t alignment, size_t offset)
47 return ((void *) 0);45 return ((void *) 0);
48 if (alignment < sizeof (void *))46 if (alignment < sizeof (void *))
49 alignment = sizeof (void *);47 alignment = sizeof (void *);
48 alignment--;
5049
51 /* Including the extra sizeof(void*) is overkill on a 32-bit50 /* Including the extra sizeof(void*) is overkill on a 32-bit
52 machine, since malloc is already 8-byte aligned, as long51 machine, since malloc is already 8-byte aligned, as long
53 as we enforce alignment >= 8 ...but oh well. */52 as we enforce alignment >= 8 ...but oh well. */
5453
55 p0 = malloc (size + (alignment + sizeof (void *)));54 p0 = malloc (size + (alignment + GAP (offset) + sizeof (void *)));
56 if (!p0)55 if (!p0)
57 return ((void *) 0);56 return ((void *) 0);
58 p = PTR_ALIGN (p0, alignment, offset);57 p = PTR_ALIGN (p0, alignment, offset);
...@@ -91,6 +90,7 @@ __mingw_aligned_offset_realloc (void *memblock, size_t size,...@@ -91,6 +90,7 @@ __mingw_aligned_offset_realloc (void *memblock, size_t size,
91 }90 }
92 if (alignment < sizeof (void *))91 if (alignment < sizeof (void *))
93 alignment = sizeof (void *);92 alignment = sizeof (void *);
93 alignment--;
9494
95 p0 = ORIG_PTR (memblock);95 p0 = ORIG_PTR (memblock);
96 /* It is an error for the alignment to change. */96 /* It is an error for the alignment to change. */
...@@ -98,7 +98,7 @@ __mingw_aligned_offset_realloc (void *memblock, size_t size,...@@ -98,7 +98,7 @@ __mingw_aligned_offset_realloc (void *memblock, size_t size,
98 goto bad;98 goto bad;
99 shift = CP (memblock) - CP (p0);99 shift = CP (memblock) - CP (p0);
100100
101 p0 = realloc (p0, size + (alignment + sizeof (void *)));101 p0 = realloc (p0, size + (alignment + GAP (offset) + sizeof (void *)));
102 if (!p0)102 if (!p0)
103 return ((void *) 0);103 return ((void *) 0);
104 p = PTR_ALIGN (p0, alignment, offset);104 p = PTR_ALIGN (p0, alignment, offset);
...@@ -121,3 +121,29 @@ __mingw_aligned_realloc (void *memblock, size_t size, size_t alignment)...@@ -121,3 +121,29 @@ __mingw_aligned_realloc (void *memblock, size_t size, size_t alignment)
121{121{
122 return __mingw_aligned_offset_realloc (memblock, size, alignment, 0);122 return __mingw_aligned_offset_realloc (memblock, size, alignment, 0);
123}123}
124
125size_t
126__mingw_aligned_msize (void *memblock, size_t alignment, size_t offset)
127{
128 void *p0;
129
130 if (!memblock || NOT_POWER_OF_TWO (alignment))
131 {
132 errno = EINVAL;
133 return (size_t)-1;
134 }
135 if (alignment < sizeof (void *))
136 alignment = sizeof (void *);
137 alignment--;
138
139 p0 = ORIG_PTR (memblock);
140
141 /* It is an error if the alignment or offset does not match. */
142 if (memblock != PTR_ALIGN (p0, alignment, offset))
143 {
144 errno = EINVAL;
145 return (size_t)-1;
146 }
147
148 return _msize (p0) - (alignment + GAP (offset) + sizeof (void *));
149}
lib/libc/mingw/misc/mingw_controlfp.c created+53
...@@ -0,0 +1,53 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include "internal.h"
8
9#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
10/* Internal MinGW version of _control87_2 */
11int __mingw_control87_2( unsigned int newval, unsigned int mask,
12 unsigned int *x86_cw, unsigned int *sse2_cw )
13{
14 if (x86_cw)
15 {
16 *x86_cw = newval;
17 __mingw_setfp(x86_cw, mask, NULL, 0);
18 }
19
20 if (!sse2_cw) return 1;
21
22 if (__mingw_has_sse())
23 {
24 *sse2_cw = newval;
25 __mingw_setfp_sse(sse2_cw, mask, NULL, 0);
26 }
27 else *sse2_cw = 0;
28
29 return 1;
30}
31#endif
32
33/* Internal MinGW version of _control87 */
34unsigned int __mingw_controlfp(unsigned int newval, unsigned int mask)
35{
36 unsigned int flags = 0;
37#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__))
38 unsigned int sse2_cw;
39
40 __mingw_control87_2( newval, mask, &flags, &sse2_cw );
41
42 if (__mingw_has_sse())
43 {
44 if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS;
45 flags |= sse2_cw;
46 }
47#else
48 flags = newval;
49 __mingw_setfp(&flags, mask, NULL, 0);
50#endif
51 return flags;
52}
53
lib/libc/mingw/misc/mingw_getsp.S+4-4
...@@ -15,7 +15,10 @@...@@ -15,7 +15,10 @@
15 .globl __MINGW_USYMBOL(mingw_getsp)15 .globl __MINGW_USYMBOL(mingw_getsp)
16 .def __MINGW_USYMBOL(mingw_getsp); .scl 2; .type 32; .endef16 .def __MINGW_USYMBOL(mingw_getsp); .scl 2; .type 32; .endef
17__MINGW_USYMBOL(mingw_getsp):17__MINGW_USYMBOL(mingw_getsp):
18#if defined(_AMD64_) || defined(__x86_64__)18#if defined(_ARM64_) || defined(__aarch64__) || defined(__arm64ec__)
19 mov x0, sp
20 ret
21#elif defined(_AMD64_) || defined(__x86_64__)
19 leaq 8(%rsp),%rax22 leaq 8(%rsp),%rax
20 ret23 ret
21#elif defined(_X86_) || defined(__i386__)24#elif defined(_X86_) || defined(__i386__)
...@@ -24,7 +27,4 @@ __MINGW_USYMBOL(mingw_getsp):...@@ -24,7 +27,4 @@ __MINGW_USYMBOL(mingw_getsp):
24#elif defined(_ARM_) || defined(__arm__)27#elif defined(_ARM_) || defined(__arm__)
25 mov r0, sp28 mov r0, sp
26 bx lr29 bx lr
27#elif defined(_ARM64_) || defined(__aarch64__)
28 mov x0, sp
29 ret
30#endif30#endif
lib/libc/mingw/misc/mingw_setfp.c created+373
...@@ -0,0 +1,373 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include "internal.h"
8
9#if defined(__i386__) || defined(__x86_64__)
10
11static unsigned int get_mxcsr(void)
12{
13 unsigned int ret;
14#ifdef __arm64ec__
15 extern NTSTATUS (*__os_arm64x_get_x64_information)(ULONG,void*,void*);
16 __os_arm64x_get_x64_information( 0, &ret, NULL );
17#else
18 __asm__ __volatile__( "stmxcsr %0" : "=m" (ret) );
19#endif
20 return ret;
21}
22
23static void set_mxcsr( unsigned int val )
24{
25#ifdef __arm64ec__
26 extern NTSTATUS (*__os_arm64x_set_x64_information)(ULONG,ULONG_PTR,void*);
27 __os_arm64x_set_x64_information( 0, val, NULL );
28#else
29 __asm__ __volatile__( "ldmxcsr %0" : : "m" (val) );
30#endif
31}
32
33void __mingw_setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask )
34{
35 unsigned int old_fpword, fpword = get_mxcsr();
36 unsigned int flags;
37
38 old_fpword = fpword;
39
40 cw_mask &= _MCW_EM | _MCW_RC | _MCW_DN;
41 sw_mask &= _MCW_EM;
42
43 if (sw)
44 {
45 flags = 0;
46 if (fpword & 0x1) flags |= _SW_INVALID;
47 if (fpword & 0x2) flags |= _SW_DENORMAL;
48 if (fpword & 0x4) flags |= _SW_ZERODIVIDE;
49 if (fpword & 0x8) flags |= _SW_OVERFLOW;
50 if (fpword & 0x10) flags |= _SW_UNDERFLOW;
51 if (fpword & 0x20) flags |= _SW_INEXACT;
52
53 *sw = (flags & ~sw_mask) | (*sw & sw_mask);
54 fpword &= ~0x3f;
55 if (*sw & _SW_INVALID) fpword |= 0x1;
56 if (*sw & _SW_DENORMAL) fpword |= 0x2;
57 if (*sw & _SW_ZERODIVIDE) fpword |= 0x4;
58 if (*sw & _SW_OVERFLOW) fpword |= 0x8;
59 if (*sw & _SW_UNDERFLOW) fpword |= 0x10;
60 if (*sw & _SW_INEXACT) fpword |= 0x20;
61 *sw = flags;
62 }
63
64 if (cw)
65 {
66 flags = 0;
67 if (fpword & 0x80) flags |= _EM_INVALID;
68 if (fpword & 0x100) flags |= _EM_DENORMAL;
69 if (fpword & 0x200) flags |= _EM_ZERODIVIDE;
70 if (fpword & 0x400) flags |= _EM_OVERFLOW;
71 if (fpword & 0x800) flags |= _EM_UNDERFLOW;
72 if (fpword & 0x1000) flags |= _EM_INEXACT;
73 switch (fpword & 0x6000)
74 {
75 case 0x6000: flags |= _RC_UP|_RC_DOWN; break;
76 case 0x4000: flags |= _RC_UP; break;
77 case 0x2000: flags |= _RC_DOWN; break;
78 }
79 switch (fpword & 0x8040)
80 {
81 case 0x0040: flags |= _DN_FLUSH_OPERANDS_SAVE_RESULTS; break;
82 case 0x8000: flags |= _DN_SAVE_OPERANDS_FLUSH_RESULTS; break;
83 case 0x8040: flags |= _DN_FLUSH; break;
84 }
85
86 *cw = (flags & ~cw_mask) | (*cw & cw_mask);
87 fpword &= ~0xffc0;
88 if (*cw & _EM_INVALID) fpword |= 0x80;
89 if (*cw & _EM_DENORMAL) fpword |= 0x100;
90 if (*cw & _EM_ZERODIVIDE) fpword |= 0x200;
91 if (*cw & _EM_OVERFLOW) fpword |= 0x400;
92 if (*cw & _EM_UNDERFLOW) fpword |= 0x800;
93 if (*cw & _EM_INEXACT) fpword |= 0x1000;
94 switch (*cw & _MCW_RC)
95 {
96 case _RC_UP|_RC_DOWN: fpword |= 0x6000; break;
97 case _RC_UP: fpword |= 0x4000; break;
98 case _RC_DOWN: fpword |= 0x2000; break;
99 }
100 switch (*cw & _MCW_DN)
101 {
102 case _DN_FLUSH_OPERANDS_SAVE_RESULTS: fpword |= 0x0040; break;
103 case _DN_SAVE_OPERANDS_FLUSH_RESULTS: fpword |= 0x8000; break;
104 case _DN_FLUSH: fpword |= 0x8040; break;
105 }
106
107 /* clear status word if anything changes */
108 if (fpword != old_fpword && !sw) fpword &= ~0x3f;
109 }
110
111 if (fpword != old_fpword) set_mxcsr( fpword );
112}
113#endif
114
115void __mingw_setfp( unsigned int *cw, unsigned int cw_mask,
116 unsigned int *sw, unsigned int sw_mask )
117{
118#if defined(__arm64ec__)
119 __mingw_setfp_sse(cw, cw_mask, sw, sw_mask);
120#elif defined(__i386__) || defined(__x86_64__)
121 unsigned long oldcw = 0, newcw = 0;
122 unsigned long oldsw = 0, newsw = 0;
123 unsigned int flags;
124
125 cw_mask &= _MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC;
126 sw_mask &= _MCW_EM;
127
128 if (sw)
129 {
130 __asm__ __volatile__( "fstsw %0" : "=m" (newsw) );
131 oldsw = newsw;
132
133 flags = 0;
134 if (newsw & 0x1) flags |= _SW_INVALID;
135 if (newsw & 0x2) flags |= _SW_DENORMAL;
136 if (newsw & 0x4) flags |= _SW_ZERODIVIDE;
137 if (newsw & 0x8) flags |= _SW_OVERFLOW;
138 if (newsw & 0x10) flags |= _SW_UNDERFLOW;
139 if (newsw & 0x20) flags |= _SW_INEXACT;
140
141 *sw = (flags & ~sw_mask) | (*sw & sw_mask);
142 newsw &= ~0x3f;
143 if (*sw & _SW_INVALID) newsw |= 0x1;
144 if (*sw & _SW_DENORMAL) newsw |= 0x2;
145 if (*sw & _SW_ZERODIVIDE) newsw |= 0x4;
146 if (*sw & _SW_OVERFLOW) newsw |= 0x8;
147 if (*sw & _SW_UNDERFLOW) newsw |= 0x10;
148 if (*sw & _SW_INEXACT) newsw |= 0x20;
149 *sw = flags;
150 }
151
152 if (cw)
153 {
154 __asm__ __volatile__( "fstcw %0" : "=m" (newcw) );
155 oldcw = newcw;
156
157 flags = 0;
158 if (newcw & 0x1) flags |= _EM_INVALID;
159 if (newcw & 0x2) flags |= _EM_DENORMAL;
160 if (newcw & 0x4) flags |= _EM_ZERODIVIDE;
161 if (newcw & 0x8) flags |= _EM_OVERFLOW;
162 if (newcw & 0x10) flags |= _EM_UNDERFLOW;
163 if (newcw & 0x20) flags |= _EM_INEXACT;
164 switch (newcw & 0xc00)
165 {
166 case 0xc00: flags |= _RC_UP|_RC_DOWN; break;
167 case 0x800: flags |= _RC_UP; break;
168 case 0x400: flags |= _RC_DOWN; break;
169 }
170 switch (newcw & 0x300)
171 {
172 case 0x0: flags |= _PC_24; break;
173 case 0x200: flags |= _PC_53; break;
174 case 0x300: flags |= _PC_64; break;
175 }
176 if (newcw & 0x1000) flags |= _IC_AFFINE;
177
178 *cw = (flags & ~cw_mask) | (*cw & cw_mask);
179 newcw &= ~0x1f3f;
180 if (*cw & _EM_INVALID) newcw |= 0x1;
181 if (*cw & _EM_DENORMAL) newcw |= 0x2;
182 if (*cw & _EM_ZERODIVIDE) newcw |= 0x4;
183 if (*cw & _EM_OVERFLOW) newcw |= 0x8;
184 if (*cw & _EM_UNDERFLOW) newcw |= 0x10;
185 if (*cw & _EM_INEXACT) newcw |= 0x20;
186 switch (*cw & _MCW_RC)
187 {
188 case _RC_UP|_RC_DOWN: newcw |= 0xc00; break;
189 case _RC_UP: newcw |= 0x800; break;
190 case _RC_DOWN: newcw |= 0x400; break;
191 }
192 switch (*cw & _MCW_PC)
193 {
194 case _PC_64: newcw |= 0x300; break;
195 case _PC_53: newcw |= 0x200; break;
196 case _PC_24: newcw |= 0x0; break;
197 }
198 if (*cw & _IC_AFFINE) newcw |= 0x1000;
199 }
200
201 if (oldsw != newsw && (newsw & 0x3f))
202 {
203 struct {
204 WORD control_word;
205 WORD unused1;
206 WORD status_word;
207 WORD unused2;
208 WORD tag_word;
209 WORD unused3;
210 DWORD instruction_pointer;
211 WORD code_segment;
212 WORD unused4;
213 DWORD operand_addr;
214 WORD data_segment;
215 WORD unused5;
216 } fenv;
217
218 __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) );
219 fenv.control_word = newcw;
220 fenv.status_word = newsw;
221 __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)",
222 "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" );
223 return;
224 }
225
226 if (oldsw != newsw)
227 __asm__ __volatile__( "fnclex" );
228 if (oldcw != newcw)
229 __asm__ __volatile__( "fldcw %0" : : "m" (newcw) );
230#elif defined(__aarch64__)
231 ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0;
232 unsigned int flags;
233
234 cw_mask &= _MCW_EM | _MCW_RC;
235 sw_mask &= _MCW_EM;
236
237 if (sw)
238 {
239 __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) );
240 old_fpsr = fpsr;
241
242 flags = 0;
243 if (fpsr & 0x1) flags |= _SW_INVALID;
244 if (fpsr & 0x2) flags |= _SW_ZERODIVIDE;
245 if (fpsr & 0x4) flags |= _SW_OVERFLOW;
246 if (fpsr & 0x8) flags |= _SW_UNDERFLOW;
247 if (fpsr & 0x10) flags |= _SW_INEXACT;
248 if (fpsr & 0x80) flags |= _SW_DENORMAL;
249
250 *sw = (flags & ~sw_mask) | (*sw & sw_mask);
251 fpsr &= ~0x9f;
252 if (*sw & _SW_INVALID) fpsr |= 0x1;
253 if (*sw & _SW_ZERODIVIDE) fpsr |= 0x2;
254 if (*sw & _SW_OVERFLOW) fpsr |= 0x4;
255 if (*sw & _SW_UNDERFLOW) fpsr |= 0x8;
256 if (*sw & _SW_INEXACT) fpsr |= 0x10;
257 if (*sw & _SW_DENORMAL) fpsr |= 0x80;
258 *sw = flags;
259 }
260
261 if (cw)
262 {
263 __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) );
264 old_fpcr = fpcr;
265
266 flags = 0;
267 if (!(fpcr & 0x100)) flags |= _EM_INVALID;
268 if (!(fpcr & 0x200)) flags |= _EM_ZERODIVIDE;
269 if (!(fpcr & 0x400)) flags |= _EM_OVERFLOW;
270 if (!(fpcr & 0x800)) flags |= _EM_UNDERFLOW;
271 if (!(fpcr & 0x1000)) flags |= _EM_INEXACT;
272 if (!(fpcr & 0x8000)) flags |= _EM_DENORMAL;
273 switch (fpcr & 0xc00000)
274 {
275 case 0x400000: flags |= _RC_UP; break;
276 case 0x800000: flags |= _RC_DOWN; break;
277 case 0xc00000: flags |= _RC_CHOP; break;
278 }
279
280 *cw = (flags & ~cw_mask) | (*cw & cw_mask);
281 fpcr &= ~0xc09f00ul;
282 if (!(*cw & _EM_INVALID)) fpcr |= 0x100;
283 if (!(*cw & _EM_ZERODIVIDE)) fpcr |= 0x200;
284 if (!(*cw & _EM_OVERFLOW)) fpcr |= 0x400;
285 if (!(*cw & _EM_UNDERFLOW)) fpcr |= 0x800;
286 if (!(*cw & _EM_INEXACT)) fpcr |= 0x1000;
287 if (!(*cw & _EM_DENORMAL)) fpcr |= 0x8000;
288 switch (*cw & _MCW_RC)
289 {
290 case _RC_CHOP: fpcr |= 0xc00000; break;
291 case _RC_UP: fpcr |= 0x400000; break;
292 case _RC_DOWN: fpcr |= 0x800000; break;
293 }
294 }
295
296 /* mask exceptions if needed */
297 if (old_fpcr != fpcr && ~(old_fpcr >> 8) & fpsr & 0x9f != fpsr & 0x9f)
298 {
299 ULONG_PTR mask = fpcr & ~0x9f00;
300 __asm__ __volatile__( "msr fpcr, %0" :: "r" (mask) );
301 }
302
303 if (old_fpsr != fpsr)
304 __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) );
305 if (old_fpcr != fpcr)
306 __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) );
307#elif defined(__arm__)
308 DWORD old_fpscr, fpscr;
309 unsigned int flags;
310
311 __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) );
312 old_fpscr = fpscr;
313
314 cw_mask &= _MCW_EM | _MCW_RC;
315 sw_mask &= _MCW_EM;
316
317 if (sw)
318 {
319 flags = 0;
320 if (fpscr & 0x1) flags |= _SW_INVALID;
321 if (fpscr & 0x2) flags |= _SW_ZERODIVIDE;
322 if (fpscr & 0x4) flags |= _SW_OVERFLOW;
323 if (fpscr & 0x8) flags |= _SW_UNDERFLOW;
324 if (fpscr & 0x10) flags |= _SW_INEXACT;
325 if (fpscr & 0x80) flags |= _SW_DENORMAL;
326
327 *sw = (flags & ~sw_mask) | (*sw & sw_mask);
328 fpscr &= ~0x9f;
329 if (*sw & _SW_INVALID) fpscr |= 0x1;
330 if (*sw & _SW_ZERODIVIDE) fpscr |= 0x2;
331 if (*sw & _SW_OVERFLOW) fpscr |= 0x4;
332 if (*sw & _SW_UNDERFLOW) fpscr |= 0x8;
333 if (*sw & _SW_INEXACT) fpscr |= 0x10;
334 if (*sw & _SW_DENORMAL) fpscr |= 0x80;
335 *sw = flags;
336 }
337
338 if (cw)
339 {
340 flags = 0;
341 if (!(fpscr & 0x100)) flags |= _EM_INVALID;
342 if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE;
343 if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW;
344 if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW;
345 if (!(fpscr & 0x1000)) flags |= _EM_INEXACT;
346 if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL;
347 switch (fpscr & 0xc00000)
348 {
349 case 0x400000: flags |= _RC_UP; break;
350 case 0x800000: flags |= _RC_DOWN; break;
351 case 0xc00000: flags |= _RC_CHOP; break;
352 }
353
354 *cw = (flags & ~cw_mask) | (*cw & cw_mask);
355 fpscr &= ~0xc09f00ul;
356 if (!(*cw & _EM_INVALID)) fpscr |= 0x100;
357 if (!(*cw & _EM_ZERODIVIDE)) fpscr |= 0x200;
358 if (!(*cw & _EM_OVERFLOW)) fpscr |= 0x400;
359 if (!(*cw & _EM_UNDERFLOW)) fpscr |= 0x800;
360 if (!(*cw & _EM_INEXACT)) fpscr |= 0x1000;
361 if (!(*cw & _EM_DENORMAL)) fpscr |= 0x8000;
362 switch (*cw & _MCW_RC)
363 {
364 case _RC_CHOP: fpscr |= 0xc00000; break;
365 case _RC_UP: fpscr |= 0x400000; break;
366 case _RC_DOWN: fpscr |= 0x800000; break;
367 }
368 }
369
370 if (old_fpscr != fpscr)
371 __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) );
372#endif
373}
lib/libc/mingw/misc/setjmp.S+2
...@@ -6,6 +6,7 @@...@@ -6,6 +6,7 @@
66
7#include <_mingw_mac.h>7#include <_mingw_mac.h>
88
9#ifndef __arm64ec__
9 .globl __MINGW_USYMBOL(__intrinsic_setjmp)10 .globl __MINGW_USYMBOL(__intrinsic_setjmp)
10 .def __MINGW_USYMBOL(__intrinsic_setjmp); .scl 2; .type 32; .endef11 .def __MINGW_USYMBOL(__intrinsic_setjmp); .scl 2; .type 32; .endef
1112
...@@ -115,3 +116,4 @@ __MINGW_USYMBOL(__intrinsic_setjmpex):...@@ -115,3 +116,4 @@ __MINGW_USYMBOL(__intrinsic_setjmpex):
115 mov x0, #0116 mov x0, #0
116 ret117 ret
117#endif118#endif
119#endif /* __arm64ec__ */
lib/libc/mingw/misc/ucrt_tzset.c-3
...@@ -40,6 +40,3 @@ void __cdecl tzset(void)...@@ -40,6 +40,3 @@ void __cdecl tzset(void)
40{40{
41 _tzset();41 _tzset();
42}42}
43
44// Dummy/unused __imp_ wrappers, to make GNU ld not autoexport these symbols.
45void __cdecl (*__MINGW_IMP_SYMBOL(tzset))(void) = tzset;
lib/libc/mingw/misc/winbs_uint64.c+1-34
...@@ -2,38 +2,5 @@ unsigned long long __cdecl _byteswap_uint64(unsigned long long _Int64);...@@ -2,38 +2,5 @@ unsigned long long __cdecl _byteswap_uint64(unsigned long long _Int64);
22
3unsigned long long __cdecl _byteswap_uint64(unsigned long long _Int64)3unsigned long long __cdecl _byteswap_uint64(unsigned long long _Int64)
4{4{
5#if defined(_AMD64_) || defined(__x86_64__)5 return __builtin_bswap64(_Int64);
6 unsigned long long retval;
7 __asm__ __volatile__ ("bswapq %[retval]" : [retval] "=rm" (retval) : "[retval]" (_Int64));
8 return retval;
9#elif defined(_X86_) || defined(__i386__)
10 union {
11 long long int64part;
12 struct {
13 unsigned long lowpart;
14 unsigned long hipart;
15 };
16 } retval;
17 retval.int64part = _Int64;
18 __asm__ __volatile__ ("bswapl %[lowpart]\n"
19 "bswapl %[hipart]\n"
20 : [lowpart] "=rm" (retval.hipart), [hipart] "=rm" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart));
21 return retval.int64part;
22#else
23 unsigned char *b = (void*)&_Int64;
24 unsigned char tmp;
25 tmp = b[0];
26 b[0] = b[7];
27 b[7] = tmp;
28 tmp = b[1];
29 b[1] = b[6];
30 b[6] = tmp;
31 tmp = b[2];
32 b[2] = b[5];
33 b[5] = tmp;
34 tmp = b[3];
35 b[3] = b[4];
36 b[4] = tmp;
37 return _Int64;
38#endif
39}6}
lib/libc/mingw/misc/winbs_ulong.c+1-15
...@@ -2,19 +2,5 @@ unsigned long __cdecl _byteswap_ulong (unsigned long _Long);...@@ -2,19 +2,5 @@ unsigned long __cdecl _byteswap_ulong (unsigned long _Long);
22
3unsigned long __cdecl _byteswap_ulong (unsigned long _Long)3unsigned long __cdecl _byteswap_ulong (unsigned long _Long)
4{4{
5#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)5 return __builtin_bswap32(_Long);
6 unsigned long retval;
7 __asm__ __volatile__ ("bswapl %[retval]" : [retval] "=rm" (retval) : "[retval]" (_Long));
8 return retval;
9#else
10 unsigned char *b = (void*)&_Long;
11 unsigned char tmp;
12 tmp = b[0];
13 b[0] = b[3];
14 b[3] = tmp;
15 tmp = b[1];
16 b[1] = b[2];
17 b[2] = tmp;
18 return _Long;
19#endif /* defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) */
20}6}
lib/libc/mingw/misc/winbs_ushort.c+1-12
...@@ -2,16 +2,5 @@ unsigned short __cdecl _byteswap_ushort(unsigned short _Short);...@@ -2,16 +2,5 @@ unsigned short __cdecl _byteswap_ushort(unsigned short _Short);
22
3unsigned short __cdecl _byteswap_ushort(unsigned short _Short)3unsigned short __cdecl _byteswap_ushort(unsigned short _Short)
4{4{
5#if defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__)5 return __builtin_bswap16(_Short);
6 unsigned short retval;
7 __asm__ __volatile__ ("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (_Short));
8 return retval;
9#else
10 unsigned char *b = (void*)&_Short;
11 unsigned char tmp;
12 tmp = b[0];
13 b[0] = b[1];
14 b[1] = tmp;
15 return _Short;
16#endif /* defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) */
17}6}
lib/libc/mingw/stdio/__mingw_fix_stat_path.c created+64
...@@ -0,0 +1,64 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <sys/stat.h>
8#include <stdlib.h>
9
10/**
11 * Returns _path without trailing slash if any
12 *
13 * - if _path has no trailing slash, the function returns it
14 * - if _path has a trailing slash, but is of the form C:/, then it returns it
15 * - otherwise, the function creates a new string, which is a copy of _path
16 * without the trailing slash. It is then the responsibility of the caller
17 * to free it.
18 */
19
20char* __mingw_fix_stat_path (const char* _path);
21char* __mingw_fix_stat_path (const char* _path)
22{
23 int len;
24 char *p;
25
26 p = (char*)_path;
27
28 if (_path && *_path) {
29 len = strlen (_path);
30
31 /* Ignore X:\ */
32
33 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == ':'))
34 return p;
35
36 /* Check UNC \\abc\<name>\ */
37 if ((_path[0] == '\\' || _path[0] == '/')
38 && (_path[1] == '\\' || _path[1] == '/'))
39 {
40 const char *r = &_path[2];
41 while (*r != 0 && *r != '\\' && *r != '/')
42 ++r;
43 if (*r != 0)
44 ++r;
45 if (*r == 0)
46 return p;
47 while (*r != 0 && *r != '\\' && *r != '/')
48 ++r;
49 if (*r != 0)
50 ++r;
51 if (*r == 0)
52 return p;
53 }
54
55 if (_path[len - 1] == '/' || _path[len - 1] == '\\')
56 {
57 p = (char*)malloc (len);
58 memcpy (p, _path, len - 1);
59 p[len - 1] = '\0';
60 }
61 }
62
63 return p;
64}
lib/libc/mingw/stdio/__mingw_fix_wstat_path.c created+64
...@@ -0,0 +1,64 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#include <sys/stat.h>
8#include <stdlib.h>
9
10/**
11 * Returns _path without trailing slash if any
12 *
13 * - if _path has no trailing slash, the function returns it
14 * - if _path has a trailing slash, but is of the form C:/, then it returns it
15 * - otherwise, the function creates a new string, which is a copy of _path
16 * without the trailing slash. It is then the responsibility of the caller
17 * to free it.
18 */
19
20wchar_t* __mingw_fix_wstat_path (const wchar_t* _path);
21wchar_t* __mingw_fix_wstat_path (const wchar_t* _path)
22{
23 int len;
24 wchar_t *p;
25
26 p = (wchar_t*)_path;
27
28 if (_path && *_path) {
29 len = wcslen (_path);
30
31 /* Ignore X:\ */
32
33 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == L':'))
34 return p;
35
36 /* Check UNC \\abc\<name>\ */
37 if ((_path[0] == L'\\' || _path[0] == L'/')
38 && (_path[1] == L'\\' || _path[1] == L'/'))
39 {
40 const wchar_t *r = &_path[2];
41 while (*r != 0 && *r != L'\\' && *r != L'/')
42 ++r;
43 if (*r != 0)
44 ++r;
45 if (*r == 0)
46 return p;
47 while (*r != 0 && *r != L'\\' && *r != L'/')
48 ++r;
49 if (*r != 0)
50 ++r;
51 if (*r == 0)
52 return p;
53 }
54
55 if (_path[len - 1] == L'/' || _path[len - 1] == L'\\')
56 {
57 p = (wchar_t*)malloc (len * sizeof(wchar_t));
58 memcpy (p, _path, (len - 1) * sizeof(wchar_t));
59 p[len - 1] = L'\0';
60 }
61 }
62
63 return p;
64}
lib/libc/mingw/stdio/_findfirst64i32.c+1-1
...@@ -7,7 +7,7 @@ intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *...@@ -7,7 +7,7 @@ intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *
7 struct __finddata64_t fd;7 struct __finddata64_t fd;
8 intptr_t ret = _findfirst64(_Filename,&fd);8 intptr_t ret = _findfirst64(_Filename,&fd);
9 if (ret == -1) {9 if (ret == -1) {
10 memset(_FindData,0,sizeof(struct _finddata64i32_t));10 *_FindData = (struct _finddata64i32_t){0};
11 return -1;11 return -1;
12 }12 }
13 _FindData->attrib=fd.attrib;13 _FindData->attrib=fd.attrib;
lib/libc/mingw/stdio/_findnext64i32.c+1-1
...@@ -7,7 +7,7 @@ int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindDa...@@ -7,7 +7,7 @@ int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindDa
7 struct __finddata64_t fd;7 struct __finddata64_t fd;
8 int ret = _findnext64(_FindHandle,&fd);8 int ret = _findnext64(_FindHandle,&fd);
9 if (ret == -1) {9 if (ret == -1) {
10 memset(_FindData,0,sizeof(struct _finddata64i32_t));10 *_FindData = (struct _finddata64i32_t){0};
11 return -1;11 return -1;
12 }12 }
13 _FindData->attrib=fd.attrib;13 _FindData->attrib=fd.attrib;
lib/libc/mingw/stdio/_fstat64i32.c+20-8
...@@ -1,14 +1,26 @@...@@ -1,14 +1,26 @@
1#define __CRT__NO_INLINE1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
2#include <sys/stat.h>7#include <sys/stat.h>
38
9/* When the file size does not fit into the st_size field:
10 * crtdll-msvcr90 msvcr100 msvcr110+
11 * st_size truncate 0 0
12 * errno no change no change EOVERFLOW
13 * returns 0 -1 -1
14 *
15 * This file is used only for pre-msvcr80 builds,
16 * So use the pre-msvcr80 behavior - truncate without error.
17 */
4int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat)18int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat)
5{19{
6 struct _stat64 st;20 struct _stat64 st;
7 int ret=_fstat64(_FileDes,&st);21 int ret=_fstat64(_FileDes,&st);
8 if (ret == -1) {22 if (ret != 0)
9 memset(_Stat,0,sizeof(struct _stat64i32));23 return ret;
10 return -1;
11 }
12 _Stat->st_dev=st.st_dev;24 _Stat->st_dev=st.st_dev;
13 _Stat->st_ino=st.st_ino;25 _Stat->st_ino=st.st_ino;
14 _Stat->st_mode=st.st_mode;26 _Stat->st_mode=st.st_mode;
...@@ -16,10 +28,10 @@ int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat)...@@ -16,10 +28,10 @@ int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat)
16 _Stat->st_uid=st.st_uid;28 _Stat->st_uid=st.st_uid;
17 _Stat->st_gid=st.st_gid;29 _Stat->st_gid=st.st_gid;
18 _Stat->st_rdev=st.st_rdev;30 _Stat->st_rdev=st.st_rdev;
19 _Stat->st_size=(_off_t) st.st_size; /* 32bit size */31 _Stat->st_size=(_off_t) st.st_size; /* truncate 64-bit st_size to 32-bit */
20 _Stat->st_atime=st.st_atime;32 _Stat->st_atime=st.st_atime;
21 _Stat->st_mtime=st.st_mtime;33 _Stat->st_mtime=st.st_mtime;
22 _Stat->st_ctime=st.st_ctime;34 _Stat->st_ctime=st.st_ctime;
23 return ret;35 return 0;
24}36}
2537int (__cdecl *__MINGW_IMP_SYMBOL(_fstat64i32))(int, struct _stat64i32 *) = _fstat64i32;
lib/libc/mingw/stdio/_stat.c deleted-120
...@@ -1,120 +0,0 @@
1#define __CRT__NO_INLINE
2#include <sys/stat.h>
3#include <stdlib.h>
4
5/**
6 * Returns _path without trailing slash if any
7 *
8 * - if _path has no trailing slash, the function returns it
9 * - if _path has a trailing slash, but is of the form C:/, then it returns it
10 * - otherwise, the function creates a new string, which is a copy of _path
11 * without the trailing slash. It is then the responsibility of the caller
12 * to free it.
13 */
14
15static char*
16_mingw_no_trailing_slash (const char* _path)
17{
18 int len;
19 char *p;
20
21 p = (char*)_path;
22
23 if (_path && *_path) {
24 len = strlen (_path);
25
26 /* Ignore X:\ */
27
28 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == ':'))
29 return p;
30
31 /* Check UNC \\abc\<name>\ */
32 if ((_path[0] == '\\' || _path[0] == '/')
33 && (_path[1] == '\\' || _path[1] == '/'))
34 {
35 const char *r = &_path[2];
36 while (*r != 0 && *r != '\\' && *r != '/')
37 ++r;
38 if (*r != 0)
39 ++r;
40 if (*r == 0)
41 return p;
42 while (*r != 0 && *r != '\\' && *r != '/')
43 ++r;
44 if (*r != 0)
45 ++r;
46 if (*r == 0)
47 return p;
48 }
49
50 if (_path[len - 1] == '/' || _path[len - 1] == '\\')
51 {
52 p = (char*)malloc (len);
53 memcpy (p, _path, len - 1);
54 p[len - 1] = '\0';
55 }
56 }
57
58 return p;
59}
60/* FIXME: Relying on _USE_32BIT_TIME_T, which is a user-macro,
61during CRT compilation is plainly broken. Need an appropriate
62implementation to provide users the ability of compiling the
63CRT only with 32-bit time_t behavior. */
64#if defined(_USE_32BIT_TIME_T)
65int __cdecl
66stat(const char *_Filename,struct stat *_Stat)
67{
68 struct _stat32 st;
69 char *_path = _mingw_no_trailing_slash(_Filename);
70
71 int ret=_stat32(_path,&st);
72
73 if (_path != _Filename)
74 free (_path);
75
76 if (ret == -1) {
77 memset(_Stat,0,sizeof(struct stat));
78 return -1;
79 }
80 /* struct stat and struct _stat32
81 are the same for this case. */
82 memcpy(_Stat, &st, sizeof(struct _stat32));
83 return ret;
84}
85#else
86int __cdecl
87stat(const char *_Filename,struct stat *_Stat)
88{
89 struct _stat64 st;
90 char *_path = _mingw_no_trailing_slash(_Filename);
91
92 int ret=_stat64(_path,&st);
93
94 if (_path != _Filename)
95 free (_path);
96
97 if (ret == -1) {
98 memset(_Stat,0,sizeof(struct stat));
99 return -1;
100 }
101 /* struct stat and struct _stat64i32
102 are the same for this case. */
103 _Stat->st_dev=st.st_dev;
104 _Stat->st_ino=st.st_ino;
105 _Stat->st_mode=st.st_mode;
106 _Stat->st_nlink=st.st_nlink;
107 _Stat->st_uid=st.st_uid;
108 _Stat->st_gid=st.st_gid;
109 _Stat->st_rdev=st.st_rdev;
110 _Stat->st_size=(_off_t) st.st_size;
111 _Stat->st_atime=st.st_atime;
112 _Stat->st_mtime=st.st_mtime;
113 _Stat->st_ctime=st.st_ctime;
114 return ret;
115}
116#endif
117
118/* Add __imp__fstat and __imp__stat symbols. */
119int (*__MINGW_IMP_SYMBOL(stat))(const char *,struct stat *) = &stat;
120
lib/libc/mingw/stdio/_stat64i32.c+19-70
...@@ -1,77 +1,26 @@...@@ -1,77 +1,26 @@
1#define __CRT__NO_INLINE
2#include <sys/stat.h>
3#include <stdlib.h>
4
5/**1/**
6 * Returns _path without trailing slash if any2 * This file has no copyright assigned and is placed in the Public Domain.
7 *3 * This file is part of the mingw-w64 runtime package.
8 * - if _path has no trailing slash, the function returns it4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
9 * - if _path has a trailing slash, but is of the form C:/, then it returns it
10 * - otherwise, the function creates a new string, which is a copy of _path
11 * without the trailing slash. It is then the responsibility of the caller
12 * to free it.
13 */5 */
146
15static char*7#include <sys/stat.h>
16_mingw_no_trailing_slash (const char* _path)
17{
18 int len;
19 char *p;
20
21 p = (char*)_path;
22
23 if (_path && *_path) {
24 len = strlen (_path);
25
26 /* Ignore X:\ */
27
28 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == ':'))
29 return p;
30
31 /* Check UNC \\abc\<name>\ */
32 if ((_path[0] == '\\' || _path[0] == '/')
33 && (_path[1] == '\\' || _path[1] == '/'))
34 {
35 const char *r = &_path[2];
36 while (*r != 0 && *r != '\\' && *r != '/')
37 ++r;
38 if (*r != 0)
39 ++r;
40 if (*r == 0)
41 return p;
42 while (*r != 0 && *r != '\\' && *r != '/')
43 ++r;
44 if (*r != 0)
45 ++r;
46 if (*r == 0)
47 return p;
48 }
49
50 if (_path[len - 1] == '/' || _path[len - 1] == '\\')
51 {
52 p = (char*)malloc (len);
53 memcpy (p, _path, len - 1);
54 p[len - 1] = '\0';
55 }
56 }
57
58 return p;
59}
608
9/* When the file size does not fit into the st_size field:
10 * crtdll-msvcr90 msvcr100 msvcr110+
11 * st_size truncate 0 0
12 * errno no change no change EOVERFLOW
13 * returns 0 -1 -1
14 *
15 * This file is used only for pre-msvcr80 builds,
16 * So use the pre-msvcr80 behavior - truncate without error.
17 */
61int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat)18int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat)
62{19{
63 struct _stat64 st;20 struct _stat64 st;
64 char *_path = _mingw_no_trailing_slash(_Name);21 int ret=_stat64(_Name,&st);
65 22 if (ret != 0)
66 int ret=_stat64(_path,&st);23 return ret;
67
68 if (_path != _Name)
69 free(_path);
70
71 if (ret == -1) {
72 memset(_Stat,0,sizeof(struct _stat64i32));
73 return -1;
74 }
75 _Stat->st_dev=st.st_dev;24 _Stat->st_dev=st.st_dev;
76 _Stat->st_ino=st.st_ino;25 _Stat->st_ino=st.st_ino;
77 _Stat->st_mode=st.st_mode;26 _Stat->st_mode=st.st_mode;
...@@ -79,10 +28,10 @@ int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat)...@@ -79,10 +28,10 @@ int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat)
79 _Stat->st_uid=st.st_uid;28 _Stat->st_uid=st.st_uid;
80 _Stat->st_gid=st.st_gid;29 _Stat->st_gid=st.st_gid;
81 _Stat->st_rdev=st.st_rdev;30 _Stat->st_rdev=st.st_rdev;
82 _Stat->st_size=(_off_t) st.st_size;31 _Stat->st_size=(_off_t) st.st_size; /* truncate 64-bit st_size to 32-bit */
83 _Stat->st_atime=st.st_atime;32 _Stat->st_atime=st.st_atime;
84 _Stat->st_mtime=st.st_mtime;33 _Stat->st_mtime=st.st_mtime;
85 _Stat->st_ctime=st.st_ctime;34 _Stat->st_ctime=st.st_ctime;
86 return ret;35 return 0;
87}36}
8837int (__cdecl *__MINGW_IMP_SYMBOL(_stat64i32))(const char *, struct _stat64i32 *) = _stat64i32;
lib/libc/mingw/stdio/_wfindfirst64i32.c+1-1
...@@ -7,7 +7,7 @@ intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i3...@@ -7,7 +7,7 @@ intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i3
7 struct _wfinddata64_t fd;7 struct _wfinddata64_t fd;
8 intptr_t ret = _wfindfirst64(_Filename,&fd);8 intptr_t ret = _wfindfirst64(_Filename,&fd);
9 if (ret == -1) {9 if (ret == -1) {
10 memset(_FindData,0,sizeof(struct _wfinddata64i32_t));10 *_FindData = (struct _wfinddata64i32_t){0};
11 return -1;11 return -1;
12 }12 }
13 _FindData->attrib=fd.attrib;13 _FindData->attrib=fd.attrib;
lib/libc/mingw/stdio/_wfindnext64i32.c+1-1
...@@ -7,7 +7,7 @@ int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_Find...@@ -7,7 +7,7 @@ int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_Find
7 struct _wfinddata64_t fd;7 struct _wfinddata64_t fd;
8 int ret = _wfindnext64(_FindHandle,&fd);8 int ret = _wfindnext64(_FindHandle,&fd);
9 if (ret == -1) {9 if (ret == -1) {
10 memset(_FindData,0,sizeof(struct _wfinddata64i32_t));10 *_FindData = (struct _wfinddata64i32_t){0};
11 return -1;11 return -1;
12 }12 }
13 _FindData->attrib=fd.attrib;13 _FindData->attrib=fd.attrib;
lib/libc/mingw/stdio/_wstat.c deleted-119
...@@ -1,119 +0,0 @@
1#define __CRT__NO_INLINE
2#include <sys/stat.h>
3#include <stdlib.h>
4#include <malloc.h>
5
6/**
7 * Returns _path without trailing slash if any
8 *
9 * - if _path has no trailing slash, the function returns it
10 * - if _path has a trailing slash, but is of the form C:/, then it returns it
11 * - otherwise, the function creates a new string, which is a copy of _path
12 * without the trailing slash. It is then the responsibility of the caller
13 * to free it.
14 */
15
16static wchar_t*
17_mingw_no_trailing_slash (const wchar_t* _path)
18{
19 int len;
20 wchar_t *p;
21
22 p = (wchar_t*)_path;
23
24 if (_path && *_path) {
25 len = wcslen (_path);
26
27 /* Ignore X:\ */
28
29 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == L':'))
30 return p;
31
32 /* Check UNC \\abc\<name>\ */
33 if ((_path[0] == L'\\' || _path[0] == L'/')
34 && (_path[1] == L'\\' || _path[1] == L'/'))
35 {
36 const wchar_t *r = &_path[2];
37 while (*r != 0 && *r != L'\\' && *r != L'/')
38 ++r;
39 if (*r != 0)
40 ++r;
41 if (*r == 0)
42 return p;
43 while (*r != 0 && *r != L'\\' && *r != L'/')
44 ++r;
45 if (*r != 0)
46 ++r;
47 if (*r == 0)
48 return p;
49 }
50
51 if (_path[len - 1] == L'/' || _path[len - 1] == L'\\')
52 {
53 p = (wchar_t*)malloc (len * sizeof(wchar_t));
54 memcpy (p, _path, (len - 1) * sizeof(wchar_t));
55 p[len - 1] = L'\0';
56 }
57 }
58
59 return p;
60}
61
62/* FIXME: Relying on _USE_32BIT_TIME_T, which is a user-macro,
63during CRT compilation is plainly broken. Need an appropriate
64implementation to provide users the ability of compiling the
65CRT only with 32-bit time_t behavior. */
66#if defined(_USE_32BIT_TIME_T)
67int __cdecl
68wstat(const wchar_t *_Filename,struct stat *_Stat)
69{
70 struct _stat32 st;
71 wchar_t *_path = _mingw_no_trailing_slash(_Filename);
72
73 int ret=_wstat32(_path,&st);
74
75 if (_path != _Filename)
76 free (_path);
77
78 if (ret == -1) {
79 memset(_Stat,0,sizeof(struct stat));
80 return -1;
81 }
82 /* struct stat and struct _stat32
83 are the same for this case. */
84 memcpy(_Stat, &st, sizeof(struct _stat32));
85 return ret;
86}
87#else
88int __cdecl
89wstat(const wchar_t *_Filename,struct stat *_Stat)
90{
91 struct _stat64 st;
92 wchar_t *_path = _mingw_no_trailing_slash(_Filename);
93
94 int ret=_wstat64(_path,&st);
95
96 if (_path != _Filename)
97 free (_path);
98
99 if (ret == -1) {
100 memset(_Stat,0,sizeof(struct stat));
101 return -1;
102 }
103 /* struct stat and struct _stat64i32
104 are the same for this case. */
105 _Stat->st_dev=st.st_dev;
106 _Stat->st_ino=st.st_ino;
107 _Stat->st_mode=st.st_mode;
108 _Stat->st_nlink=st.st_nlink;
109 _Stat->st_uid=st.st_uid;
110 _Stat->st_gid=st.st_gid;
111 _Stat->st_rdev=st.st_rdev;
112 _Stat->st_size=(_off_t) st.st_size;
113 _Stat->st_atime=st.st_atime;
114 _Stat->st_mtime=st.st_mtime;
115 _Stat->st_ctime=st.st_ctime;
116 return ret;
117}
118#endif
119
lib/libc/mingw/stdio/_wstat64i32.c+19-70
...@@ -1,77 +1,26 @@...@@ -1,77 +1,26 @@
1#define __CRT__NO_INLINE
2#include <sys/stat.h>
3#include <stdlib.h>
4
5/**1/**
6 * Returns _path without trailing slash if any2 * This file has no copyright assigned and is placed in the Public Domain.
7 *3 * This file is part of the mingw-w64 runtime package.
8 * - if _path has no trailing slash, the function returns it4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
9 * - if _path has a trailing slash, but is of the form C:/, then it returns it
10 * - otherwise, the function creates a new string, which is a copy of _path
11 * without the trailing slash. It is then the responsibility of the caller
12 * to free it.
13 */5 */
146
15static wchar_t*7#include <sys/stat.h>
16_mingw_no_trailing_slash (const wchar_t* _path)
17{
18 int len;
19 wchar_t *p;
20
21 p = (wchar_t*)_path;
22
23 if (_path && *_path) {
24 len = wcslen (_path);
25
26 /* Ignore X:\ */
27
28 if (len <= 1 || ((len == 2 || len == 3) && _path[1] == L':'))
29 return p;
30
31 /* Check UNC \\abc\<name>\ */
32 if ((_path[0] == L'\\' || _path[0] == L'/')
33 && (_path[1] == L'\\' || _path[1] == L'/'))
34 {
35 const wchar_t *r = &_path[2];
36 while (*r != 0 && *r != L'\\' && *r != L'/')
37 ++r;
38 if (*r != 0)
39 ++r;
40 if (*r == 0)
41 return p;
42 while (*r != 0 && *r != L'\\' && *r != L'/')
43 ++r;
44 if (*r != 0)
45 ++r;
46 if (*r == 0)
47 return p;
48 }
49
50 if (_path[len - 1] == L'/' || _path[len - 1] == L'\\')
51 {
52 p = (wchar_t*)malloc (len * sizeof(wchar_t));
53 memcpy (p, _path, (len - 1) * sizeof(wchar_t));
54 p[len - 1] = L'\0';
55 }
56 }
57
58 return p;
59}
608
9/* When the file size does not fit into the st_size field:
10 * crtdll-msvcr90 msvcr100 msvcr110+
11 * st_size truncate 0 0
12 * errno no change no change EOVERFLOW
13 * returns 0 -1 -1
14 *
15 * This file is used only for pre-msvcr80 builds,
16 * So use the pre-msvcr80 behavior - truncate without error.
17 */
61int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat)18int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat)
62{19{
63 struct _stat64 st;20 struct _stat64 st;
64 wchar_t *_path = _mingw_no_trailing_slash(_Name);21 int ret=_wstat64(_Name,&st);
65 22 if (ret != 0)
66 int ret=_wstat64(_path,&st);23 return ret;
67
68 if (_path != _Name)
69 free(_path);
70
71 if (ret == -1) {
72 memset(_Stat,0,sizeof(struct _stat64i32));
73 return -1;
74 }
75 _Stat->st_dev=st.st_dev;24 _Stat->st_dev=st.st_dev;
76 _Stat->st_ino=st.st_ino;25 _Stat->st_ino=st.st_ino;
77 _Stat->st_mode=st.st_mode;26 _Stat->st_mode=st.st_mode;
...@@ -79,10 +28,10 @@ int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat)...@@ -79,10 +28,10 @@ int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat)
79 _Stat->st_uid=st.st_uid;28 _Stat->st_uid=st.st_uid;
80 _Stat->st_gid=st.st_gid;29 _Stat->st_gid=st.st_gid;
81 _Stat->st_rdev=st.st_rdev;30 _Stat->st_rdev=st.st_rdev;
82 _Stat->st_size=(_off_t) st.st_size;31 _Stat->st_size=(_off_t) st.st_size; /* truncate 64-bit st_size to 32-bit */
83 _Stat->st_atime=st.st_atime;32 _Stat->st_atime=st.st_atime;
84 _Stat->st_mtime=st.st_mtime;33 _Stat->st_mtime=st.st_mtime;
85 _Stat->st_ctime=st.st_ctime;34 _Stat->st_ctime=st.st_ctime;
86 return ret;35 return 0;
87}36}
8837int (__cdecl *__MINGW_IMP_SYMBOL(_wstat64i32))(const wchar_t *, struct _stat64i32 *) = _wstat64i32;
lib/libc/mingw/stdio/mingw_pformat.c+7-14
...@@ -512,8 +512,7 @@ void __pformat_putchars( const char *s, int count, __pformat_t *stream )...@@ -512,8 +512,7 @@ void __pformat_putchars( const char *s, int count, __pformat_t *stream )
512 wchar_t w[12], *p;512 wchar_t w[12], *p;
513 while( count > 0 )513 while( count > 0 )
514 {514 {
515 mbstate_t ps;515 mbstate_t ps = {0};
516 memset(&ps, 0, sizeof(ps) );
517 --count;516 --count;
518 p = &w[0];517 p = &w[0];
519 l = mbrtowc (p, s, strlen (s), &ps);518 l = mbrtowc (p, s, strlen (s), &ps);
...@@ -1175,11 +1174,8 @@ void __pformat_emit_radix_point( __pformat_t *stream )...@@ -1175,11 +1174,8 @@ void __pformat_emit_radix_point( __pformat_t *stream )
1175 /* Radix point initialisation not yet completed;1174 /* Radix point initialisation not yet completed;
1176 * establish a multibyte to `wchar_t' converter...1175 * establish a multibyte to `wchar_t' converter...
1177 */1176 */
1178 int len; wchar_t rpchr; mbstate_t state;1177 int len; wchar_t rpchr;
11791178 mbstate_t state = {0};
1180 /* Initialise the conversion state...
1181 */
1182 memset( &state, 0, sizeof( state ) );
11831179
1184 /* Fetch and convert the localised radix point representation...1180 /* Fetch and convert the localised radix point representation...
1185 */1181 */
...@@ -1203,11 +1199,8 @@ void __pformat_emit_radix_point( __pformat_t *stream )...@@ -1203,11 +1199,8 @@ void __pformat_emit_radix_point( __pformat_t *stream )
1203#ifdef __BUILD_WIDEAPI1199#ifdef __BUILD_WIDEAPI
1204 __pformat_putc (stream->rpchr, stream);1200 __pformat_putc (stream->rpchr, stream);
1205#else1201#else
1206 int len; char buf[len = stream->rplen]; mbstate_t state;1202 int len; char buf[len = stream->rplen];
12071203 mbstate_t state = {0};
1208 /* Initialise the conversion state...
1209 */
1210 memset( &state, 0, sizeof( state ) );
12111204
1212 /* Convert the `wchar_t' representation to multibyte...1205 /* Convert the `wchar_t' representation to multibyte...
1213 */1206 */
...@@ -3123,8 +3116,8 @@ __pformat (int flags, void *dest, int max, const APICHAR *fmt, va_list argv)...@@ -3123,8 +3116,8 @@ __pformat (int flags, void *dest, int max, const APICHAR *fmt, va_list argv)
3123 if (state == PFORMAT_INIT)3116 if (state == PFORMAT_INIT)
3124 {3117 {
3125 stream.flags |= PFORMAT_GROUPED; /* $$$$ */3118 stream.flags |= PFORMAT_GROUPED; /* $$$$ */
3126 int len; wchar_t rpchr; mbstate_t cstate;3119 int len; wchar_t rpchr;
3127 memset (&cstate, 0, sizeof(state));3120 mbstate_t cstate = {0};
3128 if ((len = mbrtowc( &rpchr, localeconv()->thousands_sep, 16, &cstate)) > 0)3121 if ((len = mbrtowc( &rpchr, localeconv()->thousands_sep, 16, &cstate)) > 0)
3129 stream.thousands_chr = rpchr;3122 stream.thousands_chr = rpchr;
3130 stream.thousands_chr_len = len;3123 stream.thousands_chr_len = len;
lib/libc/mingw/stdio/mingw_sformat.c+4-6
...@@ -307,7 +307,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)...@@ -307,7 +307,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)
307 char seen_dot, seen_exp, is_neg, not_in;307 char seen_dot, seen_exp, is_neg, not_in;
308 char *tmp_wbuf_ptr, buf[MB_LEN_MAX];308 char *tmp_wbuf_ptr, buf[MB_LEN_MAX];
309 const char *lc_decimal_point, *lc_thousands_sep;309 const char *lc_decimal_point, *lc_thousands_sep;
310 mbstate_t state, cstate;310 mbstate_t state = {0}, cstate;
311 union {311 union {
312 unsigned long long ull;312 unsigned long long ull;
313 unsigned long ul;313 unsigned long ul;
...@@ -323,8 +323,6 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)...@@ -323,8 +323,6 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)
323 return EOF;323 return EOF;
324 }324 }
325325
326 memset (&state, 0, sizeof (state));
327
328 lc_decimal_point = localeconv()->decimal_point;326 lc_decimal_point = localeconv()->decimal_point;
329 lc_thousands_sep = localeconv()->thousands_sep;327 lc_thousands_sep = localeconv()->thousands_sep;
330 if (lc_thousands_sep != NULL && *lc_thousands_sep == 0)328 if (lc_thousands_sep != NULL && *lc_thousands_sep == 0)
...@@ -682,7 +680,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)...@@ -682,7 +680,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)
682 if ((c = in_ch (s, &read_in)) == EOF)680 if ((c = in_ch (s, &read_in)) == EOF)
683 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);681 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
684682
685 memset (&cstate, 0, sizeof (cstate));683 cstate = (mbstate_t){0};
686684
687 do685 do
688 {686 {
...@@ -854,7 +852,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)...@@ -854,7 +852,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)
854 if ((c = in_ch (s, &read_in)) == EOF)852 if ((c = in_ch (s, &read_in)) == EOF)
855 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);853 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
856854
857 memset (&cstate, 0, sizeof (cstate));855 cstate = (mbstate_t){0};
858856
859 do857 do
860 {858 {
...@@ -1459,7 +1457,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)...@@ -1459,7 +1457,7 @@ __mingw_sformat (_IFP *s, const char *format, va_list argp)
1459 if ((c = in_ch (s, &read_in)) == EOF)1457 if ((c = in_ch (s, &read_in)) == EOF)
1460 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);1458 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
14611459
1462 memset (&cstate, 0, sizeof (cstate));1460 cstate = (mbstate_t){0};
14631461
1464 do1462 do
1465 {1463 {
lib/libc/mingw/stdio/mingw_swformat.c+5-5
...@@ -332,10 +332,10 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)...@@ -332,10 +332,10 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)
332 return EOF;332 return EOF;
333 }333 }
334334
335 memset (&state, 0, sizeof(state));335 state = (mbstate_t){0};
336 clen = mbrtowc( &wc, localeconv()->decimal_point, 16, &state);336 clen = mbrtowc( &wc, localeconv()->decimal_point, 16, &state);
337 lc_decimal_point = (clen > 0 ? wc : '.');337 lc_decimal_point = (clen > 0 ? wc : '.');
338 memset( &state, 0, sizeof( state ) );338 state = (mbstate_t){0};
339 clen = mbrtowc( &wc, localeconv()->thousands_sep, 16, &state);339 clen = mbrtowc( &wc, localeconv()->thousands_sep, 16, &state);
340 lc_thousands_sep = (clen > 0 ? wc : 0);340 lc_thousands_sep = (clen > 0 ? wc : 0);
341341
...@@ -596,7 +596,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)...@@ -596,7 +596,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)
596 if ((c = in_ch (s, &read_in)) == WEOF)596 if ((c = in_ch (s, &read_in)) == WEOF)
597 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);597 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
598598
599 memset (&state, 0, sizeof (state));599 state = (mbstate_t){0};
600600
601 do601 do
602 {602 {
...@@ -744,7 +744,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)...@@ -744,7 +744,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)
744 if ((c = in_ch (s, &read_in)) == WEOF)744 if ((c = in_ch (s, &read_in)) == WEOF)
745 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);745 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
746746
747 memset (&state, 0, sizeof (state));747 state = (mbstate_t){0};
748748
749 do749 do
750 {750 {
...@@ -1459,7 +1459,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)...@@ -1459,7 +1459,7 @@ __mingw_swformat (_IFPW *s, const wchar_t *format, va_list argp)
1459 if ((c = in_ch (s, &read_in)) == WEOF)1459 if ((c = in_ch (s, &read_in)) == WEOF)
1460 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);1460 return cleanup_return ((!rval ? EOF : rval), &gcollect, pstr, &wbuf);
14611461
1462 memset (&state, 0, sizeof (state));1462 state = (mbstate_t){0};
14631463
1464 do1464 do
1465 {1465 {
lib/libc/mingw/stdio/mingw_vfscanf.c+1-3
...@@ -7,8 +7,6 @@...@@ -7,8 +7,6 @@
7int7int
8__mingw_vfscanf (FILE *s, const char *format, va_list argp)8__mingw_vfscanf (FILE *s, const char *format, va_list argp)
9{9{
10 _IFP ifp;10 _IFP ifp = { .fp = s };
11 memset (&ifp, 0, sizeof (_IFP));
12 ifp.fp = s;
13 return __mingw_sformat (&ifp, format, argp);11 return __mingw_sformat (&ifp, format, argp);
14}12}
lib/libc/mingw/stdio/mingw_vfwscanf.c+1-3
...@@ -7,8 +7,6 @@...@@ -7,8 +7,6 @@
7int7int
8__mingw_vfwscanf (FILE *s, const wchar_t *format, va_list argp)8__mingw_vfwscanf (FILE *s, const wchar_t *format, va_list argp)
9{9{
10 _IFPW ifp;10 _IFPW ifp = { .fp = s };
11 memset (&ifp, 0, sizeof (_IFPW));
12 ifp.fp = s;
13 return __mingw_swformat (&ifp, format, argp);11 return __mingw_swformat (&ifp, format, argp);
14}12}
lib/libc/mingw/stdio/mingw_vsscanf.c+1-4
...@@ -7,9 +7,6 @@...@@ -7,9 +7,6 @@
7int7int
8__mingw_vsscanf (const char *s, const char *format, va_list argp)8__mingw_vsscanf (const char *s, const char *format, va_list argp)
9{9{
10 _IFP ifp;10 _IFP ifp = { .str = s, .is_string = 1 };
11 memset (&ifp, 0, sizeof (_IFP));
12 ifp.str = s;
13 ifp.is_string = 1;
14 return __mingw_sformat (&ifp, format, argp);11 return __mingw_sformat (&ifp, format, argp);
15}12}
lib/libc/mingw/stdio/mingw_vswscanf.c+1-4
...@@ -7,9 +7,6 @@...@@ -7,9 +7,6 @@
7int7int
8__mingw_vswscanf (const wchar_t *s, const wchar_t *format, va_list argp)8__mingw_vswscanf (const wchar_t *s, const wchar_t *format, va_list argp)
9{9{
10 _IFPW ifp;10 _IFPW ifp = { .str = s, .is_string = 1 };
11 memset (&ifp, 0, sizeof (_IFPW));
12 ifp.str = s;
13 ifp.is_string = 1;
14 return __mingw_swformat (&ifp, format, argp);11 return __mingw_swformat (&ifp, format, argp);
15}12}
lib/libc/mingw/stdio/ucrt___local_stdio_printf_options.c created+15
...@@ -0,0 +1,15 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <corecrt_stdio_config.h>
10
11static unsigned __int64 options = _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS | _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING;
12
13unsigned __int64* __local_stdio_printf_options(void) {
14 return &options;
15}
lib/libc/mingw/stdio/ucrt___local_stdio_scanf_options.c created+15
...@@ -0,0 +1,15 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <corecrt_stdio_config.h>
10
11static unsigned __int64 options = _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS;
12
13unsigned __int64* __local_stdio_scanf_options(void) {
14 return &options;
15}
lib/libc/mingw/stdio/ucrt__scprintf.c-1
...@@ -18,4 +18,3 @@ int __cdecl _scprintf(const char * __restrict__ _Format, ...)...@@ -18,4 +18,3 @@ int __cdecl _scprintf(const char * __restrict__ _Format, ...)
18 va_end(_ArgList);18 va_end(_ArgList);
19 return ret;19 return ret;
20}20}
21int __cdecl (*__MINGW_IMP_SYMBOL(_scprintf))(const char *__restrict__, ...) = _scprintf;
lib/libc/mingw/stdio/ucrt__snprintf.c-1
...@@ -18,4 +18,3 @@ int __cdecl _snprintf(char * __restrict__ _Dest, size_t _Count, const char * __r...@@ -18,4 +18,3 @@ int __cdecl _snprintf(char * __restrict__ _Dest, size_t _Count, const char * __r
18 va_end(_Args);18 va_end(_Args);
19 return ret;19 return ret;
20}20}
21int __cdecl (*__MINGW_IMP_SYMBOL(_snprintf))(char *__restrict__, size_t, const char *__restrict__, ...) = _snprintf;
lib/libc/mingw/stdio/ucrt__snscanf.c+1-2
...@@ -14,8 +14,7 @@ int __cdecl _snscanf(const char * __restrict__ _Src, size_t _MaxCount, const cha...@@ -14,8 +14,7 @@ int __cdecl _snscanf(const char * __restrict__ _Src, size_t _MaxCount, const cha
14 int ret;14 int ret;
15 va_list _ArgList;15 va_list _ArgList;
16 va_start(_ArgList, _Format);16 va_start(_ArgList, _Format);
17 ret = __stdio_common_vsscanf(0, _Src, _MaxCount, _Format, NULL, _ArgList);17 ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, _MaxCount, _Format, NULL, _ArgList);
18 va_end(_ArgList);18 va_end(_ArgList);
19 return ret;19 return ret;
20}20}
21int __cdecl (*__MINGW_IMP_SYMBOL(_snscanf))(const char *__restrict__, size_t, const char * __restrict__, ...) = _snscanf;
lib/libc/mingw/stdio/ucrt__snwprintf.c-18
...@@ -4,25 +4,12 @@...@@ -4,25 +4,12 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7// For ucrt, this function normally is an inline function in stdio.h.
8// libmingwex doesn't use the ucrt version of headers, and wassert.c can
9// end up requiring a concrete version of it.
10
11#ifdef __GNUC__
12#pragma GCC diagnostic push
13#pragma GCC diagnostic ignored "-Winline"
14#endif
15
16#undef __MSVCRT_VERSION__7#undef __MSVCRT_VERSION__
17#define _UCRT8#define _UCRT
189
19#define _snwprintf real__snwprintf
20
21#include <stdarg.h>10#include <stdarg.h>
22#include <stdio.h>11#include <stdio.h>
2312
24#undef _snwprintf
25
26int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t * restrict _Format, ...);13int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t * restrict _Format, ...);
2714
28int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t * restrict _Format, ...)15int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t * restrict _Format, ...)
...@@ -34,8 +21,3 @@ int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t *...@@ -34,8 +21,3 @@ int __cdecl _snwprintf(wchar_t * restrict _Dest, size_t _Count, const wchar_t *
34 va_end(ap);21 va_end(ap);
35 return ret;22 return ret;
36}23}
37
38int __cdecl (*__MINGW_IMP_SYMBOL(_snwprintf))(wchar_t *restrict, size_t, const wchar_t *restrict, ...) = _snwprintf;
39#ifdef __GNUC__
40#pragma GCC diagnostic pop
41#endif
lib/libc/mingw/stdio/ucrt__vsnprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __re...@@ -12,4 +12,3 @@ int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __re
12{12{
13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args);13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(_vsnprintf))(char *__restrict__, size_t, const char *__restrict__, va_list) = _vsnprintf;
lib/libc/mingw/stdio/ucrt__vsnwprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t...@@ -12,4 +12,3 @@ int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t
12{12{
13 return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args);13 return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(_vsnwprintf))(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list) = _vsnwprintf;
lib/libc/mingw/stdio/ucrt_fprintf.c-1
...@@ -17,4 +17,3 @@ int __cdecl fprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,...@@ -17,4 +17,3 @@ int __cdecl fprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,
17 __builtin_va_end(ap);17 __builtin_va_end(ap);
18 return ret;18 return ret;
19}19}
20int __cdecl (*__MINGW_IMP_SYMBOL(fprintf))(FILE *__restrict__, const char *__restrict__, ...) = fprintf;
lib/libc/mingw/stdio/ucrt_fscanf.c+1-2
...@@ -12,8 +12,7 @@ int __cdecl fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,....@@ -12,8 +12,7 @@ int __cdecl fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,.
12 __builtin_va_list __ap;12 __builtin_va_list __ap;
13 int __ret;13 int __ret;
14 __builtin_va_start(__ap, _Format);14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vfscanf(0, _File, _Format, NULL, __ap);15 __ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap);
16 __builtin_va_end(__ap);16 __builtin_va_end(__ap);
17 return __ret;17 return __ret;
18}18}
19int __cdecl (*__MINGW_IMP_SYMBOL(fscanf))(FILE *__restrict__, const char *__restrict__, ...) = fscanf;
lib/libc/mingw/stdio/ucrt_fwprintf.c+1-19
...@@ -4,25 +4,12 @@...@@ -4,25 +4,12 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7// For ucrt, this function normally is an inline function in stdio.h.
8// libmingwex doesn't use the ucrt version of headers, and wassert.c can
9// end up requiring a concrete version of it.
10
11#ifdef __GNUC__
12#pragma GCC diagnostic push
13#pragma GCC diagnostic ignored "-Winline"
14#endif
15
16#undef __MSVCRT_VERSION__7#undef __MSVCRT_VERSION__
17#define _UCRT8#define _UCRT
189
19#define fwprintf real_fwprintf
20
21#include <stdarg.h>10#include <stdarg.h>
22#include <stdio.h>11#include <stdio.h>
2312
24#undef fwprintf
25
26int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...);13int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...);
2714
28int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...)15int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...)
...@@ -30,12 +17,7 @@ int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...)...@@ -30,12 +17,7 @@ int __cdecl fwprintf(FILE *ptr, const wchar_t *fmt, ...)
30 va_list ap;17 va_list ap;
31 int ret;18 int ret;
32 va_start(ap, fmt);19 va_start(ap, fmt);
33 ret = vfwprintf(ptr, fmt, ap);20 ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, ptr, fmt, NULL, ap);
34 va_end(ap);21 va_end(ap);
35 return ret;22 return ret;
36}23}
37
38int __cdecl (*__MINGW_IMP_SYMBOL(fwprintf))(FILE *, const wchar_t *, ...) = fwprintf;
39#ifdef __GNUC__
40#pragma GCC diagnostic pop
41#endif
lib/libc/mingw/stdio/ucrt_fwscanf.c created+18
...@@ -0,0 +1,18 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) {
12 __builtin_va_list __ap;
13 int __ret;
14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap);
16 __builtin_va_end(__ap);
17 return __ret;
18}
lib/libc/mingw/stdio/ucrt_ms_fprintf.c deleted-22
...@@ -1,22 +0,0 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9
10#include <stdio.h>
11#include <stdarg.h>
12
13int __cdecl __ms_fprintf(FILE * restrict file, const char * restrict format, ...)
14{
15 va_list ap;
16 int ret;
17 va_start(ap, format);
18 ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, ap);
19 va_end(ap);
20 return ret;
21}
22int __cdecl (*__MINGW_IMP_SYMBOL(__ms_fprintf))(FILE * restrict, const char * restrict, ...) = __ms_fprintf;
lib/libc/mingw/stdio/ucrt_ms_fwprintf.c+1-2
...@@ -17,8 +17,7 @@ int __cdecl __ms_fwprintf(FILE *file, const wchar_t *fmt, ...)...@@ -17,8 +17,7 @@ int __cdecl __ms_fwprintf(FILE *file, const wchar_t *fmt, ...)
17 va_list ap;17 va_list ap;
18 int ret;18 int ret;
19 va_start(ap, fmt);19 va_start(ap, fmt);
20 ret = __stdio_common_vfwprintf(_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS, file, fmt, NULL, ap);20 ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, fmt, NULL, ap);
21 va_end(ap);21 va_end(ap);
22 return ret;22 return ret;
23}23}
24int __cdecl (*__MINGW_IMP_SYMBOL(__ms_fwprintf))(FILE *, const wchar_t *, ...) = __ms_fwprintf;
lib/libc/mingw/stdio/ucrt_printf.c-1
...@@ -17,4 +17,3 @@ int __cdecl printf(const char * __restrict__ _Format,...)...@@ -17,4 +17,3 @@ int __cdecl printf(const char * __restrict__ _Format,...)
17 __builtin_va_end(ap);17 __builtin_va_end(ap);
18 return ret;18 return ret;
19}19}
20int __cdecl (*__MINGW_IMP_SYMBOL(printf))(const char *__restrict__, ...) = printf;
lib/libc/mingw/stdio/ucrt_scanf.c+1-2
...@@ -12,8 +12,7 @@ int __cdecl scanf(const char * __restrict__ _Format,...) {...@@ -12,8 +12,7 @@ int __cdecl scanf(const char * __restrict__ _Format,...) {
12 __builtin_va_list __ap;12 __builtin_va_list __ap;
13 int __ret;13 int __ret;
14 __builtin_va_start(__ap, _Format);14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vfscanf(0, stdin, _Format, NULL, __ap);15 __ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap);
16 __builtin_va_end(__ap);16 __builtin_va_end(__ap);
17 return __ret;17 return __ret;
18}18}
19int __cdecl (*__MINGW_IMP_SYMBOL(scanf))(const char *__restrict__, ...) = scanf;
lib/libc/mingw/stdio/ucrt_snprintf.c-1
...@@ -17,4 +17,3 @@ int __cdecl snprintf (char * __restrict__ __stream, size_t __n, const char * __r...@@ -17,4 +17,3 @@ int __cdecl snprintf (char * __restrict__ __stream, size_t __n, const char * __r
17 __builtin_va_end(ap);17 __builtin_va_end(ap);
18 return ret;18 return ret;
19}19}
20int __cdecl (*__MINGW_IMP_SYMBOL(snprintf))(char *__restrict__, size_t, const char *__restrict__, ...) = snprintf;
lib/libc/mingw/stdio/ucrt_snwprintf.c created+19
...@@ -0,0 +1,19 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
12{
13 __builtin_va_list __ap;
14 int __ret;
15 __builtin_va_start(__ap, format);
16 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, __ap);
17 __builtin_va_end(__ap);
18 return __ret;
19}
lib/libc/mingw/stdio/ucrt_sprintf.c-1
...@@ -17,4 +17,3 @@ int __cdecl sprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,...@@ -17,4 +17,3 @@ int __cdecl sprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,
17 __builtin_va_end(ap);17 __builtin_va_end(ap);
18 return ret;18 return ret;
19}19}
20int __cdecl (*__MINGW_IMP_SYMBOL(sprintf))(char *__restrict__, const char *__restrict__, ...) = sprintf;
lib/libc/mingw/stdio/ucrt_sscanf.c+1-3
...@@ -12,9 +12,7 @@ int __cdecl sscanf(const char * __restrict__ _Src,const char * __restrict__ _For...@@ -12,9 +12,7 @@ int __cdecl sscanf(const char * __restrict__ _Src,const char * __restrict__ _For
12 __builtin_va_list __ap;12 __builtin_va_list __ap;
13 int __ret;13 int __ret;
14 __builtin_va_start(__ap, _Format);14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vsscanf(0, _Src, (size_t)-1, _Format, NULL, __ap);15 __ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap);
16 __builtin_va_end(__ap);16 __builtin_va_end(__ap);
17 return __ret;17 return __ret;
18}18}
19
20int __cdecl (*__MINGW_IMP_SYMBOL(sscanf))(const char *__restrict__, const char *__restrict__, ...) = sscanf;
lib/libc/mingw/stdio/ucrt_swprintf.c created+29
...@@ -0,0 +1,29 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...)
12{
13 __builtin_va_list __ap;
14 int __ret;
15 /*
16 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
17 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
18 * executed in "standard snprintf behavior" and returns number of (wide)
19 * chars required to allocate. For all other cases it is executed in a way
20 * that returns negative value on error. But C95+ compliant swprintf() for
21 * case _Count == 0 returns negative value, so handle this case specially.
22 */
23 if (_Dest == NULL && _Count == 0)
24 return -1;
25 __builtin_va_start(__ap, _Format);
26 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap);
27 __builtin_va_end(__ap);
28 return __ret < 0 ? -1 : __ret;
29}
lib/libc/mingw/stdio/ucrt_swscanf.c created+18
...@@ -0,0 +1,18 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) {
12 __builtin_va_list __ap;
13 int __ret;
14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap);
16 __builtin_va_end(__ap);
17 return __ret;
18}
lib/libc/mingw/stdio/ucrt_vfprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl vfprintf(FILE * __restrict__ _File,const char * __restrict__ _Format...@@ -12,4 +12,3 @@ int __cdecl vfprintf(FILE * __restrict__ _File,const char * __restrict__ _Format
12{12{
13 return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList);13 return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(vfprintf))(FILE *__restrict__, const char *__restrict__, va_list) = vfprintf;
lib/libc/mingw/stdio/ucrt_vfscanf.c+1-2
...@@ -9,6 +9,5 @@...@@ -9,6 +9,5 @@
9#include <stdio.h>9#include <stdio.h>
1010
11int __cdecl vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) {11int __cdecl vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) {
12 return __stdio_common_vfscanf(0, __stream, __format, NULL, __local_argv);12 return __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv);
13}13}
14int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, __builtin_va_list) = vfscanf;
lib/libc/mingw/stdio/ucrt_vfwprintf.c created+14
...@@ -0,0 +1,14 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vfwprintf(FILE * __restrict__ _File, const wchar_t * __restrict__ _Format, va_list _ArgList)
12{
13 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList);
14}
lib/libc/mingw/stdio/ucrt_vfwscanf.c created+13
...@@ -0,0 +1,13 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv) {
12 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv);
13}
lib/libc/mingw/stdio/ucrt_vprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl vprintf(const char * __restrict__ _Format,va_list _ArgList)...@@ -12,4 +12,3 @@ int __cdecl vprintf(const char * __restrict__ _Format,va_list _ArgList)
12{12{
13 return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList);13 return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(vprintf))(const char *__restrict__, va_list) = vprintf;
lib/libc/mingw/stdio/ucrt_vscanf.c+1-2
...@@ -9,6 +9,5 @@...@@ -9,6 +9,5 @@
9#include <stdio.h>9#include <stdio.h>
1010
11int __cdecl vscanf(const char *__format, __builtin_va_list __local_argv) {11int __cdecl vscanf(const char *__format, __builtin_va_list __local_argv) {
12 return __stdio_common_vfscanf(0, stdin, __format, NULL, __local_argv);12 return __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv);
13}13}
14int __cdecl (*__MINGW_IMP_SYMBOL(vscanf))(const char *, __builtin_va_list) = vscanf;
lib/libc/mingw/stdio/ucrt_vsnprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl vsnprintf (char * __restrict__ __stream, size_t __n, const char * __...@@ -12,4 +12,3 @@ int __cdecl vsnprintf (char * __restrict__ __stream, size_t __n, const char * __
12{12{
13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, __stream, __n, __format, NULL, __local_argv);13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, __stream, __n, __format, NULL, __local_argv);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(vsnprintf))(char *__restrict__, size_t, const char *__restrict__, va_list) = vsnprintf;
lib/libc/mingw/stdio/ucrt_vsnwprintf.c created+14
...@@ -0,0 +1,14 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
12{
13 return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg);
14}
lib/libc/mingw/stdio/ucrt_vsprintf.c-1
...@@ -12,4 +12,3 @@ int __cdecl vsprintf(char * __restrict__ _Dest,const char * __restrict__ _Format...@@ -12,4 +12,3 @@ int __cdecl vsprintf(char * __restrict__ _Dest,const char * __restrict__ _Format
12{12{
13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, _Dest, (size_t)-1, _Format, NULL, _Args);13 return __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, _Dest, (size_t)-1, _Format, NULL, _Args);
14}14}
15int __cdecl (*__MINGW_IMP_SYMBOL(vsprintf))(char *__restrict__, const char *__restrict__, va_list) = vsprintf;
lib/libc/mingw/stdio/ucrt_vsscanf.c+1-2
...@@ -9,6 +9,5 @@...@@ -9,6 +9,5 @@
9#include <stdio.h>9#include <stdio.h>
1010
11int __cdecl vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv) {11int __cdecl vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv) {
12 return __stdio_common_vsscanf(0, __source, (size_t)-1, __format, NULL, __local_argv);12 return __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, (size_t)-1, __format, NULL, __local_argv);
13}13}
14int __cdecl (*__MINGW_IMP_SYMBOL(vsscanf))(const char *__restrict, const char *__restrict__, __builtin_va_list) = vsscanf;
lib/libc/mingw/stdio/ucrt_vswprintf.c created+26
...@@ -0,0 +1,26 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args)
12{
13 int __ret;
14 /*
15 * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
16 * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
17 * executed in "standard snprintf behavior" and returns number of (wide)
18 * chars required to allocate. For all other cases it is executed in a way
19 * that returns negative value on error. But C95+ compliant vswprintf() for
20 * case _Count == 0 returns negative value, so handle this case specially.
21 */
22 if (_Dest == NULL && _Count == 0)
23 return -1;
24 __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args);
25 return __ret < 0 ? -1 : __ret;
26}
lib/libc/mingw/stdio/ucrt_vwprintf.c created+14
...@@ -0,0 +1,14 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vwprintf(const wchar_t * __restrict__ _Format, va_list _ArgList)
12{
13 return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList);
14}
lib/libc/mingw/stdio/ucrt_vwscanf.c created+13
...@@ -0,0 +1,13 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl vwscanf(const wchar_t *__format, __builtin_va_list __local_argv) {
12 return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv);
13}
lib/libc/mingw/stdio/ucrt_wprintf.c created+23
...@@ -0,0 +1,23 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9
10#include <stdarg.h>
11#include <stdio.h>
12
13int __cdecl wprintf(const wchar_t *fmt, ...);
14
15int __cdecl wprintf(const wchar_t *fmt, ...)
16{
17 va_list ap;
18 int ret;
19 va_start(ap, fmt);
20 ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, fmt, NULL, ap);
21 va_end(ap);
22 return ret;
23}
lib/libc/mingw/stdio/ucrt_wscanf.c created+18
...@@ -0,0 +1,18 @@
1/**
2 * This file has no copyright assigned and is placed in the Public Domain.
3 * This file is part of the mingw-w64 runtime package.
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */
6
7#undef __MSVCRT_VERSION__
8#define _UCRT
9#include <stdio.h>
10
11int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) {
12 __builtin_va_list __ap;
13 int __ret;
14 __builtin_va_start(__ap, _Format);
15 __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap);
16 __builtin_va_end(__ap);
17 return __ret;
18}
lib/libc/mingw/winpthreads/barrier.c+17-9
...@@ -20,12 +20,22 @@...@@ -20,12 +20,22 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#include <windows.h>23#ifdef HAVE_CONFIG_H
24#include <stdio.h>24#include "config.h"
25#endif
26
27#include <assert.h>
25#include <malloc.h>28#include <malloc.h>
29#include <stdio.h>
30
31#define WIN32_LEAN_AND_MEAN
32#include <windows.h>
33
34/* public header files */
26#include "pthread.h"35#include "pthread.h"
36#include "semaphore.h"
37/* internal header files */
27#include "barrier.h"38#include "barrier.h"
28#include "ref.h"
29#include "misc.h"39#include "misc.h"
3040
31static pthread_spinlock_t barrier_global = PTHREAD_SPINLOCK_INITIALIZER;41static pthread_spinlock_t barrier_global = PTHREAD_SPINLOCK_INITIALIZER;
...@@ -34,9 +44,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int...@@ -34,9 +44,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int
34barrier_unref(volatile pthread_barrier_t *barrier, int res)44barrier_unref(volatile pthread_barrier_t *barrier, int res)
35{45{
36 pthread_spin_lock(&barrier_global);46 pthread_spin_lock(&barrier_global);
37#ifdef WINPTHREAD_DBG
38 assert((((barrier_t *)*barrier)->valid == LIFE_BARRIER) && (((barrier_t *)*barrier)->busy > 0));47 assert((((barrier_t *)*barrier)->valid == LIFE_BARRIER) && (((barrier_t *)*barrier)->busy > 0));
39#endif
40 ((barrier_t *)*barrier)->busy -= 1;48 ((barrier_t *)*barrier)->busy -= 1;
41 pthread_spin_unlock(&barrier_global);49 pthread_spin_unlock(&barrier_global);
42 return res;50 return res;
...@@ -64,7 +72,7 @@ barrier_ref_destroy(volatile pthread_barrier_t *barrier, pthread_barrier_t *bDes...@@ -64,7 +72,7 @@ barrier_ref_destroy(volatile pthread_barrier_t *barrier, pthread_barrier_t *bDes
6472
65 *bDestroy = NULL;73 *bDestroy = NULL;
66 pthread_spin_lock(&barrier_global);74 pthread_spin_lock(&barrier_global);
67 75
68 if (!barrier || !*barrier || ((barrier_t *)*barrier)->valid != LIFE_BARRIER) r = EINVAL;76 if (!barrier || !*barrier || ((barrier_t *)*barrier)->valid != LIFE_BARRIER) r = EINVAL;
69 else {77 else {
70 barrier_t *b_ = (barrier_t *)*barrier;78 barrier_t *b_ = (barrier_t *)*barrier;
...@@ -92,15 +100,15 @@ int pthread_barrier_destroy(pthread_barrier_t *b_)...@@ -92,15 +100,15 @@ int pthread_barrier_destroy(pthread_barrier_t *b_)
92 pthread_barrier_t bDestroy;100 pthread_barrier_t bDestroy;
93 barrier_t *b;101 barrier_t *b;
94 int r;102 int r;
95 103
96 while ((r = barrier_ref_destroy(b_,&bDestroy)) == EBUSY)104 while ((r = barrier_ref_destroy(b_,&bDestroy)) == EBUSY)
97 Sleep(0);105 Sleep(0);
98 106
99 if (r)107 if (r)
100 return r;108 return r;
101109
102 b = (barrier_t *)bDestroy;110 b = (barrier_t *)bDestroy;
103 111
104 pthread_mutex_lock(&b->m);112 pthread_mutex_lock(&b->m);
105113
106 if (sem_destroy(&b->sems[0]) != 0)114 if (sem_destroy(&b->sems[0]) != 0)
lib/libc/mingw/winpthreads/barrier.h-2
...@@ -34,8 +34,6 @@...@@ -34,8 +34,6 @@
34 return EINVAL; \34 return EINVAL; \
35 } while (0)35 } while (0)
3636
37#include "semaphore.h"
38
39typedef struct barrier_t barrier_t;37typedef struct barrier_t barrier_t;
40struct barrier_t38struct barrier_t
41{39{
lib/libc/mingw/winpthreads/clock.c+112-15
...@@ -4,15 +4,23 @@...@@ -4,15 +4,23 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#ifdef HAVE_CONFIG_H
8#include "config.h"
9#endif
10
11#include <assert.h>
7#include <errno.h>12#include <errno.h>
8#include <stdint.h>13#include <stdint.h>
9#include <time.h>14#include <time.h>
15
16#define WIN32_LEAN_AND_MEAN
10#include <windows.h>17#include <windows.h>
11#ifndef IN_WINPTHREAD18
12#define IN_WINPTHREAD 119#define WINPTHREAD_CLOCK_DECL WINPTHREAD_API
13#endif20
14#include "pthread.h"21/* public header files */
15#include "pthread_time.h"22#include "pthread_time.h"
23/* internal header files */
16#include "misc.h"24#include "misc.h"
1725
18#define POW10_7 1000000026#define POW10_7 10000000
...@@ -51,7 +59,7 @@ static WINPTHREADS_INLINE int lc_set_errno(int result)...@@ -51,7 +59,7 @@ static WINPTHREADS_INLINE int lc_set_errno(int result)
51 * If the function fails, the return value is -1,59 * If the function fails, the return value is -1,
52 * with errno set to indicate the error.60 * with errno set to indicate the error.
53 */61 */
54int clock_getres(clockid_t clock_id, struct timespec *res)62static int __clock_getres(clockid_t clock_id, struct _timespec64 *res)
55{63{
56 clockid_t id = clock_id;64 clockid_t id = clock_id;
5765
...@@ -113,7 +121,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)...@@ -113,7 +121,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
113 * If the function fails, the return value is -1,121 * If the function fails, the return value is -1,
114 * with errno set to indicate the error.122 * with errno set to indicate the error.
115 */123 */
116int clock_gettime(clockid_t clock_id, struct timespec *tp)124static int __clock_gettime(clockid_t clock_id, struct _timespec64 *tp)
117{125{
118 unsigned __int64 t;126 unsigned __int64 t;
119 LARGE_INTEGER pf, pc;127 LARGE_INTEGER pf, pc;
...@@ -172,7 +180,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)...@@ -172,7 +180,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
172 return 0;180 return 0;
173 }181 }
174182
175 case CLOCK_THREAD_CPUTIME_ID: 183 case CLOCK_THREAD_CPUTIME_ID:
176 {184 {
177 if(0 == GetThreadTimes(GetCurrentThread(), &ct.ft, &et.ft, &kt.ft, &ut.ft))185 if(0 == GetThreadTimes(GetCurrentThread(), &ct.ft, &et.ft, &kt.ft, &ut.ft))
178 return lc_set_errno(EINVAL);186 return lc_set_errno(EINVAL);
...@@ -201,20 +209,20 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)...@@ -201,20 +209,20 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
201 * If the function fails, the return value is -1,209 * If the function fails, the return value is -1,
202 * with errno set to indicate the error.210 * with errno set to indicate the error.
203 */211 */
204int clock_nanosleep(clockid_t clock_id, int flags,212static int __clock_nanosleep(clockid_t clock_id, int flags,
205 const struct timespec *request,213 const struct _timespec64 *request,
206 struct timespec *remain)214 struct _timespec64 *remain)
207{215{
208 struct timespec tp;216 struct _timespec64 tp;
209217
210 if (clock_id != CLOCK_REALTIME)218 if (clock_id != CLOCK_REALTIME)
211 return lc_set_errno(EINVAL);219 return lc_set_errno(EINVAL);
212220
213 if (flags == 0)221 if (flags == 0)
214 return nanosleep(request, remain);222 return nanosleep64(request, remain);
215223
216 /* TIMER_ABSTIME = 1 */224 /* TIMER_ABSTIME = 1 */
217 clock_gettime(CLOCK_REALTIME, &tp);225 __clock_gettime(CLOCK_REALTIME, &tp);
218226
219 tp.tv_sec = request->tv_sec - tp.tv_sec;227 tp.tv_sec = request->tv_sec - tp.tv_sec;
220 tp.tv_nsec = request->tv_nsec - tp.tv_nsec;228 tp.tv_nsec = request->tv_nsec - tp.tv_nsec;
...@@ -223,7 +231,7 @@ int clock_nanosleep(clockid_t clock_id, int flags,...@@ -223,7 +231,7 @@ int clock_nanosleep(clockid_t clock_id, int flags,
223 tp.tv_sec --;231 tp.tv_sec --;
224 }232 }
225233
226 return nanosleep(&tp, remain);234 return nanosleep64(&tp, remain);
227}235}
228236
229/**237/**
...@@ -234,7 +242,7 @@ int clock_nanosleep(clockid_t clock_id, int flags,...@@ -234,7 +242,7 @@ int clock_nanosleep(clockid_t clock_id, int flags,
234 * If the function fails, the return value is -1,242 * If the function fails, the return value is -1,
235 * with errno set to indicate the error.243 * with errno set to indicate the error.
236 */244 */
237int clock_settime(clockid_t clock_id, const struct timespec *tp)245static int __clock_settime(clockid_t clock_id, const struct _timespec64 *tp)
238{246{
239 SYSTEMTIME st;247 SYSTEMTIME st;
240248
...@@ -255,3 +263,92 @@ int clock_settime(clockid_t clock_id, const struct timespec *tp)...@@ -255,3 +263,92 @@ int clock_settime(clockid_t clock_id, const struct timespec *tp)
255263
256 return 0;264 return 0;
257}265}
266
267/**
268 * Versions to use with 64-bit time_t (struct _timespec64)
269 */
270
271int clock_getres64 (clockid_t clock_id, struct _timespec64 *tp)
272{
273 return __clock_getres (clock_id, tp);
274}
275
276int clock_gettime64 (clockid_t clock_id, struct _timespec64 *tp)
277{
278 return __clock_gettime (clock_id, tp);
279}
280
281int clock_settime64 (clockid_t clock_id, const struct _timespec64 *tp)
282{
283 return __clock_settime (clock_id, tp);
284}
285
286int clock_nanosleep64 (clockid_t clock_id, int flags,
287 const struct _timespec64 *request, struct _timespec64 *remain)
288{
289 return __clock_nanosleep (clock_id, flags, request, remain);
290}
291
292/**
293 * Versions to use with 32-bit time_t (struct _timespec32)
294 */
295
296int clock_getres32 (clockid_t clock_id, struct _timespec32 *tp)
297{
298 struct _timespec64 tp64 = {0};
299
300 if (__clock_getres (clock_id, &tp64) == -1)
301 return -1;
302
303 tp->tv_sec = (__time32_t) tp64.tv_sec;
304 tp->tv_nsec = tp64.tv_nsec;
305
306 return 0;
307}
308
309int clock_gettime32 (clockid_t clock_id, struct _timespec32 *tp)
310{
311 struct _timespec64 tp64 = {0};
312
313 if (__clock_gettime (clock_id, &tp64) == -1)
314 return -1;
315
316 if (tp64.tv_sec > INT_MAX)
317 {
318 _set_errno (EOVERFLOW);
319 return -1;
320 }
321
322 tp->tv_sec = (__time32_t) tp64.tv_sec;
323 tp->tv_nsec = tp64.tv_nsec;
324
325 return 0;
326}
327
328int clock_settime32 (clockid_t clock_id, const struct _timespec32 *tp)
329{
330 struct _timespec64 tp64 = {.tv_sec = tp->tv_sec, .tv_nsec = tp->tv_nsec};
331 return __clock_settime (clock_id, &tp64);
332}
333
334int clock_nanosleep32 (clockid_t clock_id, int flags,
335 const struct _timespec32 *request, struct _timespec32 *remain)
336{
337 struct _timespec64 request64 = {
338 .tv_sec = request->tv_sec,
339 .tv_nsec = request->tv_nsec
340 };
341 struct _timespec64 remain64 = {0};
342
343 if (__clock_nanosleep (clock_id, flags, &request64, &remain64) == -1)
344 return -1;
345
346 assert (remain64.tv_sec <= INT_MAX);
347
348 if (remain != NULL) {
349 remain->tv_sec = (__time32_t)remain64.tv_sec;
350 remain->tv_nsec = remain64.tv_nsec;
351 }
352
353 return 0;
354}
lib/libc/mingw/winpthreads/cond.c+36-74
...@@ -24,17 +24,27 @@...@@ -24,17 +24,27 @@
24 * Posix Condition Variables for Microsoft Windows.24 * Posix Condition Variables for Microsoft Windows.
25 * 22-9-2010 Partly based on the ACE framework implementation.25 * 22-9-2010 Partly based on the ACE framework implementation.
26 */26 */
27#include <windows.h>27
28#include <stdio.h>28#ifdef HAVE_CONFIG_H
29#include "config.h"
30#endif
31
29#include <malloc.h>32#include <malloc.h>
33#include <stdio.h>
30#include <time.h>34#include <time.h>
35
36#define WIN32_LEAN_AND_MEAN
37#include <windows.h>
38
39#define WINPTHREAD_COND_DECL WINPTHREAD_API
40
41/* public header files */
31#include "pthread.h"42#include "pthread.h"
32#include "pthread_time.h"43#include "pthread_time.h"
33#include "ref.h"44/* internal header files */
34#include "cond.h"45#include "cond.h"
35#include "thread.h"
36#include "misc.h"46#include "misc.h"
37#include "winpthread_internal.h"47#include "thread.h"
3848
39#include "pthread_compat.h"49#include "pthread_compat.h"
4050
...@@ -52,41 +62,13 @@ typedef struct sCondWaitHelper {...@@ -52,41 +62,13 @@ typedef struct sCondWaitHelper {
5262
53int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout);63int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout);
5464
55#ifdef WINPTHREAD_DBG
56static int print_state = 0;
57static FILE *fo;
58void cond_print_set(int state, FILE *f)
59{
60 if (f) fo = f;
61 if (!fo) fo = stdout;
62 print_state = state;
63}
64
65void cond_print(volatile pthread_cond_t *c, char *txt)
66{
67 if (!print_state) return;
68 cond_t *c_ = (cond_t *)*c;
69 if (c_ == NULL) {
70 fprintf(fo,"C%p %lu %s\n",(void *)*c,GetCurrentThreadId(),txt);
71 } else {
72 fprintf(fo,"C%p %lu V=%0X w=%ld %s\n",
73 (void *)*c,
74 GetCurrentThreadId(),
75 (int)c_->valid,
76 c_->waiters_count_,
77 txt
78 );
79 }
80}
81#endif
82
83static pthread_spinlock_t cond_locked = PTHREAD_SPINLOCK_INITIALIZER;65static pthread_spinlock_t cond_locked = PTHREAD_SPINLOCK_INITIALIZER;
8466
85static int67static int
86cond_static_init (pthread_cond_t *c)68cond_static_init (pthread_cond_t *c)
87{69{
88 int r = 0;70 int r = 0;
89 71
90 pthread_spin_lock (&cond_locked);72 pthread_spin_lock (&cond_locked);
91 if (c == NULL)73 if (c == NULL)
92 r = EINVAL;74 r = EINVAL;
...@@ -143,40 +125,6 @@ pthread_condattr_setclock(pthread_condattr_t *a, clockid_t clock_id)...@@ -143,40 +125,6 @@ pthread_condattr_setclock(pthread_condattr_t *a, clockid_t clock_id)
143 return 0;125 return 0;
144}126}
145127
146int
147__pthread_clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *rqtp,
148 struct timespec *rmtp)
149{
150 unsigned long long tick, tick2;
151 unsigned long long delay;
152 DWORD dw;
153
154 if (clock_id != CLOCK_REALTIME
155 && clock_id != CLOCK_MONOTONIC
156 && clock_id != CLOCK_PROCESS_CPUTIME_ID)
157 return EINVAL;
158 if ((flags & TIMER_ABSTIME) != 0)
159 delay = _pthread_rel_time_in_ms (rqtp);
160 else
161 delay = _pthread_time_in_ms_from_timespec (rqtp);
162 do
163 {
164 dw = (DWORD) (delay >= 99999ULL ? 99999ULL : delay);
165 tick = _pthread_time_in_ms ();
166 pthread_delay_np_ms (dw);
167 tick2 = _pthread_time_in_ms ();
168 tick2 -= tick;
169 if (tick2 >= delay)
170 delay = 0;
171 else
172 delay -= tick2;
173 }
174 while (delay != 0ULL);
175 if (rmtp)
176 memset (rmtp, 0, sizeof (*rmtp));
177 return 0;
178}
179
180int128int
181pthread_condattr_setpshared (pthread_condattr_t *a, int s)129pthread_condattr_setpshared (pthread_condattr_t *a, int s)
182{130{
...@@ -218,7 +166,7 @@ pthread_cond_init (pthread_cond_t *c, const pthread_condattr_t *a)...@@ -218,7 +166,7 @@ pthread_cond_init (pthread_cond_t *c, const pthread_condattr_t *a)
218 _c->sema_b = CreateSemaphore (NULL, /* no security */166 _c->sema_b = CreateSemaphore (NULL, /* no security */
219 0, /* initially 0 */167 0, /* initially 0 */
220 0x7fffffff, /* max count */168 0x7fffffff, /* max count */
221 NULL); 169 NULL);
222 if (_c->sema_q == NULL || _c->sema_b == NULL) {170 if (_c->sema_q == NULL || _c->sema_b == NULL) {
223 if (_c->sema_q != NULL)171 if (_c->sema_q != NULL)
224 CloseHandle (_c->sema_q);172 CloseHandle (_c->sema_q);
...@@ -356,7 +304,7 @@ pthread_cond_broadcast (pthread_cond_t *c)...@@ -356,7 +304,7 @@ pthread_cond_broadcast (pthread_cond_t *c)
356{304{
357 cond_t *_c;305 cond_t *_c;
358 int r;306 int r;
359 int relCnt = 0; 307 int relCnt = 0;
360308
361 if (!c || !*c)309 if (!c || !*c)
362 return EINVAL;310 return EINVAL;
...@@ -465,7 +413,7 @@ tryagain:...@@ -465,7 +413,7 @@ tryagain:
465}413}
466414
467static int415static int
468pthread_cond_timedwait_impl (pthread_cond_t *c, pthread_mutex_t *external_mutex, const struct timespec *t, int rel)416pthread_cond_timedwait_impl (pthread_cond_t *c, pthread_mutex_t *external_mutex, const struct _timespec64 *t, int rel)
469{417{
470 sCondWaitHelper ch;418 sCondWaitHelper ch;
471 DWORD dwr;419 DWORD dwr;
...@@ -531,17 +479,31 @@ tryagain:...@@ -531,17 +479,31 @@ tryagain:
531}479}
532480
533int481int
534pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *t)482pthread_cond_timedwait64(pthread_cond_t *c, pthread_mutex_t *m, const struct _timespec64 *t)
535{483{
536 return pthread_cond_timedwait_impl(c, m, t, 0);484 return pthread_cond_timedwait_impl(c, m, t, 0);
537}485}
538486
539int487int
540pthread_cond_timedwait_relative_np(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *t)488pthread_cond_timedwait32(pthread_cond_t *c, pthread_mutex_t *m, const struct _timespec32 *t)
489{
490 struct _timespec64 t64 = {.tv_sec = t->tv_sec, .tv_nsec = t->tv_nsec};
491 return pthread_cond_timedwait_impl(c, m, &t64, 0);
492}
493
494int
495pthread_cond_timedwait64_relative_np(pthread_cond_t *c, pthread_mutex_t *m, const struct _timespec64 *t)
541{496{
542 return pthread_cond_timedwait_impl(c, m, t, 1);497 return pthread_cond_timedwait_impl(c, m, t, 1);
543}498}
544499
500int
501pthread_cond_timedwait32_relative_np(pthread_cond_t *c, pthread_mutex_t *m, const struct _timespec32 *t)
502{
503 struct _timespec64 t64 = {.tv_sec = t->tv_sec, .tv_nsec = t->tv_nsec};
504 return pthread_cond_timedwait_impl(c, m, &t64, 1);
505}
506
545static void507static void
546cleanup_wait (void *arg)508cleanup_wait (void *arg)
547{509{
...@@ -751,5 +713,5 @@ do_sema_b_release(HANDLE sema, LONG count,CRITICAL_SECTION *cs, LONG *val)...@@ -751,5 +713,5 @@ do_sema_b_release(HANDLE sema, LONG count,CRITICAL_SECTION *cs, LONG *val)
751 }713 }
752 InterlockedExchangeAdd(val, -count);714 InterlockedExchangeAdd(val, -count);
753 LeaveCriticalSection(cs);715 LeaveCriticalSection(cs);
754 return EINVAL; 716 return EINVAL;
755}717}
lib/libc/mingw/winpthreads/cond.h+1-7
...@@ -23,8 +23,6 @@...@@ -23,8 +23,6 @@
23#ifndef WIN_PTHREADS_COND_H23#ifndef WIN_PTHREADS_COND_H
24#define WIN_PTHREADS_COND_H24#define WIN_PTHREADS_COND_H
2525
26#include <windows.h>
27
28#define CHECK_COND(c) \26#define CHECK_COND(c) \
29 do { \27 do { \
30 if (!(c) || !*c || (*c == PTHREAD_COND_INITIALIZER) \28 if (!(c) || !*c || (*c == PTHREAD_COND_INITIALIZER) \
...@@ -40,7 +38,7 @@...@@ -40,7 +38,7 @@
40typedef struct cond_t cond_t;38typedef struct cond_t cond_t;
41struct cond_t39struct cond_t
42{40{
43 unsigned int valid; 41 unsigned int valid;
44 int busy;42 int busy;
45 LONG waiters_count_; /* Number of waiting threads. */43 LONG waiters_count_; /* Number of waiting threads. */
46 LONG waiters_count_unblock_; /* Number of waiting threads whitch can be unblocked. */44 LONG waiters_count_unblock_; /* Number of waiting threads whitch can be unblocked. */
...@@ -56,8 +54,4 @@ struct cond_t...@@ -56,8 +54,4 @@ struct cond_t
56 became signaled. */54 became signaled. */
57};55};
5856
59void cond_print_set(int state, FILE *f);
60
61void cond_print(volatile pthread_cond_t *c, char *txt);
62
63#endif57#endif
lib/libc/mingw/winpthreads/misc.c+15-2
...@@ -20,8 +20,16 @@...@@ -20,8 +20,16 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#ifdef HAVE_CONFIG_H
24#include "config.h"
25#endif
26
27#define WIN32_LEAN_AND_MEAN
23#include <windows.h>28#include <windows.h>
29
30/* public header files */
24#include "pthread.h"31#include "pthread.h"
32/* internal header files */
25#include "misc.h"33#include "misc.h"
2634
27void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL;35void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL;
...@@ -29,6 +37,8 @@ static ULONGLONG (WINAPI *_pthread_get_tick_count_64) (VOID);...@@ -29,6 +37,8 @@ static ULONGLONG (WINAPI *_pthread_get_tick_count_64) (VOID);
29HRESULT (WINAPI *_pthread_set_thread_description) (HANDLE, PCWSTR) = NULL;37HRESULT (WINAPI *_pthread_set_thread_description) (HANDLE, PCWSTR) = NULL;
3038
31#if defined(__GNUC__) || defined(__clang__)39#if defined(__GNUC__) || defined(__clang__)
40#pragma GCC diagnostic push
41#pragma GCC diagnostic ignored "-Wprio-ctor-dtor"
32__attribute__((constructor(0)))42__attribute__((constructor(0)))
33#endif43#endif
34static void winpthreads_init(void)44static void winpthreads_init(void)
...@@ -55,6 +65,9 @@ static void winpthreads_init(void)...@@ -55,6 +65,9 @@ static void winpthreads_init(void)
55 (HRESULT (WINAPI *)(HANDLE, PCWSTR))(void*) GetProcAddress(mod, "SetThreadDescription");65 (HRESULT (WINAPI *)(HANDLE, PCWSTR))(void*) GetProcAddress(mod, "SetThreadDescription");
56 }66 }
57}67}
68#if defined(__GNUC__) || defined(__clang__)
69#pragma GCC diagnostic pop
70#endif
5871
59#if defined(_MSC_VER) && !defined(__clang__)72#if defined(_MSC_VER) && !defined(__clang__)
60/* Force a reference to __xc_t to prevent whole program optimization73/* Force a reference to __xc_t to prevent whole program optimization
...@@ -82,7 +95,7 @@ unsigned long long _pthread_time_in_ms(void)...@@ -82,7 +95,7 @@ unsigned long long _pthread_time_in_ms(void)
82 - 0x19DB1DED53E8000ULL) / 10000ULL;95 - 0x19DB1DED53E8000ULL) / 10000ULL;
83}96}
8497
85unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts)98unsigned long long _pthread_time_in_ms_from_timespec(const struct _timespec64 *ts)
86{99{
87 unsigned long long t = (unsigned long long) ts->tv_sec * 1000LL;100 unsigned long long t = (unsigned long long) ts->tv_sec * 1000LL;
88 /* The +999999 is here to ensure that the division always rounds up */101 /* The +999999 is here to ensure that the division always rounds up */
...@@ -91,7 +104,7 @@ unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts)...@@ -91,7 +104,7 @@ unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts)
91 return t;104 return t;
92}105}
93106
94unsigned long long _pthread_rel_time_in_ms(const struct timespec *ts)107unsigned long long _pthread_rel_time_in_ms(const struct _timespec64 *ts)
95{108{
96 unsigned long long t1 = _pthread_time_in_ms_from_timespec(ts);109 unsigned long long t1 = _pthread_time_in_ms_from_timespec(ts);
97 unsigned long long t2 = _pthread_time_in_ms();110 unsigned long long t2 = _pthread_time_in_ms();
lib/libc/mingw/winpthreads/misc.h+4-31
...@@ -23,37 +23,10 @@...@@ -23,37 +23,10 @@
23#ifndef WIN_PTHREADS_MISC_H23#ifndef WIN_PTHREADS_MISC_H
24#define WIN_PTHREADS_MISC_H24#define WIN_PTHREADS_MISC_H
2525
26#include <limits.h>
27/* public header files */
26#include "pthread_compat.h"28#include "pthread_compat.h"
2729
28#ifndef assert
29
30#ifndef ASSERT_TRACE
31# define ASSERT_TRACE 0
32#else
33# undef ASSERT_TRACE
34# define ASSERT_TRACE 0
35#endif
36
37# define assert(e) \
38 ((e) ? ((ASSERT_TRACE) ? fprintf(stderr, \
39 "Assertion succeeded: (%s), file %s, line %d\n", \
40 #e, __FILE__, (int) __LINE__), \
41 fflush(stderr) : \
42 0) : \
43 (fprintf(stderr, "Assertion failed: (%s), file %s, line %d\n", \
44 #e, __FILE__, (int) __LINE__), exit(1), 0))
45
46# define fixme(e) \
47 ((e) ? ((ASSERT_TRACE) ? fprintf(stderr, \
48 "Assertion succeeded: (%s), file %s, line %d\n", \
49 #e, __FILE__, (int) __LINE__), \
50 fflush(stderr) : \
51 0) : \
52 (fprintf(stderr, "FIXME: (%s), file %s, line %d\n", \
53 #e, __FILE__, (int) __LINE__), 0, 0))
54
55#endif
56
57#define PTR2INT(x) ((int)(uintptr_t)(x))30#define PTR2INT(x) ((int)(uintptr_t)(x))
5831
59#if SIZE_MAX>UINT_MAX32#if SIZE_MAX>UINT_MAX
...@@ -102,8 +75,8 @@ static WINPTHREADS_INLINE unsigned long dwMilliSecs(unsigned long long ms)...@@ -102,8 +75,8 @@ static WINPTHREADS_INLINE unsigned long dwMilliSecs(unsigned long long ms)
102}75}
10376
104unsigned long long _pthread_time_in_ms(void);77unsigned long long _pthread_time_in_ms(void);
105unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts);78unsigned long long _pthread_time_in_ms_from_timespec(const struct _timespec64 *ts);
106unsigned long long _pthread_rel_time_in_ms(const struct timespec *ts);79unsigned long long _pthread_rel_time_in_ms(const struct _timespec64 *ts);
107unsigned long _pthread_wait_for_single_object (void *handle, unsigned long timeout);80unsigned long _pthread_wait_for_single_object (void *handle, unsigned long timeout);
108unsigned long _pthread_wait_for_multiple_objects (unsigned long count, void **handles, unsigned int all, unsigned long timeout);81unsigned long _pthread_wait_for_multiple_objects (unsigned long count, void **handles, unsigned int all, unsigned long timeout);
10982
lib/libc/mingw/winpthreads/mutex.c+29-6
...@@ -21,11 +21,22 @@...@@ -21,11 +21,22 @@
21 DEALINGS IN THE SOFTWARE.21 DEALINGS IN THE SOFTWARE.
22*/22*/
2323
24#include <windows.h>24#ifdef HAVE_CONFIG_H
25#include <stdio.h>25#include "config.h"
26#endif
27
26#include <malloc.h>28#include <malloc.h>
27#include <stdbool.h>29#include <stdbool.h>
30#include <stdio.h>
31
32#define WIN32_LEAN_AND_MEAN
33#include <windows.h>
34
35#define WINPTHREAD_MUTEX_DECL WINPTHREAD_API
36
37/* public header files */
28#include "pthread.h"38#include "pthread.h"
39/* internal header files */
29#include "misc.h"40#include "misc.h"
3041
31typedef enum {42typedef enum {
...@@ -184,7 +195,8 @@ pthread_mutex_lock (pthread_mutex_t *m)...@@ -184,7 +195,8 @@ pthread_mutex_lock (pthread_mutex_t *m)
184 return pthread_mutex_lock_intern (m, INFINITE);195 return pthread_mutex_lock_intern (m, INFINITE);
185}196}
186197
187int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts)198/* Internal version which always uses `struct _timespec64`. */
199static int __pthread_mutex_timedlock(pthread_mutex_t *m, const struct _timespec64 *ts)
188{200{
189 unsigned long long patience;201 unsigned long long patience;
190 if (ts != NULL) {202 if (ts != NULL) {
...@@ -199,8 +211,19 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts)...@@ -199,8 +211,19 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts)
199 return pthread_mutex_lock_intern(m, patience);211 return pthread_mutex_lock_intern(m, patience);
200}212}
201213
214int pthread_mutex_timedlock64(pthread_mutex_t *m, const struct _timespec64 *ts)
215{
216 return __pthread_mutex_timedlock (m, ts);
217}
218
219int pthread_mutex_timedlock32(pthread_mutex_t *m, const struct _timespec32 *ts)
220{
221 struct _timespec64 ts64 = {.tv_sec = ts->tv_sec, .tv_nsec = ts->tv_nsec};
222 return __pthread_mutex_timedlock (m, &ts64);
223}
224
202int pthread_mutex_unlock(pthread_mutex_t *m)225int pthread_mutex_unlock(pthread_mutex_t *m)
203{ 226{
204 /* Here m might an initialiser of an error-checking or recursive mutex, in227 /* Here m might an initialiser of an error-checking or recursive mutex, in
205 which case the behaviour is well-defined, so we can't skip this check. */228 which case the behaviour is well-defined, so we can't skip this check. */
206 mutex_impl_t *mi = mutex_impl(m);229 mutex_impl_t *mi = mutex_impl(m);
...@@ -305,9 +328,9 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *a, int *type)...@@ -305,9 +328,9 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *a, int *type)
305{328{
306 if (!a || !type)329 if (!a || !type)
307 return EINVAL;330 return EINVAL;
308 331
309 *type = *a & 3;332 *type = *a & 3;
310 333
311 return 0;334 return 0;
312}335}
313336
lib/libc/mingw/winpthreads/nanosleep.c+41-3
...@@ -4,12 +4,24 @@...@@ -4,12 +4,24 @@
4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.4 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
5 */5 */
66
7#ifdef HAVE_CONFIG_H
8#include "config.h"
9#endif
10
11#include <assert.h>
7#include <errno.h>12#include <errno.h>
8#include <time.h>13#include <time.h>
14
15#define WIN32_LEAN_AND_MEAN
9#include <windows.h>16#include <windows.h>
17
18#define WINPTHREAD_NANOSLEEP_DECL WINPTHREAD_API
19
20/* public header files */
10#include "pthread.h"21#include "pthread.h"
11#include "pthread_time.h"22#include "pthread_time.h"
12#include "winpthread_internal.h"23/* internal header files */
24#include "thread.h"
1325
14#define POW10_3 100026#define POW10_3 1000
15#define POW10_4 1000027#define POW10_4 10000
...@@ -25,7 +37,7 @@...@@ -25,7 +37,7 @@
25 * If the function fails, the return value is -1,37 * If the function fails, the return value is -1,
26 * with errno set to indicate the error.38 * with errno set to indicate the error.
27 */39 */
28int nanosleep(const struct timespec *request, struct timespec *remain)40static int __nanosleep(const struct _timespec64 *request, struct _timespec64 *remain)
29{41{
30 unsigned long ms, rc = 0;42 unsigned long ms, rc = 0;
31 unsigned __int64 u64, want, real;43 unsigned __int64 u64, want, real;
...@@ -48,7 +60,7 @@ int nanosleep(const struct timespec *request, struct timespec *remain)...@@ -48,7 +60,7 @@ int nanosleep(const struct timespec *request, struct timespec *remain)
48 else ms = (unsigned long) u64;60 else ms = (unsigned long) u64;
4961
50 u64 -= ms;62 u64 -= ms;
51 rc = pthread_delay_np_ms(ms);63 rc = _pthread_delay_np_ms(ms);
52 }64 }
5365
54 if (rc != 0) { /* WAIT_IO_COMPLETION (192) */66 if (rc != 0) { /* WAIT_IO_COMPLETION (192) */
...@@ -69,3 +81,29 @@ int nanosleep(const struct timespec *request, struct timespec *remain)...@@ -69,3 +81,29 @@ int nanosleep(const struct timespec *request, struct timespec *remain)
6981
70 return 0;82 return 0;
71}83}
84
85int nanosleep64(const struct _timespec64 *request, struct _timespec64 *remain)
86{
87 return __nanosleep (request, remain);
88}
89
90int nanosleep32(const struct _timespec32 *request, struct _timespec32 *remain)
91{
92 struct _timespec64 request64 = {
93 .tv_sec = request->tv_sec,
94 .tv_nsec = request->tv_nsec
95 };
96 struct _timespec64 remain64 = {0};
97
98 if (__nanosleep (&request64, &remain64) == -1)
99 return -1;
100
101 assert (remain64.tv_sec <= INT_MAX);
102
103 if (remain != NULL) {
104 remain->tv_sec = (__time32_t)remain64.tv_sec;
105 remain->tv_nsec = remain64.tv_nsec;
106 }
107
108 return 0;
109}
lib/libc/mingw/winpthreads/ref.c deleted-34
...@@ -1,34 +0,0 @@
1/*
2 Copyright (c) 2011-2016 mingw-w64 project
3
4 Permission is hereby granted, free of charge, to any person obtaining a
5 copy of this software and associated documentation files (the "Software"),
6 to deal in the Software without restriction, including without limitation
7 the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 and/or sell copies of the Software, and to permit persons to whom the
9 Software is furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in
12 all copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 DEALINGS IN THE SOFTWARE.
21*/
22
23#include <windows.h>
24#include <winternl.h>
25#include <stdio.h>
26#include "pthread.h"
27#include "semaphore.h"
28#include "rwlock.h"
29#include "cond.h"
30#include "barrier.h"
31#include "sem.h"
32#include "ref.h"
33#include "misc.h"
34
lib/libc/mingw/winpthreads/ref.h deleted-29
...@@ -1,29 +0,0 @@
1/*
2 Copyright (c) 2011-2016 mingw-w64 project
3
4 Permission is hereby granted, free of charge, to any person obtaining a
5 copy of this software and associated documentation files (the "Software"),
6 to deal in the Software without restriction, including without limitation
7 the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 and/or sell copies of the Software, and to permit persons to whom the
9 Software is furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in
12 all copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 DEALINGS IN THE SOFTWARE.
21*/
22
23#ifndef WIN_PTHREADS_REF_H
24#define WIN_PTHREADS_REF_H
25#include "pthread.h"
26#include "semaphore.h"
27
28#endif
29
lib/libc/mingw/winpthreads/rwlock.c+57-48
...@@ -20,14 +20,25 @@...@@ -20,14 +20,25 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#include <windows.h>23#ifdef HAVE_CONFIG_H
24#include <stdio.h>24#include "config.h"
25#endif
26
27#include <assert.h>
25#include <malloc.h>28#include <malloc.h>
29#include <stdio.h>
30
31#define WIN32_LEAN_AND_MEAN
32#include <windows.h>
33
34#define WINPTHREAD_RWLOCK_DECL WINPTHREAD_API
35
36/* public header files */
26#include "pthread.h"37#include "pthread.h"
27#include "thread.h"38/* internal header files */
28#include "ref.h"
29#include "rwlock.h"
30#include "misc.h"39#include "misc.h"
40#include "rwlock.h"
41#include "thread.h"
3142
32static pthread_spinlock_t rwl_global = PTHREAD_SPINLOCK_INITIALIZER;43static pthread_spinlock_t rwl_global = PTHREAD_SPINLOCK_INITIALIZER;
3344
...@@ -36,9 +47,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t...@@ -36,9 +47,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t
36static WINPTHREADS_ATTRIBUTE((noinline)) int rwl_unref(volatile pthread_rwlock_t *rwl, int res)47static WINPTHREADS_ATTRIBUTE((noinline)) int rwl_unref(volatile pthread_rwlock_t *rwl, int res)
37{48{
38 pthread_spin_lock(&rwl_global);49 pthread_spin_lock(&rwl_global);
39#ifdef WINPTHREAD_DBG
40 assert((((rwlock_t *)*rwl)->valid == LIFE_RWLOCK) && (((rwlock_t *)*rwl)->busy > 0));50 assert((((rwlock_t *)*rwl)->valid == LIFE_RWLOCK) && (((rwlock_t *)*rwl)->busy > 0));
41#endif
42 ((rwlock_t *)*rwl)->busy--;51 ((rwlock_t *)*rwl)->busy--;
43 pthread_spin_unlock(&rwl_global);52 pthread_spin_unlock(&rwl_global);
44 return res;53 return res;
...@@ -87,7 +96,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwl_ref_destroy(pthread_rwlock_t *r...@@ -87,7 +96,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwl_ref_destroy(pthread_rwlock_t *r
8796
88 *rDestroy = (pthread_rwlock_t)NULL;97 *rDestroy = (pthread_rwlock_t)NULL;
89 pthread_spin_lock(&rwl_global);98 pthread_spin_lock(&rwl_global);
90 99
91 if (!rwl || !*rwl) r = EINVAL;100 if (!rwl || !*rwl) r = EINVAL;
92 else {101 else {
93 rwlock_t *r_ = (rwlock_t *)*rwl;102 rwlock_t *r_ = (rwlock_t *)*rwl;
...@@ -128,30 +137,6 @@ static int rwlock_free_both_locks(rwlock_t *rwlock, int last_fail)...@@ -128,30 +137,6 @@ static int rwlock_free_both_locks(rwlock_t *rwlock, int last_fail)
128 return ret;137 return ret;
129}138}
130139
131#ifdef WINPTHREAD_DBG
132static int print_state = 0;
133void rwl_print_set(int state)
134{
135 print_state = state;
136}
137
138void rwl_print(volatile pthread_rwlock_t *rwl, char *txt)
139{
140 if (!print_state) return;
141 rwlock_t *r = (rwlock_t *)*rwl;
142 if (r == NULL) {
143 printf("RWL%p %lu %s\n",(void *)*rwl,GetCurrentThreadId(),txt);
144 } else {
145 printf("RWL%p %lu V=%0X B=%d r=%ld w=%ld L=%p %s\n",
146 (void *)*rwl,
147 GetCurrentThreadId(),
148 (int)r->valid,
149 (int)r->busy,
150 0L,0L,NULL,txt);
151 }
152}
153#endif
154
155static pthread_spinlock_t cond_locked = PTHREAD_SPINLOCK_INITIALIZER;140static pthread_spinlock_t cond_locked = PTHREAD_SPINLOCK_INITIALIZER;
156141
157static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t *rw)142static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t *rw)
...@@ -165,7 +150,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t...@@ -165,7 +150,7 @@ static WINPTHREADS_ATTRIBUTE((noinline)) int rwlock_static_init(pthread_rwlock_t
165 }150 }
166 r = pthread_rwlock_init (rw, NULL);151 r = pthread_rwlock_init (rw, NULL);
167 pthread_spin_unlock(&cond_locked);152 pthread_spin_unlock(&cond_locked);
168 153
169 return r;154 return r;
170}155}
171156
...@@ -178,7 +163,7 @@ int pthread_rwlock_init (pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *...@@ -178,7 +163,7 @@ int pthread_rwlock_init (pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *
178 return EINVAL;163 return EINVAL;
179 *rwlock_ = (pthread_rwlock_t)NULL;164 *rwlock_ = (pthread_rwlock_t)NULL;
180 if ((rwlock = calloc(1, sizeof(*rwlock))) == NULL)165 if ((rwlock = calloc(1, sizeof(*rwlock))) == NULL)
181 return ENOMEM; 166 return ENOMEM;
182 rwlock->valid = DEAD_RWLOCK;167 rwlock->valid = DEAD_RWLOCK;
183168
184 rwlock->nex_count = rwlock->nsh_count = rwlock->ncomplete = 0;169 rwlock->nex_count = rwlock->nsh_count = rwlock->ncomplete = 0;
...@@ -203,18 +188,18 @@ int pthread_rwlock_init (pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *...@@ -203,18 +188,18 @@ int pthread_rwlock_init (pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *
203 rwlock->valid = LIFE_RWLOCK;188 rwlock->valid = LIFE_RWLOCK;
204 *rwlock_ = (pthread_rwlock_t)rwlock;189 *rwlock_ = (pthread_rwlock_t)rwlock;
205 return r;190 return r;
206} 191}
207192
208int pthread_rwlock_destroy (pthread_rwlock_t *rwlock_)193int pthread_rwlock_destroy (pthread_rwlock_t *rwlock_)
209{194{
210 rwlock_t *rwlock;195 rwlock_t *rwlock;
211 pthread_rwlock_t rDestroy;196 pthread_rwlock_t rDestroy;
212 int r, r2;197 int r, r2;
213 198
214 pthread_spin_lock(&cond_locked);199 pthread_spin_lock(&cond_locked);
215 r = rwl_ref_destroy(rwlock_,&rDestroy);200 r = rwl_ref_destroy(rwlock_,&rDestroy);
216 pthread_spin_unlock(&cond_locked);201 pthread_spin_unlock(&cond_locked);
217 202
218 if(r) return r;203 if(r) return r;
219 if(!rDestroy) return 0; /* destroyed a (still) static initialized rwl */204 if(!rDestroy) return 0; /* destroyed a (still) static initialized rwl */
220205
...@@ -245,7 +230,7 @@ int pthread_rwlock_destroy (pthread_rwlock_t *rwlock_)...@@ -245,7 +230,7 @@ int pthread_rwlock_destroy (pthread_rwlock_t *rwlock_)
245 rwlock->valid = DEAD_RWLOCK;230 rwlock->valid = DEAD_RWLOCK;
246 free((void *)rDestroy);231 free((void *)rDestroy);
247 return 0;232 return 0;
248} 233}
249234
250int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock_)235int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock_)
251{236{
...@@ -279,7 +264,8 @@ int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock_)...@@ -279,7 +264,8 @@ int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock_)
279 return rwl_unref(rwlock_, ret);264 return rwl_unref(rwlock_, ret);
280}265}
281266
282int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct timespec *ts)267/* Internal version which always uses `struct _timespec64`. */
268static int __pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct _timespec64 *ts)
283{269{
284 rwlock_t *rwlock;270 rwlock_t *rwlock;
285 int ret;271 int ret;
...@@ -290,12 +276,12 @@ int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct timespec...@@ -290,12 +276,12 @@ int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct timespec
290 if(ret != 0) return ret;276 if(ret != 0) return ret;
291277
292 rwlock = (rwlock_t *)*rwlock_;278 rwlock = (rwlock_t *)*rwlock_;
293 if ((ret = pthread_mutex_timedlock (&rwlock->mex, ts)) != 0)279 if ((ret = pthread_mutex_timedlock64 (&rwlock->mex, ts)) != 0)
294 return rwl_unref(rwlock_, ret);280 return rwl_unref(rwlock_, ret);
295 InterlockedIncrement(&rwlock->nsh_count);281 InterlockedIncrement(&rwlock->nsh_count);
296 if (rwlock->nsh_count == INT_MAX)282 if (rwlock->nsh_count == INT_MAX)
297 {283 {
298 ret = pthread_mutex_timedlock(&rwlock->mcomplete, ts);284 ret = pthread_mutex_timedlock64(&rwlock->mcomplete, ts);
299 if (ret != 0)285 if (ret != 0)
300 {286 {
301 if (ret == ETIMEDOUT)287 if (ret == ETIMEDOUT)
...@@ -312,6 +298,17 @@ int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct timespec...@@ -312,6 +298,17 @@ int pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock_, const struct timespec
312 return rwl_unref(rwlock_, ret);298 return rwl_unref(rwlock_, ret);
313}299}
314300
301int pthread_rwlock_timedrdlock64(pthread_rwlock_t *l, const struct _timespec64 *ts)
302{
303 return __pthread_rwlock_timedrdlock (l, ts);
304}
305
306int pthread_rwlock_timedrdlock32(pthread_rwlock_t *l, const struct _timespec32 *ts)
307{
308 struct _timespec64 ts64 = {.tv_sec = ts->tv_sec, .tv_nsec = ts->tv_nsec};
309 return __pthread_rwlock_timedrdlock (l, &ts64);
310}
311
315int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock_)312int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock_)
316{313{
317 rwlock_t *rwlock;314 rwlock_t *rwlock;
...@@ -340,7 +337,7 @@ int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock_)...@@ -340,7 +337,7 @@ int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock_)
340 }337 }
341 ret = pthread_mutex_unlock(&rwlock->mex);338 ret = pthread_mutex_unlock(&rwlock->mex);
342 return rwl_unref(rwlock_,ret);339 return rwl_unref(rwlock_,ret);
343} 340}
344341
345int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock_)342int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock_)
346{343{
...@@ -378,7 +375,7 @@ int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock_)...@@ -378,7 +375,7 @@ int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock_)
378 }375 }
379 rwlock->nex_count = 1;376 rwlock->nex_count = 1;
380 return rwl_unref(rwlock_, 0);377 return rwl_unref(rwlock_, 0);
381} 378}
382379
383int pthread_rwlock_unlock (pthread_rwlock_t *rwlock_)380int pthread_rwlock_unlock (pthread_rwlock_t *rwlock_)
384{381{
...@@ -409,7 +406,7 @@ int pthread_rwlock_unlock (pthread_rwlock_t *rwlock_)...@@ -409,7 +406,7 @@ int pthread_rwlock_unlock (pthread_rwlock_t *rwlock_)
409 ret = rwlock_free_both_locks(rwlock, 0);406 ret = rwlock_free_both_locks(rwlock, 0);
410 }407 }
411 return rwl_unref(rwlock_, ret);408 return rwl_unref(rwlock_, ret);
412} 409}
413410
414static void st_cancelwrite (void *arg)411static void st_cancelwrite (void *arg)
415{412{
...@@ -459,7 +456,8 @@ int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock_)...@@ -459,7 +456,8 @@ int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock_)
459 return rwl_unref(rwlock_,ret);456 return rwl_unref(rwlock_,ret);
460}457}
461458
462int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec *ts)459/* Internal version which always uses `struct _timespec64`. */
460static int __pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct _timespec64 *ts)
463{461{
464 int ret;462 int ret;
465 rwlock_t *rwlock;463 rwlock_t *rwlock;
...@@ -471,10 +469,10 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec...@@ -471,10 +469,10 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec
471 return ret;469 return ret;
472 rwlock = (rwlock_t *)*rwlock_;470 rwlock = (rwlock_t *)*rwlock_;
473471
474 ret = pthread_mutex_timedlock(&rwlock->mex, ts);472 ret = pthread_mutex_timedlock64(&rwlock->mex, ts);
475 if (ret != 0)473 if (ret != 0)
476 return rwl_unref(rwlock_,ret);474 return rwl_unref(rwlock_,ret);
477 ret = pthread_mutex_timedlock (&rwlock->mcomplete, ts);475 ret = pthread_mutex_timedlock64(&rwlock->mcomplete, ts);
478 if (ret != 0)476 if (ret != 0)
479 {477 {
480 pthread_mutex_unlock(&rwlock->mex);478 pthread_mutex_unlock(&rwlock->mex);
...@@ -492,7 +490,7 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec...@@ -492,7 +490,7 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec
492 rwlock->ncomplete = -rwlock->nsh_count;490 rwlock->ncomplete = -rwlock->nsh_count;
493 pthread_cleanup_push(st_cancelwrite, (void *) rwlock);491 pthread_cleanup_push(st_cancelwrite, (void *) rwlock);
494 do {492 do {
495 ret = pthread_cond_timedwait(&rwlock->ccomplete, &rwlock->mcomplete, ts);493 ret = pthread_cond_timedwait64(&rwlock->ccomplete, &rwlock->mcomplete, ts);
496 } while (rwlock->ncomplete < 0 && !ret);494 } while (rwlock->ncomplete < 0 && !ret);
497 pthread_cleanup_pop(!ret ? 0 : 1);495 pthread_cleanup_pop(!ret ? 0 : 1);
498496
...@@ -505,6 +503,17 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec...@@ -505,6 +503,17 @@ int pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock_, const struct timespec
505 return rwl_unref(rwlock_,ret);503 return rwl_unref(rwlock_,ret);
506}504}
507505
506int pthread_rwlock_timedwrlock64(pthread_rwlock_t *rwlock, const struct _timespec64 *ts)
507{
508 return __pthread_rwlock_timedwrlock (rwlock, ts);
509}
510
511int pthread_rwlock_timedwrlock32(pthread_rwlock_t *rwlock, const struct _timespec32 *ts)
512{
513 struct _timespec64 ts64 = {.tv_sec = ts->tv_sec, .tv_nsec = ts->tv_nsec};
514 return __pthread_rwlock_timedwrlock (rwlock, &ts64);
515}
516
508int pthread_rwlockattr_destroy(pthread_rwlockattr_t *a)517int pthread_rwlockattr_destroy(pthread_rwlockattr_t *a)
509{518{
510 if (!a)519 if (!a)
lib/libc/mingw/winpthreads/rwlock.h-3
...@@ -43,7 +43,4 @@ struct rwlock_t {...@@ -43,7 +43,4 @@ struct rwlock_t {
43#define RWL_SET 0x0143#define RWL_SET 0x01
44#define RWL_TRY 0x0244#define RWL_TRY 0x02
4545
46void rwl_print(volatile pthread_rwlock_t *rwl, char *txt);
47void rwl_print_set(int state);
48
49#endif46#endif
lib/libc/mingw/winpthreads/sched.c+11-3
...@@ -20,12 +20,20 @@...@@ -20,12 +20,20 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#include <windows.h>23#ifdef HAVE_CONFIG_H
24#include "config.h"
25#endif
26
24#include <stdio.h>27#include <stdio.h>
25#include "pthread.h"
26#include "thread.h"
2728
29#define WIN32_LEAN_AND_MEAN
30#include <windows.h>
31
32/* public header files */
33#include "pthread.h"
34/* internal header files */
28#include "misc.h"35#include "misc.h"
36#include "thread.h"
2937
30int sched_get_priority_min(int pol)38int sched_get_priority_min(int pol)
31{39{
lib/libc/mingw/winpthreads/sem.c+28-8
...@@ -20,15 +20,23 @@...@@ -20,15 +20,23 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#include <windows.h>23#ifdef HAVE_CONFIG_H
24#include <stdio.h>24#include "config.h"
25#endif
26
25#include <malloc.h>27#include <malloc.h>
28#include <stdio.h>
29
30#define WIN32_LEAN_AND_MEAN
31#include <windows.h>
32
33/* public header files */
26#include "pthread.h"34#include "pthread.h"
27#include "thread.h"
28#include "misc.h"
29#include "semaphore.h"35#include "semaphore.h"
36/* internal header files */
37#include "misc.h"
30#include "sem.h"38#include "sem.h"
31#include "ref.h"39#include "thread.h"
3240
33int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout);41int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout);
3442
...@@ -212,8 +220,9 @@ sem_wait (sem_t *sem)...@@ -212,8 +220,9 @@ sem_wait (sem_t *sem)
212 return sem_result (ret);220 return sem_result (ret);
213}221}
214222
215int223/* Internal version which always uses `struct _timespec64`. */
216sem_timedwait (sem_t *sem, const struct timespec *t)224static int
225__sem_timedwait (sem_t *sem, const struct _timespec64 *t)
217{226{
218 int cur_v, ret = 0;227 int cur_v, ret = 0;
219 DWORD dwr;228 DWORD dwr;
...@@ -251,6 +260,17 @@ sem_timedwait (sem_t *sem, const struct timespec *t)...@@ -251,6 +260,17 @@ sem_timedwait (sem_t *sem, const struct timespec *t)
251 return sem_result (ret);260 return sem_result (ret);
252}261}
253262
263int sem_timedwait64(sem_t *sem, const struct _timespec64 *t)
264{
265 return __sem_timedwait (sem, t);
266}
267
268int sem_timedwait32(sem_t *sem, const struct _timespec32 *t)
269{
270 struct _timespec64 t64 = {.tv_sec = t->tv_sec, .tv_nsec = t->tv_nsec};
271 return __sem_timedwait (sem, &t64);
272}
273
254int274int
255sem_post (sem_t *sem)275sem_post (sem_t *sem)
256{276{
...@@ -350,5 +370,5 @@ sem_getvalue (sem_t *sem, int *sval)...@@ -350,5 +370,5 @@ sem_getvalue (sem_t *sem, int *sval)
350370
351 *sval = (int) sv->value;371 *sval = (int) sv->value;
352 pthread_mutex_unlock (&sv->vlock);372 pthread_mutex_unlock (&sv->vlock);
353 return 0; 373 return 0;
354}374}
lib/libc/mingw/winpthreads/sem.h-2
...@@ -23,8 +23,6 @@...@@ -23,8 +23,6 @@
23#ifndef WIN_SEM23#ifndef WIN_SEM
24#define WIN_SEM24#define WIN_SEM
2525
26#include <windows.h>
27
28#define LIFE_SEM 0xBAB1F00D26#define LIFE_SEM 0xBAB1F00D
29#define DEAD_SEM 0xDEADBEEF27#define DEAD_SEM 0xDEADBEEF
3028
lib/libc/mingw/winpthreads/spinlock.c+9-1
...@@ -21,8 +21,16 @@...@@ -21,8 +21,16 @@
21 DEALINGS IN THE SOFTWARE.21 DEALINGS IN THE SOFTWARE.
22*/22*/
2323
24#ifdef HAVE_CONFIG_H
25#include "config.h"
26#endif
27
28#define WIN32_LEAN_AND_MEAN
24#include <windows.h>29#include <windows.h>
30
31/* public header files */
25#include "pthread.h"32#include "pthread.h"
33/* internal header files */
26#include "misc.h"34#include "misc.h"
2735
28/* We use the pthread_spinlock_t itself as a lock:36/* We use the pthread_spinlock_t itself as a lock:
...@@ -56,7 +64,7 @@ pthread_spin_lock (pthread_spinlock_t *lock)...@@ -56,7 +64,7 @@ pthread_spin_lock (pthread_spinlock_t *lock)
56 } while (*lk == 0);64 } while (*lk == 0);
57 return 0;65 return 0;
58}66}
59 67
60int68int
61pthread_spin_trylock (pthread_spinlock_t *lock)69pthread_spin_trylock (pthread_spinlock_t *lock)
62{70{
lib/libc/mingw/winpthreads/thread.c+55-57
...@@ -20,16 +20,27 @@...@@ -20,16 +20,27 @@
20 DEALINGS IN THE SOFTWARE.20 DEALINGS IN THE SOFTWARE.
21*/21*/
2222
23#include <windows.h>23#ifdef HAVE_CONFIG_H
24#include <strsafe.h>24#include "config.h"
25#include <stdio.h>25#endif
26#include <stdlib.h>26
27#include <malloc.h>27#include <malloc.h>
28#include <signal.h>28#include <signal.h>
29#include <stdio.h>
30#include <stdlib.h>
31#include <wchar.h>
32
33#define WIN32_LEAN_AND_MEAN
34#include <windows.h>
35#include <strsafe.h>
36
37#define WINPTHREAD_THREAD_DECL WINPTHREAD_API
38
39/* public header files */
29#include "pthread.h"40#include "pthread.h"
30#include "thread.h"41/* internal header files */
31#include "misc.h"42#include "misc.h"
32#include "winpthread_internal.h"43#include "thread.h"
3344
34static _pthread_v *__pthread_self_lite (void);45static _pthread_v *__pthread_self_lite (void);
3546
...@@ -537,34 +548,6 @@ WINPTHREADS_ATTRIBUTE((WINPTHREADS_SECTION(".CRT$XLF")))...@@ -537,34 +548,6 @@ WINPTHREADS_ATTRIBUTE((WINPTHREADS_SECTION(".CRT$XLF")))
537extern const PIMAGE_TLS_CALLBACK __xl_f;548extern const PIMAGE_TLS_CALLBACK __xl_f;
538const PIMAGE_TLS_CALLBACK __xl_f = __dyn_tls_pthread;549const PIMAGE_TLS_CALLBACK __xl_f = __dyn_tls_pthread;
539550
540
541#ifdef WINPTHREAD_DBG
542static int print_state = 0;
543void thread_print_set (int state)
544{
545 print_state = state;
546}
547
548void
549thread_print (volatile pthread_t t, char *txt)
550{
551 if (!print_state)
552 return;
553 if (!t)
554 printf("T%p %lu %s\n",NULL,GetCurrentThreadId(),txt);
555 else
556 {
557 printf("T%p %lu V=%0X H=%p %s\n",
558 (void *) __pth_gpointer_locked (t),
559 GetCurrentThreadId(),
560 (__pth_gpointer_locked (t))->valid,
561 (__pth_gpointer_locked (t))->h,
562 txt
563 );
564 }
565}
566#endif
567
568/* Internal collect-once structure. */551/* Internal collect-once structure. */
569typedef struct collect_once_t {552typedef struct collect_once_t {
570 pthread_once_t *o;553 pthread_once_t *o;
...@@ -677,8 +660,8 @@ pthread_timechange_handler_np(void *dummy)...@@ -677,8 +660,8 @@ pthread_timechange_handler_np(void *dummy)
677660
678/* Compatibility routine for pthread-win32. It waits for ellapse of661/* Compatibility routine for pthread-win32. It waits for ellapse of
679 interval and additionally checks for possible thread-cancelation. */662 interval and additionally checks for possible thread-cancelation. */
680int663static int
681pthread_delay_np (const struct timespec *interval)664__pthread_delay_np (const struct _timespec64 *interval)
682{665{
683 DWORD to = (!interval ? 0 : dwMilliSecs (_pthread_time_in_ms_from_timespec (interval)));666 DWORD to = (!interval ? 0 : dwMilliSecs (_pthread_time_in_ms_from_timespec (interval)));
684 struct _pthread_v *s = __pthread_self_lite ();667 struct _pthread_v *s = __pthread_self_lite ();
...@@ -699,10 +682,21 @@ pthread_delay_np (const struct timespec *interval)...@@ -699,10 +682,21 @@ pthread_delay_np (const struct timespec *interval)
699 return 0;682 return 0;
700}683}
701684
702int pthread_delay_np_ms (DWORD to);685int
686pthread_delay64_np (const struct _timespec64 *interval)
687{
688 return __pthread_delay_np(interval);
689}
690
691int
692pthread_delay32_np (const struct _timespec32 *interval)
693{
694 struct _timespec64 interval64 = {.tv_sec = interval->tv_sec, .tv_nsec = interval->tv_nsec};
695 return __pthread_delay_np(&interval64);
696}
703697
704int698int
705pthread_delay_np_ms (DWORD to)699_pthread_delay_np_ms (DWORD to)
706{700{
707 struct _pthread_v *s = __pthread_self_lite ();701 struct _pthread_v *s = __pthread_self_lite ();
708702
...@@ -725,7 +719,7 @@ pthread_delay_np_ms (DWORD to)...@@ -725,7 +719,7 @@ pthread_delay_np_ms (DWORD to)
725/* Compatibility routine for pthread-win32. It returns the719/* Compatibility routine for pthread-win32. It returns the
726 amount of available CPUs on system. */720 amount of available CPUs on system. */
727int721int
728pthread_num_processors_np(void) 722pthread_num_processors_np(void)
729{723{
730 int r = 0;724 int r = 0;
731 DWORD_PTR ProcessAffinityMask, SystemAffinityMask;725 DWORD_PTR ProcessAffinityMask, SystemAffinityMask;
...@@ -742,10 +736,10 @@ pthread_num_processors_np(void)...@@ -742,10 +736,10 @@ pthread_num_processors_np(void)
742/* Compatiblity routine for pthread-win32. Allows to set amount of used736/* Compatiblity routine for pthread-win32. Allows to set amount of used
743 CPUs for process. */737 CPUs for process. */
744int738int
745pthread_set_num_processors_np(int n) 739pthread_set_num_processors_np(int n)
746{740{
747 DWORD_PTR ProcessAffinityMask, ProcessNewAffinityMask = 0, SystemAffinityMask;741 DWORD_PTR ProcessAffinityMask, ProcessNewAffinityMask = 0, SystemAffinityMask;
748 int r = 0; 742 int r = 0;
749 /* need at least 1 */743 /* need at least 1 */
750 n = n ? n : 1;744 n = n ? n : 1;
751 if (GetProcessAffinityMask (GetCurrentProcess (), &ProcessAffinityMask, &SystemAffinityMask))745 if (GetProcessAffinityMask (GetCurrentProcess (), &ProcessAffinityMask, &SystemAffinityMask))
...@@ -878,7 +872,7 @@ pthread_key_delete (pthread_key_t key)...@@ -878,7 +872,7 @@ pthread_key_delete (pthread_key_t key)
878 return EINVAL;872 return EINVAL;
879873
880 pthread_rwlock_wrlock (&_pthread_key_lock);874 pthread_rwlock_wrlock (&_pthread_key_lock);
881 875
882 _pthread_key_dest[key] = NULL;876 _pthread_key_dest[key] = NULL;
883877
884 /* Start next search from our location */878 /* Start next search from our location */
...@@ -910,7 +904,7 @@ pthread_setspecific (pthread_key_t key, const void *value)...@@ -910,7 +904,7 @@ pthread_setspecific (pthread_key_t key, const void *value)
910{904{
911 DWORD lasterr = GetLastError ();905 DWORD lasterr = GetLastError ();
912 _pthread_v *t = __pthread_self_lite ();906 _pthread_v *t = __pthread_self_lite ();
913 907
914 pthread_spin_lock (&t->spin_keys);908 pthread_spin_lock (&t->spin_keys);
915909
916 if (key >= t->keymax)910 if (key >= t->keymax)
...@@ -1522,7 +1516,7 @@ void _fpreset (void);...@@ -1522,7 +1516,7 @@ void _fpreset (void);
15221516
1523#if defined(__i386__)1517#if defined(__i386__)
1524/* Align ESP on 16-byte boundaries. */1518/* Align ESP on 16-byte boundaries. */
1525# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)1519# if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
1526__attribute__((force_align_arg_pointer))1520__attribute__((force_align_arg_pointer))
1527# endif1521# endif
1528#endif1522#endif
...@@ -1553,17 +1547,7 @@ pthread_create_wrapper (void *args)...@@ -1553,17 +1547,7 @@ pthread_create_wrapper (void *args)
1553 if (tv->func)1547 if (tv->func)
1554 trslt = (intptr_t) tv->func(tv->ret_arg);1548 trslt = (intptr_t) tv->func(tv->ret_arg);
1555 #ifdef __SEH__1549 #ifdef __SEH__
1556 asm ("\tnop\n\t.tl_end: nop\n"1550 asm ("\tnop\n\t.tl_end: nop\n");
1557#ifdef __arm__
1558 "\t.seh_handler __C_specific_handler, %except\n"
1559#else
1560 "\t.seh_handler __C_specific_handler, @except\n"
1561#endif
1562 "\t.seh_handlerdata\n"
1563 "\t.long 1\n"
1564 "\t.rva .tl_start, .tl_end, _gnu_exception_handler ,.tl_end\n"
1565 "\t.text"
1566 );
1567 #endif1551 #endif
1568 pthread_mutex_lock (&mtx_pthr_locked);1552 pthread_mutex_lock (&mtx_pthr_locked);
1569 tv->ret_arg = (void*) trslt;1553 tv->ret_arg = (void*) trslt;
...@@ -1601,6 +1585,19 @@ pthread_create_wrapper (void *args)...@@ -1601,6 +1585,19 @@ pthread_create_wrapper (void *args)
1601 Sleep (0);1585 Sleep (0);
1602 _endthreadex (rslt);1586 _endthreadex (rslt);
1603 return rslt;1587 return rslt;
1588
1589#if defined(__SEH__)
1590 asm(
1591#ifdef __arm__
1592 "\t.seh_handler __C_specific_handler, %except\n"
1593#else
1594 "\t.seh_handler __C_specific_handler, @except\n"
1595#endif
1596 "\t.seh_handlerdata\n"
1597 "\t.long 1\n"
1598 "\t.rva .tl_start, .tl_end, _gnu_exception_handler ,.tl_end\n"
1599 "\t.text\n");
1600#endif
1604}1601}
16051602
1606int1603int
...@@ -1881,13 +1878,14 @@ pthread_setname_np (pthread_t thread, const char *name)...@@ -1881,13 +1878,14 @@ pthread_setname_np (pthread_t thread, const char *name)
18811878
1882 if (_pthread_set_thread_description != NULL)1879 if (_pthread_set_thread_description != NULL)
1883 {1880 {
1884 size_t required_size = mbstowcs(NULL, name, 0);1881 mbstate_t mbs = {0};
1882 size_t required_size = mbsrtowcs(NULL, &name, 0, &mbs);
1885 if (required_size != (size_t)-1)1883 if (required_size != (size_t)-1)
1886 {1884 {
1887 wchar_t *wname = malloc((required_size + 1) * sizeof(wchar_t));1885 wchar_t *wname = malloc((required_size + 1) * sizeof(wchar_t));
1888 if (wname != NULL)1886 if (wname != NULL)
1889 {1887 {
1890 mbstowcs(wname, name, required_size + 1);1888 mbsrtowcs(wname, &name, required_size + 1, &mbs);
1891 _pthread_set_thread_description(tv->h, wname);1889 _pthread_set_thread_description(tv->h, wname);
1892 free(wname);1890 free(wname);
1893 }1891 }
lib/libc/mingw/winpthreads/thread.h+2-5
...@@ -23,8 +23,8 @@...@@ -23,8 +23,8 @@
23#ifndef WIN_PTHREAD_H23#ifndef WIN_PTHREAD_H
24#define WIN_PTHREAD_H24#define WIN_PTHREAD_H
2525
26#include <windows.h>
27#include <setjmp.h>26#include <setjmp.h>
27/* internal header files */
28#include "rwlock.h"28#include "rwlock.h"
2929
30#define LIFE_THREAD 0xBAB1F00D30#define LIFE_THREAD 0xBAB1F00D
...@@ -69,11 +69,8 @@ typedef struct __pthread_idlist {...@@ -69,11 +69,8 @@ typedef struct __pthread_idlist {
6969
70int _pthread_tryjoin(pthread_t t, void **res);70int _pthread_tryjoin(pthread_t t, void **res);
71void _pthread_setnobreak(int);71void _pthread_setnobreak(int);
72#ifdef WINPTHREAD_DBG
73void thread_print_set(int state);
74void thread_print(volatile pthread_t t, char *txt);
75#endif
76int __pthread_shallcancel(void);72int __pthread_shallcancel(void);
77WINPTHREAD_API struct _pthread_v * __pth_gpointer_locked (pthread_t id);73WINPTHREAD_API struct _pthread_v * __pth_gpointer_locked (pthread_t id);
74int _pthread_delay_np_ms (DWORD to);
7875
79#endif76#endif
lib/libc/mingw/winpthreads/winpthread_internal.h deleted-27
...@@ -1,27 +0,0 @@
1/*
2 Copyright (c) 2011-2016 mingw-w64 project
3
4 Permission is hereby granted, free of charge, to any person obtaining a
5 copy of this software and associated documentation files (the "Software"),
6 to deal in the Software without restriction, including without limitation
7 the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 and/or sell copies of the Software, and to permit persons to whom the
9 Software is furnished to do so, subject to the following conditions:
10
11 The above copyright notice and this permission notice shall be included in
12 all copies or substantial portions of the Software.
13
14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 DEALINGS IN THE SOFTWARE.
21*/
22
23#ifndef WINPTHREAD_INTERNAL_H
24#define WINPTHREAD_INTERNAL_H
25WINPTHREAD_API struct _pthread_v * __pth_gpointer_locked (pthread_t id);
26int pthread_delay_np_ms (DWORD to);
27#endif /*WINPTHREAD_INTERNAL_H*/
src/libs/mingw.zig+29-20
...@@ -154,7 +154,8 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre...@@ -154,7 +154,8 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
154 try addCcArgs(comp, arena, &winpthreads_args);154 try addCcArgs(comp, arena, &winpthreads_args);
155 try winpthreads_args.appendSlice(&[_][]const u8{155 try winpthreads_args.appendSlice(&[_][]const u8{
156 "-DIN_WINPTHREAD",156 "-DIN_WINPTHREAD",
157 "-DWIN32_LEAN_AND_MEAN",157 // winpthreads incorrectly assumes that Clang has `-Wprio-ctor-dtor`.
158 "-Wno-unknown-warning-option",
158 });159 });
159160
160 switch (comp.compilerRtOptMode()) {161 switch (comp.compilerRtOptMode()) {
...@@ -294,18 +295,12 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {...@@ -294,18 +295,12 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
294 "o", &digest, final_def_basename,295 "o", &digest, final_def_basename,
295 });296 });
296297
297 const target_defines = switch (target.cpu.arch) {
298 .thumb => "#define DEF_ARM32\n",
299 .aarch64 => "#define DEF_ARM64\n",
300 .x86 => "#define DEF_I386\n",
301 .x86_64 => "#define DEF_X64\n",
302 else => unreachable,
303 };
304
305 const aro = @import("aro");298 const aro = @import("aro");
306 var aro_comp = aro.Compilation.init(gpa, std.fs.cwd());299 var aro_comp = aro.Compilation.init(gpa, std.fs.cwd());
307 defer aro_comp.deinit();300 defer aro_comp.deinit();
308301
302 aro_comp.target = target;
303
309 const include_dir = try comp.dirs.zig_lib.join(arena, &.{ "libc", "mingw", "def-include" });304 const include_dir = try comp.dirs.zig_lib.join(arena, &.{ "libc", "mingw", "def-include" });
310305
311 if (comp.verbose_cc) print: {306 if (comp.verbose_cc) print: {
...@@ -320,7 +315,6 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {...@@ -320,7 +315,6 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
320 try aro_comp.include_dirs.append(gpa, include_dir);315 try aro_comp.include_dirs.append(gpa, include_dir);
321316
322 const builtin_macros = try aro_comp.generateBuiltinMacros(.include_system_defines);317 const builtin_macros = try aro_comp.generateBuiltinMacros(.include_system_defines);
323 const user_macros = try aro_comp.addSourceFromBuffer("<command line>", target_defines);
324 const def_file_source = try aro_comp.addSourceFromPath(def_file_path);318 const def_file_source = try aro_comp.addSourceFromPath(def_file_path);
325319
326 var pp = aro.Preprocessor.init(&aro_comp);320 var pp = aro.Preprocessor.init(&aro_comp);
...@@ -328,7 +322,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {...@@ -328,7 +322,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
328 pp.linemarkers = .none;322 pp.linemarkers = .none;
329 pp.preserve_whitespace = true;323 pp.preserve_whitespace = true;
330324
331 try pp.preprocessSources(&.{ def_file_source, builtin_macros, user_macros });325 try pp.preprocessSources(&.{ def_file_source, builtin_macros });
332326
333 for (aro_comp.diagnostics.list.items) |diagnostic| {327 for (aro_comp.diagnostics.list.items) |diagnostic| {
334 if (diagnostic.kind == .@"fatal error" or diagnostic.kind == .@"error") {328 if (diagnostic.kind == .@"fatal error" or diagnostic.kind == .@"error") {
...@@ -485,7 +479,6 @@ const mingw32_generic_src = [_][]const u8{...@@ -485,7 +479,6 @@ const mingw32_generic_src = [_][]const u8{
485 "crt" ++ path.sep_str ++ "pesect.c",479 "crt" ++ path.sep_str ++ "pesect.c",
486 "crt" ++ path.sep_str ++ "udllargc.c",480 "crt" ++ path.sep_str ++ "udllargc.c",
487 "crt" ++ path.sep_str ++ "xthdloc.c",481 "crt" ++ path.sep_str ++ "xthdloc.c",
488 "crt" ++ path.sep_str ++ "CRT_fp10.c",
489 "crt" ++ path.sep_str ++ "mingw_helpers.c",482 "crt" ++ path.sep_str ++ "mingw_helpers.c",
490 "crt" ++ path.sep_str ++ "pseudo-reloc.c",483 "crt" ++ path.sep_str ++ "pseudo-reloc.c",
491 "crt" ++ path.sep_str ++ "udll_argv.c",484 "crt" ++ path.sep_str ++ "udll_argv.c",
...@@ -609,7 +602,6 @@ const mingw32_generic_src = [_][]const u8{...@@ -609,7 +602,6 @@ const mingw32_generic_src = [_][]const u8{
609 "misc" ++ path.sep_str ++ "delayimp.c",602 "misc" ++ path.sep_str ++ "delayimp.c",
610 "misc" ++ path.sep_str ++ "dirent.c",603 "misc" ++ path.sep_str ++ "dirent.c",
611 "misc" ++ path.sep_str ++ "dirname.c",604 "misc" ++ path.sep_str ++ "dirname.c",
612 "misc" ++ path.sep_str ++ "dllentrypoint.c",
613 "misc" ++ path.sep_str ++ "dllmain.c",605 "misc" ++ path.sep_str ++ "dllmain.c",
614 "misc" ++ path.sep_str ++ "feclearexcept.c",606 "misc" ++ path.sep_str ++ "feclearexcept.c",
615 "misc" ++ path.sep_str ++ "fegetenv.c",607 "misc" ++ path.sep_str ++ "fegetenv.c",
...@@ -621,10 +613,14 @@ const mingw32_generic_src = [_][]const u8{...@@ -621,10 +613,14 @@ const mingw32_generic_src = [_][]const u8{
621 "misc" ++ path.sep_str ++ "fesetexceptflag.c",613 "misc" ++ path.sep_str ++ "fesetexceptflag.c",
622 "misc" ++ path.sep_str ++ "fesetround.c",614 "misc" ++ path.sep_str ++ "fesetround.c",
623 "misc" ++ path.sep_str ++ "fetestexcept.c",615 "misc" ++ path.sep_str ++ "fetestexcept.c",
616 "misc" ++ path.sep_str ++ "mingw_controlfp.c",
617 "misc" ++ path.sep_str ++ "mingw_setfp.c",
624 "misc" ++ path.sep_str ++ "feupdateenv.c",618 "misc" ++ path.sep_str ++ "feupdateenv.c",
625 "misc" ++ path.sep_str ++ "ftruncate.c",619 "misc" ++ path.sep_str ++ "ftruncate.c",
626 "misc" ++ path.sep_str ++ "ftw.c",620 "misc" ++ path.sep_str ++ "ftw32.c",
621 "misc" ++ path.sep_str ++ "ftw32i64.c",
627 "misc" ++ path.sep_str ++ "ftw64.c",622 "misc" ++ path.sep_str ++ "ftw64.c",
623 "misc" ++ path.sep_str ++ "ftw64i32.c",
628 "misc" ++ path.sep_str ++ "fwide.c",624 "misc" ++ path.sep_str ++ "fwide.c",
629 "misc" ++ path.sep_str ++ "getlogin.c",625 "misc" ++ path.sep_str ++ "getlogin.c",
630 "misc" ++ path.sep_str ++ "getopt.c",626 "misc" ++ path.sep_str ++ "getopt.c",
...@@ -669,12 +665,12 @@ const mingw32_generic_src = [_][]const u8{...@@ -669,12 +665,12 @@ const mingw32_generic_src = [_][]const u8{
669 "stdio" ++ path.sep_str ++ "_findfirst64i32.c",665 "stdio" ++ path.sep_str ++ "_findfirst64i32.c",
670 "stdio" ++ path.sep_str ++ "_findnext64i32.c",666 "stdio" ++ path.sep_str ++ "_findnext64i32.c",
671 "stdio" ++ path.sep_str ++ "_fstat64i32.c",667 "stdio" ++ path.sep_str ++ "_fstat64i32.c",
672 "stdio" ++ path.sep_str ++ "_stat.c",
673 "stdio" ++ path.sep_str ++ "_stat64i32.c",668 "stdio" ++ path.sep_str ++ "_stat64i32.c",
674 "stdio" ++ path.sep_str ++ "_wfindfirst64i32.c",669 "stdio" ++ path.sep_str ++ "_wfindfirst64i32.c",
675 "stdio" ++ path.sep_str ++ "_wfindnext64i32.c",670 "stdio" ++ path.sep_str ++ "_wfindnext64i32.c",
676 "stdio" ++ path.sep_str ++ "_wstat.c",
677 "stdio" ++ path.sep_str ++ "_wstat64i32.c",671 "stdio" ++ path.sep_str ++ "_wstat64i32.c",
672 "stdio" ++ path.sep_str ++ "__mingw_fix_stat_path.c",
673 "stdio" ++ path.sep_str ++ "__mingw_fix_wstat_path.c",
678 "stdio" ++ path.sep_str ++ "asprintf.c",674 "stdio" ++ path.sep_str ++ "asprintf.c",
679 "stdio" ++ path.sep_str ++ "fopen64.c",675 "stdio" ++ path.sep_str ++ "fopen64.c",
680 "stdio" ++ path.sep_str ++ "fseeko32.c",676 "stdio" ++ path.sep_str ++ "fseeko32.c",
...@@ -749,23 +745,36 @@ const mingw32_generic_src = [_][]const u8{...@@ -749,23 +745,36 @@ const mingw32_generic_src = [_][]const u8{
749 "stdio" ++ path.sep_str ++ "ucrt__vscprintf.c",745 "stdio" ++ path.sep_str ++ "ucrt__vscprintf.c",
750 "stdio" ++ path.sep_str ++ "ucrt__vsnprintf.c",746 "stdio" ++ path.sep_str ++ "ucrt__vsnprintf.c",
751 "stdio" ++ path.sep_str ++ "ucrt__vsnwprintf.c",747 "stdio" ++ path.sep_str ++ "ucrt__vsnwprintf.c",
748 "stdio" ++ path.sep_str ++ "ucrt___local_stdio_printf_options.c",
749 "stdio" ++ path.sep_str ++ "ucrt___local_stdio_scanf_options.c",
752 "stdio" ++ path.sep_str ++ "ucrt_fprintf.c",750 "stdio" ++ path.sep_str ++ "ucrt_fprintf.c",
753 "stdio" ++ path.sep_str ++ "ucrt_fscanf.c",751 "stdio" ++ path.sep_str ++ "ucrt_fscanf.c",
754 "stdio" ++ path.sep_str ++ "ucrt_fwprintf.c",752 "stdio" ++ path.sep_str ++ "ucrt_fwprintf.c",
755 "stdio" ++ path.sep_str ++ "ucrt_ms_fprintf.c",753 "stdio" ++ path.sep_str ++ "ucrt_fwscanf.c",
756 "stdio" ++ path.sep_str ++ "ucrt_ms_fwprintf.c",754 "stdio" ++ path.sep_str ++ "ucrt_ms_fwprintf.c",
757 "stdio" ++ path.sep_str ++ "ucrt_printf.c",755 "stdio" ++ path.sep_str ++ "ucrt_printf.c",
758 "stdio" ++ path.sep_str ++ "ucrt_scanf.c",756 "stdio" ++ path.sep_str ++ "ucrt_scanf.c",
759 "stdio" ++ path.sep_str ++ "ucrt_snprintf.c",757 "stdio" ++ path.sep_str ++ "ucrt_snprintf.c",
758 "stdio" ++ path.sep_str ++ "ucrt_snwprintf.c",
760 "stdio" ++ path.sep_str ++ "ucrt_sprintf.c",759 "stdio" ++ path.sep_str ++ "ucrt_sprintf.c",
761 "stdio" ++ path.sep_str ++ "ucrt_sscanf.c",760 "stdio" ++ path.sep_str ++ "ucrt_sscanf.c",
761 "stdio" ++ path.sep_str ++ "ucrt_swscanf.c",
762 "stdio" ++ path.sep_str ++ "ucrt_swprintf.c",
762 "stdio" ++ path.sep_str ++ "ucrt_vfprintf.c",763 "stdio" ++ path.sep_str ++ "ucrt_vfprintf.c",
763 "stdio" ++ path.sep_str ++ "ucrt_vfscanf.c",764 "stdio" ++ path.sep_str ++ "ucrt_vfscanf.c",
765 "stdio" ++ path.sep_str ++ "ucrt_vfwscanf.c",
766 "stdio" ++ path.sep_str ++ "ucrt_vfwprintf.c",
764 "stdio" ++ path.sep_str ++ "ucrt_vprintf.c",767 "stdio" ++ path.sep_str ++ "ucrt_vprintf.c",
765 "stdio" ++ path.sep_str ++ "ucrt_vscanf.c",768 "stdio" ++ path.sep_str ++ "ucrt_vscanf.c",
766 "stdio" ++ path.sep_str ++ "ucrt_vsnprintf.c",769 "stdio" ++ path.sep_str ++ "ucrt_vsnprintf.c",
770 "stdio" ++ path.sep_str ++ "ucrt_vsnwprintf.c",
767 "stdio" ++ path.sep_str ++ "ucrt_vsprintf.c",771 "stdio" ++ path.sep_str ++ "ucrt_vsprintf.c",
772 "stdio" ++ path.sep_str ++ "ucrt_vswprintf.c",
768 "stdio" ++ path.sep_str ++ "ucrt_vsscanf.c",773 "stdio" ++ path.sep_str ++ "ucrt_vsscanf.c",
774 "stdio" ++ path.sep_str ++ "ucrt_vwscanf.c",
775 "stdio" ++ path.sep_str ++ "ucrt_wscanf.c",
776 "stdio" ++ path.sep_str ++ "ucrt_vwprintf.c",
777 "stdio" ++ path.sep_str ++ "ucrt_wprintf.c",
769 "string" ++ path.sep_str ++ "ucrt__wcstok.c",778 "string" ++ path.sep_str ++ "ucrt__wcstok.c",
770 // uuid779 // uuid
771 "libsrc" ++ path.sep_str ++ "ativscp-uuid.c",780 "libsrc" ++ path.sep_str ++ "ativscp-uuid.c",
...@@ -889,6 +898,8 @@ const mingw32_generic_src = [_][]const u8{...@@ -889,6 +898,8 @@ const mingw32_generic_src = [_][]const u8{
889};898};
890899
891const mingw32_x86_src = [_][]const u8{900const mingw32_x86_src = [_][]const u8{
901 // mingw32
902 "crt" ++ path.sep_str ++ "CRT_fp10.c",
892 // mingwex903 // mingwex
893 "math" ++ path.sep_str ++ "cbrtl.c",904 "math" ++ path.sep_str ++ "cbrtl.c",
894 "math" ++ path.sep_str ++ "erfl.c",905 "math" ++ path.sep_str ++ "erfl.c",
...@@ -971,11 +982,11 @@ const mingw32_x86_32_src = [_][]const u8{...@@ -971,11 +982,11 @@ const mingw32_x86_32_src = [_][]const u8{
971const mingw32_arm_src = [_][]const u8{982const mingw32_arm_src = [_][]const u8{
972 // mingwex983 // mingwex
973 "math" ++ path.sep_str ++ "arm-common" ++ path.sep_str ++ "ldexpl.c",984 "math" ++ path.sep_str ++ "arm-common" ++ path.sep_str ++ "ldexpl.c",
985 "math" ++ path.sep_str ++ "arm-common" ++ path.sep_str ++ "sincosl.c",
974};986};
975987
976const mingw32_arm32_src = [_][]const u8{988const mingw32_arm32_src = [_][]const u8{
977 // mingwex989 // mingwex
978 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "_chgsignl.S",
979 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "s_rint.c",990 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "s_rint.c",
980 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "s_rintf.c",991 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "s_rintf.c",
981 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "sincos.S",992 "math" ++ path.sep_str ++ "arm" ++ path.sep_str ++ "sincos.S",
...@@ -983,7 +994,6 @@ const mingw32_arm32_src = [_][]const u8{...@@ -983,7 +994,6 @@ const mingw32_arm32_src = [_][]const u8{
983994
984const mingw32_arm64_src = [_][]const u8{995const mingw32_arm64_src = [_][]const u8{
985 // mingwex996 // mingwex
986 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "_chgsignl.S",
987 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "rint.c",997 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "rint.c",
988 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "rintf.c",998 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "rintf.c",
989 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "sincos.S",999 "math" ++ path.sep_str ++ "arm64" ++ path.sep_str ++ "sincos.S",
...@@ -997,7 +1007,6 @@ const mingw32_winpthreads_src = [_][]const u8{...@@ -997,7 +1007,6 @@ const mingw32_winpthreads_src = [_][]const u8{
997 "winpthreads" ++ path.sep_str ++ "misc.c",1007 "winpthreads" ++ path.sep_str ++ "misc.c",
998 "winpthreads" ++ path.sep_str ++ "mutex.c",1008 "winpthreads" ++ path.sep_str ++ "mutex.c",
999 "winpthreads" ++ path.sep_str ++ "nanosleep.c",1009 "winpthreads" ++ path.sep_str ++ "nanosleep.c",
1000 "winpthreads" ++ path.sep_str ++ "ref.c",
1001 "winpthreads" ++ path.sep_str ++ "rwlock.c",1010 "winpthreads" ++ path.sep_str ++ "rwlock.c",
1002 "winpthreads" ++ path.sep_str ++ "sched.c",1011 "winpthreads" ++ path.sep_str ++ "sched.c",
1003 "winpthreads" ++ path.sep_str ++ "sem.c",1012 "winpthreads" ++ path.sep_str ++ "sem.c",
src/zig_llvm.cpp+7-5
...@@ -484,20 +484,22 @@ bool ZigLLVMWriteImportLibrary(const char *def_path, unsigned int coff_machine,...@@ -484,20 +484,22 @@ bool ZigLLVMWriteImportLibrary(const char *def_path, unsigned int coff_machine,
484 }484 }
485 }485 }
486486
487 if (machine == COFF::IMAGE_FILE_MACHINE_I386 && kill_at) {487 if (kill_at) {
488 for (object::COFFShortExport& E : def->Exports) {488 for (object::COFFShortExport& E : def->Exports) {
489 if (!E.ImportName.empty() || (!E.Name.empty() && E.Name[0] == '?'))489 if (!E.ImportName.empty() || (!E.Name.empty() && E.Name[0] == '?'))
490 continue;490 continue;
491 E.SymbolName = E.Name;491 if (machine == COFF::IMAGE_FILE_MACHINE_I386) {
492 // By making sure E.SymbolName != E.Name for decorated symbols,
493 // writeImportLibrary writes these symbols with the type
494 // IMPORT_NAME_UNDECORATE.
495 E.SymbolName = E.Name;
496 }
492 // Trim off the trailing decoration. Symbols will always have a497 // Trim off the trailing decoration. Symbols will always have a
493 // starting prefix here (either _ for cdecl/stdcall, @ for fastcall498 // starting prefix here (either _ for cdecl/stdcall, @ for fastcall
494 // or ? for C++ functions). Vectorcall functions won't have any499 // or ? for C++ functions). Vectorcall functions won't have any
495 // fixed prefix, but the function base name will still be at least500 // fixed prefix, but the function base name will still be at least
496 // one char.501 // one char.
497 E.Name = E.Name.substr(0, E.Name.find('@', 1));502 E.Name = E.Name.substr(0, E.Name.find('@', 1));
498 // By making sure E.SymbolName != E.Name for decorated symbols,
499 // writeImportLibrary writes these symbols with the type
500 // IMPORT_NAME_UNDECORATE.
501 }503 }
502 }504 }
503505