diff --git a/lib/libc/include/any-windows-any/_mingw.h b/lib/libc/include/any-windows-any/_mingw.h index acfc0f9bd64400216f3d167a1ef67304d27e4ea8..2297cf779061f339b02c90088f287ef1c8f06832 100644 --- a/lib/libc/include/any-windows-any/_mingw.h +++ b/lib/libc/include/any-windows-any/_mingw.h @@ -622,17 +622,17 @@ __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void) #define __MINGW_FASTFAIL_IMPL 1 #endif #if __MINGW_FASTFAIL_IMPL == 1 -void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code); -__MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code) +void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int _Code); +__MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int _Code) { #if defined(__aarch64__) || defined(__arm64ec__) - register unsigned int w0 __asm__("w0") = code; - __asm__ __volatile__("brk #0xf003"::"r"(w0)); + register unsigned int __w0 __asm__("w0") = _Code; + __asm__ __volatile__("brk #0xf003"::"r"(__w0)); #elif defined(__i386__) || defined(__x86_64__) - __asm__ __volatile__("int {$}0x29"::"c"(code)); + __asm__ __volatile__("int {$}0x29"::"c"(_Code)); #elif defined(__arm__) - register unsigned int r0 __asm__("r0") = code; - __asm__ __volatile__("udf #0xfb"::"r"(r0)); + register unsigned int __r0 __asm__("r0") = _Code; + __asm__ __volatile__("udf #0xfb"::"r"(__r0)); #else __asm__ __volatile__("unimplemented"); #endif @@ -647,13 +647,13 @@ __MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned i #endif #if __MINGW_PREFETCH_IMPL == 1 #if defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__) -void __cdecl __prefetch(const void *addr); -__MINGW_INTRIN_INLINE void __cdecl __prefetch(const void *addr) +void __cdecl __prefetch(const void *_Addr); +__MINGW_INTRIN_INLINE void __cdecl __prefetch(const void *_Addr) { #if defined(__arm__) - __asm__ __volatile__("pld [%0]"::"r"(addr)); + __asm__ __volatile__("pld [%0]"::"r"(_Addr)); #elif defined(__aarch64__) || defined(__arm64ec__) - __asm__ __volatile__("prfm pldl1keep, [%0]"::"r"(addr)); + __asm__ __volatile__("prfm pldl1keep, [%0]"::"r"(_Addr)); #endif } #endif /* defined(__arm__) || defined(__aarch64__) */ @@ -668,21 +668,7 @@ const char *__mingw_get_crt_info (void); } #endif -#endif /* _INC__MINGW_H */ - -#ifndef MINGW_SDK_INIT -#define MINGW_SDK_INIT - -/* for backward compatibility */ -#ifndef MINGW_HAS_SECURE_API -#define MINGW_HAS_SECURE_API 1 -#endif - #define __STDC_SECURE_LIB__ 200411L #define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ -#ifndef __WIDL__ -#include "sdks/_mingw_ddk.h" -#endif - -#endif /* MINGW_SDK_INIT */ +#endif /* _INC__MINGW_H */ diff --git a/lib/libc/include/any-windows-any/_mingw_mac.h b/lib/libc/include/any-windows-any/_mingw_mac.h index 70d64f6d022e3a03dfb42a3696068bf5bb9e8245..dae10e797f18259df3fb1c29ad4479e18f6f1a18 100644 --- a/lib/libc/include/any-windows-any/_mingw_mac.h +++ b/lib/libc/include/any-windows-any/_mingw_mac.h @@ -14,7 +14,7 @@ #define __MINGW64_STRINGIFY(x) \ __STRINGIFY(x) -#define __MINGW64_VERSION_MAJOR 13 +#define __MINGW64_VERSION_MAJOR 15 #define __MINGW64_VERSION_MINOR 0 #define __MINGW64_VERSION_BUGFIX 0 diff --git a/lib/libc/include/any-windows-any/_mingw_stat64.h b/lib/libc/include/any-windows-any/_mingw_stat64.h index 84eabba9698b1ae241cafe5b093c69548e19653c..c7b53bef2ca5f2ddb915aaca44ae5458a9a1eabb 100644 --- a/lib/libc/include/any-windows-any/_mingw_stat64.h +++ b/lib/libc/include/any-windows-any/_mingw_stat64.h @@ -3,6 +3,12 @@ /* __stat64 is needed for compatibility with msvc */ #define __stat64 _stat64 +/* + * To prevent ABI issues, the mingw-w64 runtime should not call the + * _fstat, _fstati64, _stat, _stati64, _wstat and _wstati64 functions. + * Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T #define _fstat _fstat32 #define _fstati64 _fstat32i64 @@ -18,6 +24,7 @@ #define _wstat _wstat64i32 #define _wstati64 _wstat64 #endif /* _USE_32BIT_TIME_T */ +#endif /* _CRTBLD */ struct _stat32 { _dev_t st_dev; diff --git a/lib/libc/include/any-windows-any/activation.h b/lib/libc/include/any-windows-any/activation.h index 306cf137569e5f7ae89c9de5073bbd90dafa7197..aae6502362ce5d5528b4348837a0fa80e0accc6c 100644 --- a/lib/libc/include/any-windows-any/activation.h +++ b/lib/libc/include/any-windows-any/activation.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/activaut.h b/lib/libc/include/any-windows-any/activaut.h index df518715606f282d0f7aa599d3a04ef96a16d33e..32ea4f99c23aa90e758180e54ded0b2cacb822af 100644 --- a/lib/libc/include/any-windows-any/activaut.h +++ b/lib/libc/include/any-windows-any/activaut.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activaut.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/activdbg.h b/lib/libc/include/any-windows-any/activdbg.h index 6f2818f6484ad5572b7e7d057c5e6eb0e8a6582c..ea1c251b917baedd8fad7e0b2b4f4ac954ca3edf 100644 --- a/lib/libc/include/any-windows-any/activdbg.h +++ b/lib/libc/include/any-windows-any/activdbg.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activdbg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activdbg.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/activdbg100.h b/lib/libc/include/any-windows-any/activdbg100.h index ab6c128383e212d9a51fab3e7fdc28f75c02ce7b..a569638c4f0fb737dcf65654623375d8d60c99e9 100644 --- a/lib/libc/include/any-windows-any/activdbg100.h +++ b/lib/libc/include/any-windows-any/activdbg100.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activdbg100.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activdbg100.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/activprof.h b/lib/libc/include/any-windows-any/activprof.h index b32e077f09dbe6b91773bb95ace39bbb555337dd..41ac11765a57950f4027802f2216435f329517a7 100644 --- a/lib/libc/include/any-windows-any/activprof.h +++ b/lib/libc/include/any-windows-any/activprof.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activprof.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activprof.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/activscp.h b/lib/libc/include/any-windows-any/activscp.h index a0670d7dac35a1072d2b4b7e2e11549545ad1b3b..76bf0ab0c29caf3505dfb88d3af8b88596908ee6 100644 --- a/lib/libc/include/any-windows-any/activscp.h +++ b/lib/libc/include/any-windows-any/activscp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/activscp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/activscp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/adhoc.h b/lib/libc/include/any-windows-any/adhoc.h index 2084d35e68be5126639a78fe78e84a6c9b57894b..da908391926a467b31f1691a43bd3c2ef4cf8a52 100644 --- a/lib/libc/include/any-windows-any/adhoc.h +++ b/lib/libc/include/any-windows-any/adhoc.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/adhoc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/adhoc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/alg.h b/lib/libc/include/any-windows-any/alg.h index 5c76938a3ca21487ce243fdba158eddfa0cc6500..e3768e7980db26aeba4a6a88b4e9eea3229dd58a 100644 --- a/lib/libc/include/any-windows-any/alg.h +++ b/lib/libc/include/any-windows-any/alg.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/alg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/alg.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/amstream.h b/lib/libc/include/any-windows-any/amstream.h index 20a66ab33dce891777ac516a2f58ea0731c24a22..58dc87dd3c9531dd30cf357c895835f962af05e2 100644 --- a/lib/libc/include/any-windows-any/amstream.h +++ b/lib/libc/include/any-windows-any/amstream.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/amstream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/amvideo.h b/lib/libc/include/any-windows-any/amvideo.h index f754a7f832e85ebb30189dbf09b07afab72dc83e..7a7d1c3295531ddf9c272471ad98a2464585386d 100644 --- a/lib/libc/include/any-windows-any/amvideo.h +++ b/lib/libc/include/any-windows-any/amvideo.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/amvideo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/assert.h b/lib/libc/include/any-windows-any/assert.h index a8cfb2e83e3e5f0d470fb541a656791527133696..51a223a0b821f751d6ea8ef2904d3dca3f985580 100644 --- a/lib/libc/include/any-windows-any/assert.h +++ b/lib/libc/include/any-windows-any/assert.h @@ -21,8 +21,8 @@ extern "C" { #endif -_CRTIMP void __cdecl __MINGW_ATTRIB_NORETURN _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); -_CRTIMP void __cdecl __MINGW_ATTRIB_NORETURN _assert (const char *_Message, const char *_File, unsigned _Line); +_CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); +void __cdecl _assert (const char *_Message, const char *_File, unsigned _Line); #ifdef __cplusplus } @@ -53,4 +53,3 @@ _CRTIMP void __cdecl __MINGW_ATTRIB_NORETURN _assert (const char *_Message, cons (_assert(#_Expression,__FILE__,__LINE__),0)) #endif /* _UNICODE||UNICODE */ #endif /* !defined (NDEBUG) */ - diff --git a/lib/libc/include/any-windows-any/asyncinfo.h b/lib/libc/include/any-windows-any/asyncinfo.h index 5ee431eafc7e2ed9de348bc0259ce010b3eadd27..5a3ec59175b9f39c8e791e79b69293449fdca793 100644 --- a/lib/libc/include/any-windows-any/asyncinfo.h +++ b/lib/libc/include/any-windows-any/asyncinfo.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/asyncinfo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/asyncinfo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/audioclient.h b/lib/libc/include/any-windows-any/audioclient.h index 146e1df1522dd49c2af869e4d28bd1db68616033..a6100f019519e374b1d842a16e7d87bc04ce572c 100644 --- a/lib/libc/include/any-windows-any/audioclient.h +++ b/lib/libc/include/any-windows-any/audioclient.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/audioclient.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/audioendpoints.h b/lib/libc/include/any-windows-any/audioendpoints.h index c7dc9b872fef7103faeb1b43150941524e0987b9..a9413c0d9c96a9584eb47db27a70b902694346ba 100644 --- a/lib/libc/include/any-windows-any/audioendpoints.h +++ b/lib/libc/include/any-windows-any/audioendpoints.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/audioendpoints.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/audioendpoints.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/audiopolicy.h b/lib/libc/include/any-windows-any/audiopolicy.h index 0575ffd3f7bca6664b670b2c4389adff75006966..e6aa009b710dc51423ded42f2cb3d6285e9962ce 100644 --- a/lib/libc/include/any-windows-any/audiopolicy.h +++ b/lib/libc/include/any-windows-any/audiopolicy.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/audiopolicy.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/austream.h b/lib/libc/include/any-windows-any/austream.h index 026ecd6c73e5c7418a37e48ab696964b87d1c5c9..16d340680fc1ad2e4abc337ff70c0564e43a7303 100644 --- a/lib/libc/include/any-windows-any/austream.h +++ b/lib/libc/include/any-windows-any/austream.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/austream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bdaiface.h b/lib/libc/include/any-windows-any/bdaiface.h index 5b72f6f0770ea0784bb677163bea347bbf3bace4..7974a9450bb26d4f991aee82f799d941d39d8960 100644 --- a/lib/libc/include/any-windows-any/bdaiface.h +++ b/lib/libc/include/any-windows-any/bdaiface.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bdaiface.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bdaiface.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits.h b/lib/libc/include/any-windows-any/bits.h index ae1e5e1bf51ccfce38863183dacf323a5289e15b..18a229610bb31d18884539c1c3df7c41f081bdca 100644 --- a/lib/libc/include/any-windows-any/bits.h +++ b/lib/libc/include/any-windows-any/bits.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits1_5.h b/lib/libc/include/any-windows-any/bits1_5.h index cf2ac78d043fae8b5a56d18c95c580ba536f5486..0ea5d2ceb596ec9711e8f9c6085f2a8e2d4615e1 100644 --- a/lib/libc/include/any-windows-any/bits1_5.h +++ b/lib/libc/include/any-windows-any/bits1_5.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits1_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits1_5.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits2_0.h b/lib/libc/include/any-windows-any/bits2_0.h index ea8c1c866a7550a8bbae7122fb370029d9f39077..208118ac303e8f21d2a5a50fa61a938a7736a419 100644 --- a/lib/libc/include/any-windows-any/bits2_0.h +++ b/lib/libc/include/any-windows-any/bits2_0.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits2_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits2_0.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits2_5.h b/lib/libc/include/any-windows-any/bits2_5.h index 4cfa20db460232784134301f072584ff6bbfcd13..04640e4224128dccd96ee115e9eeec3b3f84c10b 100644 --- a/lib/libc/include/any-windows-any/bits2_5.h +++ b/lib/libc/include/any-windows-any/bits2_5.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits2_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits2_5.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits3_0.h b/lib/libc/include/any-windows-any/bits3_0.h index 72c7839c2677bb1659597f06f1e5a3b1f3c858d3..ad2ddd8dcfbf4123f6fa107dd2e4411e7fbab211 100644 --- a/lib/libc/include/any-windows-any/bits3_0.h +++ b/lib/libc/include/any-windows-any/bits3_0.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits3_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits3_0.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bits5_0.h b/lib/libc/include/any-windows-any/bits5_0.h index ff896091ea1288963b8d4242304a246dc7da48e9..5ea63dca15644ad92392d0f4886b90ab4734d415 100644 --- a/lib/libc/include/any-windows-any/bits5_0.h +++ b/lib/libc/include/any-windows-any/bits5_0.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/bits5_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/bits5_0.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/cfgmgr32.h b/lib/libc/include/any-windows-any/cfgmgr32.h index b1910e11e31c3b9551cace286558e663a2a02181..925e7c42caf505985857a98becf90734f0293fdc 100644 --- a/lib/libc/include/any-windows-any/cfgmgr32.h +++ b/lib/libc/include/any-windows-any/cfgmgr32.h @@ -37,8 +37,8 @@ extern "C" { #define MAX_IRQS 7 #define MAX_DMA_CHANNELS 7 -#define DWORD_MAX 0xFFFFFFFF -#define DWORDLONG_MAX 0xFFFFFFFFFFFFFFFF +#define DWORD_MAX __MSABI_LONG(0xffffffffu) +#define DWORDLONG_MAX 0xffffffffffffffffull #define CONFIGMG_VERSION 0x0400 diff --git a/lib/libc/include/any-windows-any/comadmin.h b/lib/libc/include/any-windows-any/comadmin.h index 06b723117008b12a7e3ce4f9b8e622d4716b3d0c..d6fa9dea7604363df4dc50cfd4911bb01e7257f9 100644 --- a/lib/libc/include/any-windows-any/comadmin.h +++ b/lib/libc/include/any-windows-any/comadmin.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/comadmin.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/comadmin.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/comcat.h b/lib/libc/include/any-windows-any/comcat.h index 46ee41ffc11e456f0d267b7a639ca2e09e78de61..3ac5f7a84d67617673a511b3060cf0f33de60f4b 100644 --- a/lib/libc/include/any-windows-any/comcat.h +++ b/lib/libc/include/any-windows-any/comcat.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/comcat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/comcat.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/commoncontrols.h b/lib/libc/include/any-windows-any/commoncontrols.h index 4b37772022d27be287b3f8926ddf81783f8b8e95..1bcce0b2ece3f0a81619b33ac1e9fd6d51ec7254 100644 --- a/lib/libc/include/any-windows-any/commoncontrols.h +++ b/lib/libc/include/any-windows-any/commoncontrols.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/commoncontrols.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/commoncontrols.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/comutil.h b/lib/libc/include/any-windows-any/comutil.h index ddb0906379ada10c079331eb0cdf703f6022752b..07c6d3e008b1363375bda977e3637d4f0ded461a 100644 --- a/lib/libc/include/any-windows-any/comutil.h +++ b/lib/libc/include/any-windows-any/comutil.h @@ -8,6 +8,7 @@ #include #include +#include #ifndef _COM_ASSERT #define _COM_ASSERT(x) ((void)0) @@ -51,8 +52,50 @@ namespace _com_util { } namespace _com_util { - BSTR WINAPI ConvertStringToBSTR(const char *pSrc); - char *WINAPI ConvertBSTRToString(BSTR pSrc); + inline BSTR WINAPI ConvertStringToBSTR(const char *pSrc){ + int wcSize; + BSTR bstr; + if(!pSrc) return NULL; + wcSize=::MultiByteToWideChar(CP_ACP,0,pSrc,-1,NULL,0); + if (wcSize==0) { + _com_issue_error(HRESULT_FROM_WIN32(GetLastError())); + return NULL; + } + bstr=::SysAllocStringLen(NULL,wcSize-1); + if(!bstr) { + _com_issue_error(E_OUTOFMEMORY); + return NULL; + } + if(::MultiByteToWideChar(CP_ACP,0,pSrc,-1,bstr,wcSize)==0) { + DWORD err = ::GetLastError(); + ::SysFreeString(bstr); + _com_issue_error(HRESULT_FROM_WIN32(err)); + return NULL; + } + return bstr; + } + inline char *WINAPI ConvertBSTRToString(BSTR pSrc){ + int mbSize; + char *str; + if(!pSrc) return NULL; + mbSize = ::WideCharToMultiByte(CP_ACP,0,pSrc,-1,NULL,0,NULL,NULL); + if (mbSize==0) { + _com_issue_error(HRESULT_FROM_WIN32(::GetLastError())); + return NULL; + } + str=new(::std::nothrow) char[mbSize]; + if(!str) { + _com_issue_error(E_OUTOFMEMORY); + return NULL; + } + if(::WideCharToMultiByte(CP_ACP,0,pSrc,-1,str,mbSize,NULL,NULL)==0) { + DWORD err = ::GetLastError(); + delete[] str; + _com_issue_error(HRESULT_FROM_WIN32(err)); + return NULL; + } + return str; + } } class _bstr_t { diff --git a/lib/libc/include/any-windows-any/conio.h b/lib/libc/include/any-windows-any/conio.h index 97b4e342d8dc6083ac9289aaa23f6dba78d1f8df..5b9cdf0c248f2996873cbdd70250fe5c8777d2ff 100644 --- a/lib/libc/include/any-windows-any/conio.h +++ b/lib/libc/include/any-windows-any/conio.h @@ -8,17 +8,53 @@ #include #include +#include #include #ifdef __cplusplus extern "C" { #endif - _CRTIMP char *_cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; +/** + * Functions to read/write strings from/to console. + */ + + _CRTIMP char *__cdecl _cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _cputs(const char *_Str); + +#ifndef NO_OLDNAMES + char *__cdecl cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl cputs(const char *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif + +/** + * Functions to read/write single characters from/to console. + */ + + _CRTIMP int __cdecl _kbhit(void); _CRTIMP int __cdecl _getch(void); _CRTIMP int __cdecl _getche(void); - _CRTIMP int __cdecl _kbhit(void); + _CRTIMP int __cdecl _putch(int _Ch); + _CRTIMP int __cdecl _ungetch(int _Ch); + +#ifndef NO_OLDNAMES + int __cdecl kbhit(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl getch(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl getche(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl putch(int _Ch) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl ungetch(int _Ch) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif + +#if __MSVCRT_VERSION__ >= 0x800 + _CRTIMP int __cdecl _getch_nolock(void); + _CRTIMP int __cdecl _getche_nolock(void); + _CRTIMP int __cdecl _putch_nolock(int _Ch); + _CRTIMP int __cdecl _ungetch_nolock(int _Ch); +#endif + +/** + * Formatted console I/O functions. + */ #ifdef _UCRT int __cdecl __conio_common_vcprintf(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList); @@ -59,7 +95,6 @@ extern "C" { __builtin_va_end(_ArgList); return _Ret; } - __mingw_ovr int __cdecl _vcprintf_p(const char * __restrict__ _Format,va_list _ArgList) { return __conio_common_vcprintf_p(0, _Format, NULL, _ArgList); @@ -99,214 +134,63 @@ extern "C" { __builtin_va_end(_ArgList); return _Ret; } -#else +#ifndef NO_OLDNAMES + __mingw_ovr int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 + { + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Format); + _Ret = _vcprintf(_Format, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; + } + __mingw_ovr int __cdecl cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 + { + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Format); + _Ret = __conio_common_vcscanf(0, _Format, NULL, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; + } +#endif /* NO_OLDNAMES */ +#else /* !_UCRT */ _CRTIMP int __cdecl _cprintf(const char * __restrict__ _Format,...); - _CRTIMP int __cdecl _cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP int __cdecl _cscanf_l(const char * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - - _CRTIMP int __cdecl _vcprintf(const char * __restrict__ _Format,va_list _ArgList); - _CRTIMP int __cdecl _cprintf_p(const char * __restrict__ _Format,...); - _CRTIMP int __cdecl _vcprintf_p(const char * __restrict__ _Format,va_list _ArgList); _CRTIMP int __cdecl _cprintf_l(const char * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcprintf_l(const char * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); + _CRTIMP int __cdecl _cprintf_p(const char * __restrict__ _Format,...); _CRTIMP int __cdecl _cprintf_p_l(const char * __restrict__ _Format,_locale_t _Locale,...); + _CRTIMP int __cdecl _vcprintf(const char * __restrict__ _Format,va_list _ArgList); + _CRTIMP int __cdecl _vcprintf_l(const char * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); + _CRTIMP int __cdecl _vcprintf_p(const char * __restrict__ _Format,va_list _ArgList); _CRTIMP int __cdecl _vcprintf_p_l(const char * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); -#endif + _CRTIMP int __cdecl _cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP int __cdecl _cscanf_l(const char * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; +#ifndef NO_OLDNAMES + int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif /* NO_OLDNAMES */ +#endif /* _UCRT */ -#if defined(_X86_) && !defined(__x86_64) +/** + * Port I/O functions. + * + * These functions were removed from CRT in msvcr80.dll. + * They are still available in i386 system versions of msvcrt.dll. + */ + +#if (__MSVCRT_VERSION__ >= 0x0400 && __MSVCRT_VERSION__ < 0x0800) && defined(_M_IX86) int __cdecl _inp(unsigned short); unsigned short __cdecl _inpw(unsigned short); unsigned long __cdecl _inpd(unsigned short); int __cdecl _outp(unsigned short,int); unsigned short __cdecl _outpw(unsigned short,unsigned short); unsigned long __cdecl _outpd(unsigned short,unsigned long); -#endif - - _CRTIMP int __cdecl _putch(int _Ch); - _CRTIMP int __cdecl _ungetch(int _Ch); -#if __MSVCRT_VERSION__ >= 0x800 - _CRTIMP int __cdecl _getch_nolock(void); - _CRTIMP int __cdecl _getche_nolock(void); - _CRTIMP int __cdecl _putch_nolock(int _Ch); - _CRTIMP int __cdecl _ungetch_nolock(int _Ch); -#endif - -#ifndef _WCONIO_DEFINED -#define _WCONIO_DEFINED - -#ifndef WEOF -#define WEOF (wint_t)(0xFFFF) -#endif - - _CRTIMP wchar_t *_cgetws(wchar_t *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP wint_t __cdecl _getwch(void); - _CRTIMP wint_t __cdecl _getwche(void); - _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); - _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); - _CRTIMP int __cdecl _cputws(const wchar_t *_String); -#ifdef _UCRT - int __cdecl __conio_common_vcwprintf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); - int __cdecl __conio_common_vcwprintf_p(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); - int __cdecl __conio_common_vcwprintf_s(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); - int __cdecl __conio_common_vcwscanf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); - - __mingw_ovr int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __conio_common_vcwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, NULL, _ArgList); - } - __mingw_ovr int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = _vcwprintf(_Format, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = __conio_common_vcwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Format, NULL, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Locale); - _Ret = __conio_common_vcwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Format, _Locale, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __conio_common_vcwprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, NULL, _ArgList); - } - __mingw_ovr int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = _vcwprintf_p(_Format, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) - { - return __conio_common_vcwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, _Locale, _ArgList); - } - __mingw_ovr int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Locale); - _Ret = _vcwprintf_l(_Format, _Locale, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) - { - return __conio_common_vcwprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, _Locale, _ArgList); - } - __mingw_ovr int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Locale); - _Ret = _vcwprintf_p_l(_Format, _Locale, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } -#else - _CRTIMP int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...); - _CRTIMP int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...); - _CRTIMP int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); -#endif -#if __MSVCRT_VERSION__ >= 0x800 - _CRTIMP wint_t __cdecl _putwch_nolock(wchar_t _WCh); - _CRTIMP wint_t __cdecl _getwch_nolock(void); - _CRTIMP wint_t __cdecl _getwche_nolock(void); - _CRTIMP wint_t __cdecl _ungetwch_nolock(wint_t _WCh); -#endif -#endif - #ifndef NO_OLDNAMES - char *__cdecl cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - -#ifdef _UCRT - __mingw_ovr int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = _vcprintf(_Format, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } - __mingw_ovr int __cdecl cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005 - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = __conio_common_vcscanf(0, _Format, NULL, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } -#else - int __cdecl cprintf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl cscanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#endif - int __cdecl cputs(const char *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl getch(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl getche(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl kbhit(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl putch(int _Ch) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl ungetch(int _Ch) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - -#if (defined(_X86_) && !defined(__x86_64)) int __cdecl inp(unsigned short) __MINGW_ATTRIB_DEPRECATED_MSVC2005; unsigned short __cdecl inpw(unsigned short) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl outp(unsigned short,int) __MINGW_ATTRIB_DEPRECATED_MSVC2005; unsigned short __cdecl outpw(unsigned short,unsigned short) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#endif - - /* __cpuid moved to intrin.h per msdn */ - /* __inbyte moved to intrin.h per msdn */ - /* __inbytestring moved to intrin.h per msdn */ - /* __indword moved to intrin.h per msdn */ - /* __indwordstring moved to intrin.h per msdn */ - /* __inword moved to intrin.h per msdn */ - /* __inwordstring moved to intrin.h per msdn */ - /* __outbyte moved to intrin.h per msdn */ - /* __outbytestring moved to intrin.h per msdn */ - /* __outdword moved to intrin.h per msdn */ - /* __outdwordstring moved to intrin.h per msdn */ - /* __outword moved to intrin.h per msdn */ - /* __outwordstring moved to intrin.h per msdn */ - /* __readcr0 moved to intrin.h per msdn */ - /* __readcr2 moved to intrin.h per msdn */ - /* __readcr3 moved to intrin.h per msdn */ - /* __readcr4 moved to intrin.h per msdn */ - /* __readcr8 moved to intrin.h per msdn */ - /* __readmsr moved to intrin.h per msdn */ - /* __writecr0 moved to intrin.h per msdn */ - /* __writecr2 moved to intrin.h per msdn */ - /* __writecr3 moved to intrin.h per msdn */ - /* __writecr4 moved to intrin.h per msdn */ - /* __writecr8 moved to intrin.h per msdn */ - /* __writemsr moved to intrin.h per msdn */ +#endif /* NO_OLDNAMES */ #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/control.h b/lib/libc/include/any-windows-any/control.h index a4f05139a7e7ec72dfd81a1bd114504a99aec1f7..06850a453e50b60437066f555a722741c6fc28f3 100644 --- a/lib/libc/include/any-windows-any/control.h +++ b/lib/libc/include/any-windows-any/control.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/control.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/control.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/corecrt.h b/lib/libc/include/any-windows-any/corecrt.h index abb720885cecd0f35408ac5b0b2269d2bb00f819..e413b9f47c25d7793fe68588cd053ac03899021a 100644 --- a/lib/libc/include/any-windows-any/corecrt.h +++ b/lib/libc/include/any-windows-any/corecrt.h @@ -151,6 +151,13 @@ typedef __time64_t time_t; #endif #endif +#ifdef _DEBUG +_CRTIMP void __cdecl _invalid_parameter(const wchar_t *expression, const wchar_t *function_name, const wchar_t *file_name, unsigned int line_number, __UINTPTR_TYPE__ reserved); +#endif +_CRTIMP void __cdecl _invalid_parameter_noinfo(void); +_CRTIMP __MINGW_ATTRIB_NORETURN void __cdecl _invalid_parameter_noinfo_noreturn(void); +_CRTIMP __MINGW_ATTRIB_NORETURN void __cdecl _invoke_watson(const wchar_t *expression, const wchar_t *function_name, const wchar_t *file_name, unsigned int line_number, __UINTPTR_TYPE__ reserved); + #if defined(__cplusplus) && _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES #define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) \ @@ -447,41 +454,6 @@ typedef struct tagLC_ID { } LC_ID,*LPLC_ID; #endif /* _TAGLC_ID_DEFINED */ -#ifndef _THREADLOCALEINFO -#define _THREADLOCALEINFO -typedef struct threadlocaleinfostruct { -#ifdef _UCRT - const unsigned short *_locale_pctype; - int _locale_mb_cur_max; - unsigned int _locale_lc_codepage; -#else - int refcount; - unsigned int lc_codepage; - unsigned int lc_collate_cp; - unsigned long lc_handle[6]; - LC_ID lc_id[6]; - struct { - char *locale; - wchar_t *wlocale; - int *refcount; - int *wrefcount; - } lc_category[6]; - int lc_clike; - int mb_cur_max; - int *lconv_intl_refcount; - int *lconv_num_refcount; - int *lconv_mon_refcount; - struct lconv *lconv; - int *ctype1_refcount; - unsigned short *ctype1; - const unsigned short *pctype; - const unsigned char *pclmap; - const unsigned char *pcumap; - struct __lc_time_data *lc_time_curr; -#endif -} threadlocinfo; -#endif /* _THREADLOCALEINFO */ - #ifndef __crt_typefix #define __crt_typefix(ctype) #endif diff --git a/lib/libc/include/any-windows-any/corecrt_memory.h b/lib/libc/include/any-windows-any/corecrt_memory.h new file mode 100644 index 0000000000000000000000000000000000000000..e5c5dc27071a9af195c55487e7a0f13ec469f5f1 --- /dev/null +++ b/lib/libc/include/any-windows-any/corecrt_memory.h @@ -0,0 +1,57 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_CORECRT_MEMORY +#define _INC_CORECRT_MEMORY + +#include + +#if defined(__LIBMSVCRT__) +/* When building mingw-w64, this should be blank. */ +#define _SECIMP +#else +#ifndef _SECIMP +#define _SECIMP __declspec(dllimport) +#endif /* _SECIMP */ +#endif /* defined(__LIBMSVCRT__) */ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _CONST_RETURN +#define _CONST_RETURN +#endif + +#define _WConst_return _CONST_RETURN + +#ifndef _CRT_MEMORY_DEFINED +#define _CRT_MEMORY_DEFINED + _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); +#if !defined(__STRICT_ANSI__) || defined(_GNU_SOURCE) || __STDC_VERSION__ + 0 >= 202311L || _XOPEN_SOURCE + 0 >= 600 + void * __cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); +#endif + _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); + _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); + _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); + int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); + void * __cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _SECIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count); + void * __cdecl mempcpy (void *_Dst, const void *_Src, size_t _Size); + void * __cdecl memset(void *_Dst,int _Val,size_t _Size); +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 202311L + void * __cdecl memset_explicit(void *_Dst,int _Val,size_t _Size); +#endif + +#ifndef NO_OLDNAMES + void * __cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif +#endif + +#ifdef __cplusplus +} +#endif +#endif diff --git a/lib/libc/include/any-windows-any/corecrt_stdio_config.h b/lib/libc/include/any-windows-any/corecrt_stdio_config.h index 7ac0e6e03402a9ef732903e15dfc06162bd1653a..366d90a6d9b44f47bde371d8d60148696c3f6ba8 100644 --- a/lib/libc/include/any-windows-any/corecrt_stdio_config.h +++ b/lib/libc/include/any-windows-any/corecrt_stdio_config.h @@ -13,8 +13,8 @@ extern "C" { #endif -unsigned __int64* __local_stdio_printf_options(void); -unsigned __int64* __local_stdio_scanf_options(void); +unsigned __int64* __cdecl __local_stdio_printf_options(void); +unsigned __int64* __cdecl __local_stdio_scanf_options(void); #define _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION 0x0001ULL #define _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR 0x0002ULL diff --git a/lib/libc/include/any-windows-any/corecrt_wconio.h b/lib/libc/include/any-windows-any/corecrt_wconio.h new file mode 100644 index 0000000000000000000000000000000000000000..7b741a2b7020d6a1971668157ea64df05a092252 --- /dev/null +++ b/lib/libc/include/any-windows-any/corecrt_wconio.h @@ -0,0 +1,146 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _INC_CORECRT_WCONIO +#define _INC_CORECRT_WCONIO + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef WEOF +#define WEOF (wint_t)(0xFFFF) +#endif + +/** + * Functions to read/write strings from/to console. + */ + +_CRTIMP wchar_t *__cdecl _cgetws(wchar_t *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; +_CRTIMP int __cdecl _cputws(const wchar_t *_String); + +/** + * Functions to read/write single characters from/to console. + */ + +_CRTIMP wint_t __cdecl _getwch(void); +_CRTIMP wint_t __cdecl _getwche(void); +_CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); +_CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); + +#if __MSVCRT_VERSION__ >= 0x800 +_CRTIMP wint_t __cdecl _getwch_nolock(void); +_CRTIMP wint_t __cdecl _getwche_nolock(void); +_CRTIMP wint_t __cdecl _putwch_nolock(wchar_t _WCh); +_CRTIMP wint_t __cdecl _ungetwch_nolock(wint_t _WCh); +#endif + +/** + * Formatted console I/O functions. + */ + +#ifdef _UCRT +int __cdecl __conio_common_vcwprintf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); +int __cdecl __conio_common_vcwprintf_p(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); +int __cdecl __conio_common_vcwprintf_s(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); +int __cdecl __conio_common_vcwscanf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); + +__mingw_ovr int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) +{ + return __conio_common_vcwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, NULL, _ArgList); +} +__mingw_ovr int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Format); + _Ret = _vcwprintf(_Format, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +__mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN +int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Format); + _Ret = __conio_common_vcwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Format, NULL, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +__mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN +int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Locale); + _Ret = __conio_common_vcwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Format, _Locale, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +__mingw_ovr int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList) +{ + return __conio_common_vcwprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, NULL, _ArgList); +} +__mingw_ovr int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Format); + _Ret = _vcwprintf_p(_Format, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +__mingw_ovr int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) +{ + return __conio_common_vcwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, _Locale, _ArgList); +} +__mingw_ovr int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Locale); + _Ret = _vcwprintf_l(_Format, _Locale, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +__mingw_ovr int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList) +{ + return __conio_common_vcwprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Format, _Locale, _ArgList); +} +__mingw_ovr int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) +{ + __builtin_va_list _ArgList; + int _Ret; + __builtin_va_start(_ArgList, _Locale); + _Ret = _vcwprintf_p_l(_Format, _Locale, _ArgList); + __builtin_va_end(_ArgList); + return _Ret; +} +#else /* !_UCRT */ +_CRTIMP int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...); +_CRTIMP int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); +_CRTIMP int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...); +_CRTIMP int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); +_CRTIMP int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); +_CRTIMP int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); +_CRTIMP int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); +_CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); +_CRTIMP int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; +_CRTIMP int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; +#endif /* _UCRT */ + +#ifdef __cplusplus +} +#endif + +#include + +#endif /* _INC_CORECRT_WCONIO */ diff --git a/lib/libc/include/any-windows-any/corecrt_wctype.h b/lib/libc/include/any-windows-any/corecrt_wctype.h index d2a58d81d2e17a19fb40a79fc8de81e15988c0cc..bed41be3696c8907229b32158c37d2d9d7908991 100644 --- a/lib/libc/include/any-windows-any/corecrt_wctype.h +++ b/lib/libc/include/any-windows-any/corecrt_wctype.h @@ -12,45 +12,31 @@ extern "C" { #endif -#ifndef _WCTYPE_T_DEFINED -#define _WCTYPE_T_DEFINED - typedef unsigned short wint_t; - typedef unsigned short wctype_t; -#endif /* _WCTYPE_T_DEFINED */ - #ifndef WEOF #define WEOF (wint_t)(0xFFFF) #endif -#ifndef _CRT_CTYPEDATA_DEFINED -#define _CRT_CTYPEDATA_DEFINED #ifndef _CTYPE_DISABLE_MACROS +_CRTIMP const unsigned short* __cdecl __pctype_func(void); +_CRTIMP const wctype_t * __cdecl __pwctype_func(void); #ifndef __PCTYPE_FUNC #define __PCTYPE_FUNC __pctype_func() - _CRTIMP const unsigned short* __pctype_func(void); #endif #ifndef _pctype #define _pctype (__pctype_func()) #endif -#endif -#endif - -#ifndef _CRT_WCTYPEDATA_DEFINED -#define _CRT_WCTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS -#if !defined(_wctype) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP) - extern const unsigned short ** __MINGW_IMP_SYMBOL(_wctype); -#define _wctype (* __MINGW_IMP_SYMBOL(_wctype)) -#endif - - _CRTIMP const wctype_t * __cdecl __pwctype_func(void); #ifndef _pwctype #define _pwctype (__pwctype_func()) #endif -#endif +#endif /* !_CTYPE_DISABLE_MACROS */ + +#if __MSVCRT_VERSION__ >= 0x0600 +#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP +extern _CRTIMP const unsigned short *_wctype; +#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ #endif #define _UPPER 0x1 @@ -66,95 +52,128 @@ extern "C" { #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED +/** + * Standard C functions. + */ - _CRTIMP int __cdecl iswalpha(wint_t _C); - _CRTIMP int __cdecl iswupper(wint_t _C); - _CRTIMP int __cdecl iswlower(wint_t _C); - _CRTIMP int __cdecl iswdigit(wint_t _C); - _CRTIMP int __cdecl iswxdigit(wint_t _C); - _CRTIMP int __cdecl iswspace(wint_t _C); - _CRTIMP int __cdecl iswpunct(wint_t _C); - _CRTIMP int __cdecl iswalnum(wint_t _C); - _CRTIMP int __cdecl iswprint(wint_t _C); - _CRTIMP int __cdecl iswgraph(wint_t _C); - _CRTIMP int __cdecl iswcntrl(wint_t _C); - _CRTIMP int __cdecl iswascii(wint_t _C); -#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP - _CRTIMP int __cdecl isleadbyte(int _C); -#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ - _CRTIMP wint_t __cdecl towupper(wint_t _C); - _CRTIMP wint_t __cdecl towlower(wint_t _C); - _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); - _CRTIMP int __cdecl __iswcsymf(wint_t _C); - _CRTIMP int __cdecl __iswcsym(wint_t _C); - _CRTIMP int __cdecl iswblank(wint_t _C); -#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600) - /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in - * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */ - _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); -# ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP - _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); -# endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ - _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); - _CRTIMP int __cdecl _iswblank_l(wint_t _C,_locale_t _Locale); -#endif -#if __MSVCRT_VERSION__ >= 0x800 - /* These are only available since msvcr80.dll, never in msvcrt.dll. */ - _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); -#endif -#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP - _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); -#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ -#endif +_CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); -#ifndef _WCTYPE_INLINE_DEFINED -#define _WCTYPE_INLINE_DEFINED +_CRTIMP int __cdecl iswalnum(wint_t _C); +_CRTIMP int __cdecl iswalpha(wint_t _C); +_CRTIMP int __cdecl iswblank(wint_t _C); +_CRTIMP int __cdecl iswcntrl(wint_t _C); +_CRTIMP int __cdecl iswdigit(wint_t _C); +_CRTIMP int __cdecl iswgraph(wint_t _C); +_CRTIMP int __cdecl iswlower(wint_t _C); +_CRTIMP int __cdecl iswprint(wint_t _C); +_CRTIMP int __cdecl iswpunct(wint_t _C); +_CRTIMP int __cdecl iswspace(wint_t _C); +_CRTIMP int __cdecl iswupper(wint_t _C); +_CRTIMP int __cdecl iswxdigit(wint_t _C); -#undef _CRT_WCTYPE_NOINLINE -#ifndef __cplusplus -#define iswalpha(_c) (iswctype(_c,_ALPHA)) -#define iswupper(_c) (iswctype(_c,_UPPER)) -#define iswlower(_c) (iswctype(_c,_LOWER)) -#define iswdigit(_c) (iswctype(_c,_DIGIT)) +_CRTIMP wint_t __cdecl towlower(wint_t _C); +_CRTIMP wint_t __cdecl towupper(wint_t _C); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT)) +#define iswalpha(_c) (iswctype(_c,_ALPHA)) +#define iswblank(_c) (iswctype(_c,_BLANK)) +#define iswcntrl(_c) (iswctype(_c,_CONTROL)) +#define iswdigit(_c) (iswctype(_c,_DIGIT)) +#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT)) +#define iswlower(_c) (iswctype(_c,_LOWER)) +#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT)) +#define iswpunct(_c) (iswctype(_c,_PUNCT)) +#define iswspace(_c) (iswctype(_c,_SPACE)) +#define iswupper(_c) (iswctype(_c,_UPPER)) #define iswxdigit(_c) (iswctype(_c,_HEX)) -#define iswspace(_c) (iswctype(_c,_SPACE)) -#define iswpunct(_c) (iswctype(_c,_PUNCT)) -#define iswalnum(_c) (iswctype(_c,_ALPHA|_DIGIT)) -#define iswprint(_c) (iswctype(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT)) -#define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT)) -#define iswcntrl(_c) (iswctype(_c,_CONTROL)) -#define iswascii(_c) ((unsigned)(_c) < 0x80) -#define iswblank(_c) (((_c) == '\t') || iswctype(_c,_BLANK)) -#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600) -# define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p)) -# define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p)) -# define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p)) -# define _iswdigit_l(_c,_p) (_iswctype_l(_c,_DIGIT,_p)) -# define _iswxdigit_l(_c,_p) (_iswctype_l(_c,_HEX,_p)) -# define _iswspace_l(_c,_p) (_iswctype_l(_c,_SPACE,_p)) -# define _iswpunct_l(_c,_p) (_iswctype_l(_c,_PUNCT,_p)) -# define _iswalnum_l(_c,_p) (_iswctype_l(_c,_ALPHA|_DIGIT,_p)) -# define _iswprint_l(_c,_p) (_iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT,_p)) -# define _iswgraph_l(_c,_p) (_iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT,_p)) -# define _iswcntrl_l(_c,_p) (_iswctype_l(_c,_CONTROL,_p)) -# define _iswblank_l(_c,_p) (((_c) == '\t') || _iswctype_l(_c,_BLANK,_p)) -#endif /* __MSVCRT_VERSION__ >= 0x800 */ +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ + +/** + * Locale-specific versions of Standard C functions. + * + * They are available since msvcr80.dll. + */ + +/* These are also available in msvcrt.dll since Windows Vista. */ +#if __MSVCRT_VERSION__ >= 0x0800 || (__MSVCRT_VERSION__ == 0x0600 && _WIN32_WINNT >= 0x0600) +_CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); + +_CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswblank_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); + +_CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); +_CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define _iswalnum_l(_c,_p) (_iswctype_l(_c,_ALPHA|_DIGIT,_p)) +#define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p)) +#define _iswblank_l(_c,_p) (((_c) == '\t') || _iswctype_l(_c,_BLANK,_p)) +#define _iswcntrl_l(_c,_p) (_iswctype_l(_c,_CONTROL,_p)) +#define _iswdigit_l(_c,_p) (_iswctype_l(_c,_DIGIT,_p)) +#define _iswgraph_l(_c,_p) (_iswctype_l(_c,_PUNCT|_ALPHA|_DIGIT,_p)) +#define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p)) +#define _iswprint_l(_c,_p) (_iswctype_l(_c,_BLANK|_PUNCT|_ALPHA|_DIGIT,_p)) +#define _iswpunct_l(_c,_p) (_iswctype_l(_c,_PUNCT,_p)) +#define _iswspace_l(_c,_p) (_iswctype_l(_c,_SPACE,_p)) +#define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p)) +#define _iswxdigit_l(_c,_p) (_iswctype_l(_c,_HEX,_p)) +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ #endif + +/** + * Microsoft-specific functions. + */ + +_CRTIMP int __cdecl __iswcsym(wint_t _C); +_CRTIMP int __cdecl __iswcsymf(wint_t _C); +_CRTIMP int __cdecl iswascii(wint_t _C); + +/* These are only available for Desktop applications. */ +#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP +_CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); +_CRTIMP int __cdecl isleadbyte(int _C); +#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define __iswcsym(_c) (iswalnum(_c) || ((_c)=='_')) +#define __iswcsymf(_c) (iswalpha(_c) || ((_c)=='_')) +#define iswascii(_c) ((unsigned)(_c) < 0x80) +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ + +/** + * Locale-specific versions of Microsoft functions. + * + * They are available since msvcr80.dll. + */ + +/* These are only available since msvcr80.dll, never in msvcrt.dll. */ +#if __MSVCRT_VERSION__ >= 0x0800 +_CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); +_CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define _iswcsym_l(_c,_p) (_iswalnum_l(_c,_p) || ((_c)=='_')) +#define _iswcsymf_l(_c,_p) (_iswalpha_l(_c,_p) || ((_c)=='_')) +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ +#endif + +/* These are also available in msvcrt.dll since Windows Vista. */ +#if __MSVCRT_VERSION__ >= 0x0800 || (__MSVCRT_VERSION__ == 0x0600 && _WIN32_WINNT >= 0x0600) +/* These are only available for Desktop applications. */ +#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP +_CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); +#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/credentialprovider.h b/lib/libc/include/any-windows-any/credentialprovider.h index eff713bba3d4f7cb2b2b4e9872a773fff7c90aa5..dcdec4f8e6e95be2eb505cb2f9f87ea99876e0a3 100644 --- a/lib/libc/include/any-windows-any/credentialprovider.h +++ b/lib/libc/include/any-windows-any/credentialprovider.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/credentialprovider.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/credentialprovider.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ctfutb.h b/lib/libc/include/any-windows-any/ctfutb.h index 04f3e99aeaaa7fb518d6bcce3cb65369a51a2cac..ed90265718bb60990afc28e701e3cc98a7489b22 100644 --- a/lib/libc/include/any-windows-any/ctfutb.h +++ b/lib/libc/include/any-windows-any/ctfutb.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/ctfutb.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/ctfutb.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ctxtcall.h b/lib/libc/include/any-windows-any/ctxtcall.h index b81a01f95b0daaf02a024acfea01c0b30b7231f3..ee873e11fefdd68d867e8ad606fa975ead23a380 100644 --- a/lib/libc/include/any-windows-any/ctxtcall.h +++ b/lib/libc/include/any-windows-any/ctxtcall.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/ctxtcall.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/ctxtcall.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ctype.h b/lib/libc/include/any-windows-any/ctype.h index 05986d9977d96d561e026ad634cba6022167d4b4..700a9308317a13a122f5f3bb1f3139bc803d445a 100644 --- a/lib/libc/include/any-windows-any/ctype.h +++ b/lib/libc/include/any-windows-any/ctype.h @@ -12,122 +12,130 @@ extern "C" { #endif -#ifndef WEOF -#define WEOF (wint_t)(0xFFFF) -#endif +/** + * Standard C functions. + */ - /* CRT stuff */ -#if 1 - extern const unsigned char __newclmap[]; - extern const unsigned char __newcumap[]; - extern pthreadlocinfo __ptlocinfo; - extern pthreadmbcinfo __ptmbcinfo; - extern int __globallocalestatus; - extern int __locale_changed; - extern struct threadlocaleinfostruct __initiallocinfo; - extern _locale_tstruct __initiallocalestructinfo; - pthreadlocinfo __cdecl __updatetlocinfo(void); - pthreadmbcinfo __cdecl __updatetmbcinfo(void); -#endif +_CRTIMP int __cdecl isalnum(int _C); +_CRTIMP int __cdecl isalpha(int _C); +_CRTIMP int __cdecl isblank(int _C); +_CRTIMP int __cdecl iscntrl(int _C); +_CRTIMP int __cdecl isdigit(int _C); +_CRTIMP int __cdecl isgraph(int _C); +_CRTIMP int __cdecl islower(int _C); +_CRTIMP int __cdecl isprint(int _C); +_CRTIMP int __cdecl ispunct(int _C); +_CRTIMP int __cdecl isspace(int _C); +_CRTIMP int __cdecl isupper(int _C); +_CRTIMP int __cdecl isxdigit(int _C); -#ifndef _CTYPE_DEFINED -#define _CTYPE_DEFINED +_CRTIMP int __cdecl tolower(int _C); +_CRTIMP int __cdecl toupper(int _C); - _CRTIMP int __cdecl isalpha(int _C); - _CRTIMP int __cdecl isupper(int _C); - _CRTIMP int __cdecl islower(int _C); - _CRTIMP int __cdecl isdigit(int _C); - _CRTIMP int __cdecl isxdigit(int _C); - _CRTIMP int __cdecl isspace(int _C); - _CRTIMP int __cdecl ispunct(int _C); - _CRTIMP int __cdecl isalnum(int _C); - _CRTIMP int __cdecl isprint(int _C); - _CRTIMP int __cdecl isgraph(int _C); - _CRTIMP int __cdecl iscntrl(int _C); - _CRTIMP int __cdecl toupper(int _C); - _CRTIMP int __cdecl _toupper(int _C); - _CRTIMP int __cdecl tolower(int _C); - _CRTIMP int __cdecl _tolower(int _C); - _CRTIMP int __cdecl _tolower_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isctype(int _C,int _Type); - _CRTIMP int __cdecl isblank(int _C); - _CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _toupper_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale); - _CRTIMP int __cdecl _isblank_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl __isascii(int _C); - _CRTIMP int __cdecl __toascii(int _C); - _CRTIMP int __cdecl __iscsymf(int _C); - _CRTIMP int __cdecl __iscsym(int _C); -#endif +/** + * Locale-specific versions of Standard C functions. + * + * They are available since msvcr80.dll. + */ -#ifndef _CTYPE_DISABLE_MACROS +/* These are also available in msvcrt.dll since Windows Vista. */ +#if __MSVCRT_VERSION__ >= 0x0800 || (__MSVCRT_VERSION__ == 0x0600 && _WIN32_WINNT >= 0x0600) +_CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isblank_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale); -#ifndef MB_CUR_MAX -#define MB_CUR_MAX ___mb_cur_max_func() -#ifndef __mb_cur_max -#define __mb_cur_max (___mb_cur_max_func()) -#endif -_CRTIMP int __cdecl ___mb_cur_max_func(void); +_CRTIMP int __cdecl _tolower_l(int _C,_locale_t _Locale); +_CRTIMP int __cdecl _toupper_l(int _C,_locale_t _Locale); #endif -#define __chvalidchk(a,b) (__PCTYPE_FUNC[(unsigned char)(a)] & (b)) -#ifdef _UCRT -#define _chvalidchk_l(_Char,_Flag,_Locale) (!_Locale ? __chvalidchk(_Char,_Flag) : ((_locale_t)_Locale)->locinfo->_locale_pctype[(unsigned char)(_Char)] & (_Flag)) -#define _ischartype_l(_Char,_Flag,_Locale) (((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->_locale_mb_cur_max) > 1) ? _isctype_l(_Char,(_Flag),_Locale) : _chvalidchk_l(_Char,_Flag,_Locale)) -#else -#define _chvalidchk_l(_Char,_Flag,_Locale) (!_Locale ? __chvalidchk(_Char,_Flag) : ((_locale_t)_Locale)->locinfo->pctype[(unsigned char)(_Char)] & (_Flag)) -#define _ischartype_l(_Char,_Flag,_Locale) (((_Locale)!=NULL && (((_locale_t)(_Locale))->locinfo->mb_cur_max) > 1) ? _isctype_l(_Char,(_Flag),_Locale) : _chvalidchk_l(_Char,_Flag,_Locale)) -#endif -#define _isalpha_l(_Char,_Locale) _ischartype_l(_Char,_ALPHA,_Locale) -#define _isupper_l(_Char,_Locale) _ischartype_l(_Char,_UPPER,_Locale) -#define _islower_l(_Char,_Locale) _ischartype_l(_Char,_LOWER,_Locale) -#define _isdigit_l(_Char,_Locale) _ischartype_l(_Char,_DIGIT,_Locale) -#define _isxdigit_l(_Char,_Locale) _ischartype_l(_Char,_HEX,_Locale) -#define _isspace_l(_Char,_Locale) _ischartype_l(_Char,_SPACE,_Locale) -#define _ispunct_l(_Char,_Locale) _ischartype_l(_Char,_PUNCT,_Locale) -#define _isalnum_l(_Char,_Locale) _ischartype_l(_Char,_ALPHA|_DIGIT,_Locale) -#define _isprint_l(_Char,_Locale) _ischartype_l(_Char,_BLANK|_PUNCT|_ALPHA|_DIGIT,_Locale) -#define _isgraph_l(_Char,_Locale) _ischartype_l(_Char,_PUNCT|_ALPHA|_DIGIT,_Locale) -#define _iscntrl_l(_Char,_Locale) _ischartype_l(_Char,_CONTROL,_Locale) -#define _isblank_l(_Char,_Locale) (((_Char) == '\t') || _ischartype_l(_Char,_BLANK,_Locale)) -#define _tolower(_Char) ((_Char)-'A'+'a') -#define _toupper(_Char) ((_Char)-'a'+'A') +/** + * POSIX functions. + */ + +_CRTIMP int __cdecl __isascii(int _C); +_CRTIMP int __cdecl __toascii(int _C); +_CRTIMP int __cdecl _tolower(int _C); +_CRTIMP int __cdecl _toupper(int _C); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) #define __isascii(_Char) ((unsigned)(_Char) < 0x80) #define __toascii(_Char) ((_Char) & 0x7f) - -#define __iscsymf(_c) (isalpha(_c) || ((_c)=='_')) -#define __iscsym(_c) (isalnum(_c) || ((_c)=='_')) -#define __iswcsymf(_c) (iswalpha(_c) || ((_c)=='_')) -#define __iswcsym(_c) (iswalnum(_c) || ((_c)=='_')) -#define _iscsymf_l(_c,_p) (_isalpha_l(_c,_p) || ((_c)=='_')) -#define _iscsym_l(_c,_p) (_isalnum_l(_c,_p) || ((_c)=='_')) -#define _iswcsymf_l(_c,_p) (_iswalpha_l(_c,_p) || ((_c)=='_')) -#define _iswcsym_l(_c,_p) (_iswalnum_l(_c,_p) || ((_c)=='_')) -#endif +#define _tolower(_Char) ((_Char)-'A'+'a') +#define _toupper(_Char) ((_Char)-'a'+'A') +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ #ifndef NO_OLDNAMES -#ifndef _CTYPE_DEFINED - _CRTIMP int __cdecl isascii(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - _CRTIMP int __cdecl toascii(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - _CRTIMP int __cdecl iscsymf(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - _CRTIMP int __cdecl iscsym(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#else +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) #define isascii __isascii #define toascii __toascii -#define iscsymf __iscsymf +#else +_CRTIMP int __cdecl isascii(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +_CRTIMP int __cdecl toascii(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ +#endif /* !NO_OLDNAMES */ + +/** + * Microsoft-specific functions. + */ + +_CRTIMP int __cdecl _isctype(int _C,int _Type); + +_CRTIMP int __cdecl __iscsym(int _C); +_CRTIMP int __cdecl __iscsymf(int _C); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define __iscsym(_c) (isalnum(_c) || ((_c)=='_')) +#define __iscsymf(_c) (isalpha(_c) || ((_c)=='_')) +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ + +#ifndef NO_OLDNAMES +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) #define iscsym __iscsym +#define iscsymf __iscsymf +#else +_CRTIMP int __cdecl iscsym(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +_CRTIMP int __cdecl iscsymf(int _C) __MINGW_ATTRIB_DEPRECATED_MSVC2005; +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ +#endif /* !NO_OLDNAMES */ + +/** + * Locale-specific versions of Microsoft functions. + * + * They are available since msvcr80.dll. + */ + +/** + * _iscsym_l and _iscsymf_l are only available as macros in Microsoft headers. + * + * We do not expose those macros under following conditions: + * + * - when _CTYPE_DISABLE_MACROS is defined; this is what Microsoft headers do + * - for C++ compilations; this avoids possible clashes with class member names + * + * To make them available under above conditions, we provide them as externals. + */ +#if __MSVCRT_VERSION__ >= 0x0800 +int __cdecl _iscsym_l(wint_t _C, _locale_t _Locale); +int __cdecl _iscsymf_l(wint_t _C, _locale_t _Locale); + +#if !defined(_CTYPE_DISABLE_MACROS) && !defined(__cplusplus) +#define _iscsym_l(_c,_p) (_isalnum_l(_c,_p) || ((_c)=='_')) +#define _iscsymf_l(_c,_p) (_isalpha_l(_c,_p) || ((_c)=='_')) +#endif /* !_CTYPE_DISABLE_MACROS && !__cplusplus */ #endif + +/* These are also available in msvcrt.dll since Windows Vista. */ +#if __MSVCRT_VERSION__ >= 0x0800 || (__MSVCRT_VERSION__ == 0x0600 && _WIN32_WINNT >= 0x0600) +_CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale); #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/d3d10.h b/lib/libc/include/any-windows-any/d3d10.h index 01a08b0de838cc909dbe3609f3fbbcbefed9f6f3..70d888652f59a62c7b11a5e17574ef4d62d28c58 100644 --- a/lib/libc/include/any-windows-any/d3d10.h +++ b/lib/libc/include/any-windows-any/d3d10.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d10.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d10_1.h b/lib/libc/include/any-windows-any/d3d10_1.h index edd43173cfd096a990c407d6294694f5f1747ef1..9024f4bdf5685c7bf83fe5e03384ded0ff850d4a 100644 --- a/lib/libc/include/any-windows-any/d3d10_1.h +++ b/lib/libc/include/any-windows-any/d3d10_1.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d10_1.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d10effect.h b/lib/libc/include/any-windows-any/d3d10effect.h index 72351aa824f1e12250bd2afd21192ae40b9df9a7..e8929955cff43e063260c4a733c196942256cfba 100644 --- a/lib/libc/include/any-windows-any/d3d10effect.h +++ b/lib/libc/include/any-windows-any/d3d10effect.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d10effect.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d10effect.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d10sdklayers.h b/lib/libc/include/any-windows-any/d3d10sdklayers.h index 075a7e7c6acfb4b8a1e1f6f5e387b111a3f237a0..5eb2efe22844730fd191defbf801dbaa15af296b 100644 --- a/lib/libc/include/any-windows-any/d3d10sdklayers.h +++ b/lib/libc/include/any-windows-any/d3d10sdklayers.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d10sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d10sdklayers.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d10shader.h b/lib/libc/include/any-windows-any/d3d10shader.h index 715443615d3358aa46947bbe6a927bb6f3746fa0..24773e589245bafc03abd879181a0f1addc2e0c1 100644 --- a/lib/libc/include/any-windows-any/d3d10shader.h +++ b/lib/libc/include/any-windows-any/d3d10shader.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d10shader.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d10shader.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11.h b/lib/libc/include/any-windows-any/d3d11.h index 6661705359dfca28b088b26bb60a912ea10e100f..4453d6dd497ecb9d190516ed6f79307fd078032b 100644 --- a/lib/libc/include/any-windows-any/d3d11.h +++ b/lib/libc/include/any-windows-any/d3d11.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -1265,34 +1265,47 @@ typedef enum D3D11_FILTER_TYPE { D3D11_FILTER_TYPE_POINT = 0, D3D11_FILTER_TYPE_LINEAR = 1 } D3D11_FILTER_TYPE; +typedef enum D3D11_FILTER_REDUCTION_TYPE { + D3D11_FILTER_REDUCTION_TYPE_STANDARD = 0x0, + D3D11_FILTER_REDUCTION_TYPE_COMPARISON = 0x1, + D3D11_FILTER_REDUCTION_TYPE_MINIMUM = 0x2, + D3D11_FILTER_REDUCTION_TYPE_MAXIMUM = 0x3 +} D3D11_FILTER_REDUCTION_TYPE; +#define D3D11_FILTER_REDUCTION_TYPE_SHIFT (7) + #define D3D11_MIN_FILTER_SHIFT (4) #define D3D11_MAG_FILTER_SHIFT (2) #define D3D11_MIP_FILTER_SHIFT (0) +#define D3D11_FILTER_REDUCTION_TYPE_MASK (0x3) + #define D3D11_FILTER_TYPE_MASK (0x3) #define D3D11_COMPARISON_FILTERING_BIT (0x80) #define D3D11_ANISOTROPIC_FILTERING_BIT (0x40) -#define D3D11_ENCODE_BASIC_FILTER(min, mag, mip, bComparison) \ - ((D3D11_FILTER)(((bComparison) ? D3D11_COMPARISON_FILTERING_BIT : 0 ) | \ - (((min)&D3D11_FILTER_TYPE_MASK) << D3D11_MIN_FILTER_SHIFT) | \ +#define D3D11_ENCODE_BASIC_FILTER(min, mag, mip, reduction_mode) \ + ((D3D11_FILTER)((((min)&D3D11_FILTER_TYPE_MASK) << D3D11_MIN_FILTER_SHIFT) | \ (((mag)&D3D11_FILTER_TYPE_MASK) << D3D11_MAG_FILTER_SHIFT) | \ - (((mip)&D3D11_FILTER_TYPE_MASK) << D3D11_MIP_FILTER_SHIFT))) -#define D3D11_ENCODE_ANISOTROPIC_FILTER(bComparison) \ + (((mip)&D3D11_FILTER_TYPE_MASK) << D3D11_MIP_FILTER_SHIFT) | \ + (((reduction_mode)&D3D11_FILTER_REDUCTION_TYPE_MASK) << D3D11_FILTER_REDUCTION_TYPE_SHIFT))) +#define D3D11_ENCODE_ANISOTROPIC_FILTER(reduction_mode) \ ((D3D11_FILTER)(D3D11_ANISOTROPIC_FILTERING_BIT | \ D3D11_ENCODE_BASIC_FILTER(D3D11_FILTER_TYPE_LINEAR,D3D11_FILTER_TYPE_LINEAR, \ - D3D11_FILTER_TYPE_LINEAR,bComparison))) + D3D11_FILTER_TYPE_LINEAR,reduction_mode))) #define D3D11_DECODE_MIN_FILTER(d3d11Filter) \ ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MIN_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK)) #define D3D11_DECODE_MAG_FILTER(d3d11Filter) \ ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MAG_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK)) #define D3D11_DECODE_MIP_FILTER(d3d11Filter) \ ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MIP_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK)) -#define D3D11_DECODE_IS_COMPARISON_FILTER(d3d11Filter) ((d3d11Filter) & D3D11_COMPARISON_FILTERING_BIT) +#define D3D11_DECODE_FILTER_REDUCTION(filter) \ + ((D3D11_FILTER_REDUCTION_TYPE)(((filter) >> D3D11_FILTER_REDUCTION_TYPE_SHIFT) & D3D11_FILTER_REDUCTION_TYPE_MASK)) +#define D3D11_DECODE_IS_COMPARISON_FILTER(filter) \ + (D3D11_DECODE_FILTER_REDUCTION(filter) == D3D11_FILTER_REDUCTION_TYPE_COMPARISON) #define D3D11_DECODE_IS_ANISOTROPIC_FILTER(d3d11Filter) \ (((d3d11Filter) & D3D11_ANISOTROPIC_FILTERING_BIT ) \ && (D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIN_FILTER(d3d11Filter)) \ diff --git a/lib/libc/include/any-windows-any/d3d11_1.h b/lib/libc/include/any-windows-any/d3d11_1.h index a09bb523ef12eb723dff21b469fe333f4b6bf5a7..b7abec0a249b434a71485300ecbba73ec49bf7a3 100644 --- a/lib/libc/include/any-windows-any/d3d11_1.h +++ b/lib/libc/include/any-windows-any/d3d11_1.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11_1.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11_2.h b/lib/libc/include/any-windows-any/d3d11_2.h index c5c78331a146bcbe5c46c68c5d2565017e96cee9..b89a702ce071ebfab65773f14647fa0472d79ed6 100644 --- a/lib/libc/include/any-windows-any/d3d11_2.h +++ b/lib/libc/include/any-windows-any/d3d11_2.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11_2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11_3.h b/lib/libc/include/any-windows-any/d3d11_3.h index 7161351ab77a05ffde941a853193cf48a64e730b..d59317a5c414d96dad81f0f85d18f5caaf1de18a 100644 --- a/lib/libc/include/any-windows-any/d3d11_3.h +++ b/lib/libc/include/any-windows-any/d3d11_3.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11_3.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11_4.h b/lib/libc/include/any-windows-any/d3d11_4.h index c55568fe1eda4c80a16b87fb80f9e6df9a28c7c7..7a5fe2a3b9ef2a66241cb91cbe1d79d039908ba6 100644 --- a/lib/libc/include/any-windows-any/d3d11_4.h +++ b/lib/libc/include/any-windows-any/d3d11_4.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11_4.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11on12.h b/lib/libc/include/any-windows-any/d3d11on12.h index 83d87826e6a31c0571564be98ae2a43336fa6997..ab71e8547c15e8503239895e72a7c6994ffaa740 100644 --- a/lib/libc/include/any-windows-any/d3d11on12.h +++ b/lib/libc/include/any-windows-any/d3d11on12.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11on12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11on12.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11sdklayers.h b/lib/libc/include/any-windows-any/d3d11sdklayers.h index 5a8b3e8e717cd6d41589dfd95f02cbc3e781c654..474e751f58dabd051675578cf2c4442a7f436c1b 100644 --- a/lib/libc/include/any-windows-any/d3d11sdklayers.h +++ b/lib/libc/include/any-windows-any/d3d11sdklayers.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d11sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d11sdklayers.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -1229,6 +1229,7 @@ typedef enum D3D11_RLDO_FLAGS { D3D11_RLDO_SUMMARY = 1, D3D11_RLDO_DETAIL = 2 } D3D11_RLDO_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D11_RLDO_FLAGS) typedef struct D3D11_MESSAGE { D3D11_MESSAGE_CATEGORY Category; D3D11_MESSAGE_SEVERITY Severity; diff --git a/lib/libc/include/any-windows-any/d3d11shader.h b/lib/libc/include/any-windows-any/d3d11shader.h index 4237822cad3aaf236c8f12ae68bcdee86871d9cd..e83ec97e03f90e7d3ab56a09be81f23353f068cc 100644 --- a/lib/libc/include/any-windows-any/d3d11shader.h +++ b/lib/libc/include/any-windows-any/d3d11shader.h @@ -151,6 +151,22 @@ typedef struct _D3D11_SIGNATURE_PARAMETER_DESC #endif } D3D11_SIGNATURE_PARAMETER_DESC; +typedef struct _D3D11_PARAMETER_DESC +{ + LPCSTR Name; + LPCSTR SemanticName; + D3D_SHADER_VARIABLE_TYPE Type; + D3D_SHADER_VARIABLE_CLASS Class; + UINT Rows; + UINT Columns; + D3D_INTERPOLATION_MODE InterpolationMode; + D3D_PARAMETER_FLAGS Flags; + UINT FirstInRegister; + UINT FirstInComponent; + UINT FirstOutRegister; + UINT FirstOutComponent; +} D3D11_PARAMETER_DESC; + DEFINE_GUID(IID_ID3D11ShaderReflectionType, 0x6e6ffa6a, 0x9bae, 0x4613, 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21); #define INTERFACE ID3D11ShaderReflectionType @@ -288,4 +304,36 @@ DECLARE_INTERFACE_(ID3D11Linker, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D11LinkingNode, 0xd80dd70c, 0x8d2f, 0x4751, 0x94, 0xa1, 0x3, 0xc7, 0x9b, 0x35, 0x56, 0xdb); + +#define INTERFACE ID3D11LinkingNode +DECLARE_INTERFACE_(ID3D11LinkingNode, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11FunctionLinkingGraph, 0x54133220, 0x1ce8, 0x43d3, 0x82, 0x36, 0x98, 0x55, 0xc5, 0xce, 0xec, 0xff); + +#define INTERFACE ID3D11FunctionLinkingGraph +DECLARE_INTERFACE_(ID3D11FunctionLinkingGraph, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11FunctionLinkingGraph methods */ + STDMETHOD(CreateModuleInstance)(THIS_ ID3D11ModuleInstance **instance, ID3DBlob **error) PURE; + STDMETHOD(SetInputSignature)(THIS_ const D3D11_PARAMETER_DESC *parameter_desc, UINT parameter_count, ID3D11LinkingNode **input_node) PURE; + STDMETHOD(SetOutputSignature)(THIS_ const D3D11_PARAMETER_DESC *parameter_desc, UINT parameter_count, ID3D11LinkingNode **output_node) PURE; + STDMETHOD(CallFunction)(THIS_ LPCSTR _namespace, ID3D11Module *module, LPCSTR function_name, ID3D11LinkingNode **call_node) PURE; + STDMETHOD(PassValue)(THIS_ ID3D11LinkingNode *src_node, INT src_parameter_index, ID3D11LinkingNode *dst_node, INT dst_parameter_index) PURE; + STDMETHOD(PassValueWithSwizzle)(THIS_ ID3D11LinkingNode *src_node, INT src_parameter_index, LPCSTR src_swizzle, ID3D11LinkingNode *dst_node, INT dst_parameter_index,LPCSTR dst_swizzle) PURE; + STDMETHOD(GetLastError)(THIS_ ID3DBlob **error) PURE; + STDMETHOD(GenerateHlsl)(THIS_ UINT flags, ID3DBlob **buffer) PURE; +}; +#undef INTERFACE + #endif diff --git a/lib/libc/include/any-windows-any/d3d12.h b/lib/libc/include/any-windows-any/d3d12.h index 1f6c0575365ca318464af4b89954221ed7606307..334ec534aa7a2fcbed3c183ed05ec9fd5264f094 100644 --- a/lib/libc/include/any-windows-any/d3d12.h +++ b/lib/libc/include/any-windows-any/d3d12.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d12.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -466,6 +466,30 @@ interface ID3D12SDKConfiguration; #endif /* __cplusplus */ #endif +#ifndef __ID3D12SDKConfiguration1_FWD_DEFINED__ +#define __ID3D12SDKConfiguration1_FWD_DEFINED__ +typedef interface ID3D12SDKConfiguration1 ID3D12SDKConfiguration1; +#ifdef __cplusplus +interface ID3D12SDKConfiguration1; +#endif /* __cplusplus */ +#endif + +#ifndef __ID3D12DeviceFactory_FWD_DEFINED__ +#define __ID3D12DeviceFactory_FWD_DEFINED__ +typedef interface ID3D12DeviceFactory ID3D12DeviceFactory; +#ifdef __cplusplus +interface ID3D12DeviceFactory; +#endif /* __cplusplus */ +#endif + +#ifndef __ID3D12DeviceConfiguration_FWD_DEFINED__ +#define __ID3D12DeviceConfiguration_FWD_DEFINED__ +typedef interface ID3D12DeviceConfiguration ID3D12DeviceConfiguration; +#ifdef __cplusplus +interface ID3D12DeviceConfiguration; +#endif /* __cplusplus */ +#endif + #ifndef __ID3D12GraphicsCommandList5_FWD_DEFINED__ #define __ID3D12GraphicsCommandList5_FWD_DEFINED__ typedef interface ID3D12GraphicsCommandList5 ID3D12GraphicsCommandList5; @@ -1266,6 +1290,16 @@ extern "C" { #define D3D12_VIDEO_DECODE_STATUS_MACROBLOCKS_AFFECTED_UNKNOWN (0xffffffff) +#define D3D12_VIDEO_ENCODER_AV1_INVALID_DPB_RESOURCE_INDEX (0xff) + +#define D3D12_VIDEO_ENCODER_AV1_MAX_TILE_COLS (64) + +#define D3D12_VIDEO_ENCODER_AV1_MAX_TILE_ROWS (64) + +#define D3D12_VIDEO_ENCODER_AV1_SUPERRES_DENOM_MIN (9) + +#define D3D12_VIDEO_ENCODER_AV1_SUPERRES_NUM (8) + #define D3D12_VIDEO_PROCESS_MAX_FILTERS (32) #define D3D12_VIDEO_PROCESS_STEREO_VIEWS (2) @@ -18215,7 +18249,9 @@ typedef enum D3D12_RENDER_PASS_FLAGS { D3D12_RENDER_PASS_FLAG_NONE = 0x0, D3D12_RENDER_PASS_FLAG_ALLOW_UAV_WRITES = 0x1, D3D12_RENDER_PASS_FLAG_SUSPENDING_PASS = 0x2, - D3D12_RENDER_PASS_FLAG_RESUMING_PASS = 0x4 + D3D12_RENDER_PASS_FLAG_RESUMING_PASS = 0x4, + D3D12_RENDER_PASS_FLAG_BIND_READ_ONLY_DEPTH = 0x8, + D3D12_RENDER_PASS_FLAG_BIND_READ_ONLY_STENCIL = 0x10 } D3D12_RENDER_PASS_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_RENDER_PASS_FLAGS); /***************************************************************************** @@ -19272,7 +19308,7 @@ typedef enum D3D12_BARRIER_SYNC { D3D12_BARRIER_SYNC_NONE = 0x0, D3D12_BARRIER_SYNC_ALL = 0x1, D3D12_BARRIER_SYNC_DRAW = 0x2, - D3D12_BARRIER_SYNC_INPUT_ASSEMBLER = 0x4, + D3D12_BARRIER_SYNC_INDEX_INPUT = 0x4, D3D12_BARRIER_SYNC_VERTEX_SHADING = 0x8, D3D12_BARRIER_SYNC_PIXEL_SHADING = 0x10, D3D12_BARRIER_SYNC_DEPTH_STENCIL = 0x20, @@ -19286,6 +19322,7 @@ typedef enum D3D12_BARRIER_SYNC { D3D12_BARRIER_SYNC_ALL_SHADING = 0x1000, D3D12_BARRIER_SYNC_NON_PIXEL_SHADING = 0x2000, D3D12_BARRIER_SYNC_EMIT_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO = 0x4000, + D3D12_BARRIER_SYNC_CLEAR_UNORDERED_ACCESS_VIEW = 0x8000, D3D12_BARRIER_SYNC_VIDEO_DECODE = 0x100000, D3D12_BARRIER_SYNC_VIDEO_PROCESS = 0x200000, D3D12_BARRIER_SYNC_VIDEO_ENCODE = 0x400000, @@ -21701,6 +21738,429 @@ static inline HRESULT ID3D12SDKConfiguration_SetSDKVersion(ID3D12SDKConfiguratio #endif /* __ID3D12SDKConfiguration_INTERFACE_DEFINED__ */ +/***************************************************************************** + * ID3D12SDKConfiguration1 interface + */ +#ifndef __ID3D12SDKConfiguration1_INTERFACE_DEFINED__ +#define __ID3D12SDKConfiguration1_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ID3D12SDKConfiguration1, 0x8aaf9303, 0xad25, 0x48b9, 0x9a,0x57, 0xd9,0xc3,0x7e,0x00,0x9d,0x9f); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("8aaf9303-ad25-48b9-9a57-d9c37e009d9f") +ID3D12SDKConfiguration1 : public ID3D12SDKConfiguration +{ + virtual HRESULT STDMETHODCALLTYPE CreateDeviceFactory( + UINT sdk_version, + const char *sdk_path, + REFIID riid, + void **ppv) = 0; + + virtual void STDMETHODCALLTYPE FreeUnusedSDKs( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ID3D12SDKConfiguration1, 0x8aaf9303, 0xad25, 0x48b9, 0x9a,0x57, 0xd9,0xc3,0x7e,0x00,0x9d,0x9f) +#endif +#else +typedef struct ID3D12SDKConfiguration1Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ID3D12SDKConfiguration1 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ID3D12SDKConfiguration1 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ID3D12SDKConfiguration1 *This); + + /*** ID3D12SDKConfiguration methods ***/ + HRESULT (STDMETHODCALLTYPE *SetSDKVersion)( + ID3D12SDKConfiguration1 *This, + UINT version, + const char *path); + + /*** ID3D12SDKConfiguration1 methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateDeviceFactory)( + ID3D12SDKConfiguration1 *This, + UINT sdk_version, + const char *sdk_path, + REFIID riid, + void **ppv); + + void (STDMETHODCALLTYPE *FreeUnusedSDKs)( + ID3D12SDKConfiguration1 *This); + + END_INTERFACE +} ID3D12SDKConfiguration1Vtbl; + +interface ID3D12SDKConfiguration1 { + CONST_VTBL ID3D12SDKConfiguration1Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ID3D12SDKConfiguration1_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ID3D12SDKConfiguration1_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ID3D12SDKConfiguration1_Release(This) (This)->lpVtbl->Release(This) +/*** ID3D12SDKConfiguration methods ***/ +#define ID3D12SDKConfiguration1_SetSDKVersion(This,version,path) (This)->lpVtbl->SetSDKVersion(This,version,path) +/*** ID3D12SDKConfiguration1 methods ***/ +#define ID3D12SDKConfiguration1_CreateDeviceFactory(This,sdk_version,sdk_path,riid,ppv) (This)->lpVtbl->CreateDeviceFactory(This,sdk_version,sdk_path,riid,ppv) +#define ID3D12SDKConfiguration1_FreeUnusedSDKs(This) (This)->lpVtbl->FreeUnusedSDKs(This) +#else +/*** IUnknown methods ***/ +static inline HRESULT ID3D12SDKConfiguration1_QueryInterface(ID3D12SDKConfiguration1* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ID3D12SDKConfiguration1_AddRef(ID3D12SDKConfiguration1* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ID3D12SDKConfiguration1_Release(ID3D12SDKConfiguration1* This) { + return This->lpVtbl->Release(This); +} +/*** ID3D12SDKConfiguration methods ***/ +static inline HRESULT ID3D12SDKConfiguration1_SetSDKVersion(ID3D12SDKConfiguration1* This,UINT version,const char *path) { + return This->lpVtbl->SetSDKVersion(This,version,path); +} +/*** ID3D12SDKConfiguration1 methods ***/ +static inline HRESULT ID3D12SDKConfiguration1_CreateDeviceFactory(ID3D12SDKConfiguration1* This,UINT sdk_version,const char *sdk_path,REFIID riid,void **ppv) { + return This->lpVtbl->CreateDeviceFactory(This,sdk_version,sdk_path,riid,ppv); +} +static inline void ID3D12SDKConfiguration1_FreeUnusedSDKs(ID3D12SDKConfiguration1* This) { + This->lpVtbl->FreeUnusedSDKs(This); +} +#endif +#endif + +#endif + + +#endif /* __ID3D12SDKConfiguration1_INTERFACE_DEFINED__ */ + +typedef enum D3D12_DEVICE_FACTORY_FLAGS { + D3D12_DEVICE_FACTORY_FLAG_NONE = 0, + D3D12_DEVICE_FACTORY_FLAG_ALLOW_RETURNING_EXISTING_DEVICE = 0x1, + D3D12_DEVICE_FACTORY_FLAG_ALLOW_RETURNING_INCOMPATIBLE_EXISTING_DEVICE = 0x2, + D3D12_DEVICE_FACTORY_FLAG_DISALLOW_STORING_NEW_DEVICE_AS_SINGLETON = 0x4 +} D3D12_DEVICE_FACTORY_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEVICE_FACTORY_FLAGS) +/***************************************************************************** + * ID3D12DeviceFactory interface + */ +#ifndef __ID3D12DeviceFactory_INTERFACE_DEFINED__ +#define __ID3D12DeviceFactory_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ID3D12DeviceFactory, 0x61f307d3, 0xd34e, 0x4e7c, 0x83,0x74, 0x3b,0xa4,0xde,0x23,0xcc,0xcb); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("61f307d3-d34e-4e7c-8374-3ba4de23cccb") +ID3D12DeviceFactory : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE InitializeFromGlobalState( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE ApplyToGlobalState( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetFlags( + D3D12_DEVICE_FACTORY_FLAGS flags) = 0; + + virtual D3D12_DEVICE_FACTORY_FLAGS STDMETHODCALLTYPE GetFlags( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetConfigurationInterface( + REFCLSID clsid, + REFIID iid, + void **ppv) = 0; + + virtual HRESULT STDMETHODCALLTYPE EnableExperimentalFeatures( + UINT num_features, + const IID *iids, + void *configuration_structs, + UINT *configuration_struct_sizes) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateDevice( + IUnknown *adapter, + D3D_FEATURE_LEVEL feature_level, + REFIID riid, + void **ppv_device) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ID3D12DeviceFactory, 0x61f307d3, 0xd34e, 0x4e7c, 0x83,0x74, 0x3b,0xa4,0xde,0x23,0xcc,0xcb) +#endif +#else +typedef struct ID3D12DeviceFactoryVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ID3D12DeviceFactory *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ID3D12DeviceFactory *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ID3D12DeviceFactory *This); + + /*** ID3D12DeviceFactory methods ***/ + HRESULT (STDMETHODCALLTYPE *InitializeFromGlobalState)( + ID3D12DeviceFactory *This); + + HRESULT (STDMETHODCALLTYPE *ApplyToGlobalState)( + ID3D12DeviceFactory *This); + + HRESULT (STDMETHODCALLTYPE *SetFlags)( + ID3D12DeviceFactory *This, + D3D12_DEVICE_FACTORY_FLAGS flags); + + D3D12_DEVICE_FACTORY_FLAGS (STDMETHODCALLTYPE *GetFlags)( + ID3D12DeviceFactory *This); + + HRESULT (STDMETHODCALLTYPE *GetConfigurationInterface)( + ID3D12DeviceFactory *This, + REFCLSID clsid, + REFIID iid, + void **ppv); + + HRESULT (STDMETHODCALLTYPE *EnableExperimentalFeatures)( + ID3D12DeviceFactory *This, + UINT num_features, + const IID *iids, + void *configuration_structs, + UINT *configuration_struct_sizes); + + HRESULT (STDMETHODCALLTYPE *CreateDevice)( + ID3D12DeviceFactory *This, + IUnknown *adapter, + D3D_FEATURE_LEVEL feature_level, + REFIID riid, + void **ppv_device); + + END_INTERFACE +} ID3D12DeviceFactoryVtbl; + +interface ID3D12DeviceFactory { + CONST_VTBL ID3D12DeviceFactoryVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ID3D12DeviceFactory_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ID3D12DeviceFactory_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ID3D12DeviceFactory_Release(This) (This)->lpVtbl->Release(This) +/*** ID3D12DeviceFactory methods ***/ +#define ID3D12DeviceFactory_InitializeFromGlobalState(This) (This)->lpVtbl->InitializeFromGlobalState(This) +#define ID3D12DeviceFactory_ApplyToGlobalState(This) (This)->lpVtbl->ApplyToGlobalState(This) +#define ID3D12DeviceFactory_SetFlags(This,flags) (This)->lpVtbl->SetFlags(This,flags) +#define ID3D12DeviceFactory_GetFlags(This) (This)->lpVtbl->GetFlags(This) +#define ID3D12DeviceFactory_GetConfigurationInterface(This,clsid,iid,ppv) (This)->lpVtbl->GetConfigurationInterface(This,clsid,iid,ppv) +#define ID3D12DeviceFactory_EnableExperimentalFeatures(This,num_features,iids,configuration_structs,configuration_struct_sizes) (This)->lpVtbl->EnableExperimentalFeatures(This,num_features,iids,configuration_structs,configuration_struct_sizes) +#define ID3D12DeviceFactory_CreateDevice(This,adapter,feature_level,riid,ppv_device) (This)->lpVtbl->CreateDevice(This,adapter,feature_level,riid,ppv_device) +#else +/*** IUnknown methods ***/ +static inline HRESULT ID3D12DeviceFactory_QueryInterface(ID3D12DeviceFactory* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ID3D12DeviceFactory_AddRef(ID3D12DeviceFactory* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ID3D12DeviceFactory_Release(ID3D12DeviceFactory* This) { + return This->lpVtbl->Release(This); +} +/*** ID3D12DeviceFactory methods ***/ +static inline HRESULT ID3D12DeviceFactory_InitializeFromGlobalState(ID3D12DeviceFactory* This) { + return This->lpVtbl->InitializeFromGlobalState(This); +} +static inline HRESULT ID3D12DeviceFactory_ApplyToGlobalState(ID3D12DeviceFactory* This) { + return This->lpVtbl->ApplyToGlobalState(This); +} +static inline HRESULT ID3D12DeviceFactory_SetFlags(ID3D12DeviceFactory* This,D3D12_DEVICE_FACTORY_FLAGS flags) { + return This->lpVtbl->SetFlags(This,flags); +} +static inline D3D12_DEVICE_FACTORY_FLAGS ID3D12DeviceFactory_GetFlags(ID3D12DeviceFactory* This) { + return This->lpVtbl->GetFlags(This); +} +static inline HRESULT ID3D12DeviceFactory_GetConfigurationInterface(ID3D12DeviceFactory* This,REFCLSID clsid,REFIID iid,void **ppv) { + return This->lpVtbl->GetConfigurationInterface(This,clsid,iid,ppv); +} +static inline HRESULT ID3D12DeviceFactory_EnableExperimentalFeatures(ID3D12DeviceFactory* This,UINT num_features,const IID *iids,void *configuration_structs,UINT *configuration_struct_sizes) { + return This->lpVtbl->EnableExperimentalFeatures(This,num_features,iids,configuration_structs,configuration_struct_sizes); +} +static inline HRESULT ID3D12DeviceFactory_CreateDevice(ID3D12DeviceFactory* This,IUnknown *adapter,D3D_FEATURE_LEVEL feature_level,REFIID riid,void **ppv_device) { + return This->lpVtbl->CreateDevice(This,adapter,feature_level,riid,ppv_device); +} +#endif +#endif + +#endif + + +#endif /* __ID3D12DeviceFactory_INTERFACE_DEFINED__ */ + +typedef enum D3D12_DEVICE_FLAGS { + D3D12_DEVICE_FLAG_NONE = 0, + D3D12_DEVICE_FLAG_DEBUG_LAYER_ENABLED = 0x1, + D3D12_DEVICE_FLAG_GPU_BASED_VALIDATION_ENABLED = 0x2, + D3D12_DEVICE_FLAG_SYNCHRONIZED_COMMAND_QUEUE_VALIDATION_DISABLED = 0x4, + D3D12_DEVICE_FLAG_DRED_AUTO_BREADCRUMBS_ENABLED = 0x8, + D3D12_DEVICE_FLAG_DRED_PAGE_FAULT_REPORTING_ENABLED = 0x10, + D3D12_DEVICE_FLAG_DRED_WATSON_REPORTING_ENABLED = 0x20, + D3D12_DEVICE_FLAG_DRED_BREADCRUMB_CONTEXT_ENABLED = 0x40, + D3D12_DEVICE_FLAG_DRED_USE_MARKERS_ONLY_BREADCRUMBS = 0x80, + D3D12_DEVICE_FLAG_SHADER_INSTRUMENTATION_ENABLED = 0x100, + D3D12_DEVICE_FLAG_AUTO_DEBUG_NAME_ENABLED = 0x200, + D3D12_DEVICE_FLAG_FORCE_LEGACY_STATE_VALIDATION = 0x400 +} D3D12_DEVICE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEVICE_FLAGS) +typedef struct D3D12_DEVICE_CONFIGURATION_DESC { + D3D12_DEVICE_FLAGS Flags; + UINT GpuBasedValidationFlags; + UINT SDKVersion; + UINT NumEnabledExperimentalFeatures; +} D3D12_DEVICE_CONFIGURATION_DESC; +/***************************************************************************** + * ID3D12DeviceConfiguration interface + */ +#ifndef __ID3D12DeviceConfiguration_INTERFACE_DEFINED__ +#define __ID3D12DeviceConfiguration_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ID3D12DeviceConfiguration, 0x78dbf87b, 0xf766, 0x422b, 0xa6,0x1c, 0xc8,0xc4,0x46,0xbd,0xb9,0xad); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("78dbf87b-f766-422b-a61c-c8c446bdb9ad") +ID3D12DeviceConfiguration : public IUnknown +{ +#ifdef WIDL_EXPLICIT_AGGREGATE_RETURNS + virtual D3D12_DEVICE_CONFIGURATION_DESC* STDMETHODCALLTYPE GetDesc( + D3D12_DEVICE_CONFIGURATION_DESC *__ret) = 0; + D3D12_DEVICE_CONFIGURATION_DESC STDMETHODCALLTYPE GetDesc( + ) + { + D3D12_DEVICE_CONFIGURATION_DESC __ret; + return *GetDesc(&__ret); + } +#else + virtual D3D12_DEVICE_CONFIGURATION_DESC STDMETHODCALLTYPE GetDesc( + ) = 0; +#endif + + virtual HRESULT STDMETHODCALLTYPE GetEnabledExperimentalFeatures( + GUID *guids, + UINT num_guids) = 0; + + virtual HRESULT STDMETHODCALLTYPE SerializeVersionedRootSignature( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **result, + ID3DBlob **error) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateVersionedRootSignatureDeserializer( + const void *blob, + SIZE_T size, + REFIID riid, + void **deserializer) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ID3D12DeviceConfiguration, 0x78dbf87b, 0xf766, 0x422b, 0xa6,0x1c, 0xc8,0xc4,0x46,0xbd,0xb9,0xad) +#endif +#else +typedef struct ID3D12DeviceConfigurationVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ID3D12DeviceConfiguration *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ID3D12DeviceConfiguration *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ID3D12DeviceConfiguration *This); + + /*** ID3D12DeviceConfiguration methods ***/ + D3D12_DEVICE_CONFIGURATION_DESC * (STDMETHODCALLTYPE *GetDesc)( + ID3D12DeviceConfiguration *This, + D3D12_DEVICE_CONFIGURATION_DESC *__ret); + + HRESULT (STDMETHODCALLTYPE *GetEnabledExperimentalFeatures)( + ID3D12DeviceConfiguration *This, + GUID *guids, + UINT num_guids); + + HRESULT (STDMETHODCALLTYPE *SerializeVersionedRootSignature)( + ID3D12DeviceConfiguration *This, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **result, + ID3DBlob **error); + + HRESULT (STDMETHODCALLTYPE *CreateVersionedRootSignatureDeserializer)( + ID3D12DeviceConfiguration *This, + const void *blob, + SIZE_T size, + REFIID riid, + void **deserializer); + + END_INTERFACE +} ID3D12DeviceConfigurationVtbl; + +interface ID3D12DeviceConfiguration { + CONST_VTBL ID3D12DeviceConfigurationVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ID3D12DeviceConfiguration_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ID3D12DeviceConfiguration_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ID3D12DeviceConfiguration_Release(This) (This)->lpVtbl->Release(This) +/*** ID3D12DeviceConfiguration methods ***/ +#define ID3D12DeviceConfiguration_GetDesc(This) ID3D12DeviceConfiguration_GetDesc_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support +#define ID3D12DeviceConfiguration_GetEnabledExperimentalFeatures(This,guids,num_guids) (This)->lpVtbl->GetEnabledExperimentalFeatures(This,guids,num_guids) +#define ID3D12DeviceConfiguration_SerializeVersionedRootSignature(This,desc,result,error) (This)->lpVtbl->SerializeVersionedRootSignature(This,desc,result,error) +#define ID3D12DeviceConfiguration_CreateVersionedRootSignatureDeserializer(This,blob,size,riid,deserializer) (This)->lpVtbl->CreateVersionedRootSignatureDeserializer(This,blob,size,riid,deserializer) +#else +/*** IUnknown methods ***/ +static inline HRESULT ID3D12DeviceConfiguration_QueryInterface(ID3D12DeviceConfiguration* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ID3D12DeviceConfiguration_AddRef(ID3D12DeviceConfiguration* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ID3D12DeviceConfiguration_Release(ID3D12DeviceConfiguration* This) { + return This->lpVtbl->Release(This); +} +/*** ID3D12DeviceConfiguration methods ***/ +static inline D3D12_DEVICE_CONFIGURATION_DESC ID3D12DeviceConfiguration_GetDesc(ID3D12DeviceConfiguration* This) { + D3D12_DEVICE_CONFIGURATION_DESC __ret; + return *This->lpVtbl->GetDesc(This,&__ret); +} +static inline HRESULT ID3D12DeviceConfiguration_GetEnabledExperimentalFeatures(ID3D12DeviceConfiguration* This,GUID *guids,UINT num_guids) { + return This->lpVtbl->GetEnabledExperimentalFeatures(This,guids,num_guids); +} +static inline HRESULT ID3D12DeviceConfiguration_SerializeVersionedRootSignature(ID3D12DeviceConfiguration* This,const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc,ID3DBlob **result,ID3DBlob **error) { + return This->lpVtbl->SerializeVersionedRootSignature(This,desc,result,error); +} +static inline HRESULT ID3D12DeviceConfiguration_CreateVersionedRootSignatureDeserializer(ID3D12DeviceConfiguration* This,const void *blob,SIZE_T size,REFIID riid,void **deserializer) { + return This->lpVtbl->CreateVersionedRootSignatureDeserializer(This,blob,size,riid,deserializer); +} +#endif +#endif + +#endif + + +#endif /* __ID3D12DeviceConfiguration_INTERFACE_DEFINED__ */ + typedef enum D3D12_AXIS_SHADING_RATE { D3D12_AXIS_SHADING_RATE_1X = 0x0, D3D12_AXIS_SHADING_RATE_2X = 0x1, diff --git a/lib/libc/include/any-windows-any/d3d12sdklayers.h b/lib/libc/include/any-windows-any/d3d12sdklayers.h index 2839ab1d772182d2543aea44e2cbf4b4af2b6999..6d544581310a7d4d1133498941602f2680888823 100644 --- a/lib/libc/include/any-windows-any/d3d12sdklayers.h +++ b/lib/libc/include/any-windows-any/d3d12sdklayers.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d12sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d12sdklayers.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -989,7 +989,8 @@ typedef enum D3D12_MESSAGE_ID { D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_UNBOUNDED_STATIC_DESCRIPTORS = 0x4fd, D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_INVALIDSHADERBYTECODE = 0x4fe, D3D12_MESSAGE_ID_CREATEAMPLIFICATIONSHADER_OUTOFMEMORY = 0x4ff, - D3D12_MESSAGE_ID_D3D12_MESSAGES_END = 0x500 + D3D12_MESSAGE_ID_INCOMPATIBLE_BARRIER_LAYOUT = 0x536, + D3D12_MESSAGE_ID_D3D12_MESSAGES_END = 0x537 } D3D12_MESSAGE_ID; typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE { D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0x0, diff --git a/lib/libc/include/any-windows-any/d3d12shader.h b/lib/libc/include/any-windows-any/d3d12shader.h index 8113d9c9251b1e4ffa397c58fbf374d4b2cb84b0..7cae62a35a3e08752c36c2e3e66632c051c9f270 100644 --- a/lib/libc/include/any-windows-any/d3d12shader.h +++ b/lib/libc/include/any-windows-any/d3d12shader.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d12shader.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d12shader.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d12video.h b/lib/libc/include/any-windows-any/d3d12video.h index 51ec79676a125a1fe9797214ddbfaae74370c1c4..852cc2e5dc943540e4f569d4210439448a91b195 100644 --- a/lib/libc/include/any-windows-any/d3d12video.h +++ b/lib/libc/include/any-windows-any/d3d12video.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3d12video.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3d12video.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -42,6 +42,14 @@ interface ID3D12VideoDecoder; #endif /* __cplusplus */ #endif +#ifndef __ID3D12VideoProcessor_FWD_DEFINED__ +#define __ID3D12VideoProcessor_FWD_DEFINED__ +typedef interface ID3D12VideoProcessor ID3D12VideoProcessor; +#ifdef __cplusplus +interface ID3D12VideoProcessor; +#endif /* __cplusplus */ +#endif + #ifndef __ID3D12VideoDecodeCommandList_FWD_DEFINED__ #define __ID3D12VideoDecodeCommandList_FWD_DEFINED__ typedef interface ID3D12VideoDecodeCommandList ID3D12VideoDecodeCommandList; @@ -50,6 +58,14 @@ interface ID3D12VideoDecodeCommandList; #endif /* __cplusplus */ #endif +#ifndef __ID3D12VideoProcessCommandList_FWD_DEFINED__ +#define __ID3D12VideoProcessCommandList_FWD_DEFINED__ +typedef interface ID3D12VideoProcessCommandList ID3D12VideoProcessCommandList; +#ifdef __cplusplus +interface ID3D12VideoProcessCommandList; +#endif /* __cplusplus */ +#endif + #ifndef __ID3D12VideoDecodeCommandList1_FWD_DEFINED__ #define __ID3D12VideoDecodeCommandList1_FWD_DEFINED__ typedef interface ID3D12VideoDecodeCommandList1 ID3D12VideoDecodeCommandList1; @@ -169,6 +185,15 @@ typedef enum D3D12_VIDEO_FRAME_STEREO_FORMAT { D3D12_VIDEO_FRAME_STEREO_FORMAT_VERTICAL = 3, D3D12_VIDEO_FRAME_STEREO_FORMAT_SEPARATE = 4 } D3D12_VIDEO_FRAME_STEREO_FORMAT; +typedef struct D3D12_VIDEO_FORMAT { + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; +} D3D12_VIDEO_FORMAT; +typedef struct D3D12_VIDEO_SAMPLE { + UINT Width; + UINT Height; + D3D12_VIDEO_FORMAT Format; +} D3D12_VIDEO_SAMPLE; typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE { D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE = 0, D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED = 1 @@ -213,7 +238,9 @@ typedef enum D3D12_FEATURE_VIDEO { D3D12_FEATURE_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT = 42, D3D12_FEATURE_VIDEO_ENCODER_SUPPORT = 43, D3D12_FEATURE_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT = 44, - D3D12_FEATURE_VIDEO_ENCODER_RESOURCE_REQUIREMENTS = 45 + D3D12_FEATURE_VIDEO_ENCODER_RESOURCE_REQUIREMENTS = 45, + D3D12_FEATURE_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_CONFIG = 46, + D3D12_FEATURE_VIDEO_ENCODER_SUPPORT1 = 47 } D3D12_FEATURE_VIDEO; typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE { D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE = 0 @@ -271,6 +298,10 @@ typedef enum D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS { D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_CUSTOM = 0x80000000 } D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS ); +typedef struct D3D12_VIDEO_PROCESS_ALPHA_BLENDING { + WINBOOL Enable; + FLOAT Alpha; +} D3D12_VIDEO_PROCESS_ALPHA_BLENDING; typedef struct D3D12_VIDEO_PROCESS_LUMA_KEY { WINBOOL Enable; FLOAT Lower; @@ -761,6 +792,16 @@ typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT { D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS ConfigurationFlags; D3D12_VIDEO_DECODE_TIER DecodeTier; } D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT; +typedef enum D3D12_VIDEO_SCALE_SUPPORT_FLAGS { + D3D12_VIDEO_SCALE_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_SCALE_SUPPORT_FLAG_POW2_ONLY = 0x1, + D3D12_VIDEO_SCALE_SUPPORT_FLAG_EVEN_DIMENSIONS_ONLY = 0x2 +} D3D12_VIDEO_SCALE_SUPPORT_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_SCALE_SUPPORT_FLAGS) +typedef struct D3D12_VIDEO_SCALE_SUPPORT { + D3D12_VIDEO_SIZE_RANGE OutputSizeRange; + D3D12_VIDEO_SCALE_SUPPORT_FLAGS Flags; +} D3D12_VIDEO_SCALE_SUPPORT; typedef struct D3D12_VIDEO_DECODE_FRAME_ARGUMENT { D3D12_VIDEO_DECODE_ARGUMENT_TYPE Type; UINT Size; @@ -796,6 +837,286 @@ typedef struct D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS { UINT OutputSubresource; D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS ConversionArguments; } D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS; +/***************************************************************************** + * ID3D12VideoProcessor interface + */ +#ifndef __ID3D12VideoProcessor_INTERFACE_DEFINED__ +#define __ID3D12VideoProcessor_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ID3D12VideoProcessor, 0x304fdb32, 0xbede, 0x410a, 0x85,0x45, 0x94,0x3a,0xc6,0xa4,0x61,0x38); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("304fdb32-bede-410a-8545-943ac6a46138") +ID3D12VideoProcessor : public ID3D12Pageable +{ + virtual UINT STDMETHODCALLTYPE GetNodeMask( + ) = 0; + + virtual UINT STDMETHODCALLTYPE GetNumInputStreamDescs( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetInputStreamDescs( + UINT num_input_stream_descs, + D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *input_stream_descs) = 0; + +#ifdef WIDL_EXPLICIT_AGGREGATE_RETURNS + virtual D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC* STDMETHODCALLTYPE GetOutputStreamDesc( + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *__ret) = 0; + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC STDMETHODCALLTYPE GetOutputStreamDesc( + ) + { + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC __ret; + return *GetOutputStreamDesc(&__ret); + } +#else + virtual D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC STDMETHODCALLTYPE GetOutputStreamDesc( + ) = 0; +#endif + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ID3D12VideoProcessor, 0x304fdb32, 0xbede, 0x410a, 0x85,0x45, 0x94,0x3a,0xc6,0xa4,0x61,0x38) +#endif +#else +typedef struct ID3D12VideoProcessorVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ID3D12VideoProcessor *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ID3D12VideoProcessor *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ID3D12VideoProcessor *This); + + /*** ID3D12Object methods ***/ + HRESULT (STDMETHODCALLTYPE *GetPrivateData)( + ID3D12VideoProcessor *This, + REFGUID guid, + UINT *data_size, + void *data); + + HRESULT (STDMETHODCALLTYPE *SetPrivateData)( + ID3D12VideoProcessor *This, + REFGUID guid, + UINT data_size, + const void *data); + + HRESULT (STDMETHODCALLTYPE *SetPrivateDataInterface)( + ID3D12VideoProcessor *This, + REFGUID guid, + const IUnknown *data); + + HRESULT (STDMETHODCALLTYPE *SetName)( + ID3D12VideoProcessor *This, + const WCHAR *name); + + /*** ID3D12DeviceChild methods ***/ + HRESULT (STDMETHODCALLTYPE *GetDevice)( + ID3D12VideoProcessor *This, + REFIID riid, + void **device); + + /*** ID3D12VideoProcessor methods ***/ + UINT (STDMETHODCALLTYPE *GetNodeMask)( + ID3D12VideoProcessor *This); + + UINT (STDMETHODCALLTYPE *GetNumInputStreamDescs)( + ID3D12VideoProcessor *This); + + HRESULT (STDMETHODCALLTYPE *GetInputStreamDescs)( + ID3D12VideoProcessor *This, + UINT num_input_stream_descs, + D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *input_stream_descs); + + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC * (STDMETHODCALLTYPE *GetOutputStreamDesc)( + ID3D12VideoProcessor *This, + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *__ret); + + END_INTERFACE +} ID3D12VideoProcessorVtbl; + +interface ID3D12VideoProcessor { + CONST_VTBL ID3D12VideoProcessorVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ID3D12VideoProcessor_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ID3D12VideoProcessor_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ID3D12VideoProcessor_Release(This) (This)->lpVtbl->Release(This) +/*** ID3D12Object methods ***/ +#define ID3D12VideoProcessor_GetPrivateData(This,guid,data_size,data) (This)->lpVtbl->GetPrivateData(This,guid,data_size,data) +#define ID3D12VideoProcessor_SetPrivateData(This,guid,data_size,data) (This)->lpVtbl->SetPrivateData(This,guid,data_size,data) +#define ID3D12VideoProcessor_SetPrivateDataInterface(This,guid,data) (This)->lpVtbl->SetPrivateDataInterface(This,guid,data) +#define ID3D12VideoProcessor_SetName(This,name) (This)->lpVtbl->SetName(This,name) +/*** ID3D12DeviceChild methods ***/ +#define ID3D12VideoProcessor_GetDevice(This,riid,device) (This)->lpVtbl->GetDevice(This,riid,device) +/*** ID3D12VideoProcessor methods ***/ +#define ID3D12VideoProcessor_GetNodeMask(This) (This)->lpVtbl->GetNodeMask(This) +#define ID3D12VideoProcessor_GetNumInputStreamDescs(This) (This)->lpVtbl->GetNumInputStreamDescs(This) +#define ID3D12VideoProcessor_GetInputStreamDescs(This,num_input_stream_descs,input_stream_descs) (This)->lpVtbl->GetInputStreamDescs(This,num_input_stream_descs,input_stream_descs) +#define ID3D12VideoProcessor_GetOutputStreamDesc(This) ID3D12VideoProcessor_GetOutputStreamDesc_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support +#else +/*** IUnknown methods ***/ +static inline HRESULT ID3D12VideoProcessor_QueryInterface(ID3D12VideoProcessor* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ID3D12VideoProcessor_AddRef(ID3D12VideoProcessor* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ID3D12VideoProcessor_Release(ID3D12VideoProcessor* This) { + return This->lpVtbl->Release(This); +} +/*** ID3D12Object methods ***/ +static inline HRESULT ID3D12VideoProcessor_GetPrivateData(ID3D12VideoProcessor* This,REFGUID guid,UINT *data_size,void *data) { + return This->lpVtbl->GetPrivateData(This,guid,data_size,data); +} +static inline HRESULT ID3D12VideoProcessor_SetPrivateData(ID3D12VideoProcessor* This,REFGUID guid,UINT data_size,const void *data) { + return This->lpVtbl->SetPrivateData(This,guid,data_size,data); +} +static inline HRESULT ID3D12VideoProcessor_SetPrivateDataInterface(ID3D12VideoProcessor* This,REFGUID guid,const IUnknown *data) { + return This->lpVtbl->SetPrivateDataInterface(This,guid,data); +} +static inline HRESULT ID3D12VideoProcessor_SetName(ID3D12VideoProcessor* This,const WCHAR *name) { + return This->lpVtbl->SetName(This,name); +} +/*** ID3D12DeviceChild methods ***/ +static inline HRESULT ID3D12VideoProcessor_GetDevice(ID3D12VideoProcessor* This,REFIID riid,void **device) { + return This->lpVtbl->GetDevice(This,riid,device); +} +/*** ID3D12VideoProcessor methods ***/ +static inline UINT ID3D12VideoProcessor_GetNodeMask(ID3D12VideoProcessor* This) { + return This->lpVtbl->GetNodeMask(This); +} +static inline UINT ID3D12VideoProcessor_GetNumInputStreamDescs(ID3D12VideoProcessor* This) { + return This->lpVtbl->GetNumInputStreamDescs(This); +} +static inline HRESULT ID3D12VideoProcessor_GetInputStreamDescs(ID3D12VideoProcessor* This,UINT num_input_stream_descs,D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *input_stream_descs) { + return This->lpVtbl->GetInputStreamDescs(This,num_input_stream_descs,input_stream_descs); +} +static inline D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC ID3D12VideoProcessor_GetOutputStreamDesc(ID3D12VideoProcessor* This) { + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC __ret; + return *This->lpVtbl->GetOutputStreamDesc(This,&__ret); +} +#endif +#endif + +#endif + + +#endif /* __ID3D12VideoProcessor_INTERFACE_DEFINED__ */ + +typedef enum D3D12_VIDEO_PROCESS_FEATURE_FLAGS { + D3D12_VIDEO_PROCESS_FEATURE_FLAG_NONE = 0x0, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_ALPHA_FILL = 0x1, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_LUMA_KEY = 0x2, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_STEREO = 0x4, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_ROTATION = 0x8, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_FLIP = 0x10, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_ALPHA_BLENDING = 0x20, + D3D12_VIDEO_PROCESS_FEATURE_FLAG_PIXEL_ASPECT_RATIO = 0x40 +} D3D12_VIDEO_PROCESS_FEATURE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_FEATURE_FLAGS) +typedef enum D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS { + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_NONE = 0x0, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_DENOISE = 0x1, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_DERINGING = 0x2, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_EDGE_ENHANCEMENT = 0x4, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_COLOR_CORRECTION = 0x8, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_FLESH_TONE_MAPPING = 0x10, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_IMAGE_STABILIZATION = 0x20, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_SUPER_RESOLUTION = 0x40, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_ANAMORPHIC_SCALING = 0x80, + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_CUSTOM = 0x80000000 +} D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS) +typedef enum D3D12_VIDEO_PROCESS_ORIENTATION { + D3D12_VIDEO_PROCESS_ORIENTATION_DEFAULT = 0, + D3D12_VIDEO_PROCESS_ORIENTATION_FLIP_HORIZONTAL = 1, + D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_90 = 2, + D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_90_FLIP_HORIZONTAL = 3, + D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_180 = 4, + D3D12_VIDEO_PROCESS_ORIENTATION_FLIP_VERTICAL = 5, + D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_270 = 6, + D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_270_FLIP_HORIZONTAL = 7 +} D3D12_VIDEO_PROCESS_ORIENTATION; +typedef enum D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS { + D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAG_NONE = 0x0, + D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAG_FRAME_DISCONTINUITY = 0x1, + D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAG_FRAME_REPEAT = 0x2 +} D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS) +typedef struct D3D12_VIDEO_PROCESS_FILTER_RANGE { + INT Minimum; + INT Maximum; + INT Default; + FLOAT Multiplier; +} D3D12_VIDEO_PROCESS_FILTER_RANGE; +typedef enum D3D12_VIDEO_PROCESS_SUPPORT_FLAGS { + D3D12_VIDEO_PROCESS_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_PROCESS_SUPPORT_FLAG_SUPPORTED = 0x1 +} D3D12_VIDEO_PROCESS_SUPPORT_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_SUPPORT_FLAGS) +typedef struct D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT { + UINT NodeIndex; + D3D12_VIDEO_SAMPLE InputSample; + D3D12_VIDEO_FIELD_TYPE InputFieldType; + D3D12_VIDEO_FRAME_STEREO_FORMAT InputStereoFormat; + DXGI_RATIONAL InputFrameRate; + D3D12_VIDEO_FORMAT OutputFormat; + D3D12_VIDEO_FRAME_STEREO_FORMAT OutputStereoFormat; + DXGI_RATIONAL OutputFrameRate; + D3D12_VIDEO_PROCESS_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_SCALE_SUPPORT ScaleSupport; + D3D12_VIDEO_PROCESS_FEATURE_FLAGS FeatureSupport; + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS DeinterlaceSupport; + D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS AutoProcessingSupport; + D3D12_VIDEO_PROCESS_FILTER_FLAGS FilterSupport; + D3D12_VIDEO_PROCESS_FILTER_RANGE FilterRangeSupport[32]; +} D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT; +typedef struct D3D12_VIDEO_PROCESS_REFERENCE_SET { + UINT NumPastFrames; + ID3D12Resource **ppPastFrames; + UINT *pPastSubresources; + UINT NumFutureFrames; + ID3D12Resource **ppFutureFrames; + UINT *pFutureSubresources; +} D3D12_VIDEO_PROCESS_REFERENCE_SET; +typedef struct D3D12_VIDEO_PROCESS_TRANSFORM { + D3D12_RECT SourceRectangle; + D3D12_RECT DestinationRectangle; + D3D12_VIDEO_PROCESS_ORIENTATION Orientation; +} D3D12_VIDEO_PROCESS_TRANSFORM; +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE { + UINT OutputIndex; + UINT InputFrameOrField; +} D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE; +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM { + ID3D12Resource *pTexture2D; + UINT Subresource; + D3D12_VIDEO_PROCESS_REFERENCE_SET ReferenceSet; +} D3D12_VIDEO_PROCESS_INPUT_STREAM; +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS { + D3D12_VIDEO_PROCESS_INPUT_STREAM InputStream[2]; + D3D12_VIDEO_PROCESS_TRANSFORM Transform; + D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS Flags; + D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE RateInfo; + INT FilterLevels[32]; + D3D12_VIDEO_PROCESS_ALPHA_BLENDING AlphaBlending; +} D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS; +typedef struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM { + ID3D12Resource *pTexture2D; + UINT Subresource; +} D3D12_VIDEO_PROCESS_OUTPUT_STREAM; +typedef struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS { + D3D12_VIDEO_PROCESS_OUTPUT_STREAM OutputStream[2]; + D3D12_RECT TargetRectangle; +} D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS; /***************************************************************************** * ID3D12VideoDecodeCommandList interface */ @@ -1117,6 +1438,329 @@ static inline void ID3D12VideoDecodeCommandList_WriteBufferImmediate(ID3D12Video #endif /* __ID3D12VideoDecodeCommandList_INTERFACE_DEFINED__ */ +/***************************************************************************** + * ID3D12VideoProcessCommandList interface + */ +#ifndef __ID3D12VideoProcessCommandList_INTERFACE_DEFINED__ +#define __ID3D12VideoProcessCommandList_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ID3D12VideoProcessCommandList, 0xaeb2543a, 0x167f, 0x4682, 0xac,0xc8, 0xd1,0x59,0xed,0x4a,0x62,0x09); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("aeb2543a-167f-4682-acc8-d159ed4a6209") +ID3D12VideoProcessCommandList : public ID3D12CommandList +{ + virtual HRESULT STDMETHODCALLTYPE Close( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Reset( + ID3D12CommandAllocator *allocator) = 0; + + virtual void STDMETHODCALLTYPE ClearState( + ) = 0; + + virtual void STDMETHODCALLTYPE ResourceBarrier( + UINT num_barriers, + const D3D12_RESOURCE_BARRIER *barriers) = 0; + + virtual void STDMETHODCALLTYPE DiscardResource( + ID3D12Resource *resource, + const D3D12_DISCARD_REGION *region) = 0; + + virtual void STDMETHODCALLTYPE BeginQuery( + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT index) = 0; + + virtual void STDMETHODCALLTYPE EndQuery( + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT index) = 0; + + virtual void STDMETHODCALLTYPE ResolveQueryData( + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT start_index, + UINT num_queries, + ID3D12Resource *destination_buffer, + UINT64 aligned_destination_buffer_offset) = 0; + + virtual void STDMETHODCALLTYPE SetPredication( + ID3D12Resource *buffer, + UINT64 aligned_buffer_offset, + D3D12_PREDICATION_OP operation) = 0; + + virtual void STDMETHODCALLTYPE SetMarker( + UINT metadata, + const void *data, + UINT size) = 0; + + virtual void STDMETHODCALLTYPE BeginEvent( + UINT metadata, + const void *data, + UINT size) = 0; + + virtual void STDMETHODCALLTYPE EndEvent( + ) = 0; + + virtual void STDMETHODCALLTYPE ProcessFrames( + ID3D12VideoProcessor *video_processor, + const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS *output_arguments, + UINT num_input_streams, + const D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS *input_arguments) = 0; + + virtual void STDMETHODCALLTYPE WriteBufferImmediate( + UINT count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ID3D12VideoProcessCommandList, 0xaeb2543a, 0x167f, 0x4682, 0xac,0xc8, 0xd1,0x59,0xed,0x4a,0x62,0x09) +#endif +#else +typedef struct ID3D12VideoProcessCommandListVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ID3D12VideoProcessCommandList *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ID3D12VideoProcessCommandList *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ID3D12VideoProcessCommandList *This); + + /*** ID3D12Object methods ***/ + HRESULT (STDMETHODCALLTYPE *GetPrivateData)( + ID3D12VideoProcessCommandList *This, + REFGUID guid, + UINT *data_size, + void *data); + + HRESULT (STDMETHODCALLTYPE *SetPrivateData)( + ID3D12VideoProcessCommandList *This, + REFGUID guid, + UINT data_size, + const void *data); + + HRESULT (STDMETHODCALLTYPE *SetPrivateDataInterface)( + ID3D12VideoProcessCommandList *This, + REFGUID guid, + const IUnknown *data); + + HRESULT (STDMETHODCALLTYPE *SetName)( + ID3D12VideoProcessCommandList *This, + const WCHAR *name); + + /*** ID3D12DeviceChild methods ***/ + HRESULT (STDMETHODCALLTYPE *GetDevice)( + ID3D12VideoProcessCommandList *This, + REFIID riid, + void **device); + + /*** ID3D12CommandList methods ***/ + D3D12_COMMAND_LIST_TYPE (STDMETHODCALLTYPE *GetType)( + ID3D12VideoProcessCommandList *This); + + /*** ID3D12VideoProcessCommandList methods ***/ + HRESULT (STDMETHODCALLTYPE *Close)( + ID3D12VideoProcessCommandList *This); + + HRESULT (STDMETHODCALLTYPE *Reset)( + ID3D12VideoProcessCommandList *This, + ID3D12CommandAllocator *allocator); + + void (STDMETHODCALLTYPE *ClearState)( + ID3D12VideoProcessCommandList *This); + + void (STDMETHODCALLTYPE *ResourceBarrier)( + ID3D12VideoProcessCommandList *This, + UINT num_barriers, + const D3D12_RESOURCE_BARRIER *barriers); + + void (STDMETHODCALLTYPE *DiscardResource)( + ID3D12VideoProcessCommandList *This, + ID3D12Resource *resource, + const D3D12_DISCARD_REGION *region); + + void (STDMETHODCALLTYPE *BeginQuery)( + ID3D12VideoProcessCommandList *This, + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT index); + + void (STDMETHODCALLTYPE *EndQuery)( + ID3D12VideoProcessCommandList *This, + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT index); + + void (STDMETHODCALLTYPE *ResolveQueryData)( + ID3D12VideoProcessCommandList *This, + ID3D12QueryHeap *query_heap, + D3D12_QUERY_TYPE type, + UINT start_index, + UINT num_queries, + ID3D12Resource *destination_buffer, + UINT64 aligned_destination_buffer_offset); + + void (STDMETHODCALLTYPE *SetPredication)( + ID3D12VideoProcessCommandList *This, + ID3D12Resource *buffer, + UINT64 aligned_buffer_offset, + D3D12_PREDICATION_OP operation); + + void (STDMETHODCALLTYPE *SetMarker)( + ID3D12VideoProcessCommandList *This, + UINT metadata, + const void *data, + UINT size); + + void (STDMETHODCALLTYPE *BeginEvent)( + ID3D12VideoProcessCommandList *This, + UINT metadata, + const void *data, + UINT size); + + void (STDMETHODCALLTYPE *EndEvent)( + ID3D12VideoProcessCommandList *This); + + void (STDMETHODCALLTYPE *ProcessFrames)( + ID3D12VideoProcessCommandList *This, + ID3D12VideoProcessor *video_processor, + const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS *output_arguments, + UINT num_input_streams, + const D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS *input_arguments); + + void (STDMETHODCALLTYPE *WriteBufferImmediate)( + ID3D12VideoProcessCommandList *This, + UINT count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes); + + END_INTERFACE +} ID3D12VideoProcessCommandListVtbl; + +interface ID3D12VideoProcessCommandList { + CONST_VTBL ID3D12VideoProcessCommandListVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ID3D12VideoProcessCommandList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ID3D12VideoProcessCommandList_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ID3D12VideoProcessCommandList_Release(This) (This)->lpVtbl->Release(This) +/*** ID3D12Object methods ***/ +#define ID3D12VideoProcessCommandList_GetPrivateData(This,guid,data_size,data) (This)->lpVtbl->GetPrivateData(This,guid,data_size,data) +#define ID3D12VideoProcessCommandList_SetPrivateData(This,guid,data_size,data) (This)->lpVtbl->SetPrivateData(This,guid,data_size,data) +#define ID3D12VideoProcessCommandList_SetPrivateDataInterface(This,guid,data) (This)->lpVtbl->SetPrivateDataInterface(This,guid,data) +#define ID3D12VideoProcessCommandList_SetName(This,name) (This)->lpVtbl->SetName(This,name) +/*** ID3D12DeviceChild methods ***/ +#define ID3D12VideoProcessCommandList_GetDevice(This,riid,device) (This)->lpVtbl->GetDevice(This,riid,device) +/*** ID3D12CommandList methods ***/ +#define ID3D12VideoProcessCommandList_GetType(This) (This)->lpVtbl->GetType(This) +/*** ID3D12VideoProcessCommandList methods ***/ +#define ID3D12VideoProcessCommandList_Close(This) (This)->lpVtbl->Close(This) +#define ID3D12VideoProcessCommandList_Reset(This,allocator) (This)->lpVtbl->Reset(This,allocator) +#define ID3D12VideoProcessCommandList_ClearState(This) (This)->lpVtbl->ClearState(This) +#define ID3D12VideoProcessCommandList_ResourceBarrier(This,num_barriers,barriers) (This)->lpVtbl->ResourceBarrier(This,num_barriers,barriers) +#define ID3D12VideoProcessCommandList_DiscardResource(This,resource,region) (This)->lpVtbl->DiscardResource(This,resource,region) +#define ID3D12VideoProcessCommandList_BeginQuery(This,query_heap,type,index) (This)->lpVtbl->BeginQuery(This,query_heap,type,index) +#define ID3D12VideoProcessCommandList_EndQuery(This,query_heap,type,index) (This)->lpVtbl->EndQuery(This,query_heap,type,index) +#define ID3D12VideoProcessCommandList_ResolveQueryData(This,query_heap,type,start_index,num_queries,destination_buffer,aligned_destination_buffer_offset) (This)->lpVtbl->ResolveQueryData(This,query_heap,type,start_index,num_queries,destination_buffer,aligned_destination_buffer_offset) +#define ID3D12VideoProcessCommandList_SetPredication(This,buffer,aligned_buffer_offset,operation) (This)->lpVtbl->SetPredication(This,buffer,aligned_buffer_offset,operation) +#define ID3D12VideoProcessCommandList_SetMarker(This,metadata,data,size) (This)->lpVtbl->SetMarker(This,metadata,data,size) +#define ID3D12VideoProcessCommandList_BeginEvent(This,metadata,data,size) (This)->lpVtbl->BeginEvent(This,metadata,data,size) +#define ID3D12VideoProcessCommandList_EndEvent(This) (This)->lpVtbl->EndEvent(This) +#define ID3D12VideoProcessCommandList_ProcessFrames(This,video_processor,output_arguments,num_input_streams,input_arguments) (This)->lpVtbl->ProcessFrames(This,video_processor,output_arguments,num_input_streams,input_arguments) +#define ID3D12VideoProcessCommandList_WriteBufferImmediate(This,count,params,modes) (This)->lpVtbl->WriteBufferImmediate(This,count,params,modes) +#else +/*** IUnknown methods ***/ +static inline HRESULT ID3D12VideoProcessCommandList_QueryInterface(ID3D12VideoProcessCommandList* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ID3D12VideoProcessCommandList_AddRef(ID3D12VideoProcessCommandList* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ID3D12VideoProcessCommandList_Release(ID3D12VideoProcessCommandList* This) { + return This->lpVtbl->Release(This); +} +/*** ID3D12Object methods ***/ +static inline HRESULT ID3D12VideoProcessCommandList_GetPrivateData(ID3D12VideoProcessCommandList* This,REFGUID guid,UINT *data_size,void *data) { + return This->lpVtbl->GetPrivateData(This,guid,data_size,data); +} +static inline HRESULT ID3D12VideoProcessCommandList_SetPrivateData(ID3D12VideoProcessCommandList* This,REFGUID guid,UINT data_size,const void *data) { + return This->lpVtbl->SetPrivateData(This,guid,data_size,data); +} +static inline HRESULT ID3D12VideoProcessCommandList_SetPrivateDataInterface(ID3D12VideoProcessCommandList* This,REFGUID guid,const IUnknown *data) { + return This->lpVtbl->SetPrivateDataInterface(This,guid,data); +} +static inline HRESULT ID3D12VideoProcessCommandList_SetName(ID3D12VideoProcessCommandList* This,const WCHAR *name) { + return This->lpVtbl->SetName(This,name); +} +/*** ID3D12DeviceChild methods ***/ +static inline HRESULT ID3D12VideoProcessCommandList_GetDevice(ID3D12VideoProcessCommandList* This,REFIID riid,void **device) { + return This->lpVtbl->GetDevice(This,riid,device); +} +/*** ID3D12CommandList methods ***/ +static inline D3D12_COMMAND_LIST_TYPE ID3D12VideoProcessCommandList_GetType(ID3D12VideoProcessCommandList* This) { + return This->lpVtbl->GetType(This); +} +/*** ID3D12VideoProcessCommandList methods ***/ +static inline HRESULT ID3D12VideoProcessCommandList_Close(ID3D12VideoProcessCommandList* This) { + return This->lpVtbl->Close(This); +} +static inline HRESULT ID3D12VideoProcessCommandList_Reset(ID3D12VideoProcessCommandList* This,ID3D12CommandAllocator *allocator) { + return This->lpVtbl->Reset(This,allocator); +} +static inline void ID3D12VideoProcessCommandList_ClearState(ID3D12VideoProcessCommandList* This) { + This->lpVtbl->ClearState(This); +} +static inline void ID3D12VideoProcessCommandList_ResourceBarrier(ID3D12VideoProcessCommandList* This,UINT num_barriers,const D3D12_RESOURCE_BARRIER *barriers) { + This->lpVtbl->ResourceBarrier(This,num_barriers,barriers); +} +static inline void ID3D12VideoProcessCommandList_DiscardResource(ID3D12VideoProcessCommandList* This,ID3D12Resource *resource,const D3D12_DISCARD_REGION *region) { + This->lpVtbl->DiscardResource(This,resource,region); +} +static inline void ID3D12VideoProcessCommandList_BeginQuery(ID3D12VideoProcessCommandList* This,ID3D12QueryHeap *query_heap,D3D12_QUERY_TYPE type,UINT index) { + This->lpVtbl->BeginQuery(This,query_heap,type,index); +} +static inline void ID3D12VideoProcessCommandList_EndQuery(ID3D12VideoProcessCommandList* This,ID3D12QueryHeap *query_heap,D3D12_QUERY_TYPE type,UINT index) { + This->lpVtbl->EndQuery(This,query_heap,type,index); +} +static inline void ID3D12VideoProcessCommandList_ResolveQueryData(ID3D12VideoProcessCommandList* This,ID3D12QueryHeap *query_heap,D3D12_QUERY_TYPE type,UINT start_index,UINT num_queries,ID3D12Resource *destination_buffer,UINT64 aligned_destination_buffer_offset) { + This->lpVtbl->ResolveQueryData(This,query_heap,type,start_index,num_queries,destination_buffer,aligned_destination_buffer_offset); +} +static inline void ID3D12VideoProcessCommandList_SetPredication(ID3D12VideoProcessCommandList* This,ID3D12Resource *buffer,UINT64 aligned_buffer_offset,D3D12_PREDICATION_OP operation) { + This->lpVtbl->SetPredication(This,buffer,aligned_buffer_offset,operation); +} +static inline void ID3D12VideoProcessCommandList_SetMarker(ID3D12VideoProcessCommandList* This,UINT metadata,const void *data,UINT size) { + This->lpVtbl->SetMarker(This,metadata,data,size); +} +static inline void ID3D12VideoProcessCommandList_BeginEvent(ID3D12VideoProcessCommandList* This,UINT metadata,const void *data,UINT size) { + This->lpVtbl->BeginEvent(This,metadata,data,size); +} +static inline void ID3D12VideoProcessCommandList_EndEvent(ID3D12VideoProcessCommandList* This) { + This->lpVtbl->EndEvent(This); +} +static inline void ID3D12VideoProcessCommandList_ProcessFrames(ID3D12VideoProcessCommandList* This,ID3D12VideoProcessor *video_processor,const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS *output_arguments,UINT num_input_streams,const D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS *input_arguments) { + This->lpVtbl->ProcessFrames(This,video_processor,output_arguments,num_input_streams,input_arguments); +} +static inline void ID3D12VideoProcessCommandList_WriteBufferImmediate(ID3D12VideoProcessCommandList* This,UINT count,const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params,const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes) { + This->lpVtbl->WriteBufferImmediate(This,count,params,modes); +} +#endif +#endif + +#endif + + +#endif /* __ID3D12VideoProcessCommandList_INTERFACE_DEFINED__ */ + typedef struct D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM { UINT64 Offset; ID3D12Resource *pBuffer; @@ -1416,15 +2060,33 @@ typedef enum D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE { D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_8X8 = 0, D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_16X16 = 1 } D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE; +typedef enum D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS { + D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAG_NONE = 0, + D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAG_8X8 = 1 << D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_8X8, + D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAG_16X16 = 1 << D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_16X16 +} D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS) typedef enum D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION { D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_QUARTER_PEL = 0 } D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION; +typedef enum D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS { + D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAG_NONE = 0, + D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAG_QUARTER_PEL = 1 << D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_QUARTER_PEL +} D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS) typedef struct D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT { UINT NodeIndex; WINBOOL VideoDecodeSupport; WINBOOL VideoProcessSupport; WINBOOL VideoEncodeSupport; } D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT; +typedef struct D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR { + UINT NodeIndex; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS BlockSizeFlags; + D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS PrecisionFlags; + D3D12_VIDEO_SIZE_RANGE SizeRange; +} D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR; typedef struct D3D12_VIDEO_MOTION_ESTIMATOR_DESC { UINT NodeMask; DXGI_FORMAT InputFormat; @@ -2983,6 +3645,362 @@ DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE1, 0x6936ff0f, 0x45b1, 0x4163, DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_12BIT_PROFILE2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_12BIT_PROFILE2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); +typedef enum D3D12_VIDEO_ENCODER_AV1_PROFILE { + D3D12_VIDEO_ENCODER_AV1_PROFILE_MAIN = 0, + D3D12_VIDEO_ENCODER_AV1_PROFILE_HIGH = 1, + D3D12_VIDEO_ENCODER_AV1_PROFILE_PROFESSIONAL = 2 +} D3D12_VIDEO_ENCODER_AV1_PROFILE; +typedef enum D3D12_VIDEO_ENCODER_AV1_LEVELS { + D3D12_VIDEO_ENCODER_AV1_LEVELS_2_0 = 0, + D3D12_VIDEO_ENCODER_AV1_LEVELS_2_1 = 1, + D3D12_VIDEO_ENCODER_AV1_LEVELS_2_2 = 2, + D3D12_VIDEO_ENCODER_AV1_LEVELS_2_3 = 3, + D3D12_VIDEO_ENCODER_AV1_LEVELS_3_0 = 4, + D3D12_VIDEO_ENCODER_AV1_LEVELS_3_1 = 5, + D3D12_VIDEO_ENCODER_AV1_LEVELS_3_2 = 6, + D3D12_VIDEO_ENCODER_AV1_LEVELS_3_3 = 7, + D3D12_VIDEO_ENCODER_AV1_LEVELS_4_0 = 8, + D3D12_VIDEO_ENCODER_AV1_LEVELS_4_1 = 9, + D3D12_VIDEO_ENCODER_AV1_LEVELS_4_2 = 10, + D3D12_VIDEO_ENCODER_AV1_LEVELS_4_3 = 11, + D3D12_VIDEO_ENCODER_AV1_LEVELS_5_0 = 12, + D3D12_VIDEO_ENCODER_AV1_LEVELS_5_1 = 13, + D3D12_VIDEO_ENCODER_AV1_LEVELS_5_2 = 14, + D3D12_VIDEO_ENCODER_AV1_LEVELS_5_3 = 15, + D3D12_VIDEO_ENCODER_AV1_LEVELS_6_0 = 16, + D3D12_VIDEO_ENCODER_AV1_LEVELS_6_1 = 17, + D3D12_VIDEO_ENCODER_AV1_LEVELS_6_2 = 18, + D3D12_VIDEO_ENCODER_AV1_LEVELS_6_3 = 19, + D3D12_VIDEO_ENCODER_AV1_LEVELS_7_0 = 20, + D3D12_VIDEO_ENCODER_AV1_LEVELS_7_1 = 21, + D3D12_VIDEO_ENCODER_AV1_LEVELS_7_2 = 22, + D3D12_VIDEO_ENCODER_AV1_LEVELS_7_3 = 23 +} D3D12_VIDEO_ENCODER_AV1_LEVELS; +typedef enum D3D12_VIDEO_ENCODER_AV1_TIER { + D3D12_VIDEO_ENCODER_AV1_TIER_MAIN = 0, + D3D12_VIDEO_ENCODER_AV1_TIER_HIGH = 1 +} D3D12_VIDEO_ENCODER_AV1_TIER; +typedef struct D3D12_VIDEO_ENCODER_AV1_LEVEL_TIER_CONSTRAINTS { + D3D12_VIDEO_ENCODER_AV1_LEVELS Level; + D3D12_VIDEO_ENCODER_AV1_TIER Tier; +} D3D12_VIDEO_ENCODER_AV1_LEVEL_TIER_CONSTRAINTS; +typedef enum D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS { + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_128x128_SUPERBLOCK = 0x1, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_FILTER_INTRA = 0x2, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_INTRA_EDGE_FILTER = 0x4, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_INTERINTRA_COMPOUND = 0x8, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_MASKED_COMPOUND = 0x10, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_WARPED_MOTION = 0x20, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_DUAL_FILTER = 0x40, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_JNT_COMP = 0x80, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_FORCED_INTEGER_MOTION_VECTORS = 0x100, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_SUPER_RESOLUTION = 0x200, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_LOOP_RESTORATION_FILTER = 0x400, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_PALETTE_ENCODING = 0x800, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_CDEF_FILTERING = 0x1000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_INTRA_BLOCK_COPY = 0x2000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_FRAME_REFERENCE_MOTION_VECTORS = 0x4000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_ORDER_HINT_TOOLS = 0x8000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_AUTO_SEGMENTATION = 0x10000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_CUSTOM_SEGMENTATION = 0x20000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_LOOP_FILTER_DELTAS = 0x40000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_QUANTIZATION_DELTAS = 0x80000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_QUANTIZATION_MATRIX = 0x100000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_REDUCED_TX_SET = 0x200000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_MOTION_MODE_SWITCHABLE = 0x400000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_ALLOW_HIGH_PRECISION_MV = 0x800000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_SKIP_MODE_PRESENT = 0x1000000, + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAG_DELTA_LF_PARAMS = 0x2000000 +} D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_TX_MODE { + D3D12_VIDEO_ENCODER_AV1_TX_MODE_ONLY4x4 = 0, + D3D12_VIDEO_ENCODER_AV1_TX_MODE_LARGEST = 1, + D3D12_VIDEO_ENCODER_AV1_TX_MODE_SELECT = 2 +} D3D12_VIDEO_ENCODER_AV1_TX_MODE; +typedef enum D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAGS { + D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAG_ONLY4x4 = 1 << D3D12_VIDEO_ENCODER_AV1_TX_MODE_ONLY4x4, + D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAG_LARGEST = 1 << D3D12_VIDEO_ENCODER_AV1_TX_MODE_LARGEST, + D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAG_SELECT = 1 << D3D12_VIDEO_ENCODER_AV1_TX_MODE_SELECT +} D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS { + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP = 0, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP_SMOOTH = 1, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP_SHARP = 2, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_BILINEAR = 3, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_SWITCHABLE = 4 +} D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS; +typedef enum D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAGS { + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_EIGHTTAP = 1 << D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_EIGHTTAP_SMOOTH = 1 << D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP_SMOOTH, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_EIGHTTAP_SHARP = 1 << D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_EIGHTTAP_SHARP, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_BILINEAR = 1 << D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_BILINEAR, + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAG_SWITCHABLE = 1 << D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_SWITCHABLE +} D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE { + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE_4x4 = 0, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE_8x8 = 1, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE_16x16 = 2, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE_32x32 = 3, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE_64x64 = 4 +} D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE; +typedef enum D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE { + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_DISABLED = 0, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_Q = 1, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_Y_V = 2, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_Y_H = 3, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_U = 4, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_V = 5, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_REF_FRAME = 6, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_SKIP = 7, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_GLOBALMV = 8 +} D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE; +typedef enum D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAGS { + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_NONE = 0, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_DISABLED = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_DISABLED, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_Q = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_Q, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_LF_Y_V = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_Y_V, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_LF_Y_H = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_Y_H, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_LF_U = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_U, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_LF_V = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_LF_V, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_REF_FRAME = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_REF_FRAME, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_SKIP = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_SKIP, + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAG_ALT_GLOBALMV = 1 << D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_ALT_GLOBALMV +} D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE { + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE_DISABLED = 0, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE_SWITCHABLE = 1, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE_WIENER = 2, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE_SGRPROJ = 3 +} D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE; +typedef enum D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE { + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE_DISABLED = 0, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE_32x32 = 1, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE_64x64 = 2, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE_128x128 = 3, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE_256x256 = 4 +} D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE; +typedef enum D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAGS { + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAG_NOT_SUPPORTED = 0x0, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAG_32x32 = 0x1, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAG_64x64 = 0x2, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAG_128x128 = 0x4, + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAG_256x256 = 0x8 +} D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION { + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_IDENTITY = 0, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_TRANSLATION = 1, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_ROTZOOM = 2, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_AFFINE = 3 +} D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION; +typedef enum D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAGS { + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAG_NONE = 0, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAG_IDENTITY = 1 << D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_IDENTITY, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAG_TRANSLATION = 1 << D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_TRANSLATION, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAG_ROTZOOM = 1 << D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_ROTZOOM, + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAG_AFFINE = 1 << D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_AFFINE +} D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAGS { + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_NONE = 0, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_QUANTIZATION = 0x1, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_QUANTIZATION_DELTA = 0x2, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_LOOP_FILTER = 0x4, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_LOOP_FILTER_DELTA = 0x8, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_CDEF_DATA = 0x10, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_CONTEXT_UPDATE_TILE_ID = 0x20, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_COMPOUND_PREDICTION_MODE = 0x40, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_PRIMARY_REF_FRAME = 0x80, + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAG_REFERENCE_INDICES = 0x100 +} D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAGS) +typedef struct D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION_SUPPORT { + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS SupportedFeatureFlags; + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS RequiredFeatureFlags; + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS_FLAGS SupportedInterpolationFilters; + D3D12_VIDEO_ENCODER_AV1_RESTORATION_SUPPORT_FLAGS SupportedRestorationParams[3][3]; + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MODE_FLAGS SupportedSegmentationModes; + D3D12_VIDEO_ENCODER_AV1_TX_MODE_FLAGS SupportedTxModes[4]; + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_BLOCK_SIZE SegmentationBlockSize; + D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES_FLAGS PostEncodeValuesFlags; + UINT MaxTemporalLayers; + UINT MaxSpatialLayers; +} D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION_SUPPORT; +typedef enum D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE { + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_KEY_FRAME = 0, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_INTER_FRAME = 1, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_INTRA_ONLY_FRAME = 2, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_SWITCH_FRAME = 3 +} D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE; +typedef enum D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAGS { + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAG_KEY_FRAME = 1 << D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_KEY_FRAME, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAG_INTER_FRAME = 1 << D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_INTER_FRAME, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAG_INTRA_ONLY_FRAME = 1 << D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_INTRA_ONLY_FRAME, + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAG_SWITCH_FRAME = 1 << D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_SWITCH_FRAME +} D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAGS) +typedef enum D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE { + D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE_SINGLE_REFERENCE = 0, + D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE_COMPOUND_REFERENCE = 1 +} D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE; +typedef struct D3D12_VIDEO_ENCODER_CODEC_AV1_PICTURE_CONTROL_SUPPORT { + D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE PredictionMode; + UINT MaxUniqueReferencesPerFrame; + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE_FLAGS SupportedFrameTypes; + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION_FLAGS SupportedReferenceWarpedMotionFlags; +} D3D12_VIDEO_ENCODER_CODEC_AV1_PICTURE_CONTROL_SUPPORT; +typedef struct D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION { + D3D12_VIDEO_ENCODER_AV1_FEATURE_FLAGS FeatureFlags; + UINT OrderHintBitsMinus1; +} D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION; +typedef struct D3D12_VIDEO_ENCODER_AV1_SEQUENCE_STRUCTURE { + UINT IntraDistance; + UINT InterFramePeriod; +} D3D12_VIDEO_ENCODER_AV1_SEQUENCE_STRUCTURE; +typedef struct D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_WARPED_MOTION_INFO { + D3D12_VIDEO_ENCODER_AV1_REFERENCE_WARPED_MOTION_TRANSFORMATION TransformationType; + INT TransformationMatrix[8]; + WINBOOL InvalidAffineSet; +} D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_WARPED_MOTION_INFO; +typedef struct D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_DESCRIPTOR { + UINT ReconstructedPictureResourceIndex; + UINT TemporalLayerIndexPlus1; + UINT SpatialLayerIndexPlus1; + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE FrameType; + D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_WARPED_MOTION_INFO WarpedMotionInfo; + UINT OrderHint; + UINT PictureIndex; +} D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_DESCRIPTOR; +typedef enum D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAGS { + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_ERROR_RESILIENT_MODE = 0x1, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_DISABLE_CDF_UPDATE = 0x2, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_PALETTE_ENCODING = 0x4, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_SKIP_MODE = 0x8, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_FRAME_REFERENCE_MOTION_VECTORS = 0x10, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_FORCE_INTEGER_MOTION_VECTORS = 0x20, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ALLOW_INTRA_BLOCK_COPY = 0x40, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_USE_SUPER_RESOLUTION = 0x80, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_DISABLE_FRAME_END_UPDATE_CDF = 0x100, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_FRAME_SEGMENTATION_AUTO = 0x200, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_FRAME_SEGMENTATION_CUSTOM = 0x400, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ENABLE_WARPED_MOTION = 0x800, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_REDUCED_TX_SET = 0x1000, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_MOTION_MODE_SWITCHABLE = 0x2000, + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAG_ALLOW_HIGH_PRECISION_MV = 0x4000 +} D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAGS; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAGS) +typedef struct D3D12_VIDEO_ENCODER_AV1_RESTORATION_CONFIG { + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TYPE FrameRestorationType[3]; + D3D12_VIDEO_ENCODER_AV1_RESTORATION_TILESIZE LoopRestorationPixelSize[3]; +} D3D12_VIDEO_ENCODER_AV1_RESTORATION_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_AV1_SEGMENT_DATA { + UINT64 EnabledFeatures; + INT64 FeatureValue[8]; +} D3D12_VIDEO_ENCODER_AV1_SEGMENT_DATA; +typedef struct D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_CONFIG { + UINT64 UpdateMap; + UINT64 TemporalUpdate; + UINT64 UpdateData; + UINT64 NumSegments; + D3D12_VIDEO_ENCODER_AV1_SEGMENT_DATA SegmentsData[8]; +} D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MAP { + UINT SegmentsMapByteSize; + UINT8 *pSegmentsMap; +} D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MAP; +typedef struct D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_CONFIG { + UINT64 LoopFilterLevel[2]; + UINT64 LoopFilterLevelU; + UINT64 LoopFilterLevelV; + UINT64 LoopFilterSharpnessLevel; + UINT64 LoopFilterDeltaEnabled; + UINT64 UpdateRefDelta; + INT64 RefDeltas[8]; + UINT64 UpdateModeDelta; + INT64 ModeDeltas[2]; +} D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_DELTA_CONFIG { + UINT64 DeltaLFPresent; + UINT64 DeltaLFMulti; + UINT64 DeltaLFRes; +} D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_DELTA_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_CONFIG { + UINT64 BaseQIndex; + INT64 YDCDeltaQ; + INT64 UDCDeltaQ; + INT64 UACDeltaQ; + INT64 VDCDeltaQ; + INT64 VACDeltaQ; + UINT64 UsingQMatrix; + UINT64 QMY; + UINT64 QMU; + UINT64 QMV; +} D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_DELTA_CONFIG { + UINT64 DeltaQPresent; + UINT64 DeltaQRes; +} D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_DELTA_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_AV1_CDEF_CONFIG { + UINT64 CdefBits; + UINT64 CdefDampingMinus3; + UINT64 CdefYPriStrength[8]; + UINT64 CdefUVPriStrength[8]; + UINT64 CdefYSecStrength[8]; + UINT64 CdefUVSecStrength[8]; +} D3D12_VIDEO_ENCODER_AV1_CDEF_CONFIG; +typedef struct D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_CODEC_DATA { + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_FLAGS Flags; + D3D12_VIDEO_ENCODER_AV1_FRAME_TYPE FrameType; + D3D12_VIDEO_ENCODER_AV1_COMP_PREDICTION_TYPE CompoundPredictionType; + D3D12_VIDEO_ENCODER_AV1_INTERPOLATION_FILTERS InterpolationFilter; + D3D12_VIDEO_ENCODER_AV1_RESTORATION_CONFIG FrameRestorationConfig; + D3D12_VIDEO_ENCODER_AV1_TX_MODE TxMode; + UINT SuperResDenominator; + UINT OrderHint; + UINT PictureIndex; + UINT TemporalLayerIndexPlus1; + UINT SpatialLayerIndexPlus1; + D3D12_VIDEO_ENCODER_AV1_REFERENCE_PICTURE_DESCRIPTOR ReferenceFramesReconPictureDescriptors[8]; + UINT ReferenceIndices[7]; + UINT PrimaryRefFrame; + UINT RefreshFrameFlags; + D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_CONFIG LoopFilter; + D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_DELTA_CONFIG LoopFilterDelta; + D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_CONFIG Quantization; + D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_DELTA_CONFIG QuantizationDelta; + D3D12_VIDEO_ENCODER_AV1_CDEF_CONFIG CDEF; + UINT QPMapValuesCount; + INT16 *pRateControlQPMap; + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_CONFIG CustomSegmentation; + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_MAP CustomSegmentsMap; +} D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_CODEC_DATA; +typedef struct D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_TILES { + UINT64 RowCount; + UINT64 ColCount; + UINT64 RowHeights[64]; + UINT64 ColWidths[64]; + UINT64 ContextUpdateTileId; +} D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_TILES; +typedef struct D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES { + UINT64 CompoundPredictionType; + D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_CONFIG LoopFilter; + D3D12_VIDEO_ENCODER_CODEC_AV1_LOOP_FILTER_DELTA_CONFIG LoopFilterDelta; + D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_CONFIG Quantization; + D3D12_VIDEO_ENCODER_CODEC_AV1_QUANTIZATION_DELTA_CONFIG QuantizationDelta; + D3D12_VIDEO_ENCODER_AV1_CDEF_CONFIG CDEF; + D3D12_VIDEO_ENCODER_AV1_SEGMENTATION_CONFIG SegmentationConfig; + UINT64 PrimaryRefFrame; + UINT64 ReferenceIndices[7]; +} D3D12_VIDEO_ENCODER_AV1_POST_ENCODE_VALUES; typedef enum D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE { D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_ABSOLUTE_QP_MAP = 0, D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP = 1, @@ -3050,7 +4068,8 @@ typedef struct D3D12_VIDEO_ENCODER_RATE_CONTROL { } D3D12_VIDEO_ENCODER_RATE_CONTROL; typedef enum D3D12_VIDEO_ENCODER_CODEC { D3D12_VIDEO_ENCODER_CODEC_H264 = 0, - D3D12_VIDEO_ENCODER_CODEC_HEVC = 1 + D3D12_VIDEO_ENCODER_CODEC_HEVC = 1, + D3D12_VIDEO_ENCODER_CODEC_AV1 = 2 } D3D12_VIDEO_ENCODER_CODEC; typedef enum D3D12_VIDEO_ENCODER_PROFILE_H264 { D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN = 0, @@ -3066,6 +4085,7 @@ typedef struct D3D12_VIDEO_ENCODER_PROFILE_DESC { __C89_NAMELESS union { D3D12_VIDEO_ENCODER_PROFILE_H264 *pH264Profile; D3D12_VIDEO_ENCODER_PROFILE_HEVC *pHEVCProfile; + D3D12_VIDEO_ENCODER_AV1_PROFILE *pAV1Profile; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_PROFILE_DESC; typedef enum D3D12_VIDEO_ENCODER_LEVELS_H264 { @@ -3118,6 +4138,7 @@ typedef struct D3D12_VIDEO_ENCODER_LEVEL_SETTING { __C89_NAMELESS union { D3D12_VIDEO_ENCODER_LEVELS_H264 *pH264LevelSetting; D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC *pHEVCLevelSetting; + D3D12_VIDEO_ENCODER_AV1_LEVEL_TIER_CONSTRAINTS *pAV1LevelSetting; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_LEVEL_SETTING; typedef struct D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC { @@ -3134,6 +4155,14 @@ typedef enum D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE { D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE_NONE = 0, D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE_ROW_BASED = 1 } D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE { + UINT NodeIndex; + D3D12_VIDEO_ENCODER_CODEC Codec; + D3D12_VIDEO_ENCODER_PROFILE_DESC Profile; + D3D12_VIDEO_ENCODER_LEVEL_SETTING Level; + D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE IntraRefreshMode; + WINBOOL IsSupported; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE; typedef enum D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE { D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME = 0, D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_BYTES_PER_SUBREGION = 1, @@ -3223,11 +4252,36 @@ typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC { UCHAR max_transform_hierarchy_depth_inter; UCHAR max_transform_hierarchy_depth_intra; } D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC; +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS1 { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAG1_NONE = 0x0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAG1_SEPARATE_COLOUR_PLANE_SUPPORT = 0x1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAG1_SEPARATE_COLOUR_PLANE_REQUIRED = 0x2 +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS1; +DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS1) +typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC1 { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS SupportFlags; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE MinLumaCodingUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE MaxLumaCodingUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE MinLumaTransformUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE MaxLumaTransformUnitSize; + UCHAR max_transform_hierarchy_depth_inter; + UCHAR max_transform_hierarchy_depth_intra; + UINT allowed_diff_cu_chroma_qp_offset_depth_values; + UINT allowed_log2_sao_offset_scale_luma_values; + UINT allowed_log2_sao_offset_scale_chroma_values; + UINT allowed_log2_max_transform_skip_block_size_minus2_values; + UINT allowed_chroma_qp_offset_list_len_minus1_values; + UINT allowed_cb_qp_offset_list_values[6]; + UINT allowed_cr_qp_offset_list_values[6]; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS1 SupportFlags1; +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC1; typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT { UINT DataSize; __C89_NAMELESS union { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264 *pH264Support; D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC *pHEVCSupport; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC1 *pHEVCSupport1; + D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION_SUPPORT *pAV1Support; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT; typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT { @@ -3256,6 +4310,7 @@ typedef struct D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT { __C89_NAMELESS union { D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264 *pH264Support; D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC *pHEVCSupport; + D3D12_VIDEO_ENCODER_CODEC_AV1_PICTURE_CONTROL_SUPPORT *pAV1Support; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT; typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT { @@ -3325,6 +4380,7 @@ typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION { __C89_NAMELESS union { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 *pH264Config; D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC *pHEVCConfig; + D3D12_VIDEO_ENCODER_AV1_CODEC_CONFIGURATION *pAV1Config; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION; typedef struct D3D12_VIDEO_ENCODER_INTRA_REFRESH { @@ -3335,7 +4391,8 @@ typedef enum D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE { D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_MAXIMUM = 0, D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_FULL_PIXEL = 1, D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_HALF_PIXEL = 2, - D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_QUARTER_PIXEL = 3 + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_QUARTER_PIXEL = 3, + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_EIGHTH_PIXEL = 4 } D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE; typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS { UINT MaxSubregionsNumber; @@ -3373,6 +4430,7 @@ typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE { __C89_NAMELESS union { D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 *pH264GroupOfPictures; D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVC *pHEVCGroupOfPictures; + D3D12_VIDEO_ENCODER_AV1_SEQUENCE_STRUCTURE *pAV1SequenceStructure; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE; typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT { @@ -4123,11 +5181,39 @@ typedef struct D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC { UINT QPMapValuesCount; INT8 *pRateControlQPMap; } D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC; +typedef struct D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC1 { + D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC_FLAGS Flags; + D3D12_VIDEO_ENCODER_FRAME_TYPE_HEVC FrameType; + UINT slice_pic_parameter_set_id; + UINT PictureOrderCountNumber; + UINT TemporalLayerIndex; + UINT List0ReferenceFramesCount; + UINT *pList0ReferenceFrames; + UINT List1ReferenceFramesCount; + UINT *pList1ReferenceFrames; + UINT ReferenceFramesReconPictureDescriptorsCount; + D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVC *pReferenceFramesReconPictureDescriptors; + UINT List0RefPicModificationsCount; + UINT *pList0RefPicModifications; + UINT List1RefPicModificationsCount; + UINT *pList1RefPicModifications; + UINT QPMapValuesCount; + INT8 *pRateControlQPMap; + UCHAR diff_cu_chroma_qp_offset_depth; + UCHAR log2_sao_offset_scale_luma; + UCHAR log2_sao_offset_scale_chroma; + UCHAR log2_max_transform_skip_block_size_minus2; + UCHAR chroma_qp_offset_list_len_minus1; + CHAR cb_qp_offset_list[6]; + CHAR cr_qp_offset_list[6]; +} D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC1; typedef struct D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA { UINT DataSize; __C89_NAMELESS union { D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264 *pH264PicData; D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC *pHEVCPicData; + D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC1 *pHEVCPicData1; + D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_CODEC_DATA *pAV1PicData; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA; typedef struct D3D12_VIDEO_ENCODE_REFERENCE_FRAMES { @@ -4168,8 +5254,29 @@ typedef struct D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA { __C89_NAMELESS union { const D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES *pSlicesPartition_H264; const D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES *pSlicesPartition_HEVC; + const D3D12_VIDEO_ENCODER_AV1_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_TILES *pTilesPartition_AV1; } __C89_NAMELESSUNIONNAME; } D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT1 { + UINT NodeIndex; + D3D12_VIDEO_ENCODER_CODEC Codec; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION CodecConfiguration; + D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE CodecGopSequence; + D3D12_VIDEO_ENCODER_RATE_CONTROL RateControl; + D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE IntraRefresh; + D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE SubregionFrameEncoding; + UINT ResolutionsListCount; + const D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *pResolutionList; + UINT MaxReferenceFramesInDPB; + D3D12_VIDEO_ENCODER_VALIDATION_FLAGS ValidationFlags; + D3D12_VIDEO_ENCODER_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_ENCODER_PROFILE_DESC SuggestedProfile; + D3D12_VIDEO_ENCODER_LEVEL_SETTING SuggestedLevel; + D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS *pResolutionDependentSupport; + D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA SubregionFrameEncodingData; + UINT MaxQualityVsSpeed; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT1; typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC { D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS Flags; D3D12_VIDEO_ENCODER_INTRA_REFRESH IntraRefreshConfig; diff --git a/lib/libc/include/any-windows-any/d3dcommon.h b/lib/libc/include/any-windows-any/d3dcommon.h index a8ae11cc786d09f871bad81e4e93d11d2dc4882a..fa2be88d0a71584b3febd5543f0e355b9e756e68 100644 --- a/lib/libc/include/any-windows-any/d3dcommon.h +++ b/lib/libc/include/any-windows-any/d3dcommon.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/d3dcommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3dcompiler.h b/lib/libc/include/any-windows-any/d3dcompiler.h index cb3241845b933ff731674c624bfcabdc0c01ba3d..24586ea842a73e95a5a224973a12f5d2143a4bcb 100644 --- a/lib/libc/include/any-windows-any/d3dcompiler.h +++ b/lib/libc/include/any-windows-any/d3dcompiler.h @@ -154,6 +154,7 @@ typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const ch const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCreateFunctionLinkingGraph(UINT flags, ID3D11FunctionLinkingGraph **graph); HRESULT WINAPI D3DCreateLinker(ID3D11Linker **linker); HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module); diff --git a/lib/libc/include/any-windows-any/dbgprop.h b/lib/libc/include/any-windows-any/dbgprop.h index 1c6ad2c2ac0043b1a6c60b531aca17cba834e74e..574bd4c5f1be17bc825ddfcfd022c7689f9b31e2 100644 --- a/lib/libc/include/any-windows-any/dbgprop.h +++ b/lib/libc/include/any-windows-any/dbgprop.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dbgprop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dbgprop.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dcommon.h b/lib/libc/include/any-windows-any/dcommon.h index 6e8f2644bcbe6eda259bad147bfe541826475bde..57daf21c559cde519e0c0f19eb31785222faeef6 100644 --- a/lib/libc/include/any-windows-any/dcommon.h +++ b/lib/libc/include/any-windows-any/dcommon.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dcommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dcomp.h b/lib/libc/include/any-windows-any/dcomp.h index bc4e5e3e6b14bd879727f40a9b7b458b2c193b32..800e73200dc3efa546c8f8d69e03a67cb3352d66 100644 --- a/lib/libc/include/any-windows-any/dcomp.h +++ b/lib/libc/include/any-windows-any/dcomp.h @@ -667,6 +667,68 @@ DECLARE_INTERFACE_IID_(IDCompositionDevice3, IDCompositionDevice2, "0987CB06-F91 __CRT_UUID_DECL(IDCompositionDevice3,0x0987cb06,0xf916,0x48bf,0x8d,0x35,0xce,0x76,0x41,0x78,0x1b,0xd9); #endif +#if (NTDDI_VERSION >= NTDDI_WIN10_NI) + +#undef INTERFACE +#define INTERFACE IDCompositionTexture +DECLARE_INTERFACE_IID_(IDCompositionTexture, IUnknown, "929BB1AA-725F-433B-ABD7-273075A835F2") +{ + STDMETHOD(SetSourceRect)(THIS_ const D2D_RECT_U &sourceRect) PURE; + STDMETHOD(SetColorSpace)(THIS_ DXGI_COLOR_SPACE_TYPE colorSpace) PURE; + STDMETHOD(SetAlphaMode)(THIS_ DXGI_ALPHA_MODE alphaMode) PURE; + STDMETHOD(GetAvailableFence)(THIS_ UINT64 *fenceValue, REFIID iid, void **availableFence) PURE; +}; + +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDCompositionTexture, 0x929bb1aa, 0x725f, 0x433b, 0xab, 0xd7, 0x27, 0x30, 0x75, 0xa8, 0x35, 0xf2); +#endif + +#undef INTERFACE +#define INTERFACE IDCompositionDevice4 +DECLARE_INTERFACE_IID_(IDCompositionDevice4, IDCompositionDevice3, "85FC5CCA-2DA6-494C-86B6-4A775C049B8A") +{ + STDMETHOD(CheckCompositionTextureSupport)(THIS_ IUnknown *renderingDevice, WINBOOL *supportsCompositionTextures) PURE; + STDMETHOD(CreateCompositionTexture)(THIS_ IUnknown *d3dTexture, IDCompositionTexture **compositionTexture) PURE; +}; + +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDCompositionDevice4, 0x85fc5cca, 0x2da6, 0x494c, 0x86, 0xb6, 0x4a, 0x77, 0x5c, 0x04, 0x9b, 0x8a); +#endif + +#endif /* (NTDDI_VERSION >= NTDDI_WIN10_NI) */ + +#if (NTDDI_VERSION >= NTDDI_WIN11_GE) + +#undef INTERFACE +#define INTERFACE IDCompositionDynamicTexture +DECLARE_INTERFACE_IID_(IDCompositionDynamicTexture, IUnknown, "A1DE1D3F-6405-447F-8E95-1383A34B0277") +{ +#if defined(_MSC_VER) && defined(__cplusplus) + STDMETHOD(SetTexture)(THIS_ IDCompositionTexture *pTexture) PURE; + STDMETHOD(SetTexture)(THIS_ IDCompositionTexture *pTexture, const D2D_RECT_L *pRects, size_t rectCount) PURE; +#else + STDMETHOD(SetTexture)(THIS_ IDCompositionTexture *pTexture, const D2D_RECT_L *pRects, size_t rectCount) PURE; + STDMETHOD(SetTexture)(THIS_ IDCompositionTexture *pTexture) PURE; +#endif +}; + +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDCompositionDynamicTexture, 0xa1de1d3f, 0x6405, 0x447f, 0x8e, 0x95, 0x13, 0x83, 0xa3, 0x4b, 0x02, 0x77); +#endif + +#undef INTERFACE +#define INTERFACE IDCompositionDevice5 +DECLARE_INTERFACE_IID_(IDCompositionDevice5, IDCompositionDevice4, "2C6BEBFE-A603-472F-AF34-D2443356E61B") +{ + STDMETHOD(CreateDynamicTexture)(THIS_ IDCompositionDynamicTexture **compositionDynamicTexture) PURE; +}; + +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDCompositionDevice5, 0x2c6bebfe, 0xa603, 0x472f, 0xaf, 0x34, 0xd2, 0x44, 0x33, 0x56, 0xe6, 0x1b); +#endif + +#endif /* (NTDDI_VERSION >= NTDDI_WIN11_GE) */ + #endif /* WINAPI_PARTITION_DESKTOP */ #if (_WIN32_WINNT >= 0x0A00) diff --git a/lib/libc/include/any-windows-any/dcompanimation.h b/lib/libc/include/any-windows-any/dcompanimation.h index 731d429c769669f72e4a5151e2849857c8635a26..0b2ad625df02e6691ffcf2750ff7a6b9ef946bbd 100644 --- a/lib/libc/include/any-windows-any/dcompanimation.h +++ b/lib/libc/include/any-windows-any/dcompanimation.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dcompanimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dcompanimation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ddk/ntddk.h b/lib/libc/include/any-windows-any/ddk/ntddk.h index 6f5259d40001d3cb92e79d4350284dd38b2ae1b5..c67e6457d3c297f456901fc709e127947a82f95d 100644 --- a/lib/libc/include/any-windows-any/ddk/ntddk.h +++ b/lib/libc/include/any-windows-any/ddk/ntddk.h @@ -1161,6 +1161,21 @@ typedef struct _FILE_DISPOSITION_INFORMATION { BOOLEAN DeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN10_RS1) +#define FILE_DISPOSITION_DO_NOT_DELETE 0x00000000 +#define FILE_DISPOSITION_DELETE 0x00000001 +#define FILE_DISPOSITION_POSIX_SEMANTICS 0x00000002 +#define FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK 0x00000004 +#define FILE_DISPOSITION_ON_CLOSE 0x00000008 +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN10_RS5) +#define FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE 0x00000010 +#endif + +typedef struct _FILE_DISPOSITION_INFORMATION_EX { + ULONG Flags; +} FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; +#endif + typedef struct _FILE_END_OF_FILE_INFORMATION { LARGE_INTEGER EndOfFile; } FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; diff --git a/lib/libc/include/any-windows-any/ddk/wdm.h b/lib/libc/include/any-windows-any/ddk/wdm.h index c2c547730b39fbf1cd38ebb8917bc2696cfb6119..5548e4732b0c68bad77e9a06c2ff33086961482e 100644 --- a/lib/libc/include/any-windows-any/ddk/wdm.h +++ b/lib/libc/include/any-windows-any/ddk/wdm.h @@ -195,51 +195,6 @@ inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) /****************************************************************************** * INTERLOCKED Functions * ******************************************************************************/ -// -// Intrinsics (note: taken from our winnt.h) -// FIXME: 64-bit -// -#if defined(__GNUC__) - -static __inline__ BOOLEAN -InterlockedBitTestAndSet( - IN LONG volatile *Base, - IN LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btsl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1; -#endif -} - -static __inline__ BOOLEAN -InterlockedBitTestAndReset( - IN LONG volatile *Base, - IN LONG Bit) -{ -#if defined(_M_IX86) - LONG OldBit; - __asm__ __volatile__("lock " - "btrl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"+m" (*Base) - :"Ir" (Bit) - : "memory"); - return OldBit; -#else - return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1; -#endif -} - -#endif /* defined(__GNUC__) */ #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse diff --git a/lib/libc/include/any-windows-any/ddstream.h b/lib/libc/include/any-windows-any/ddstream.h index d4cc623dba445209c36c20778104bb48af47532b..f5a79bc9a76918cacfa4cd75efccd944dae8a0a9 100644 --- a/lib/libc/include/any-windows-any/ddstream.h +++ b/lib/libc/include/any-windows-any/ddstream.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/ddstream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/devicetopology.h b/lib/libc/include/any-windows-any/devicetopology.h index dd6143d71742febf2e483bfa369efc231e74d241..7067bb03878fdf60dffee1f9c942cf94166b3ffd 100644 --- a/lib/libc/include/any-windows-any/devicetopology.h +++ b/lib/libc/include/any-windows-any/devicetopology.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/devicetopology.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/devicetopology.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dimm.h b/lib/libc/include/any-windows-any/dimm.h index 395c932147fa002f0b48d8cce1835785cfa1ef1e..5ae760fe443fe89936e8cf41fea7aeae0a8a2a36 100644 --- a/lib/libc/include/any-windows-any/dimm.h +++ b/lib/libc/include/any-windows-any/dimm.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dimm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dimm.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dinputd.h b/lib/libc/include/any-windows-any/dinputd.h index 16fd56685ab2fdf239454b8862df0a4edc0a1932..21edfca2c1b99bd4b94772b015214022734190f2 100644 --- a/lib/libc/include/any-windows-any/dinputd.h +++ b/lib/libc/include/any-windows-any/dinputd.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dinputd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dinputd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/directmanipulation.h b/lib/libc/include/any-windows-any/directmanipulation.h index c284149399ac29401f7c8c9c050119072602d4d9..73807166008f7e47085abf0707a89be42bb88ace 100644 --- a/lib/libc/include/any-windows-any/directmanipulation.h +++ b/lib/libc/include/any-windows-any/directmanipulation.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/directmanipulation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/directmanipulation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dirent.h b/lib/libc/include/any-windows-any/dirent.h index 2d7a1b73f71e32f5a6f827890ba5aa3322cf8570..e9a4d1ba1c27d2936113dc64ff96cfb64d0b79e1 100644 --- a/lib/libc/include/any-windows-any/dirent.h +++ b/lib/libc/include/any-windows-any/dirent.h @@ -38,7 +38,11 @@ struct dirent typedef struct { /* disk transfer area for this dir */ - struct _finddata_t dd_dta; +#ifdef _WIN64 + struct _finddata64i32_t dd_dta; +#else + struct _finddata32_t dd_dta; +#endif /* dirent struct to return from dir (NOTE: this makes this thread * safe as long as only one thread uses a particular DIR struct at @@ -85,7 +89,11 @@ struct _wdirent typedef struct { /* disk transfer area for this dir */ - struct _wfinddata_t dd_dta; +#ifdef _WIN64 + struct _wfinddata64i32_t dd_dta; +#else + struct _wfinddata32_t dd_dta; +#endif /* dirent struct to return from dir (NOTE: this makes this thread * safe as long as only one thread uses a particular DIR struct at diff --git a/lib/libc/include/any-windows-any/dispex.h b/lib/libc/include/any-windows-any/dispex.h index e8bafc62750d325a25379bcb95a333b1e7a33302..c10937763ccb2b1e18593bc6f77cbea8eaa727dd 100644 --- a/lib/libc/include/any-windows-any/dispex.h +++ b/lib/libc/include/any-windows-any/dispex.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dispex.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dispex.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dmodshow.h b/lib/libc/include/any-windows-any/dmodshow.h index 7eb6a47f90d703b6d0141940aa692120bc566064..d34e2d9305bbad951ceaa6a35059e8cb90a555c6 100644 --- a/lib/libc/include/any-windows-any/dmodshow.h +++ b/lib/libc/include/any-windows-any/dmodshow.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dmodshow.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dmodshow.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dmusicf.h b/lib/libc/include/any-windows-any/dmusicf.h index 4e22b1bcb11c3b34d9f9a800887b1c90bd2dc438..624803acc6503fb4350509cf0400490c01c7cf8d 100644 --- a/lib/libc/include/any-windows-any/dmusicf.h +++ b/lib/libc/include/any-windows-any/dmusicf.h @@ -429,7 +429,7 @@ struct _DMUS_IO_SEQ_ITEM { MUSIC_TIME mtTime; MUSIC_TIME mtDuration; DWORD dwPChannel; - short nOffset; + short nOffset; BYTE bStatus; BYTE bByte1; BYTE bByte2; @@ -489,7 +489,7 @@ struct _DMUS_IO_TIMESIG { struct _DMUS_IO_STYLE { DMUS_IO_TIMESIG timeSig; - double dblTempo; + double dblTempo; }; struct _DMUS_IO_VERSION { @@ -503,6 +503,7 @@ struct _DMUS_IO_PATTERN { BYTE bGrooveTop; WORD wEmbellishment; WORD wNbrMeasures; + /* DX8 */ BYTE bDestGrooveBottom; BYTE bDestGrooveTop; DWORD dwFlags; @@ -516,6 +517,7 @@ struct _DMUS_IO_STYLEPART { BYTE bPlayModeFlags; BYTE bInvertUpper; BYTE bInvertLower; + /* DX8 */ BYTE bPad[3]; DWORD dwFlags; }; @@ -527,8 +529,9 @@ struct _DMUS_IO_PARTREF { BYTE bSubChordLevel; BYTE bPriority; BYTE bRandomVariation; + /* DX8 */ WORD wPad; - DWORD dwPChannel; + DWORD dwPChannel; /* Replaces wLogicalPartID */ }; @@ -600,6 +603,7 @@ struct _DMUS_IO_CHORD { MUSIC_TIME mtTime; WORD wMeasure; BYTE bBeat; + /* DX8 */ BYTE bFlags; }; @@ -619,6 +623,7 @@ struct _DMUS_IO_COMMAND { BYTE bCommand; BYTE bGrooveLevel; BYTE bGrooveRange; + /* DX8 */ BYTE bRepeatMode; }; @@ -673,6 +678,7 @@ struct _DMUS_IO_INSTRUMENT { BYTE bVolume; short nTranspose; DWORD dwChannelPriority; + /* DX8 */ short nPitchBendRange; }; @@ -707,6 +713,7 @@ struct _DMUS_IO_WAVE_ITEM_HEADER { DWORD dwLoopStart; DWORD dwLoopEnd; DWORD dwFlags; + /* DX9 */ WORD wVolumeRange; WORD wPitchRange; }; diff --git a/lib/libc/include/any-windows-any/docobj.h b/lib/libc/include/any-windows-any/docobj.h index 46431b859b89596f35aa844489b93130bc2af079..bc9542fd40b4b45d733d2c9876aca23d7111090b 100644 --- a/lib/libc/include/any-windows-any/docobj.h +++ b/lib/libc/include/any-windows-any/docobj.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/docobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/docobj.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -1713,7 +1713,7 @@ static inline HRESULT IProtectedModeMenuServices_LoadMenuID(IProtectedModeMenuSe #endif #endif -#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY_DESKTOP_APP, WINAPI_PARTITION_APP) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) typedef struct tagPAGESET { } PAGESET; #endif /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/docobjectservice.h b/lib/libc/include/any-windows-any/docobjectservice.h index f07f2f589a465b773f38b4f8d384252d90288f7e..09ebdf1f065fae32abf8a8215bec884cac55086b 100644 --- a/lib/libc/include/any-windows-any/docobjectservice.h +++ b/lib/libc/include/any-windows-any/docobjectservice.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/docobjectservice.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/docobjectservice.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/documenttarget.h b/lib/libc/include/any-windows-any/documenttarget.h index 555f422eaefd14371fbf2dfee8e72b179ccc1caa..fffdd133b04e65153b811a5d01dd5e110ad2c9b9 100644 --- a/lib/libc/include/any-windows-any/documenttarget.h +++ b/lib/libc/include/any-windows-any/documenttarget.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/documenttarget.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/documenttarget.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/downloadmgr.h b/lib/libc/include/any-windows-any/downloadmgr.h index 8862dded9e370d4852ceca83eb73fa17f8113626..a25a187d34bf2a6b30c340b33f844ce60949dcdd 100644 --- a/lib/libc/include/any-windows-any/downloadmgr.h +++ b/lib/libc/include/any-windows-any/downloadmgr.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/downloadmgr.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/drmexternals.h b/lib/libc/include/any-windows-any/drmexternals.h index e8a14f166a72756c0e7ec0d07b22b21c23b5a123..617c1d331b982924adc8e39ff8686f51c17c45f2 100644 --- a/lib/libc/include/any-windows-any/drmexternals.h +++ b/lib/libc/include/any-windows-any/drmexternals.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/drmexternals.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/drmexternals.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dvdif.h b/lib/libc/include/any-windows-any/dvdif.h index e89215ff24487591a9cbf191f50771af18d8256b..d476fd5c0638aa04c58c689a6d43b844bf0bc512 100644 --- a/lib/libc/include/any-windows-any/dvdif.h +++ b/lib/libc/include/any-windows-any/dvdif.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dvdif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dvdif.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dwrite.h b/lib/libc/include/any-windows-any/dwrite.h index 07b9cd466ff779046cd2e425d89e9a8aa61aeac0..a9d0c9a9f4e2039ad580cd2f4183e17c08878886 100644 --- a/lib/libc/include/any-windows-any/dwrite.h +++ b/lib/libc/include/any-windows-any/dwrite.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dwrite.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dwrite_1.h b/lib/libc/include/any-windows-any/dwrite_1.h index 6f9cb1f505d65a2bd985e93e10d5565cbaff760b..2f7542b6087de2c03575bc75cfb122096eb00f29 100644 --- a/lib/libc/include/any-windows-any/dwrite_1.h +++ b/lib/libc/include/any-windows-any/dwrite_1.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dwrite_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dwrite_1.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dwrite_2.h b/lib/libc/include/any-windows-any/dwrite_2.h index 8793a83ba7678891bdef0e7cf823b0e9078261f6..fcea56fff2a0d5097413a2153c3531c179c3c836 100644 --- a/lib/libc/include/any-windows-any/dwrite_2.h +++ b/lib/libc/include/any-windows-any/dwrite_2.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dwrite_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dwrite_2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dwrite_3.h b/lib/libc/include/any-windows-any/dwrite_3.h index 4886b749e6b1282c8119fb349fad8264174e86d6..3aa6342ded37b92db6ab42b0d0ade5805d034ed5 100644 --- a/lib/libc/include/any-windows-any/dwrite_3.h +++ b/lib/libc/include/any-windows-any/dwrite_3.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dwrite_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dwrite_3.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi.h b/lib/libc/include/any-windows-any/dxgi.h index 7b46a97be90c247e94ae965735e16f1d930e4d20..9297bd9693a536cac864b7f805f9f4fffaf63641 100644 --- a/lib/libc/include/any-windows-any/dxgi.h +++ b/lib/libc/include/any-windows-any/dxgi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi1_2.h b/lib/libc/include/any-windows-any/dxgi1_2.h index 5aeb7319374e704478fb2c1dff96312b328d2768..d92196f9a6e8846be54bb47fe30b8bbbf464dbe9 100644 --- a/lib/libc/include/any-windows-any/dxgi1_2.h +++ b/lib/libc/include/any-windows-any/dxgi1_2.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi1_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi1_2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi1_3.h b/lib/libc/include/any-windows-any/dxgi1_3.h index 0fa0ba48dc6451e6cf1277b1bc4300376b5b55d9..45e57bd601e7407f63db0785ebc959483132f24a 100644 --- a/lib/libc/include/any-windows-any/dxgi1_3.h +++ b/lib/libc/include/any-windows-any/dxgi1_3.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi1_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi1_3.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi1_4.h b/lib/libc/include/any-windows-any/dxgi1_4.h index c2a7285af9259702133a8880fce7fc4cb9f9dd15..d936c66fc57934683042200d858799867ec1e564 100644 --- a/lib/libc/include/any-windows-any/dxgi1_4.h +++ b/lib/libc/include/any-windows-any/dxgi1_4.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi1_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi1_4.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi1_5.h b/lib/libc/include/any-windows-any/dxgi1_5.h index 6ba5b8b3a6ad9fa5a1b6c73c0cc19afc34fd0640..de1894fd1f03149385a035a0405317d3383623e1 100644 --- a/lib/libc/include/any-windows-any/dxgi1_5.h +++ b/lib/libc/include/any-windows-any/dxgi1_5.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi1_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi1_5.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgi1_6.h b/lib/libc/include/any-windows-any/dxgi1_6.h index e641d8a5dccba263540d0b66fa6abae1b168506b..c47494b8be7e40bb08f7dc4390316893224ac31b 100644 --- a/lib/libc/include/any-windows-any/dxgi1_6.h +++ b/lib/libc/include/any-windows-any/dxgi1_6.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgi1_6.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgi1_6.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgicommon.h b/lib/libc/include/any-windows-any/dxgicommon.h index 36d3dba07fd053108013774f383549b42fe4d89b..d0ddf5c0bb7510cc9047037a4a25b5224b31f4e9 100644 --- a/lib/libc/include/any-windows-any/dxgicommon.h +++ b/lib/libc/include/any-windows-any/dxgicommon.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgicommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgicommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgidebug.h b/lib/libc/include/any-windows-any/dxgidebug.h index ad1bd28f6befb2c9373c8fc9a9b31ac4a017e003..1282f5a8949b2b4523a1d9aaef814f26472dad3b 100644 --- a/lib/libc/include/any-windows-any/dxgidebug.h +++ b/lib/libc/include/any-windows-any/dxgidebug.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgidebug.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgidebug.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgiformat.h b/lib/libc/include/any-windows-any/dxgiformat.h index 0da111884414d1702c2cae26522c1caca3c45e69..ff8ba665dd68590808978cfc566746685d916a7b 100644 --- a/lib/libc/include/any-windows-any/dxgiformat.h +++ b/lib/libc/include/any-windows-any/dxgiformat.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgiformat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgiformat.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxgitype.h b/lib/libc/include/any-windows-any/dxgitype.h index 275ce8d9aacc64c32ae9a08495ba3951378fd239..260ac0ce5f52446a7292c70555a0da75dae234b5 100644 --- a/lib/libc/include/any-windows-any/dxgitype.h +++ b/lib/libc/include/any-windows-any/dxgitype.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxgitype.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxgitype.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxva2api.h b/lib/libc/include/any-windows-any/dxva2api.h index 1a07b6bfcf485016be91f40e208d97290473c403..0f93e162bb9c137d41525315539e85ca0c0c2dae 100644 --- a/lib/libc/include/any-windows-any/dxva2api.h +++ b/lib/libc/include/any-windows-any/dxva2api.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxva2api.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxva2api.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxvahd.h b/lib/libc/include/any-windows-any/dxvahd.h index 77fd4b6e4747a21f96b733481e2faadc10ed800f..ed11007105461baa89ce85446dcb70e995fc3eb0 100644 --- a/lib/libc/include/any-windows-any/dxvahd.h +++ b/lib/libc/include/any-windows-any/dxvahd.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/dxvahd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/dxvahd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/emi.h b/lib/libc/include/any-windows-any/emi.h new file mode 100644 index 0000000000000000000000000000000000000000..f2fee6bed75b550176ac3b52092e33eb2169899d --- /dev/null +++ b/lib/libc/include/any-windows-any/emi.h @@ -0,0 +1,83 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _EMI_ +#define _EMI_ + +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + +DEFINE_GUID(GUID_DEVICE_ENERGY_METER, 0x45bd8344, 0x7ed6, 0x49cf, 0xa4, 0x40, 0xc2, 0x76, 0xc9, 0x33, 0xb0, 0x53); + +#define IOCTL_EMI_GET_VERSION CTL_CODE(FILE_DEVICE_UNKNOWN, 0, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_EMI_GET_METADATA_SIZE CTL_CODE(FILE_DEVICE_UNKNOWN, 1, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_EMI_GET_METADATA CTL_CODE(FILE_DEVICE_UNKNOWN, 2, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_EMI_GET_MEASUREMENT CTL_CODE(FILE_DEVICE_UNKNOWN, 3, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define EMI_NAME_MAX 16 + +#define EMI_VERSION_V1 1 +#define EMI_VERSION_V2 2 + +typedef enum { + EmiMeasurementUnitPicowattHours +} EMI_MEASUREMENT_UNIT; + +typedef struct { + USHORT EmiVersion; +} EMI_VERSION; + +typedef struct { + ULONG MetadataSize; +} EMI_METADATA_SIZE; + +typedef struct { + ULONGLONG AbsoluteEnergy; + ULONGLONG AbsoluteTime; +} EMI_CHANNEL_MEASUREMENT_DATA; + +typedef struct { + EMI_MEASUREMENT_UNIT MeasurementUnit; + WCHAR HardwareOEM[EMI_NAME_MAX]; + WCHAR HardwareModel[EMI_NAME_MAX]; + USHORT HardwareRevision; + USHORT MeteredHardwareNameSize; + WCHAR MeteredHardwareName[ANYSIZE_ARRAY]; +} EMI_METADATA_V1; + +typedef EMI_CHANNEL_MEASUREMENT_DATA EMI_MEASUREMENT_DATA_V1; + +typedef EMI_METADATA_V1 EMI_METADATA; +typedef EMI_MEASUREMENT_DATA_V1 EMI_MEASUREMENT_DATA; + +typedef struct { + EMI_MEASUREMENT_UNIT MeasurementUnit; + USHORT ChannelNameSize; + WCHAR ChannelName[ANYSIZE_ARRAY]; +} EMI_CHANNEL_V2; + +typedef struct { + WCHAR HardwareOEM[EMI_NAME_MAX]; + WCHAR HardwareModel[EMI_NAME_MAX]; + USHORT HardwareRevision; + USHORT ChannelCount; + EMI_CHANNEL_V2 Channels[ANYSIZE_ARRAY]; +} EMI_METADATA_V2; + +typedef struct { + EMI_CHANNEL_MEASUREMENT_DATA ChannelData[ANYSIZE_ARRAY]; +} EMI_MEASUREMENT_DATA_V2; + +#define EMI_CHANNEL_V2_LENGTH(_ChannelNameSize) (FIELD_OFFSET(EMI_CHANNEL_V2, ChannelName) + (_ChannelNameSize)) + +#define EMI_CHANNEL_V2_NEXT_CHANNEL(_Channel) ((EMI_CHANNEL_V2 *)((PUCHAR)(_Channel) + EMI_CHANNEL_V2_LENGTH((_Channel)->ChannelNameSize))) + +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ + +#endif /* (NTDDI_VERSION >= NTDDI_WINBLUE) */ + +#endif /* _EMI_ */ diff --git a/lib/libc/include/any-windows-any/endpointvolume.h b/lib/libc/include/any-windows-any/endpointvolume.h index 3d6fb10277bb09a4aa8d00f58253bcb4849b3f01..e4f0897257a4e63accaf81159dd62dd11ae33aed 100644 --- a/lib/libc/include/any-windows-any/endpointvolume.h +++ b/lib/libc/include/any-windows-any/endpointvolume.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/endpointvolume.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/endpointvolume.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/errno.h b/lib/libc/include/any-windows-any/errno.h index 390f77cc531729f7250323a9cfc60959f57a720e..9838a621b3cfa221ccf691314ea5bfae37f06806 100644 --- a/lib/libc/include/any-windows-any/errno.h +++ b/lib/libc/include/any-windows-any/errno.h @@ -17,8 +17,8 @@ extern "C" { _CRTIMP extern int *__cdecl _errno(void); #define errno (*_errno()) -errno_t __cdecl _set_errno(int _Value); -errno_t __cdecl _get_errno(int *_Value); +_CRTIMP errno_t __cdecl _set_errno(int _Value); +_CRTIMP errno_t __cdecl _get_errno(int *_Value); #endif /* _CRT_ERRNO_DEFINED */ #define EPERM 1 diff --git a/lib/libc/include/any-windows-any/esent.h b/lib/libc/include/any-windows-any/esent.h index b3272285a17c77dceddf6114220fe9e3da18b049..2cd3bb729d356aea22218903024365448483de12 100644 --- a/lib/libc/include/any-windows-any/esent.h +++ b/lib/libc/include/any-windows-any/esent.h @@ -2559,10 +2559,12 @@ JET_ERR JET_API JetOpenTableW( #define JetOpenTable __MINGW_NAME_AW(JetOpenTable) +#if (JET_VERSION >= 0x0600) JET_ERR JET_API JetOpenTemporaryTable( JET_SESID sesid, JET_OPENTEMPORARYTABLE* popentemporarytable ); +#endif /*(JET_VERSION >= 0x0600)*/ JET_ERR JET_API JetOpenTempTable( JET_SESID sesid, diff --git a/lib/libc/include/any-windows-any/evr.h b/lib/libc/include/any-windows-any/evr.h index 20c18ae0a3521ddfae090ceeb7fe82863a5aa2a1..615cbad0e28c76aebc84e6f1afc889c5879a6683 100644 --- a/lib/libc/include/any-windows-any/evr.h +++ b/lib/libc/include/any-windows-any/evr.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/evr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/evr.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/evr9.h b/lib/libc/include/any-windows-any/evr9.h index 0c19b2079c7d1065ff839f3d5ba024ed6b6c346d..139ead88a91b6618b640f436a2f8b54d4bd45077 100644 --- a/lib/libc/include/any-windows-any/evr9.h +++ b/lib/libc/include/any-windows-any/evr9.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/evr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/evr9.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/excpt.h b/lib/libc/include/any-windows-any/excpt.h index 0ad224a171f521c94c00b15a2096302dd8f30415..3c03f4f34707c13b0b26bd95c30d4faf0188537d 100644 --- a/lib/libc/include/any-windows-any/excpt.h +++ b/lib/libc/include/any-windows-any/excpt.h @@ -16,14 +16,12 @@ extern "C" { struct _EXCEPTION_POINTERS; -#ifndef EXCEPTION_DISPOSITION -#define EXCEPTION_DISPOSITION int -#endif -#define ExceptionContinueExecution 0 -#define ExceptionContinueSearch 1 -#define ExceptionNestedException 2 -#define ExceptionCollidedUnwind 3 -#define ExceptionExecuteHandler 4 +typedef enum _EXCEPTION_DISPOSITION { + ExceptionContinueExecution = 0, + ExceptionContinueSearch = 1, + ExceptionNestedException = 2, + ExceptionCollidedUnwind = 3 +} EXCEPTION_DISPOSITION; #if (defined(_X86_) && !defined(__x86_64)) struct _EXCEPTION_RECORD; diff --git a/lib/libc/include/any-windows-any/exdisp.h b/lib/libc/include/any-windows-any/exdisp.h index 66cfc220bfc9caf67b890e2865f24ed3b727d5af..dcf77c6a3804a00e1ed6c3e4f472bef4e51bb6a4 100644 --- a/lib/libc/include/any-windows-any/exdisp.h +++ b/lib/libc/include/any-windows-any/exdisp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/exdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/exdisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fenv.h b/lib/libc/include/any-windows-any/fenv.h index b4ab0718cdf7db2544fd87cb55c33562ec188673..2fccf40f419833175bf96bd59a1b6ee6bd2844ff 100644 --- a/lib/libc/include/any-windows-any/fenv.h +++ b/lib/libc/include/any-windows-any/fenv.h @@ -81,23 +81,29 @@ extern const fenv_t __mingw_fe_pc53_env; /*TODO: Some of these could be inlined */ /* 7.6.2 Exception */ -extern int __cdecl feclearexcept (int); -extern int __cdecl fegetexceptflag (fexcept_t * flagp, int excepts); -extern int __cdecl feraiseexcept (int excepts ); -extern int __cdecl fesetexceptflag (const fexcept_t *, int); -extern int __cdecl fetestexcept (int excepts); +extern int __cdecl feclearexcept (int _Flags); +extern int __cdecl fegetexceptflag (fexcept_t * _Flagp, int _Excepts); +extern int __cdecl feraiseexcept (int _Excepts); +extern int __cdecl fesetexceptflag (const fexcept_t * _Flagp, int _Excepts); +extern int __cdecl fetestexcept (int _Excepts); /* 7.6.3 Rounding */ extern int __cdecl fegetround (void); -extern int __cdecl fesetround (int mode); +extern int __cdecl fesetround (int _Mode); /* 7.6.4 Environment */ -extern int __cdecl fegetenv(fenv_t * envp); -extern int __cdecl fesetenv(const fenv_t * ); -extern int __cdecl feupdateenv(const fenv_t *); -extern int __cdecl feholdexcept(fenv_t *); +extern int __cdecl fegetenv(fenv_t * _Envp); +extern int __cdecl fesetenv(const fenv_t * _Envp); +extern int __cdecl feupdateenv(const fenv_t * _Envp); +extern int __cdecl feholdexcept(fenv_t * _Envp); + +#ifdef _GNU_SOURCE +extern int __cdecl feenableexcept(int _Excepts); +extern int __cdecl fedisableexcept(int _Excepts); +extern int __cdecl fegetexcept(void); +#endif #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/filter.h b/lib/libc/include/any-windows-any/filter.h index b4ab60d87f70da315e68a6eb8b3e674ff695cd01..5dcf79a5613d2e43a80e5fdf9754690cb5c6b643 100644 --- a/lib/libc/include/any-windows-any/filter.h +++ b/lib/libc/include/any-windows-any/filter.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/filter.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/filter.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/float.h b/lib/libc/include/any-windows-any/float.h index 73255258be8bcefa5b98e7801d633200c03381ec..af21463813f4d815eac081ed4aab01107b8b6723 100644 --- a/lib/libc/include/any-windows-any/float.h +++ b/lib/libc/include/any-windows-any/float.h @@ -243,6 +243,8 @@ #define _FPE_STACKOVERFLOW 0x8a #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ +#define _FPE_MULTIPLE_TRAPS 0x8d +#define _FPE_MULTIPLE_FAULTS 0x8e #ifndef __STRICT_ANSI__ #define CW_DEFAULT _CW_DEFAULT diff --git a/lib/libc/include/any-windows-any/fsrm.h b/lib/libc/include/any-windows-any/fsrm.h index 757f7e281a3d6751ff2237586601937cde4f5066..8085c4d0be4ce17abbb2a8a013888ae7922830f6 100644 --- a/lib/libc/include/any-windows-any/fsrm.h +++ b/lib/libc/include/any-windows-any/fsrm.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fsrm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fsrm.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -306,6 +306,421 @@ interface IFsrmExportImport; #define FSRM_DISPID_ADR (FSRM_DISPID_FEATURE_GENERAL | 0x800000) +/***************************************************************************** + * IFsrmCollection interface + */ +#ifndef __IFsrmCollection_INTERFACE_DEFINED__ +#define __IFsrmCollection_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IFsrmCollection, 0xf76fbf3b, 0x8ddd, 0x4b42, 0xb0,0x5a, 0xcb,0x1c,0x3f,0xf1,0xfe,0xe8); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("f76fbf3b-8ddd-4b42-b05a-cb1c3ff1fee8") +IFsrmCollection : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE get__NewEnum( + IUnknown **unknown) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Item( + LONG index, + VARIANT *item) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Count( + LONG *count) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_State( + FsrmCollectionState *state) = 0; + + virtual HRESULT STDMETHODCALLTYPE Cancel( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE WaitForCompletion( + LONG waitSeconds, + VARIANT_BOOL *completed) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetById( + FSRM_OBJECT_ID id, + VARIANT *entry) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IFsrmCollection, 0xf76fbf3b, 0x8ddd, 0x4b42, 0xb0,0x5a, 0xcb,0x1c,0x3f,0xf1,0xfe,0xe8) +#endif +#else +typedef struct IFsrmCollectionVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IFsrmCollection *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IFsrmCollection *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IFsrmCollection *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IFsrmCollection *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IFsrmCollection *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IFsrmCollection *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IFsrmCollection *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** IFsrmCollection methods ***/ + HRESULT (STDMETHODCALLTYPE *get__NewEnum)( + IFsrmCollection *This, + IUnknown **unknown); + + HRESULT (STDMETHODCALLTYPE *get_Item)( + IFsrmCollection *This, + LONG index, + VARIANT *item); + + HRESULT (STDMETHODCALLTYPE *get_Count)( + IFsrmCollection *This, + LONG *count); + + HRESULT (STDMETHODCALLTYPE *get_State)( + IFsrmCollection *This, + FsrmCollectionState *state); + + HRESULT (STDMETHODCALLTYPE *Cancel)( + IFsrmCollection *This); + + HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( + IFsrmCollection *This, + LONG waitSeconds, + VARIANT_BOOL *completed); + + HRESULT (STDMETHODCALLTYPE *GetById)( + IFsrmCollection *This, + FSRM_OBJECT_ID id, + VARIANT *entry); + + END_INTERFACE +} IFsrmCollectionVtbl; + +interface IFsrmCollection { + CONST_VTBL IFsrmCollectionVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IFsrmCollection_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IFsrmCollection_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IFsrmCollection_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define IFsrmCollection_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define IFsrmCollection_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define IFsrmCollection_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define IFsrmCollection_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** IFsrmCollection methods ***/ +#define IFsrmCollection_get__NewEnum(This,unknown) (This)->lpVtbl->get__NewEnum(This,unknown) +#define IFsrmCollection_get_Item(This,index,item) (This)->lpVtbl->get_Item(This,index,item) +#define IFsrmCollection_get_Count(This,count) (This)->lpVtbl->get_Count(This,count) +#define IFsrmCollection_get_State(This,state) (This)->lpVtbl->get_State(This,state) +#define IFsrmCollection_Cancel(This) (This)->lpVtbl->Cancel(This) +#define IFsrmCollection_WaitForCompletion(This,waitSeconds,completed) (This)->lpVtbl->WaitForCompletion(This,waitSeconds,completed) +#define IFsrmCollection_GetById(This,id,entry) (This)->lpVtbl->GetById(This,id,entry) +#else +/*** IUnknown methods ***/ +static inline HRESULT IFsrmCollection_QueryInterface(IFsrmCollection* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IFsrmCollection_AddRef(IFsrmCollection* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IFsrmCollection_Release(IFsrmCollection* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static inline HRESULT IFsrmCollection_GetTypeInfoCount(IFsrmCollection* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static inline HRESULT IFsrmCollection_GetTypeInfo(IFsrmCollection* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static inline HRESULT IFsrmCollection_GetIDsOfNames(IFsrmCollection* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static inline HRESULT IFsrmCollection_Invoke(IFsrmCollection* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** IFsrmCollection methods ***/ +static inline HRESULT IFsrmCollection_get__NewEnum(IFsrmCollection* This,IUnknown **unknown) { + return This->lpVtbl->get__NewEnum(This,unknown); +} +static inline HRESULT IFsrmCollection_get_Item(IFsrmCollection* This,LONG index,VARIANT *item) { + return This->lpVtbl->get_Item(This,index,item); +} +static inline HRESULT IFsrmCollection_get_Count(IFsrmCollection* This,LONG *count) { + return This->lpVtbl->get_Count(This,count); +} +static inline HRESULT IFsrmCollection_get_State(IFsrmCollection* This,FsrmCollectionState *state) { + return This->lpVtbl->get_State(This,state); +} +static inline HRESULT IFsrmCollection_Cancel(IFsrmCollection* This) { + return This->lpVtbl->Cancel(This); +} +static inline HRESULT IFsrmCollection_WaitForCompletion(IFsrmCollection* This,LONG waitSeconds,VARIANT_BOOL *completed) { + return This->lpVtbl->WaitForCompletion(This,waitSeconds,completed); +} +static inline HRESULT IFsrmCollection_GetById(IFsrmCollection* This,FSRM_OBJECT_ID id,VARIANT *entry) { + return This->lpVtbl->GetById(This,id,entry); +} +#endif +#endif + +#endif + + +#endif /* __IFsrmCollection_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IFsrmMutableCollection interface + */ +#ifndef __IFsrmMutableCollection_INTERFACE_DEFINED__ +#define __IFsrmMutableCollection_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IFsrmMutableCollection, 0x1bb617b8, 0x3886, 0x49dc, 0xaf,0x82, 0xa6,0xc9,0x0f,0xa3,0x5d,0xda); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("1bb617b8-3886-49dc-af82-a6c90fa35dda") +IFsrmMutableCollection : public IFsrmCollection +{ + virtual HRESULT STDMETHODCALLTYPE Add( + VARIANT item) = 0; + + virtual HRESULT STDMETHODCALLTYPE Remove( + LONG index) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveById( + FSRM_OBJECT_ID id) = 0; + + virtual HRESULT STDMETHODCALLTYPE Clone( + IFsrmMutableCollection **collection) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IFsrmMutableCollection, 0x1bb617b8, 0x3886, 0x49dc, 0xaf,0x82, 0xa6,0xc9,0x0f,0xa3,0x5d,0xda) +#endif +#else +typedef struct IFsrmMutableCollectionVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IFsrmMutableCollection *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IFsrmMutableCollection *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IFsrmMutableCollection *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IFsrmMutableCollection *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IFsrmMutableCollection *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IFsrmMutableCollection *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IFsrmMutableCollection *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** IFsrmCollection methods ***/ + HRESULT (STDMETHODCALLTYPE *get__NewEnum)( + IFsrmMutableCollection *This, + IUnknown **unknown); + + HRESULT (STDMETHODCALLTYPE *get_Item)( + IFsrmMutableCollection *This, + LONG index, + VARIANT *item); + + HRESULT (STDMETHODCALLTYPE *get_Count)( + IFsrmMutableCollection *This, + LONG *count); + + HRESULT (STDMETHODCALLTYPE *get_State)( + IFsrmMutableCollection *This, + FsrmCollectionState *state); + + HRESULT (STDMETHODCALLTYPE *Cancel)( + IFsrmMutableCollection *This); + + HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( + IFsrmMutableCollection *This, + LONG waitSeconds, + VARIANT_BOOL *completed); + + HRESULT (STDMETHODCALLTYPE *GetById)( + IFsrmMutableCollection *This, + FSRM_OBJECT_ID id, + VARIANT *entry); + + /*** IFsrmMutableCollection methods ***/ + HRESULT (STDMETHODCALLTYPE *Add)( + IFsrmMutableCollection *This, + VARIANT item); + + HRESULT (STDMETHODCALLTYPE *Remove)( + IFsrmMutableCollection *This, + LONG index); + + HRESULT (STDMETHODCALLTYPE *RemoveById)( + IFsrmMutableCollection *This, + FSRM_OBJECT_ID id); + + HRESULT (STDMETHODCALLTYPE *Clone)( + IFsrmMutableCollection *This, + IFsrmMutableCollection **collection); + + END_INTERFACE +} IFsrmMutableCollectionVtbl; + +interface IFsrmMutableCollection { + CONST_VTBL IFsrmMutableCollectionVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IFsrmMutableCollection_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IFsrmMutableCollection_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IFsrmMutableCollection_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define IFsrmMutableCollection_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define IFsrmMutableCollection_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define IFsrmMutableCollection_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define IFsrmMutableCollection_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** IFsrmCollection methods ***/ +#define IFsrmMutableCollection_get__NewEnum(This,unknown) (This)->lpVtbl->get__NewEnum(This,unknown) +#define IFsrmMutableCollection_get_Item(This,index,item) (This)->lpVtbl->get_Item(This,index,item) +#define IFsrmMutableCollection_get_Count(This,count) (This)->lpVtbl->get_Count(This,count) +#define IFsrmMutableCollection_get_State(This,state) (This)->lpVtbl->get_State(This,state) +#define IFsrmMutableCollection_Cancel(This) (This)->lpVtbl->Cancel(This) +#define IFsrmMutableCollection_WaitForCompletion(This,waitSeconds,completed) (This)->lpVtbl->WaitForCompletion(This,waitSeconds,completed) +#define IFsrmMutableCollection_GetById(This,id,entry) (This)->lpVtbl->GetById(This,id,entry) +/*** IFsrmMutableCollection methods ***/ +#define IFsrmMutableCollection_Add(This,item) (This)->lpVtbl->Add(This,item) +#define IFsrmMutableCollection_Remove(This,index) (This)->lpVtbl->Remove(This,index) +#define IFsrmMutableCollection_RemoveById(This,id) (This)->lpVtbl->RemoveById(This,id) +#define IFsrmMutableCollection_Clone(This,collection) (This)->lpVtbl->Clone(This,collection) +#else +/*** IUnknown methods ***/ +static inline HRESULT IFsrmMutableCollection_QueryInterface(IFsrmMutableCollection* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IFsrmMutableCollection_AddRef(IFsrmMutableCollection* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IFsrmMutableCollection_Release(IFsrmMutableCollection* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static inline HRESULT IFsrmMutableCollection_GetTypeInfoCount(IFsrmMutableCollection* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static inline HRESULT IFsrmMutableCollection_GetTypeInfo(IFsrmMutableCollection* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static inline HRESULT IFsrmMutableCollection_GetIDsOfNames(IFsrmMutableCollection* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static inline HRESULT IFsrmMutableCollection_Invoke(IFsrmMutableCollection* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { + return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); +} +/*** IFsrmCollection methods ***/ +static inline HRESULT IFsrmMutableCollection_get__NewEnum(IFsrmMutableCollection* This,IUnknown **unknown) { + return This->lpVtbl->get__NewEnum(This,unknown); +} +static inline HRESULT IFsrmMutableCollection_get_Item(IFsrmMutableCollection* This,LONG index,VARIANT *item) { + return This->lpVtbl->get_Item(This,index,item); +} +static inline HRESULT IFsrmMutableCollection_get_Count(IFsrmMutableCollection* This,LONG *count) { + return This->lpVtbl->get_Count(This,count); +} +static inline HRESULT IFsrmMutableCollection_get_State(IFsrmMutableCollection* This,FsrmCollectionState *state) { + return This->lpVtbl->get_State(This,state); +} +static inline HRESULT IFsrmMutableCollection_Cancel(IFsrmMutableCollection* This) { + return This->lpVtbl->Cancel(This); +} +static inline HRESULT IFsrmMutableCollection_WaitForCompletion(IFsrmMutableCollection* This,LONG waitSeconds,VARIANT_BOOL *completed) { + return This->lpVtbl->WaitForCompletion(This,waitSeconds,completed); +} +static inline HRESULT IFsrmMutableCollection_GetById(IFsrmMutableCollection* This,FSRM_OBJECT_ID id,VARIANT *entry) { + return This->lpVtbl->GetById(This,id,entry); +} +/*** IFsrmMutableCollection methods ***/ +static inline HRESULT IFsrmMutableCollection_Add(IFsrmMutableCollection* This,VARIANT item) { + return This->lpVtbl->Add(This,item); +} +static inline HRESULT IFsrmMutableCollection_Remove(IFsrmMutableCollection* This,LONG index) { + return This->lpVtbl->Remove(This,index); +} +static inline HRESULT IFsrmMutableCollection_RemoveById(IFsrmMutableCollection* This,FSRM_OBJECT_ID id) { + return This->lpVtbl->RemoveById(This,id); +} +static inline HRESULT IFsrmMutableCollection_Clone(IFsrmMutableCollection* This,IFsrmMutableCollection **collection) { + return This->lpVtbl->Clone(This,collection); +} +#endif +#endif + +#endif + + +#endif /* __IFsrmMutableCollection_INTERFACE_DEFINED__ */ + /***************************************************************************** * IFsrmCommittableCollection interface */ @@ -1544,202 +1959,6 @@ static inline HRESULT IFsrmActionReport_put_MailTo(IFsrmActionReport* This,BSTR #endif /* __IFsrmActionReport_INTERFACE_DEFINED__ */ -/***************************************************************************** - * IFsrmCollection interface - */ -#ifndef __IFsrmCollection_INTERFACE_DEFINED__ -#define __IFsrmCollection_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IFsrmCollection, 0xf76fbf3b, 0x8ddd, 0x4b42, 0xb0,0x5a, 0xcb,0x1c,0x3f,0xf1,0xfe,0xe8); -#if defined(__cplusplus) && !defined(CINTERFACE) -MIDL_INTERFACE("f76fbf3b-8ddd-4b42-b05a-cb1c3ff1fee8") -IFsrmCollection : public IDispatch -{ - virtual HRESULT STDMETHODCALLTYPE get__NewEnum( - IUnknown **unknown) = 0; - - virtual HRESULT STDMETHODCALLTYPE get_Item( - LONG index, - VARIANT *item) = 0; - - virtual HRESULT STDMETHODCALLTYPE get_Count( - LONG *count) = 0; - - virtual HRESULT STDMETHODCALLTYPE get_State( - FsrmCollectionState *state) = 0; - - virtual HRESULT STDMETHODCALLTYPE Cancel( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE WaitForCompletion( - LONG waitSeconds, - VARIANT_BOOL *completed) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetById( - FSRM_OBJECT_ID id, - VARIANT *entry) = 0; - -}; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(IFsrmCollection, 0xf76fbf3b, 0x8ddd, 0x4b42, 0xb0,0x5a, 0xcb,0x1c,0x3f,0xf1,0xfe,0xe8) -#endif -#else -typedef struct IFsrmCollectionVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmCollection *This, - REFIID riid, - void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmCollection *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IFsrmCollection *This); - - /*** IDispatch methods ***/ - HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmCollection *This, - UINT *pctinfo); - - HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmCollection *This, - UINT iTInfo, - LCID lcid, - ITypeInfo **ppTInfo); - - HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmCollection *This, - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId); - - HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmCollection *This, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr); - - /*** IFsrmCollection methods ***/ - HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IFsrmCollection *This, - IUnknown **unknown); - - HRESULT (STDMETHODCALLTYPE *get_Item)( - IFsrmCollection *This, - LONG index, - VARIANT *item); - - HRESULT (STDMETHODCALLTYPE *get_Count)( - IFsrmCollection *This, - LONG *count); - - HRESULT (STDMETHODCALLTYPE *get_State)( - IFsrmCollection *This, - FsrmCollectionState *state); - - HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmCollection *This); - - HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmCollection *This, - LONG waitSeconds, - VARIANT_BOOL *completed); - - HRESULT (STDMETHODCALLTYPE *GetById)( - IFsrmCollection *This, - FSRM_OBJECT_ID id, - VARIANT *entry); - - END_INTERFACE -} IFsrmCollectionVtbl; - -interface IFsrmCollection { - CONST_VTBL IFsrmCollectionVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -#ifndef WIDL_C_INLINE_WRAPPERS -/*** IUnknown methods ***/ -#define IFsrmCollection_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -#define IFsrmCollection_AddRef(This) (This)->lpVtbl->AddRef(This) -#define IFsrmCollection_Release(This) (This)->lpVtbl->Release(This) -/*** IDispatch methods ***/ -#define IFsrmCollection_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) -#define IFsrmCollection_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) -#define IFsrmCollection_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) -#define IFsrmCollection_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) -/*** IFsrmCollection methods ***/ -#define IFsrmCollection_get__NewEnum(This,unknown) (This)->lpVtbl->get__NewEnum(This,unknown) -#define IFsrmCollection_get_Item(This,index,item) (This)->lpVtbl->get_Item(This,index,item) -#define IFsrmCollection_get_Count(This,count) (This)->lpVtbl->get_Count(This,count) -#define IFsrmCollection_get_State(This,state) (This)->lpVtbl->get_State(This,state) -#define IFsrmCollection_Cancel(This) (This)->lpVtbl->Cancel(This) -#define IFsrmCollection_WaitForCompletion(This,waitSeconds,completed) (This)->lpVtbl->WaitForCompletion(This,waitSeconds,completed) -#define IFsrmCollection_GetById(This,id,entry) (This)->lpVtbl->GetById(This,id,entry) -#else -/*** IUnknown methods ***/ -static inline HRESULT IFsrmCollection_QueryInterface(IFsrmCollection* This,REFIID riid,void **ppvObject) { - return This->lpVtbl->QueryInterface(This,riid,ppvObject); -} -static inline ULONG IFsrmCollection_AddRef(IFsrmCollection* This) { - return This->lpVtbl->AddRef(This); -} -static inline ULONG IFsrmCollection_Release(IFsrmCollection* This) { - return This->lpVtbl->Release(This); -} -/*** IDispatch methods ***/ -static inline HRESULT IFsrmCollection_GetTypeInfoCount(IFsrmCollection* This,UINT *pctinfo) { - return This->lpVtbl->GetTypeInfoCount(This,pctinfo); -} -static inline HRESULT IFsrmCollection_GetTypeInfo(IFsrmCollection* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { - return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); -} -static inline HRESULT IFsrmCollection_GetIDsOfNames(IFsrmCollection* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { - return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); -} -static inline HRESULT IFsrmCollection_Invoke(IFsrmCollection* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { - return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); -} -/*** IFsrmCollection methods ***/ -static inline HRESULT IFsrmCollection_get__NewEnum(IFsrmCollection* This,IUnknown **unknown) { - return This->lpVtbl->get__NewEnum(This,unknown); -} -static inline HRESULT IFsrmCollection_get_Item(IFsrmCollection* This,LONG index,VARIANT *item) { - return This->lpVtbl->get_Item(This,index,item); -} -static inline HRESULT IFsrmCollection_get_Count(IFsrmCollection* This,LONG *count) { - return This->lpVtbl->get_Count(This,count); -} -static inline HRESULT IFsrmCollection_get_State(IFsrmCollection* This,FsrmCollectionState *state) { - return This->lpVtbl->get_State(This,state); -} -static inline HRESULT IFsrmCollection_Cancel(IFsrmCollection* This) { - return This->lpVtbl->Cancel(This); -} -static inline HRESULT IFsrmCollection_WaitForCompletion(IFsrmCollection* This,LONG waitSeconds,VARIANT_BOOL *completed) { - return This->lpVtbl->WaitForCompletion(This,waitSeconds,completed); -} -static inline HRESULT IFsrmCollection_GetById(IFsrmCollection* This,FSRM_OBJECT_ID id,VARIANT *entry) { - return This->lpVtbl->GetById(This,id,entry); -} -#endif -#endif - -#endif - - -#endif /* __IFsrmCollection_INTERFACE_DEFINED__ */ - /***************************************************************************** * IFsrmDerivedObjectsResult interface */ @@ -3244,225 +3463,6 @@ static inline HRESULT IFsrmActionEmail2_put_AttachmentFileListSize(IFsrmActionEm #endif /* __IFsrmActionEmail2_INTERFACE_DEFINED__ */ -/***************************************************************************** - * IFsrmMutableCollection interface - */ -#ifndef __IFsrmMutableCollection_INTERFACE_DEFINED__ -#define __IFsrmMutableCollection_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IFsrmMutableCollection, 0x1bb617b8, 0x3886, 0x49dc, 0xaf,0x82, 0xa6,0xc9,0x0f,0xa3,0x5d,0xda); -#if defined(__cplusplus) && !defined(CINTERFACE) -MIDL_INTERFACE("1bb617b8-3886-49dc-af82-a6c90fa35dda") -IFsrmMutableCollection : public IFsrmCollection -{ - virtual HRESULT STDMETHODCALLTYPE Add( - VARIANT item) = 0; - - virtual HRESULT STDMETHODCALLTYPE Remove( - LONG index) = 0; - - virtual HRESULT STDMETHODCALLTYPE RemoveById( - FSRM_OBJECT_ID id) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - IFsrmMutableCollection **collection) = 0; - -}; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(IFsrmMutableCollection, 0x1bb617b8, 0x3886, 0x49dc, 0xaf,0x82, 0xa6,0xc9,0x0f,0xa3,0x5d,0xda) -#endif -#else -typedef struct IFsrmMutableCollectionVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IFsrmMutableCollection *This, - REFIID riid, - void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IFsrmMutableCollection *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IFsrmMutableCollection *This); - - /*** IDispatch methods ***/ - HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( - IFsrmMutableCollection *This, - UINT *pctinfo); - - HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( - IFsrmMutableCollection *This, - UINT iTInfo, - LCID lcid, - ITypeInfo **ppTInfo); - - HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( - IFsrmMutableCollection *This, - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId); - - HRESULT (STDMETHODCALLTYPE *Invoke)( - IFsrmMutableCollection *This, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr); - - /*** IFsrmCollection methods ***/ - HRESULT (STDMETHODCALLTYPE *get__NewEnum)( - IFsrmMutableCollection *This, - IUnknown **unknown); - - HRESULT (STDMETHODCALLTYPE *get_Item)( - IFsrmMutableCollection *This, - LONG index, - VARIANT *item); - - HRESULT (STDMETHODCALLTYPE *get_Count)( - IFsrmMutableCollection *This, - LONG *count); - - HRESULT (STDMETHODCALLTYPE *get_State)( - IFsrmMutableCollection *This, - FsrmCollectionState *state); - - HRESULT (STDMETHODCALLTYPE *Cancel)( - IFsrmMutableCollection *This); - - HRESULT (STDMETHODCALLTYPE *WaitForCompletion)( - IFsrmMutableCollection *This, - LONG waitSeconds, - VARIANT_BOOL *completed); - - HRESULT (STDMETHODCALLTYPE *GetById)( - IFsrmMutableCollection *This, - FSRM_OBJECT_ID id, - VARIANT *entry); - - /*** IFsrmMutableCollection methods ***/ - HRESULT (STDMETHODCALLTYPE *Add)( - IFsrmMutableCollection *This, - VARIANT item); - - HRESULT (STDMETHODCALLTYPE *Remove)( - IFsrmMutableCollection *This, - LONG index); - - HRESULT (STDMETHODCALLTYPE *RemoveById)( - IFsrmMutableCollection *This, - FSRM_OBJECT_ID id); - - HRESULT (STDMETHODCALLTYPE *Clone)( - IFsrmMutableCollection *This, - IFsrmMutableCollection **collection); - - END_INTERFACE -} IFsrmMutableCollectionVtbl; - -interface IFsrmMutableCollection { - CONST_VTBL IFsrmMutableCollectionVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -#ifndef WIDL_C_INLINE_WRAPPERS -/*** IUnknown methods ***/ -#define IFsrmMutableCollection_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -#define IFsrmMutableCollection_AddRef(This) (This)->lpVtbl->AddRef(This) -#define IFsrmMutableCollection_Release(This) (This)->lpVtbl->Release(This) -/*** IDispatch methods ***/ -#define IFsrmMutableCollection_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) -#define IFsrmMutableCollection_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) -#define IFsrmMutableCollection_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) -#define IFsrmMutableCollection_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) -/*** IFsrmCollection methods ***/ -#define IFsrmMutableCollection_get__NewEnum(This,unknown) (This)->lpVtbl->get__NewEnum(This,unknown) -#define IFsrmMutableCollection_get_Item(This,index,item) (This)->lpVtbl->get_Item(This,index,item) -#define IFsrmMutableCollection_get_Count(This,count) (This)->lpVtbl->get_Count(This,count) -#define IFsrmMutableCollection_get_State(This,state) (This)->lpVtbl->get_State(This,state) -#define IFsrmMutableCollection_Cancel(This) (This)->lpVtbl->Cancel(This) -#define IFsrmMutableCollection_WaitForCompletion(This,waitSeconds,completed) (This)->lpVtbl->WaitForCompletion(This,waitSeconds,completed) -#define IFsrmMutableCollection_GetById(This,id,entry) (This)->lpVtbl->GetById(This,id,entry) -/*** IFsrmMutableCollection methods ***/ -#define IFsrmMutableCollection_Add(This,item) (This)->lpVtbl->Add(This,item) -#define IFsrmMutableCollection_Remove(This,index) (This)->lpVtbl->Remove(This,index) -#define IFsrmMutableCollection_RemoveById(This,id) (This)->lpVtbl->RemoveById(This,id) -#define IFsrmMutableCollection_Clone(This,collection) (This)->lpVtbl->Clone(This,collection) -#else -/*** IUnknown methods ***/ -static inline HRESULT IFsrmMutableCollection_QueryInterface(IFsrmMutableCollection* This,REFIID riid,void **ppvObject) { - return This->lpVtbl->QueryInterface(This,riid,ppvObject); -} -static inline ULONG IFsrmMutableCollection_AddRef(IFsrmMutableCollection* This) { - return This->lpVtbl->AddRef(This); -} -static inline ULONG IFsrmMutableCollection_Release(IFsrmMutableCollection* This) { - return This->lpVtbl->Release(This); -} -/*** IDispatch methods ***/ -static inline HRESULT IFsrmMutableCollection_GetTypeInfoCount(IFsrmMutableCollection* This,UINT *pctinfo) { - return This->lpVtbl->GetTypeInfoCount(This,pctinfo); -} -static inline HRESULT IFsrmMutableCollection_GetTypeInfo(IFsrmMutableCollection* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { - return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); -} -static inline HRESULT IFsrmMutableCollection_GetIDsOfNames(IFsrmMutableCollection* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { - return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); -} -static inline HRESULT IFsrmMutableCollection_Invoke(IFsrmMutableCollection* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) { - return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); -} -/*** IFsrmCollection methods ***/ -static inline HRESULT IFsrmMutableCollection_get__NewEnum(IFsrmMutableCollection* This,IUnknown **unknown) { - return This->lpVtbl->get__NewEnum(This,unknown); -} -static inline HRESULT IFsrmMutableCollection_get_Item(IFsrmMutableCollection* This,LONG index,VARIANT *item) { - return This->lpVtbl->get_Item(This,index,item); -} -static inline HRESULT IFsrmMutableCollection_get_Count(IFsrmMutableCollection* This,LONG *count) { - return This->lpVtbl->get_Count(This,count); -} -static inline HRESULT IFsrmMutableCollection_get_State(IFsrmMutableCollection* This,FsrmCollectionState *state) { - return This->lpVtbl->get_State(This,state); -} -static inline HRESULT IFsrmMutableCollection_Cancel(IFsrmMutableCollection* This) { - return This->lpVtbl->Cancel(This); -} -static inline HRESULT IFsrmMutableCollection_WaitForCompletion(IFsrmMutableCollection* This,LONG waitSeconds,VARIANT_BOOL *completed) { - return This->lpVtbl->WaitForCompletion(This,waitSeconds,completed); -} -static inline HRESULT IFsrmMutableCollection_GetById(IFsrmMutableCollection* This,FSRM_OBJECT_ID id,VARIANT *entry) { - return This->lpVtbl->GetById(This,id,entry); -} -/*** IFsrmMutableCollection methods ***/ -static inline HRESULT IFsrmMutableCollection_Add(IFsrmMutableCollection* This,VARIANT item) { - return This->lpVtbl->Add(This,item); -} -static inline HRESULT IFsrmMutableCollection_Remove(IFsrmMutableCollection* This,LONG index) { - return This->lpVtbl->Remove(This,index); -} -static inline HRESULT IFsrmMutableCollection_RemoveById(IFsrmMutableCollection* This,FSRM_OBJECT_ID id) { - return This->lpVtbl->RemoveById(This,id); -} -static inline HRESULT IFsrmMutableCollection_Clone(IFsrmMutableCollection* This,IFsrmMutableCollection **collection) { - return This->lpVtbl->Clone(This,collection); -} -#endif -#endif - -#endif - - -#endif /* __IFsrmMutableCollection_INTERFACE_DEFINED__ */ - #endif /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/fsrmenums.h b/lib/libc/include/any-windows-any/fsrmenums.h index f2a5e01e70e95fa82ceb6ebc9a8975ef740d81b4..5685e41e213c6df967b896a13bf31500866caba4 100644 --- a/lib/libc/include/any-windows-any/fsrmenums.h +++ b/lib/libc/include/any-windows-any/fsrmenums.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fsrmenums.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fsrmenums.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fsrmquota.h b/lib/libc/include/any-windows-any/fsrmquota.h index e52cf9f61ea8921cbc299666bec04db2d083ad40..bdbe24b9d9a31b549f3f8a055f2a6504bb645f49 100644 --- a/lib/libc/include/any-windows-any/fsrmquota.h +++ b/lib/libc/include/any-windows-any/fsrmquota.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fsrmquota.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fsrmquota.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fsrmreports.h b/lib/libc/include/any-windows-any/fsrmreports.h index f63393992db1a2db1e3043b3bcda283c4d00def7..f8780d010b6959273ceed00ebcadc05b85ffb729 100644 --- a/lib/libc/include/any-windows-any/fsrmreports.h +++ b/lib/libc/include/any-windows-any/fsrmreports.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fsrmreports.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fsrmreports.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fsrmscreen.h b/lib/libc/include/any-windows-any/fsrmscreen.h index 71473e0a4ac6b98b7638d49b8254fe470f6be1cc..6ee197e97f17a45b40762d4870738e0528065ba4 100644 --- a/lib/libc/include/any-windows-any/fsrmscreen.h +++ b/lib/libc/include/any-windows-any/fsrmscreen.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fsrmscreen.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fsrmscreen.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fusion.h b/lib/libc/include/any-windows-any/fusion.h index 3992708db9f8c589f38e3c07843c694755d39f2e..59054a1621308f6b5298f53d6f32ed03adc9c8c2 100644 --- a/lib/libc/include/any-windows-any/fusion.h +++ b/lib/libc/include/any-windows-any/fusion.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fusion.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fusion.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fwptypes.h b/lib/libc/include/any-windows-any/fwptypes.h index 2911845f016fb4c88902c5f984dabd6817d00ad5..14f75d37286e1b4177480b77af986fdbb1d1d8f2 100644 --- a/lib/libc/include/any-windows-any/fwptypes.h +++ b/lib/libc/include/any-windows-any/fwptypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/fwptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/fwptypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/heapapi.h b/lib/libc/include/any-windows-any/heapapi.h index 6c9ee9243ce49d95d61f73880911c0bd9f9eb057..e49465232cd09b608bc049bd61d025bcc7adb574 100644 --- a/lib/libc/include/any-windows-any/heapapi.h +++ b/lib/libc/include/any-windows-any/heapapi.h @@ -15,18 +15,7 @@ extern "C" { #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) - typedef struct _HEAP_SUMMARY { - DWORD cb; - SIZE_T cbAllocated; - SIZE_T cbCommitted; - SIZE_T cbReserved; - SIZE_T cbMaxReserve; - } HEAP_SUMMARY,*PHEAP_SUMMARY; - - typedef PHEAP_SUMMARY LPHEAP_SUMMARY; - WINBASEAPI WINBOOL WINAPI HeapValidate (HANDLE hHeap, DWORD dwFlags, LPCVOID lpMem); - WINBOOL WINAPI HeapSummary (HANDLE hHeap, DWORD dwFlags, LPHEAP_SUMMARY lpSummary); #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || NTDDI_VERSION >= NTDDI_WIN10_19H1 @@ -41,6 +30,17 @@ extern "C" { #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) + typedef struct _HEAP_SUMMARY { + DWORD cb; + SIZE_T cbAllocated; + SIZE_T cbCommitted; + SIZE_T cbReserved; + SIZE_T cbMaxReserve; + } HEAP_SUMMARY,*PHEAP_SUMMARY; + + typedef PHEAP_SUMMARY LPHEAP_SUMMARY; + + WINBOOL WINAPI HeapSummary (HANDLE hHeap, DWORD dwFlags, LPHEAP_SUMMARY lpSummary); WINBASEAPI HANDLE WINAPI HeapCreate (DWORD flOptions, SIZE_T dwInitialSize, SIZE_T dwMaximumSize); WINBASEAPI SIZE_T WINAPI HeapCompact (HANDLE hHeap, DWORD dwFlags); WINBASEAPI WINBOOL WINAPI HeapDestroy (HANDLE hHeap); diff --git a/lib/libc/include/any-windows-any/hstring.h b/lib/libc/include/any-windows-any/hstring.h index eb6a49811d9ff0185ac60c8f85f438de8aeb1395..141c8b374b88d1f3c2002932991560ee4cbe3f8e 100644 --- a/lib/libc/include/any-windows-any/hstring.h +++ b/lib/libc/include/any-windows-any/hstring.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/hstring.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/hstring.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/httprequest.h b/lib/libc/include/any-windows-any/httprequest.h index 7d54c6cdafd3b2d16b0fb6b24fddc5daa759db30..54e6b7cff03428fd97195a54650b97f87f76583b 100644 --- a/lib/libc/include/any-windows-any/httprequest.h +++ b/lib/libc/include/any-windows-any/httprequest.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/httprequest.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/httprequest.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/icftypes.h b/lib/libc/include/any-windows-any/icftypes.h index dfaa59f0fbf8c1d00963c753af62bfccf17c7505..e12f70b5c9ef5d1f0f37622772c06c810ab516b7 100644 --- a/lib/libc/include/any-windows-any/icftypes.h +++ b/lib/libc/include/any-windows-any/icftypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/icftypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/icftypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/icodecapi.h b/lib/libc/include/any-windows-any/icodecapi.h index 21a3c32fb355bfe217875dbc66ea7a488c390315..d3a8f7879dce98c60494b681512a1f1a30256666 100644 --- a/lib/libc/include/any-windows-any/icodecapi.h +++ b/lib/libc/include/any-windows-any/icodecapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/icodecapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/icodecapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/iketypes.h b/lib/libc/include/any-windows-any/iketypes.h index 6f59e09277dc74413d909c8c26a55171979536f0..95901354b57988f4c505a8e4d2b7b656ca00d30d 100644 --- a/lib/libc/include/any-windows-any/iketypes.h +++ b/lib/libc/include/any-windows-any/iketypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/iketypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/iketypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/inputpaneinterop.h b/lib/libc/include/any-windows-any/inputpaneinterop.h index 843c1b199452c99c4eb9ca77efb4490c8db8b2d5..bd6550073248dcd596cc1abf8e0b2e1f24a7a996 100644 --- a/lib/libc/include/any-windows-any/inputpaneinterop.h +++ b/lib/libc/include/any-windows-any/inputpaneinterop.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/inputpaneinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/inputpaneinterop.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/inputscope.h b/lib/libc/include/any-windows-any/inputscope.h index 265b2396c070e02e2dc8796641ebbeb5893d17f9..721bd21df8c30f0a14303ea0bdacdf395c45e1e0 100644 --- a/lib/libc/include/any-windows-any/inputscope.h +++ b/lib/libc/include/any-windows-any/inputscope.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/inputscope.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/inputscope.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/inspectable.h b/lib/libc/include/any-windows-any/inspectable.h index eb68e25085c406182f6e9768fa2e95cd222c33f0..a7e35037706a82d23504891f67b15f51c02cdc1a 100644 --- a/lib/libc/include/any-windows-any/inspectable.h +++ b/lib/libc/include/any-windows-any/inspectable.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/inspectable.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/inspectable.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/intrin.h b/lib/libc/include/any-windows-any/intrin.h index 041c20e542bf9668bcdbcac741c8583611f06ba8..2b48a72510091e28dbe72f1860964e3e167063ad 100644 --- a/lib/libc/include/any-windows-any/intrin.h +++ b/lib/libc/include/any-windows-any/intrin.h @@ -521,7 +521,8 @@ extern "C" { __MACHINEIA64(void __rum(int)) #ifndef __CYGWIN__ #ifndef USE_NO_MINGW_SETJMP_TWO_ARGS - __MACHINE(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf,void *)) + __MACHINEIA32(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf)) + __MACHINEX64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf,void *)) __MACHINEIA64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void *)) __MACHINEX64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void *)) #else diff --git a/lib/libc/include/any-windows-any/intsafe.h b/lib/libc/include/any-windows-any/intsafe.h index bad9f38fedf9a05a4842d0fd550640afbca6a6fc..0383cf9e305019edae712356d0cae5a6a7a00f66 100644 --- a/lib/libc/include/any-windows-any/intsafe.h +++ b/lib/libc/include/any-windows-any/intsafe.h @@ -11,9 +11,76 @@ #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) +#include <_mingw.h> #include #include +#define INT8_MIN (-128) +#define INT8_MAX 127 +#define UINT8_MAX 255 +#define BYTE_MAX 255 +#define INT16_MIN (-32768) +#define INT16_MAX 32767 +#define SHORT_MIN (-32768) +#define SHORT_MAX 32767 +#define UINT16_MAX 65535 +#define USHORT_MAX 65535 +#define WORD_MAX 65535 +#define INT32_MIN (-0x7fffffff - 1) +#define INT32_MAX 0x7fffffff +#define INT_MIN (-0x7fffffff - 1) +#define INT_MAX 0x7fffffff +#define UINT32_MAX 0xffffffffu +#define UINT_MAX 0xffffffffu +#define DWORD_MAX __MSABI_LONG(0xffffffffu) +#define INT64_MIN (-0x7fffffffffffffff - 1) +#define INT64_MAX 0x7fffffffffffffff +#define LONGLONG_MIN (-0x7fffffffffffffffll - 1) +#define LONG64_MIN (-0x7fffffffffffffffll - 1) +#define LONGLONG_MAX 0x7fffffffffffffffll +#define LONG64_MAX 0x7fffffffffffffffll +#define UINT64_MAX 0xffffffffffffffffu +#define ULONGLONG_MAX 0xffffffffffffffffull +#define ULONG64_MAX 0xffffffffffffffffull +#define DWORDLONG_MAX 0xffffffffffffffffull +#define DWORD64_MAX 0xffffffffffffffffull + +#ifdef __LP64__ +#define LONG_MIN (-0x7fffffffffffffff - 1) +#define LONG_MAX 0x7fffffffffffffff +#define ULONG_MAX 0xffffffffffffffffu +#else +#define LONG_MIN (-0x7fffffffl - 1) +#define LONG_MAX 0x7fffffffl +#define ULONG_MAX 0xfffffffful +#endif + +#ifdef _WIN64 +#define PTRDIFF_T_MIN (-0x7fffffffffffffff - 1) +#define PTRDIFF_T_MAX 0x7fffffffffffffff +#define SIZE_T_MAX 0xffffffffffffffffu +#define INT_PTR_MIN (-0x7fffffffffffffffll - 1) +#define INT_PTR_MAX 0x7fffffffffffffffll +#define UINT_PTR_MAX 0xffffffffffffffffull +#define LONG_PTR_MIN (-0x7fffffffffffffffll - 1) +#define LONG_PTR_MAX 0x7fffffffffffffffll +#define ULONG_PTR_MAX 0xffffffffffffffffull +#else +#define PTRDIFF_T_MIN (-0x7fffffff - 1) +#define PTRDIFF_T_MAX 0x7fffffff +#define SIZE_T_MAX 0xffffffffu +#define INT_PTR_MIN (-0x7fffffff - 1) +#define INT_PTR_MAX 0x7fffffff +#define UINT_PTR_MAX 0xffffffffu +#define LONG_PTR_MIN (-0x7fffffffl - 1) +#define LONG_PTR_MAX 0x7fffffffl +#define ULONG_PTR_MAX 0xfffffffful +#endif +#define SSIZE_T_MIN LONG_PTR_MIN +#define SSIZE_T_MAX LONG_PTR_MAX +#define _SIZE_T_MAX ULONG_PTR_MAX +#define DWORD_PTR_MAX ULONG_PTR_MAX + #define INTSAFE_E_ARITHMETIC_OVERFLOW ((HRESULT)0x80070216) #ifndef S_OK @@ -424,7 +491,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define Int8ToULong64 Int8ToULongLong #define Int8ToDWord64 Int8ToULongLong #define Int8ToUInt64 Int8ToULongLong -#define Int8ToSizeT Int8ToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int8ToSizeT, INT8, size_t) #define Int8ToSIZET Int8ToULongPtr #define ShortToUInt16 ShortToUShort #define ShortToUInt32 ShortToUInt @@ -433,7 +500,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define ShortToULong64 ShortToULongLong #define ShortToDWord64 ShortToULongLong #define ShortToUInt64 ShortToULongLong -#define ShortToSizeT ShortToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ShortToSizeT, SHORT, size_t) #define ShortToSIZET ShortToULongPtr #define Int16ToChar ShortToChar #define Int16ToInt8 ShortToInt8 @@ -455,7 +522,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define Int16ToULong64 ShortToULongLong #define Int16ToDWord64 ShortToULongLong #define Int16ToUInt64 ShortToULongLong -#define Int16ToSizeT ShortToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int16ToSizeT, INT16, size_t) #define Int16ToSIZET ShortToULongPtr #define UShortToInt16 UShortToShort #define UInt16ToChar UShortToChar @@ -497,7 +564,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define Int32ToULong64 IntToULongLong #define Int32ToDWord64 IntToULongLong #define Int32ToUInt64 IntToULongLong -#define Int32ToSizeT IntToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Int32ToSizeT, INT32, size_t) #define Int32ToSIZET IntToULongPtr #define IntPtrToByte IntPtrToUInt8 #define IntPtrToInt16 IntPtrToShort @@ -535,7 +602,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define UIntPtrToInt32 UIntPtrToInt #define UIntPtrToUInt32 UIntPtrToUInt #define UIntPtrToLong64 UIntPtrToLongLong -#define UIntPtrToPtrdiffT UIntPtrToIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UIntPtrToPtrdiffT, UINT_PTR, ptrdiff_t) #define LongToInt16 LongToShort #define LongToUInt16 LongToUShort #define LongToInt32 LongToInt @@ -601,8 +668,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define LongLongToULong64 LongLongToULongLong #define LongLongToDWord64 LongLongToULongLong #define LongLongToUInt64 LongLongToULongLong -#define LongLongToPtrdiffT LongLongToIntPtr -#define LongLongToSizeT LongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToPtrdiffT, LONGLONG, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(LongLongToSizeT, LONGLONG, size_t) #define LongLongToSSIZET LongLongToLongPtr #define LongLongToSIZET LongLongToULongPtr #define Long64ToChar LongLongToChar @@ -628,8 +695,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define Long64ToDWord LongLongToULong #define Long64ToDWordPtr LongLongToULongPtr #define Long64ToULongLong LongLongToULongLong -#define Long64ToPtrdiffT LongLongToIntPtr -#define Long64ToSizeT LongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Long64ToPtrdiffT, LONG64, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(Long64ToSizeT, LONG64, size_t) #define Long64ToSSIZET LongLongToLongPtr #define Long64ToSIZET LongLongToULongPtr #define Int64ToChar LongLongToChar @@ -682,8 +749,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define DWordLongToLongLong ULongLongToLongLong #define DWordLongToLong64 ULongLongToLongLong #define DWordLongToInt64 ULongLongToLongLong -#define DWordLongToPtrdiffT ULongLongToIntPtr -#define DWordLongToSizeT ULongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordLongToPtrdiffT, DWORDLONG, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWordLongToSizeT, DWORDLONG, size_t) #define DWordLongToSSIZET ULongLongToLongPtr #define DWordLongToSIZET ULongLongToULongPtr #define ULong64ToChar ULongLongToChar @@ -711,8 +778,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define ULong64ToLongLong ULongLongToLongLong #define ULong64ToLong64 ULongLongToLongLong #define ULong64ToInt64 ULongLongToLongLong -#define ULong64ToPtrdiffT ULongLongToIntPtr -#define ULong64ToSizeT ULongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULong64ToPtrdiffT, ULONG64, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(ULong64ToSizeT, ULONG64, size_t) #define ULong64ToSSIZET ULongLongToLongPtr #define ULong64ToSIZET ULongLongToULongPtr #define DWord64ToChar ULongLongToChar @@ -740,8 +807,8 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define DWord64ToLongLong ULongLongToLongLong #define DWord64ToLong64 ULongLongToLongLong #define DWord64ToInt64 ULongLongToLongLong -#define DWord64ToPtrdiffT ULongLongToIntPtr -#define DWord64ToSizeT ULongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWord64ToPtrdiffT, DWORD64, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(DWord64ToSizeT, DWORD64, size_t) #define DWord64ToSSIZET ULongLongToLongPtr #define DWord64ToSIZET ULongLongToULongPtr #define UInt64ToChar ULongLongToChar @@ -769,42 +836,42 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define UInt64ToLongLong ULongLongToLongLong #define UInt64ToLong64 ULongLongToLongLong #define UInt64ToInt64 ULongLongToLongLong -#define UInt64ToPtrdiffT ULongLongToIntPtr -#define UInt64ToSizeT ULongLongToUIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UInt64ToPtrdiffT, UINT64, ptrdiff_t) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(UInt64ToSizeT, UINT64, size_t) #define UInt64ToSSIZET ULongLongToLongPtr #define UInt64ToSIZET ULongLongToULongPtr -#define PtrdiffTToChar IntPtrToChar -#define PtrdiffTToInt8 IntPtrToInt8 -#define PtrdiffTToUChar IntPtrToUChar -#define PtrdiffTToUInt8 IntPtrToUInt8 -#define PtrdiffTToByte IntPtrToUInt8 -#define PtrdiffTToShort IntPtrToShort -#define PtrdiffTToInt16 IntPtrToShort -#define PtrdiffTToUShort IntPtrToUShort -#define PtrdiffTToUInt16 IntPtrToUShort -#define PtrdiffTToWord IntPtrToUShort -#define PtrdiffTToInt32 IntPtrToInt -#define PtrdiffTToUInt32 IntPtrToUInt -#define PtrdiffTToLongPtr IntPtrToLongPtr -#define PtrdiffTToULongLong IntPtrToULongLong -#define PtrdiffTToDWordLong IntPtrToULongLong -#define PtrdiffTToULong64 IntPtrToULongLong -#define PtrdiffTToDWord64 IntPtrToULongLong -#define PtrdiffTToUInt64 IntPtrToULongLong -#define PtrdiffTToSIZET IntPtrToULongPtr -#define SizeTToInt8 UIntPtrToInt8 -#define SizeTToUChar UIntPtrToUChar -#define SizeTToChar UIntPtrToChar -#define SizeTToUInt8 UIntPtrToUInt8 -#define SizeTToByte UIntPtrToUInt8 -#define SizeTToShort UIntPtrToShort -#define SizeTToInt16 UIntPtrToShort -#define SizeTToUShort UIntPtrToUShort -#define SizeTToUInt16 UIntPtrToUShort -#define SizeTToWord UIntPtrToUShort -#define SizeTToInt32 UIntPtrToInt -#define SizeTToLongLong UIntPtrToLongLong -#define SizeTToLong64 UIntPtrToLongLong +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_CHAR(PtrdiffTToChar, ptrdiff_t, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(PtrdiffTToUChar, ptrdiff_t, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToInt8, ptrdiff_t, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt8, ptrdiff_t, UINT8) +#define PtrdiffTToByte PtrdiffTToUInt8 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToInt16, ptrdiff_t, INT16) +#define PtrdiffTToShort PtrdiffTToInt16 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt16, ptrdiff_t, UINT16) +#define PtrdiffTToUShort PtrdiffTToUInt16 +#define PtrdiffTToWord PtrdiffTToUInt16 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToInt32, ptrdiff_t, INT32) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt32, ptrdiff_t, UINT32) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToLongPtr, ptrdiff_t, LONG_PTR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULongLong, ptrdiff_t, ULONGLONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWordLong, ptrdiff_t, DWORDLONG) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToULong64, ptrdiff_t, ULONG64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToDWord64, ptrdiff_t, DWORD64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToUInt64, ptrdiff_t, UINT64) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(PtrdiffTToSIZET, ptrdiff_t, SIZE_T) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_CHAR(SizeTToChar, size_t, CHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV_UCHAR(SizeTToUChar, size_t, UCHAR) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt8, size_t, INT8) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToUInt8, size_t, UINT8) +#define SizeTToByte SizeTToUInt8 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt16, size_t, INT16) +#define SizeTToShort SizeTToInt16 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToUInt16, size_t, UINT16) +#define SizeTToUShort SizeTToUInt16 +#define SizeTToWord SizeTToUInt16 +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToInt32, size_t, INT32) +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SizeTToLongLong, size_t, LONGLONG) +#define SizeTToLong64 SizeTToLongLong #define SSIZETToInt8 LongPtrToInt8 #define SSIZETToUChar LongPtrToUChar #define SSIZETToChar LongPtrToChar @@ -846,7 +913,7 @@ __MINGW_INTSAFE_API __MINGW_INTSAFE_MATH(LongLongMult, LONGLONG, mul) #define SIZETToLongLong ULongPtrToLongLong #define SIZETToLong64 ULongPtrToLongLong #define SIZETToInt64 ULongPtrToLongLong -#define SIZETToPtrdiffT ULongPtrToIntPtr +__MINGW_INTSAFE_API __MINGW_INTSAFE_CONV(SIZETToPtrdiffT, SIZE_T, ptrdiff_t) #define SIZETToSSIZET ULongPtrToLongPtr #define UInt16Add UShortAdd diff --git a/lib/libc/include/any-windows-any/io.h b/lib/libc/include/any-windows-any/io.h index a6dc2f8a1bb216fccdd8aa431ef7d1e1d851ced0..198606e3b70ebc827c50ab23cf3a1270856709ea 100644 --- a/lib/libc/include/any-windows-any/io.h +++ b/lib/libc/include/any-windows-any/io.h @@ -76,6 +76,11 @@ _CRTIMP char* __cdecl _getcwd (char*, int); char name[260]; }; +/* + * To prevent ABI issues, the mingw-w64 runtime should not call these + * functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T #define _finddata_t _finddata32_t #define _finddatai64_t _finddata32i64_t @@ -93,6 +98,7 @@ _CRTIMP char* __cdecl _getcwd (char*, int); #define _findfirsti64 _findfirst64 #define _findnexti64 _findnext64 #endif /* _USE_32BIT_TIME_T */ +#endif /* _CRTBLD */ #define _FINDDATA_T_DEFINED #endif /* _FINDDATA_T_DEFINED */ @@ -135,14 +141,19 @@ _CRTIMP char* __cdecl _getcwd (char*, int); wchar_t name[260]; }; +/* + * To prevent ABI issues, the mingw-w64 runtime should not call these + * functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T #define _wfinddata_t _wfinddata32_t #define _wfinddatai64_t _wfinddata32i64_t #define _wfindfirst _wfindfirst32 #define _wfindnext _wfindnext32 -#define _wfindfirst32i64 _wfindfirsti64 -#define _wfindnext32i64 _wfindnexti64 +#define _wfindfirsti64 _wfindfirst32i64 +#define _wfindnexti64 _wfindnext32i64 #else #define _wfinddata_t _wfinddata64i32_t #define _wfinddatai64_t _wfinddata64_t @@ -152,6 +163,7 @@ _CRTIMP char* __cdecl _getcwd (char*, int); #define _wfindfirsti64 _wfindfirst64 #define _wfindnexti64 _wfindnext64 #endif /* _USE_32BIT_TIME_T */ +#endif /* _CRTBLD */ #define _WFINDDATA_T_DEFINED #endif /* _WFINDDATA_T_DEFINED */ @@ -237,49 +249,10 @@ _CRTIMP char* __cdecl _getcwd (char*, int); __MINGW_EXTENSION _CRTIMP __int64 __cdecl _filelengthi64(int _FileHandle); _CRTIMP intptr_t __cdecl _findfirst32i64(const char *_Filename,struct _finddata32i64_t *_FindData); _CRTIMP intptr_t __cdecl _findfirst64(const char *_Filename,struct __finddata64_t *_FindData); -#ifdef __cplusplus -#include -#endif - intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData); -#ifndef __CRT__NO_INLINE - __CRT_INLINE intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData) - { - struct __finddata64_t fd; - intptr_t ret = _findfirst64(_Filename,&fd); - if (ret == -1) { - memset(_FindData,0,sizeof(struct _finddata64i32_t)); - return -1; - } - _FindData->attrib=fd.attrib; - _FindData->time_create=fd.time_create; - _FindData->time_access=fd.time_access; - _FindData->time_write=fd.time_write; - _FindData->size=(_fsize_t) fd.size; - strncpy(_FindData->name,fd.name,260); - return ret; - } -#endif /* __CRT__NO_INLINE */ + _CRTIMP intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData); _CRTIMP int __cdecl _findnext32i64(intptr_t _FindHandle,struct _finddata32i64_t *_FindData); _CRTIMP int __cdecl _findnext64(intptr_t _FindHandle,struct __finddata64_t *_FindData); - int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData) - { - struct __finddata64_t fd; - int __ret = _findnext64(_FindHandle,&fd); - if (__ret == -1) { - memset(_FindData,0,sizeof(struct _finddata64i32_t)); - return -1; - } - _FindData->attrib=fd.attrib; - _FindData->time_create=fd.time_create; - _FindData->time_access=fd.time_access; - _FindData->time_write=fd.time_write; - _FindData->size=(_fsize_t) fd.size; - strncpy(_FindData->name,fd.name,260); - return __ret; - } -#endif /* __CRT__NO_INLINE */ + _CRTIMP int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData); __MINGW_EXTENSION __int64 __cdecl _lseeki64(int _FileHandle,__int64 _Offset,int _Origin); __MINGW_EXTENSION __int64 __cdecl _telli64(int _FileHandle); @@ -344,15 +317,21 @@ _CRTIMP char* __cdecl _getcwd (char*, int); int __cdecl chsize(int _FileHandle,long _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl close(int _FileHandle) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl creat(const char *_Filename,int _PermissionMode) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl creat64(const char *_Filename,int _PermissionMode); int __cdecl dup(int _FileHandle) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl dup2(int _FileHandleSrc,int _FileHandleDst) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl eof(int _FileHandle) __MINGW_ATTRIB_DEPRECATED_MSVC2005; long __cdecl filelength(int _FileHandle) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl isatty(int _FileHandle) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl locking(int _FileHandle,int _LockMode,long _NumOfBytes) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - long __cdecl lseek(int _FileHandle,long _Offset,int _Origin) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + off_t __cdecl lseek(int _FileHandle,off_t _Offset,int _Origin) +#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) + __MINGW_ASM_CALL(lseek64) +#endif + __MINGW_ATTRIB_DEPRECATED_MSVC2005; char *__cdecl mktemp(char *_TemplateName) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl open(const char *_Filename,int _OpenFlag,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; + int __cdecl open64(const char *_Filename,int _OpenFlag,...); int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl setmode(int _FileHandle,int _Mode) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl sopen(const char *_Filename,int _OpenFlag,int _ShareFlag,...) __MINGW_ATTRIB_DEPRECATED_MSVC2005; @@ -361,13 +340,6 @@ _CRTIMP char* __cdecl _getcwd (char*, int); int __cdecl write(int _Filehandle,const void *_Buf,unsigned int _MaxCharCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005; #endif -#ifndef _FILE_OFFSET_BITS_SET_LSEEK -#define _FILE_OFFSET_BITS_SET_LSEEK -#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) -#define lseek lseek64 -#endif /* (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) */ -#endif /* _FILE_OFFSET_BITS_SET_LSEEK */ - #ifdef _POSIX /* Misc stuff */ diff --git a/lib/libc/include/any-windows-any/iwscapi.h b/lib/libc/include/any-windows-any/iwscapi.h index 4ba584d2d1848bbcf9150502219c3647d4d01ca8..0bcfc201c4c367537580ea56276d2bf2ecfdcbe3 100644 --- a/lib/libc/include/any-windows-any/iwscapi.h +++ b/lib/libc/include/any-windows-any/iwscapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/iwscapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/iwscapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/locale.h b/lib/libc/include/any-windows-any/locale.h index f69bd6ed783edee017abed1109f5de7e0cfdedae..607079c7fec3cadc4573ce864742e59fa6575a4e 100644 --- a/lib/libc/include/any-windows-any/locale.h +++ b/lib/libc/include/any-windows-any/locale.h @@ -86,18 +86,24 @@ extern "C" { #endif - int __cdecl _configthreadlocale(int _Flag); - char *__cdecl setlocale(int _Category,const char *_Locale); + _CRTIMP int __cdecl _configthreadlocale(int _Flag); + _CRTIMP char *__cdecl setlocale(int _Category,const char *_Locale); _CRTIMP struct lconv *__cdecl localeconv(void); _CRTIMP _locale_t __cdecl _get_current_locale(void); _CRTIMP _locale_t __cdecl _create_locale(int _Category,const char *_Locale); _CRTIMP void __cdecl _free_locale(_locale_t _Locale); - _locale_t __cdecl __get_current_locale(void); - _locale_t __cdecl __create_locale(int _Category,const char *_Locale); - void __cdecl __free_locale(_locale_t _Locale); + _CRTIMP _locale_t __cdecl __get_current_locale(void); + _CRTIMP _locale_t __cdecl __create_locale(int _Category,const char *_Locale); + _CRTIMP void __cdecl __free_locale(_locale_t _Locale); _CRTIMP unsigned int __cdecl ___lc_codepage_func(void); + /* Get the code page that the CRT currently uses for filenames. */ + unsigned int __cdecl __mingw_filename_cp(void); + + /* Variant of _isleadbyte_l() function which takes codepage (instead of locale_t). */ + int __cdecl __mingw_isleadbyte_cp(int c, unsigned int cp); + #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); diff --git a/lib/libc/include/any-windows-any/locationapi.h b/lib/libc/include/any-windows-any/locationapi.h index 42f20e5688ed42788fa47fd662132ae315cf422d..c76d93ac80caa654e751256e803b9ef47bbbea3c 100644 --- a/lib/libc/include/any-windows-any/locationapi.h +++ b/lib/libc/include/any-windows-any/locationapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/locationapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/locationapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/math.h b/lib/libc/include/any-windows-any/math.h index 65c41cd6da34bd410fcfa0cb9f46c5b81969d02e..c0a0285f8c72ec68911d80d7134170c4346905eb 100644 --- a/lib/libc/include/any-windows-any/math.h +++ b/lib/libc/include/any-windows-any/math.h @@ -168,6 +168,17 @@ extern "C" { #define __setusermatherr __mingw_setusermatherr #endif +#define MATH_ERRNO 1 +#define MATH_ERREXCEPT 2 + +#if defined __FAST_MATH__ /* no error handling. */ +# define math_errhandling 0 +#elif defined __NO_MATH_ERRNO__ /* errno is not used; only exceptions. */ +# define math_errhandling MATH_ERREXCEPT +#else +# define math_errhandling (MATH_ERRNO | MATH_ERREXCEPT) +#endif + double __cdecl sin(double _X); double __cdecl cos(double _X); double __cdecl tan(double _X); @@ -484,13 +495,13 @@ __fin))) #define fpclassify(x) \ __mingw_choose_expr ( \ __mingw_types_compatible_p (__typeof__ (x), double), \ - __fpclassify(x), \ + __fpclassify((double)(x)), \ __mingw_choose_expr ( \ __mingw_types_compatible_p (__typeof__ (x), float), \ - __fpclassifyf(x), \ + __fpclassifyf((float)(x)), \ __mingw_choose_expr ( \ __mingw_types_compatible_p (__typeof__ (x), long double), \ - __fpclassifyl(x), \ + __fpclassifyl((long double)(x)), \ __dfp_expansion(__fpclassify,(__builtin_trap(),0),x)))) @@ -687,6 +698,44 @@ __mingw_choose_expr ( \ #endif extern long double __cdecl tanhl(long double); +#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) \ + || defined(_CRTBLD) +/* 7.12.4.8 */ + double __cdecl acospi(double _X); + float __cdecl acospif(float _X); + long double __cdecl acospil(long double _X); + +/* 7.12.4.9 */ + double __cdecl asinpi(double _X); + float __cdecl asinpif(float _X); + long double __cdecl asinpil(long double _X); + +/* 7.12.4.10 */ + double __cdecl atanpi(double _X); + float __cdecl atanpif(float _X); + long double __cdecl atanpil(long double _X); + +/* 7.12.4.11 */ + double __cdecl atan2pi(double _Y, double _X); + float __cdecl atan2pif(float _Y, float _X); + long double __cdecl atan2pil(long double _Y, long double _X); + +/* 7.12.4.12 */ + double __cdecl cospi(double _X); + float __cdecl cospif(float _X); + long double __cdecl cospil(long double _X); + +/* 7.12.4.13 */ + double __cdecl sinpi(double _X); + float __cdecl sinpif(float _X); + long double __cdecl sinpil(long double _X); + +/* 7.12.4.14 */ + double __cdecl tanpi(double _X); + float __cdecl tanpif(float _X); + long double __cdecl tanpil(long double _X); +#endif + /* Inverse hyperbolic trig functions */ /* 7.12.5.1 */ extern double __cdecl acosh (double); @@ -1154,9 +1203,9 @@ _Decimal128 __cdecl atand128(_Decimal128 _X); _Decimal32 __cdecl atand32(_Decimal32 _X); /* http://h21007.www2.hp.com/portal/download/files/unprot/fp/manpages/atan2d64.3m.htm */ -_Decimal64 __cdecl atan2d64(_Decimal64 _X, _Decimal64 _Y); -_Decimal128 __cdecl atan2d128(_Decimal128 _X, _Decimal128 _Y); -_Decimal32 __cdecl atan2d32(_Decimal32 _X, _Decimal32 _Y); +_Decimal64 __cdecl atan2d64(_Decimal64 _Y, _Decimal64 _X); +_Decimal128 __cdecl atan2d128(_Decimal128 _Y, _Decimal128 _X); +_Decimal32 __cdecl atan2d32(_Decimal32 _Y, _Decimal32 _X); /*** hyperbolics ***/ /* http://h21007.www2.hp.com/portal/download/files/unprot/fp/manpages/coshd64.3m.htm */ diff --git a/lib/libc/include/any-windows-any/mbctype.h b/lib/libc/include/any-windows-any/mbctype.h index b85720c97eb0cf7e37030776c40b34f27b48d99c..d1c48f2b333e3956ad6a356b98452c03a9e03f70 100644 --- a/lib/libc/include/any-windows-any/mbctype.h +++ b/lib/libc/include/any-windows-any/mbctype.h @@ -23,12 +23,6 @@ extern "C" { #define _mbcasemap (__p__mbcasemap()) #endif - extern pthreadmbcinfo __ptmbcinfo; - extern int __globallocalestatus; - extern int __locale_changed; - extern struct threadmbcinfostruct __initialmbcinfo; - pthreadmbcinfo __cdecl __updatetmbcinfo(void); - #define _MS 0x01 #define _MP 0x02 #define _M1 0x04 @@ -48,22 +42,32 @@ extern "C" { #define _MB_CP_OEM -2 #define _MB_CP_ANSI -3 #define _MB_CP_LOCALE -4 +#ifdef _UCRT +#define _MB_CP_UTF8 65001 +#endif #ifndef _MBCTYPE_DEFINED #define _MBCTYPE_DEFINED - +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _setmbcp(int _CodePage); _CRTIMP int __cdecl _getmbcp(void); +#endif _CRTIMP int __cdecl _ismbbkalnum(unsigned int _C); _CRTIMP int __cdecl _ismbbkalnum_l(unsigned int _C,_locale_t _Locale); _CRTIMP int __cdecl _ismbbkana(unsigned int _C); _CRTIMP int __cdecl _ismbbkana_l(unsigned int _C,_locale_t _Locale); _CRTIMP int __cdecl _ismbbkpunct(unsigned int _C); _CRTIMP int __cdecl _ismbbkpunct_l(unsigned int _C,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _ismbbkprint(unsigned int _C); _CRTIMP int __cdecl _ismbbkprint_l(unsigned int _C,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbbalpha(unsigned int _C); _CRTIMP int __cdecl _ismbbalpha_l(unsigned int _C,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0C00 + _CRTIMP int __cdecl _ismbbblank(unsigned int _C); + _CRTIMP int __cdecl _ismbbblank_l(unsigned int _C,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbbpunct(unsigned int _C); _CRTIMP int __cdecl _ismbbpunct_l(unsigned int _C,_locale_t _Locale); _CRTIMP int __cdecl _ismbbalnum(unsigned int _C); diff --git a/lib/libc/include/any-windows-any/mbstring.h b/lib/libc/include/any-windows-any/mbstring.h index e9e43a13a1e16e2fe4bc3631abd72f593c8acbe9..93451b7cdb3f73f2c0c31f9907f3cf81be2a93fe 100644 --- a/lib/libc/include/any-windows-any/mbstring.h +++ b/lib/libc/include/any-windows-any/mbstring.h @@ -16,6 +16,9 @@ extern "C" { #ifndef _FILE_DEFINED struct _iobuf { +#ifdef _UCRT + void *_Placeholder; +#else char *_ptr; int _cnt; char *_base; @@ -24,6 +27,7 @@ extern "C" { int _charbuf; int _bufsiz; char *_tmpfname; +#endif }; typedef struct _iobuf FILE; #define _FILE_DEFINED @@ -47,46 +51,58 @@ extern "C" { _CRTIMP unsigned int __cdecl _mbctombb_l(unsigned int _Ch,_locale_t _Locale); _CRTIMP int __cdecl _mbsbtype(const unsigned char *_Str,size_t _Pos); _CRTIMP int __cdecl _mbsbtype_l(const unsigned char *_Str,size_t _Pos,_locale_t _Locale); +#if __MSVCRT_VERSION__ < 0x0800 _CRTIMP unsigned char *__cdecl _mbscat(unsigned char *_Dest,const unsigned char *_Source); - _CRTIMP unsigned char *_mbscat_l(unsigned char *_Dest,const unsigned char *_Source,_locale_t _Locale); +#endif _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbschr(const unsigned char *_Str,unsigned int _Ch); _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbschr_l(const unsigned char *_Str,unsigned int _Ch,_locale_t _Locale); _CRTIMP int __cdecl _mbscmp(const unsigned char *_Str1,const unsigned char *_Str2); _CRTIMP int __cdecl _mbscmp_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbscoll(const unsigned char *_Str1,const unsigned char *_Str2); _CRTIMP int __cdecl _mbscoll_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); +#endif +#if __MSVCRT_VERSION__ < 0x0800 _CRTIMP unsigned char *__cdecl _mbscpy(unsigned char *_Dest,const unsigned char *_Source); - _CRTIMP unsigned char *_mbscpy_l(unsigned char *_Dest,const unsigned char *_Source,_locale_t _Locale); +#endif _CRTIMP size_t __cdecl _mbscspn(const unsigned char *_Str,const unsigned char *_Control); _CRTIMP size_t __cdecl _mbscspn_l(const unsigned char *_Str,const unsigned char *_Control,_locale_t _Locale); _CRTIMP unsigned char *__cdecl _mbsdec(const unsigned char *_Start,const unsigned char *_Pos); _CRTIMP unsigned char *__cdecl _mbsdec_l(const unsigned char *_Start,const unsigned char *_Pos,_locale_t _Locale); _CRTIMP int __cdecl _mbsicmp(const unsigned char *_Str1,const unsigned char *_Str2); _CRTIMP int __cdecl _mbsicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbsicoll(const unsigned char *_Str1,const unsigned char *_Str2); _CRTIMP int __cdecl _mbsicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); +#endif _CRTIMP unsigned char *__cdecl _mbsinc(const unsigned char *_Ptr); _CRTIMP unsigned char *__cdecl _mbsinc_l(const unsigned char *_Ptr,_locale_t _Locale); _CRTIMP size_t __cdecl _mbslen(const unsigned char *_Str); _CRTIMP size_t __cdecl _mbslen_l(const unsigned char *_Str,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0800 _CRTIMP size_t __cdecl _mbsnlen(const unsigned char *_Str,size_t _MaxCount); _CRTIMP size_t __cdecl _mbsnlen_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); +#endif _CRTIMP unsigned char *__cdecl _mbslwr(unsigned char *_String); - _CRTIMP unsigned char *_mbslwr_l(unsigned char *_String,_locale_t _Locale); + _CRTIMP unsigned char *__cdecl _mbslwr_l(unsigned char *_String,_locale_t _Locale); _CRTIMP unsigned char *__cdecl _mbsnbcat(unsigned char *_Dest,const unsigned char *_Source,size_t _Count) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsnbcat_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _mbsnbcmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnbcmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbsnbcoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnbcoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#endif _CRTIMP size_t __cdecl _mbsnbcnt(const unsigned char *_Str,size_t _MaxCount); _CRTIMP size_t __cdecl _mbsnbcnt_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); _CRTIMP unsigned char *__cdecl _mbsnbcpy(unsigned char *_Dest,const unsigned char *_Source,size_t _Count) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsnbcpy_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _mbsnbicmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnbicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbsnbicoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnbicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#endif _CRTIMP unsigned char *__cdecl _mbsnbset(unsigned char *_Str,unsigned int _Ch,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsnbset_l(unsigned char *_Str,unsigned int _Ch,size_t _MaxCount,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsncat(unsigned char *_Dest,const unsigned char *_Source,size_t _Count) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -95,16 +111,20 @@ extern "C" { _CRTIMP size_t __cdecl _mbsnccnt_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _mbsncmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsncmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbsncoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsncoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#endif _CRTIMP unsigned char *__cdecl _mbsncpy(unsigned char *_Dest,const unsigned char *_Source,size_t _Count) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsncpy_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned int __cdecl _mbsnextc (const unsigned char *_Str); _CRTIMP unsigned int __cdecl _mbsnextc_l(const unsigned char *_Str,_locale_t _Locale); _CRTIMP int __cdecl _mbsnicmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _mbsnicoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _mbsnicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); +#endif _CRTIMP unsigned char *__cdecl _mbsninc(const unsigned char *_Str,size_t _Count); _CRTIMP unsigned char *__cdecl _mbsninc_l(const unsigned char *_Str,size_t _Count,_locale_t _Locale); _CRTIMP unsigned char *__cdecl _mbsnset(unsigned char *_Dst,unsigned int _Val,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -126,7 +146,7 @@ extern "C" { _CRTIMP unsigned char *__cdecl _mbstok(unsigned char *_Str,const unsigned char *_Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbstok_l(unsigned char *_Str,const unsigned char *_Delim,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP unsigned char *__cdecl _mbsupr(unsigned char *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP unsigned char *_mbsupr_l(unsigned char *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP unsigned char *__cdecl _mbsupr_l(unsigned char *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP size_t __cdecl _mbclen(const unsigned char *_Str); _CRTIMP size_t __cdecl _mbclen_l(const unsigned char *_Str,_locale_t _Locale); _CRTIMP void __cdecl _mbccpy(unsigned char *_Dst,const unsigned char *_Src) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -149,22 +169,32 @@ extern "C" { #endif #endif +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _ismbcalnum(unsigned int _Ch); _CRTIMP int __cdecl _ismbcalnum_l(unsigned int _Ch,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbcalpha(unsigned int _Ch); _CRTIMP int __cdecl _ismbcalpha_l(unsigned int _Ch,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0C00 + _CRTIMP int __cdecl _ismbcblank(unsigned int _Ch); + _CRTIMP int __cdecl _ismbcblank_l(unsigned int _Ch,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbcdigit(unsigned int _Ch); _CRTIMP int __cdecl _ismbcdigit_l(unsigned int _Ch,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _ismbcgraph(unsigned int _Ch); _CRTIMP int __cdecl _ismbcgraph_l(unsigned int _Ch,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbclegal(unsigned int _Ch); _CRTIMP int __cdecl _ismbclegal_l(unsigned int _Ch,_locale_t _Locale); _CRTIMP int __cdecl _ismbclower(unsigned int _Ch); _CRTIMP int __cdecl _ismbclower_l(unsigned int _Ch,_locale_t _Locale); _CRTIMP int __cdecl _ismbcprint(unsigned int _Ch); _CRTIMP int __cdecl _ismbcprint_l(unsigned int _Ch,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0200 _CRTIMP int __cdecl _ismbcpunct(unsigned int _Ch); _CRTIMP int __cdecl _ismbcpunct_l(unsigned int _Ch,_locale_t _Locale); +#endif _CRTIMP int __cdecl _ismbcspace(unsigned int _Ch); _CRTIMP int __cdecl _ismbcspace_l(unsigned int _Ch,_locale_t _Locale); _CRTIMP int __cdecl _ismbcupper(unsigned int _Ch); diff --git a/lib/libc/include/any-windows-any/mediaobj.h b/lib/libc/include/any-windows-any/mediaobj.h index 41a69a04d25e5a7d9f32aa3ee9211bde5e98dab4..bdd893fd0ee734f10e0057389483386ee7aeb5c6 100644 --- a/lib/libc/include/any-windows-any/mediaobj.h +++ b/lib/libc/include/any-windows-any/mediaobj.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mediaobj.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/medparam.h b/lib/libc/include/any-windows-any/medparam.h index c5300fafbef18f85cc3477552553aabc5e1e0f1a..0cc1f0a24e58df05af37708d0c0b4cbb56eca720 100644 --- a/lib/libc/include/any-windows-any/medparam.h +++ b/lib/libc/include/any-windows-any/medparam.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/medparam.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/medparam.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/memory.h b/lib/libc/include/any-windows-any/memory.h index f48f416ded43e5c8dd271f7c96b92a0848f9a9a5..fc40c3117a5c8be79c69929dead191385d2d2cc1 100644 --- a/lib/libc/include/any-windows-any/memory.h +++ b/lib/libc/include/any-windows-any/memory.h @@ -6,46 +6,6 @@ #ifndef _INC_MEMORY #define _INC_MEMORY -#include +#include -#if defined(__LIBMSVCRT__) -/* When building mingw-w64, this should be blank. */ -#define _SECIMP -#else -#ifndef _SECIMP -#define _SECIMP __declspec(dllimport) -#endif /* _SECIMP */ -#endif /* defined(__LIBMSVCRT__) */ - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _CONST_RETURN -#define _CONST_RETURN -#endif - -#define _WConst_return _CONST_RETURN - -#ifndef _CRT_MEMORY_DEFINED -#define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - void * __cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _SECIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count); - void * __cdecl mempcpy (void *_Dst, const void *_Src, size_t _Size); - void * __cdecl memset(void *_Dst,int _Val,size_t _Size); - -#ifndef NO_OLDNAMES - void * __cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#endif -#endif - -#ifdef __cplusplus -} -#endif #endif diff --git a/lib/libc/include/any-windows-any/mfcaptureengine.h b/lib/libc/include/any-windows-any/mfcaptureengine.h index 20ab91f7b3582da2feff4125da6ad79dcf0b9c49..db6a600e41290bb86ee26ea026fa7f15a5a05f2e 100644 --- a/lib/libc/include/any-windows-any/mfcaptureengine.h +++ b/lib/libc/include/any-windows-any/mfcaptureengine.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfcaptureengine.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfcaptureengine.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfd3d12.h b/lib/libc/include/any-windows-any/mfd3d12.h index 28ce385e43950d7738561c20f72647c391b762a2..913f8a023a5c1d804ee26270e22a5a739c5e8177 100644 --- a/lib/libc/include/any-windows-any/mfd3d12.h +++ b/lib/libc/include/any-windows-any/mfd3d12.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfd3d12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfd3d12.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfidl.h b/lib/libc/include/any-windows-any/mfidl.h index 58005f0605f43f9f762b1e413c3ca34d90e4a6ef..8c91b5f899435d6f8215bffea135581275a6c243 100644 --- a/lib/libc/include/any-windows-any/mfidl.h +++ b/lib/libc/include/any-windows-any/mfidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfmediacapture.h b/lib/libc/include/any-windows-any/mfmediacapture.h index a65ee5a97d5a7aa08ba41dc46398563fdf5607d7..97a8fb0d059c33938bf0a4a14871e2b0a6e0352c 100644 --- a/lib/libc/include/any-windows-any/mfmediacapture.h +++ b/lib/libc/include/any-windows-any/mfmediacapture.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfmediacapture.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfmediacapture.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfmediaengine.h b/lib/libc/include/any-windows-any/mfmediaengine.h index ff72d4ee874777e85a41a00cab77ac53118369c8..ee534ee43d32f737158b6dcf514d46da1d169ce7 100644 --- a/lib/libc/include/any-windows-any/mfmediaengine.h +++ b/lib/libc/include/any-windows-any/mfmediaengine.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfmediaengine.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfmediaengine.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -66,6 +66,46 @@ interface IMFMediaEngineClassFactory; #endif /* __cplusplus */ #endif +#ifndef __IMFMediaSourceExtensionNotify_FWD_DEFINED__ +#define __IMFMediaSourceExtensionNotify_FWD_DEFINED__ +typedef interface IMFMediaSourceExtensionNotify IMFMediaSourceExtensionNotify; +#ifdef __cplusplus +interface IMFMediaSourceExtensionNotify; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFSourceBufferNotify_FWD_DEFINED__ +#define __IMFSourceBufferNotify_FWD_DEFINED__ +typedef interface IMFSourceBufferNotify IMFSourceBufferNotify; +#ifdef __cplusplus +interface IMFSourceBufferNotify; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFSourceBuffer_FWD_DEFINED__ +#define __IMFSourceBuffer_FWD_DEFINED__ +typedef interface IMFSourceBuffer IMFSourceBuffer; +#ifdef __cplusplus +interface IMFSourceBuffer; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFSourceBufferList_FWD_DEFINED__ +#define __IMFSourceBufferList_FWD_DEFINED__ +typedef interface IMFSourceBufferList IMFSourceBufferList; +#ifdef __cplusplus +interface IMFSourceBufferList; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMediaSourceExtension_FWD_DEFINED__ +#define __IMFMediaSourceExtension_FWD_DEFINED__ +typedef interface IMFMediaSourceExtension IMFMediaSourceExtension; +#ifdef __cplusplus +interface IMFMediaSourceExtension; +#endif /* __cplusplus */ +#endif + #ifndef __IMFMediaEngineNotify_FWD_DEFINED__ #define __IMFMediaEngineNotify_FWD_DEFINED__ typedef interface IMFMediaEngineNotify IMFMediaEngineNotify; @@ -90,6 +130,54 @@ interface IMFMediaEngineExtension; #endif /* __cplusplus */ #endif +#ifndef __IMFMediaKeySessionNotify_FWD_DEFINED__ +#define __IMFMediaKeySessionNotify_FWD_DEFINED__ +typedef interface IMFMediaKeySessionNotify IMFMediaKeySessionNotify; +#ifdef __cplusplus +interface IMFMediaKeySessionNotify; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMediaKeySession_FWD_DEFINED__ +#define __IMFMediaKeySession_FWD_DEFINED__ +typedef interface IMFMediaKeySession IMFMediaKeySession; +#ifdef __cplusplus +interface IMFMediaKeySession; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFCdmSuspendNotify_FWD_DEFINED__ +#define __IMFCdmSuspendNotify_FWD_DEFINED__ +typedef interface IMFCdmSuspendNotify IMFCdmSuspendNotify; +#ifdef __cplusplus +interface IMFCdmSuspendNotify; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMediaKeys_FWD_DEFINED__ +#define __IMFMediaKeys_FWD_DEFINED__ +typedef interface IMFMediaKeys IMFMediaKeys; +#ifdef __cplusplus +interface IMFMediaKeys; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMediaEngineClassFactoryEx_FWD_DEFINED__ +#define __IMFMediaEngineClassFactoryEx_FWD_DEFINED__ +typedef interface IMFMediaEngineClassFactoryEx IMFMediaEngineClassFactoryEx; +#ifdef __cplusplus +interface IMFMediaEngineClassFactoryEx; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMediaEngineClassFactory2_FWD_DEFINED__ +#define __IMFMediaEngineClassFactory2_FWD_DEFINED__ +typedef interface IMFMediaEngineClassFactory2 IMFMediaEngineClassFactory2; +#ifdef __cplusplus +interface IMFMediaEngineClassFactory2; +#endif /* __cplusplus */ +#endif + /* Headers for imported files */ #include @@ -2061,6 +2149,692 @@ static inline HRESULT IMFMediaEngineClassFactory_CreateError(IMFMediaEngineClass #endif /* __IMFMediaEngineClassFactory_INTERFACE_DEFINED__ */ +/***************************************************************************** + * IMFMediaSourceExtensionNotify interface + */ +#ifndef __IMFMediaSourceExtensionNotify_INTERFACE_DEFINED__ +#define __IMFMediaSourceExtensionNotify_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaSourceExtensionNotify, 0xa7901327, 0x05dd, 0x4469, 0xa7,0xb7, 0x0e,0x01,0x97,0x9e,0x36,0x1d); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("a7901327-05dd-4469-a7b7-0e01979e361d") +IMFMediaSourceExtensionNotify : public IUnknown +{ + virtual void STDMETHODCALLTYPE OnSourceOpen( + ) = 0; + + virtual void STDMETHODCALLTYPE OnSourceEnded( + ) = 0; + + virtual void STDMETHODCALLTYPE OnSourceClose( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaSourceExtensionNotify, 0xa7901327, 0x05dd, 0x4469, 0xa7,0xb7, 0x0e,0x01,0x97,0x9e,0x36,0x1d) +#endif +#else +typedef struct IMFMediaSourceExtensionNotifyVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaSourceExtensionNotify *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaSourceExtensionNotify *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaSourceExtensionNotify *This); + + /*** IMFMediaSourceExtensionNotify methods ***/ + void (STDMETHODCALLTYPE *OnSourceOpen)( + IMFMediaSourceExtensionNotify *This); + + void (STDMETHODCALLTYPE *OnSourceEnded)( + IMFMediaSourceExtensionNotify *This); + + void (STDMETHODCALLTYPE *OnSourceClose)( + IMFMediaSourceExtensionNotify *This); + + END_INTERFACE +} IMFMediaSourceExtensionNotifyVtbl; + +interface IMFMediaSourceExtensionNotify { + CONST_VTBL IMFMediaSourceExtensionNotifyVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaSourceExtensionNotify_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaSourceExtensionNotify_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaSourceExtensionNotify_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaSourceExtensionNotify methods ***/ +#define IMFMediaSourceExtensionNotify_OnSourceOpen(This) (This)->lpVtbl->OnSourceOpen(This) +#define IMFMediaSourceExtensionNotify_OnSourceEnded(This) (This)->lpVtbl->OnSourceEnded(This) +#define IMFMediaSourceExtensionNotify_OnSourceClose(This) (This)->lpVtbl->OnSourceClose(This) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaSourceExtensionNotify_QueryInterface(IMFMediaSourceExtensionNotify* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaSourceExtensionNotify_AddRef(IMFMediaSourceExtensionNotify* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaSourceExtensionNotify_Release(IMFMediaSourceExtensionNotify* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaSourceExtensionNotify methods ***/ +static inline void IMFMediaSourceExtensionNotify_OnSourceOpen(IMFMediaSourceExtensionNotify* This) { + This->lpVtbl->OnSourceOpen(This); +} +static inline void IMFMediaSourceExtensionNotify_OnSourceEnded(IMFMediaSourceExtensionNotify* This) { + This->lpVtbl->OnSourceEnded(This); +} +static inline void IMFMediaSourceExtensionNotify_OnSourceClose(IMFMediaSourceExtensionNotify* This) { + This->lpVtbl->OnSourceClose(This); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaSourceExtensionNotify_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFSourceBufferNotify interface + */ +#ifndef __IMFSourceBufferNotify_INTERFACE_DEFINED__ +#define __IMFSourceBufferNotify_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFSourceBufferNotify, 0x87e47623, 0x2ceb, 0x45d6, 0x9b,0x88, 0xd8,0x52,0x0c,0x4d,0xcb,0xbc); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("87e47623-2ceb-45d6-9b88-d8520c4dcbbc") +IMFSourceBufferNotify : public IUnknown +{ + virtual void STDMETHODCALLTYPE OnUpdateStart( + ) = 0; + + virtual void STDMETHODCALLTYPE OnAbort( + ) = 0; + + virtual void STDMETHODCALLTYPE OnError( + HRESULT hr) = 0; + + virtual void STDMETHODCALLTYPE OnUpdate( + ) = 0; + + virtual void STDMETHODCALLTYPE OnUpdateEnd( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFSourceBufferNotify, 0x87e47623, 0x2ceb, 0x45d6, 0x9b,0x88, 0xd8,0x52,0x0c,0x4d,0xcb,0xbc) +#endif +#else +typedef struct IMFSourceBufferNotifyVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFSourceBufferNotify *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFSourceBufferNotify *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFSourceBufferNotify *This); + + /*** IMFSourceBufferNotify methods ***/ + void (STDMETHODCALLTYPE *OnUpdateStart)( + IMFSourceBufferNotify *This); + + void (STDMETHODCALLTYPE *OnAbort)( + IMFSourceBufferNotify *This); + + void (STDMETHODCALLTYPE *OnError)( + IMFSourceBufferNotify *This, + HRESULT hr); + + void (STDMETHODCALLTYPE *OnUpdate)( + IMFSourceBufferNotify *This); + + void (STDMETHODCALLTYPE *OnUpdateEnd)( + IMFSourceBufferNotify *This); + + END_INTERFACE +} IMFSourceBufferNotifyVtbl; + +interface IMFSourceBufferNotify { + CONST_VTBL IMFSourceBufferNotifyVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFSourceBufferNotify_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFSourceBufferNotify_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFSourceBufferNotify_Release(This) (This)->lpVtbl->Release(This) +/*** IMFSourceBufferNotify methods ***/ +#define IMFSourceBufferNotify_OnUpdateStart(This) (This)->lpVtbl->OnUpdateStart(This) +#define IMFSourceBufferNotify_OnAbort(This) (This)->lpVtbl->OnAbort(This) +#define IMFSourceBufferNotify_OnError(This,hr) (This)->lpVtbl->OnError(This,hr) +#define IMFSourceBufferNotify_OnUpdate(This) (This)->lpVtbl->OnUpdate(This) +#define IMFSourceBufferNotify_OnUpdateEnd(This) (This)->lpVtbl->OnUpdateEnd(This) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFSourceBufferNotify_QueryInterface(IMFSourceBufferNotify* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFSourceBufferNotify_AddRef(IMFSourceBufferNotify* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFSourceBufferNotify_Release(IMFSourceBufferNotify* This) { + return This->lpVtbl->Release(This); +} +/*** IMFSourceBufferNotify methods ***/ +static inline void IMFSourceBufferNotify_OnUpdateStart(IMFSourceBufferNotify* This) { + This->lpVtbl->OnUpdateStart(This); +} +static inline void IMFSourceBufferNotify_OnAbort(IMFSourceBufferNotify* This) { + This->lpVtbl->OnAbort(This); +} +static inline void IMFSourceBufferNotify_OnError(IMFSourceBufferNotify* This,HRESULT hr) { + This->lpVtbl->OnError(This,hr); +} +static inline void IMFSourceBufferNotify_OnUpdate(IMFSourceBufferNotify* This) { + This->lpVtbl->OnUpdate(This); +} +static inline void IMFSourceBufferNotify_OnUpdateEnd(IMFSourceBufferNotify* This) { + This->lpVtbl->OnUpdateEnd(This); +} +#endif +#endif + +#endif + + +#endif /* __IMFSourceBufferNotify_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFSourceBuffer interface + */ +#ifndef __IMFSourceBuffer_INTERFACE_DEFINED__ +#define __IMFSourceBuffer_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFSourceBuffer, 0xe2cd3a4b, 0xaf25, 0x4d3d, 0x91,0x10, 0xda,0x0e,0x6f,0x8e,0xe8,0x77); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("e2cd3a4b-af25-4d3d-9110-da0e6f8ee877") +IMFSourceBuffer : public IUnknown +{ + virtual WINBOOL STDMETHODCALLTYPE GetUpdating( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetBuffered( + IMFMediaTimeRange **buffered) = 0; + + virtual double STDMETHODCALLTYPE GetTimeStampOffset( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetTimeStampOffset( + double offset) = 0; + + virtual double STDMETHODCALLTYPE GetAppendWindowStart( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetAppendWindowStart( + double time) = 0; + + virtual double STDMETHODCALLTYPE GetAppendWindowEnd( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetAppendWindowEnd( + double time) = 0; + + virtual HRESULT STDMETHODCALLTYPE Append( + const BYTE *data, + DWORD len) = 0; + + virtual HRESULT STDMETHODCALLTYPE AppendByteStream( + IMFByteStream *stream, + DWORDLONG *max_len) = 0; + + virtual HRESULT STDMETHODCALLTYPE Abort( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Remove( + double start, + double end) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFSourceBuffer, 0xe2cd3a4b, 0xaf25, 0x4d3d, 0x91,0x10, 0xda,0x0e,0x6f,0x8e,0xe8,0x77) +#endif +#else +typedef struct IMFSourceBufferVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFSourceBuffer *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFSourceBuffer *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFSourceBuffer *This); + + /*** IMFSourceBuffer methods ***/ + WINBOOL (STDMETHODCALLTYPE *GetUpdating)( + IMFSourceBuffer *This); + + HRESULT (STDMETHODCALLTYPE *GetBuffered)( + IMFSourceBuffer *This, + IMFMediaTimeRange **buffered); + + double (STDMETHODCALLTYPE *GetTimeStampOffset)( + IMFSourceBuffer *This); + + HRESULT (STDMETHODCALLTYPE *SetTimeStampOffset)( + IMFSourceBuffer *This, + double offset); + + double (STDMETHODCALLTYPE *GetAppendWindowStart)( + IMFSourceBuffer *This); + + HRESULT (STDMETHODCALLTYPE *SetAppendWindowStart)( + IMFSourceBuffer *This, + double time); + + double (STDMETHODCALLTYPE *GetAppendWindowEnd)( + IMFSourceBuffer *This); + + HRESULT (STDMETHODCALLTYPE *SetAppendWindowEnd)( + IMFSourceBuffer *This, + double time); + + HRESULT (STDMETHODCALLTYPE *Append)( + IMFSourceBuffer *This, + const BYTE *data, + DWORD len); + + HRESULT (STDMETHODCALLTYPE *AppendByteStream)( + IMFSourceBuffer *This, + IMFByteStream *stream, + DWORDLONG *max_len); + + HRESULT (STDMETHODCALLTYPE *Abort)( + IMFSourceBuffer *This); + + HRESULT (STDMETHODCALLTYPE *Remove)( + IMFSourceBuffer *This, + double start, + double end); + + END_INTERFACE +} IMFSourceBufferVtbl; + +interface IMFSourceBuffer { + CONST_VTBL IMFSourceBufferVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFSourceBuffer_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFSourceBuffer_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFSourceBuffer_Release(This) (This)->lpVtbl->Release(This) +/*** IMFSourceBuffer methods ***/ +#define IMFSourceBuffer_GetUpdating(This) (This)->lpVtbl->GetUpdating(This) +#define IMFSourceBuffer_GetBuffered(This,buffered) (This)->lpVtbl->GetBuffered(This,buffered) +#define IMFSourceBuffer_GetTimeStampOffset(This) (This)->lpVtbl->GetTimeStampOffset(This) +#define IMFSourceBuffer_SetTimeStampOffset(This,offset) (This)->lpVtbl->SetTimeStampOffset(This,offset) +#define IMFSourceBuffer_GetAppendWindowStart(This) (This)->lpVtbl->GetAppendWindowStart(This) +#define IMFSourceBuffer_SetAppendWindowStart(This,time) (This)->lpVtbl->SetAppendWindowStart(This,time) +#define IMFSourceBuffer_GetAppendWindowEnd(This) (This)->lpVtbl->GetAppendWindowEnd(This) +#define IMFSourceBuffer_SetAppendWindowEnd(This,time) (This)->lpVtbl->SetAppendWindowEnd(This,time) +#define IMFSourceBuffer_Append(This,data,len) (This)->lpVtbl->Append(This,data,len) +#define IMFSourceBuffer_AppendByteStream(This,stream,max_len) (This)->lpVtbl->AppendByteStream(This,stream,max_len) +#define IMFSourceBuffer_Abort(This) (This)->lpVtbl->Abort(This) +#define IMFSourceBuffer_Remove(This,start,end) (This)->lpVtbl->Remove(This,start,end) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFSourceBuffer_QueryInterface(IMFSourceBuffer* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFSourceBuffer_AddRef(IMFSourceBuffer* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFSourceBuffer_Release(IMFSourceBuffer* This) { + return This->lpVtbl->Release(This); +} +/*** IMFSourceBuffer methods ***/ +static inline WINBOOL IMFSourceBuffer_GetUpdating(IMFSourceBuffer* This) { + return This->lpVtbl->GetUpdating(This); +} +static inline HRESULT IMFSourceBuffer_GetBuffered(IMFSourceBuffer* This,IMFMediaTimeRange **buffered) { + return This->lpVtbl->GetBuffered(This,buffered); +} +static inline double IMFSourceBuffer_GetTimeStampOffset(IMFSourceBuffer* This) { + return This->lpVtbl->GetTimeStampOffset(This); +} +static inline HRESULT IMFSourceBuffer_SetTimeStampOffset(IMFSourceBuffer* This,double offset) { + return This->lpVtbl->SetTimeStampOffset(This,offset); +} +static inline double IMFSourceBuffer_GetAppendWindowStart(IMFSourceBuffer* This) { + return This->lpVtbl->GetAppendWindowStart(This); +} +static inline HRESULT IMFSourceBuffer_SetAppendWindowStart(IMFSourceBuffer* This,double time) { + return This->lpVtbl->SetAppendWindowStart(This,time); +} +static inline double IMFSourceBuffer_GetAppendWindowEnd(IMFSourceBuffer* This) { + return This->lpVtbl->GetAppendWindowEnd(This); +} +static inline HRESULT IMFSourceBuffer_SetAppendWindowEnd(IMFSourceBuffer* This,double time) { + return This->lpVtbl->SetAppendWindowEnd(This,time); +} +static inline HRESULT IMFSourceBuffer_Append(IMFSourceBuffer* This,const BYTE *data,DWORD len) { + return This->lpVtbl->Append(This,data,len); +} +static inline HRESULT IMFSourceBuffer_AppendByteStream(IMFSourceBuffer* This,IMFByteStream *stream,DWORDLONG *max_len) { + return This->lpVtbl->AppendByteStream(This,stream,max_len); +} +static inline HRESULT IMFSourceBuffer_Abort(IMFSourceBuffer* This) { + return This->lpVtbl->Abort(This); +} +static inline HRESULT IMFSourceBuffer_Remove(IMFSourceBuffer* This,double start,double end) { + return This->lpVtbl->Remove(This,start,end); +} +#endif +#endif + +#endif + + +#endif /* __IMFSourceBuffer_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFSourceBufferList interface + */ +#ifndef __IMFSourceBufferList_INTERFACE_DEFINED__ +#define __IMFSourceBufferList_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFSourceBufferList, 0x249981f8, 0x8325, 0x41f3, 0xb8,0x0c, 0x3b,0x9e,0x3a,0xad,0x0c,0xbe); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("249981f8-8325-41f3-b80c-3b9e3aad0cbe") +IMFSourceBufferList : public IUnknown +{ + virtual DWORD STDMETHODCALLTYPE GetLength( + ) = 0; + + virtual IMFSourceBuffer * STDMETHODCALLTYPE GetSourceBuffer( + DWORD index) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFSourceBufferList, 0x249981f8, 0x8325, 0x41f3, 0xb8,0x0c, 0x3b,0x9e,0x3a,0xad,0x0c,0xbe) +#endif +#else +typedef struct IMFSourceBufferListVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFSourceBufferList *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFSourceBufferList *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFSourceBufferList *This); + + /*** IMFSourceBufferList methods ***/ + DWORD (STDMETHODCALLTYPE *GetLength)( + IMFSourceBufferList *This); + + IMFSourceBuffer * (STDMETHODCALLTYPE *GetSourceBuffer)( + IMFSourceBufferList *This, + DWORD index); + + END_INTERFACE +} IMFSourceBufferListVtbl; + +interface IMFSourceBufferList { + CONST_VTBL IMFSourceBufferListVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFSourceBufferList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFSourceBufferList_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFSourceBufferList_Release(This) (This)->lpVtbl->Release(This) +/*** IMFSourceBufferList methods ***/ +#define IMFSourceBufferList_GetLength(This) (This)->lpVtbl->GetLength(This) +#define IMFSourceBufferList_GetSourceBuffer(This,index) (This)->lpVtbl->GetSourceBuffer(This,index) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFSourceBufferList_QueryInterface(IMFSourceBufferList* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFSourceBufferList_AddRef(IMFSourceBufferList* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFSourceBufferList_Release(IMFSourceBufferList* This) { + return This->lpVtbl->Release(This); +} +/*** IMFSourceBufferList methods ***/ +static inline DWORD IMFSourceBufferList_GetLength(IMFSourceBufferList* This) { + return This->lpVtbl->GetLength(This); +} +static inline IMFSourceBuffer * IMFSourceBufferList_GetSourceBuffer(IMFSourceBufferList* This,DWORD index) { + return This->lpVtbl->GetSourceBuffer(This,index); +} +#endif +#endif + +#endif + + +#endif /* __IMFSourceBufferList_INTERFACE_DEFINED__ */ + +typedef enum MF_MSE_READY { + MF_MSE_READY_CLOSED = 1, + MF_MSE_READY_OPEN = 2, + MF_MSE_READY_ENDED = 3 +} MF_MSE_READY; +typedef enum MF_MSE_ERROR { + MF_MSE_ERROR_NOERROR = 0, + MF_MSE_ERROR_NETWORK = 1, + MF_MSE_ERROR_DECODE = 2, + MF_MSE_ERROR_UNKNOWN_ERROR = 3 +} MF_MSE_ERROR; +/***************************************************************************** + * IMFMediaSourceExtension interface + */ +#ifndef __IMFMediaSourceExtension_INTERFACE_DEFINED__ +#define __IMFMediaSourceExtension_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaSourceExtension, 0xe467b94e, 0xa713, 0x4562, 0xa8,0x02, 0x81,0x6a,0x42,0xe9,0x00,0x8a); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("e467b94e-a713-4562-a802-816a42e9008a") +IMFMediaSourceExtension : public IUnknown +{ + virtual IMFSourceBufferList * STDMETHODCALLTYPE GetSourceBuffers( + ) = 0; + + virtual IMFSourceBufferList * STDMETHODCALLTYPE GetActiveSourceBuffers( + ) = 0; + + virtual MF_MSE_READY STDMETHODCALLTYPE GetReadyState( + ) = 0; + + virtual double STDMETHODCALLTYPE GetDuration( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetDuration( + double duration) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddSourceBuffer( + BSTR type, + IMFSourceBufferNotify *notify, + IMFSourceBuffer **source_buffer) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveSourceBuffer( + IMFSourceBuffer *source_buffer) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetEndOfStream( + MF_MSE_ERROR error) = 0; + + virtual WINBOOL STDMETHODCALLTYPE IsTypeSupported( + BSTR type) = 0; + + virtual IMFSourceBuffer * STDMETHODCALLTYPE GetSourceBuffer( + DWORD stream_index) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaSourceExtension, 0xe467b94e, 0xa713, 0x4562, 0xa8,0x02, 0x81,0x6a,0x42,0xe9,0x00,0x8a) +#endif +#else +typedef struct IMFMediaSourceExtensionVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaSourceExtension *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaSourceExtension *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaSourceExtension *This); + + /*** IMFMediaSourceExtension methods ***/ + IMFSourceBufferList * (STDMETHODCALLTYPE *GetSourceBuffers)( + IMFMediaSourceExtension *This); + + IMFSourceBufferList * (STDMETHODCALLTYPE *GetActiveSourceBuffers)( + IMFMediaSourceExtension *This); + + MF_MSE_READY (STDMETHODCALLTYPE *GetReadyState)( + IMFMediaSourceExtension *This); + + double (STDMETHODCALLTYPE *GetDuration)( + IMFMediaSourceExtension *This); + + HRESULT (STDMETHODCALLTYPE *SetDuration)( + IMFMediaSourceExtension *This, + double duration); + + HRESULT (STDMETHODCALLTYPE *AddSourceBuffer)( + IMFMediaSourceExtension *This, + BSTR type, + IMFSourceBufferNotify *notify, + IMFSourceBuffer **source_buffer); + + HRESULT (STDMETHODCALLTYPE *RemoveSourceBuffer)( + IMFMediaSourceExtension *This, + IMFSourceBuffer *source_buffer); + + HRESULT (STDMETHODCALLTYPE *SetEndOfStream)( + IMFMediaSourceExtension *This, + MF_MSE_ERROR error); + + WINBOOL (STDMETHODCALLTYPE *IsTypeSupported)( + IMFMediaSourceExtension *This, + BSTR type); + + IMFSourceBuffer * (STDMETHODCALLTYPE *GetSourceBuffer)( + IMFMediaSourceExtension *This, + DWORD stream_index); + + END_INTERFACE +} IMFMediaSourceExtensionVtbl; + +interface IMFMediaSourceExtension { + CONST_VTBL IMFMediaSourceExtensionVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaSourceExtension_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaSourceExtension_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaSourceExtension_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaSourceExtension methods ***/ +#define IMFMediaSourceExtension_GetSourceBuffers(This) (This)->lpVtbl->GetSourceBuffers(This) +#define IMFMediaSourceExtension_GetActiveSourceBuffers(This) (This)->lpVtbl->GetActiveSourceBuffers(This) +#define IMFMediaSourceExtension_GetReadyState(This) (This)->lpVtbl->GetReadyState(This) +#define IMFMediaSourceExtension_GetDuration(This) (This)->lpVtbl->GetDuration(This) +#define IMFMediaSourceExtension_SetDuration(This,duration) (This)->lpVtbl->SetDuration(This,duration) +#define IMFMediaSourceExtension_AddSourceBuffer(This,type,notify,source_buffer) (This)->lpVtbl->AddSourceBuffer(This,type,notify,source_buffer) +#define IMFMediaSourceExtension_RemoveSourceBuffer(This,source_buffer) (This)->lpVtbl->RemoveSourceBuffer(This,source_buffer) +#define IMFMediaSourceExtension_SetEndOfStream(This,error) (This)->lpVtbl->SetEndOfStream(This,error) +#define IMFMediaSourceExtension_IsTypeSupported(This,type) (This)->lpVtbl->IsTypeSupported(This,type) +#define IMFMediaSourceExtension_GetSourceBuffer(This,stream_index) (This)->lpVtbl->GetSourceBuffer(This,stream_index) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaSourceExtension_QueryInterface(IMFMediaSourceExtension* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaSourceExtension_AddRef(IMFMediaSourceExtension* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaSourceExtension_Release(IMFMediaSourceExtension* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaSourceExtension methods ***/ +static inline IMFSourceBufferList * IMFMediaSourceExtension_GetSourceBuffers(IMFMediaSourceExtension* This) { + return This->lpVtbl->GetSourceBuffers(This); +} +static inline IMFSourceBufferList * IMFMediaSourceExtension_GetActiveSourceBuffers(IMFMediaSourceExtension* This) { + return This->lpVtbl->GetActiveSourceBuffers(This); +} +static inline MF_MSE_READY IMFMediaSourceExtension_GetReadyState(IMFMediaSourceExtension* This) { + return This->lpVtbl->GetReadyState(This); +} +static inline double IMFMediaSourceExtension_GetDuration(IMFMediaSourceExtension* This) { + return This->lpVtbl->GetDuration(This); +} +static inline HRESULT IMFMediaSourceExtension_SetDuration(IMFMediaSourceExtension* This,double duration) { + return This->lpVtbl->SetDuration(This,duration); +} +static inline HRESULT IMFMediaSourceExtension_AddSourceBuffer(IMFMediaSourceExtension* This,BSTR type,IMFSourceBufferNotify *notify,IMFSourceBuffer **source_buffer) { + return This->lpVtbl->AddSourceBuffer(This,type,notify,source_buffer); +} +static inline HRESULT IMFMediaSourceExtension_RemoveSourceBuffer(IMFMediaSourceExtension* This,IMFSourceBuffer *source_buffer) { + return This->lpVtbl->RemoveSourceBuffer(This,source_buffer); +} +static inline HRESULT IMFMediaSourceExtension_SetEndOfStream(IMFMediaSourceExtension* This,MF_MSE_ERROR error) { + return This->lpVtbl->SetEndOfStream(This,error); +} +static inline WINBOOL IMFMediaSourceExtension_IsTypeSupported(IMFMediaSourceExtension* This,BSTR type) { + return This->lpVtbl->IsTypeSupported(This,type); +} +static inline IMFSourceBuffer * IMFMediaSourceExtension_GetSourceBuffer(IMFMediaSourceExtension* This,DWORD stream_index) { + return This->lpVtbl->GetSourceBuffer(This,stream_index); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaSourceExtension_INTERFACE_DEFINED__ */ + /***************************************************************************** * IMFMediaEngineNotify interface */ @@ -2356,6 +3130,664 @@ static inline HRESULT IMFMediaEngineExtension_EndCreateObject(IMFMediaEngineExte #endif /* __IMFMediaEngineExtension_INTERFACE_DEFINED__ */ +/***************************************************************************** + * IMFMediaKeySessionNotify interface + */ +#ifndef __IMFMediaKeySessionNotify_INTERFACE_DEFINED__ +#define __IMFMediaKeySessionNotify_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaKeySessionNotify, 0x6a0083f9, 0x8947, 0x4c1d, 0x9c,0xe0, 0xcd,0xee,0x22,0xb2,0x31,0x35); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("6a0083f9-8947-4c1d-9ce0-cdee22b23135") +IMFMediaKeySessionNotify : public IUnknown +{ + virtual void STDMETHODCALLTYPE KeyMessage( + BSTR destination_url, + const BYTE *message, + DWORD message_len) = 0; + + virtual void STDMETHODCALLTYPE KeyAdded( + ) = 0; + + virtual void STDMETHODCALLTYPE KeyError( + USHORT code, + DWORD system_code) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaKeySessionNotify, 0x6a0083f9, 0x8947, 0x4c1d, 0x9c,0xe0, 0xcd,0xee,0x22,0xb2,0x31,0x35) +#endif +#else +typedef struct IMFMediaKeySessionNotifyVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaKeySessionNotify *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaKeySessionNotify *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaKeySessionNotify *This); + + /*** IMFMediaKeySessionNotify methods ***/ + void (STDMETHODCALLTYPE *KeyMessage)( + IMFMediaKeySessionNotify *This, + BSTR destination_url, + const BYTE *message, + DWORD message_len); + + void (STDMETHODCALLTYPE *KeyAdded)( + IMFMediaKeySessionNotify *This); + + void (STDMETHODCALLTYPE *KeyError)( + IMFMediaKeySessionNotify *This, + USHORT code, + DWORD system_code); + + END_INTERFACE +} IMFMediaKeySessionNotifyVtbl; + +interface IMFMediaKeySessionNotify { + CONST_VTBL IMFMediaKeySessionNotifyVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaKeySessionNotify_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaKeySessionNotify_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaKeySessionNotify_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaKeySessionNotify methods ***/ +#define IMFMediaKeySessionNotify_KeyMessage(This,destination_url,message,message_len) (This)->lpVtbl->KeyMessage(This,destination_url,message,message_len) +#define IMFMediaKeySessionNotify_KeyAdded(This) (This)->lpVtbl->KeyAdded(This) +#define IMFMediaKeySessionNotify_KeyError(This,code,system_code) (This)->lpVtbl->KeyError(This,code,system_code) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaKeySessionNotify_QueryInterface(IMFMediaKeySessionNotify* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaKeySessionNotify_AddRef(IMFMediaKeySessionNotify* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaKeySessionNotify_Release(IMFMediaKeySessionNotify* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaKeySessionNotify methods ***/ +static inline void IMFMediaKeySessionNotify_KeyMessage(IMFMediaKeySessionNotify* This,BSTR destination_url,const BYTE *message,DWORD message_len) { + This->lpVtbl->KeyMessage(This,destination_url,message,message_len); +} +static inline void IMFMediaKeySessionNotify_KeyAdded(IMFMediaKeySessionNotify* This) { + This->lpVtbl->KeyAdded(This); +} +static inline void IMFMediaKeySessionNotify_KeyError(IMFMediaKeySessionNotify* This,USHORT code,DWORD system_code) { + This->lpVtbl->KeyError(This,code,system_code); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaKeySessionNotify_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFMediaKeySession interface + */ +#ifndef __IMFMediaKeySession_INTERFACE_DEFINED__ +#define __IMFMediaKeySession_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaKeySession, 0x24fa67d5, 0xd1d0, 0x4dc5, 0x99,0x5c, 0xc0,0xef,0xdc,0x19,0x1f,0xb5); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("24fa67d5-d1d0-4dc5-995c-c0efdc191fb5") +IMFMediaKeySession : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetError( + USHORT *code, + DWORD *system_code) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_KeySystem( + BSTR *key_system) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_SessionId( + BSTR *session_id) = 0; + + virtual HRESULT STDMETHODCALLTYPE Update( + const BYTE *key, + DWORD key_len) = 0; + + virtual HRESULT STDMETHODCALLTYPE Close( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaKeySession, 0x24fa67d5, 0xd1d0, 0x4dc5, 0x99,0x5c, 0xc0,0xef,0xdc,0x19,0x1f,0xb5) +#endif +#else +typedef struct IMFMediaKeySessionVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaKeySession *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaKeySession *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaKeySession *This); + + /*** IMFMediaKeySession methods ***/ + HRESULT (STDMETHODCALLTYPE *GetError)( + IMFMediaKeySession *This, + USHORT *code, + DWORD *system_code); + + HRESULT (STDMETHODCALLTYPE *get_KeySystem)( + IMFMediaKeySession *This, + BSTR *key_system); + + HRESULT (STDMETHODCALLTYPE *get_SessionId)( + IMFMediaKeySession *This, + BSTR *session_id); + + HRESULT (STDMETHODCALLTYPE *Update)( + IMFMediaKeySession *This, + const BYTE *key, + DWORD key_len); + + HRESULT (STDMETHODCALLTYPE *Close)( + IMFMediaKeySession *This); + + END_INTERFACE +} IMFMediaKeySessionVtbl; + +interface IMFMediaKeySession { + CONST_VTBL IMFMediaKeySessionVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaKeySession_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaKeySession_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaKeySession_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaKeySession methods ***/ +#define IMFMediaKeySession_GetError(This,code,system_code) (This)->lpVtbl->GetError(This,code,system_code) +#define IMFMediaKeySession_get_KeySystem(This,key_system) (This)->lpVtbl->get_KeySystem(This,key_system) +#define IMFMediaKeySession_get_SessionId(This,session_id) (This)->lpVtbl->get_SessionId(This,session_id) +#define IMFMediaKeySession_Update(This,key,key_len) (This)->lpVtbl->Update(This,key,key_len) +#define IMFMediaKeySession_Close(This) (This)->lpVtbl->Close(This) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaKeySession_QueryInterface(IMFMediaKeySession* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaKeySession_AddRef(IMFMediaKeySession* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaKeySession_Release(IMFMediaKeySession* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaKeySession methods ***/ +static inline HRESULT IMFMediaKeySession_GetError(IMFMediaKeySession* This,USHORT *code,DWORD *system_code) { + return This->lpVtbl->GetError(This,code,system_code); +} +static inline HRESULT IMFMediaKeySession_get_KeySystem(IMFMediaKeySession* This,BSTR *key_system) { + return This->lpVtbl->get_KeySystem(This,key_system); +} +static inline HRESULT IMFMediaKeySession_get_SessionId(IMFMediaKeySession* This,BSTR *session_id) { + return This->lpVtbl->get_SessionId(This,session_id); +} +static inline HRESULT IMFMediaKeySession_Update(IMFMediaKeySession* This,const BYTE *key,DWORD key_len) { + return This->lpVtbl->Update(This,key,key_len); +} +static inline HRESULT IMFMediaKeySession_Close(IMFMediaKeySession* This) { + return This->lpVtbl->Close(This); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaKeySession_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFCdmSuspendNotify interface + */ +#ifndef __IMFCdmSuspendNotify_INTERFACE_DEFINED__ +#define __IMFCdmSuspendNotify_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFCdmSuspendNotify, 0x7a5645d2, 0x43bd, 0x47fd, 0x87,0xb7, 0xdc,0xd2,0x4c,0xc7,0xd6,0x92); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("7a5645d2-43bd-47fd-87b7-dcd24cc7d692") +IMFCdmSuspendNotify : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE Begin( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE End( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFCdmSuspendNotify, 0x7a5645d2, 0x43bd, 0x47fd, 0x87,0xb7, 0xdc,0xd2,0x4c,0xc7,0xd6,0x92) +#endif +#else +typedef struct IMFCdmSuspendNotifyVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFCdmSuspendNotify *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFCdmSuspendNotify *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFCdmSuspendNotify *This); + + /*** IMFCdmSuspendNotify methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin)( + IMFCdmSuspendNotify *This); + + HRESULT (STDMETHODCALLTYPE *End)( + IMFCdmSuspendNotify *This); + + END_INTERFACE +} IMFCdmSuspendNotifyVtbl; + +interface IMFCdmSuspendNotify { + CONST_VTBL IMFCdmSuspendNotifyVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFCdmSuspendNotify_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFCdmSuspendNotify_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFCdmSuspendNotify_Release(This) (This)->lpVtbl->Release(This) +/*** IMFCdmSuspendNotify methods ***/ +#define IMFCdmSuspendNotify_Begin(This) (This)->lpVtbl->Begin(This) +#define IMFCdmSuspendNotify_End(This) (This)->lpVtbl->End(This) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFCdmSuspendNotify_QueryInterface(IMFCdmSuspendNotify* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFCdmSuspendNotify_AddRef(IMFCdmSuspendNotify* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFCdmSuspendNotify_Release(IMFCdmSuspendNotify* This) { + return This->lpVtbl->Release(This); +} +/*** IMFCdmSuspendNotify methods ***/ +static inline HRESULT IMFCdmSuspendNotify_Begin(IMFCdmSuspendNotify* This) { + return This->lpVtbl->Begin(This); +} +static inline HRESULT IMFCdmSuspendNotify_End(IMFCdmSuspendNotify* This) { + return This->lpVtbl->End(This); +} +#endif +#endif + +#endif + + +#endif /* __IMFCdmSuspendNotify_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFMediaKeys interface + */ +#ifndef __IMFMediaKeys_INTERFACE_DEFINED__ +#define __IMFMediaKeys_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaKeys, 0x5cb31c05, 0x61ff, 0x418f, 0xaf,0xda, 0xca,0xaf,0x41,0x42,0x1a,0x38); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("5cb31c05-61ff-418f-afda-caaf41421a38") +IMFMediaKeys : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE CreateSession( + BSTR mime_type, + const BYTE *init_data, + DWORD init_data_len, + const BYTE *custom_data, + DWORD custom_data_len, + IMFMediaKeySessionNotify *notify, + IMFMediaKeySession **session) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_KeySystem( + BSTR *key_system) = 0; + + virtual HRESULT STDMETHODCALLTYPE Shutdown( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSuspendNotify( + IMFCdmSuspendNotify **notify) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaKeys, 0x5cb31c05, 0x61ff, 0x418f, 0xaf,0xda, 0xca,0xaf,0x41,0x42,0x1a,0x38) +#endif +#else +typedef struct IMFMediaKeysVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaKeys *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaKeys *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaKeys *This); + + /*** IMFMediaKeys methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateSession)( + IMFMediaKeys *This, + BSTR mime_type, + const BYTE *init_data, + DWORD init_data_len, + const BYTE *custom_data, + DWORD custom_data_len, + IMFMediaKeySessionNotify *notify, + IMFMediaKeySession **session); + + HRESULT (STDMETHODCALLTYPE *get_KeySystem)( + IMFMediaKeys *This, + BSTR *key_system); + + HRESULT (STDMETHODCALLTYPE *Shutdown)( + IMFMediaKeys *This); + + HRESULT (STDMETHODCALLTYPE *GetSuspendNotify)( + IMFMediaKeys *This, + IMFCdmSuspendNotify **notify); + + END_INTERFACE +} IMFMediaKeysVtbl; + +interface IMFMediaKeys { + CONST_VTBL IMFMediaKeysVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaKeys_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaKeys_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaKeys_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaKeys methods ***/ +#define IMFMediaKeys_CreateSession(This,mime_type,init_data,init_data_len,custom_data,custom_data_len,notify,session) (This)->lpVtbl->CreateSession(This,mime_type,init_data,init_data_len,custom_data,custom_data_len,notify,session) +#define IMFMediaKeys_get_KeySystem(This,key_system) (This)->lpVtbl->get_KeySystem(This,key_system) +#define IMFMediaKeys_Shutdown(This) (This)->lpVtbl->Shutdown(This) +#define IMFMediaKeys_GetSuspendNotify(This,notify) (This)->lpVtbl->GetSuspendNotify(This,notify) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaKeys_QueryInterface(IMFMediaKeys* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaKeys_AddRef(IMFMediaKeys* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaKeys_Release(IMFMediaKeys* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaKeys methods ***/ +static inline HRESULT IMFMediaKeys_CreateSession(IMFMediaKeys* This,BSTR mime_type,const BYTE *init_data,DWORD init_data_len,const BYTE *custom_data,DWORD custom_data_len,IMFMediaKeySessionNotify *notify,IMFMediaKeySession **session) { + return This->lpVtbl->CreateSession(This,mime_type,init_data,init_data_len,custom_data,custom_data_len,notify,session); +} +static inline HRESULT IMFMediaKeys_get_KeySystem(IMFMediaKeys* This,BSTR *key_system) { + return This->lpVtbl->get_KeySystem(This,key_system); +} +static inline HRESULT IMFMediaKeys_Shutdown(IMFMediaKeys* This) { + return This->lpVtbl->Shutdown(This); +} +static inline HRESULT IMFMediaKeys_GetSuspendNotify(IMFMediaKeys* This,IMFCdmSuspendNotify **notify) { + return This->lpVtbl->GetSuspendNotify(This,notify); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaKeys_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFMediaEngineClassFactoryEx interface + */ +#ifndef __IMFMediaEngineClassFactoryEx_INTERFACE_DEFINED__ +#define __IMFMediaEngineClassFactoryEx_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaEngineClassFactoryEx, 0xc56156c6, 0xea5b, 0x48a5, 0x9d,0xf8, 0xfb,0xe0,0x35,0xd0,0x92,0x9e); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("c56156c6-ea5b-48a5-9df8-fbe035d0929e") +IMFMediaEngineClassFactoryEx : public IMFMediaEngineClassFactory +{ + virtual HRESULT STDMETHODCALLTYPE CreateMediaSourceExtension( + DWORD flags, + IMFAttributes *attr, + IMFMediaSourceExtension **mse) = 0; + + virtual HRESULT STDMETHODCALLTYPE CreateMediaKeys( + BSTR key_system, + BSTR cdm_store_path, + IMFMediaKeys **keys) = 0; + + virtual HRESULT STDMETHODCALLTYPE IsTypeSupported( + BSTR type, + BSTR key_system, + WINBOOL *is_supported) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaEngineClassFactoryEx, 0xc56156c6, 0xea5b, 0x48a5, 0x9d,0xf8, 0xfb,0xe0,0x35,0xd0,0x92,0x9e) +#endif +#else +typedef struct IMFMediaEngineClassFactoryExVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaEngineClassFactoryEx *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaEngineClassFactoryEx *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaEngineClassFactoryEx *This); + + /*** IMFMediaEngineClassFactory methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateInstance)( + IMFMediaEngineClassFactoryEx *This, + DWORD flags, + IMFAttributes *attributes, + IMFMediaEngine **engine); + + HRESULT (STDMETHODCALLTYPE *CreateTimeRange)( + IMFMediaEngineClassFactoryEx *This, + IMFMediaTimeRange **range); + + HRESULT (STDMETHODCALLTYPE *CreateError)( + IMFMediaEngineClassFactoryEx *This, + IMFMediaError **error); + + /*** IMFMediaEngineClassFactoryEx methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateMediaSourceExtension)( + IMFMediaEngineClassFactoryEx *This, + DWORD flags, + IMFAttributes *attr, + IMFMediaSourceExtension **mse); + + HRESULT (STDMETHODCALLTYPE *CreateMediaKeys)( + IMFMediaEngineClassFactoryEx *This, + BSTR key_system, + BSTR cdm_store_path, + IMFMediaKeys **keys); + + HRESULT (STDMETHODCALLTYPE *IsTypeSupported)( + IMFMediaEngineClassFactoryEx *This, + BSTR type, + BSTR key_system, + WINBOOL *is_supported); + + END_INTERFACE +} IMFMediaEngineClassFactoryExVtbl; + +interface IMFMediaEngineClassFactoryEx { + CONST_VTBL IMFMediaEngineClassFactoryExVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaEngineClassFactoryEx_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaEngineClassFactoryEx_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaEngineClassFactoryEx_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaEngineClassFactory methods ***/ +#define IMFMediaEngineClassFactoryEx_CreateInstance(This,flags,attributes,engine) (This)->lpVtbl->CreateInstance(This,flags,attributes,engine) +#define IMFMediaEngineClassFactoryEx_CreateTimeRange(This,range) (This)->lpVtbl->CreateTimeRange(This,range) +#define IMFMediaEngineClassFactoryEx_CreateError(This,error) (This)->lpVtbl->CreateError(This,error) +/*** IMFMediaEngineClassFactoryEx methods ***/ +#define IMFMediaEngineClassFactoryEx_CreateMediaSourceExtension(This,flags,attr,mse) (This)->lpVtbl->CreateMediaSourceExtension(This,flags,attr,mse) +#define IMFMediaEngineClassFactoryEx_CreateMediaKeys(This,key_system,cdm_store_path,keys) (This)->lpVtbl->CreateMediaKeys(This,key_system,cdm_store_path,keys) +#define IMFMediaEngineClassFactoryEx_IsTypeSupported(This,type,key_system,is_supported) (This)->lpVtbl->IsTypeSupported(This,type,key_system,is_supported) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaEngineClassFactoryEx_QueryInterface(IMFMediaEngineClassFactoryEx* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaEngineClassFactoryEx_AddRef(IMFMediaEngineClassFactoryEx* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaEngineClassFactoryEx_Release(IMFMediaEngineClassFactoryEx* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaEngineClassFactory methods ***/ +static inline HRESULT IMFMediaEngineClassFactoryEx_CreateInstance(IMFMediaEngineClassFactoryEx* This,DWORD flags,IMFAttributes *attributes,IMFMediaEngine **engine) { + return This->lpVtbl->CreateInstance(This,flags,attributes,engine); +} +static inline HRESULT IMFMediaEngineClassFactoryEx_CreateTimeRange(IMFMediaEngineClassFactoryEx* This,IMFMediaTimeRange **range) { + return This->lpVtbl->CreateTimeRange(This,range); +} +static inline HRESULT IMFMediaEngineClassFactoryEx_CreateError(IMFMediaEngineClassFactoryEx* This,IMFMediaError **error) { + return This->lpVtbl->CreateError(This,error); +} +/*** IMFMediaEngineClassFactoryEx methods ***/ +static inline HRESULT IMFMediaEngineClassFactoryEx_CreateMediaSourceExtension(IMFMediaEngineClassFactoryEx* This,DWORD flags,IMFAttributes *attr,IMFMediaSourceExtension **mse) { + return This->lpVtbl->CreateMediaSourceExtension(This,flags,attr,mse); +} +static inline HRESULT IMFMediaEngineClassFactoryEx_CreateMediaKeys(IMFMediaEngineClassFactoryEx* This,BSTR key_system,BSTR cdm_store_path,IMFMediaKeys **keys) { + return This->lpVtbl->CreateMediaKeys(This,key_system,cdm_store_path,keys); +} +static inline HRESULT IMFMediaEngineClassFactoryEx_IsTypeSupported(IMFMediaEngineClassFactoryEx* This,BSTR type,BSTR key_system,WINBOOL *is_supported) { + return This->lpVtbl->IsTypeSupported(This,type,key_system,is_supported); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaEngineClassFactoryEx_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMFMediaEngineClassFactory2 interface + */ +#ifndef __IMFMediaEngineClassFactory2_INTERFACE_DEFINED__ +#define __IMFMediaEngineClassFactory2_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMediaEngineClassFactory2, 0x09083cef, 0x867f, 0x4bf6, 0x87,0x76, 0xde,0xe3,0xa7,0xb4,0x2f,0xca); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("09083cef-867f-4bf6-8776-dee3a7b42fca") +IMFMediaEngineClassFactory2 : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE CreateMediaKeys2( + BSTR key_system, + BSTR default_cdm_store_path, + BSTR inprivate_cdm_store_path, + IMFMediaKeys **keys) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMediaEngineClassFactory2, 0x09083cef, 0x867f, 0x4bf6, 0x87,0x76, 0xde,0xe3,0xa7,0xb4,0x2f,0xca) +#endif +#else +typedef struct IMFMediaEngineClassFactory2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMediaEngineClassFactory2 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMediaEngineClassFactory2 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMediaEngineClassFactory2 *This); + + /*** IMFMediaEngineClassFactory2 methods ***/ + HRESULT (STDMETHODCALLTYPE *CreateMediaKeys2)( + IMFMediaEngineClassFactory2 *This, + BSTR key_system, + BSTR default_cdm_store_path, + BSTR inprivate_cdm_store_path, + IMFMediaKeys **keys); + + END_INTERFACE +} IMFMediaEngineClassFactory2Vtbl; + +interface IMFMediaEngineClassFactory2 { + CONST_VTBL IMFMediaEngineClassFactory2Vtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMediaEngineClassFactory2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMediaEngineClassFactory2_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMediaEngineClassFactory2_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMediaEngineClassFactory2 methods ***/ +#define IMFMediaEngineClassFactory2_CreateMediaKeys2(This,key_system,default_cdm_store_path,inprivate_cdm_store_path,keys) (This)->lpVtbl->CreateMediaKeys2(This,key_system,default_cdm_store_path,inprivate_cdm_store_path,keys) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMFMediaEngineClassFactory2_QueryInterface(IMFMediaEngineClassFactory2* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMFMediaEngineClassFactory2_AddRef(IMFMediaEngineClassFactory2* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMFMediaEngineClassFactory2_Release(IMFMediaEngineClassFactory2* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMediaEngineClassFactory2 methods ***/ +static inline HRESULT IMFMediaEngineClassFactory2_CreateMediaKeys2(IMFMediaEngineClassFactory2* This,BSTR key_system,BSTR default_cdm_store_path,BSTR inprivate_cdm_store_path,IMFMediaKeys **keys) { + return This->lpVtbl->CreateMediaKeys2(This,key_system,default_cdm_store_path,inprivate_cdm_store_path,keys); +} +#endif +#endif + +#endif + + +#endif /* __IMFMediaEngineClassFactory2_INTERFACE_DEFINED__ */ + /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/mfobjects.h b/lib/libc/include/any-windows-any/mfobjects.h index 59ce5edbebc85229b72f381e5debcbacd8a94c30..c1d5c86b3fecd1c1ba1018b0b751e3ec37b44230 100644 --- a/lib/libc/include/any-windows-any/mfobjects.h +++ b/lib/libc/include/any-windows-any/mfobjects.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfobjects.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfplay.h b/lib/libc/include/any-windows-any/mfplay.h index 9abb3875800f4ee2f96be0f627f07bd4ff104030..92ebd0c2361975bd77f15f75b89ecef95592589e 100644 --- a/lib/libc/include/any-windows-any/mfplay.h +++ b/lib/libc/include/any-windows-any/mfplay.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfplay.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfplay.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfreadwrite.h b/lib/libc/include/any-windows-any/mfreadwrite.h index 6bd90c2b45413fd6f8832dc8aa60e0afeae62408..f35880f589b8f5aa68f0b01bf7b1b7169810cbce 100644 --- a/lib/libc/include/any-windows-any/mfreadwrite.h +++ b/lib/libc/include/any-windows-any/mfreadwrite.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mfreadwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mfreadwrite.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mftransform.h b/lib/libc/include/any-windows-any/mftransform.h index 7268f9b4629ad3709b74dbb7cc43cc4ec2db6b59..d7b443ce711041e9be463f628df9f6ccb7f8ce69 100644 --- a/lib/libc/include/any-windows-any/mftransform.h +++ b/lib/libc/include/any-windows-any/mftransform.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mftransform.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mftransform.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mmdeviceapi.h b/lib/libc/include/any-windows-any/mmdeviceapi.h index c12e2ee032bb9ade7221c312cc4dd941157d1905..12e600fa508d4a95a46f265a1945c0c121c3d282 100644 --- a/lib/libc/include/any-windows-any/mmdeviceapi.h +++ b/lib/libc/include/any-windows-any/mmdeviceapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mmdeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mmdeviceapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mmstream.h b/lib/libc/include/any-windows-any/mmstream.h index 022963122f501b3238d29a71e4fbefb5bb4eb67f..689a5900590cf553517db755c8f8ef878b658718 100644 --- a/lib/libc/include/any-windows-any/mmstream.h +++ b/lib/libc/include/any-windows-any/mmstream.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mmstream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mpeg2data.h b/lib/libc/include/any-windows-any/mpeg2data.h index cfff85b9083bab362d2e642f6cbabf3123665af0..0c69bbccb252845c3b563ca01c3c1f967a2d1da3 100644 --- a/lib/libc/include/any-windows-any/mpeg2data.h +++ b/lib/libc/include/any-windows-any/mpeg2data.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mpeg2data.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mpeg2data.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mpeg2structs.h b/lib/libc/include/any-windows-any/mpeg2structs.h index 3eaa7e46c9c1a4adc71b3d7501c986e84c3b2975..50ff7b1c466e9f13c41154b16fd9ee2bf0277116 100644 --- a/lib/libc/include/any-windows-any/mpeg2structs.h +++ b/lib/libc/include/any-windows-any/mpeg2structs.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mpeg2structs.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mpeg2structs.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mscoree.h b/lib/libc/include/any-windows-any/mscoree.h index 05d546ff88fd07dd362e8fa8c3045fb447861898..3556069c3eef0cf8d0927f937ed5b52a830a4b75 100644 --- a/lib/libc/include/any-windows-any/mscoree.h +++ b/lib/libc/include/any-windows-any/mscoree.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mscoree.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mscoree.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msctf.h b/lib/libc/include/any-windows-any/msctf.h index 51105b85db268b9f302b6da0ca4cc5c5fbd1383a..4143b3d80489e554bfcf0fa7685a8e5cda14fea0 100644 --- a/lib/libc/include/any-windows-any/msctf.h +++ b/lib/libc/include/any-windows-any/msctf.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msctf.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msctf.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mshtmhst.h b/lib/libc/include/any-windows-any/mshtmhst.h index 2feed9773610cea6f47c4f2d2cd5c8c16478f8a9..96c74ce33892eab797a9e06519e3282ad78a208b 100644 --- a/lib/libc/include/any-windows-any/mshtmhst.h +++ b/lib/libc/include/any-windows-any/mshtmhst.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mshtmhst.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mshtmhst.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mshtml.h b/lib/libc/include/any-windows-any/mshtml.h index fd933602eca4f1762b06143bdf49f2e44ce9cbd5..87e91a13c879d44e8007373e8fb6f704f791f8e4 100644 --- a/lib/libc/include/any-windows-any/mshtml.h +++ b/lib/libc/include/any-windows-any/mshtml.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/mshtml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/mshtml.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msinkaut.h b/lib/libc/include/any-windows-any/msinkaut.h index 256e06ff8523a189b2977e8a661667dc9f0ff3ee..d082eb708ad0786004ca44eeb7c34db72df2f94e 100644 --- a/lib/libc/include/any-windows-any/msinkaut.h +++ b/lib/libc/include/any-windows-any/msinkaut.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msinkaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msinkaut.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msinkaut_i.c b/lib/libc/include/any-windows-any/msinkaut_i.c index f8e01bfa2f3ba9ff8f883849877369e9fda0ce57..da2b9d5203636b6ab817fc1f0f047972c80c6e74 100644 --- a/lib/libc/include/any-windows-any/msinkaut_i.c +++ b/lib/libc/include/any-windows-any/msinkaut_i.c @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from msinkaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from msinkaut.idl - Do not edit ***/ #include #include diff --git a/lib/libc/include/any-windows-any/msopc.h b/lib/libc/include/any-windows-any/msopc.h index e3d615481f2fe5d55a2a622eac60e2534f35b63a..2e0b33832073c23c633fccd2c5526438dfbc3deb 100644 --- a/lib/libc/include/any-windows-any/msopc.h +++ b/lib/libc/include/any-windows-any/msopc.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msopc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msopc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mswsock.h b/lib/libc/include/any-windows-any/mswsock.h index 2efdf149cd3e06f092be1c177b7855f43be10928..c1f8582e50781632307cbed3f3726526b6f31b52 100644 --- a/lib/libc/include/any-windows-any/mswsock.h +++ b/lib/libc/include/any-windows-any/mswsock.h @@ -36,6 +36,7 @@ extern "C" { #define TCP_BSDURGENT 0x7000 #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) +#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR,15) #if (_WIN32_WINNT < 0x0600) && (_WIN32_WINNT >= 0x0501) #define SIO_SOCKET_CLOSE_NOTIFY _WSAIOW(IOC_VENDOR,13) #endif /* >= XP && < VISTA */ @@ -167,12 +168,20 @@ extern "C" { } data; } NLA_BLOB,*PNLA_BLOB,*LPNLA_BLOB; +#if (_WIN32_WINNT >= 0x0600) +#define _WSACMSGHDR cmsghdr +#endif + typedef struct _WSACMSGHDR { SIZE_T cmsg_len; INT cmsg_level; INT cmsg_type; } WSACMSGHDR,*PWSACMSGHDR,*LPWSACMSGHDR; +#if (_WIN32_WINNT >= 0x0600) +typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; +#endif + #define WSA_CMSGHDR_ALIGN(length) (((length) + TYPE_ALIGNMENT(WSACMSGHDR)-1) & (~(TYPE_ALIGNMENT(WSACMSGHDR)-1))) #define WSA_CMSGDATA_ALIGN(length) (((length) + MAX_NATURAL_ALIGNMENT-1) & (~(MAX_NATURAL_ALIGNMENT-1))) #define WSA_CMSG_FIRSTHDR(msg) (((msg)->Control.len >= sizeof(WSACMSGHDR)) ? (LPWSACMSGHDR)(msg)->Control.buf : (LPWSACMSGHDR)NULL) @@ -181,6 +190,15 @@ extern "C" { #define WSA_CMSG_SPACE(length) (WSA_CMSGDATA_ALIGN(sizeof(WSACMSGHDR) + WSA_CMSGHDR_ALIGN(length))) #define WSA_CMSG_LEN(length) (WSA_CMSGDATA_ALIGN(sizeof(WSACMSGHDR)) + length) +#if (_WIN32_WINNT >= 0x0600) +#define CMSGHDR_ALIGN WSA_CMSGHDR_ALIGN +#define CMSGDATA_ALIGN WSA_CMSGDATA_ALIGN +#define CMSG_FIRSTHDR WSA_CMSG_FIRSTHDR +#define CMSG_NXTHDR WSA_CMSG_NXTHDR +#define CMSG_SPACE WSA_CMSG_SPACE +#define CMSG_LEN WSA_CMSG_LEN +#endif + #define MSG_TRUNC 0x0100 #define MSG_CTRUNC 0x0200 #define MSG_BCAST 0x0400 diff --git a/lib/libc/include/any-windows-any/msxml.h b/lib/libc/include/any-windows-any/msxml.h index bbacd5417cc5a2eef2651fc51acae754a7960bab..e7f16e063f958cfe79000be5f69b209ef2455850 100644 --- a/lib/libc/include/any-windows-any/msxml.h +++ b/lib/libc/include/any-windows-any/msxml.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msxml.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -9211,7 +9211,7 @@ IXMLDocument : public IDispatch virtual HRESULT STDMETHODCALLTYPE get_doctype( BSTR *p) = 0; - virtual HRESULT STDMETHODCALLTYPE get_dtdURl( + virtual HRESULT STDMETHODCALLTYPE get_dtdURL( BSTR *p) = 0; virtual HRESULT STDMETHODCALLTYPE createElement( @@ -9318,7 +9318,7 @@ typedef struct IXMLDocumentVtbl { IXMLDocument *This, BSTR *p); - HRESULT (STDMETHODCALLTYPE *get_dtdURl)( + HRESULT (STDMETHODCALLTYPE *get_dtdURL)( IXMLDocument *This, BSTR *p); @@ -9359,7 +9359,7 @@ interface IXMLDocument { #define IXMLDocument_put_charset(This,p) (This)->lpVtbl->put_charset(This,p) #define IXMLDocument_get_version(This,p) (This)->lpVtbl->get_version(This,p) #define IXMLDocument_get_doctype(This,p) (This)->lpVtbl->get_doctype(This,p) -#define IXMLDocument_get_dtdURl(This,p) (This)->lpVtbl->get_dtdURl(This,p) +#define IXMLDocument_get_dtdURL(This,p) (This)->lpVtbl->get_dtdURL(This,p) #define IXMLDocument_createElement(This,vType,var1,ppElem) (This)->lpVtbl->createElement(This,vType,var1,ppElem) #else /*** IUnknown methods ***/ @@ -9422,8 +9422,8 @@ static inline HRESULT IXMLDocument_get_version(IXMLDocument* This,BSTR *p) { static inline HRESULT IXMLDocument_get_doctype(IXMLDocument* This,BSTR *p) { return This->lpVtbl->get_doctype(This,p); } -static inline HRESULT IXMLDocument_get_dtdURl(IXMLDocument* This,BSTR *p) { - return This->lpVtbl->get_dtdURl(This,p); +static inline HRESULT IXMLDocument_get_dtdURL(IXMLDocument* This,BSTR *p) { + return This->lpVtbl->get_dtdURL(This,p); } static inline HRESULT IXMLDocument_createElement(IXMLDocument* This,VARIANT vType,VARIANT var1,IXMLElement **ppElem) { return This->lpVtbl->createElement(This,vType,var1,ppElem); diff --git a/lib/libc/include/any-windows-any/msxml2.h b/lib/libc/include/any-windows-any/msxml2.h index b5a7f78acc6dbbe35a446103b1cac5220986b0aa..2816f87428fc1514cb391cd25411099fc89327ab 100644 --- a/lib/libc/include/any-windows-any/msxml2.h +++ b/lib/libc/include/any-windows-any/msxml2.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msxml2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msxml2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -370,15 +370,6 @@ typedef struct FreeThreadedDOMDocument40 FreeThreadedDOMDocument40; #endif /* defined __cplusplus */ #endif /* defined __FreeThreadedDOMDocument40_FWD_DEFINED__ */ -#ifndef __FreeThreadedDOMDocument60_FWD_DEFINED__ -#define __FreeThreadedDOMDocument60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class FreeThreadedDOMDocument60 FreeThreadedDOMDocument60; -#else -typedef struct FreeThreadedDOMDocument60 FreeThreadedDOMDocument60; -#endif /* defined __cplusplus */ -#endif /* defined __FreeThreadedDOMDocument60_FWD_DEFINED__ */ - #ifndef __FreeThreadedDOMDocument_FWD_DEFINED__ #define __FreeThreadedDOMDocument_FWD_DEFINED__ #ifdef __cplusplus @@ -415,15 +406,6 @@ typedef struct XMLHTTP40 XMLHTTP40; #endif /* defined __cplusplus */ #endif /* defined __XMLHTTP40_FWD_DEFINED__ */ -#ifndef __XMLHTTP60_FWD_DEFINED__ -#define __XMLHTTP60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class XMLHTTP60 XMLHTTP60; -#else -typedef struct XMLHTTP60 XMLHTTP60; -#endif /* defined __cplusplus */ -#endif /* defined __XMLHTTP60_FWD_DEFINED__ */ - #ifndef __XMLHTTP_FWD_DEFINED__ #define __XMLHTTP_FWD_DEFINED__ #ifdef __cplusplus @@ -451,15 +433,6 @@ typedef struct ServerXMLHTTP40 ServerXMLHTTP40; #endif /* defined __cplusplus */ #endif /* defined __ServerXMLHTTP40_FWD_DEFINED__ */ -#ifndef __ServerXMLHTTP60_FWD_DEFINED__ -#define __ServerXMLHTTP60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class ServerXMLHTTP60 ServerXMLHTTP60; -#else -typedef struct ServerXMLHTTP60 ServerXMLHTTP60; -#endif /* defined __cplusplus */ -#endif /* defined __ServerXMLHTTP60_FWD_DEFINED__ */ - #ifndef __ServerXMLHTTP_FWD_DEFINED__ #define __ServerXMLHTTP_FWD_DEFINED__ #ifdef __cplusplus @@ -532,15 +505,6 @@ typedef struct XSLTemplate40 XSLTemplate40; #endif /* defined __cplusplus */ #endif /* defined __XSLTemplate40_FWD_DEFINED__ */ -#ifndef __XSLTemplate60_FWD_DEFINED__ -#define __XSLTemplate60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class XSLTemplate60 XSLTemplate60; -#else -typedef struct XSLTemplate60 XSLTemplate60; -#endif /* defined __cplusplus */ -#endif /* defined __XSLTemplate60_FWD_DEFINED__ */ - #ifndef __XSLTemplate_FWD_DEFINED__ #define __XSLTemplate_FWD_DEFINED__ #ifdef __cplusplus @@ -904,15 +868,6 @@ typedef struct SAXXMLReader40 SAXXMLReader40; #endif /* defined __cplusplus */ #endif /* defined __SAXXMLReader40_FWD_DEFINED__ */ -#ifndef __SAXXMLReader60_FWD_DEFINED__ -#define __SAXXMLReader60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class SAXXMLReader60 SAXXMLReader60; -#else -typedef struct SAXXMLReader60 SAXXMLReader60; -#endif /* defined __cplusplus */ -#endif /* defined __SAXXMLReader60_FWD_DEFINED__ */ - #ifndef __SAXXMLReader_FWD_DEFINED__ #define __SAXXMLReader_FWD_DEFINED__ #ifdef __cplusplus @@ -949,15 +904,6 @@ typedef struct MXHTMLWriter40 MXHTMLWriter40; #endif /* defined __cplusplus */ #endif /* defined __MXHTMLWriter40_FWD_DEFINED__ */ -#ifndef __MXHTMLWriter60_FWD_DEFINED__ -#define __MXHTMLWriter60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class MXHTMLWriter60 MXHTMLWriter60; -#else -typedef struct MXHTMLWriter60 MXHTMLWriter60; -#endif /* defined __cplusplus */ -#endif /* defined __MXHTMLWriter60_FWD_DEFINED__ */ - #ifndef __MXXMLWriter30_FWD_DEFINED__ #define __MXXMLWriter30_FWD_DEFINED__ #ifdef __cplusplus @@ -976,15 +922,6 @@ typedef struct MXXMLWriter40 MXXMLWriter40; #endif /* defined __cplusplus */ #endif /* defined __MXXMLWriter40_FWD_DEFINED__ */ -#ifndef __MXXMLWriter60_FWD_DEFINED__ -#define __MXXMLWriter60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class MXXMLWriter60 MXXMLWriter60; -#else -typedef struct MXXMLWriter60 MXXMLWriter60; -#endif /* defined __cplusplus */ -#endif /* defined __MXXMLWriter60_FWD_DEFINED__ */ - #ifndef __MXXMLWriter_FWD_DEFINED__ #define __MXXMLWriter_FWD_DEFINED__ #ifdef __cplusplus @@ -1012,15 +949,6 @@ typedef struct MXNamespaceManager40 MXNamespaceManager40; #endif /* defined __cplusplus */ #endif /* defined __MXNamespaceManager40_FWD_DEFINED__ */ -#ifndef __MXNamespaceManager60_FWD_DEFINED__ -#define __MXNamespaceManager60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class MXNamespaceManager60 MXNamespaceManager60; -#else -typedef struct MXNamespaceManager60 MXNamespaceManager60; -#endif /* defined __cplusplus */ -#endif /* defined __MXNamespaceManager60_FWD_DEFINED__ */ - #ifndef __SAXAttributes30_FWD_DEFINED__ #define __SAXAttributes30_FWD_DEFINED__ #ifdef __cplusplus @@ -1039,15 +967,6 @@ typedef struct SAXAttributes40 SAXAttributes40; #endif /* defined __cplusplus */ #endif /* defined __SAXAttributes40_FWD_DEFINED__ */ -#ifndef __SAXAttributes60_FWD_DEFINED__ -#define __SAXAttributes60_FWD_DEFINED__ -#ifdef __cplusplus -typedef class SAXAttributes60 SAXAttributes60; -#else -typedef struct SAXAttributes60 SAXAttributes60; -#endif /* defined __cplusplus */ -#endif /* defined __SAXAttributes60_FWD_DEFINED__ */ - #ifndef __SAXAttributes_FWD_DEFINED__ #define __SAXAttributes_FWD_DEFINED__ #ifdef __cplusplus @@ -14665,19 +14584,6 @@ __CRT_UUID_DECL(FreeThreadedDOMDocument40, 0x88d969c1, 0xf192, 0x11d4, 0xa6,0x5f #endif #endif -/***************************************************************************** - * FreeThreadedDOMDocument60 coclass - */ - -DEFINE_GUID(CLSID_FreeThreadedDOMDocument60, 0x88d96a06, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a06-f192-11d4-a65f-0040963251e5") FreeThreadedDOMDocument60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(FreeThreadedDOMDocument60, 0x88d96a06, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * FreeThreadedDOMDocument coclass */ @@ -14730,19 +14636,6 @@ __CRT_UUID_DECL(XMLHTTP40, 0x88d969c5, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96 #endif #endif -/***************************************************************************** - * XMLHTTP60 coclass - */ - -DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a0a-f192-11d4-a65f-0040963251e5") XMLHTTP60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * XMLHTTP coclass */ @@ -14782,19 +14675,6 @@ __CRT_UUID_DECL(ServerXMLHTTP40, 0x88d969c6, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x4 #endif #endif -/***************************************************************************** - * ServerXMLHTTP60 coclass - */ - -DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a0b-f192-11d4-a65f-0040963251e5") ServerXMLHTTP60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * ServerXMLHTTP coclass */ @@ -14899,19 +14779,6 @@ __CRT_UUID_DECL(XSLTemplate40, 0x88d969c3, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40, #endif #endif -/***************************************************************************** - * XSLTemplate60 coclass - */ - -DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a08-f192-11d4-a65f-0040963251e5") XSLTemplate60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * XSLTemplate coclass */ @@ -23605,19 +23472,6 @@ __CRT_UUID_DECL(SAXXMLReader40, 0x7c6e29bc, 0x8b8b, 0x4c3d, 0x85,0x9e, 0xaf,0x6c #endif #endif -/***************************************************************************** - * SAXXMLReader60 coclass - */ - -DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a0c-f192-11d4-a65f-0040963251e5") SAXXMLReader60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * SAXXMLReader coclass */ @@ -23670,19 +23524,6 @@ __CRT_UUID_DECL(MXHTMLWriter40, 0x88d969c9, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40 #endif #endif -/***************************************************************************** - * MXHTMLWriter60 coclass - */ - -DEFINE_GUID(CLSID_MXHTMLWriter60, 0x88d96a10, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a10-f192-11d4-a65f-0040963251e5") MXHTMLWriter60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(MXHTMLWriter60, 0x88d96a10, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * MXXMLWriter30 coclass */ @@ -23709,19 +23550,6 @@ __CRT_UUID_DECL(MXXMLWriter40, 0x88d969c8, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40, #endif #endif -/***************************************************************************** - * MXXMLWriter60 coclass - */ - -DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a0f-f192-11d4-a65f-0040963251e5") MXXMLWriter60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * MXXMLWriter coclass */ @@ -23761,19 +23589,6 @@ __CRT_UUID_DECL(MXNamespaceManager40, 0x88d969d6, 0xf192, 0x11d4, 0xa6,0x5f, 0x0 #endif #endif -/***************************************************************************** - * MXNamespaceManager60 coclass - */ - -DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a11-f192-11d4-a65f-0040963251e5") MXNamespaceManager60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * SAXAttributes30 coclass */ @@ -23800,19 +23615,6 @@ __CRT_UUID_DECL(SAXAttributes40, 0x88d969ca, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x4 #endif #endif -/***************************************************************************** - * SAXAttributes60 coclass - */ - -DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - -#ifdef __cplusplus -class DECLSPEC_UUID("88d96a0e-f192-11d4-a65f-0040963251e5") SAXAttributes60; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5) -#endif -#endif - /***************************************************************************** * SAXAttributes coclass */ diff --git a/lib/libc/include/any-windows-any/msxml6.h b/lib/libc/include/any-windows-any/msxml6.h index 21b6820d816376e6ca97f2631332bbd4f331cfd4..f1bd8835581cee1b98d443cbcaac89bf49a46de2 100644 --- a/lib/libc/include/any-windows-any/msxml6.h +++ b/lib/libc/include/any-windows-any/msxml6.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/msxml6.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/msxml6.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napcertrelyingparty.h b/lib/libc/include/any-windows-any/napcertrelyingparty.h index 3f24f29cbfa067bb230c1922c1a6c84910b9b027..31c363548754fe2ac733c8aeafb1da4165a13444 100644 --- a/lib/libc/include/any-windows-any/napcertrelyingparty.h +++ b/lib/libc/include/any-windows-any/napcertrelyingparty.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napcertrelyingparty.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napcertrelyingparty.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napcommon.h b/lib/libc/include/any-windows-any/napcommon.h index a2d05c9ff87ea6db72648f7b9fbae9f5641393be..4b72b983b7df1a7a227b9d6098d31449f99d098f 100644 --- a/lib/libc/include/any-windows-any/napcommon.h +++ b/lib/libc/include/any-windows-any/napcommon.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napcommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napenforcementclient.h b/lib/libc/include/any-windows-any/napenforcementclient.h index 11f1383e52b44ae229948447f5ef6ad593c90a04..a5e62d9e7efd8e09711c9b26445d753b25dcfa74 100644 --- a/lib/libc/include/any-windows-any/napenforcementclient.h +++ b/lib/libc/include/any-windows-any/napenforcementclient.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napenforcementclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napenforcementclient.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napmanagement.h b/lib/libc/include/any-windows-any/napmanagement.h index 9ec056b45d113eab713f4375e330d550335ee8d8..1fe99389b48da0ae14b5ea44b09f74cd3115c583 100644 --- a/lib/libc/include/any-windows-any/napmanagement.h +++ b/lib/libc/include/any-windows-any/napmanagement.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napmanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napmanagement.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napprotocol.h b/lib/libc/include/any-windows-any/napprotocol.h index 507ee2c36b0af40229924ae1b5e07cb4f23f01c7..ae8d5182454c50721bd429341dcedfcb4c323c95 100644 --- a/lib/libc/include/any-windows-any/napprotocol.h +++ b/lib/libc/include/any-windows-any/napprotocol.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napprotocol.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napprotocol.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napservermanagement.h b/lib/libc/include/any-windows-any/napservermanagement.h index f24e83e99ded72c69c469a99afdb2b5baa6a85c2..02142bc68a00cb1e5da5b4d14028f97aa0d19e6b 100644 --- a/lib/libc/include/any-windows-any/napservermanagement.h +++ b/lib/libc/include/any-windows-any/napservermanagement.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napservermanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napservermanagement.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napsystemhealthagent.h b/lib/libc/include/any-windows-any/napsystemhealthagent.h index 1154bed7bb336550e58c80b7ed5e72bcb9a847cc..40f805ee393b69cbd7289336d2e92a4ea2f4e571 100644 --- a/lib/libc/include/any-windows-any/napsystemhealthagent.h +++ b/lib/libc/include/any-windows-any/napsystemhealthagent.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napsystemhealthagent.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napsystemhealthagent.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/napsystemhealthvalidator.h b/lib/libc/include/any-windows-any/napsystemhealthvalidator.h index 43c815ab6054b7c34834e467ae3071888b1d401a..21e0f812126fee0f4ed03e9afa74c5e1267ec352 100644 --- a/lib/libc/include/any-windows-any/napsystemhealthvalidator.h +++ b/lib/libc/include/any-windows-any/napsystemhealthvalidator.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/napsystemhealthvalidator.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/napsystemhealthvalidator.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/naptypes.h b/lib/libc/include/any-windows-any/naptypes.h index 4c1590eb88f62a151e4e1cafa4b7048727471f84..ea9a69d352e979b7850e249bec20f2788c18986b 100644 --- a/lib/libc/include/any-windows-any/naptypes.h +++ b/lib/libc/include/any-windows-any/naptypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/naptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/naptypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/netcfgn.h b/lib/libc/include/any-windows-any/netcfgn.h index b0ae4fcb8c2c8e0ce86e4b5559b3f920f40a1d9b..505fce5e0a421b7d091c03968b49e4a8947c80e2 100644 --- a/lib/libc/include/any-windows-any/netcfgn.h +++ b/lib/libc/include/any-windows-any/netcfgn.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/netcfgn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/netcfgn.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/netcfgx.h b/lib/libc/include/any-windows-any/netcfgx.h index 041b417a2369677be21195ec9858b58245fc5bc5..01936fa955ffa063c78858992f2a5ac59a46f953 100644 --- a/lib/libc/include/any-windows-any/netcfgx.h +++ b/lib/libc/include/any-windows-any/netcfgx.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/netcfgx.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/netcfgx.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/netfw.h b/lib/libc/include/any-windows-any/netfw.h index f6f489873b97e3e503d66434059ed6da37fe70d0..7e71a875ef856a4d510812320fa7983b107d4687 100644 --- a/lib/libc/include/any-windows-any/netfw.h +++ b/lib/libc/include/any-windows-any/netfw.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/netfw.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/netfw.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/netlistmgr.h b/lib/libc/include/any-windows-any/netlistmgr.h index e268472c23d8f81c3b531e5fadaf2737b24e2799..0463ede9cee282cb01b5febba628db6a702e7126 100644 --- a/lib/libc/include/any-windows-any/netlistmgr.h +++ b/lib/libc/include/any-windows-any/netlistmgr.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/netlistmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/netlistmgr.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/new.h b/lib/libc/include/any-windows-any/new.h index b8a03579e77d0124a21b7b4bc639437d1636436e..689824e60171fdbf3f655da07ee2e480d9fa3880 100644 --- a/lib/libc/include/any-windows-any/new.h +++ b/lib/libc/include/any-windows-any/new.h @@ -13,6 +13,7 @@ #include #pragma push_macro("new") #undef new +extern "C" { #endif #ifndef __NOTHROW_T_DEFINED @@ -41,6 +42,7 @@ _CRTIMP _PNH __cdecl _set_new_handler(_PNH _NewHandler); #endif #ifdef __cplusplus +} #pragma pop_macro("new") #endif diff --git a/lib/libc/include/any-windows-any/oaidl.h b/lib/libc/include/any-windows-any/oaidl.h index 345b2db139882209fda82880cce175f2d4af25eb..1d06c32a7fe42cabdd596819f633e083a3002d86 100644 --- a/lib/libc/include/any-windows-any/oaidl.h +++ b/lib/libc/include/any-windows-any/oaidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/oaidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/oaidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/objectarray.h b/lib/libc/include/any-windows-any/objectarray.h index 9dad738adb7cc72d5171e8985596e440ce04c91d..70fde79f8acacb61df45ae7fdbdae2a7d26d73c8 100644 --- a/lib/libc/include/any-windows-any/objectarray.h +++ b/lib/libc/include/any-windows-any/objectarray.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/objectarray.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/objectarray.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/objidl.h b/lib/libc/include/any-windows-any/objidl.h index 693baa4fc7fa3883e32202352c27d24467321189..8f81026fd4a96cd21d852474aa465ae2c206cf0f 100644 --- a/lib/libc/include/any-windows-any/objidl.h +++ b/lib/libc/include/any-windows-any/objidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/objidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/objidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/objidlbase.h b/lib/libc/include/any-windows-any/objidlbase.h index 332c06c93063f33d63bbac20fd9d9c6255236ae8..4994529ac294871b69837578e2e78f50d0f3a716 100644 --- a/lib/libc/include/any-windows-any/objidlbase.h +++ b/lib/libc/include/any-windows-any/objidlbase.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/objidlbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/objidlbase.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ocidl.h b/lib/libc/include/any-windows-any/ocidl.h index d428aa5ef4ced5d6d112281bb0e129ffc609a419..b3e92113d3da487c3966f4147deff4f5fccd1aab 100644 --- a/lib/libc/include/any-windows-any/ocidl.h +++ b/lib/libc/include/any-windows-any/ocidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/ocidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/ocidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/oleacc.h b/lib/libc/include/any-windows-any/oleacc.h index 83d74297ae0a72208def84d4dd7e884f5ccc0969..05f955d8d44a95d578cc8fbb3a7939ac42d1f29b 100644 --- a/lib/libc/include/any-windows-any/oleacc.h +++ b/lib/libc/include/any-windows-any/oleacc.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/oleacc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/oleacc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/oleidl.h b/lib/libc/include/any-windows-any/oleidl.h index 2f37fb202213aafc769d375866f37e9db2fb38d4..09dc7c82feab8967d47a5f51840584737b0c4908 100644 --- a/lib/libc/include/any-windows-any/oleidl.h +++ b/lib/libc/include/any-windows-any/oleidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/oleidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/oleidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/optary.h b/lib/libc/include/any-windows-any/optary.h index 5b038fe5b35c2006afa465739b80f649b9ceb305..86641db2e69db5d438ca63e38cc38dc7eb0a0ceb 100644 --- a/lib/libc/include/any-windows-any/optary.h +++ b/lib/libc/include/any-windows-any/optary.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/optary.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/optary.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/pathcch.h b/lib/libc/include/any-windows-any/pathcch.h index 62011fd1cd192cfe86a951d01aff7ef25049ee5d..7c42c4a5df6ff84cf3b071caf1e458d35070a3e3 100644 --- a/lib/libc/include/any-windows-any/pathcch.h +++ b/lib/libc/include/any-windows-any/pathcch.h @@ -3,6 +3,9 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ +#ifndef __PATHCCH_H__ +#define __PATHCCH_H__ + #include #include #include @@ -135,3 +138,5 @@ DEFINE_ENUM_FLAG_OPERATORS(PATHCCH_OPTIONS) } #endif #endif + +#endif diff --git a/lib/libc/include/any-windows-any/pdhmsg.h b/lib/libc/include/any-windows-any/pdhmsg.h index 89af17797237cbc42f5aeb336d651eb3bb5c8238..09e359516fc5cf5ec0a010003dc3ad979089c248 100644 --- a/lib/libc/include/any-windows-any/pdhmsg.h +++ b/lib/libc/include/any-windows-any/pdhmsg.h @@ -11,91 +11,91 @@ #define STATUS_SEVERITY_INFORMATIONAL 0x1 #define STATUS_SEVERITY_ERROR 0x3 -#define PDH_CSTATUS_VALID_DATA ((DWORD)0x00000000) -#define PDH_CSTATUS_NEW_DATA ((DWORD)0x00000001) -#define PDH_CSTATUS_NO_MACHINE ((DWORD)0x800007D0) -#define PDH_CSTATUS_NO_INSTANCE ((DWORD)0x800007D1) -#define PDH_MORE_DATA ((DWORD)0x800007D2) -#define PDH_CSTATUS_ITEM_NOT_VALIDATED ((DWORD)0x800007D3) -#define PDH_RETRY ((DWORD)0x800007D4) -#define PDH_NO_DATA ((DWORD)0x800007D5) -#define PDH_CALC_NEGATIVE_DENOMINATOR ((DWORD)0x800007D6) -#define PDH_CALC_NEGATIVE_TIMEBASE ((DWORD)0x800007D7) -#define PDH_CALC_NEGATIVE_VALUE ((DWORD)0x800007D8) -#define PDH_DIALOG_CANCELLED ((DWORD)0x800007D9) -#define PDH_END_OF_LOG_FILE ((DWORD)0x800007DA) -#define PDH_ASYNC_QUERY_TIMEOUT ((DWORD)0x800007DB) -#define PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE ((DWORD)0x800007DC) -#define PDH_CSTATUS_NO_OBJECT ((DWORD)0xC0000BB8) -#define PDH_CSTATUS_NO_COUNTER ((DWORD)0xC0000BB9) -#define PDH_CSTATUS_INVALID_DATA ((DWORD)0xC0000BBA) -#define PDH_MEMORY_ALLOCATION_FAILURE ((DWORD)0xC0000BBB) -#define PDH_INVALID_HANDLE ((DWORD)0xC0000BBC) -#define PDH_INVALID_ARGUMENT ((DWORD)0xC0000BBD) -#define PDH_FUNCTION_NOT_FOUND ((DWORD)0xC0000BBE) -#define PDH_CSTATUS_NO_COUNTERNAME ((DWORD)0xC0000BBF) -#define PDH_CSTATUS_BAD_COUNTERNAME ((DWORD)0xC0000BC0) -#define PDH_INVALID_BUFFER ((DWORD)0xC0000BC1) -#define PDH_INSUFFICIENT_BUFFER ((DWORD)0xC0000BC2) -#define PDH_CANNOT_CONNECT_MACHINE ((DWORD)0xC0000BC3) -#define PDH_INVALID_PATH ((DWORD)0xC0000BC4) -#define PDH_INVALID_INSTANCE ((DWORD)0xC0000BC5) -#define PDH_INVALID_DATA ((DWORD)0xC0000BC6) -#define PDH_NO_DIALOG_DATA ((DWORD)0xC0000BC7) -#define PDH_CANNOT_READ_NAME_STRINGS ((DWORD)0xC0000BC8) -#define PDH_LOG_FILE_CREATE_ERROR ((DWORD)0xC0000BC9) -#define PDH_LOG_FILE_OPEN_ERROR ((DWORD)0xC0000BCA) -#define PDH_LOG_TYPE_NOT_FOUND ((DWORD)0xC0000BCB) -#define PDH_NO_MORE_DATA ((DWORD)0xC0000BCC) -#define PDH_ENTRY_NOT_IN_LOG_FILE ((DWORD)0xC0000BCD) -#define PDH_DATA_SOURCE_IS_LOG_FILE ((DWORD)0xC0000BCE) -#define PDH_DATA_SOURCE_IS_REAL_TIME ((DWORD)0xC0000BCF) -#define PDH_UNABLE_READ_LOG_HEADER ((DWORD)0xC0000BD0) -#define PDH_FILE_NOT_FOUND ((DWORD)0xC0000BD1) -#define PDH_FILE_ALREADY_EXISTS ((DWORD)0xC0000BD2) -#define PDH_NOT_IMPLEMENTED ((DWORD)0xC0000BD3) -#define PDH_STRING_NOT_FOUND ((DWORD)0xC0000BD4) -#define PDH_UNABLE_MAP_NAME_FILES ((DWORD)0x80000BD5) -#define PDH_UNKNOWN_LOG_FORMAT ((DWORD)0xC0000BD6) -#define PDH_UNKNOWN_LOGSVC_COMMAND ((DWORD)0xC0000BD7) -#define PDH_LOGSVC_QUERY_NOT_FOUND ((DWORD)0xC0000BD8) -#define PDH_LOGSVC_NOT_OPENED ((DWORD)0xC0000BD9) -#define PDH_WBEM_ERROR ((DWORD)0xC0000BDA) -#define PDH_ACCESS_DENIED ((DWORD)0xC0000BDB) -#define PDH_LOG_FILE_TOO_SMALL ((DWORD)0xC0000BDC) -#define PDH_INVALID_DATASOURCE ((DWORD)0xC0000BDD) -#define PDH_INVALID_SQLDB ((DWORD)0xC0000BDE) -#define PDH_NO_COUNTERS ((DWORD)0xC0000BDF) -#define PDH_SQL_ALLOC_FAILED ((DWORD)0xC0000BE0) -#define PDH_SQL_ALLOCCON_FAILED ((DWORD)0xC0000BE1) -#define PDH_SQL_EXEC_DIRECT_FAILED ((DWORD)0xC0000BE2) -#define PDH_SQL_FETCH_FAILED ((DWORD)0xC0000BE3) -#define PDH_SQL_ROWCOUNT_FAILED ((DWORD)0xC0000BE4) -#define PDH_SQL_MORE_RESULTS_FAILED ((DWORD)0xC0000BE5) -#define PDH_SQL_CONNECT_FAILED ((DWORD)0xC0000BE6) -#define PDH_SQL_BIND_FAILED ((DWORD)0xC0000BE7) -#define PDH_CANNOT_CONNECT_WMI_SERVER ((DWORD)0xC0000BE8) -#define PDH_PLA_COLLECTION_ALREADY_RUNNING ((DWORD)0xC0000BE9) -#define PDH_PLA_ERROR_SCHEDULE_OVERLAP ((DWORD)0xC0000BEA) -#define PDH_PLA_COLLECTION_NOT_FOUND ((DWORD)0xC0000BEB) -#define PDH_PLA_ERROR_SCHEDULE_ELAPSED ((DWORD)0xC0000BEC) -#define PDH_PLA_ERROR_NOSTART ((DWORD)0xC0000BED) -#define PDH_PLA_ERROR_ALREADY_EXISTS ((DWORD)0xC0000BEE) -#define PDH_PLA_ERROR_TYPE_MISMATCH ((DWORD)0xC0000BEF) -#define PDH_PLA_ERROR_FILEPATH ((DWORD)0xC0000BF0) -#define PDH_PLA_SERVICE_ERROR ((DWORD)0xC0000BF1) -#define PDH_PLA_VALIDATION_ERROR ((DWORD)0xC0000BF2) -#define PDH_PLA_VALIDATION_WARNING ((DWORD)0x80000BF3) -#define PDH_PLA_ERROR_NAME_TOO_LONG ((DWORD)0xC0000BF4) -#define PDH_INVALID_SQL_LOG_FORMAT ((DWORD)0xC0000BF5) -#define PDH_COUNTER_ALREADY_IN_QUERY ((DWORD)0xC0000BF6) -#define PDH_BINARY_LOG_CORRUPT ((DWORD)0xC0000BF7) -#define PDH_LOG_SAMPLE_TOO_SMALL ((DWORD)0xC0000BF8) -#define PDH_OS_LATER_VERSION ((DWORD)0xC0000BF9) -#define PDH_OS_EARLIER_VERSION ((DWORD)0xC0000BFA) -#define PDH_INCORRECT_APPEND_TIME ((DWORD)0xC0000BFB) -#define PDH_UNMATCHED_APPEND_COUNTER ((DWORD)0xC0000BFC) -#define PDH_SQL_ALTER_DETAIL_FAILED ((DWORD)0xC0000BFD) -#define PDH_QUERY_PERF_DATA_TIMEOUT ((DWORD)0xC0000BFE) +#define PDH_CSTATUS_VALID_DATA __MSABI_LONG(0x00000000) +#define PDH_CSTATUS_NEW_DATA __MSABI_LONG(0x00000001) +#define PDH_CSTATUS_NO_MACHINE __MSABI_LONG(0x800007D0) +#define PDH_CSTATUS_NO_INSTANCE __MSABI_LONG(0x800007D1) +#define PDH_MORE_DATA __MSABI_LONG(0x800007D2) +#define PDH_CSTATUS_ITEM_NOT_VALIDATED __MSABI_LONG(0x800007D3) +#define PDH_RETRY __MSABI_LONG(0x800007D4) +#define PDH_NO_DATA __MSABI_LONG(0x800007D5) +#define PDH_CALC_NEGATIVE_DENOMINATOR __MSABI_LONG(0x800007D6) +#define PDH_CALC_NEGATIVE_TIMEBASE __MSABI_LONG(0x800007D7) +#define PDH_CALC_NEGATIVE_VALUE __MSABI_LONG(0x800007D8) +#define PDH_DIALOG_CANCELLED __MSABI_LONG(0x800007D9) +#define PDH_END_OF_LOG_FILE __MSABI_LONG(0x800007DA) +#define PDH_ASYNC_QUERY_TIMEOUT __MSABI_LONG(0x800007DB) +#define PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE __MSABI_LONG(0x800007DC) +#define PDH_CSTATUS_NO_OBJECT __MSABI_LONG(0xC0000BB8) +#define PDH_CSTATUS_NO_COUNTER __MSABI_LONG(0xC0000BB9) +#define PDH_CSTATUS_INVALID_DATA __MSABI_LONG(0xC0000BBA) +#define PDH_MEMORY_ALLOCATION_FAILURE __MSABI_LONG(0xC0000BBB) +#define PDH_INVALID_HANDLE __MSABI_LONG(0xC0000BBC) +#define PDH_INVALID_ARGUMENT __MSABI_LONG(0xC0000BBD) +#define PDH_FUNCTION_NOT_FOUND __MSABI_LONG(0xC0000BBE) +#define PDH_CSTATUS_NO_COUNTERNAME __MSABI_LONG(0xC0000BBF) +#define PDH_CSTATUS_BAD_COUNTERNAME __MSABI_LONG(0xC0000BC0) +#define PDH_INVALID_BUFFER __MSABI_LONG(0xC0000BC1) +#define PDH_INSUFFICIENT_BUFFER __MSABI_LONG(0xC0000BC2) +#define PDH_CANNOT_CONNECT_MACHINE __MSABI_LONG(0xC0000BC3) +#define PDH_INVALID_PATH __MSABI_LONG(0xC0000BC4) +#define PDH_INVALID_INSTANCE __MSABI_LONG(0xC0000BC5) +#define PDH_INVALID_DATA __MSABI_LONG(0xC0000BC6) +#define PDH_NO_DIALOG_DATA __MSABI_LONG(0xC0000BC7) +#define PDH_CANNOT_READ_NAME_STRINGS __MSABI_LONG(0xC0000BC8) +#define PDH_LOG_FILE_CREATE_ERROR __MSABI_LONG(0xC0000BC9) +#define PDH_LOG_FILE_OPEN_ERROR __MSABI_LONG(0xC0000BCA) +#define PDH_LOG_TYPE_NOT_FOUND __MSABI_LONG(0xC0000BCB) +#define PDH_NO_MORE_DATA __MSABI_LONG(0xC0000BCC) +#define PDH_ENTRY_NOT_IN_LOG_FILE __MSABI_LONG(0xC0000BCD) +#define PDH_DATA_SOURCE_IS_LOG_FILE __MSABI_LONG(0xC0000BCE) +#define PDH_DATA_SOURCE_IS_REAL_TIME __MSABI_LONG(0xC0000BCF) +#define PDH_UNABLE_READ_LOG_HEADER __MSABI_LONG(0xC0000BD0) +#define PDH_FILE_NOT_FOUND __MSABI_LONG(0xC0000BD1) +#define PDH_FILE_ALREADY_EXISTS __MSABI_LONG(0xC0000BD2) +#define PDH_NOT_IMPLEMENTED __MSABI_LONG(0xC0000BD3) +#define PDH_STRING_NOT_FOUND __MSABI_LONG(0xC0000BD4) +#define PDH_UNABLE_MAP_NAME_FILES __MSABI_LONG(0x80000BD5) +#define PDH_UNKNOWN_LOG_FORMAT __MSABI_LONG(0xC0000BD6) +#define PDH_UNKNOWN_LOGSVC_COMMAND __MSABI_LONG(0xC0000BD7) +#define PDH_LOGSVC_QUERY_NOT_FOUND __MSABI_LONG(0xC0000BD8) +#define PDH_LOGSVC_NOT_OPENED __MSABI_LONG(0xC0000BD9) +#define PDH_WBEM_ERROR __MSABI_LONG(0xC0000BDA) +#define PDH_ACCESS_DENIED __MSABI_LONG(0xC0000BDB) +#define PDH_LOG_FILE_TOO_SMALL __MSABI_LONG(0xC0000BDC) +#define PDH_INVALID_DATASOURCE __MSABI_LONG(0xC0000BDD) +#define PDH_INVALID_SQLDB __MSABI_LONG(0xC0000BDE) +#define PDH_NO_COUNTERS __MSABI_LONG(0xC0000BDF) +#define PDH_SQL_ALLOC_FAILED __MSABI_LONG(0xC0000BE0) +#define PDH_SQL_ALLOCCON_FAILED __MSABI_LONG(0xC0000BE1) +#define PDH_SQL_EXEC_DIRECT_FAILED __MSABI_LONG(0xC0000BE2) +#define PDH_SQL_FETCH_FAILED __MSABI_LONG(0xC0000BE3) +#define PDH_SQL_ROWCOUNT_FAILED __MSABI_LONG(0xC0000BE4) +#define PDH_SQL_MORE_RESULTS_FAILED __MSABI_LONG(0xC0000BE5) +#define PDH_SQL_CONNECT_FAILED __MSABI_LONG(0xC0000BE6) +#define PDH_SQL_BIND_FAILED __MSABI_LONG(0xC0000BE7) +#define PDH_CANNOT_CONNECT_WMI_SERVER __MSABI_LONG(0xC0000BE8) +#define PDH_PLA_COLLECTION_ALREADY_RUNNING __MSABI_LONG(0xC0000BE9) +#define PDH_PLA_ERROR_SCHEDULE_OVERLAP __MSABI_LONG(0xC0000BEA) +#define PDH_PLA_COLLECTION_NOT_FOUND __MSABI_LONG(0xC0000BEB) +#define PDH_PLA_ERROR_SCHEDULE_ELAPSED __MSABI_LONG(0xC0000BEC) +#define PDH_PLA_ERROR_NOSTART __MSABI_LONG(0xC0000BED) +#define PDH_PLA_ERROR_ALREADY_EXISTS __MSABI_LONG(0xC0000BEE) +#define PDH_PLA_ERROR_TYPE_MISMATCH __MSABI_LONG(0xC0000BEF) +#define PDH_PLA_ERROR_FILEPATH __MSABI_LONG(0xC0000BF0) +#define PDH_PLA_SERVICE_ERROR __MSABI_LONG(0xC0000BF1) +#define PDH_PLA_VALIDATION_ERROR __MSABI_LONG(0xC0000BF2) +#define PDH_PLA_VALIDATION_WARNING __MSABI_LONG(0x80000BF3) +#define PDH_PLA_ERROR_NAME_TOO_LONG __MSABI_LONG(0xC0000BF4) +#define PDH_INVALID_SQL_LOG_FORMAT __MSABI_LONG(0xC0000BF5) +#define PDH_COUNTER_ALREADY_IN_QUERY __MSABI_LONG(0xC0000BF6) +#define PDH_BINARY_LOG_CORRUPT __MSABI_LONG(0xC0000BF7) +#define PDH_LOG_SAMPLE_TOO_SMALL __MSABI_LONG(0xC0000BF8) +#define PDH_OS_LATER_VERSION __MSABI_LONG(0xC0000BF9) +#define PDH_OS_EARLIER_VERSION __MSABI_LONG(0xC0000BFA) +#define PDH_INCORRECT_APPEND_TIME __MSABI_LONG(0xC0000BFB) +#define PDH_UNMATCHED_APPEND_COUNTER __MSABI_LONG(0xC0000BFC) +#define PDH_SQL_ALTER_DETAIL_FAILED __MSABI_LONG(0xC0000BFD) +#define PDH_QUERY_PERF_DATA_TIMEOUT __MSABI_LONG(0xC0000BFE) #endif diff --git a/lib/libc/include/any-windows-any/portabledeviceapi.h b/lib/libc/include/any-windows-any/portabledeviceapi.h index 4ca9da7ca76fa87bebd418f4da57949490bff754..d126e89808e8db913cbe53d145c205e4df6462c6 100644 --- a/lib/libc/include/any-windows-any/portabledeviceapi.h +++ b/lib/libc/include/any-windows-any/portabledeviceapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/portabledeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/portabledeviceapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/portabledevicetypes.h b/lib/libc/include/any-windows-any/portabledevicetypes.h index 37bbde4e985a49bb4340f4eaa0f3be31435ce65f..2c9b7e2c10387b42fe9e5a092d7a534bdf32aeb6 100644 --- a/lib/libc/include/any-windows-any/portabledevicetypes.h +++ b/lib/libc/include/any-windows-any/portabledevicetypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/portabledevicetypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/portabledevicetypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/proofofpossessioncookieinfo.h b/lib/libc/include/any-windows-any/proofofpossessioncookieinfo.h index dc494e6338a14aed8e2b2254793f61d9a1f51a54..9a3b77f300b460a546d7545327fc7179395e85c3 100644 --- a/lib/libc/include/any-windows-any/proofofpossessioncookieinfo.h +++ b/lib/libc/include/any-windows-any/proofofpossessioncookieinfo.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/proofofpossessioncookieinfo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/proofofpossessioncookieinfo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/propidl.h b/lib/libc/include/any-windows-any/propidl.h index 82ccb7ac16e633b58f6d875605522f4a7523ec66..6eed6b14f03ba26c72d65592431b19bd05055cfe 100644 --- a/lib/libc/include/any-windows-any/propidl.h +++ b/lib/libc/include/any-windows-any/propidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/propidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/propidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/propsys.h b/lib/libc/include/any-windows-any/propsys.h index 46b06015980572b7bc6dfed87f3b827e97f2c5a2..ab77987217046f7961a600c139c308cd33fc738e 100644 --- a/lib/libc/include/any-windows-any/propsys.h +++ b/lib/libc/include/any-windows-any/propsys.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/propsys.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/propsys.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/propvarutil.h b/lib/libc/include/any-windows-any/propvarutil.h index 42e658d77d1b734b619481fd14424218dd57b073..6c2f4e7a3b7f879b640a4dd9f285458e1578aecc 100644 --- a/lib/libc/include/any-windows-any/propvarutil.h +++ b/lib/libc/include/any-windows-any/propvarutil.h @@ -78,6 +78,14 @@ enum tagPROPVAR_COMPARE_FLAGS typedef int PROPVAR_COMPARE_FLAGS; +enum tagPSTIME_FLAGS +{ + PSTF_UTC = 0x00000000, + PSTF_LOCAL = 0x00000001, +}; + +typedef int PSTIME_FLAGS; + PSSTDAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); PSSTDAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); @@ -86,7 +94,6 @@ PSSTDAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); PSSTDAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); PSSTDAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); PSSTDAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); -PSSTDAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); PSSTDAPI VariantToGUID(const VARIANT *pvar, GUID *guid); PSSTDAPI_(INT) PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); @@ -94,11 +101,14 @@ PSSTDAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropva PSSTDAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); PSSTDAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); +PSSTDAPI PropVariantToFileTime(REFPROPVARIANT propvar, PSTIME_FLAGS flags, FILETIME *out); +PSSTDAPI PropVariantToGUID(REFPROPVARIANT ppropvar, GUID *guid); PSSTDAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); PSSTDAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); PSSTDAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); PSSTDAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); PSSTDAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); +PSSTDAPI PropVariantToUInt32Vector(REFPROPVARIANT propvar, ULONG *buffer, ULONG size, ULONG *count); PSSTDAPI_(ULONG) PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); PSSTDAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); PSSTDAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, WINBOOL *ret); diff --git a/lib/libc/include/any-windows-any/psdk_inc/_dbg_common.h b/lib/libc/include/any-windows-any/psdk_inc/_dbg_common.h index 847acfc78b4e4b034c83825c14f42c8924a4e11d..aa94da4a79260cc06e801c37d6343a3efbda5a48 100644 --- a/lib/libc/include/any-windows-any/psdk_inc/_dbg_common.h +++ b/lib/libc/include/any-windows-any/psdk_inc/_dbg_common.h @@ -612,6 +612,17 @@ GetModuleBaseRoutine,PTRANSLATE_ADDRESS_ROUTINE TranslateAddress); DWORD Flags; } IMAGEHLP_DEFERRED_SYMBOL_LOAD64,*PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; + typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOADW64 { + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD CheckSum; + DWORD TimeDateStamp; + WCHAR FileName[MAX_PATH + 1]; + BOOLEAN Reparse; + HANDLE hFile; + DWORD Flags; + } IMAGEHLP_DEFERRED_SYMBOL_LOADW64,*PIMAGEHLP_DEFERRED_SYMBOL_LOADW64; + #define DSLFLAG_MISMATCHED_PDB 0x1 #define DSLFLAG_MISMATCHED_DBG 0x2 diff --git a/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h b/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h index e109c15d06afdcdb1bbf757cd9f479bedf48b230..ff007df106ba64986b4af3f56b5dc3e33e6b1adc 100644 --- a/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h +++ b/lib/libc/include/any-windows-any/psdk_inc/intrin-impl.h @@ -230,9 +230,9 @@ Parameters: (FunctionName, DataType, Segment) #define __buildreadseg(x, y, z, a) y x(unsigned __LONG32 Offset) { \ y ret; \ - __asm__ ("mov{" a " %%" z ":(%[offset]), %[ret] | %[ret], " z ":[%[offset]] }" \ + __asm__ ("mov{" a " %%" z ":%a[offset], %[ret] | %[ret], " z ":[%[offset]] }" \ : [ret] "=r" (ret) \ - : [offset] "r" (Offset) \ + : [offset] "ir" (Offset) \ : "memory"); \ return ret; \ } @@ -248,9 +248,9 @@ Parameters: (FunctionName, DataType, Segment) */ #define __buildwriteseg(x, y, z, a) void x(unsigned __LONG32 Offset, y Data) { \ - __asm__ volatile ("mov{" a " %[Data], %%" z ":(%[offset]) | " z ":[%[offset]], %[Data] }" \ + __asm__ volatile ("mov{" a " %[Data], %%" z ":%a[offset] | " z ":[%[offset]], %[Data] }" \ : \ - : [offset] "r" (Offset), [Data] "r" (Data) \ + : [offset] "ir" (Offset), [Data] "r" (Data) \ : "memory"); \ } @@ -1664,12 +1664,44 @@ short _InterlockedCompareExchange16(short volatile *Destination, short ExChange, #define __INTRINSIC_DEFINED__InterlockedCompareExchange16 #endif /* __INTRINSIC_PROLOG */ +/* On i386, fall back to the kernel32 Interlocked exports because GCC + cannot inline the __sync_* builtins (no CMPXCHG/XADD). __asm__ + labels avoid collisions with the winnt.h Interlocked macros. + GCC prepends _ to __asm__ label strings on i386; Clang does not. */ +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) +#ifdef __clang__ +#define __MINGW_K32_ASM(name) __asm__("_" name) +#else +#define __MINGW_K32_ASM(name) __asm__(name) +#endif +__LONG32 __attribute__((__dllimport__, __stdcall__)) +__mingw_k32_InterlockedExchangeAdd(__LONG32 volatile *, __LONG32) + __MINGW_K32_ASM("InterlockedExchangeAdd@8"); +__LONG32 __attribute__((__dllimport__, __stdcall__)) +__mingw_k32_InterlockedCompareExchange(__LONG32 volatile *, __LONG32, __LONG32) + __MINGW_K32_ASM("InterlockedCompareExchange@12"); +__LONG32 __attribute__((__dllimport__, __stdcall__)) +__mingw_k32_InterlockedIncrement(__LONG32 volatile *) + __MINGW_K32_ASM("InterlockedIncrement@4"); +__LONG32 __attribute__((__dllimport__, __stdcall__)) +__mingw_k32_InterlockedDecrement(__LONG32 volatile *) + __MINGW_K32_ASM("InterlockedDecrement@4"); +__LONG32 __attribute__((__dllimport__, __stdcall__)) +__mingw_k32_InterlockedExchange(__LONG32 volatile *, __LONG32) + __MINGW_K32_ASM("InterlockedExchange@8"); +#undef __MINGW_K32_ASM +#endif + #if __INTRINSIC_PROLOG(_InterlockedExchangeAdd) __LONG32 _InterlockedExchangeAdd(__LONG32 volatile *Addend, __LONG32 Value); #if !__has_builtin(_InterlockedExchangeAdd) __INTRINSICS_USEINLINE __LONG32 _InterlockedExchangeAdd(__LONG32 volatile *Addend, __LONG32 Value) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return __mingw_k32_InterlockedExchangeAdd(Addend, Value); +#else return __sync_fetch_and_add(Addend, Value); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedExchangeAdd @@ -1680,7 +1712,11 @@ __LONG32 _InterlockedCompareExchange(__LONG32 volatile *Destination, __LONG32 Ex #if !__has_builtin(_InterlockedCompareExchange) __INTRINSICS_USEINLINE __LONG32 _InterlockedCompareExchange(__LONG32 volatile *Destination, __LONG32 ExChange, __LONG32 Comperand) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return __mingw_k32_InterlockedCompareExchange(Destination, ExChange, Comperand); +#else return __sync_val_compare_and_swap(Destination, Comperand, ExChange); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedCompareExchange @@ -1691,7 +1727,11 @@ __LONG32 _InterlockedIncrement(__LONG32 volatile *Addend); #if !__has_builtin(_InterlockedIncrement) __INTRINSICS_USEINLINE __LONG32 _InterlockedIncrement(__LONG32 volatile *Addend) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return __mingw_k32_InterlockedIncrement(Addend); +#else return __sync_add_and_fetch(Addend, 1); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedIncrement @@ -1702,7 +1742,11 @@ __LONG32 _InterlockedDecrement(__LONG32 volatile *Addend); #if !__has_builtin(_InterlockedDecrement) __INTRINSICS_USEINLINE __LONG32 _InterlockedDecrement(__LONG32 volatile *Addend) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return __mingw_k32_InterlockedDecrement(Addend); +#else return __sync_sub_and_fetch(Addend, 1); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedDecrement @@ -1735,7 +1779,11 @@ __LONG32 _InterlockedExchange(__LONG32 volatile *Target, __LONG32 Value); #if !__has_builtin(_InterlockedExchange) __INTRINSICS_USEINLINE __LONG32 _InterlockedExchange(__LONG32 volatile *Target, __LONG32 Value) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return __mingw_k32_InterlockedExchange(Target, Value); +#else return __sync_lock_test_and_set(Target, Value); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedExchange @@ -1757,7 +1805,14 @@ void *_InterlockedCompareExchangePointer(void * volatile *Destination, void *ExC #if !__has_builtin(_InterlockedCompareExchangePointer) __INTRINSICS_USEINLINE void *_InterlockedCompareExchangePointer(void *volatile *Destination, void *ExChange, void *Comperand) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return (void *)(long)__mingw_k32_InterlockedCompareExchange( + (__LONG32 volatile *)Destination, + (__LONG32)(long)ExChange, + (__LONG32)(long)Comperand); +#else return __sync_val_compare_and_swap(Destination, Comperand, ExChange); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedCompareExchangePointer @@ -1768,7 +1823,13 @@ void *_InterlockedExchangePointer(void *volatile *Target,void *Value); #if !__has_builtin(_InterlockedExchangePointer) __INTRINSICS_USEINLINE void *_InterlockedExchangePointer(void *volatile *Target,void *Value) { +#if defined(__i386__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) + return (void *)(long)__mingw_k32_InterlockedExchange( + (__LONG32 volatile *)Target, + (__LONG32)(long)Value); +#else return __sync_lock_test_and_set(Target, Value); +#endif } #endif #define __INTRINSIC_DEFINED__InterlockedExchangePointer diff --git a/lib/libc/include/any-windows-any/pthread_compat.h b/lib/libc/include/any-windows-any/pthread_compat.h index 3a8552882ea388db6d370093626ccb99ac4ebcbc..816005599ac1ab377b8e8304fcb5f379ea00f94f 100644 --- a/lib/libc/include/any-windows-any/pthread_compat.h +++ b/lib/libc/include/any-windows-any/pthread_compat.h @@ -60,24 +60,31 @@ #ifndef WIN_PTHREADS_PTHREAD_COMPAT_H #define WIN_PTHREADS_PTHREAD_COMPAT_H -#if defined(_USE_32BIT_TIME_T) || (defined(_TIME_BITS) && _TIME_BITS == 32) +#if defined(__cplusplus) && __cplusplus >= 201103L +#define WINPTHREADS_STATIC_ASSERT(expr, msg) static_assert ((expr), msg) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L +#define WINPTHREADS_STATIC_ASSERT(expr, msg) static_assert ((expr), msg) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +#define WINPTHREADS_STATIC_ASSERT(expr, msg) _Static_assert ((expr), msg) +#else +#define WINPTHREADS_STATIC_ASSERT(expr, msg) extern int winpthreads_static_assert[((expr) ? 1 : -1)] +#endif + +#if defined(_USE_32BIT_TIME_T) #define WINPTHREADS_TIME_BITS 32 #else #define WINPTHREADS_TIME_BITS 64 #endif -#if defined(IN_WINPTHREAD) -# if defined(DLL_EXPORT) -# define WINPTHREAD_API __declspec(dllexport) /* building the DLL */ -# else -# define WINPTHREAD_API /* building the static library */ -# endif -#else -# if defined(WINPTHREADS_USE_DLLIMPORT) -# define WINPTHREAD_API __declspec(dllimport) /* user wants explicit `dllimport` */ -# else -# define WINPTHREAD_API /* the default; auto imported in case of DLL */ -# endif +#ifndef WINPTHREAD_API + /** + * Allow `WINPTHREAD_STATIC` to override `WINPTHREADS_USE_DLLIMPORT`. + */ +# if defined(WINPTHREADS_USE_DLLIMPORT) && !defined(WINPTHREAD_STATIC) +# define WINPTHREAD_API __declspec(dllimport) +# else +# define WINPTHREAD_API +# endif #endif #ifndef __clockid_t_defined @@ -110,9 +117,24 @@ typedef unsigned short mode_t; #elif _MSC_VER +/** + * If package which includes this header file is using autoconf and calls + * AC_TYPE_PID_T macro, the check for pid_t will fail and it will define pid_t + * as a macro in config.h - this eventually results in compilation error. + * + * Luckily, it defines it to the same base type, so we can simply undefine it. + */ #ifdef _WIN64 +#ifdef pid_t +WINPTHREADS_STATIC_ASSERT (sizeof (pid_t) == sizeof(__int64), "pid_t is defined as a macro with mismatching base type"); +#undef pid_t +#endif typedef __int64 pid_t; #else +#ifdef pid_t +WINPTHREADS_STATIC_ASSERT (sizeof (pid_t) == sizeof(int), "pid_t is defined as a macro with mismatching base type"); +#undef pid_t +#endif typedef int pid_t; #endif @@ -124,25 +146,59 @@ typedef int pid_t; #endif #ifndef WINPTHREAD_CLOCK_DECL -#define WINPTHREAD_CLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_CLOCK_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_CLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_COND_DECL -#define WINPTHREAD_COND_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_COND_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_COND_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_MUTEX_DECL -#define WINPTHREAD_MUTEX_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_MUTEX_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_MUTEX_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_NANOSLEEP_DECL -#define WINPTHREAD_NANOSLEEP_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_NANOSLEEP_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_NANOSLEEP_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_RWLOCK_DECL -#define WINPTHREAD_RWLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_RWLOCK_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_RWLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_SEM_DECL -#define WINPTHREAD_SEM_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_SEM_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_SEM_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif + #ifndef WINPTHREAD_THREAD_DECL -#define WINPTHREAD_THREAD_DECL static WINPTHREADS_ALWAYS_INLINE +# ifdef __cplusplus +# define WINPTHREAD_THREAD_DECL WINPTHREADS_ALWAYS_INLINE +# else +# define WINPTHREAD_THREAD_DECL static WINPTHREADS_ALWAYS_INLINE +# endif #endif #endif diff --git a/lib/libc/include/any-windows-any/qedit.h b/lib/libc/include/any-windows-any/qedit.h index bec47289ae8f993fe2054d30b53a13bcbe665311..f14b532cfeb57068b5f106ecd0d8aee1cd1625dd 100644 --- a/lib/libc/include/any-windows-any/qedit.h +++ b/lib/libc/include/any-windows-any/qedit.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/qedit.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/qnetwork.h b/lib/libc/include/any-windows-any/qnetwork.h index 315d9e1e670829cd3ba87bd29e059dc2d358fa03..e2a92dfbae5b908f22c7e27311039d712422da47 100644 --- a/lib/libc/include/any-windows-any/qnetwork.h +++ b/lib/libc/include/any-windows-any/qnetwork.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/qnetwork.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/qnetwork.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/rdpencomapi.h b/lib/libc/include/any-windows-any/rdpencomapi.h index c7557e5e705e176b6f5d6f58fe13b0d84ac88c6a..47d2b4e4c4f4cdc3701564821987a35408beb318 100644 --- a/lib/libc/include/any-windows-any/rdpencomapi.h +++ b/lib/libc/include/any-windows-any/rdpencomapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/rdpencomapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/rdpencomapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/regbag.h b/lib/libc/include/any-windows-any/regbag.h index 88a28fcca67b1a410b4330e47363d1aaab829f20..708dfc147d9fe47fbee930296f9e993d8b86ba86 100644 --- a/lib/libc/include/any-windows-any/regbag.h +++ b/lib/libc/include/any-windows-any/regbag.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/regbag.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/regbag.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/relogger.h b/lib/libc/include/any-windows-any/relogger.h index 07ab6fcd63960fb70f91398f23eb3f74bd91b21f..e1414bbc02ff3a0bfd38c39024e1d474e3ad263d 100644 --- a/lib/libc/include/any-windows-any/relogger.h +++ b/lib/libc/include/any-windows-any/relogger.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/relogger.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/relogger.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/robuffer.h b/lib/libc/include/any-windows-any/robuffer.h index c401477681ee5a5f9bb9100087215abd06af38e7..38b3717e43abae9709280de148a581f4d26b8f2f 100644 --- a/lib/libc/include/any-windows-any/robuffer.h +++ b/lib/libc/include/any-windows-any/robuffer.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/robuffer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/robuffer.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/rtworkq.h b/lib/libc/include/any-windows-any/rtworkq.h index 6cb0d6bb550322020a844671f6e9e3bd25debe29..a5c4188e9e206fc61928796bcde78dc729cb9f1a 100644 --- a/lib/libc/include/any-windows-any/rtworkq.h +++ b/lib/libc/include/any-windows-any/rtworkq.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/rtworkq.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/rtworkq.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sal.h b/lib/libc/include/any-windows-any/sal.h index aac0963986d823f3bce7e0a9e4408c422a6494c5..4471d3a0227d3401f143261a298075501738720d 100644 --- a/lib/libc/include/any-windows-any/sal.h +++ b/lib/libc/include/any-windows-any/sal.h @@ -570,6 +570,7 @@ #define __deref_opt_out_bcount(x) #define __deref_out #define __deref_out_ecount(size) +#define __deref_out_ecount_full(size) #define __deref_out_opt #define __range(x,y) diff --git a/lib/libc/include/any-windows-any/sapi51.h b/lib/libc/include/any-windows-any/sapi51.h index 8678420efc576d3e6a353a48492c4deb7dc898c3..ad5fb211465441ffcda7b7823b97dc1b0ef7c69c 100644 --- a/lib/libc/include/any-windows-any/sapi51.h +++ b/lib/libc/include/any-windows-any/sapi51.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/sapi51.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/sapi51.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sapi53.h b/lib/libc/include/any-windows-any/sapi53.h index 897f9374351701b1080a8307182a0b2f854725f2..f1adc34284a6759cc6ff9e88a0f7189d90511e5c 100644 --- a/lib/libc/include/any-windows-any/sapi53.h +++ b/lib/libc/include/any-windows-any/sapi53.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/sapi53.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/sapi53.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sapi54.h b/lib/libc/include/any-windows-any/sapi54.h index 9addb7331bcb76af96b3512a895bd541c173774d..a459f73e98c9fa2ea553abeeb9383eed810cbe1c 100644 --- a/lib/libc/include/any-windows-any/sapi54.h +++ b/lib/libc/include/any-windows-any/sapi54.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/sapi54.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/sapi54.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sdks/_mingw_ddk.h b/lib/libc/include/any-windows-any/sdks/_mingw_ddk.h deleted file mode 100644 index d4ec07e213fb6e0560b7109a08ce2220f85709d4..0000000000000000000000000000000000000000 --- a/lib/libc/include/any-windows-any/sdks/_mingw_ddk.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MINGW_DDK_H -#define MINGW_DDK_H -#if 1 -#define MINGW_HAS_DDK_H 1 -#endif -#endif diff --git a/lib/libc/include/any-windows-any/sec_api/conio_s.h b/lib/libc/include/any-windows-any/sec_api/conio_s.h index d7f0e9eb35398de0ac1a1c65aed1733051a5ddce..3736d152586bf9196ef14d087707e806f79bc251 100644 --- a/lib/libc/include/any-windows-any/sec_api/conio_s.h +++ b/lib/libc/include/any-windows-any/sec_api/conio_s.h @@ -22,28 +22,23 @@ extern "C" { #endif +/** + * Functions to read/write strings from/to console. + */ + _SECIMP errno_t __cdecl _cgets_s (char *_Buffer,size_t _Size,size_t *_SizeRead); __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgets_s, char, _Buffer, size_t*, _SizeRead) +/** + * Formatted console I/O functions. + */ + _SECIMP int __cdecl _cprintf_s (const char *_Format,...); - _CRTIMP int __cdecl _cscanf_s(const char *_Format,...); - _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...); - _SECIMP int __cdecl _vcprintf_s (const char *_Format,va_list _ArgList); _SECIMP int __cdecl _cprintf_s_l (const char *_Format,_locale_t _Locale,...); + _SECIMP int __cdecl _vcprintf_s (const char *_Format,va_list _ArgList); _SECIMP int __cdecl _vcprintf_s_l (const char *_Format,_locale_t _Locale,va_list _ArgList); - -#ifndef _WCONIO_S_DEFINED -#define _WCONIO_S_DEFINED - _SECIMP errno_t __cdecl _cgetws_s (wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgetws_s, wchar_t, _Buffer, size_t*, _SizeRead) - - _SECIMP int __cdecl _cwprintf_s (const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _SECIMP int __cdecl _vcwprintf_s (const wchar_t *_Format,va_list _ArgList); - _SECIMP int __cdecl _cwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,...); - _SECIMP int __cdecl _vcwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); -#endif + _CRTIMP int __cdecl _cscanf_s(const char *_Format,...); + _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...); #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/sec_api/wchar_s.h b/lib/libc/include/any-windows-any/sec_api/wchar_s.h index de932a8bb26b3d4920d2182d1fd47607d17f8f58..a5fe23f4b8e701c3608a5088fad35f2b21b58435 100644 --- a/lib/libc/include/any-windows-any/sec_api/wchar_s.h +++ b/lib/libc/include/any-windows-any/sec_api/wchar_s.h @@ -27,17 +27,6 @@ extern "C" { _SECIMP errno_t __cdecl _wmktemp_s (wchar_t *_TemplateName,size_t _SizeInWords); #endif -#ifndef _WCONIO_S_DEFINED -#define _WCONIO_S_DEFINED - _SECIMP errno_t __cdecl _cgetws_s (wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead); - _SECIMP int __cdecl _cwprintf_s (const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _SECIMP int __cdecl _vcwprintf_s (const wchar_t *_Format,va_list _ArgList); - _SECIMP int __cdecl _cwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,...); - _SECIMP int __cdecl _vcwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); -#endif - #ifndef _WSTDIO_S_DEFINED #define _WSTDIO_S_DEFINED _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); diff --git a/lib/libc/include/any-windows-any/sec_api/wconio_s.h b/lib/libc/include/any-windows-any/sec_api/wconio_s.h new file mode 100644 index 0000000000000000000000000000000000000000..4e139076057550957bb37a8e72003e3e85b15059 --- /dev/null +++ b/lib/libc/include/any-windows-any/sec_api/wconio_s.h @@ -0,0 +1,47 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _INC_WCONIO_S +#define _INC_WCONIO_S + +#include + +#if defined(__LIBMSVCRT__) +/* When building mingw-w64, this should be blank. */ +#define _SECIMP +#else +#ifndef _SECIMP +#define _SECIMP __declspec(dllimport) +#endif /* _SECIMP */ +#endif /* defined(__LIBMSVCRT__) */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Functions to read/write strings from/to console. + */ + +_SECIMP errno_t __cdecl _cgetws_s (wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead); +__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgetws_s, wchar_t, _Buffer, size_t*, _SizeRead) + +/** + * Formatted console I/O functions. + */ + +_SECIMP int __cdecl _cwprintf_s (const wchar_t *_Format,...); +_SECIMP int __cdecl _cwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,...); +_SECIMP int __cdecl _vcwprintf_s (const wchar_t *_Format,va_list _ArgList); +_SECIMP int __cdecl _vcwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +_CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...); +_CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_WCONIO_S */ diff --git a/lib/libc/include/any-windows-any/sensorsapi.h b/lib/libc/include/any-windows-any/sensorsapi.h index c173dd49e2be5cefacb398ae393c65e20d15fcc1..9f4ebf1f8e15830192bd3f7110f3373af3cabb57 100644 --- a/lib/libc/include/any-windows-any/sensorsapi.h +++ b/lib/libc/include/any-windows-any/sensorsapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/sensorsapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/sensorsapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/servprov.h b/lib/libc/include/any-windows-any/servprov.h index 11d7aa20c0cd643742093e5d308635b81db1a39e..7d2f0bfdd5c0320d19b41121b2211a6267aced5d 100644 --- a/lib/libc/include/any-windows-any/servprov.h +++ b/lib/libc/include/any-windows-any/servprov.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/servprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/servprov.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/setjmp.h b/lib/libc/include/any-windows-any/setjmp.h index 74e7c7ea4a37e8957cbc9f2061fad237bd360d11..0d85d0e9f9f8444f96b2bf191a16d5dd3179f80e 100644 --- a/lib/libc/include/any-windows-any/setjmp.h +++ b/lib/libc/include/any-windows-any/setjmp.h @@ -26,7 +26,7 @@ extern "C" { #endif -#if (defined(_X86_) && !defined(__x86_64)) +#if defined(__i386__) #define _JBLEN 16 #define _JBTYPE int @@ -40,6 +40,7 @@ extern "C" { unsigned long Eip; unsigned long Registration; unsigned long TryLevel; + /* Following fields are only for new _setjmp3(), the are not for old _setjmp(). */ unsigned long Cookie; unsigned long UnwindFunc; unsigned long UnwindData[6]; @@ -107,7 +108,7 @@ extern "C" { } _JUMP_BUFFER; -#elif defined(__x86_64) +#elif defined(__x86_64__) typedef _CRT_ALIGN(16) struct _SETJMP_FLOAT128 { __MINGW_EXTENSION unsigned __int64 Part[2]; @@ -202,68 +203,83 @@ extern "C" { #define _JMP_BUF_DEFINED #endif -_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value); +_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf, int _Value); /* for setjmp.h and non-i386 setjmpex.h */ +#ifdef __i386__ +_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl _longjmpex(jmp_buf _Buf, int _Value); /* for i386 setjmpex.h */ +#endif + +#ifdef __i386__ +_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf); /* old i386 crtdll setjmp.h */ +_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, int _Count, ...); /* new i386 msvcrt20+ setjmp.h and setjmpex.h */ +#else +#ifndef __aarch64__ +_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Frame); /* for non-i386 and non-aarch64 setjmp.h */ +#endif +_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf _Buf, void *_Frame); /* for non-i386 setjmpex.h and aarch64 setjmp.h */ +#endif + +#if defined(__arm__) || defined(__aarch64__) +int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf); +__MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf, int _Value); +#endif void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void); +#ifdef __cplusplus +} +#endif + +#pragma pack(pop) +#endif /* _INC_SETJMP */ + +/* + * Now outside of the _INC_SETJMP block, defines setjmp() and longjmp(). + * It allows '#include ' to override the existing setjmp() and longjmp() definitions. + */ + #pragma push_macro("__has_builtin") #ifndef __has_builtin #define __has_builtin(x) 0 #endif -#ifdef _UCRT -# ifdef _WIN64 -# define _setjmp __intrinsic_setjmpex +#ifdef setjmp +# undef setjmp +#endif +#if defined(__i386__) +# define setjmp(BUF) _setjmp3((BUF), 0) +#elif !defined(_INC_SETJMPEX) && (!defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH)) +# if defined(__arm__) || defined(__aarch64__) +# define setjmp(BUF) __mingw_setjmp((BUF)) # else -# define _setjmp __intrinsic_setjmp +# define setjmp(BUF) _setjmp((BUF), NULL) # endif -#elif defined(__aarch64__) - /* ARM64 msvcrt.dll lacks _setjmp, only has _setjmpex. */ -# define _setjmp _setjmpex -#endif -#ifndef _INC_SETJMPEX -# if defined(_X86_) || defined(__i386__) -# define setjmp(BUF) _setjmp3((BUF), NULL) -# elif !defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH) -# if defined(__arm__) || defined(__aarch64__) -# define setjmp(BUF) __mingw_setjmp((BUF)) -# define longjmp __mingw_longjmp - int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf); - __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf,int _Value); -# else -# define setjmp(BUF) _setjmp((BUF), NULL) -# endif -# elif __has_builtin(__builtin_sponentry) +#elif !defined(_INC_SETJMPEX) && !defined(__aarch64__) +# if __has_builtin(__builtin_sponentry) # define setjmp(BUF) _setjmp((BUF), __builtin_sponentry()) # elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__) # define setjmp(BUF) _setjmp((BUF), mingw_getsp()) # else -# define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0)) +# define setjmp(BUF) _setjmp((BUF), __builtin_frame_address(0)) # endif - int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Ctx); - int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, void *_Ctx); #else -# undef setjmp -# ifdef __SEH__ -# if (__MINGW_GCC_VERSION < 40702) && !defined(__clang__) -# define setjmp(BUF) _setjmpex((BUF), mingw_getsp()) -# define setjmpex(BUF) _setjmpex((BUF), mingw_getsp()) -# else -# define setjmp(BUF) _setjmpex((BUF), __builtin_frame_address (0)) -# define setjmpex(BUF) _setjmpex((BUF), __builtin_frame_address (0)) -# endif +# if __has_builtin(__builtin_sponentry) +# define setjmp(BUF) _setjmpex((BUF), __builtin_sponentry()) +# elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__) +# define setjmp(BUF) _setjmpex((BUF), mingw_getsp()) # else -# define setjmp(BUF) _setjmpex((BUF), NULL) -# define setjmpex(BUF) _setjmpex((BUF), NULL) +# define setjmp(BUF) _setjmpex((BUF), __builtin_frame_address(0)) # endif - int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf _Buf,void *_Ctx); +#endif + +#ifdef longjmp +# undef longjmp +#endif +#if defined(_INC_SETJMPEX) && defined(__i386__) +# define longjmp _longjmpex +#elif !defined(_INC_SETJMPEX) && (!defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH)) && (defined(__arm__) || defined(__aarch64__)) +# define longjmp __mingw_longjmp +#else +# define longjmp longjmp #endif #pragma pop_macro("__has_builtin") - -#ifdef __cplusplus -} -#endif - -#pragma pack(pop) -#endif diff --git a/lib/libc/include/any-windows-any/setjmpex.h b/lib/libc/include/any-windows-any/setjmpex.h index c5540b970f0530a01e636bd685018ffe2fb98506..a1017c3e9e4cd4d36ad4889df3598fd6a5a1616c 100644 --- a/lib/libc/include/any-windows-any/setjmpex.h +++ b/lib/libc/include/any-windows-any/setjmpex.h @@ -4,21 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifndef _INC_SETJMPEX +/* setjmp.h defines setjmp() and longjmp() based on _INC_SETJMPEX */ #define _INC_SETJMPEX - -#ifndef _WIN32 -#error Only Win32 target is supported! -#endif - -#if (defined(_X86_) && !defined(__x86_64)) -#define setjmp _setjmp -#define longjmp _longjmpex -#else -#ifdef setjmp -#undef setjmp -#endif -#define setjmp _setjmpex -#endif - #include #endif diff --git a/lib/libc/include/any-windows-any/shldisp.h b/lib/libc/include/any-windows-any/shldisp.h index f0afd65c54e0100097f74986c1d811930660150d..b8b1f432ad9278d8e640a0e2cadc6b2e5c5ad8d9 100644 --- a/lib/libc/include/any-windows-any/shldisp.h +++ b/lib/libc/include/any-windows-any/shldisp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/shldisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/shldisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/shobjidl.h b/lib/libc/include/any-windows-any/shobjidl.h index e6ead3ac01859190d937ab46004571d1e02430b7..a480b13628c25ed5483b4de3d62ebeb8c5e52086 100644 --- a/lib/libc/include/any-windows-any/shobjidl.h +++ b/lib/libc/include/any-windows-any/shobjidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/shobjidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/shobjidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/shtypes.h b/lib/libc/include/any-windows-any/shtypes.h index e87fe79b18f92c21058dcdf8d00cc99c5ae61c0f..74d627699079740fe8adce8b69ab4915ad25b745 100644 --- a/lib/libc/include/any-windows-any/shtypes.h +++ b/lib/libc/include/any-windows-any/shtypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/shtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/shtypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/signal.h b/lib/libc/include/any-windows-any/signal.h index ea59ecbb3618272b85e1dfd77671f97a346f9269..0971201920388f10afab9637c6b5cd74826d1975 100644 --- a/lib/libc/include/any-windows-any/signal.h +++ b/lib/libc/include/any-windows-any/signal.h @@ -45,7 +45,7 @@ extern "C" { #endif #endif - typedef void (*__p_sig_fn_t)(int); + typedef void (__cdecl *__p_sig_fn_t)(int); #define SIG_DFL (__p_sig_fn_t)0 #define SIG_IGN (__p_sig_fn_t)1 diff --git a/lib/libc/include/any-windows-any/spatialaudioclient.h b/lib/libc/include/any-windows-any/spatialaudioclient.h index 0eb9fd3d471a05440f9a30f60bafc315abaebd0c..00c2e8bc1772805f4400a80ffdf24f17653b944f 100644 --- a/lib/libc/include/any-windows-any/spatialaudioclient.h +++ b/lib/libc/include/any-windows-any/spatialaudioclient.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/spatialaudioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/spatialaudioclient.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/spellcheck.h b/lib/libc/include/any-windows-any/spellcheck.h index 0d9d36d4b56f30af1be93e1c5df570f6d372c1fd..cffa0e2b6bed1285fa0bf2c01a24a67441f7b91f 100644 --- a/lib/libc/include/any-windows-any/spellcheck.h +++ b/lib/libc/include/any-windows-any/spellcheck.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/spellcheck.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/spellcheck.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sql.h b/lib/libc/include/any-windows-any/sql.h index bdfd6b751092d36c7f56a93ba0085691ff25fc0b..dbb03ada7ce6ccfc7dc6c8c97936b273dabe48eb 100644 --- a/lib/libc/include/any-windows-any/sql.h +++ b/lib/libc/include/any-windows-any/sql.h @@ -24,6 +24,11 @@ extern "C" { #if (ODBCVER >= 0x0300) #define SQL_NO_DATA 100 #endif + +#if (ODBCVER >= 0x0380) +#define SQL_PARAM_DATA_AVAILABLE 101 +#endif + #define SQL_ERROR (-1) #define SQL_INVALID_HANDLE (-2) @@ -174,6 +179,10 @@ extern "C" { #define SQL_ARD_TYPE (-99) #endif +#if (ODBCVER >= 0x0380) +#define SQL_APD_TYPE (-100) +#endif + #if (ODBCVER >= 0x0300) #define SQL_CODE_DATE 1 #define SQL_CODE_TIME 2 @@ -337,6 +346,10 @@ extern "C" { #define SQL_API_SQLSTATISTICS 53 #define SQL_API_SQLTABLES 54 #define SQL_API_SQLTRANSACT 23 +#if (ODBCVER >= 0x0380) +#define SQL_API_SQLCANCELHANDLE 1550 +#define SQL_API_SQLCOMPLETEASYNC 1551 +#endif #if (ODBCVER >= 0x0300) #define SQL_MAX_DRIVER_CONNECTIONS 0 @@ -491,6 +504,9 @@ extern "C" { SQLRETURN SQL_API SQLBindParam(SQLHSTMT StatementHandle,SQLUSMALLINT ParameterNumber,SQLSMALLINT ValueType,SQLSMALLINT ParameterType,SQLULEN LengthPrecision,SQLSMALLINT ParameterScale,SQLPOINTER ParameterValue,SQLLEN *StrLen_or_Ind); #endif SQLRETURN SQL_API SQLCancel(SQLHSTMT StatementHandle); +#if (ODBCVER >= 0x0380) + SQLRETURN SQL_API SQLCancelHandle(SQLSMALLINT HandleType,SQLHANDLE InputHandle); +#endif #if (ODBCVER >= 0x0300) SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle); #ifdef _WIN64 @@ -500,6 +516,9 @@ extern "C" { #endif #endif SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle,SQLCHAR *CatalogName,SQLSMALLINT NameLength1,SQLCHAR *SchemaName,SQLSMALLINT NameLength2,SQLCHAR *TableName,SQLSMALLINT NameLength3,SQLCHAR *ColumnName,SQLSMALLINT NameLength4); +#if (ODBCVER >= 0x0380) + SQLRETURN SQL_API SQLCompleteAsync(SQLSMALLINT HandleType,SQLHANDLE Handle,RETCODE *AsyncRetCodePtr); +#endif SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3); #if (ODBCVER >= 0x0300) SQLRETURN SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,SQLHDESC TargetDescHandle); diff --git a/lib/libc/include/any-windows-any/stddef.h b/lib/libc/include/any-windows-any/stddef.h index 03c8ebf86cb83ba20f94b7d671af6f35c9ec9087..614329f9c4c19e53d8dfc0aab7c07f23da7497b8 100644 --- a/lib/libc/include/any-windows-any/stddef.h +++ b/lib/libc/include/any-windows-any/stddef.h @@ -17,8 +17,8 @@ extern "C" { #define _CRT_ERRNO_DEFINED _CRTIMP extern int *__cdecl _errno(void); #define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); + _CRTIMP errno_t __cdecl _set_errno(int _Value); + _CRTIMP errno_t __cdecl _get_errno(int *_Value); #endif /* _CRT_ERRNO_DEFINED */ _CRTIMP extern unsigned long __cdecl __threadid(void); diff --git a/lib/libc/include/any-windows-any/stdio.h b/lib/libc/include/any-windows-any/stdio.h index 91d617fc0fb247b66d599b1f80a27db3a417b5d0..0428e44eee5532460192c80ad1a07d6ffd3ed2fe 100644 --- a/lib/libc/include/any-windows-any/stdio.h +++ b/lib/libc/include/any-windows-any/stdio.h @@ -569,62 +569,42 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li #endif _CRTIMP int __cdecl _flushall(void); FILE *__cdecl fopen(const char * __restrict__ _Filename,const char * __restrict__ _Mode) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - FILE *fopen64(const char * __restrict__ filename,const char * __restrict__ mode); + FILE *__cdecl fopen64(const char * __restrict__ filename,const char * __restrict__ mode); int __cdecl fputc(int _Ch,FILE *_File); _CRTIMP int __cdecl _fputchar(int _Ch); int __cdecl fputs(const char * __restrict__ _Str,FILE * __restrict__ _File); size_t __cdecl fread(void * __restrict__ _DstBuf,size_t _ElementSize,size_t _Count,FILE * __restrict__ _File); FILE *__cdecl freopen(const char * __restrict__ _Filename,const char * __restrict__ _Mode,FILE * __restrict__ _File) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + FILE *__cdecl freopen64(const char * __restrict__ _Filename,const char * __restrict__ _Mode,FILE * __restrict__ _File); int __cdecl fsetpos(FILE *_File,const fpos_t *_Pos); int __cdecl fsetpos64(FILE *_File,const fpos_t *_Pos); /* fsetpos already 64bit */ int __cdecl fseek(FILE *_File,long _Offset,int _Origin); long __cdecl ftell(FILE *_File); - /* Shouldn't be any fseeko32 in glibc, 32bit to 64bit casting should be fine */ - /* int fseeko32(FILE* stream, _off_t offset, int whence);*/ /* fseeko32 redirects to fseeko64 */ _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); -#ifdef _UCRT - __mingw_ovr int fseeko(FILE *_File, _off_t _Offset, int _Origin) { - return fseek(_File, _Offset, _Origin); - } - __mingw_ovr int fseeko64(FILE *_File, _off64_t _Offset, int _Origin) { - return _fseeki64(_File, _Offset, _Origin); - } - __mingw_ovr _off_t ftello(FILE *_File) { - return ftell(_File); - } - __mingw_ovr _off64_t ftello64(FILE *_File) { - return _ftelli64(_File); - } +#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) + int __cdecl fseeko(FILE *_File, _off64_t _Offset, int _Origin) __MINGW_ASM_CALL(fseeko64); #else - int fseeko64(FILE* stream, _off64_t offset, int whence); - int fseeko(FILE* stream, _off_t offset, int whence); - /* Returns truncated 64bit off_t */ - _off_t ftello(FILE * stream); - _off64_t ftello64(FILE * stream); + int __cdecl fseeko(FILE *_File, _off_t _Offset, int _Origin); #endif - -#ifndef _FILE_OFFSET_BITS_SET_FSEEKO -#define _FILE_OFFSET_BITS_SET_FSEEKO -#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) -#define fseeko fseeko64 -#endif /* (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) */ -#endif /* _FILE_OFFSET_BITS_SET_FSEEKO */ - -#ifndef _FILE_OFFSET_BITS_SET_FTELLO -#define _FILE_OFFSET_BITS_SET_FTELLO + _CRTIMP int __cdecl fseeko64(FILE *_File, _off64_t _Offset, int _Origin); #if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) -#define ftello ftello64 -#endif /* (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) */ -#endif /* _FILE_OFFSET_BITS_SET_FTELLO */ + _off64_t __cdecl ftello(FILE *_File) __MINGW_ASM_CALL(ftello64); +#else + _off_t __cdecl ftello(FILE *_File); +#endif + _CRTIMP _off64_t __cdecl ftello64(FILE *_File); size_t __cdecl fwrite(const void * __restrict__ _Str,size_t _Size,size_t _Count,FILE * __restrict__ _File); int __cdecl getc(FILE *_File); int __cdecl getchar(void); _CRTIMP int __cdecl _getmaxstdio(void); char *__cdecl gets(char *_Buffer) - __attribute__((__warning__("Using gets() is always unsafe - use fgets() instead"))); +#ifndef _CRTBLD + __attribute__((__warning__("Using gets() is always unsafe - use fgets() instead"))) +#endif +; int __cdecl _getw(FILE *_File); #ifndef _CRT_PERROR_DEFINED #define _CRT_PERROR_DEFINED @@ -675,6 +655,7 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) _CRTIMP int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList); FILE *__cdecl tmpfile(void) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + FILE *__cdecl tmpfile64(void); char *__cdecl tmpnam(char *_Buffer); int __cdecl ungetc(int _Ch,FILE *_File); @@ -1096,48 +1077,33 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #endif /* __NO_ISOCEXT */ #else /* !__USE_MINGW_ANSI_STDIO */ - -#ifdef _UCRT __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); + __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl wscanf(const wchar_t * __restrict__ _Format,...); - __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv); __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv); - __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, va_list __local_argv); - - int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); - int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); - int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); - int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#else - - int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv); + int __cdecl vfwscanf(FILE *__stream, const wchar_t *__format, va_list __local_argv); __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv); + int __cdecl vswscanf(const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv); __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv); - -#endif /* __NO_ISOCEXT */ + int __cdecl vwscanf(const wchar_t *__format, va_list __local_argv); int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); -#endif /* _UCRT */ + + int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); + int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); + int __cdecl snwprintf(wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); + int __cdecl vsnwprintf(wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg); #endif /* __USE_MINGW_ANSI_STDIO */ #ifndef WEOF @@ -1164,73 +1130,17 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#ifdef _UCRT - __mingw_ovr - int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - -#if __USE_MINGW_ANSI_STDIO == 0 - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); - int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); - - int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg); -#endif - - __mingw_ovr - int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, (size_t)-1, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr - int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args) - { - return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, (size_t)-1, _Format, NULL, _Args); - } - - __mingw_ovr - int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format, va_list _ArgList) - { - int _Result = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, _Format, NULL, _ArgList); - return _Result < 0 ? -1 : _Result; - } -#else _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...); +#ifndef _UCRT _CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList); +#endif /* _UCRT */ _CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); - -#ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - -#if __USE_MINGW_ANSI_STDIO == 0 - int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf); - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf); -#endif - -#endif /* ! __NO_ISOCEXT */ _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); - int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); -#endif /* _UCRT */ - #ifndef RC_INVOKED #include #endif @@ -1293,17 +1203,10 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #define _STDIO_DEFINED #endif -#ifdef _UCRT _CRTIMP int __cdecl _fgetc_nolock(FILE *_File); _CRTIMP int __cdecl _fputc_nolock(int _Char, FILE *_File); _CRTIMP int __cdecl _getc_nolock(FILE *_File); _CRTIMP int __cdecl _putc_nolock(int _Char, FILE *_File); -#else -#define _fgetc_nolock(_stream) (--(_stream)->_cnt >= 0 ? 0xff & *(_stream)->_ptr++ : _filbuf(_stream)) -#define _fputc_nolock(_c,_stream) (--(_stream)->_cnt >= 0 ? 0xff & (*(_stream)->_ptr++ = (char)(_c)) : _flsbuf((_c),(_stream))) -#define _getc_nolock(_stream) _fgetc_nolock(_stream) -#define _putc_nolock(_c,_stream) _fputc_nolock(_c,_stream) -#endif #define _getchar_nolock() _getc_nolock(stdin) #define _putchar_nolock(_c) _putc_nolock((_c),stdout) #define _getwchar_nolock() _getwc_nolock(stdin) diff --git a/lib/libc/include/any-windows-any/stdlib.h b/lib/libc/include/any-windows-any/stdlib.h index 482971357cfe67803cd69d9ea99db75b92930168..794ba779057522f1d419a79785342442903ef273 100644 --- a/lib/libc/include/any-windows-any/stdlib.h +++ b/lib/libc/include/any-windows-any/stdlib.h @@ -145,8 +145,8 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #define _CRT_ERRNO_DEFINED _CRTIMP extern int *__cdecl _errno(void); #define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); + _CRTIMP errno_t __cdecl _set_errno(int _Value); + _CRTIMP errno_t __cdecl _get_errno(int *_Value); #endif _CRTIMP unsigned long *__cdecl __doserrno(void); #define _doserrno (*__doserrno()) @@ -192,7 +192,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #endif #ifndef _POSIX_ -#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) && !defined(_UCRT) +#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) || defined(_ARM64EC_) || defined(__arm64ec__)) && !defined(_UCRT) /* The plain msvcrt.dll for arm/aarch64 lacks * _environ/_wenviron, but has these functions instead. */ _CRTIMP void __cdecl _get_environ(char ***); @@ -342,17 +342,20 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _strtoui64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); ldiv_t __cdecl ldiv(long _Numerator,long _Denominator); _CRTIMP char *__cdecl _ltoa(long _Value,char *_Dest,int _Radix) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl mblen(const char *_Ch,size_t _MaxCount); + _CRTIMP int __cdecl mblen(const char *_Ch,size_t _MaxCount); _CRTIMP int __cdecl _mblen_l(const char *_Ch,size_t _MaxCount,_locale_t _Locale); _CRTIMP size_t __cdecl _mbstrlen(const char *_Str); _CRTIMP size_t __cdecl _mbstrlen_l(const char *_Str,_locale_t _Locale); +#if __MSVCRT_VERSION__ >= 0x0800 _CRTIMP size_t __cdecl _mbstrnlen(const char *_Str,size_t _MaxCount); _CRTIMP size_t __cdecl _mbstrnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); - int __cdecl mbtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SrcSizeInBytes); +#endif + _CRTIMP int __cdecl mbtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SrcSizeInBytes); _CRTIMP int __cdecl _mbtowc_l(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SrcSizeInBytes,_locale_t _Locale); - size_t __cdecl mbstowcs(wchar_t * __restrict__ _Dest,const char * __restrict__ _Source,size_t _MaxCount); + _CRTIMP size_t __cdecl mbstowcs(wchar_t * __restrict__ _Dest,const char * __restrict__ _Source,size_t _MaxCount); _CRTIMP size_t __cdecl _mbstowcs_l(wchar_t * __restrict__ _Dest,const char * __restrict__ _Source,size_t _MaxCount,_locale_t _Locale); - int __cdecl mkstemp(char *template_name); + int __cdecl mkstemp(char *_TemplateName); + char *__cdecl mkdtemp(char *_TemplateName); int __cdecl rand(void); _CRTIMP int __cdecl _set_error_mode(int _Mode); void __cdecl srand(unsigned int _Seed); @@ -412,9 +415,9 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re int __cdecl system(const char *_Command); #endif _CRTIMP char *__cdecl _ultoa(unsigned long _Value,char *_Dest,int _Radix) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl wctomb(char *_MbCh,wchar_t _WCh) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP int __cdecl wctomb(char *_MbCh,wchar_t _WCh) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _wctomb_l(char *_MbCh,wchar_t _WCh,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl wcstombs(char * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP size_t __cdecl wcstombs(char * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP size_t __cdecl _wcstombs_l(char * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _MaxCount,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #ifndef _CRT_ALLOCATION_DEFINED @@ -463,6 +466,10 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset); +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L + size_t __cdecl memalignment(const void *_Memory); +#endif + #if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) #pragma pop_macro("calloc") #pragma pop_macro("free") diff --git a/lib/libc/include/any-windows-any/string.h b/lib/libc/include/any-windows-any/string.h index 1832e38ed85a92d6f6abbbd0993889fddf303040..d8382fa3c22561452c0aaacef7879f68c63c99f0 100644 --- a/lib/libc/include/any-windows-any/string.h +++ b/lib/libc/include/any-windows-any/string.h @@ -7,15 +7,7 @@ #define _INC_STRING #include - -#if defined(__LIBMSVCRT__) -/* When building mingw-w64, this should be blank. */ -#define _SECIMP -#else -#ifndef _SECIMP -#define _SECIMP __declspec(dllimport) -#endif /* _SECIMP */ -#endif /* defined(__LIBMSVCRT__) */ +#include #ifdef __cplusplus extern "C" { @@ -38,24 +30,6 @@ extern "C" { #endif #endif -#define _WConst_return _CONST_RETURN - -#ifndef _CRT_MEMORY_DEFINED -#define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - void * __cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _SECIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count); - void * __cdecl mempcpy (void *_Dst, const void *_Src, size_t _Size); - void * __cdecl memset(void *_Dst,int _Val,size_t _Size); -#ifndef NO_OLDNAMES - void * __cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; - int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size) __MINGW_ATTRIB_DEPRECATED_MSVC2005; -#endif -#endif char * __cdecl _strset(char *_Str,int _Val) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; char * __cdecl _strset_l(char *_Str,int _Val,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; char * __cdecl strcpy(char * __restrict__ _Dest,const char * __restrict__ _Source); @@ -71,12 +45,25 @@ extern "C" { _CRTIMP char *__cdecl _strdup(const char *_Src); #if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) #pragma pop_macro("_strdup") +#endif +#if !defined(__STRICT_ANSI__) || defined(_GNU_SOURCE) || __STDC_VERSION__ + 0 >= 202311L || _POSIX_C_SOURCE + 0 >= 200809L || _XOPEN_SOURCE + 0 >= 600 +#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) +#pragma push_macro("strdup") +#undef strdup +#endif + char *__cdecl strdup(const char *_Src); +#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) +#pragma pop_macro("strdup") +#endif +#endif +#if !defined(__STRICT_ANSI__) || defined(_GNU_SOURCE) || __STDC_VERSION__ + 0 >= 202311L || _POSIX_C_SOURCE + 0 >= 200809L || _XOPEN_SOURCE + 0 >= 700 + char *__cdecl strndup(const char *_Src,size_t _MaxCount); #endif _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val); _CRTIMP int __cdecl _stricmp(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _strcmpi(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _stricmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - int __cdecl strcoll(const char *_Str1,const char *_Str2); + _CRTIMP int __cdecl strcoll(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _strcoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _stricoll(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _stricoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); @@ -86,7 +73,7 @@ extern "C" { _CRTIMP int __cdecl _strnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); size_t __cdecl strcspn(const char *_Str,const char *_Control); _CRTIMP char *__cdecl _strerror(const char *_ErrMsg) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - char *__cdecl strerror(int) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP char *__cdecl strerror(int) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP char *__cdecl _strlwr(char *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; char *strlwr_l(char *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; char *__cdecl strncat(char * __restrict__ _Dest,const char * __restrict__ _Source,size_t _Count) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -101,14 +88,14 @@ extern "C" { _CRTIMP char *__cdecl _strrev(char *_Str); size_t __cdecl strspn(const char *_Str,const char *_Control); _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); - char *__cdecl strtok(char * __restrict__ _Str,const char * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP char *__cdecl strtok(char * __restrict__ _Str,const char * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #pragma push_macro("strtok_r") #undef strtok_r char *strtok_r(char * __restrict__ _Str, const char * __restrict__ _Delim, char ** __restrict__ __last); #pragma pop_macro("strtok_r") _CRTIMP char *__cdecl _strupr(char *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl strxfrm(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount); + _CRTIMP size_t __cdecl strxfrm(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); #ifndef NO_OLDNAMES @@ -126,13 +113,6 @@ extern "C" { int __cdecl strnicmp(const char *_Str1,const char *_Str,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005; int __cdecl strncasecmp (const char *, const char *, size_t); int __cdecl strcasecmp (const char *, const char *); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl strncasecmp (const char *__sz1, const char *__sz2, size_t __sizeMaxCompare) { return _strnicmp (__sz1, __sz2, __sizeMaxCompare); } - __CRT_INLINE int __cdecl strcasecmp (const char *__sz1, const char *__sz2) { return _stricmp (__sz1, __sz2); } -#else -#define strncasecmp _strnicmp -#define strcasecmp _stricmp -#endif /* !__CRT__NO_INLINE */ char *__cdecl strnset(char *_Str,int _Val,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005; char *__cdecl strrev(char *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005; char *__cdecl strset(char *_Str,int _Val) __MINGW_ATTRIB_DEPRECATED_MSVC2005; @@ -165,8 +145,8 @@ extern "C" { _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #if defined(_CRT_NON_CONFORMING_WCSTOK) && !defined(__cplusplus) #define wcstok _wcstok #endif @@ -186,9 +166,9 @@ extern "C" { _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); + _CRTIMP size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); - int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); diff --git a/lib/libc/include/any-windows-any/strmif.h b/lib/libc/include/any-windows-any/strmif.h index 16e6d17408a036853425f9a67be3841e46aeeb62..c075ccb8e2adb83649d8dbb3db3f15c14885b77e 100644 --- a/lib/libc/include/any-windows-any/strmif.h +++ b/lib/libc/include/any-windows-any/strmif.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/strmif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/strmif.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/structuredquerycondition.h b/lib/libc/include/any-windows-any/structuredquerycondition.h index d253110575ef16dcb80f75a0044fc10da6b356ee..e188cdbab5710dd7a0f8fce7addebcb141e01bda 100644 --- a/lib/libc/include/any-windows-any/structuredquerycondition.h +++ b/lib/libc/include/any-windows-any/structuredquerycondition.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/structuredquerycondition.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/structuredquerycondition.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/swprintf.inl b/lib/libc/include/any-windows-any/swprintf.inl index 3fe7712c0c61b05c31f3a12e8678217ff7aac63e..7adfbb6ef1a1761eaa6a0c46986a08b0255a07a0 100644 --- a/lib/libc/include/any-windows-any/swprintf.inl +++ b/lib/libc/include/any-windows-any/swprintf.inl @@ -7,36 +7,15 @@ #ifndef _INC_SWPRINTF_INL #define _INC_SWPRINTF_INL -#include - #ifdef __cplusplus extern "C++" { -__mingw_ovr /* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) -int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv) -{ - return _vswprintf( __stream, __format, __local_argv ); -} +int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv) __MINGW_ASM_CALL(_vswprintf); -__mingw_ovr /* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) -int swprintf (wchar_t *__stream, const wchar_t *__format, ...) -{ -#ifdef __clang__ - /* clang does not support __builtin_va_arg_pack(), so forward swprintf() to vswprintf() */ - int __retval; - __builtin_va_list __local_argv; - - __builtin_va_start( __local_argv, __format ); - __retval = vswprintf( __stream, __format, __local_argv ); - __builtin_va_end( __local_argv ); - return __retval; -#else - return _swprintf( __stream, __format, __builtin_va_arg_pack() ); -#endif -} +int swprintf (wchar_t *__stream, const wchar_t *__format, ...) __MINGW_ASM_CALL(_swprintf); } diff --git a/lib/libc/include/any-windows-any/sys/stat.h b/lib/libc/include/any-windows-any/sys/stat.h index 5d2e6dfaf0316f82427a9d924832a75b378afdf4..347f66eef77b92316548a5b64aa826269597ebb1 100644 --- a/lib/libc/include/any-windows-any/sys/stat.h +++ b/lib/libc/include/any-windows-any/sys/stat.h @@ -149,21 +149,21 @@ struct stat { }; #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) #ifdef _USE_32BIT_TIME_T -int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat32i64); +int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(fstat32i64); int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat32i64); int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat32i64); #else -int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat64); +int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(fstat64); int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat64); int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat64); #endif #else #ifdef _USE_32BIT_TIME_T -int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat32); +int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(fstat32); int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat32); int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat32); #else -int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(_fstat64i32); +int __cdecl fstat(int _Desc, struct stat *_Stat) __MINGW_ASM_CALL(fstat64i32); int __cdecl stat(const char *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(stat64i32); int __cdecl wstat(const wchar_t *_Filename, struct stat *_Stat) __MINGW_ASM_CALL(wstat64i32); #endif diff --git a/lib/libc/include/any-windows-any/sys/timeb.h b/lib/libc/include/any-windows-any/sys/timeb.h index 8613661a11cd67d048f7260c476f07e894d1d3d4..d52fd9c7f760fe49ff3f6a5c3e02e0ee71fced59 100644 --- a/lib/libc/include/any-windows-any/sys/timeb.h +++ b/lib/libc/include/any-windows-any/sys/timeb.h @@ -78,6 +78,11 @@ extern "C" { _CRTIMP void __cdecl _ftime64(struct __timeb64 *_Time); _CRTIMP void __cdecl _ftime32(struct __timeb32 *_Time); +/* + * To prevent ABI issues, the mingw-w64 runtime should not call the + * _timeb and _ftime functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifndef _USE_32BIT_TIME_T #define _timeb __timeb64 #define _ftime _ftime64 @@ -85,6 +90,7 @@ extern "C" { #define _timeb __timeb32 #define _ftime _ftime32 #endif +#endif /* _CRTBLD */ struct _timespec32 { __time32_t tv_sec; @@ -109,13 +115,19 @@ struct itimerspec { }; #endif +/* + * To prevent ABI issues, the mingw-w64 runtime should not call the + * ftime function. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) #ifndef _USE_32BIT_TIME_T - void __cdecl ftime (struct timeb *) __MINGW_ASM_CALL(_ftime64); + int __cdecl ftime (struct timeb *) __MINGW_ASM_CALL(ftime64); #else - void __cdecl ftime (struct timeb *) __MINGW_ASM_CALL(_ftime32); + int __cdecl ftime (struct timeb *) __MINGW_ASM_CALL(ftime32); #endif /* _USE_32BIT_TIME_T */ #endif +#endif /* _CRTBLD */ #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/sys/utime.h b/lib/libc/include/any-windows-any/sys/utime.h index df0c701a00d517eee6fc611bc54810c6625870c5..6109da61c83b8aa7c0181a659686f12e8306fe9f 100644 --- a/lib/libc/include/any-windows-any/sys/utime.h +++ b/lib/libc/include/any-windows-any/sys/utime.h @@ -91,43 +91,30 @@ extern "C" { _CRTIMP int __cdecl _wutime64(const wchar_t *_Filename,struct __utimbuf64 *_Time); #ifndef RC_INVOKED -int __cdecl _utime(const char *,struct _utimbuf *); -int __cdecl _futime(int,struct _utimbuf *); -int __cdecl _wutime(const wchar_t *,struct _utimbuf *); -#ifndef __CRT__NO_INLINE + +/* + * To prevent ABI issues, the mingw-w64 runtime should not call these + * functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T -__CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { - return _utime32(_Filename,(struct __utimbuf32 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { - return _futime32(_Desc,(struct __utimbuf32 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { - return _wutime32(_Filename,(struct __utimbuf32 *)_Utimbuf); -} + int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_utime32); + int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_futime32); + int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_wutime32); #else -__CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { - return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { - return _futime64(_Desc,(struct __utimbuf64 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { - return _wutime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} + int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_utime64); + int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_futime64); + int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) __MINGW_ASM_CALL(_wutime64); #endif -#endif /* !__CRT__NO_INLINE */ - #ifndef NO_OLDNAMES - int __cdecl utime(const char *, struct utimbuf *); -#ifndef __CRT__NO_INLINE -#ifndef _USE_32BIT_TIME_T -__CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { - return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} -#endif /* !_USE_32BIT_TIME_T */ -#endif /* !__CRT__NO_INLINE */ +#ifdef _USE_32BIT_TIME_T + int __cdecl utime(const char *, struct utimbuf *) __MINGW_ASM_CALL(_utime32); +#else + int __cdecl utime(const char *, struct utimbuf *) __MINGW_ASM_CALL(_utime64); #endif +#endif +#endif /* _CRTBLD */ + #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h b/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h index a6972303f0b308ef4033db1b0444fc12fd43a700..5973c6e0094765f83cf652287d15c2c17317adbc 100644 --- a/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h +++ b/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/systemmediatransportcontrolsinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/systemmediatransportcontrolsinterop.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/taskschd.h b/lib/libc/include/any-windows-any/taskschd.h index fbabd1f6acc461861669cc53a069ba8dca2c3762..0601361595c284f2c4138fb30b1c251b53e5e610 100644 --- a/lib/libc/include/any-windows-any/taskschd.h +++ b/lib/libc/include/any-windows-any/taskschd.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/taskschd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/taskschd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/textstor.h b/lib/libc/include/any-windows-any/textstor.h index 7c1a23241f1a369a90499d0c486593d12a6767ff..4d14d990d803585d5e4c3c347cacf040da30e9c1 100644 --- a/lib/libc/include/any-windows-any/textstor.h +++ b/lib/libc/include/any-windows-any/textstor.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/textstor.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/textstor.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/thumbcache.h b/lib/libc/include/any-windows-any/thumbcache.h index b36d0cafc73f59dae4dadfd860e857e2087d5c17..78ef15f3f80721aedfd010e9c023b39ae761e942 100644 --- a/lib/libc/include/any-windows-any/thumbcache.h +++ b/lib/libc/include/any-windows-any/thumbcache.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/thumbcache.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/thumbcache.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/time.h b/lib/libc/include/any-windows-any/time.h index 2a475eeff94487606e7161239508b333626541cf..9f1f9013cc7d100f7f1bec84ea1cfadc75621fa3 100644 --- a/lib/libc/include/any-windows-any/time.h +++ b/lib/libc/include/any-windows-any/time.h @@ -227,6 +227,11 @@ extern "C" { #ifndef RC_INVOKED +/* + * To prevent ABI issues, the mingw-w64 runtime should not call these + * functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T time_t __CRTDECL time(time_t *_Time) __MINGW_ASM_CALL(_time32); #ifdef _UCRT @@ -256,6 +261,7 @@ errno_t __CRTDECL ctime_s(char *_Buf,size_t _SizeInBytes,const time_t *_Time) __ time_t __CRTDECL mktime(struct tm *_Tm) __MINGW_ASM_CALL(_mktime64); time_t __CRTDECL _mkgmtime(struct tm *_Tm) __MINGW_ASM_CALL(_mkgmtime64); #endif +#endif /* _CRTBLD */ #endif /* !RC_INVOKED */ diff --git a/lib/libc/include/any-windows-any/tlbref.h b/lib/libc/include/any-windows-any/tlbref.h index 0ad1d6a0a316c4967372fa9b644312a7079eaad9..d3482fd3aeca721fdf5b5da69bc079599c352ab0 100644 --- a/lib/libc/include/any-windows-any/tlbref.h +++ b/lib/libc/include/any-windows-any/tlbref.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/tlbref.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/tlbref.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tlogstg.h b/lib/libc/include/any-windows-any/tlogstg.h index c448b0138caae585d0b9e066a312b2618789387c..40dd011490e7d972e12afc4357086b8ccae3c747 100644 --- a/lib/libc/include/any-windows-any/tlogstg.h +++ b/lib/libc/include/any-windows-any/tlogstg.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/tlogstg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/tlogstg.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tpcshrd.h b/lib/libc/include/any-windows-any/tpcshrd.h index c82889ef4083313e6bc5c2a1b5aa5d13b923fb8e..d0c6fa7f2c014322bb16088253d116dedd7efcab 100644 --- a/lib/libc/include/any-windows-any/tpcshrd.h +++ b/lib/libc/include/any-windows-any/tpcshrd.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/tpcshrd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/tpcshrd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tsvirtualchannels.h b/lib/libc/include/any-windows-any/tsvirtualchannels.h index a02d2e8ea5d5c0bf37c7ba529c9225e9144e83c0..abd3f510c7d44f1683e10d9567623c11f1133394 100644 --- a/lib/libc/include/any-windows-any/tsvirtualchannels.h +++ b/lib/libc/include/any-windows-any/tsvirtualchannels.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/tsvirtualchannels.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/tsvirtualchannels.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tuner.h b/lib/libc/include/any-windows-any/tuner.h index e057a850f1d92413b08160ef71fb7a9f402a51f1..96800b1a6c74b351f43542aefc91fea0d296c64c 100644 --- a/lib/libc/include/any-windows-any/tuner.h +++ b/lib/libc/include/any-windows-any/tuner.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/tuner.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/tuner.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/uchar.h b/lib/libc/include/any-windows-any/uchar.h index 7c32e70251ccecda097f185b463e9c99e6dba8a6..b1dabc62c86b685c2a00b90ac1ad8c61e66f6d3e 100644 --- a/lib/libc/include/any-windows-any/uchar.h +++ b/lib/libc/include/any-windows-any/uchar.h @@ -48,25 +48,10 @@ extern "C" { #endif #ifdef _UCRT - -size_t mbrtoc16 (char16_t *__restrict__ pc16, - const char *__restrict__ s, - size_t n, - mbstate_t *__restrict__ ps); - -size_t c16rtomb (char *__restrict__ s, - char16_t c16, - mbstate_t *__restrict__ ps); - -size_t mbrtoc32 (char32_t *__restrict__ pc32, - const char *__restrict__ s, - size_t n, - mbstate_t *__restrict__ ps); - -size_t c32rtomb (char *__restrict__ s, - char32_t c32, - mbstate_t *__restrict__ ps); - +_CRTIMP size_t mbrtoc16 (char16_t *__restrict__ _Pc16, const char *__restrict__ _S, size_t _N, mbstate_t *__restrict__ _Ps); +_CRTIMP size_t c16rtomb (char *__restrict__ _S, char16_t _C16, mbstate_t *__restrict__ _Ps); +_CRTIMP size_t mbrtoc32 (char32_t *__restrict__ _Pc32, const char *__restrict__ s, size_t n, mbstate_t *__restrict__ _Ps); +_CRTIMP size_t c32rtomb (char *__restrict__ _S, char32_t _C32, mbstate_t *__restrict__ _Ps); #endif /* _UCRT */ #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/uianimation.h b/lib/libc/include/any-windows-any/uianimation.h index 28d6219b79bd13e83b78521425d32704b002ecf8..23b57be582ea7cdd6ccd1f06fb12fc9d20d569cb 100644 --- a/lib/libc/include/any-windows-any/uianimation.h +++ b/lib/libc/include/any-windows-any/uianimation.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/uianimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/uianimation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/uiautomationclient.h b/lib/libc/include/any-windows-any/uiautomationclient.h index 1c59acd6d4603b3a7a798ef2097ffd111d28a41e..622b36ea10dbcc98852046cd9cd32b93f8e01481 100644 --- a/lib/libc/include/any-windows-any/uiautomationclient.h +++ b/lib/libc/include/any-windows-any/uiautomationclient.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/uiautomationclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/uiautomationclient.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/uiautomationcore.h b/lib/libc/include/any-windows-any/uiautomationcore.h index e79b2800c98cb259e50f6a56da6b6ae397cf620c..773b66033029f0f9a3872f2462778452c88b654c 100644 --- a/lib/libc/include/any-windows-any/uiautomationcore.h +++ b/lib/libc/include/any-windows-any/uiautomationcore.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/uiautomationcore.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/uiautomationcore.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/uiviewsettingsinterop.h b/lib/libc/include/any-windows-any/uiviewsettingsinterop.h index 53898728b29e46248222f6ea08741034caeb1318..a92c066e645e20ef32530c60c05d74be9a1cfa7f 100644 --- a/lib/libc/include/any-windows-any/uiviewsettingsinterop.h +++ b/lib/libc/include/any-windows-any/uiviewsettingsinterop.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/uiviewsettingsinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/uiviewsettingsinterop.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/unistd.h b/lib/libc/include/any-windows-any/unistd.h index af59cb96ce20ca9d5e9db79d39c0988e33572d3b..b9f1a7836e0d8c9a0c3b93de52685e15f1e7ecb7 100644 --- a/lib/libc/include/any-windows-any/unistd.h +++ b/lib/libc/include/any-windows-any/unistd.h @@ -56,38 +56,20 @@ int __cdecl __MINGW_NOTHROW usleep(useconds_t); #define FTRUNCATE_DEFINED /* This is defined as a real library function to allow autoconf to verify its existence. */ -#if !defined(NO_OLDNAMES) || defined(_POSIX) -int ftruncate(int, off32_t); -int ftruncate64(int, off64_t); -int truncate(const char *, off32_t); -int truncate64(const char *, off64_t); -#ifndef __CRT__NO_INLINE -__CRT_INLINE int ftruncate(int __fd, off32_t __length) -{ - return _chsize (__fd, __length); -} -#endif /* !__CRT__NO_INLINE */ -#else -int ftruncate(int, _off_t); +int ftruncate(int, off_t) +#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) +__MINGW_ASM_CALL(ftruncate64) +#endif +; int ftruncate64(int, _off64_t); -int truncate(const char *, _off_t); +int truncate(const char *, off_t) +#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) +__MINGW_ASM_CALL(truncate64) +#endif +; int truncate64(const char *, _off64_t); -#ifndef __CRT__NO_INLINE -__CRT_INLINE int ftruncate(int __fd, _off_t __length) -{ - return _chsize (__fd, __length); -} -#endif /* !__CRT__NO_INLINE */ -#endif #endif /* FTRUNCATE_DEFINED */ -#ifndef _FILE_OFFSET_BITS_SET_FTRUNCATE -#define _FILE_OFFSET_BITS_SET_FTRUNCATE -#if (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) -#define ftruncate ftruncate64 -#endif /* _FILE_OFFSET_BITS_SET_FTRUNCATE */ -#endif /* _FILE_OFFSET_BITS_SET_FTRUNCATE */ - #ifndef _CRT_SWAB_DEFINED #define _CRT_SWAB_DEFINED /* Also in stdlib.h */ void __cdecl swab(char *_Buf1,char *_Buf2,int _SizeInBytes) __MINGW_ATTRIB_DEPRECATED_MSVC2005; diff --git a/lib/libc/include/any-windows-any/unknwn.h b/lib/libc/include/any-windows-any/unknwn.h index 98c00ca3e921650e9eeea86262dfec51534b0a2c..89acbdb4e5c793c8341dad0210acfaab236be370 100644 --- a/lib/libc/include/any-windows-any/unknwn.h +++ b/lib/libc/include/any-windows-any/unknwn.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/unknwn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/unknwn.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/unknwnbase.h b/lib/libc/include/any-windows-any/unknwnbase.h index 61544a870970cd78d434e242d7cab2ed1344beac..59ceedc9bf980e3f4684b2dca88c2eb55cfe5825 100644 --- a/lib/libc/include/any-windows-any/unknwnbase.h +++ b/lib/libc/include/any-windows-any/unknwnbase.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/unknwnbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/unknwnbase.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/urlhist.h b/lib/libc/include/any-windows-any/urlhist.h index ce038ab9e2146f158310afd50c70882b0df38463..a91382ab6a02b3c0e553f20424d42759fb4fc27b 100644 --- a/lib/libc/include/any-windows-any/urlhist.h +++ b/lib/libc/include/any-windows-any/urlhist.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/urlhist.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/urlhist.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/urlmon.h b/lib/libc/include/any-windows-any/urlmon.h index d677106ff3f9a626831c1043a7bdfc8d9ae35fff..d7ffef3b9f0a3431d5ff0f68b9753c9026e3527f 100644 --- a/lib/libc/include/any-windows-any/urlmon.h +++ b/lib/libc/include/any-windows-any/urlmon.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/urlmon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vdslun.h b/lib/libc/include/any-windows-any/vdslun.h index 6a3f8b54e933048f181a4fca8bb24b9f5fb3a4b5..1b89cd0327b64b8f6db5a35eebbfd2b71d77adee 100644 --- a/lib/libc/include/any-windows-any/vdslun.h +++ b/lib/libc/include/any-windows-any/vdslun.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vdslun.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vdslun.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vidcap.h b/lib/libc/include/any-windows-any/vidcap.h index 440895482da5dcdf7b3e2498235d8202e17dc6fc..a9af5c7b12f57758e9c3527fd685ef483f3bfbdf 100644 --- a/lib/libc/include/any-windows-any/vidcap.h +++ b/lib/libc/include/any-windows-any/vidcap.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vidcap.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vidcap.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vmr9.h b/lib/libc/include/any-windows-any/vmr9.h index 319222a390ed83d47ee780f4914f07c200dd8c09..62baa431ad28ed92b91d4b0d1fd04c4a67d6956a 100644 --- a/lib/libc/include/any-windows-any/vmr9.h +++ b/lib/libc/include/any-windows-any/vmr9.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vmr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vmr9.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vsadmin.h b/lib/libc/include/any-windows-any/vsadmin.h index 290d316da2cf0f0513b5292d927eefa4b3e3d3fd..c75cb0a2716d137498d89b3c4e281890950909cf 100644 --- a/lib/libc/include/any-windows-any/vsadmin.h +++ b/lib/libc/include/any-windows-any/vsadmin.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vsadmin.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vsadmin.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vsbackup.h b/lib/libc/include/any-windows-any/vsbackup.h index 08bd51fd3b6db203755d849d116345460e0e2103..80e5ae939b091e9d3b6dd9fa02dbe61086c7f280 100644 --- a/lib/libc/include/any-windows-any/vsbackup.h +++ b/lib/libc/include/any-windows-any/vsbackup.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vsbackup.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vsbackup.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vsmgmt.h b/lib/libc/include/any-windows-any/vsmgmt.h index adcc65038a9239350d7a73d08898a81afd67b3bd..93978936b0fba3b3b1d6f3b444ce7244dc9f665b 100644 --- a/lib/libc/include/any-windows-any/vsmgmt.h +++ b/lib/libc/include/any-windows-any/vsmgmt.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vsmgmt.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vsmgmt.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vsprov.h b/lib/libc/include/any-windows-any/vsprov.h index 870f287ca6b76ff46593d0ba6ec7feb6d75f790d..3196f26e5d3dcd2eadeb218d38f0938a364c1c96 100644 --- a/lib/libc/include/any-windows-any/vsprov.h +++ b/lib/libc/include/any-windows-any/vsprov.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vsprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vsprov.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vss.h b/lib/libc/include/any-windows-any/vss.h index 42d5ddb451a75b9b895c5319a17847700cf99e69..a106a54ea89859de1e0b4b0b04fd174ba0ab7e03 100644 --- a/lib/libc/include/any-windows-any/vss.h +++ b/lib/libc/include/any-windows-any/vss.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vss.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vss.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vswriter.h b/lib/libc/include/any-windows-any/vswriter.h index d75afb166fa6c1a17ca38d8c0e41e8ae0cfc4044..d1492f82ef15420eda05a47bedd62ed7dc85dc71 100644 --- a/lib/libc/include/any-windows-any/vswriter.h +++ b/lib/libc/include/any-windows-any/vswriter.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/vswriter.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/vswriter.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemads.h b/lib/libc/include/any-windows-any/wbemads.h index d4a0bceb38cce5d3db350526a7ea1d9dc04e1f00..93d977c45e2b6d6759f9012fc74b6c377e8ca180 100644 --- a/lib/libc/include/any-windows-any/wbemads.h +++ b/lib/libc/include/any-windows-any/wbemads.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wbemads.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wbemads.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemcli.h b/lib/libc/include/any-windows-any/wbemcli.h index 1f64731d0cbc64e373a48c863563b53f1196138f..f7e847d7779358a806932fc711badafa0d50a858 100644 --- a/lib/libc/include/any-windows-any/wbemcli.h +++ b/lib/libc/include/any-windows-any/wbemcli.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wbemcli.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wbemcli.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemdisp.h b/lib/libc/include/any-windows-any/wbemdisp.h index 8970c4a1f1e6b788f82b83bf20d79fab295042e1..ee81750532f9f84203c9572783699bb75da22558 100644 --- a/lib/libc/include/any-windows-any/wbemdisp.h +++ b/lib/libc/include/any-windows-any/wbemdisp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wbemdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wbemdisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemprov.h b/lib/libc/include/any-windows-any/wbemprov.h index df6c098e1933c58e9a28116007daa96750fb3b78..dcca9a35507c369e9fa96c30dfce12402201448e 100644 --- a/lib/libc/include/any-windows-any/wbemprov.h +++ b/lib/libc/include/any-windows-any/wbemprov.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wbemprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wbemprov.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemtran.h b/lib/libc/include/any-windows-any/wbemtran.h index a925bee638b1f4054a15ccca0119f3feee5dc2e0..32ddda080f0103f723fa1dc495be5490346996c1 100644 --- a/lib/libc/include/any-windows-any/wbemtran.h +++ b/lib/libc/include/any-windows-any/wbemtran.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wbemtran.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wbemtran.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wchar.h b/lib/libc/include/any-windows-any/wchar.h index c72530c18d7e32c916721658d85c887d5be2c799..68bb5c0f4999e1e93770273841f73eb64a635424 100644 --- a/lib/libc/include/any-windows-any/wchar.h +++ b/lib/libc/include/any-windows-any/wchar.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -41,6 +42,9 @@ extern "C" { #ifndef _FILE_DEFINED struct _iobuf { +#ifdef _UCRT + void *_Placeholder; +#else char *_ptr; int _cnt; char *_base; @@ -49,6 +53,7 @@ extern "C" { int _charbuf; int _bufsiz; char *_tmpfname; +#endif }; typedef struct _iobuf FILE; #define _FILE_DEFINED @@ -110,6 +115,11 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); }; /* #endif */ +/* + * To prevent ABI issues, the mingw-w64 runtime should not call these + * functions. Instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD #ifdef _USE_32BIT_TIME_T #define _wfinddata_t _wfinddata32_t #define _wfinddatai64_t _wfinddata32i64_t @@ -127,6 +137,7 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); #define _wfindfirsti64 _wfindfirst64 #define _wfindnexti64 _wfindnext64 #endif +#endif /* _CRTBLD */ #define _WFINDDATA_T_DEFINED #endif @@ -187,10 +198,10 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); _CRTIMP int __cdecl _wrename(const wchar_t *_OldFilename,const wchar_t *_NewFilename); _CRTIMP wchar_t *__cdecl _wmktemp(wchar_t *_TemplateName) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t *_Filename,struct _wfinddata32i64_t *_FindData); - intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); + _CRTIMP intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); _CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t *_Filename,struct _wfinddata64_t *_FindData); _CRTIMP int __cdecl _wfindnext32i64(intptr_t _FindHandle,struct _wfinddata32i64_t *_FindData); - int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); + _CRTIMP int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); _CRTIMP int __cdecl _wfindnext64(intptr_t _FindHandle,struct _wfinddata64_t *_FindData); _CRTIMP errno_t __cdecl _wsopen_s(int *_FileHandle,const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionFlag); _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -267,38 +278,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); #endif #endif -#ifndef _WCONIO_DEFINED -#define _WCONIO_DEFINED - -#ifndef WEOF -#define WEOF (wint_t)(0xFFFF) -#endif - - _CRTIMP wchar_t *_cgetws(wchar_t *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - _CRTIMP wint_t __cdecl _getwch(void); - _CRTIMP wint_t __cdecl _getwche(void); - _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); - _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); - _CRTIMP int __cdecl _cputws(const wchar_t *_String); - _CRTIMP int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...); - _CRTIMP int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...); - _CRTIMP int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...); - _CRTIMP int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); - - _CRTIMP int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); -#if __MSVCRT_VERSION__ >= 0x800 - wint_t __cdecl _putwch_nolock(wchar_t _WCh); - wint_t __cdecl _getwch_nolock(void); - wint_t __cdecl _getwche_nolock(void); - wint_t __cdecl _ungetwch_nolock(wint_t _WCh); -#endif -#endif - #ifdef _UCRT int __cdecl __stdio_common_vswprintf_p(unsigned __int64 _Options, wchar_t *_Str, size_t _Len, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); int __cdecl __stdio_common_vfwprintf_p(unsigned __int64 _Options, FILE *_File, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList); @@ -460,53 +439,30 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #endif /* __NO_ISOCEXT */ #else /* !__USE_MINGW_ANSI_STDIO */ - -#ifdef _UCRT __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); + __MINGW_ATTRIB_DEPRECATED_SEC_WARN int __cdecl wscanf(const wchar_t * __restrict__ _Format,...); - __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv); __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv); - __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, va_list __local_argv); - - int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); - int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); - int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); - int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); + int __cdecl vfwscanf(FILE *__stream, const wchar_t *__format, va_list __local_argv); - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); - int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); -#else - - int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#ifndef __NO_ISOCEXT /* externs in libmingwex.a */ __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv); - - __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv); + int __cdecl vswscanf(const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv); __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv); -#endif /* __NO_ISOCEXT */ + int __cdecl vwscanf(const wchar_t *__format, va_list __local_argv); int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); -#endif /* _UCRT */ #endif /* __USE_MINGW_ANSI_STDIO */ @@ -534,34 +490,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _putws(const wchar_t *_Str); -#ifdef _UCRT - __mingw_ovr - int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) - { - return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); - } - -#if __USE_MINGW_ANSI_STDIO == 0 - int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg); -#endif - -#else _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...); + +#ifndef _UCRT _CRTIMP int __cdecl _swprintf_l(wchar_t * __restrict__ ,size_t _SizeInWords,const wchar_t * __restrict__ _Format,_locale_t _Locale,... ) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList); +#endif + _CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; @@ -572,15 +508,13 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #pragma push_macro("vsnwprintf") # undef snwprintf # undef vsnwprintf - int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf); - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf); + int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); + int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg); #pragma pop_macro ("vsnwprintf") #pragma pop_macro ("snwprintf") #endif -#endif /* _UCRT */ - -#endif /* _WSTDIO_DEFINED */ +#endif /* __NO_ISOCEXT */ #ifdef _UCRT @@ -802,10 +736,9 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); { return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, _Format, _Locale, _ArgList); } - __mingw_ovr int __cdecl _vscwprintf(const wchar_t *_Format, va_list _ArgList) - { - return _vscwprintf_l(_Format, NULL, _ArgList); - } + + _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); + __mingw_ovr int __cdecl _scwprintf_l(const wchar_t *_Format, _locale_t _Locale, ...) { __builtin_va_list _ArgList; @@ -828,10 +761,7 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); { return _vswprintf_c_l(_DstBuf, _MaxCount, _Format, _Locale, _ArgList); } - __mingw_ovr int __cdecl _vswprintf(wchar_t *_DstBuf, const wchar_t *_Format, va_list _ArgList) - { - return _vswprintf_c_l(_DstBuf, (size_t)-1, _Format, NULL, _ArgList); - } + _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); __mingw_ovr int __cdecl _swprintf_c_l(wchar_t *_DstBuf, size_t _MaxCount, const wchar_t *_Format, _locale_t _Locale, ...) { __builtin_va_list _ArgList; @@ -850,15 +780,7 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); __builtin_va_end(_ArgList); return _Ret; } - __mingw_ovr int __cdecl _swprintf(wchar_t *_DstBuf, const wchar_t *_Format, ...) - { - __builtin_va_list _ArgList; - int _Ret; - __builtin_va_start(_ArgList, _Format); - _Ret = _vswprintf_c_l(_DstBuf, (size_t)-1, _Format, NULL, _ArgList); - __builtin_va_end(_ArgList); - return _Ret; - } + _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); #else /* _UCRT */ _CRTIMP int __cdecl _fwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t * __restrict__ _Format,...); @@ -957,7 +879,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #define _putwc_nolock(_c,_stm) _fputwc_nolock(_c,_stm) #define _getwc_nolock(_c) _fgetwc_nolock(_c) #endif -#endif + +#endif /* _WSTDIO_DEFINED */ #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED @@ -1061,8 +984,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #if defined(_CRT_NON_CONFORMING_WCSTOK) && !defined(__cplusplus) #define wcstok _wcstok #endif @@ -1082,9 +1005,9 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); + _CRTIMP size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); - int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); @@ -1147,27 +1070,21 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL - wchar_t *__cdecl _wctime(const time_t *_Time) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; -#ifndef __CRT__NO_INLINE #ifndef _USE_32BIT_TIME_T - __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); } + wchar_t *__cdecl _wctime(const time_t *_Time) __MINGW_ASM_CALL(_wctime64) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #else - __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime32(_Time); } + wchar_t *__cdecl _wctime(const time_t *_Time) __MINGW_ASM_CALL(_wctime32) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #endif -#endif /* __CRT__NO_INLINE */ #endif #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL) #define _INC_WTIME_S_INL - errno_t __cdecl _wctime_s(wchar_t *, size_t, const time_t *); -#ifndef __CRT__NO_INLINE #ifndef _USE_32BIT_TIME_T - __CRT_INLINE errno_t __cdecl _wctime_s (wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s (_Buffer,_SizeInWords,_Time); } + errno_t __cdecl _wctime_s (wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) __MINGW_ASM_CALL(_wctime64_s); #else - __CRT_INLINE errno_t __cdecl _wctime_s (wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime32_s (_Buffer,_SizeInWords,_Time); } -#endif /* _USE_32BIT_TIME_T */ -#endif /* __CRT__NO_INLINE */ -#endif /* !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL) */ + errno_t __cdecl _wctime_s (wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) __MINGW_ASM_CALL(_wctime32_s); +#endif +#endif #endif @@ -1182,13 +1099,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #endif typedef wchar_t _Wint_t; - wint_t __cdecl btowc(int); - size_t __cdecl mbrlen(const char * __restrict__ _Ch,size_t _SizeInBytes,mbstate_t * __restrict__ _State); - size_t __cdecl mbrtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SizeInBytes,mbstate_t * __restrict__ _State); - size_t __cdecl mbsrtowcs(wchar_t * __restrict__ _Dest,const char ** __restrict__ _PSrc,size_t _Count,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl wcrtomb(char * __restrict__ _Dest,wchar_t _Source,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - size_t __cdecl wcsrtombs(char * __restrict__ _Dest,const wchar_t ** __restrict__ _PSource,size_t _Count,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - int __cdecl wctob(wint_t _WCh); + _CRTIMP wint_t __cdecl btowc(int); + int __cdecl mbsinit(const mbstate_t *ps); + _CRTIMP size_t __cdecl mbrlen(const char * __restrict__ _Ch,size_t _SizeInBytes,mbstate_t * __restrict__ _State); + _CRTIMP size_t __cdecl mbrtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SizeInBytes,mbstate_t * __restrict__ _State); + _CRTIMP size_t __cdecl mbsrtowcs(wchar_t * __restrict__ _Dest,const char ** __restrict__ _PSrc,size_t _Count,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP size_t __cdecl wcrtomb(char * __restrict__ _Dest,wchar_t _Source,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP size_t __cdecl wcsrtombs(char * __restrict__ _Dest,const wchar_t ** __restrict__ _PSource,size_t _Count,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; + _CRTIMP int __cdecl wctob(wint_t _WCh); #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */ wchar_t *__cdecl wmemset(wchar_t *s, wchar_t c, size_t n); @@ -1198,12 +1116,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); wchar_t * __cdecl wmempcpy (wchar_t *_Dst, const wchar_t *_Src, size_t _Size); wchar_t *__cdecl wmemmove(wchar_t *s1, const wchar_t *s2, size_t n) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; int __cdecl fwide(FILE *stream,int mode); -#if defined(_UCRT) || defined(__LARGE_MBSTATE_T) - /* With UCRT, mbsinit is only available as inline. */ - __mingw_ovr int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || _P->_Wchar == 0); } -#else - int __cdecl mbsinit(const mbstate_t *ps); -#endif __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); #endif /* __NO_ISOCEXT */ @@ -1212,9 +1124,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); void *__cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl fwide(FILE *_F,int _M) { (void)_F; return (_M); } -#if !defined(_UCRT) && !defined(__LARGE_MBSTATE_T) - __CRT_INLINE int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || *_P==0); } -#endif __CRT_INLINE _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *_S,wchar_t _C,size_t _N) { if (_S) { for ( ; 0 < _N; ++_S, --_N) diff --git a/lib/libc/include/any-windows-any/wctype.h b/lib/libc/include/any-windows-any/wctype.h index 418d75e9e246c045bfd6123bace84e1dfa1fde63..96dc2b47cc0c622268483939abaaae8dde8354e6 100644 --- a/lib/libc/include/any-windows-any/wctype.h +++ b/lib/libc/include/any-windows-any/wctype.h @@ -13,9 +13,9 @@ extern "C" { #endif typedef wchar_t wctrans_t; - wint_t __cdecl towctrans(wint_t,wctrans_t); - wctrans_t __cdecl wctrans(const char *); - wctype_t __cdecl wctype(const char *); + _CRTIMP wint_t __cdecl towctrans(wint_t,wctrans_t); + _CRTIMP wctrans_t __cdecl wctrans(const char *); + _CRTIMP wctype_t __cdecl wctype(const char *); #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/wdstptmgmt.h b/lib/libc/include/any-windows-any/wdstptmgmt.h index 2a645f400aabe2f332ce43abfea045de877296ae..fe1b7d5fc67771a66fbd517b77b08cdae1358c11 100644 --- a/lib/libc/include/any-windows-any/wdstptmgmt.h +++ b/lib/libc/include/any-windows-any/wdstptmgmt.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wdstptmgmt.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wdstptmgmt.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/weakreference.h b/lib/libc/include/any-windows-any/weakreference.h index 6975e8f95fa4f421746753f0087cfeeb3624bd2e..e11ed6ff4769e11520c36b4ad5d00042b6e46111 100644 --- a/lib/libc/include/any-windows-any/weakreference.h +++ b/lib/libc/include/any-windows-any/weakreference.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/weakreference.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/weakreference.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/webservices.h b/lib/libc/include/any-windows-any/webservices.h index efd8e8a89f401fbfad2ddfa92f40a1653ffd29d7..97944dd80a287036764d66117401cd0930a2e7af 100644 --- a/lib/libc/include/any-windows-any/webservices.h +++ b/lib/libc/include/any-windows-any/webservices.h @@ -406,8 +406,8 @@ typedef struct _WS_INT32_DESCRIPTION { } WS_INT32_DESCRIPTION; typedef struct _WS_INT64_DESCRIPTION { - __int64 DECLSPEC_ALIGN(8) minValue; - __int64 DECLSPEC_ALIGN(8) maxValue; + INT64 minValue; + INT64 maxValue; } WS_INT64_DESCRIPTION; typedef struct _WS_UINT8_DESCRIPTION { @@ -426,8 +426,8 @@ typedef struct _WS_UINT32_DESCRIPTION { } WS_UINT32_DESCRIPTION; typedef struct _WS_UINT64_DESCRIPTION { - unsigned __int64 DECLSPEC_ALIGN(8) minValue; - unsigned __int64 DECLSPEC_ALIGN(8) maxValue; + UINT64 minValue; + UINT64 maxValue; } WS_UINT64_DESCRIPTION; typedef struct _WS_WSZ_DESCRIPTION { @@ -673,12 +673,12 @@ typedef struct _WS_XML_INT32_TEXT { typedef struct _WS_XML_INT64_TEXT { WS_XML_TEXT text; - __int64 DECLSPEC_ALIGN(8) value; + INT64 value; } WS_XML_INT64_TEXT; typedef struct _WS_XML_UINT64_TEXT { WS_XML_TEXT text; - unsigned __int64 DECLSPEC_ALIGN(8) value; + UINT64 value; } WS_XML_UINT64_TEXT; typedef struct _WS_XML_FLOAT_TEXT { @@ -1232,7 +1232,7 @@ typedef enum { } WS_DATETIME_FORMAT; struct _WS_DATETIME { - unsigned __int64 DECLSPEC_ALIGN(8) ticks; + UINT64 ticks; WS_DATETIME_FORMAT format; }; diff --git a/lib/libc/include/any-windows-any/wia_lh.h b/lib/libc/include/any-windows-any/wia_lh.h index 84c3b526abbf7969aba0ae68c8cd1df816cde1c6..9132d21ae556dd92da8f70d94433cb9aa95ba27f 100644 --- a/lib/libc/include/any-windows-any/wia_lh.h +++ b/lib/libc/include/any-windows-any/wia_lh.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wia_lh.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wia_lh.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wia_xp.h b/lib/libc/include/any-windows-any/wia_xp.h index 5acc750d3051e01b9296735d8a03690b2084fe57..d7ce7de962b1bd46085658a2253136f0da2d1173 100644 --- a/lib/libc/include/any-windows-any/wia_xp.h +++ b/lib/libc/include/any-windows-any/wia_xp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wia_xp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wia_xp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/winapifamily.h b/lib/libc/include/any-windows-any/winapifamily.h index 388d5f068cba2b5e2e642f68bea924d61f37f404..88175b45866afbd21c529189ede53b5c5ee866e7 100644 --- a/lib/libc/include/any-windows-any/winapifamily.h +++ b/lib/libc/include/any-windows-any/winapifamily.h @@ -6,19 +6,44 @@ #ifndef _INC_WINAPIFAMILY #define _INC_WINAPIFAMILY -#define WINAPI_PARTITION_DESKTOP 0x1 -#define WINAPI_PARTITION_APP 0x2 +#define WINAPI_FAMILY_PC_APP 2 +#define WINAPI_FAMILY_PHONE_APP 3 +#define WINAPI_FAMILY_SYSTEM 4 +#define WINAPI_FAMILY_SERVER 5 +#define WINAPI_FAMILY_DESKTOP_APP 100 -#define WINAPI_FAMILY_APP WINAPI_PARTITION_APP -#define WINAPI_FAMILY_DESKTOP_APP (WINAPI_PARTITION_DESKTOP \ - | WINAPI_PARTITION_APP) +#define WINAPI_FAMILY_APP WINAPI_FAMILY_PC_APP -/* WINAPI_FAMILY can be either desktop + App, or App. */ #ifndef WINAPI_FAMILY #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP #endif -#define WINAPI_FAMILY_PARTITION(v) ((WINAPI_FAMILY & v) == v) -#define WINAPI_FAMILY_ONE_PARTITION(vset, v) ((WINAPI_FAMILY & vset) == v) +#ifndef WINAPI_PARTITION_DESKTOP +#define WINAPI_PARTITION_DESKTOP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#endif -#endif +#ifndef WINAPI_PARTITION_APP +#define WINAPI_PARTITION_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_PC_APP +#define WINAPI_PARTITION_PC_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP) +#endif + +#ifndef WINAPI_PARTITION_PHONE_APP +#define WINAPI_PARTITION_PHONE_APP (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_SYSTEM +#define WINAPI_PARTITION_SYSTEM (WINAPI_FAMILY == WINAPI_FAMILY_SYSTEM || \ + WINAPI_FAMILY == WINAPI_FAMILY_SERVER) +#endif + +#define WINAPI_PARTITION_PHONE WINAPI_PARTITION_PHONE_APP + +#define WINAPI_FAMILY_PARTITION(x) x + +#endif /* _INC_WINAPIFAMILY */ diff --git a/lib/libc/include/any-windows-any/wincodec.h b/lib/libc/include/any-windows-any/wincodec.h index 4b1b306d6c948792b91237f04a1f819937995ce7..57c55ec726f3b45101c98abb2ce25b5f4f445916 100644 --- a/lib/libc/include/any-windows-any/wincodec.h +++ b/lib/libc/include/any-windows-any/wincodec.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wincodec.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wincodec.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -274,14 +274,6 @@ interface IWICDdsFrameDecode; #endif /* __cplusplus */ #endif -#ifndef __IWICWineDecoder_FWD_DEFINED__ -#define __IWICWineDecoder_FWD_DEFINED__ -typedef interface IWICWineDecoder IWICWineDecoder; -#ifdef __cplusplus -interface IWICWineDecoder; -#endif /* __cplusplus */ -#endif - /* Headers for imported files */ #include @@ -6207,85 +6199,6 @@ static inline HRESULT IWICDdsFrameDecode_CopyBlocks(IWICDdsFrameDecode* This,con #endif /* __IWICDdsFrameDecode_INTERFACE_DEFINED__ */ -/***************************************************************************** - * IWICWineDecoder interface - */ -#ifndef __IWICWineDecoder_INTERFACE_DEFINED__ -#define __IWICWineDecoder_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IWICWineDecoder, 0xb9bd430d, 0x28a8, 0x41d3, 0xa1,0xf5, 0xf3,0x6e,0xe0,0x28,0x40,0xbf); -#if defined(__cplusplus) && !defined(CINTERFACE) -MIDL_INTERFACE("b9bd430d-28a8-41d3-a1f5-f36ee02840bf") -IWICWineDecoder : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE Initialize( - IStream *stream, - WICDecodeOptions options) = 0; - -}; -#ifdef __CRT_UUID_DECL -__CRT_UUID_DECL(IWICWineDecoder, 0xb9bd430d, 0x28a8, 0x41d3, 0xa1,0xf5, 0xf3,0x6e,0xe0,0x28,0x40,0xbf) -#endif -#else -typedef struct IWICWineDecoderVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IWICWineDecoder *This, - REFIID riid, - void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IWICWineDecoder *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IWICWineDecoder *This); - - /*** IWICWineDecoder methods ***/ - HRESULT (STDMETHODCALLTYPE *Initialize)( - IWICWineDecoder *This, - IStream *stream, - WICDecodeOptions options); - - END_INTERFACE -} IWICWineDecoderVtbl; - -interface IWICWineDecoder { - CONST_VTBL IWICWineDecoderVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -#ifndef WIDL_C_INLINE_WRAPPERS -/*** IUnknown methods ***/ -#define IWICWineDecoder_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -#define IWICWineDecoder_AddRef(This) (This)->lpVtbl->AddRef(This) -#define IWICWineDecoder_Release(This) (This)->lpVtbl->Release(This) -/*** IWICWineDecoder methods ***/ -#define IWICWineDecoder_Initialize(This,stream,options) (This)->lpVtbl->Initialize(This,stream,options) -#else -/*** IUnknown methods ***/ -static inline HRESULT IWICWineDecoder_QueryInterface(IWICWineDecoder* This,REFIID riid,void **ppvObject) { - return This->lpVtbl->QueryInterface(This,riid,ppvObject); -} -static inline ULONG IWICWineDecoder_AddRef(IWICWineDecoder* This) { - return This->lpVtbl->AddRef(This); -} -static inline ULONG IWICWineDecoder_Release(IWICWineDecoder* This) { - return This->lpVtbl->Release(This); -} -/*** IWICWineDecoder methods ***/ -static inline HRESULT IWICWineDecoder_Initialize(IWICWineDecoder* This,IStream *stream,WICDecodeOptions options) { - return This->lpVtbl->Initialize(This,stream,options); -} -#endif -#endif - -#endif - - -#endif /* __IWICWineDecoder_INTERFACE_DEFINED__ */ - HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst); HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, IWICBitmap **bitmap); HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, WICSectionAccessLevel access, IWICBitmap **bitmap); diff --git a/lib/libc/include/any-windows-any/wincodecsdk.h b/lib/libc/include/any-windows-any/wincodecsdk.h index 011b1f17ba2bd040eb46171ca0052c7c2af40bcf..4902207f714a189e01273a438500eae6a07656f1 100644 --- a/lib/libc/include/any-windows-any/wincodecsdk.h +++ b/lib/libc/include/any-windows-any/wincodecsdk.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wincodecsdk.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wincodecsdk.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/winerror.h b/lib/libc/include/any-windows-any/winerror.h index 17a392402b93447d47cf92a82ca596301f6bb780..0010df216e837ba537d3e0e10054d7f4d5d50d67 100644 --- a/lib/libc/include/any-windows-any/winerror.h +++ b/lib/libc/include/any-windows-any/winerror.h @@ -4919,6 +4919,15 @@ __CRT_INLINE HRESULT HRESULT_FROM_WIN32(__LONG32 x) { return x <= 0 ? (HRESULT)x #define DWRITE_E_DOWNLOADFAILED _HRESULT_TYPEDEF_(0x8898500FL) #define DWRITE_E_TOOMANYDOWNLOADS _HRESULT_TYPEDEF_(0x88985010L) +#define IORING_E_REQUIRED_FLAG_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80460001) +#define IORING_E_SUBMISSION_QUEUE_FULL _HRESULT_TYPEDEF_(0x80460002) +#define IORING_E_VERSION_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80460003) +#define IORING_E_SUBMISSION_QUEUE_TOO_BIG _HRESULT_TYPEDEF_(0x80460004) +#define IORING_E_COMPLETION_QUEUE_TOO_BIG _HRESULT_TYPEDEF_(0x80460005) +#define IORING_E_SUBMIT_IN_PROGRESS _HRESULT_TYPEDEF_(0x80460006) +#define IORING_E_CORRUPT _HRESULT_TYPEDEF_(0x80460007) +#define IORING_E_COMPLETION_QUEUE_TOO_FULL _HRESULT_TYPEDEF_(0x80460008) + #include #undef __IN__WINERROR_ diff --git a/lib/libc/include/any-windows-any/winhttp.h b/lib/libc/include/any-windows-any/winhttp.h index 4b3683af873db1624f87aec6548b673bd07c480e..0bcf58420598fce653d8f46661b3438a3c08eb13 100644 --- a/lib/libc/include/any-windows-any/winhttp.h +++ b/lib/libc/include/any-windows-any/winhttp.h @@ -55,7 +55,8 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ICU_REJECT_USERPWD 0x00004000 /* flags for WinHttpOpen */ -#define WINHTTP_FLAG_ASYNC 0x10000000 +#define WINHTTP_FLAG_ASYNC 0x10000000 +#define WINHTTP_FLAG_SECURE_DEFAULTS 0x30000000 /* flags for WinHttpOpenRequest */ #define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 @@ -64,6 +65,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 #define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 #define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE +#define WINHTTP_FLAG_AUTOMATIC_CHUNKING 0x00000200 #define WINHTTP_FLAG_SECURE 0x00800000 #define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 @@ -168,6 +170,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL 133 #define WINHTTP_OPTION_HTTP_PROTOCOL_USED 134 #define WINHTTP_OPTION_KDC_PROXY_SETTINGS 136 +#define WINHTTP_OPTION_PROXY_DISABLE_SERVICE_CALLS 137 #define WINHTTP_OPTION_ENCODE_EXTRA 138 #define WINHTTP_OPTION_DISABLE_STREAM_QUEUE 139 #define WINHTTP_OPTION_IPV6_FAST_FALLBACK 140 @@ -330,7 +333,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_SECURE_FAILURE_PROXY (WINHTTP_ERROR_BASE + 188) #define ERROR_WINHTTP_RESERVED_189 (WINHTTP_ERROR_BASE + 189) #define ERROR_WINHTTP_HTTP_PROTOCOL_MISMATCH (WINHTTP_ERROR_BASE + 190) -#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 188) +#define ERROR_WINHTTP_GLOBAL_CALLBACK_FAILED (WINHTTP_ERROR_BASE + 191) +#define ERROR_WINHTTP_FEATURE_DISABLED (WINHTTP_ERROR_BASE + 192) +#define ERROR_WINHTTP_FAST_FORWARDING_NOT_SUPPORTED (WINHTTP_ERROR_BASE + 193) + +#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 193) #define WINHTTP_RESET_STATE 0x00000001 #define WINHTTP_RESET_SWPAD_CURRENT_NETWORK 0x00000002 @@ -511,8 +518,10 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE 0x01000000 #define WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE 0x02000000 #define WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE 0x04000000 +#define WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE 0x08000000 #define WINHTTP_CALLBACK_STATUS_SETTINGS_WRITE_COMPLETE 0x10000000 #define WINHTTP_CALLBACK_STATUS_SETTINGS_READ_COMPLETE 0x20000000 + #define WINHTTP_CALLBACK_FLAG_RESOLVE_NAME (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) #define WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) #define WINHTTP_CALLBACK_FLAG_SEND_REQUEST (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) @@ -530,10 +539,14 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE #define WINHTTP_CALLBACK_FLAG_REQUEST_ERROR WINHTTP_CALLBACK_STATUS_REQUEST_ERROR #define WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE +#define WINHTTP_CALLBACK_FLAG_GETPROXYSETTINGS_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE + #define WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR \ - | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE) + | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE \ + | WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE) + #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff #define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) @@ -547,6 +560,9 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_HANDLE_TYPE_SESSION 1 #define WINHTTP_HANDLE_TYPE_CONNECT 2 #define WINHTTP_HANDLE_TYPE_REQUEST 3 +#define WINHTTP_HANDLE_TYPE_PROXY_RESOLVER 4 +#define WINHTTP_HANDLE_TYPE_WEBSOCKET 5 +#define WINHTTP_HANDLE_TYPE_PROTOCOL 6 #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED 0x00000001 #define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT 0x00000002 diff --git a/lib/libc/include/any-windows-any/winioctl.h b/lib/libc/include/any-windows-any/winioctl.h index 036297cd815c159e7505a2a8d7fdadec3592b708..55e0cec9911c5363bf6c998811830c7e8faf122e 100644 --- a/lib/libc/include/any-windows-any/winioctl.h +++ b/lib/libc/include/any-windows-any/winioctl.h @@ -3108,6 +3108,22 @@ typedef struct _CSV_NAMESPACE_INFO { #define FSCTL_GET_REFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 182, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_CSV_H_BREAKING_SYNC_TUNNEL_REQUEST CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 185, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_SHUFFLE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 208, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +typedef struct _FILE_LEVEL_TRIM_RANGE { + DWORDLONG Offset; + DWORDLONG Length; +} FILE_LEVEL_TRIM_RANGE, *PFILE_LEVEL_TRIM_RANGE; + +typedef struct _FILE_LEVEL_TRIM { + DWORD Key; + DWORD NumRanges; + FILE_LEVEL_TRIM_RANGE Ranges[1]; +} FILE_LEVEL_TRIM, *PFILE_LEVEL_TRIM; + +typedef struct _FILE_LEVEL_TRIM_OUTPUT { + DWORD NumRangesProcessed; +} FILE_LEVEL_TRIM_OUTPUT, *PFILE_LEVEL_TRIM_OUTPUT; + #endif /*_WIN32_WINNT >= _WIN32_WINNT_WIN8 */ #if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) diff --git a/lib/libc/include/any-windows-any/winnt.h b/lib/libc/include/any-windows-any/winnt.h index 9e57bb1006a53063d17baf270f17c28bed85d6b5..3cbe623122519c58c8d1a9ef72ef84f2da2eb6ed 100644 --- a/lib/libc/include/any-windows-any/winnt.h +++ b/lib/libc/include/any-windows-any/winnt.h @@ -268,6 +268,14 @@ extern "C" { #endif #endif +#ifndef DECLSPEC_CHPE_PATCHABLE +#ifdef __arm64ec__ +#define DECLSPEC_CHPE_PATCHABLE __declspec(hybrid_patchable) +#else +#define DECLSPEC_CHPE_PATCHABLE +#endif +#endif + #define DECLSPEC_DEPRECATED_DDK #define PRAGMA_DEPRECATED_DDK 0 @@ -3213,6 +3221,12 @@ __buildmemorybarrier() #define SID_RECOMMENDED_SUB_AUTHORITIES (1) #ifndef __WIDL__ #define SECURITY_MAX_SID_SIZE (sizeof (SID) - sizeof (DWORD) + (SID_MAX_SUB_AUTHORITIES *sizeof (DWORD))) + + typedef union _SE_SID { + SID Sid; + BYTE Buffer[SECURITY_MAX_SID_SIZE]; + } SE_SID, *PSE_SID; + #endif #define SID_HASH_SIZE 32 @@ -5722,6 +5736,34 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS) #define PF_ARM_SVE_F32MM_INSTRUCTIONS_AVAILABLE 58 #define PF_ARM_SVE_F64MM_INSTRUCTIONS_AVAILABLE 59 #define PF_BMI2_INSTRUCTIONS_AVAILABLE 60 +#define PF_MOVDIR64B_INSTRUCTION_AVAILABLE 61 +#define PF_ARM_LSE2_AVAILABLE 62 +#define PF_RESERVED_FEATURE 63 +#define PF_ARM_SHA3_INSTRUCTIONS_AVAILABLE 64 +#define PF_ARM_SHA512_INSTRUCTIONS_AVAILABLE 65 +#define PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE 66 +#define PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE 67 +#define PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE 68 +#define PF_ARM_V86_EBF16_INSTRUCTIONS_AVAILABLE 69 +#define PF_ARM_SME_INSTRUCTIONS_AVAILABLE 70 +#define PF_ARM_SME2_INSTRUCTIONS_AVAILABLE 71 +#define PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE 72 +#define PF_ARM_SME2_2_INSTRUCTIONS_AVAILABLE 73 +#define PF_ARM_SME_AES_INSTRUCTIONS_AVAILABLE 74 +#define PF_ARM_SME_SBITPERM_INSTRUCTIONS_AVAILABLE 75 +#define PF_ARM_SME_SF8MM4_INSTRUCTIONS_AVAILABLE 76 +#define PF_ARM_SME_SF8MM8_INSTRUCTIONS_AVAILABLE 77 +#define PF_ARM_SME_SF8DP2_INSTRUCTIONS_AVAILABLE 78 +#define PF_ARM_SME_SF8DP4_INSTRUCTIONS_AVAILABLE 79 +#define PF_ARM_SME_SF8FMA_INSTRUCTIONS_AVAILABLE 80 +#define PF_ARM_SME_F8F32_INSTRUCTIONS_AVAILABLE 81 +#define PF_ARM_SME_F8F16_INSTRUCTIONS_AVAILABLE 82 +#define PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE 83 +#define PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE 84 +#define PF_ARM_SME_F64F64_INSTRUCTIONS_AVAILABLE 85 +#define PF_ARM_SME_I16I64_INSTRUCTIONS_AVAILABLE 86 +#define PF_ARM_SME_LUTv2_INSTRUCTIONS_AVAILABLE 87 +#define PF_ARM_SME_FA64_INSTRUCTIONS_AVAILABLE 88 #define XSTATE_LEGACY_FLOATING_POINT (0) #define XSTATE_LEGACY_SSE (1) @@ -9140,27 +9182,27 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS) #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) - NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwind (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue); + NTSYSAPI VOID NTAPI RtlUnwind (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue); NTSYSAPI PVOID NTAPI RtlPcToFileHeader (PVOID PcValue, PVOID *BaseOfImage); #if defined (__x86_64__) NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (DWORD64 ControlPc, PDWORD64 ImageBase, PUNWIND_HISTORY_TABLE HistoryTable); - NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); + NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD64 ImageBase, DWORD64 ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD64 EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers); NTSYSAPI BOOLEAN NTAPI RtlIsEcCode(DWORD64 CodePointer); #endif #if defined (__arm__) NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PDWORD ImageBase, PUNWIND_HISTORY_TABLE HistoryTable); - NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); + NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); NTSYSAPI PEXCEPTION_ROUTINE NTAPI RtlVirtualUnwind (DWORD HandlerType, DWORD ImageBase, DWORD ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PVOID *HandlerData, PDWORD EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers); #endif #if defined (__aarch64__) NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONG_PTR ControlPc, PULONG_PTR ImageBase, PUNWIND_HISTORY_TABLE HistoryTable); - NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); + NTSYSAPI VOID NTAPI RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); 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); #endif #if defined (__ia64__) NTSYSAPI PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry (ULONGLONG ControlPc, PULONGLONG ImageBase, PULONGLONG TargetGp); - NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN RtlUnwindEx (FRAME_POINTERS TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); + NTSYSAPI VOID NTAPI RtlUnwindEx (FRAME_POINTERS TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); NTSYSAPI ULONGLONG NTAPI RtlVirtualUnwind (ULONGLONG ImageBase, ULONGLONG ControlPc, PRUNTIME_FUNCTION FunctionEntry, PCONTEXT ContextRecord, PBOOLEAN InFunction, PFRAME_POINTERS EstablisherFrame, PKNONVOLATILE_CONTEXT_POINTERS ContextPointers); #endif #endif diff --git a/lib/libc/include/any-windows-any/wintrust.h b/lib/libc/include/any-windows-any/wintrust.h index 858b2d4db987790b5aa57d6153d5347ab9a2a9d9..68221d0b4da2599345923bbe575ed8f5f8b57170 100644 --- a/lib/libc/include/any-windows-any/wintrust.h +++ b/lib/libc/include/any-windows-any/wintrust.h @@ -34,6 +34,7 @@ extern "C" #define WTD_CHOICE_BLOB 3 #define WTD_CHOICE_SIGNER 4 #define WTD_CHOICE_CERT 5 +#define WTD_CHOICE_DETACHED_SIG 6 #define WTD_STATEACTION_IGNORE 0x00000000 #define WTD_STATEACTION_VERIFY 0x00000001 @@ -45,6 +46,7 @@ extern "C" #define WTD_USE_IE4_TRUST_FLAG 0x00000001 #define WTD_NO_IE4_CHAIN_FLAG 0x00000002 #define WTD_NO_POLICY_USAGE_FLAG 0x00000004 +#define WTD_USE_LOCAL_MACHINE_CERTS 0x00000008 #define WTD_REVOCATION_CHECK_NONE 0x00000010 #define WTD_REVOCATION_CHECK_END_CERT 0x00000020 #define WTD_REVOCATION_CHECK_CHAIN 0x00000040 @@ -54,6 +56,9 @@ extern "C" #define WTD_USE_DEFAULT_OSVER_CHECK 0x00000400 #define WTD_LIFETIME_SIGNING_FLAG 0x00000800 #define WTD_CACHE_ONLY_URL_RETRIEVAL 0x00001000 +#define WTD_DISABLE_MD2_MD4 0x00002000 +#define WTD_MOTW 0x00004000 +#define WTD_CODE_INTEGRITY_DRIVER_MODE 0x00008000 #define WTD_UICONTEXT_EXECUTE 0 #define WTD_UICONTEXT_INSTALL 1 @@ -71,14 +76,41 @@ extern "C" struct WINTRUST_BLOB_INFO_ *pBlob; struct WINTRUST_SGNR_INFO_ *pSgnr; struct WINTRUST_CERT_INFO_ *pCert; + struct WINTRUST_DETACHED_SIG_INFO_ *pDetachedSig; }; DWORD dwStateAction; HANDLE hWVTStateData; WCHAR *pwszURLReference; DWORD dwProvFlags; DWORD dwUIContext; +#if (NTDDI_VERSION >= NTDDI_WIN8) + struct WINTRUST_SIGNATURE_SETTINGS_ *pSignatureSettings; +#endif } WINTRUST_DATA,*PWINTRUST_DATA; +#if (NTDDI_VERSION >= NTDDI_WIN8) + typedef struct WINTRUST_SIGNATURE_SETTINGS_ { + DWORD cbStruct; + DWORD dwIndex; + DWORD dwFlags; + DWORD cSecondarySigs; + DWORD dwVerifiedSigIndex; + PCERT_STRONG_SIGN_PARA pCryptoPolicy; + } WINTRUST_SIGNATURE_SETTINGS,*PWINTRUST_SIGNATURE_SETTINGS; + +#define WSS_VERIFY_SPECIFIC 0x00000001 +#define WSS_GET_SECONDARY_SIG_COUNT 0x00000002 + +#if (NTDDI_VERSION >= NTDDI_WINBLUE) +#define WSS_VERIFY_SEALING 0x00000004 +#define WSS_INPUT_FLAG_MASK 0x00000007 +#define WSS_OUT_SEALING_STATUS_VERIFIED 0x80000000 +#define WSS_OUT_HAS_SEALING_INTENT 0x40000000 +#define WSS_OUT_FILE_SUPPORTS_SEAL 0x20000000 +#define WSS_OUTPUT_FLAG_MASK 0xe0000000 +#endif /* (NTDDI_VERSION >= NTDDI_WINBLUE) */ +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + typedef struct WINTRUST_FILE_INFO_ { DWORD cbStruct; LPCWSTR pcwszFilePath; @@ -86,6 +118,30 @@ extern "C" GUID *pgKnownSubject; } WINTRUST_FILE_INFO,*PWINTRUST_FILE_INFO; + typedef struct WINTRUST_DETACHED_SIG_HANDLES_ { + HANDLE hContentFile; + HANDLE hSignatureFile; + } WINTRUST_DETACHED_SIG_FILE_HANDLES,*PWINTRUST_DETACHED_SIG_FILE_HANDLES; + + typedef struct WINTRUST_DETACHED_SIG_BLOBS_ { + LARGE_INTEGER cbContentObject; + BYTE *pbContentObject; + DWORD cbSignatureObject; + BYTE *pbSignatureObject; + } WINTRUST_DETACHED_SIG_BLOBS,*PWINTRUST_DETACHED_SIG_BLOBS; + +#define WINTRUST_DETACHED_SIG_CHOICE_HANDLE 1 +#define WINTRUST_DETACHED_SIG_CHOICE_BLOB 2 + + typedef struct WINTRUST_DETACHED_SIG_INFO_ { + DWORD cbStruct; + DWORD dwUnionChoice; + __C89_NAMELESS union { + struct WINTRUST_DETACHED_SIG_HANDLES_ *pDetachedSigHandles; + struct WINTRUST_DETACHED_SIG_BLOBS_ *pDetachedSigBlobs; + }; + } WINTRUST_DETACHED_SIG_INFO,*PWINTRUST_DETACHED_SIG_INFO; + typedef HANDLE HCATADMIN; typedef struct WINTRUST_CATALOG_INFO_ { @@ -184,6 +240,11 @@ extern "C" #define TRUSTERROR_MAX_STEPS 38 + struct _CRYPT_PROVIDER_DATA; + struct _CRYPT_PROVIDER_SGNR; + struct _CRYPT_PROVIDER_PRIVDATA; + struct _CRYPT_PROVIDER_DEFUSAGE; + typedef void *(*PFN_CPD_MEM_ALLOC)(DWORD cbSize); typedef void (*PFN_CPD_MEM_FREE)(void *pvMem2Free); typedef WINBOOL (*PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData,HCERTSTORE hStore2Add); diff --git a/lib/libc/include/any-windows-any/winuser.h b/lib/libc/include/any-windows-any/winuser.h index 5423c72ea175a35c6ed11fdc2f1a646c93c36e0d..482f8238282847202ee29ac29b0569ce0f168981 100644 --- a/lib/libc/include/any-windows-any/winuser.h +++ b/lib/libc/include/any-windows-any/winuser.h @@ -6792,7 +6792,7 @@ typedef struct tagINPUT_TRANSFORM { } INPUT_TRANSFORM; /* Do these functions belong here? */ -WINUSERAPI WINBOOL WINAPI GetPointerInputTransform(UINT32 pointerId, UINT32 historyCount, UINT32 *inputTransform); +WINUSERAPI WINBOOL WINAPI GetPointerInputTransform(UINT32 pointerId, UINT32 historyCount, INPUT_TRANSFORM *inputTransform); WINUSERAPI WINBOOL WINAPI IsMousePointerEnabled(void); #endif /*(_WIN32_WINNT >= 0x0602)*/ #endif diff --git a/lib/libc/include/any-windows-any/wmcodecdsp.h b/lib/libc/include/any-windows-any/wmcodecdsp.h index 82de8a4c29b946a5e812bf7adf58302e4687d97f..8c86444dead9454c2cb1f6f4b3bb4f80393b38ad 100644 --- a/lib/libc/include/any-windows-any/wmcodecdsp.h +++ b/lib/libc/include/any-windows-any/wmcodecdsp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmcodecdsp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmcodecdsp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmcontainer.h b/lib/libc/include/any-windows-any/wmcontainer.h index 3c28f613d0b4bc619dfb00b2bc3add23f7c1524a..870b3d6f411fd243157303b8da040366c822c592 100644 --- a/lib/libc/include/any-windows-any/wmcontainer.h +++ b/lib/libc/include/any-windows-any/wmcontainer.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmcontainer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmcontainer.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmdrmsdk.h b/lib/libc/include/any-windows-any/wmdrmsdk.h index 3a78e2e88158008127b24c4c5e3382d796dd1bba..2654f122f8073c89a7ff2c8d171331e6a0384c8c 100644 --- a/lib/libc/include/any-windows-any/wmdrmsdk.h +++ b/lib/libc/include/any-windows-any/wmdrmsdk.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmdrmsdk.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmdrmsdk.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmp.h b/lib/libc/include/any-windows-any/wmp.h index fd6ebe482a85583e79954e12176329f693395f67..f071d1445c562bd7b93cc35a4f6ed40635590afd 100644 --- a/lib/libc/include/any-windows-any/wmp.h +++ b/lib/libc/include/any-windows-any/wmp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmprealestate.h b/lib/libc/include/any-windows-any/wmprealestate.h index ac1a805b6823608623859af847a1c1456484138d..1e2bbb71609a9905e846a54e56ea18cd1c075e02 100644 --- a/lib/libc/include/any-windows-any/wmprealestate.h +++ b/lib/libc/include/any-windows-any/wmprealestate.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmprealestate.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmprealestate.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmpservices.h b/lib/libc/include/any-windows-any/wmpservices.h index 35cfcd81665ea5c407d92973693fba5670a33a3e..1cac38a1f4d0e7f0bf179a8a33cac79a39e7d5fa 100644 --- a/lib/libc/include/any-windows-any/wmpservices.h +++ b/lib/libc/include/any-windows-any/wmpservices.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmpservices.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmpservices.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmsbuffer.h b/lib/libc/include/any-windows-any/wmsbuffer.h index 859c6454b20315b32ecc6f4ecfa7bf5c90ec6023..b1e27e6f0c356a90fa37ab946b2c34c03b164aa9 100644 --- a/lib/libc/include/any-windows-any/wmsbuffer.h +++ b/lib/libc/include/any-windows-any/wmsbuffer.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmsbuffer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmsbuffer.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmsdkidl.h b/lib/libc/include/any-windows-any/wmsdkidl.h index a5e7e64a28b084d6a40eddcae504efc7a40e80ea..eac32cf5b2e1966b1d1ff2269418a3ba7d7a0765 100644 --- a/lib/libc/include/any-windows-any/wmsdkidl.h +++ b/lib/libc/include/any-windows-any/wmsdkidl.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmsdkidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmsdkidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wmsecure.h b/lib/libc/include/any-windows-any/wmsecure.h index f1526c8e49236805a9d59d27321dc3da18ae88b6..efbcf2ece96ded3fcd20604e2cf0b3f9960843e2 100644 --- a/lib/libc/include/any-windows-any/wmsecure.h +++ b/lib/libc/include/any-windows-any/wmsecure.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wmsecure.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wmsecure.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wpcapi.h b/lib/libc/include/any-windows-any/wpcapi.h index 02c6a1506d6b6b297a601534095cc469c71638a3..58134c2c7fcfc0780f7139151e55bb94ca2c7d4e 100644 --- a/lib/libc/include/any-windows-any/wpcapi.h +++ b/lib/libc/include/any-windows-any/wpcapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wpcapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wpcapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdattachment.h b/lib/libc/include/any-windows-any/wsdattachment.h index a0e5c16c83c69cba8f34f7abd839dfccfc791a80..d1b7f9d5153dfa48760fa8c7777e479ed76a1f03 100644 --- a/lib/libc/include/any-windows-any/wsdattachment.h +++ b/lib/libc/include/any-windows-any/wsdattachment.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsdattachment.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsdattachment.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdbase.h b/lib/libc/include/any-windows-any/wsdbase.h index 62e66f297389f580da400f8b1cea488da9fbbeb7..1092c5b4c3bcad4e26b5e99e86063399383aa811 100644 --- a/lib/libc/include/any-windows-any/wsdbase.h +++ b/lib/libc/include/any-windows-any/wsdbase.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsdbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsdbase.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdclient.h b/lib/libc/include/any-windows-any/wsdclient.h index 689fbf52ce9db46a41ed21b534c0823d406c4d43..b317fe0e345b27aa5e021b5c1c39dc50a153e93b 100644 --- a/lib/libc/include/any-windows-any/wsdclient.h +++ b/lib/libc/include/any-windows-any/wsdclient.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsdclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsdclient.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsddisco.h b/lib/libc/include/any-windows-any/wsddisco.h index 465bcfb04fb1ff501fd9f75a1d4cf44581230198..1ea05fb5b817bf6e6050ab8bc27f0c1ca13c9de9 100644 --- a/lib/libc/include/any-windows-any/wsddisco.h +++ b/lib/libc/include/any-windows-any/wsddisco.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsddisco.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsddisco.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdhost.h b/lib/libc/include/any-windows-any/wsdhost.h index 41939a3741f4b0f11a03d04abd47ef36467cd41a..7a69b3fa1e1c8e6c66cc553c0132708b89d1cdbd 100644 --- a/lib/libc/include/any-windows-any/wsdhost.h +++ b/lib/libc/include/any-windows-any/wsdhost.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsdhost.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsdhost.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdxml.h b/lib/libc/include/any-windows-any/wsdxml.h index 59e059301b168324735fa1fd7af9fac26ee38c66..1227e3098e6e562716e38769085e08d94e1d859a 100644 --- a/lib/libc/include/any-windows-any/wsdxml.h +++ b/lib/libc/include/any-windows-any/wsdxml.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsdxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsdxml.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsmandisp.h b/lib/libc/include/any-windows-any/wsmandisp.h index 914ba4fba19e3ac494b8491b95e7f85e6067c256..448ffdb37724bbfad48e95ad413436b25312f71d 100644 --- a/lib/libc/include/any-windows-any/wsmandisp.h +++ b/lib/libc/include/any-windows-any/wsmandisp.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wsmandisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wsmandisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wtypes.h b/lib/libc/include/any-windows-any/wtypes.h index 9b10fa486582e9c43857d9c2c624ac96f240600d..b8931096024da875bc60100609dded58e0504c3c 100644 --- a/lib/libc/include/any-windows-any/wtypes.h +++ b/lib/libc/include/any-windows-any/wtypes.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wtypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wtypesbase.h b/lib/libc/include/any-windows-any/wtypesbase.h index 1eef5f9cb9f6d2b6386d721108b9d36c3b735763..c2b13f024371df2393a1359fa08ea0a069678434 100644 --- a/lib/libc/include/any-windows-any/wtypesbase.h +++ b/lib/libc/include/any-windows-any/wtypesbase.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wtypesbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wtypesbase.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wuapi.h b/lib/libc/include/any-windows-any/wuapi.h index 6824a76e9219632955736b552451758924e7dc7b..666fe245f69ccfd294c117212b7f273736b04c62 100644 --- a/lib/libc/include/any-windows-any/wuapi.h +++ b/lib/libc/include/any-windows-any/wuapi.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/wuapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/wuapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xamlom.h b/lib/libc/include/any-windows-any/xamlom.h index 80bb68c29670ba23d9c62d4a58c91993c769059e..8d0cd478971c76faad1c98c5967578ea20d423a6 100644 --- a/lib/libc/include/any-windows-any/xamlom.h +++ b/lib/libc/include/any-windows-any/xamlom.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xamlom.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xamlom.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xapo.h b/lib/libc/include/any-windows-any/xapo.h index ed76e42f9202883fddc1509a3deccd5905f3e887..ffa5fa9bf1f51745c5d4a06ebb97a4809534a098 100644 --- a/lib/libc/include/any-windows-any/xapo.h +++ b/lib/libc/include/any-windows-any/xapo.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xapo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xapo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xaudio2.h b/lib/libc/include/any-windows-any/xaudio2.h index 122343323f77b678e11d0f4dbbb928c2e259d2d6..47c43b1ef58f61ffd238a5105abea650854ab492 100644 --- a/lib/libc/include/any-windows-any/xaudio2.h +++ b/lib/libc/include/any-windows-any/xaudio2.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xaudio2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xaudio2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -1858,6 +1858,7 @@ inline static float XAudio2RadiansToCutoffFrequency(float radians, float sampler #endif #pragma pack(pop) HRESULT WINAPI XAudio2Create(IXAudio2** pxaudio2, UINT32 flags, XAUDIO2_PROCESSOR processor); +HRESULT WINAPI XAudio2CreateWithVersionInfo(IXAudio2** pxaudio2, UINT32 flags, XAUDIO2_PROCESSOR processor, DWORD version); /* Begin additional prototypes for all interfaces */ diff --git a/lib/libc/include/any-windows-any/xaudio2fx.h b/lib/libc/include/any-windows-any/xaudio2fx.h index 3fed8dcdf6bf52223b76a3bd3b69b6f20b2b928e..58774765510cffc86ce994afe112720a0a405819 100644 --- a/lib/libc/include/any-windows-any/xaudio2fx.h +++ b/lib/libc/include/any-windows-any/xaudio2fx.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xaudio2fx.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xaudio2fx.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xmllite.h b/lib/libc/include/any-windows-any/xmllite.h index 3731c973d9c0b4d70282220d1ca2688dc26ecd90..a27f6ae369f3304d6944194940919ed38c0eacbc 100644 --- a/lib/libc/include/any-windows-any/xmllite.h +++ b/lib/libc/include/any-windows-any/xmllite.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xmllite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xmllite.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xpsdigitalsignature.h b/lib/libc/include/any-windows-any/xpsdigitalsignature.h index 242783edd86271fa0e9075a652f904320e28af17..ca3109732ba4ded86ef4f84d7f5a7180942d4e7b 100644 --- a/lib/libc/include/any-windows-any/xpsdigitalsignature.h +++ b/lib/libc/include/any-windows-any/xpsdigitalsignature.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xpsdigitalsignature.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xpsdigitalsignature.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xpsobjectmodel.h b/lib/libc/include/any-windows-any/xpsobjectmodel.h index 7e778de62aa48b5ec4bb81fa8ea01554004b1c0e..16f357ab9d53abaa22de92da4829653dd0e70d72 100644 --- a/lib/libc/include/any-windows-any/xpsobjectmodel.h +++ b/lib/libc/include/any-windows-any/xpsobjectmodel.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xpsobjectmodel.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xpsobjectmodel.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xpsobjectmodel_1.h b/lib/libc/include/any-windows-any/xpsobjectmodel_1.h index 63acf5805ea556116440ef983820c67080a4dbe9..54dd64823e84cb0cc976533395698bd6a3bf3b5a 100644 --- a/lib/libc/include/any-windows-any/xpsobjectmodel_1.h +++ b/lib/libc/include/any-windows-any/xpsobjectmodel_1.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xpsobjectmodel_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xpsobjectmodel_1.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xpsprint.h b/lib/libc/include/any-windows-any/xpsprint.h index 0a62e574dd5203987aeafd94fbf6150d6d7c55e4..c320e06fb2dbecd327f7d922deb0bff7d938d286 100644 --- a/lib/libc/include/any-windows-any/xpsprint.h +++ b/lib/libc/include/any-windows-any/xpsprint.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xpsprint.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xpsprint.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/xpsrassvc.h b/lib/libc/include/any-windows-any/xpsrassvc.h index a91297a89ba70c1a25ac92c3bd75172a976c07cb..e1cdfcb430b3f8a574df597e46d2bb7348ee0b08 100644 --- a/lib/libc/include/any-windows-any/xpsrassvc.h +++ b/lib/libc/include/any-windows-any/xpsrassvc.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 10.4 from include/xpsrassvc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 11.6 from include/xpsrassvc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__