From 0979e56bd284adf161e1765200785a376fd7bb53 Mon Sep 17 00:00:00 2001 From: Alex Rønne Petersen Date: Fri, 16 May 2025 23:21:29 +0200 Subject: mingw: Update MinGW-w64 headers to 38c8142f660b6ba11e7c408f2de1e9f8bfaf839e. --- lib/libc/include/any-windows-any/_mingw.h | 8 +- lib/libc/include/any-windows-any/_mingw_mac.h | 2 +- lib/libc/include/any-windows-any/_mingw_stat64.h | 23 +- lib/libc/include/any-windows-any/accctrl.h | 4 +- lib/libc/include/any-windows-any/aclui.h | 2 +- lib/libc/include/any-windows-any/activation.h | 2 +- lib/libc/include/any-windows-any/activaut.h | 2 +- lib/libc/include/any-windows-any/activdbg.h | 2 +- lib/libc/include/any-windows-any/activdbg100.h | 2 +- lib/libc/include/any-windows-any/activprof.h | 2 +- lib/libc/include/any-windows-any/activscp.h | 2 +- lib/libc/include/any-windows-any/adhoc.h | 2 +- lib/libc/include/any-windows-any/af_irda.h | 2 +- lib/libc/include/any-windows-any/agtctl_i.c | 50 - lib/libc/include/any-windows-any/agtsvr_i.c | 51 - lib/libc/include/any-windows-any/alg.h | 2 +- lib/libc/include/any-windows-any/alink.h | 2 +- lib/libc/include/any-windows-any/amstream.h | 2 +- lib/libc/include/any-windows-any/amvideo.h | 2 +- lib/libc/include/any-windows-any/aqadmtyp.h | 4 +- lib/libc/include/any-windows-any/asyncinfo.h | 2 +- lib/libc/include/any-windows-any/audioapotypes.h | 2 +- lib/libc/include/any-windows-any/audioclient.h | 2 +- lib/libc/include/any-windows-any/audioendpoints.h | 2 +- lib/libc/include/any-windows-any/audiopolicy.h | 2 +- lib/libc/include/any-windows-any/austream.h | 2 +- lib/libc/include/any-windows-any/authz.h | 2 +- lib/libc/include/any-windows-any/bdaiface.h | 2 +- lib/libc/include/any-windows-any/bdaiface_enums.h | 6 +- lib/libc/include/any-windows-any/bdatypes.h | 6 +- lib/libc/include/any-windows-any/bits.h | 2 +- lib/libc/include/any-windows-any/bits1_5.h | 2 +- lib/libc/include/any-windows-any/bits2_0.h | 2 +- lib/libc/include/any-windows-any/bits2_5.h | 2 +- lib/libc/include/any-windows-any/bits3_0.h | 2 +- lib/libc/include/any-windows-any/bits5_0.h | 2 +- lib/libc/include/any-windows-any/cdoex_i.c | 106 - lib/libc/include/any-windows-any/cdoexm_i.c | 59 - lib/libc/include/any-windows-any/cdosys_i.c | 83 - lib/libc/include/any-windows-any/certsrv.h | 2 +- lib/libc/include/any-windows-any/comadmin.h | 2 +- lib/libc/include/any-windows-any/combaseapi.h | 2 +- lib/libc/include/any-windows-any/comcat.h | 2 +- lib/libc/include/any-windows-any/commctrl.h | 4 +- lib/libc/include/any-windows-any/commoncontrols.h | 2 +- lib/libc/include/any-windows-any/control.h | 2 +- lib/libc/include/any-windows-any/cor.h | 8 +- lib/libc/include/any-windows-any/corecrt_startup.h | 2 +- .../include/any-windows-any/corecrt_stdio_config.h | 14 +- lib/libc/include/any-windows-any/corecrt_wctype.h | 164 + lib/libc/include/any-windows-any/corhdr.h | 26 +- .../include/any-windows-any/credentialprovider.h | 2 +- lib/libc/include/any-windows-any/crtdbg.h | 2 - lib/libc/include/any-windows-any/ctfutb.h | 2 +- lib/libc/include/any-windows-any/ctxtcall.h | 2 +- lib/libc/include/any-windows-any/ctype.h | 181 +- lib/libc/include/any-windows-any/d3d10.h | 2 +- lib/libc/include/any-windows-any/d3d10_1.h | 2 +- lib/libc/include/any-windows-any/d3d10effect.h | 2 +- lib/libc/include/any-windows-any/d3d10sdklayers.h | 2 +- lib/libc/include/any-windows-any/d3d10shader.h | 2 +- lib/libc/include/any-windows-any/d3d11.h | 2 +- lib/libc/include/any-windows-any/d3d11_1.h | 2 +- lib/libc/include/any-windows-any/d3d11_2.h | 2 +- lib/libc/include/any-windows-any/d3d11_3.h | 2 +- lib/libc/include/any-windows-any/d3d11_4.h | 2 +- lib/libc/include/any-windows-any/d3d11on12.h | 2 +- lib/libc/include/any-windows-any/d3d11sdklayers.h | 2 +- lib/libc/include/any-windows-any/d3d12.h | 2 +- lib/libc/include/any-windows-any/d3d12sdklayers.h | 2 +- lib/libc/include/any-windows-any/d3d12shader.h | 2 +- lib/libc/include/any-windows-any/d3d12video.h | 2 +- lib/libc/include/any-windows-any/d3d8.h | 26 +- lib/libc/include/any-windows-any/d3d8caps.h | 4 +- lib/libc/include/any-windows-any/d3d8types.h | 10 +- lib/libc/include/any-windows-any/d3d9.h | 40 +- lib/libc/include/any-windows-any/d3d9caps.h | 4 +- lib/libc/include/any-windows-any/d3d9types.h | 8 +- lib/libc/include/any-windows-any/d3dcaps.h | 4 +- lib/libc/include/any-windows-any/d3dcommon.h | 2 +- lib/libc/include/any-windows-any/d3drmobj.h | 16 +- lib/libc/include/any-windows-any/d3dtypes.h | 4 +- lib/libc/include/any-windows-any/d3dx9shader.h | 2 +- lib/libc/include/any-windows-any/d3dx9tex.h | 3 + lib/libc/include/any-windows-any/dbgprop.h | 2 +- lib/libc/include/any-windows-any/dcommon.h | 2 +- lib/libc/include/any-windows-any/dcompanimation.h | 2 +- lib/libc/include/any-windows-any/ddstream.h | 2 +- lib/libc/include/any-windows-any/devicetopology.h | 2 +- lib/libc/include/any-windows-any/dimm.h | 2 +- lib/libc/include/any-windows-any/dinputd.h | 2 +- .../include/any-windows-any/directmanipulation.h | 2 +- lib/libc/include/any-windows-any/dispex.h | 2 +- lib/libc/include/any-windows-any/dmodshow.h | 2 +- lib/libc/include/any-windows-any/dmplugin.h | 4 +- lib/libc/include/any-windows-any/dmusbuff.h | 4 +- lib/libc/include/any-windows-any/dmusicc.h | 4 +- lib/libc/include/any-windows-any/dmusicf.h | 4 +- lib/libc/include/any-windows-any/dmusici.h | 4 +- lib/libc/include/any-windows-any/docobj.h | 2 +- .../include/any-windows-any/docobjectservice.h | 2 +- lib/libc/include/any-windows-any/documenttarget.h | 2 +- lib/libc/include/any-windows-any/downloadmgr.h | 2 +- lib/libc/include/any-windows-any/dpnathlp.h | 2 +- lib/libc/include/any-windows-any/drmexternals.h | 2 +- lib/libc/include/any-windows-any/dvdif.h | 2 +- lib/libc/include/any-windows-any/dwmapi.h | 2 +- lib/libc/include/any-windows-any/dwrite.h | 2 +- lib/libc/include/any-windows-any/dwrite_1.h | 2 +- lib/libc/include/any-windows-any/dwrite_2.h | 2 +- lib/libc/include/any-windows-any/dwrite_3.h | 2 +- lib/libc/include/any-windows-any/dxgi.h | 2 +- lib/libc/include/any-windows-any/dxgi1_2.h | 2 +- lib/libc/include/any-windows-any/dxgi1_3.h | 2 +- lib/libc/include/any-windows-any/dxgi1_4.h | 2 +- lib/libc/include/any-windows-any/dxgi1_5.h | 2 +- lib/libc/include/any-windows-any/dxgi1_6.h | 2 +- lib/libc/include/any-windows-any/dxgicommon.h | 2 +- lib/libc/include/any-windows-any/dxgidebug.h | 2 +- lib/libc/include/any-windows-any/dxgiformat.h | 2 +- lib/libc/include/any-windows-any/dxgitype.h | 2 +- lib/libc/include/any-windows-any/dxva.h | 30 +- lib/libc/include/any-windows-any/dxva2api.h | 2 +- lib/libc/include/any-windows-any/dxvahd.h | 2 +- lib/libc/include/any-windows-any/emostore_i.c | 54 - lib/libc/include/any-windows-any/endpointvolume.h | 2 +- lib/libc/include/any-windows-any/evntprov.h | 6 +- lib/libc/include/any-windows-any/evr.h | 2 +- lib/libc/include/any-windows-any/evr9.h | 2 +- lib/libc/include/any-windows-any/exdisp.h | 2 +- lib/libc/include/any-windows-any/fenv.h | 108 +- lib/libc/include/any-windows-any/filter.h | 2 +- lib/libc/include/any-windows-any/float.h | 14 + lib/libc/include/any-windows-any/fsrm.h | 2 +- lib/libc/include/any-windows-any/fsrmenums.h | 2 +- lib/libc/include/any-windows-any/fsrmquota.h | 2 +- lib/libc/include/any-windows-any/fsrmreports.h | 2 +- lib/libc/include/any-windows-any/fsrmscreen.h | 2 +- lib/libc/include/any-windows-any/ftw.h | 30 +- lib/libc/include/any-windows-any/fusion.h | 2 +- lib/libc/include/any-windows-any/fwptypes.h | 2 +- lib/libc/include/any-windows-any/hstring.h | 2 +- lib/libc/include/any-windows-any/httprequest.h | 473 +++ lib/libc/include/any-windows-any/icftypes.h | 2 +- lib/libc/include/any-windows-any/icodecapi.h | 2 +- lib/libc/include/any-windows-any/iisext_i.c | 66 - lib/libc/include/any-windows-any/iketypes.h | 2 +- .../include/any-windows-any/inputpaneinterop.h | 2 +- lib/libc/include/any-windows-any/inputscope.h | 2 +- lib/libc/include/any-windows-any/inspectable.h | 2 +- lib/libc/include/any-windows-any/iwscapi.h | 2 +- lib/libc/include/any-windows-any/locale.h | 4 + lib/libc/include/any-windows-any/locationapi.h | 2 +- lib/libc/include/any-windows-any/malloc.h | 4 +- lib/libc/include/any-windows-any/math.h | 182 +- lib/libc/include/any-windows-any/mediaobj.h | 2 +- lib/libc/include/any-windows-any/medparam.h | 2 +- lib/libc/include/any-windows-any/memoryapi.h | 4 +- lib/libc/include/any-windows-any/mfapi.h | 12 +- lib/libc/include/any-windows-any/mfcaptureengine.h | 2 +- lib/libc/include/any-windows-any/mfd3d12.h | 2 +- lib/libc/include/any-windows-any/mfidl.h | 2 +- lib/libc/include/any-windows-any/mfmediacapture.h | 2 +- lib/libc/include/any-windows-any/mfmediaengine.h | 2 +- lib/libc/include/any-windows-any/mfobjects.h | 2 +- lib/libc/include/any-windows-any/mfplay.h | 2 +- lib/libc/include/any-windows-any/mfreadwrite.h | 2 +- lib/libc/include/any-windows-any/mftransform.h | 2 +- lib/libc/include/any-windows-any/mmdeviceapi.h | 2 +- lib/libc/include/any-windows-any/mmstream.h | 2 +- lib/libc/include/any-windows-any/mpeg2bits.h | 80 +- lib/libc/include/any-windows-any/mpeg2data.h | 822 ++++- lib/libc/include/any-windows-any/mpeg2structs.h | 469 +-- lib/libc/include/any-windows-any/mscat.h | 4 +- lib/libc/include/any-windows-any/mscoree.h | 2 +- lib/libc/include/any-windows-any/msctf.h | 2 +- lib/libc/include/any-windows-any/mshtmhst.h | 2 +- lib/libc/include/any-windows-any/mshtml.h | 2 +- lib/libc/include/any-windows-any/msinkaut.h | 2 +- lib/libc/include/any-windows-any/msinkaut_i.c | 2 +- lib/libc/include/any-windows-any/msopc.h | 2 +- lib/libc/include/any-windows-any/msxml.h | 2 +- lib/libc/include/any-windows-any/msxml2.h | 2 +- lib/libc/include/any-windows-any/msxml6.h | 2 +- lib/libc/include/any-windows-any/mtsadmin_i.c | 41 - lib/libc/include/any-windows-any/mtxadmin_i.c | 41 - .../include/any-windows-any/napcertrelyingparty.h | 2 +- lib/libc/include/any-windows-any/napcommon.h | 2 +- .../include/any-windows-any/napenforcementclient.h | 2 +- lib/libc/include/any-windows-any/napmanagement.h | 2 +- lib/libc/include/any-windows-any/napprotocol.h | 2 +- .../include/any-windows-any/napservermanagement.h | 2 +- .../include/any-windows-any/napsystemhealthagent.h | 2 +- .../any-windows-any/napsystemhealthvalidator.h | 2 +- lib/libc/include/any-windows-any/naptypes.h | 2 +- lib/libc/include/any-windows-any/netcfgn.h | 2 +- lib/libc/include/any-windows-any/netcfgx.h | 2 +- lib/libc/include/any-windows-any/netfw.h | 2 +- lib/libc/include/any-windows-any/netlistmgr.h | 2 +- lib/libc/include/any-windows-any/nldef.h | 6 +- lib/libc/include/any-windows-any/ntddmmc.h | 2 +- lib/libc/include/any-windows-any/ntddndis.h | 10 +- lib/libc/include/any-windows-any/ntsecapi.h | 4 +- lib/libc/include/any-windows-any/oaidl.h | 2 +- lib/libc/include/any-windows-any/objectarray.h | 2 +- lib/libc/include/any-windows-any/objidl.h | 2 +- lib/libc/include/any-windows-any/objidlbase.h | 2 +- lib/libc/include/any-windows-any/ocidl.h | 2 +- lib/libc/include/any-windows-any/odbcinst.h | 2 +- lib/libc/include/any-windows-any/oleacc.h | 2 +- lib/libc/include/any-windows-any/oleidl.h | 2 +- lib/libc/include/any-windows-any/optary.h | 2 +- lib/libc/include/any-windows-any/p2p.h | 28 +- lib/libc/include/any-windows-any/pnrpdef.h | 2 +- .../include/any-windows-any/portabledeviceapi.h | 2 +- .../include/any-windows-any/portabledevicetypes.h | 2 +- .../any-windows-any/proofofpossessioncookieinfo.h | 2 +- lib/libc/include/any-windows-any/propidl.h | 2 +- lib/libc/include/any-windows-any/propsys.h | 2 +- lib/libc/include/any-windows-any/pthread.h | 85 +- lib/libc/include/any-windows-any/pthread_compat.h | 32 +- lib/libc/include/any-windows-any/pthread_time.h | 59 +- lib/libc/include/any-windows-any/qedit.h | 2 +- lib/libc/include/any-windows-any/qnetwork.h | 2 +- lib/libc/include/any-windows-any/rasshost.h | 4 +- lib/libc/include/any-windows-any/rdpencomapi.h | 2 +- lib/libc/include/any-windows-any/regbag.h | 2 +- lib/libc/include/any-windows-any/relogger.h | 2 +- lib/libc/include/any-windows-any/robuffer.h | 2 +- lib/libc/include/any-windows-any/rtworkq.h | 2 +- lib/libc/include/any-windows-any/sapi51.h | 2 +- lib/libc/include/any-windows-any/sapi53.h | 2 +- lib/libc/include/any-windows-any/sapi54.h | 2 +- lib/libc/include/any-windows-any/scardssp_i.c | 63 - lib/libc/include/any-windows-any/scardssp_p.c | 285 -- lib/libc/include/any-windows-any/semaphore.h | 15 +- lib/libc/include/any-windows-any/sensorsapi.h | 2 +- lib/libc/include/any-windows-any/servprov.h | 2 +- lib/libc/include/any-windows-any/setjmp.h | 24 +- lib/libc/include/any-windows-any/shldisp.h | 2 +- lib/libc/include/any-windows-any/shlobj.h | 8 +- lib/libc/include/any-windows-any/shobjidl.h | 2 +- lib/libc/include/any-windows-any/shtypes.h | 2 +- .../include/any-windows-any/spatialaudioclient.h | 2 +- lib/libc/include/any-windows-any/spellcheck.h | 2 +- lib/libc/include/any-windows-any/sql.h | 2 +- lib/libc/include/any-windows-any/sqlext.h | 77 +- lib/libc/include/any-windows-any/sqltypes.h | 2 +- lib/libc/include/any-windows-any/stdio.h | 262 +- lib/libc/include/any-windows-any/stdlib.h | 2 - lib/libc/include/any-windows-any/strmif.h | 2 +- .../any-windows-any/structuredquerycondition.h | 2 +- lib/libc/include/any-windows-any/sys/stat.h | 214 +- lib/libc/include/any-windows-any/sysinfoapi.h | 10 + .../systemmediatransportcontrolsinterop.h | 2 +- lib/libc/include/any-windows-any/taskschd.h | 2 +- lib/libc/include/any-windows-any/tchar.h | 6 - lib/libc/include/any-windows-any/textstor.h | 2 +- lib/libc/include/any-windows-any/thumbcache.h | 2 +- lib/libc/include/any-windows-any/tlbref.h | 2 +- lib/libc/include/any-windows-any/tlogstg.h | 2 +- lib/libc/include/any-windows-any/tpcshrd.h | 2 +- lib/libc/include/any-windows-any/tsattrs.h | 200 +- lib/libc/include/any-windows-any/tsuserex_i.c | 53 - .../include/any-windows-any/tsvirtualchannels.h | 2 +- lib/libc/include/any-windows-any/tuner.h | 2 +- lib/libc/include/any-windows-any/uianimation.h | 2 +- .../include/any-windows-any/uiautomationclient.h | 2 +- .../include/any-windows-any/uiautomationcore.h | 2 +- .../any-windows-any/uiviewsettingsinterop.h | 2 +- lib/libc/include/any-windows-any/unknwn.h | 2 +- lib/libc/include/any-windows-any/unknwnbase.h | 2 +- lib/libc/include/any-windows-any/urlhist.h | 2 +- lib/libc/include/any-windows-any/urlmon.h | 2 +- lib/libc/include/any-windows-any/usp10.h | 2 +- lib/libc/include/any-windows-any/uxtheme.h | 10 +- lib/libc/include/any-windows-any/vdslun.h | 2 +- lib/libc/include/any-windows-any/vidcap.h | 2 +- lib/libc/include/any-windows-any/vmr9.h | 2 +- lib/libc/include/any-windows-any/vsadmin.h | 2 +- lib/libc/include/any-windows-any/vsbackup.h | 2 +- lib/libc/include/any-windows-any/vsmgmt.h | 2 +- lib/libc/include/any-windows-any/vsprov.h | 2 +- lib/libc/include/any-windows-any/vss.h | 2 +- lib/libc/include/any-windows-any/vsstyle.h | 336 +-- lib/libc/include/any-windows-any/vssym32.h | 86 +- lib/libc/include/any-windows-any/vswriter.h | 2 +- lib/libc/include/any-windows-any/wbemads.h | 2 +- lib/libc/include/any-windows-any/wbemcli.h | 2 +- lib/libc/include/any-windows-any/wbemdisp.h | 2 +- lib/libc/include/any-windows-any/wbemidl.h | 4 +- lib/libc/include/any-windows-any/wbemprov.h | 2 +- lib/libc/include/any-windows-any/wbemtran.h | 2 +- lib/libc/include/any-windows-any/wchar.h | 346 +-- lib/libc/include/any-windows-any/wctype.h | 138 +- lib/libc/include/any-windows-any/wdstptmgmt.h | 2 +- lib/libc/include/any-windows-any/weakreference.h | 2 +- lib/libc/include/any-windows-any/wia_lh.h | 2 +- lib/libc/include/any-windows-any/wia_xp.h | 2 +- lib/libc/include/any-windows-any/wiadef.h | 6 +- lib/libc/include/any-windows-any/winbase.h | 6 +- lib/libc/include/any-windows-any/wincodec.h | 2 +- lib/libc/include/any-windows-any/wincodecsdk.h | 2 +- lib/libc/include/any-windows-any/winddi.h | 2 +- lib/libc/include/any-windows-any/windot11.h | 2 +- .../include/any-windows-any/windowsnumerics.impl.h | 30 +- lib/libc/include/any-windows-any/winhttp.h | 64 +- lib/libc/include/any-windows-any/winhvemulation.h | 6 +- lib/libc/include/any-windows-any/winhvplatform.h | 105 + .../include/any-windows-any/winhvplatformdefs.h | 3137 ++++++++++++-------- lib/libc/include/any-windows-any/winioctl.h | 48 + lib/libc/include/any-windows-any/winnt.h | 37 +- lib/libc/include/any-windows-any/winuser.h | 4 +- lib/libc/include/any-windows-any/wmcodecdsp.h | 2 +- lib/libc/include/any-windows-any/wmcontainer.h | 2 +- lib/libc/include/any-windows-any/wmdrmsdk.h | 2 +- lib/libc/include/any-windows-any/wmp.h | 2 +- lib/libc/include/any-windows-any/wmprealestate.h | 2 +- lib/libc/include/any-windows-any/wmpservices.h | 2 +- lib/libc/include/any-windows-any/wmsbuffer.h | 2 +- lib/libc/include/any-windows-any/wmsdkidl.h | 4 +- lib/libc/include/any-windows-any/wmsecure.h | 2 +- lib/libc/include/any-windows-any/wpcapi.h | 2 +- lib/libc/include/any-windows-any/wrl/client.h | 47 +- lib/libc/include/any-windows-any/wsdattachment.h | 2 +- lib/libc/include/any-windows-any/wsdbase.h | 2 +- lib/libc/include/any-windows-any/wsdclient.h | 2 +- lib/libc/include/any-windows-any/wsddisco.h | 2 +- lib/libc/include/any-windows-any/wsdhost.h | 2 +- lib/libc/include/any-windows-any/wsdtypes.h | 2 +- lib/libc/include/any-windows-any/wsdxml.h | 2 +- lib/libc/include/any-windows-any/wsman.h | 2 +- lib/libc/include/any-windows-any/wsmandisp.h | 2 +- lib/libc/include/any-windows-any/wtypes.h | 2 +- lib/libc/include/any-windows-any/wtypesbase.h | 2 +- lib/libc/include/any-windows-any/wuapi.h | 2 +- lib/libc/include/any-windows-any/xamlom.h | 2 +- lib/libc/include/any-windows-any/xapo.h | 2 +- lib/libc/include/any-windows-any/xaudio2.h | 31 +- lib/libc/include/any-windows-any/xaudio2fx.h | 2 +- lib/libc/include/any-windows-any/xmllite.h | 2 +- .../include/any-windows-any/xpsdigitalsignature.h | 2 +- lib/libc/include/any-windows-any/xpsobjectmodel.h | 2 +- .../include/any-windows-any/xpsobjectmodel_1.h | 2 +- lib/libc/include/any-windows-any/xpsprint.h | 2 +- lib/libc/include/any-windows-any/xpsrassvc.h | 2 +- 346 files changed, 5336 insertions(+), 4446 deletions(-) delete mode 100644 lib/libc/include/any-windows-any/agtctl_i.c delete mode 100644 lib/libc/include/any-windows-any/agtsvr_i.c delete mode 100644 lib/libc/include/any-windows-any/cdoex_i.c delete mode 100644 lib/libc/include/any-windows-any/cdoexm_i.c delete mode 100644 lib/libc/include/any-windows-any/cdosys_i.c create mode 100644 lib/libc/include/any-windows-any/corecrt_wctype.h delete mode 100644 lib/libc/include/any-windows-any/emostore_i.c create mode 100644 lib/libc/include/any-windows-any/httprequest.h delete mode 100644 lib/libc/include/any-windows-any/iisext_i.c delete mode 100644 lib/libc/include/any-windows-any/mtsadmin_i.c delete mode 100644 lib/libc/include/any-windows-any/mtxadmin_i.c delete mode 100644 lib/libc/include/any-windows-any/scardssp_i.c delete mode 100644 lib/libc/include/any-windows-any/scardssp_p.c delete mode 100644 lib/libc/include/any-windows-any/tsuserex_i.c (limited to 'lib/libc/include') diff --git a/lib/libc/include/any-windows-any/_mingw.h b/lib/libc/include/any-windows-any/_mingw.h index 965a2275c5..acfc0f9bd6 100644 --- a/lib/libc/include/any-windows-any/_mingw.h +++ b/lib/libc/include/any-windows-any/_mingw.h @@ -246,6 +246,12 @@ limitations in handling dllimport attribute. */ #define _UCRT #endif +#ifdef _UCRT +# define __MINGW_UCRT_ASM_CALL(func) __MINGW_ASM_CALL(func) +#else +# define __MINGW_UCRT_ASM_CALL(func) +#endif + #ifndef _WIN32_WINNT #define _WIN32_WINNT 0xa00 #endif @@ -384,7 +390,7 @@ typedef int __int128 __attribute__ ((__mode__ (TI))); #ifndef __WIDL__ -#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT) && !defined (_UCRT) +#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT) && !defined (_UCRT) && !(defined (_TIME_BITS) && _TIME_BITS == 64) #ifndef _USE_32BIT_TIME_T #define _USE_32BIT_TIME_T #endif diff --git a/lib/libc/include/any-windows-any/_mingw_mac.h b/lib/libc/include/any-windows-any/_mingw_mac.h index f69bbec5d3..70d64f6d02 100644 --- a/lib/libc/include/any-windows-any/_mingw_mac.h +++ b/lib/libc/include/any-windows-any/_mingw_mac.h @@ -270,7 +270,7 @@ # define __MINGW_ATTRIB_DEPRECATED_MSVC2005 #endif -#if !defined (_CRT_SECURE_NO_WARNINGS) || (_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES == 0) +#if !defined (_CRT_SECURE_NO_WARNINGS) # define __MINGW_ATTRIB_DEPRECATED_SEC_WARN \ __MINGW_ATTRIB_DEPRECATED_STR(__MINGW_SEC_WARN_STR) #else diff --git a/lib/libc/include/any-windows-any/_mingw_stat64.h b/lib/libc/include/any-windows-any/_mingw_stat64.h index 8ce0975611..84eabba969 100644 --- a/lib/libc/include/any-windows-any/_mingw_stat64.h +++ b/lib/libc/include/any-windows-any/_mingw_stat64.h @@ -1,5 +1,8 @@ #ifndef _STAT_DEFINED +/* __stat64 is needed for compatibility with msvc */ +#define __stat64 _stat64 + #ifdef _USE_32BIT_TIME_T #define _fstat _fstat32 #define _fstati64 _fstat32i64 @@ -30,22 +33,6 @@ __time32_t st_ctime; }; -#ifndef NO_OLDNAMES - struct stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; - }; -#endif /* NO_OLDNAMES */ - struct _stat32i64 { _dev_t st_dev; _ino_t st_ino; @@ -88,9 +75,5 @@ __time64_t st_ctime; }; -#define __stat64 _stat64 -#define stat64 _stat64 /* for POSIX */ -#define fstat64 _fstat64 /* for POSIX */ - #define _STAT_DEFINED #endif /* _STAT_DEFINED */ diff --git a/lib/libc/include/any-windows-any/accctrl.h b/lib/libc/include/any-windows-any/accctrl.h index beb2a0bb68..8979b75006 100644 --- a/lib/libc/include/any-windows-any/accctrl.h +++ b/lib/libc/include/any-windows-any/accctrl.h @@ -32,7 +32,7 @@ extern "C" { SE_DS_OBJECT_ALL, SE_PROVIDER_DEFINED_OBJECT, SE_WMIGUID_OBJECT, - SE_REGISTRY_WOW64_32KEY, + SE_REGISTRY_WOW64_32KEY } SE_OBJECT_TYPE; typedef enum _TRUSTEE_TYPE { @@ -56,7 +56,7 @@ extern "C" { typedef enum _MULTIPLE_TRUSTEE_OPERATION { NO_MULTIPLE_TRUSTEE, - TRUSTEE_IS_IMPERSONATE, + TRUSTEE_IS_IMPERSONATE } MULTIPLE_TRUSTEE_OPERATION; typedef struct _OBJECTS_AND_SID { diff --git a/lib/libc/include/any-windows-any/aclui.h b/lib/libc/include/any-windows-any/aclui.h index 9116c6f64e..f5be6abfce 100644 --- a/lib/libc/include/any-windows-any/aclui.h +++ b/lib/libc/include/any-windows-any/aclui.h @@ -112,7 +112,7 @@ extern "C" { SI_SHOW_OWNER_ACTIVATED, SI_SHOW_EFFECTIVE_ACTIVATED, SI_SHOW_SHARE_ACTIVATED, - SI_SHOW_CENTRAL_POLICY_ACTIVATED, + SI_SHOW_CENTRAL_POLICY_ACTIVATED } SI_PAGE_ACTIVATED; #define GET_PAGE_TYPE(X) (UINT) ((X) &0x0000ffff) diff --git a/lib/libc/include/any-windows-any/activation.h b/lib/libc/include/any-windows-any/activation.h index 8da6cf00b5..306cf13756 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.0-rc1 from include/activation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 323e40d09c..df51871560 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.0-rc1 from include/activaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b7b67394d8..6f2818f648 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.0-rc1 from include/activdbg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2a1525cb0a..ab6c128383 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.0-rc1 from include/activdbg100.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 dab6933358..b32e077f09 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.0-rc1 from include/activprof.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 3e7062187f..a0670d7dac 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.0-rc1 from include/activscp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 77929af552..2084d35e68 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.0-rc1 from include/adhoc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/adhoc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/af_irda.h b/lib/libc/include/any-windows-any/af_irda.h index f2dadb8041..8c649ac101 100644 --- a/lib/libc/include/any-windows-any/af_irda.h +++ b/lib/libc/include/any-windows-any/af_irda.h @@ -59,7 +59,7 @@ enum { LM_HB_Extension = 128,LM_HB1_PnP = 1,LM_HB1_PDA_Palmtop = 2,LM_HB1_Computer = 4,LM_HB1_Printer = 8,LM_HB1_Modem = 16,LM_HB1_Fax = 32, - LM_HB1_LANAccess = 64,LM_HB2_Telephony = 1,LM_HB2_FileServer = 2, + LM_HB1_LANAccess = 64,LM_HB2_Telephony = 1,LM_HB2_FileServer = 2 }; #define LmCharSetASCII 0 diff --git a/lib/libc/include/any-windows-any/agtctl_i.c b/lib/libc/include/any-windows-any/agtctl_i.c deleted file mode 100644 index 7a2411e2c6..0000000000 --- a/lib/libc/include/any-windows-any/agtctl_i.c +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - - const IID IID_IAgentCtlRequest = {0x1DAB85C3,0x803A,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtlUserInput = {0xC4ABF875,0x8100,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtlBalloon = {0xF5BE8BD3,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlBalloonEx = {0x822DB1C0,0x8879,0x11d1,{0x9E,0xC6,0x00,0xC0,0x4F,0xD7,0x08,0x1F}}; - const IID IID_IAgentCtlCommand = {0xF5BE8BE3,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlCommandEx = {0xB0913410,0x3B44,0x11d1,{0xAC,0xBA,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtlCommands = {0xF5BE8BE1,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlCommandsEx = {0x6BA90C01,0x3910,0x11d1,{0xAC,0xB3,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtlCharacter = {0xF5BE8BD9,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlAnimationNames = {0x8B77181C,0xD3EF,0x11d1,{0x85,0x00,0x00,0xC0,0x4F,0xA3,0x4A,0x14}}; - const IID IID_IAgentCtlCharacterEx = {0xDE8EF600,0x2F82,0x11d1,{0xAC,0xAC,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtlCharacters = {0xF5BE8BE8,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlAudioObject = {0xF5BE8BDB,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlAudioObjectEx = {0xF5BE8BF0,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlSpeechInput = {0xF5BE8BDD,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlPropertySheet = {0xF5BE8BDF,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlCommandsWindow = {0x6D0ECB27,0x9968,0x11D0,{0xAC,0x6E,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCtl = {0xF5BE8BD1,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentCtlEx = {0x8563FF20,0x8ECC,0x11d1,{0xB9,0xB4,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID LIBID_AgentObjects = {0xF5BE8BC2,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID DIID__AgentEvents = {0xF5BE8BD4,0x7DE6,0x11D0,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const CLSID CLSID_Agent = {0xD45FD31B,0x5C6E,0x11D1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}}; - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/agtsvr_i.c b/lib/libc/include/any-windows-any/agtsvr_i.c deleted file mode 100644 index b58c8bc7d4..0000000000 --- a/lib/libc/include/any-windows-any/agtsvr_i.c +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - - const IID IID_IAgentUserInput = {0xA7B93C80,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCommand = {0xA7B93C83,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCommandEx = {0xB0913412,0x3B44,0x11d1,{0xAC,0xBA,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCommands = {0xA7B93C85,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCommandsEx = {0x6BA90C00,0x3910,0x11d1,{0xAC,0xB3,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCommandWindow = {0x6D0ECB23,0x9968,0x11D0,{0xAC,0x6E,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentSpeechInputProperties = {0xA7B93C87,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentAudioOutputProperties = {0xA7B93C89,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentAudioOutputPropertiesEx = {0xA7B93CA0,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentPropertySheet = {0xA7B93C8B,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentBalloon = {0xA7B93C8D,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentBalloonEx = {0xD7A6D440,0x8872,0x11d1,{0x9E,0xC6,0x00,0xC0,0x4F,0xD7,0x08,0x1F}}; - const IID IID_IAgentCharacter = {0xA7B93C8F,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCharacterEx = {0x98BBE491,0x2EED,0x11d1,{0xAC,0xAC,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgent = {0xA7B93C91,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentEx = {0x48D12BA0,0x5B77,0x11d1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}}; - const IID IID_IAgentNotifySink = {0x00D18159,0x8466,0x11D0,{0xAC,0x63,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentNotifySinkEx = {0x08C75162,0x3C9C,0x11d1,{0x91,0xFE,0x00,0xC0,0x4F,0xD7,0x01,0xA5}}; - const IID IID_IAgentPrivateNotifySink = {0xB741B760,0x8EA6,0x11d0,{0xAC,0x6A,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID IID_IAgentCustomMarshalMaker = {0x408D7542,0xC8FC,0x11d1,{0xAA,0x83,0x00,0xC0,0x4F,0xA3,0x4D,0x72}}; - const IID IID_IAgentClientStatus = {0xC5649F70,0x7AED,0x11d1,{0xB9,0xA8,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const IID LIBID_AgentServerObjects = {0xA7B93C73,0x7B81,0x11D0,{0xAC,0x5F,0x00,0xC0,0x4F,0xD9,0x75,0x75}}; - const CLSID CLSID_AgentServer = {0xD45FD2FC,0x5C6E,0x11D1,{0x9E,0xC1,0x00,0xC0,0x4F,0xD7,0x08,0x1F}}; - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/alg.h b/lib/libc/include/any-windows-any/alg.h index 45122302d8..5c76938a3c 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.0-rc1 from include/alg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/alg.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/alink.h b/lib/libc/include/any-windows-any/alink.h index 837813953d..156e5395bd 100644 --- a/lib/libc/include/any-windows-any/alink.h +++ b/lib/libc/include/any-windows-any/alink.h @@ -35,7 +35,7 @@ typedef enum _AssemblyFlags { afCleanModules = 0x00000002, afNoRefHash = 0x00000004, afNoDupTypeCheck = 0x00000008, - afDupeCheckTypeFwds = 0x00000010, + afDupeCheckTypeFwds = 0x00000010 } AssemblyFlags; EXTERN_GUID (CLSID_AssemblyLinker, 0xf7e02368, 0xa7f4, 0x471f, 0x8c, 0x5e, 0x98, 0x39, 0xed, 0x57, 0xcb, 0x5e); diff --git a/lib/libc/include/any-windows-any/amstream.h b/lib/libc/include/any-windows-any/amstream.h index fbe51b4cc7..20a66ab33d 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.0-rc1 from include/amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b12684bcc2..f754a7f832 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.0-rc1 from include/amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/amvideo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/aqadmtyp.h b/lib/libc/include/any-windows-any/aqadmtyp.h index 7f8772b835..5b1463144f 100644 --- a/lib/libc/include/any-windows-any/aqadmtyp.h +++ b/lib/libc/include/any-windows-any/aqadmtyp.h @@ -10,7 +10,7 @@ #define QUEUE_ADMIN_MAX_BUFFER_REQUIRED 200 typedef enum tagQUEUE_ADMIN_VERSIONS { - CURRENT_QUEUE_ADMIN_VERSION = 4, + CURRENT_QUEUE_ADMIN_VERSION = 4 } QUEUE_ADMIN_VERSIONS; typedef struct tagMESSAGE_FILTER { @@ -54,7 +54,7 @@ typedef enum tagMESSAGE_ENUM_FILTER_TYPE { MEF_N_OLDEST_MESSAGES = 0x80, MEF_FAILED = 0x100, MEF_ALL = 0x40000000, - MEF_INVERTSENSE = 0x80000000, + MEF_INVERTSENSE = 0x80000000 } MESSAGE_ENUM_FILTER_TYPE; typedef struct tagMESSAGE_ENUM_FILTER { diff --git a/lib/libc/include/any-windows-any/asyncinfo.h b/lib/libc/include/any-windows-any/asyncinfo.h index bb2dffca7c..5ee431eafc 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.0-rc1 from include/asyncinfo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/asyncinfo.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/audioapotypes.h b/lib/libc/include/any-windows-any/audioapotypes.h index 090a6a3f8b..49874b11e8 100644 --- a/lib/libc/include/any-windows-any/audioapotypes.h +++ b/lib/libc/include/any-windows-any/audioapotypes.h @@ -29,7 +29,7 @@ typedef struct APO_CONNECTION_PROPERTY { typedef enum { AUDIO_CURVE_TYPE_NONE = 0, - AUDIO_CURVE_TYPE_WINDOWS_FADE = 1, + AUDIO_CURVE_TYPE_WINDOWS_FADE = 1 } AUDIO_CURVE_TYPE; #endif diff --git a/lib/libc/include/any-windows-any/audioclient.h b/lib/libc/include/any-windows-any/audioclient.h index d200531520..146e1df152 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.0-rc1 from include/audioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5470508003..c7dc9b872f 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.0-rc1 from include/audioendpoints.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 4acbd39b93..0575ffd3f7 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.0-rc1 from include/audiopolicy.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 98a619bc10..026ecd6c73 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.0-rc1 from include/austream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/austream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/authz.h b/lib/libc/include/any-windows-any/authz.h index d6dd14bb33..1c8c09d562 100644 --- a/lib/libc/include/any-windows-any/authz.h +++ b/lib/libc/include/any-windows-any/authz.h @@ -243,7 +243,7 @@ extern "C" { AuthzAuditEventInfoOperationType, AuthzAuditEventInfoObjectType, AuthzAuditEventInfoObjectName, - AuthzAuditEventInfoAdditionalInfo, + AuthzAuditEventInfoAdditionalInfo } AUTHZ_AUDIT_EVENT_INFORMATION_CLASS; AUTHZAPI WINBOOL WINAPI AuthzFreeAuditEvent (AUTHZ_AUDIT_EVENT_HANDLE hAuditEvent); diff --git a/lib/libc/include/any-windows-any/bdaiface.h b/lib/libc/include/any-windows-any/bdaiface.h index 883658009e..5b72f6f077 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.0-rc1 from include/bdaiface.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/bdaiface.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/bdaiface_enums.h b/lib/libc/include/any-windows-any/bdaiface_enums.h index 9a262e0d75..49a6526af0 100644 --- a/lib/libc/include/any-windows-any/bdaiface_enums.h +++ b/lib/libc/include/any-windows-any/bdaiface_enums.h @@ -1,6 +1,6 @@ -/** - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ #ifndef BDAIFACE_ENUMS_H #define BDAIFACE_ENUMS_H diff --git a/lib/libc/include/any-windows-any/bdatypes.h b/lib/libc/include/any-windows-any/bdatypes.h index 7aeff556f6..83ce0f1fb9 100644 --- a/lib/libc/include/any-windows-any/bdatypes.h +++ b/lib/libc/include/any-windows-any/bdatypes.h @@ -69,7 +69,7 @@ typedef enum MEDIA_SAMPLE_CONTENT typedef enum ISDBCAS_REQUEST_ID { ISDBCAS_REQUEST_ID_EMG = 0x38, - ISDBCAS_REQUEST_ID_EMD = 0x3a, + ISDBCAS_REQUEST_ID_EMD = 0x3a } ISDBCAS_REQUEST_ID; typedef enum MUX_PID_TYPE { @@ -299,7 +299,7 @@ typedef enum tagScanModulationTypes ScanModulationTypesMask_DVBC = BDA_MOD_64QAM | BDA_SCAN_MOD_128QAM | BDA_MOD_256QAM, BDA_SCAN_MOD_16APSK = 0x10000000, - BDA_SCAN_MOD_32APSK = 0x20000000, + BDA_SCAN_MOD_32APSK = 0x20000000 } ScanModulationTypes; #ifdef __WIDL__ @@ -460,7 +460,7 @@ typedef enum ApplicationTypeType { SCTE28_CopyProtection, SCTE28_Diagnostic, SCTE28_Undesignated, - SCTE28_Reserved, + SCTE28_Reserved } ApplicationTypeType; #ifdef __WIDL__ diff --git a/lib/libc/include/any-windows-any/bits.h b/lib/libc/include/any-windows-any/bits.h index ec90bde2df..ae1e5e1bf5 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.0-rc1 from include/bits.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f351805ceb..cf2ac78d04 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.0-rc1 from include/bits1_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 ec3d1c685c..ea8c1c866a 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.0-rc1 from include/bits2_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2fa677588f..4cfa20db46 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.0-rc1 from include/bits2_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e8c3366d7a..72c7839c26 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.0-rc1 from include/bits3_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 3e5fe5b6f0..ff896091ea 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.0-rc1 from include/bits5_0.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/bits5_0.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/cdoex_i.c b/lib/libc/include/any-windows-any/cdoex_i.c deleted file mode 100644 index 78d5d4538f..0000000000 --- a/lib/libc/include/any-windows-any/cdoex_i.c +++ /dev/null @@ -1,106 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - -#if defined __cplusplus && !defined CDO_NO_NAMESPACE - namespace CDO { -#else -#undef IDataSource -#endif - - MIDL_DEFINE_GUID(IID,IID_IDataSource,0xCD000029,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IMessage,0xCD000020,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IBodyPart,0xCD000021,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IConfiguration,0xCD000022,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IMessages,0xCD000025,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IDropDirectory,0xCD000024,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IBodyParts,0xCD000023,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ISMTPScriptConnector,0xCD000030,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPEarlyScriptConnector,0xCD000034,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPPostScriptConnector,0xCD000031,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPFinalScriptConnector,0xCD000032,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ISMTPOnArrival,0xCD000026,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPostEarly,0xCD000033,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPost,0xCD000027,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPostFinal,0xCD000028,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IProxyObject,0xCD000083,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IItem,0xCD000126,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IAppointment,0xCD000120,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ICalendarMessage,0xCD000122,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IIntegers,0xCD00012E,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IVariants,0xCD00012F,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IRecurrencePattern,0xCD000123,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IException,0xCD000124,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IRecurrencePatterns,0xCD00012C,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IExceptions,0xCD00012D,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ICalendarPart,0xCD000133,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ICalendarParts,0xCD000130,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IAttendee,0xCD000135,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IAttendees,0xCD000136,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IMailbox,0xCD000125,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IFolder,0xCD000132,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IContactGroupMembers,0xCD000138,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IPerson,0xCD000127,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IAddressee,0xCD000139,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IAddressees,0xCD000142,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IGetInterface,0xCD0ff000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,LIBID_CDO,0xCD000000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Message,0xCD000001,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Configuration,0xCD000002,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_DropDirectory,0xCD000004,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_SMTPConnector,0xCD000008,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPEarlyConnector,0xCD000011,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPPostConnector,0xCD000009,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPFinalConnector,0xCD000010,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Item,0xCD000112,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Appointment,0xCD000100,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_CalendarMessage,0xCD000102,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Folder,0xCD00010E,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Person,0xCD000107,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Attendee,0xCD00010D,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Addressee,0xCD000110,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - -#undef MIDL_DEFINE_GUID - -#if defined __cplusplus && !defined CDO_NO_NAMESPACE -} -#endif - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/cdoexm_i.c b/lib/libc/include/any-windows-any/cdoexm_i.c deleted file mode 100644 index 296fac5ce0..0000000000 --- a/lib/libc/include/any-windows-any/cdoexm_i.c +++ /dev/null @@ -1,59 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - - MIDL_DEFINE_GUID(IID,LIBID_CDOEXM,0x25150F00,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IDistributionList,0x25150F3F,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IMailRecipient,0x25150F40,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IMailboxStore,0x25150F41,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_MailGroup,0x25150F1F,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_MailRecipient,0x25150F20,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_Mailbox,0x25150F21,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_FolderAdmin,0x25150F22,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_ExchangeServer,0x25150F27,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_FolderTree,0x25150F23,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_PublicStoreDB,0x25150F24,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_MailboxStoreDB,0x25150F25,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(CLSID,CLSID_StorageGroup,0x25150F26,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/cdosys_i.c b/lib/libc/include/any-windows-any/cdosys_i.c deleted file mode 100644 index 4c12002eb5..0000000000 --- a/lib/libc/include/any-windows-any/cdosys_i.c +++ /dev/null @@ -1,83 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - -#if defined __cplusplus && !defined CDO_NO_NAMESPACE - namespace CDO { -#else -#undef IDataSource -#endif - - MIDL_DEFINE_GUID(IID,IID_IDataSource,0xCD000029,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IMessage,0xCD000020,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IBodyPart,0xCD000021,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IConfiguration,0xCD000022,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IMessages,0xCD000025,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IDropDirectory,0xCD000024,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IBodyParts,0xCD000023,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ISMTPScriptConnector,0xCD000030,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPEarlyScriptConnector,0xCD000034,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPPostScriptConnector,0xCD000031,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPFinalScriptConnector,0xCD000032,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_ISMTPOnArrival,0xCD000026,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPostEarly,0xCD000033,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPost,0xCD000027,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_INNTPOnPostFinal,0xCD000028,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IProxyObject,0xCD000083,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,IID_IGetInterface,0xCD0ff000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(IID,LIBID_CDO,0xCD000000,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Message,0xCD000001,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_Configuration,0xCD000002,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_DropDirectory,0xCD000004,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_SMTPConnector,0xCD000008,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPEarlyConnector,0xCD000011,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPPostConnector,0xCD000009,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - MIDL_DEFINE_GUID(CLSID,CLSID_NNTPFinalConnector,0xCD000010,0x8B95,0x11D1,0x82,0xDB,0x00,0xC0,0x4F,0xB1,0x62,0x5D); - -#undef MIDL_DEFINE_GUID - -#if defined __cplusplus && !defined CDO_NO_NAMESPACE -} -#endif - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/certsrv.h b/lib/libc/include/any-windows-any/certsrv.h index e7d6429aa7..f0e8698ea1 100644 --- a/lib/libc/include/any-windows-any/certsrv.h +++ b/lib/libc/include/any-windows-any/certsrv.h @@ -167,7 +167,7 @@ #define __ENUM_CATYPES__ typedef enum { - ENUM_ENTERPRISE_ROOTCA = 0,ENUM_ENTERPRISE_SUBCA = 1,ENUM_STANDALONE_ROOTCA = 3,ENUM_STANDALONE_SUBCA = 4,ENUM_UNKNOWN_CA = 5, + ENUM_ENTERPRISE_ROOTCA = 0,ENUM_ENTERPRISE_SUBCA = 1,ENUM_STANDALONE_ROOTCA = 3,ENUM_STANDALONE_SUBCA = 4,ENUM_UNKNOWN_CA = 5 } ENUM_CATYPES; typedef struct _CAINFO { diff --git a/lib/libc/include/any-windows-any/comadmin.h b/lib/libc/include/any-windows-any/comadmin.h index 9295b0c7b9..06b7231170 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.0-rc1 from include/comadmin.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/comadmin.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/combaseapi.h b/lib/libc/include/any-windows-any/combaseapi.h index 1a96f6dbd2..fcfb8481f0 100644 --- a/lib/libc/include/any-windows-any/combaseapi.h +++ b/lib/libc/include/any-windows-any/combaseapi.h @@ -147,7 +147,7 @@ typedef interface IRpcStubBuffer IRpcStubBuffer; typedef interface IRpcChannelBuffer IRpcChannelBuffer; typedef enum tagCOINITBASE { - COINITBASE_MULTITHREADED = 0x0, + COINITBASE_MULTITHREADED = 0x0 } COINITBASE; #include diff --git a/lib/libc/include/any-windows-any/comcat.h b/lib/libc/include/any-windows-any/comcat.h index 525bd7c0a2..46ee41ffc1 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.0-rc1 from include/comcat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/comcat.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/commctrl.h b/lib/libc/include/any-windows-any/commctrl.h index 070dee969b..ce1f23bdee 100644 --- a/lib/libc/include/any-windows-any/commctrl.h +++ b/lib/libc/include/any-windows-any/commctrl.h @@ -3827,7 +3827,7 @@ extern "C" { #define TreeView_ShowInfoTip(hwnd, hitem) (DWORD)SNDMSG ((hwnd), TVM_SHOWINFOTIP, 0,(LPARAM) (hitem)) typedef enum _TVITEMPART { - TVGIPR_BUTTON = 0x0001, + TVGIPR_BUTTON = 0x0001 } TVITEMPART; typedef struct tagTVGETITEMPARTRECTINFO { @@ -5534,7 +5534,7 @@ WINCOMMCTRLAPI WINBOOL WINAPI Str_SetPtrW (LPWSTR *ppsz, LPCWSTR psz); #if NTDDI_VERSION >= 0x06000000 enum _LI_METRIC { LIM_SMALL, - LIM_LARGE, + LIM_LARGE }; WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric (HINSTANCE hinst, PCWSTR pszName, int lims, HICON *phico); diff --git a/lib/libc/include/any-windows-any/commoncontrols.h b/lib/libc/include/any-windows-any/commoncontrols.h index b65cf4eec4..4b37772022 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.0-rc1 from include/commoncontrols.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/commoncontrols.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/control.h b/lib/libc/include/any-windows-any/control.h index 3953ad37b6..a4f05139a7 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.0-rc1 from include/control.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/control.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/cor.h b/lib/libc/include/any-windows-any/cor.h index 3af86ef956..6b7552cec1 100644 --- a/lib/libc/include/any-windows-any/cor.h +++ b/lib/libc/include/any-windows-any/cor.h @@ -165,14 +165,14 @@ extern "C" { nltUnicode = 3, nltAuto = 4, nltOle = 5, - nltMaxValue = 7, + nltMaxValue = 7 } CorNativeLinkType; typedef enum { nlfNone = 0x0, nlfLastError = 0x1, nlfNoMangle = 0x2, - nlfMaxValue = 0x3, + nlfMaxValue = 0x3 } CorNativeLinkFlags; typedef void const *UVCP_CONSTANT; @@ -644,7 +644,7 @@ extern "C" { ValidatorModuleTypeObj = 0x00000002, ValidatorModuleTypeEnc = 0x00000003, ValidatorModuleTypeIncr = 0x00000004, - ValidatorModuleTypeMax = 0x00000004, + ValidatorModuleTypeMax = 0x00000004 } CorValidatorModuleType; #undef INTERFACE @@ -804,7 +804,7 @@ extern "C" { enum { SIGN_MASK_ONEBYTE = 0xffffffc0, SIGN_MASK_TWOBYTE = 0xffffe000, - SIGN_MASK_FOURBYTE = 0xf0000000, + SIGN_MASK_FOURBYTE = 0xf0000000 }; extern const mdToken __declspec (selectany) g_tkCorEncodeToken[4] = { mdtTypeDef, mdtTypeRef, mdtTypeSpec, mdtBaseType }; diff --git a/lib/libc/include/any-windows-any/corecrt_startup.h b/lib/libc/include/any-windows-any/corecrt_startup.h index 5fadb47f33..37391aab14 100644 --- a/lib/libc/include/any-windows-any/corecrt_startup.h +++ b/lib/libc/include/any-windows-any/corecrt_startup.h @@ -25,7 +25,7 @@ _CRTIMP void __cdecl _set_app_type(_crt_app_type _Type); typedef enum _crt_argv_mode { _crt_argv_no_arguments, _crt_argv_unexpanded_arguments, - _crt_argv_expanded_arguments, + _crt_argv_expanded_arguments } _crt_argv_mode; _CRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode mode); 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 3028d92e16..7ac0e6e034 100644 --- a/lib/libc/include/any-windows-any/corecrt_stdio_config.h +++ b/lib/libc/include/any-windows-any/corecrt_stdio_config.h @@ -9,6 +9,13 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + +unsigned __int64* __local_stdio_printf_options(void); +unsigned __int64* __local_stdio_scanf_options(void); + #define _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION 0x0001ULL #define _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR 0x0002ULL #define _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS 0x0004ULL @@ -21,11 +28,14 @@ #define _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY 0x0004ULL #ifndef _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS -#define _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS (_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS | _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING) +#define _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS (*__local_stdio_printf_options()) #endif #ifndef _CRT_INTERNAL_LOCAL_SCANF_OPTIONS -#define _CRT_INTERNAL_LOCAL_SCANF_OPTIONS _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS +#define _CRT_INTERNAL_LOCAL_SCANF_OPTIONS (*__local_stdio_scanf_options()) #endif +#ifdef __cplusplus +} +#endif #endif /* _STDIO_CONFIG_DEFINED */ diff --git a/lib/libc/include/any-windows-any/corecrt_wctype.h b/lib/libc/include/any-windows-any/corecrt_wctype.h new file mode 100644 index 0000000000..d2a58d81d2 --- /dev/null +++ b/lib/libc/include/any-windows-any/corecrt_wctype.h @@ -0,0 +1,164 @@ +/** + * 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_WCTYPE +#define _INC_CORECRT_WCTYPE + +#include + +#ifdef __cplusplus +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 + +#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 + +#define _UPPER 0x1 +#define _LOWER 0x2 +#define _DIGIT 0x4 +#define _SPACE 0x8 + +#define _PUNCT 0x10 +#define _CONTROL 0x20 +#define _BLANK 0x40 +#define _HEX 0x80 + +#define _LEADBYTE 0x8000 +#define _ALPHA (0x0100|_UPPER|_LOWER) + +#ifndef _WCTYPE_DEFINED +#define _WCTYPE_DEFINED + + _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 + +#ifndef _WCTYPE_INLINE_DEFINED +#define _WCTYPE_INLINE_DEFINED + +#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)) +#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 +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/libc/include/any-windows-any/corhdr.h b/lib/libc/include/any-windows-any/corhdr.h index 0d9f68e384..3d3e4d8d46 100644 --- a/lib/libc/include/any-windows-any/corhdr.h +++ b/lib/libc/include/any-windows-any/corhdr.h @@ -42,7 +42,7 @@ typedef enum CorTypeAttr { tdForwarder = 0x200000, tdReservedMask = 0x40800, tdRTSpecialName = 0x800, - tdHasSecurity = 0x40000, + tdHasSecurity = 0x40000 } CorTypeAttr; typedef enum CorMethodAttr { @@ -164,7 +164,7 @@ typedef enum CorPropertyAttr { typedef enum CorEventAttr { evSpecialName = 0x0200, evReservedMask = 0x0400, - evRTSpecialName = 0x0400, + evRTSpecialName = 0x0400 } CorEventAttr; typedef enum CorMethodSemanticsAttr { @@ -266,12 +266,12 @@ typedef enum CorAssemblyFlags { typedef enum CorManifestResourceFlags { mrVisibilityMask = 0x0007, mrPublic = 0x0001, - mrPrivate = 0x0002, + mrPrivate = 0x0002 } CorManifestResourceFlags; typedef enum CorFileFlags { ffContainsMetaData = 0x0000, - ffContainsNoMetaData = 0x0001, + ffContainsNoMetaData = 0x0001 } CorFileFlags; typedef enum CorPEKind { @@ -331,7 +331,7 @@ typedef enum CorElementType { ELEMENT_TYPE_MAX = 0x22, ELEMENT_TYPE_MODIFIER = 0x40, ELEMENT_TYPE_SENTINEL = 0x01 | ELEMENT_TYPE_MODIFIER, - ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER } CorElementType; typedef enum CorSerializationType { @@ -370,7 +370,7 @@ typedef enum CorCallingConvention { IMAGE_CEE_CS_CALLCONV_MASK = 0x0f, IMAGE_CEE_CS_CALLCONV_HASTHIS = 0x20, IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS = 0x40, - IMAGE_CEE_CS_CALLCONV_GENERIC = 0x10, + IMAGE_CEE_CS_CALLCONV_GENERIC = 0x10 } CorCallingConvention; typedef enum CorUnmanagedCallingConvention { @@ -381,7 +381,7 @@ typedef enum CorUnmanagedCallingConvention { IMAGE_CEE_CS_CALLCONV_C = IMAGE_CEE_UNMANAGED_CALLCONV_C, IMAGE_CEE_CS_CALLCONV_STDCALL = IMAGE_CEE_UNMANAGED_CALLCONV_STDCALL, IMAGE_CEE_CS_CALLCONV_THISCALL = IMAGE_CEE_UNMANAGED_CALLCONV_THISCALL, - IMAGE_CEE_CS_CALLCONV_FASTCALL = IMAGE_CEE_UNMANAGED_CALLCONV_FASTCALL, + IMAGE_CEE_CS_CALLCONV_FASTCALL = IMAGE_CEE_UNMANAGED_CALLCONV_FASTCALL } CorUnmanagedCallingConvention; typedef enum CorArgType { @@ -395,7 +395,7 @@ typedef enum CorArgType { IMAGE_CEE_CS_OBJECT = 0x7, IMAGE_CEE_CS_STRUCT4 = 0x8, IMAGE_CEE_CS_STRUCT32 = 0x9, - IMAGE_CEE_CS_BYVALUE = 0xa, + IMAGE_CEE_CS_BYVALUE = 0xa } CorArgType; typedef enum CorNativeType { @@ -471,7 +471,7 @@ typedef enum CorILMethodFlags { CorILMethod_SmallFormat = 0x0, CorILMethod_TinyFormat = 0x0002, CorILMethod_FatFormat = 0x0003, - CorILMethod_TinyFormat1 = 0x0006, + CorILMethod_TinyFormat1 = 0x0006 } CorILMethodFlags; typedef enum CorExceptionFlag { @@ -556,7 +556,7 @@ typedef enum CorSetENC { MDUpdateExtension = 0x00000003, MDUpdateIncremental = 0x00000004, MDUpdateDelta = 0x00000005, - MDUpdateMask = 0x00000007, + MDUpdateMask = 0x00000007 } CorSetENC; typedef enum CorErrorIfEmitOutOfOrder { @@ -567,7 +567,7 @@ typedef enum CorErrorIfEmitOutOfOrder { MDFieldOutOfOrder = 0x00000002, MDParamOutOfOrder = 0x00000004, MDPropertyOutOfOrder = 0x00000008, - MDEventOutOfOrder = 0x00000010, + MDEventOutOfOrder = 0x00000010 } CorErrorIfEmitOutOfOrder; typedef enum CorImportOptions { @@ -634,7 +634,7 @@ typedef enum CorTokenType { mdtGenericParamConstraint = 0x2c000000, mdtString = 0x70000000, mdtName = 0x71000000, - mdtBaseType = 0x72000000, + mdtBaseType = 0x72000000 } CorTokenType; typedef enum CorOpenFlags { @@ -669,7 +669,7 @@ typedef enum CorAttributeTargets { catGenericParameter = 0x4000, catAll = catAssembly | catModule | catClass | catStruct | catEnum | catConstructor | catMethod | catProperty | catField | catEvent | catInterface | catParameter | catDelegate | catGenericParameter, - catClassMembers = catClass | catStruct | catEnum | catConstructor | catMethod | catProperty | catField | catEvent | catDelegate | catInterface, + catClassMembers = catClass | catStruct | catEnum | catConstructor | catMethod | catProperty | catField | catEvent | catDelegate | catInterface } CorAttributeTargets; typedef enum CorFileMapping { diff --git a/lib/libc/include/any-windows-any/credentialprovider.h b/lib/libc/include/any-windows-any/credentialprovider.h index f440899ec2..eff713bba3 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.0-rc1 from include/credentialprovider.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/credentialprovider.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/crtdbg.h b/lib/libc/include/any-windows-any/crtdbg.h index c498bcfa63..37014c4fb2 100644 --- a/lib/libc/include/any-windows-any/crtdbg.h +++ b/lib/libc/include/any-windows-any/crtdbg.h @@ -161,12 +161,10 @@ extern "C" { #define _aligned_offset_malloc_dbg(s,a,o,f,l) _aligned_offset_malloc(s,a,o) #define _aligned_offset_realloc_dbg(p,s,a,o,f,l) _aligned_offset_realloc(p,s,a,o) -#if __MSVCRT_VERSION__ >= 0x900 #define _recalloc_dbg(p,c,s,t,f,l) _recalloc(p,c,s) #define _aligned_recalloc_dbg(p,c,s,a,f,l) _aligned_realloc(p,c,s,a) #define _aligned_offset_recalloc_dbg(p,c,s,a,o,f,l) _aligned_offset_recalloc(p,c,s,a,o) #define _aligned_msize_dbg(p,a,o) _aligned_msize(p,a,o) -#endif #define _malloca_dbg(s,t,f,l) _malloca(s) #define _freea_dbg(p,t) _freea(p) diff --git a/lib/libc/include/any-windows-any/ctfutb.h b/lib/libc/include/any-windows-any/ctfutb.h index 963e8c979c..04f3e99aea 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.0-rc1 from include/ctfutb.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 350873862f..b81a01f95b 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.0-rc1 from include/ctxtcall.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2c8499d4d5..05986d9977 100644 --- a/lib/libc/include/any-windows-any/ctype.h +++ b/lib/libc/include/any-windows-any/ctype.h @@ -6,7 +6,7 @@ #ifndef _INC_CTYPE #define _INC_CTYPE -#include +#include #ifdef __cplusplus extern "C" { @@ -14,37 +14,6 @@ extern "C" { #ifndef WEOF #define WEOF (wint_t)(0xFFFF) -#endif - -#ifndef _CRT_CTYPEDATA_DEFINED -#define _CRT_CTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS - -#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 /* CRT stuff */ @@ -61,123 +30,45 @@ extern "C" { pthreadmbcinfo __cdecl __updatetmbcinfo(void); #endif -#define _UPPER 0x1 -#define _LOWER 0x2 -#define _DIGIT 0x4 -#define _SPACE 0x8 - -#define _PUNCT 0x10 -#define _CONTROL 0x20 -#define _BLANK 0x40 -#define _HEX 0x80 - -#define _LEADBYTE 0x8000 -#define _ALPHA (0x0100|_UPPER|_LOWER) - #ifndef _CTYPE_DEFINED #define _CTYPE_DEFINED - _CRTIMP int __cdecl _isctype(int _C,int _Type); - _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale); _CRTIMP int __cdecl isalpha(int _C); - _CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isupper(int _C); - _CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl islower(int _C); - _CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isdigit(int _C); - _CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isxdigit(int _C); - _CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isspace(int _C); - _CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl ispunct(int _C); - _CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isalnum(int _C); - _CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isprint(int _C); - _CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl isgraph(int _C); - _CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale); _CRTIMP int __cdecl iscntrl(int _C); - _CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale); _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 _toupper(int _C); + _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); -#if __MSVCRT_VERSION__ >= 0xC00 - _CRTIMP int __cdecl isblank(int _C); - _CRTIMP int __cdecl _isblank_l(int _C,_locale_t _Locale); -#else - int __cdecl isblank(int _C); -#endif /* msvcr120 */ -#endif - -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED - - _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); -#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 __iswcsymf(wint_t _C); - _CRTIMP int __cdecl __iswcsym(wint_t _C); -#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 */ - -#if __MSVCRT_VERSION__ >= 0xC00 - _CRTIMP int __cdecl iswblank(wint_t _C); - _CRTIMP int __cdecl _iswblank_l(wint_t _C,_locale_t _Locale); -#else - int __cdecl iswblank(wint_t _C); -#endif /* msvcr120 */ #endif #ifndef _CTYPE_DISABLE_MACROS @@ -209,48 +100,12 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void); #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') #define __isascii(_Char) ((unsigned)(_Char) < 0x80) #define __toascii(_Char) ((_Char) & 0x7f) -#ifndef _WCTYPE_INLINE_DEFINED -#define _WCTYPE_INLINE_DEFINED - -#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)) -#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) (iswctype(_c,_SPACE) || ((_c)=='\t')) -#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)) -#endif /* __MSVCRT_VERSION__ >= 0x800 */ -#if __MSVCRT_VERSION__ >= 0xC00 -#define _iswblank_l(_c,_p) (_iswctype_l(_c,_BLANK,_p) || ((_c)=='\t')) -#endif -#endif /* __cplusplus */ -#endif - #define __iscsymf(_c) (isalpha(_c) || ((_c)=='_')) #define __iscsym(_c) (isalnum(_c) || ((_c)=='_')) #define __iswcsymf(_c) (iswalpha(_c) || ((_c)=='_')) diff --git a/lib/libc/include/any-windows-any/d3d10.h b/lib/libc/include/any-windows-any/d3d10.h index 23cb271e35..01a08b0de8 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.0-rc1 from include/d3d10.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d21eeb338e..edd43173cf 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.0-rc1 from include/d3d10_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5c4b86aaa6..72351aa824 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.0-rc1 from include/d3d10effect.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 cc8e9ec4a8..075a7e7c6a 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.0-rc1 from include/d3d10sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0c826c6c92..715443615d 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.0-rc1 from include/d3d10shader.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 407c5d4430..6661705359 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.0-rc1 from include/d3d11.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3d11.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d11_1.h b/lib/libc/include/any-windows-any/d3d11_1.h index 117c9a9432..a09bb523ef 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.0-rc1 from include/d3d11_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 8de7055d27..c5c78331a1 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.0-rc1 from include/d3d11_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e8087e4add..7161351ab7 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.0-rc1 from include/d3d11_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 a2bf87f069..c55568fe1e 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.0-rc1 from include/d3d11_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f2d9ab3962..83d87826e6 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.0-rc1 from include/d3d11on12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1091ef0103..5a8b3e8e71 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.0-rc1 from include/d3d11sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3d11sdklayers.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d12.h b/lib/libc/include/any-windows-any/d3d12.h index d431790aaf..1f6c057536 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.0-rc1 from include/d3d12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3d12.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d12sdklayers.h b/lib/libc/include/any-windows-any/d3d12sdklayers.h index 69c10b8abd..2839ab1d77 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.0-rc1 from include/d3d12sdklayers.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3d12sdklayers.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d12shader.h b/lib/libc/include/any-windows-any/d3d12shader.h index dcd09944ff..8113d9c925 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.0-rc1 from include/d3d12shader.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 598341a7e3..51ec79676a 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.0-rc1 from include/d3d12video.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3d12video.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3d8.h b/lib/libc/include/any-windows-any/d3d8.h index 856c084979..72e7a7cfe8 100644 --- a/lib/libc/include/any-windows-any/d3d8.h +++ b/lib/libc/include/any-windows-any/d3d8.h @@ -128,7 +128,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU */ #undef INTERFACE #define INTERFACE IDirect3D8 -DECLARE_INTERFACE_(IDirect3D8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3D8,IUnknown,"1dd9e8da-1c77-4d40-b0cf-98fefdff9512") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IDirect3D8,IUnknown) * IDirect3DVolume8 interface */ #define INTERFACE IDirect3DVolume8 -DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DVolume8,IUnknown,"bd7349f5-14f1-42e4-9c79-972380db40c0") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -247,7 +247,7 @@ DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown) * IDirect3DSwapChain8 interface */ #define INTERFACE IDirect3DSwapChain8 -DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DSwapChain8,IUnknown,"928c088b-76b9-4c6b-a536-a590853876cd") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -282,7 +282,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) * IDirect3DSurface8 interface */ #define INTERFACE IDirect3DSurface8 -DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DSurface8,IUnknown,"b96eebca-b326-4ea5-882f-2ff5bae021dd") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -334,7 +334,7 @@ DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown) * IDirect3DResource8 interface */ #define INTERFACE IDirect3DResource8 -DECLARE_INTERFACE_(IDirect3DResource8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DResource8,IUnknown,"1b36bb7b-09b7-410a-b445-7d1430d7b33f") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -386,7 +386,7 @@ DECLARE_INTERFACE_(IDirect3DResource8,IUnknown) * IDirect3DVertexBuffer8 interface */ #define INTERFACE IDirect3DVertexBuffer8 -DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8) +DECLARE_INTERFACE_IID_(IDirect3DVertexBuffer8,IDirect3DResource8,"8aeeeac7-05f9-44d4-b591-000b0df1cb95") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8) * IDirect3DIndexBuffer8 interface */ #define INTERFACE IDirect3DIndexBuffer8 -DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8) +DECLARE_INTERFACE_IID_(IDirect3DIndexBuffer8,IDirect3DResource8,"0e689c9a-053d-44a0-9d92-db0e3d750f86") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -514,7 +514,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8) * IDirect3DBaseTexture8 interface */ #define INTERFACE IDirect3DBaseTexture8 -DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8) +DECLARE_INTERFACE_IID_(IDirect3DBaseTexture8,IDirect3DResource8,"b4211cfa-51b9-4a9f-ab78-db99b2bb678e") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -578,7 +578,7 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8) * IDirect3DCubeTexture8 interface */ #define INTERFACE IDirect3DCubeTexture8 -DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_IID_(IDirect3DCubeTexture8,IDirect3DBaseTexture8,"3ee5b968-2aca-4c34-8bb5-7e0c3d19b750") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8) * IDirect3DTexture8 interface */ #define INTERFACE IDirect3DTexture8 -DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_IID_(IDirect3DTexture8,IDirect3DBaseTexture8,"e4cdd575-2866-4f01-b12e-7eece1ec9358") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -743,7 +743,7 @@ DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8) * IDirect3DVolumeTexture8 interface */ #define INTERFACE IDirect3DVolumeTexture8 -DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_IID_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8,"4b8aaafa-140f-42ba-9131-597eafaa2ead") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -825,7 +825,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8) * IDirect3DDevice8 interface */ #define INTERFACE IDirect3DDevice8 -DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DDevice8,IUnknown,"7385e5df-8fe8-41d5-86b6-d7b48547b6cf") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1115,7 +1115,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->DrawIndexedPrimitive(a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->DrawPrimitiveUP(a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->DrawIndexedPrimitiveUP(a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->processVertices(a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->ProcessVertices(a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->CreateVertexShader(a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->SetVertexShader(a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->GetVertexShader(a) diff --git a/lib/libc/include/any-windows-any/d3d8caps.h b/lib/libc/include/any-windows-any/d3d8caps.h index 469dacec32..345884fc19 100644 --- a/lib/libc/include/any-windows-any/d3d8caps.h +++ b/lib/libc/include/any-windows-any/d3d8caps.h @@ -20,7 +20,7 @@ #define __WINE_D3D8CAPS_H #ifdef __i386__ -#include +#pragma pack(push,4) #endif /* @@ -290,7 +290,7 @@ typedef struct _D3DCAPS8 { } D3DCAPS8; #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif /* __WINE_D3D8CAPS_H */ diff --git a/lib/libc/include/any-windows-any/d3d8types.h b/lib/libc/include/any-windows-any/d3d8types.h index d14e20ab02..64a57274b3 100644 --- a/lib/libc/include/any-windows-any/d3d8types.h +++ b/lib/libc/include/any-windows-any/d3d8types.h @@ -20,7 +20,7 @@ #define __WINE_D3D8TYPES_H #ifdef __i386__ -#include +#pragma pack(push,4) #endif /***************************************************************************** @@ -150,6 +150,9 @@ #define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2) #define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3) +#define D3DDEVINFOID_RESOURCEMANAGER 5 +#define D3DDEVINFOID_VERTEXSTATS 6 + #ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ @@ -1117,6 +1120,9 @@ typedef struct _D3DMATRIX { } DUMMYUNIONNAME; } D3DMATRIX; +#define D3DPRESENT_RATE_DEFAULT 0 +#define D3DPRESENT_RATE_UNLIMITED 0x7fffffff + typedef struct _D3DPRESENT_PARAMETERS_ { UINT BackBufferWidth; UINT BackBufferHeight; @@ -1214,7 +1220,7 @@ typedef struct _D3DVOLUME_DESC { } D3DVOLUME_DESC; #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif /* __WINE_D3D8TYPES_H */ diff --git a/lib/libc/include/any-windows-any/d3d9.h b/lib/libc/include/any-windows-any/d3d9.h index 067006755c..70bc1193d4 100644 --- a/lib/libc/include/any-windows-any/d3d9.h +++ b/lib/libc/include/any-windows-any/d3d9.h @@ -175,7 +175,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9; */ #undef INTERFACE #define INTERFACE IDirect3D9 -DECLARE_INTERFACE_(IDirect3D9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3D9,IUnknown,"81bdcbca-64d4-426d-ae8d-ad0147f4275c") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -249,7 +249,7 @@ __CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE, * IDirect3DVolume9 interface */ #define INTERFACE IDirect3DVolume9 -DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DVolume9,IUnknown,"24f416e6-1f67-4aa7-b88e-d33f6f3128a1") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -305,7 +305,7 @@ __CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8, * IDirect3DSwapChain9 interface */ #define INTERFACE IDirect3DSwapChain9 -DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DSwapChain9,IUnknown,"794950f2-adfc-458a-905e-10a10b0b503b") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; @@ -359,7 +359,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90, * IDirect3DResource9 interface */ #define INTERFACE IDirect3DResource9 -DECLARE_INTERFACE_(IDirect3DResource9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DResource9,IUnknown,"05eec05d-8f7d-4362-b999-d1baf357c704") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -415,7 +415,7 @@ __CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0 * IDirect3DSurface9 interface */ #define INTERFACE IDirect3DSurface9 -DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) +DECLARE_INTERFACE_IID_(IDirect3DSurface9,IDirect3DResource9,"0cfbaf3a-9ff6-429a-99b3-a2796af8b89b") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -492,7 +492,7 @@ __CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0 * IDirect3DVertexBuffer9 interface */ #define INTERFACE IDirect3DVertexBuffer9 -DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9) +DECLARE_INTERFACE_IID_(IDirect3DVertexBuffer9,IDirect3DResource9,"b64bb1b5-fd70-4df6-bf91-19d0a12455e3") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -560,7 +560,7 @@ __CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf, * IDirect3DIndexBuffer9 interface */ #define INTERFACE IDirect3DIndexBuffer9 -DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9) +DECLARE_INTERFACE_IID_(IDirect3DIndexBuffer9,IDirect3DResource9,"7c9dd65e-d3f7-4529-acee-785830acde35") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -628,7 +628,7 @@ __CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac, * IDirect3DBaseTexture9 interface */ #define INTERFACE IDirect3DBaseTexture9 -DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9) +DECLARE_INTERFACE_IID_(IDirect3DBaseTexture9,IDirect3DResource9,"580ca87e-1d3c-4d54-991d-b7d3e3c298ce") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -705,7 +705,7 @@ __CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99, * IDirect3DCubeTexture9 interface */ #define INTERFACE IDirect3DCubeTexture9 -DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_IID_(IDirect3DCubeTexture9,IDirect3DBaseTexture9,"fff32f81-d953-473a-9223-93d652aba93f") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -801,7 +801,7 @@ __CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92, * IDirect3DTexture9 interface */ #define INTERFACE IDirect3DTexture9 -DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_IID_(IDirect3DTexture9,IDirect3DBaseTexture9,"85c31227-3de5-4f00-9b3a-f11ac38c18b5") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -896,7 +896,7 @@ __CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b, * IDirect3DVolumeTexture9 interface */ #define INTERFACE IDirect3DVolumeTexture9 -DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_IID_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9,"2518526c-e789-4111-a7b9-47ef328d13e6") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -991,7 +991,7 @@ __CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7, * IDirect3DVertexDeclaration9 interface */ #define INTERFACE IDirect3DVertexDeclaration9 -DECLARE_INTERFACE_(IDirect3DVertexDeclaration9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DVertexDeclaration9,IUnknown,"dd13c59c-36fa-4098-a8fb-c7ed39dc8546") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1029,7 +1029,7 @@ __CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8, * IDirect3DVertexShader9 interface */ #define INTERFACE IDirect3DVertexShader9 -DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DVertexShader9,IUnknown,"efc5557e-6265-4613-8a94-43857889eb36") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1067,7 +1067,7 @@ __CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a, * IDirect3DPixelShader9 interface */ #define INTERFACE IDirect3DPixelShader9 -DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DPixelShader9,IUnknown,"6d3bdbdc-5b02-4415-b852-ce5e8bccb289") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1105,7 +1105,7 @@ __CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, * IDirect3DStateBlock9 interface */ #define INTERFACE IDirect3DStateBlock9 -DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DStateBlock9,IUnknown,"b07c4fe5-310d-4ba8-a23c-4f0f206f218b") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1146,7 +1146,7 @@ __CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2, * IDirect3DQuery9 interface */ #define INTERFACE IDirect3DQuery9 -DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DQuery9,IUnknown,"d9771460-a695-4f26-bbd3-27b840b541cc") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1193,7 +1193,7 @@ __CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb, * IDirect3DDevice9 interface */ #define INTERFACE IDirect3DDevice9 -DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown) +DECLARE_INTERFACE_IID_(IDirect3DDevice9,IUnknown,"d0223b96-bf7a-43fd-92bd-a43b0d82b9eb") { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1589,7 +1589,7 @@ __CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4 DEFINE_GUID(IID_IDirect3D9Ex, 0x02177241, 0x69fc, 0x400c, 0x8f, 0xf1, 0x93, 0xa4, 0x4d, 0xf6, 0x86, 0x1d); #define INTERFACE IDirect3D9Ex -DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9) +DECLARE_INTERFACE_IID_(IDirect3D9Ex,IDirect3D9,"02177241-69fc-400c-8ff1-93a44df6861d") { /* IUnknown */ STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE; @@ -1688,7 +1688,7 @@ __CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0 DEFINE_GUID(IID_IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3); #define INTERFACE IDirect3DSwapChain9Ex -DECLARE_INTERFACE_(IDirect3DSwapChain9Ex, IDirect3DSwapChain9) +DECLARE_INTERFACE_IID_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9,"91886caf-1c3d-4d2e-a0ab-3e4c7d8d3303") { /* IUnknown */ STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE; @@ -1753,7 +1753,7 @@ __CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, DEFINE_GUID(IID_IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a); #define INTERFACE IDirect3DDevice9Ex -DECLARE_INTERFACE_(IDirect3DDevice9Ex, IDirect3DDevice9) +DECLARE_INTERFACE_IID_(IDirect3DDevice9Ex,IDirect3DDevice9,"b18b10ce-2649-405a-870f-95f777d4313a") { /* IUnknown */ STDMETHOD_(HRESULT, QueryInterface)(THIS_ REFIID iid, void **out) PURE; diff --git a/lib/libc/include/any-windows-any/d3d9caps.h b/lib/libc/include/any-windows-any/d3d9caps.h index c62780b4a0..ac21fac261 100644 --- a/lib/libc/include/any-windows-any/d3d9caps.h +++ b/lib/libc/include/any-windows-any/d3d9caps.h @@ -21,7 +21,7 @@ #define __WINE_D3D9CAPS_H #ifdef __i386__ -#include +#pragma pack(push,4) #endif /* @@ -449,7 +449,7 @@ DEFINE_GUID(D3DKEYEXCHANGE_DXVA, 0x43d3775c, 0x38e5, 0x4924, 0x8d, 0x86, #endif #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif diff --git a/lib/libc/include/any-windows-any/d3d9types.h b/lib/libc/include/any-windows-any/d3d9types.h index 49e7f94cbe..e6335a63ad 100644 --- a/lib/libc/include/any-windows-any/d3d9types.h +++ b/lib/libc/include/any-windows-any/d3d9types.h @@ -22,7 +22,7 @@ #define __WINE_D3D9TYPES_H #ifdef __i386__ -#include +#pragma pack(push,4) #endif /***************************************************************************** @@ -1366,9 +1366,9 @@ typedef struct D3DRESOURCESTATS { DWORD TotalBytes; } D3DRESOURCESTATS; -typedef struct _D3DDEVINFO_D3DRESOURCEMANAGER { +typedef struct _D3DDEVINFO_RESOURCEMANAGER { D3DRESOURCESTATS stats[D3DRTYPECOUNT]; -} D3DDEVINFO_D3DRESOURCEMANAGER; +} D3DDEVINFO_RESOURCEMANAGER; typedef struct _D3DDEVINFO_D3DVERTEXSTATS { DWORD NumRenderedTriangles; @@ -1632,7 +1632,7 @@ typedef enum _D3DSHADER_COMPARISON } D3DSHADER_COMPARISON; #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif /* __WINE_D3D9TYPES_H */ diff --git a/lib/libc/include/any-windows-any/d3dcaps.h b/lib/libc/include/any-windows-any/d3dcaps.h index 877513ed80..2721072797 100644 --- a/lib/libc/include/any-windows-any/d3dcaps.h +++ b/lib/libc/include/any-windows-any/d3dcaps.h @@ -22,7 +22,7 @@ #include #ifdef __i386__ -#include +#pragma pack(push,4) #endif typedef struct _D3DTRANSFORMCAPS { @@ -433,7 +433,7 @@ typedef struct _D3DDEVINFO_TEXTURING { } D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING; #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif diff --git a/lib/libc/include/any-windows-any/d3dcommon.h b/lib/libc/include/any-windows-any/d3dcommon.h index da1410daa2..a8ae11cc78 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.0-rc1 from include/d3dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/d3dcommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/d3drmobj.h b/lib/libc/include/any-windows-any/d3drmobj.h index 0484322983..80de9a8c7b 100644 --- a/lib/libc/include/any-windows-any/d3drmobj.h +++ b/lib/libc/include/any-windows-any/d3drmobj.h @@ -279,7 +279,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) #define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) #define IDirect3DRMObject2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) #define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) -#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->SetClientData(p,a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->lpVtbl->GetClientData(p,a,b) #define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->lpVtbl->GetDirect3DRM(p,a) #define IDirect3DRMObject2_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->lpVtbl->SetClientData(p,a,b,c) @@ -294,7 +294,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) #define IDirect3DRMObject2_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) #define IDirect3DRMObject2_Clone(p,a,b,c) (p)->Clone(a,b,c) #define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) -#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->SetClientData(a,b) +#define IDirect3DRMObject2_GetClientData(p,a,b) (p)->GetClientData(a,b) #define IDirect3DRMObject2_GetDirect3DRM(p,a) (p)->GetDirect3DRM(a) #define IDirect3DRMObject2_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMObject2_SetClientData(p,a,b,c) (p)->SetClientData(a,b,c) @@ -991,7 +991,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRMViewport2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRMObject methods ***/ -#define IDirect3DRMViewport_2Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) +#define IDirect3DRMViewport2_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) #define IDirect3DRMViewport2_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) #define IDirect3DRMViewport2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) #define IDirect3DRMViewport2_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a) @@ -2155,7 +2155,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) #define IDirect3DRMShadow_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMShadow_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) /*** IDirect3DRMShadow methods ***/ -#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Load(p,a,b,c,d,e,f,g) +#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->lpVtbl->Init(p,a,b,c,d,e,f,g) #else /*** IUnknown methods ***/ #define IDirect3DRMShadow_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) #define IDirect3DRMShadow_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMShadow_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMShadow methods ***/ -#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Load(a,b,c,d,e,f,g) +#define IDirect3DRMShadow_Init(p,a,b,c,d,e,f,g) (p)->Init(a,b,c,d,e,f,g) #endif /***************************************************************************** @@ -3251,7 +3251,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3367,7 +3367,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture2_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3537,7 +3537,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture3_GetImage(p) (p)->GetImage() diff --git a/lib/libc/include/any-windows-any/d3dtypes.h b/lib/libc/include/any-windows-any/d3dtypes.h index e7ae4d5e60..bd6f4098dd 100644 --- a/lib/libc/include/any-windows-any/d3dtypes.h +++ b/lib/libc/include/any-windows-any/d3dtypes.h @@ -30,7 +30,7 @@ #include #ifdef __i386__ -#include +#pragma pack(push,4) #endif #define D3DVALP(val, prec) ((float)(val)) @@ -1364,7 +1364,7 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS { #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #ifdef __i386__ -#include +#pragma pack(pop) #endif #endif diff --git a/lib/libc/include/any-windows-any/d3dx9shader.h b/lib/libc/include/any-windows-any/d3dx9shader.h index cd00a87c20..483b6271a6 100644 --- a/lib/libc/include/any-windows-any/d3dx9shader.h +++ b/lib/libc/include/any-windows-any/d3dx9shader.h @@ -214,7 +214,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ #define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a) #define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c) -#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetConstantDesc(a) +#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetSamplerIndex(a) #define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b) #define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b) #define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b) diff --git a/lib/libc/include/any-windows-any/d3dx9tex.h b/lib/libc/include/any-windows-any/d3dx9tex.h index df8bb2ca69..dd8a044366 100644 --- a/lib/libc/include/any-windows-any/d3dx9tex.h +++ b/lib/libc/include/any-windows-any/d3dx9tex.h @@ -182,6 +182,9 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(struct IDirect3DVolume9 *destvolume, D3DFORMAT srcformat, UINT srcrowpitch, UINT srcslicepitch, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox, DWORD filter, D3DCOLOR colorkey); +HRESULT WINAPI D3DXSaveVolumeToFileInMemory(struct ID3DXBuffer **dst_buffer, D3DXIMAGE_FILEFORMAT dst_format, + struct IDirect3DVolume9 *src_volume, const PALETTEENTRY *src_palette, const D3DBOX *src_box); + HRESULT WINAPI D3DXSaveVolumeToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat, struct IDirect3DVolume9 *srcvolume, const PALETTEENTRY *srcpalette, const D3DBOX *srcbox); HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat, diff --git a/lib/libc/include/any-windows-any/dbgprop.h b/lib/libc/include/any-windows-any/dbgprop.h index f4b5988d01..1c6ad2c2ac 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.0-rc1 from include/dbgprop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2c84344bc1..6e8f2644bc 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.0-rc1 from include/dcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dcommon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dcompanimation.h b/lib/libc/include/any-windows-any/dcompanimation.h index c2df490f8c..731d429c76 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.0-rc1 from include/dcompanimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dcompanimation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ddstream.h b/lib/libc/include/any-windows-any/ddstream.h index 78eca081e4..d4cc623dba 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.0-rc1 from include/ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 a25846488f..dd6143d717 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.0-rc1 from include/devicetopology.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0ef27d5e12..395c932147 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.0-rc1 from include/dimm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 bc5f37721c..16fd56685a 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.0-rc1 from include/dinputd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7b9c1209c8..c284149399 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.0-rc1 from include/directmanipulation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/directmanipulation.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dispex.h b/lib/libc/include/any-windows-any/dispex.h index f2b211118a..e8bafc6275 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.0-rc1 from include/dispex.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2eaa84318b..7eb6a47f90 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.0-rc1 from include/dmodshow.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dmodshow.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dmplugin.h b/lib/libc/include/any-windows-any/dmplugin.h index 5b35f7ec3a..8fc33d9655 100644 --- a/lib/libc/include/any-windows-any/dmplugin.h +++ b/lib/libc/include/any-windows-any/dmplugin.h @@ -28,7 +28,7 @@ #include #include #include -#include +#pragma pack(push,8) #ifdef __cplusplus extern "C" { @@ -292,6 +292,6 @@ DECLARE_INTERFACE_(IDirectMusicTrack8,IDirectMusicTrack) } #endif -#include +#pragma pack(pop) #endif /* __WINE_DMUSIC_PLUGIN_H */ diff --git a/lib/libc/include/any-windows-any/dmusbuff.h b/lib/libc/include/any-windows-any/dmusbuff.h index 7632b1aea4..fbba3707f5 100644 --- a/lib/libc/include/any-windows-any/dmusbuff.h +++ b/lib/libc/include/any-windows-any/dmusbuff.h @@ -40,13 +40,13 @@ typedef struct _DMUS_EVENTHEADER DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER; /* actual structure*/ -#include +#pragma pack(push,4) struct _DMUS_EVENTHEADER { DWORD cbEvent; DWORD dwChannelGroup; REFERENCE_TIME rtDelta; DWORD dwFlags; }; -#include +#pragma pack(pop) #endif /* __WINE_DMUSIC_BUFFER_H */ diff --git a/lib/libc/include/any-windows-any/dmusicc.h b/lib/libc/include/any-windows-any/dmusicc.h index 44a5650bc8..106fd93db9 100644 --- a/lib/libc/include/any-windows-any/dmusicc.h +++ b/lib/libc/include/any-windows-any/dmusicc.h @@ -34,7 +34,7 @@ #include #include -#include +#pragma pack(push,8) #ifdef __cplusplus extern "C" { @@ -724,6 +724,6 @@ DECLARE_INTERFACE_(IDirectMusicThru,IUnknown) } #endif -#include +#pragma pack(pop) #endif /* __WINE_DMUSIC_CORE_H */ diff --git a/lib/libc/include/any-windows-any/dmusicf.h b/lib/libc/include/any-windows-any/dmusicf.h index 9fdef5125a..4e22b1bcb1 100644 --- a/lib/libc/include/any-windows-any/dmusicf.h +++ b/lib/libc/include/any-windows-any/dmusicf.h @@ -26,7 +26,7 @@ #define COM_NO_WINDOWS_H #include #include -#include +#pragma pack(push,8) #ifdef __cplusplus extern "C" { @@ -903,6 +903,6 @@ struct _DSOUND_IO_DXDMO_DATA { } #endif -#include +#pragma pack(pop) #endif /* __WINE_DMUSIC_FILEFORMATS_H */ diff --git a/lib/libc/include/any-windows-any/dmusici.h b/lib/libc/include/any-windows-any/dmusici.h index 0e5599c4a0..77f94db215 100644 --- a/lib/libc/include/any-windows-any/dmusici.h +++ b/lib/libc/include/any-windows-any/dmusici.h @@ -29,7 +29,7 @@ #include #include #include -#include +#pragma pack(push,8) #ifdef WINE_NO_UNICODE_MACROS #undef AddPort @@ -1714,6 +1714,6 @@ DECLARE_INTERFACE_(IDirectMusicContainer,IUnknown) } #endif -#include +#pragma pack(pop) #endif /* __WINE_DMUSIC_PERFORMANCE_H */ diff --git a/lib/libc/include/any-windows-any/docobj.h b/lib/libc/include/any-windows-any/docobj.h index 9661e5c90c..46431b859b 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.0-rc1 from include/docobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/docobj.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/docobjectservice.h b/lib/libc/include/any-windows-any/docobjectservice.h index 0be1e704a4..f07f2f589a 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.0-rc1 from include/docobjectservice.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 a27ce1f622..555f422eae 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.0-rc1 from include/documenttarget.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5caf66e43a..8862dded9e 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.0-rc1 from include/downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/downloadmgr.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dpnathlp.h b/lib/libc/include/any-windows-any/dpnathlp.h index 05c60823dc..10ac1c768e 100644 --- a/lib/libc/include/any-windows-any/dpnathlp.h +++ b/lib/libc/include/any-windows-any/dpnathlp.h @@ -183,7 +183,7 @@ DECLARE_INTERFACE_(IDirectPlayNATHelp,IUnknown) #define IDirectPlayNATHelp_QueryAddress(p,a,b,c,d,e) (p)->lpVtbl->QueryAddress(p,a,b,c,d,e) #define IDirectPlayNATHelp_SetAlertEvent(p,a,b) (p)->lpVtbl->SetAlertEvent(p,a,b) #define IDirectPlayNATHelp_SetAlertIOCompletionPort(p,a,b,c,d) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c,d) -#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->SetAlertIOCompletionPort(p,a,b,c) +#define IDirectPlayNATHelp_ExtendRegisteredPortsLease(p,a,b,c) (p)->lpVtbl->ExtendRegisteredPortsLease(p,a,b,c) #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/drmexternals.h b/lib/libc/include/any-windows-any/drmexternals.h index a23c6bcaf8..e8a14f166a 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.0-rc1 from include/drmexternals.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 25df808bc5..e89215ff24 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.0-rc1 from include/dvdif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dvdif.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dwmapi.h b/lib/libc/include/any-windows-any/dwmapi.h index 23e3759177..493d94cc07 100644 --- a/lib/libc/include/any-windows-any/dwmapi.h +++ b/lib/libc/include/any-windows-any/dwmapi.h @@ -100,7 +100,7 @@ extern "C" { GT_TOUCH_RIGHTTAP = 7, GT_TOUCH_PRESSANDHOLD = 8, GT_TOUCH_PRESSANDHOLDABORT = 9, - GT_TOUCH_PRESSANDTAP = 10, + GT_TOUCH_PRESSANDTAP = 10 }; enum DWM_SHOWCONTACT { diff --git a/lib/libc/include/any-windows-any/dwrite.h b/lib/libc/include/any-windows-any/dwrite.h index 015ae77aa5..07b9cd466f 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.0-rc1 from include/dwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 671f3e0472..6f9cb1f505 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.0-rc1 from include/dwrite_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c31c4c0013..8793a83ba7 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.0-rc1 from include/dwrite_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 9af6c0cd42..4886b749e6 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.0-rc1 from include/dwrite_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c66af3d4e1..7b46a97be9 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.0-rc1 from include/dxgi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5afc57589b..5aeb731937 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.0-rc1 from include/dxgi1_2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0c2b22090a..0fa0ba48dc 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.0-rc1 from include/dxgi1_3.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0de0f1442d..c2a7285af9 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.0-rc1 from include/dxgi1_4.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 db444fb089..6ba5b8b3a6 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.0-rc1 from include/dxgi1_5.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 fc20187770..e641d8a5dc 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.0-rc1 from include/dxgi1_6.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2083133298..36d3dba07f 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.0-rc1 from include/dxgicommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2f1d6f68d5..ad1bd28f6b 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.0-rc1 from include/dxgidebug.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 cf594ec435..0da1118844 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.0-rc1 from include/dxgiformat.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2a2539c6d6..275ce8d9aa 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.0-rc1 from include/dxgitype.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dxgitype.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/dxva.h b/lib/libc/include/any-windows-any/dxva.h index 9deded52e2..e58e2d9687 100644 --- a/lib/libc/include/any-windows-any/dxva.h +++ b/lib/libc/include/any-windows-any/dxva.h @@ -99,11 +99,26 @@ DEFINE_GUID(DXVA_ModeJPEG_VLD_444, 0x4cd00e17, 0x89ba, 0x48ef, 0xb9, 0xf9, 0xed, DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5); +#define DXVA_ModeH264_MoComp_NoFGT DXVA_ModeH264_A +#define DXVA_ModeH264_MoComp_FGT DXVA_ModeH264_B +#define DXVA_ModeH264_IDCT_NoFGT DXVA_ModeH264_C +#define DXVA_ModeH264_IDCT_FGT DXVA_ModeH264_D +#define DXVA_ModeH264_VLD_NoFGT DXVA_ModeH264_E +#define DXVA_ModeH264_VLD_FGT DXVA_ModeH264_F + #define DXVA_USUAL_BLOCK_WIDTH 8 #define DXVA_USUAL_BLOCK_HEIGHT 8 #define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT) -#include +#define DXVA_PICTURE_DECODING_FUNCTION 1 +#define DXVA_ALPHA_BLEND_DATA_LOAD_FUNCTION 2 +#define DXVA_ALPHA_BLEND_COMBINATION_FUNCTION 3 +#define DXVA_PICTURE_RESAMPLE_FUNCTION 4 +#define DXVA_DEBLOCKING_FILTER_FUNCTION 5 +#define DXVA_FILM_GRAIN_SYNTHESIS_FUNCTION 6 +#define DXVA_STATUS_REPORTING_FUNCTION 7 + +#pragma pack(push,1) typedef struct _DXVA_PicEntry_H264 { @@ -309,6 +324,17 @@ typedef struct _DXVA_Slice_H264_Short USHORT wBadSliceChopping; } DXVA_Slice_H264_Short, *LPDXVA_Slice_H264_Short; +typedef struct _DXVA_Status_H264 +{ + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_H264 CurrPic; + UCHAR field_pic_flag; + UCHAR bDXVA_Func; + UCHAR bBufType; + UCHAR bStatus; + UCHAR bReserved8Bits; + USHORT wNumMbsAffected; +} DXVA_Status_H264, *LPDXVA_Status_H264; typedef struct _DXVA_PicEntry_HEVC { @@ -938,7 +964,7 @@ typedef struct _DXVA_Status_AV1 { USHORT NumMbsAffected; } DXVA_Status_AV1, *LPDXVA_Status_AV1; -#include +#pragma pack(pop) typedef enum _DXVA_VideoChromaSubsampling { diff --git a/lib/libc/include/any-windows-any/dxva2api.h b/lib/libc/include/any-windows-any/dxva2api.h index 1a02f2b9a5..1a07b6bfcf 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.0-rc1 from include/dxva2api.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 65c37d34f3..77fd4b6e47 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.0-rc1 from include/dxvahd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/dxvahd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/emostore_i.c b/lib/libc/include/any-windows-any/emostore_i.c deleted file mode 100644 index a78ce5bf18..0000000000 --- a/lib/libc/include/any-windows-any/emostore_i.c +++ /dev/null @@ -1,54 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - - MIDL_DEFINE_GUID(IID,IID_IExchangeServer,0x25150F47,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IStorageGroup,0x25150F46,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IPublicStoreDB,0x25150F44,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IMailboxStoreDB,0x25150F45,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IFolderTree,0x25150F43,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - MIDL_DEFINE_GUID(IID,IID_IDataSource2,0x25150F48,0x5734,0x11d2,0xA5,0x93,0x00,0xC0,0x4F,0x99,0x0D,0x8A); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/endpointvolume.h b/lib/libc/include/any-windows-any/endpointvolume.h index ed7fa33c36..3d6fb10277 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.0-rc1 from include/endpointvolume.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/endpointvolume.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/evntprov.h b/lib/libc/include/any-windows-any/evntprov.h index 87f4eecbdd..a5783be253 100644 --- a/lib/libc/include/any-windows-any/evntprov.h +++ b/lib/libc/include/any-windows-any/evntprov.h @@ -1,6 +1,6 @@ -/** - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ /* * evntprov.h diff --git a/lib/libc/include/any-windows-any/evr.h b/lib/libc/include/any-windows-any/evr.h index 8f6a06a728..20c18ae0a3 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.0-rc1 from include/evr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 69cb96508f..0c19b2079c 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.0-rc1 from include/evr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/evr9.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/exdisp.h b/lib/libc/include/any-windows-any/exdisp.h index 542122ae38..66cfc220bf 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.0-rc1 from include/exdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1645d07d37..b4ab0718cd 100644 --- a/lib/libc/include/any-windows-any/fenv.h +++ b/lib/libc/include/any-windows-any/fenv.h @@ -6,44 +6,30 @@ #ifndef _FENV_H_ #define _FENV_H_ -#include +#include -#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) /* FPU status word exception flags */ -#define FE_INVALID 0x01 -#define FE_DIVBYZERO 0x02 -#define FE_OVERFLOW 0x04 -#define FE_UNDERFLOW 0x08 -#define FE_INEXACT 0x10 -#define FE_ALL_EXCEPT (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) +#define FE_INEXACT _SW_INEXACT +#define FE_UNDERFLOW _SW_UNDERFLOW +#define FE_OVERFLOW _SW_OVERFLOW +#define FE_DIVBYZERO _SW_ZERODIVIDE +#define FE_INVALID _SW_INVALID +#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_INEXACT | FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW) /* FPU control word rounding flags */ -#define FE_TONEAREST 0x00000000 -#define FE_UPWARD 0x00400000 -#define FE_DOWNWARD 0x00800000 -#define FE_TOWARDZERO 0x00c00000 +#define FE_TONEAREST _RC_NEAR +#define FE_UPWARD _RC_UP +#define FE_DOWNWARD _RC_DOWN +#define FE_TOWARDZERO _RC_CHOP + +#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) /* Amount to shift by to convert an exception to a mask bit. */ #define FE_EXCEPT_SHIFT 0x08 #else -#define FE_INVALID 0x01 -#define FE_DENORMAL 0x02 -#define FE_DIVBYZERO 0x04 -#define FE_OVERFLOW 0x08 -#define FE_UNDERFLOW 0x10 -#define FE_INEXACT 0x20 -#define FE_ALL_EXCEPT (FE_INVALID | FE_DENORMAL | FE_DIVBYZERO \ - | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) - -/* FPU control word rounding flags */ -#define FE_TONEAREST 0x0000 -#define FE_DOWNWARD 0x0400 -#define FE_UPWARD 0x0800 -#define FE_TOWARDZERO 0x0c00 - /* The MXCSR exception flags are the same as the FE flags. */ #define __MXCSR_EXCEPT_FLAG_SHIFT 0 @@ -60,68 +46,36 @@ #ifndef RC_INVOKED -#if defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__) - -/* Type representing exception flags. */ -typedef unsigned int fexcept_t; - -/* Type representing floating-point environment. */ typedef struct { - unsigned int __cw; + unsigned long _Fe_ctl; + unsigned long _Fe_stat; } fenv_t; -/* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((const fenv_t *) -1l) +/* Type representing exception flags. */ +typedef unsigned long fexcept_t; -#else +#ifdef __cplusplus +extern "C" { +#endif -/* - For now, support only for the basic abstraction of flags that are - either set or clear. fexcept_t could be structure that holds more - info about the fp environment. -*/ -typedef unsigned short fexcept_t; - -/* This 32-byte struct represents the entire floating point - environment as stored by fnstenv or fstenv, augmented by - the contents of the MXCSR register, as stored by stmxcsr - (if CPU supports it). */ -typedef struct -{ - unsigned short __control_word; - unsigned short __unused0; - unsigned short __status_word; - unsigned short __unused1; - unsigned short __tag_word; - unsigned short __unused2; - unsigned int __ip_offset; /* instruction pointer offset */ - unsigned short __ip_selector; - unsigned short __opcode; - unsigned int __data_offset; - unsigned short __data_selector; - unsigned short __unused3; - unsigned int __mxcsr; /* contents of the MXCSR register */ -} fenv_t; +/* The FE_DFL_ENV macro is required by standard. + fesetenv will use the environment set at app startup.*/ +extern const fenv_t __mingw_fe_dfl_env; +#define FE_DFL_ENV (&__mingw_fe_dfl_env) +/* The C99 standard (7.6.9) allows us to define implementation-specific macros for + different fp environments */ +#if defined(__i386__) || defined(__x86_64__) -/*The C99 standard (7.6.9) allows us to define implementation-specific macros for - different fp environments */ - /* The default Intel x87 floating point environment (64-bit mantissa) */ -#define FE_PC64_ENV ((const fenv_t *)-1) +extern const fenv_t __mingw_fe_pc64_env; +#define FE_PC64_ENV (&__mingw_fe_pc64_env) /* The floating point environment set by MSVCRT _fpreset (53-bit mantissa) */ -#define FE_PC53_ENV ((const fenv_t *)-2) +extern const fenv_t __mingw_fe_pc53_env; +#define FE_PC53_ENV (&__mingw_fe_pc53_env) -/* The FE_DFL_ENV macro is required by standard. - fesetenv will use the environment set at app startup.*/ -#define FE_DFL_ENV ((const fenv_t *) 0) - -#endif /* defined(_ARM_) || defined(__arm__) */ - -#ifdef __cplusplus -extern "C" { #endif /*TODO: Some of these could be inlined */ diff --git a/lib/libc/include/any-windows-any/filter.h b/lib/libc/include/any-windows-any/filter.h index 8114500a0d..b4ab60d87f 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.0-rc1 from include/filter.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f36aacc750..73255258be 100644 --- a/lib/libc/include/any-windows-any/float.h +++ b/lib/libc/include/any-windows-any/float.h @@ -181,6 +181,8 @@ /* Control word values for unNew (use with related unMask above) */ #define _DN_SAVE 0x00000000 #define _DN_FLUSH 0x01000000 +#define _DN_FLUSH_OPERANDS_SAVE_RESULTS 0x02000000 +#define _DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 #define _EM_INVALID 0x00000010 #define _EM_DENORMAL 0x00080000 #define _EM_ZERODIVIDE 0x00000008 @@ -196,6 +198,7 @@ #define _PC_24 0x00020000 #define _PC_53 0x00010000 #define _PC_64 0x00000000 +#define _EM_AMBIGUOUS 0x80000000 /* These are also defined in Mingw math.h, needed to work around GCC build issues. */ @@ -214,6 +217,14 @@ #define _FPCLASS_PINF 0x0200 /* Positive Infinity */ #endif /* __MINGW_FPCLASS_DEFINED */ +/* _statusfp bit flags */ +#define _SW_INEXACT 0x00000001 /* inexact (precision) */ +#define _SW_UNDERFLOW 0x00000002 /* underflow */ +#define _SW_OVERFLOW 0x00000004 /* overflow */ +#define _SW_ZERODIVIDE 0x00000008 /* zero divide */ +#define _SW_INVALID 0x00000010 /* invalid */ +#define _SW_DENORMAL 0x00080000 /* denormal status bit */ + /* invalid subconditions (_SW_INVALID also set) */ #define _SW_UNEMULATED 0x0040 /* unemulated instruction */ #define _SW_SQRTNEG 0x0080 /* square root of a neg number */ @@ -261,6 +272,9 @@ extern "C" { _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int _NewValue, unsigned int _Mask) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _SECIMP errno_t __cdecl _controlfp_s(unsigned int *_CurrentState, unsigned int _NewValue, unsigned int _Mask); _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int _NewValue, unsigned int _Mask); +#ifdef __i386__ +_CRTIMP int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *); +#endif _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ diff --git a/lib/libc/include/any-windows-any/fsrm.h b/lib/libc/include/any-windows-any/fsrm.h index caeb7146a8..757f7e281a 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.0-rc1 from include/fsrm.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/fsrm.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/fsrmenums.h b/lib/libc/include/any-windows-any/fsrmenums.h index 1697b1f00a..f2a5e01e70 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.0-rc1 from include/fsrmenums.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 52edfd5062..e52cf9f61e 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.0-rc1 from include/fsrmquota.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1a2499e5af..f63393992d 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.0-rc1 from include/fsrmreports.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 817334b37c..71473e0a4a 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.0-rc1 from include/fsrmscreen.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/fsrmscreen.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/ftw.h b/lib/libc/include/any-windows-any/ftw.h index a5e23e0a92..8dca99b270 100644 --- a/lib/libc/include/any-windows-any/ftw.h +++ b/lib/libc/include/any-windows-any/ftw.h @@ -53,10 +53,34 @@ extern "C" { /* Continue with FTW_DP callback for current directory (if FTW_DEPTH) and then its siblings. */ #define FTW_SKIP_SIBLINGS 3 - int ftw (const char *, int (*) (const char *, const struct stat *, int), int); - int ftw64 (const char *, int (*) (const char *, const struct stat64 *, int), int); +/* + * When building mingw-w64 CRT files it is required that the ftw and + * nftw functions are not declared with __MINGW_ASM_CALL redirection. + * Otherwise the mingw-w64 would provide broken ftw and nftw symbols. + * To prevent ABI issues, the mingw-w64 runtime should not call the ftw, + * and nftw functions, instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD +#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) +#ifdef _USE_32BIT_TIME_T + int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw32i64); + int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw32i64); +#else + int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw64); + int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw64); +#endif +#else +#ifdef _USE_32BIT_TIME_T + int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw32); + int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw32); +#else + int ftw (const char *, int (*) (const char *, const struct stat *, int), int) __MINGW_ASM_CALL(ftw64i32); + int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int) __MINGW_ASM_CALL(nftw64i32); +#endif +#endif +#endif - int nftw (const char *, int (*) (const char *, const struct stat *, int , struct FTW *), int, int); + int ftw64 (const char *, int (*) (const char *, const struct stat64 *, int), int); int nftw64 (const char *, int (*) (const char *, const struct stat64 *, int , struct FTW *), int, int); #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/fusion.h b/lib/libc/include/any-windows-any/fusion.h index 24e08a0547..3992708db9 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.0-rc1 from include/fusion.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7c307f3ed9..2911845f01 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.0-rc1 from include/fwptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/fwptypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/hstring.h b/lib/libc/include/any-windows-any/hstring.h index fe94226d0d..eb6a49811d 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.0-rc1 from include/hstring.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 new file mode 100644 index 0000000000..7d54c6cdaf --- /dev/null +++ b/lib/libc/include/any-windows-any/httprequest.h @@ -0,0 +1,473 @@ +/*** Autogenerated by WIDL 10.4 from include/httprequest.idl - Do not edit ***/ + +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include +#include +#endif + +#ifndef COM_NO_WINDOWS_H +#include +#include +#endif + +#ifndef __httprequest_h__ +#define __httprequest_h__ + +/* Forward declarations */ + +#ifndef __IWinHttpRequest_FWD_DEFINED__ +#define __IWinHttpRequest_FWD_DEFINED__ +typedef interface IWinHttpRequest IWinHttpRequest; +#ifdef __cplusplus +interface IWinHttpRequest; +#endif /* __cplusplus */ +#endif + +#ifndef __WinHttpRequest_FWD_DEFINED__ +#define __WinHttpRequest_FWD_DEFINED__ +#ifdef __cplusplus +typedef class WinHttpRequest WinHttpRequest; +#else +typedef struct WinHttpRequest WinHttpRequest; +#endif /* defined __cplusplus */ +#endif /* defined __WinHttpRequest_FWD_DEFINED__ */ + +/* Headers for imported files */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __WinHttp_LIBRARY_DEFINED__ +#define __WinHttp_LIBRARY_DEFINED__ + +DEFINE_GUID(LIBID_WinHttp, 0x662901fc, 0x6951, 0x4854, 0x9e,0xb2, 0xd9,0xa2,0x57,0x0f,0x2b,0x2e); + +typedef LONG HTTPREQUEST_PROXY_SETTING; +#define HTTPREQUEST_PROXYSETTING_DEFAULT (0x0) + +#define HTTPREQUEST_PROXYSETTING_PRECONFIG (0x0) + +#define HTTPREQUEST_PROXYSETTING_DIRECT (0x1) + +#define HTTPREQUEST_PROXYSETTING_PROXY (0x2) + +typedef LONG HTTPREQUEST_SETCREDENTIALS_FLAGS; +#define HTTPREQUEST_SETCREDENTIALS_FOR_SERVER (0x0) + +#define HTTPREQUEST_SETCREDENTIALS_FOR_PROXY (0x1) + +typedef enum WinHttpRequestOption { + WinHttpRequestOption_UserAgentString = 0, + WinHttpRequestOption_URL = 1, + WinHttpRequestOption_URLCodePage = 2, + WinHttpRequestOption_EscapePercentInURL = 3, + WinHttpRequestOption_SslErrorIgnoreFlags = 4, + WinHttpRequestOption_SelectCertificate = 5, + WinHttpRequestOption_EnableRedirects = 6, + WinHttpRequestOption_UrlEscapeDisable = 7, + WinHttpRequestOption_UrlEscapeDisableQuery = 8, + WinHttpRequestOption_SecureProtocols = 9, + WinHttpRequestOption_EnableTracing = 10, + WinHttpRequestOption_RevertImpersonationOverSsl = 11, + WinHttpRequestOption_EnableHttpsToHttpRedirects = 12, + WinHttpRequestOption_EnablePassportAuthentication = 13, + WinHttpRequestOption_MaxAutomaticRedirects = 14, + WinHttpRequestOption_MaxResponseHeaderSize = 15, + WinHttpRequestOption_MaxResponseDrainSize = 16, + WinHttpRequestOption_EnableHttp1_1 = 17, + WinHttpRequestOption_EnableCertificateRevocationCheck = 18, + WinHttpRequestOption_RejectUserpwd = 19 +} WinHttpRequestOption; +typedef enum WinHttpRequestAutoLogonPolicy { + AutoLogonPolicy_Always = 0, + AutoLogonPolicy_OnlyIfBypassProxy = 1, + AutoLogonPolicy_Never = 2 +} WinHttpRequestAutoLogonPolicy; +/***************************************************************************** + * IWinHttpRequest interface + */ +#ifndef __IWinHttpRequest_INTERFACE_DEFINED__ +#define __IWinHttpRequest_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IWinHttpRequest, 0x016fe2ec, 0xb2c8, 0x45f8, 0xb2,0x3b, 0x39,0xe5,0x3a,0x75,0x39,0x6b); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("016fe2ec-b2c8-45f8-b23b-39e53a75396b") +IWinHttpRequest : public IDispatch +{ + virtual HRESULT STDMETHODCALLTYPE SetProxy( + HTTPREQUEST_PROXY_SETTING proxy_setting, + VARIANT proxy_server, + VARIANT bypass_list) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetCredentials( + BSTR username, + BSTR password, + HTTPREQUEST_SETCREDENTIALS_FLAGS flags) = 0; + + virtual HRESULT STDMETHODCALLTYPE Open( + BSTR method, + BSTR url, + VARIANT async) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetRequestHeader( + BSTR header, + BSTR value) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetResponseHeader( + BSTR header, + BSTR *value) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetAllResponseHeaders( + BSTR *headers) = 0; + + virtual HRESULT STDMETHODCALLTYPE Send( + VARIANT body) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Status( + LONG *status) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_StatusText( + BSTR *status) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_ResponseText( + BSTR *body) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_ResponseBody( + VARIANT *body) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_ResponseStream( + VARIANT *body) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Option( + WinHttpRequestOption option, + VARIANT *value) = 0; + + virtual HRESULT STDMETHODCALLTYPE put_Option( + WinHttpRequestOption option, + VARIANT value) = 0; + + virtual HRESULT STDMETHODCALLTYPE WaitForResponse( + VARIANT timeout, + VARIANT_BOOL *succeeded) = 0; + + virtual HRESULT STDMETHODCALLTYPE Abort( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetTimeouts( + LONG resolve_timeout, + LONG connect_timeout, + LONG send_timeout, + LONG receive_timeout) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetClientCertificate( + BSTR certificate) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetAutoLogonPolicy( + WinHttpRequestAutoLogonPolicy policy) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IWinHttpRequest, 0x016fe2ec, 0xb2c8, 0x45f8, 0xb2,0x3b, 0x39,0xe5,0x3a,0x75,0x39,0x6b) +#endif +#else +typedef struct IWinHttpRequestVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IWinHttpRequest *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IWinHttpRequest *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IWinHttpRequest *This); + + /*** IDispatch methods ***/ + HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)( + IWinHttpRequest *This, + UINT *pctinfo); + + HRESULT (STDMETHODCALLTYPE *GetTypeInfo)( + IWinHttpRequest *This, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + + HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)( + IWinHttpRequest *This, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + + HRESULT (STDMETHODCALLTYPE *Invoke)( + IWinHttpRequest *This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + /*** IWinHttpRequest methods ***/ + HRESULT (STDMETHODCALLTYPE *SetProxy)( + IWinHttpRequest *This, + HTTPREQUEST_PROXY_SETTING proxy_setting, + VARIANT proxy_server, + VARIANT bypass_list); + + HRESULT (STDMETHODCALLTYPE *SetCredentials)( + IWinHttpRequest *This, + BSTR username, + BSTR password, + HTTPREQUEST_SETCREDENTIALS_FLAGS flags); + + HRESULT (STDMETHODCALLTYPE *Open)( + IWinHttpRequest *This, + BSTR method, + BSTR url, + VARIANT async); + + HRESULT (STDMETHODCALLTYPE *SetRequestHeader)( + IWinHttpRequest *This, + BSTR header, + BSTR value); + + HRESULT (STDMETHODCALLTYPE *GetResponseHeader)( + IWinHttpRequest *This, + BSTR header, + BSTR *value); + + HRESULT (STDMETHODCALLTYPE *GetAllResponseHeaders)( + IWinHttpRequest *This, + BSTR *headers); + + HRESULT (STDMETHODCALLTYPE *Send)( + IWinHttpRequest *This, + VARIANT body); + + HRESULT (STDMETHODCALLTYPE *get_Status)( + IWinHttpRequest *This, + LONG *status); + + HRESULT (STDMETHODCALLTYPE *get_StatusText)( + IWinHttpRequest *This, + BSTR *status); + + HRESULT (STDMETHODCALLTYPE *get_ResponseText)( + IWinHttpRequest *This, + BSTR *body); + + HRESULT (STDMETHODCALLTYPE *get_ResponseBody)( + IWinHttpRequest *This, + VARIANT *body); + + HRESULT (STDMETHODCALLTYPE *get_ResponseStream)( + IWinHttpRequest *This, + VARIANT *body); + + HRESULT (STDMETHODCALLTYPE *get_Option)( + IWinHttpRequest *This, + WinHttpRequestOption option, + VARIANT *value); + + HRESULT (STDMETHODCALLTYPE *put_Option)( + IWinHttpRequest *This, + WinHttpRequestOption option, + VARIANT value); + + HRESULT (STDMETHODCALLTYPE *WaitForResponse)( + IWinHttpRequest *This, + VARIANT timeout, + VARIANT_BOOL *succeeded); + + HRESULT (STDMETHODCALLTYPE *Abort)( + IWinHttpRequest *This); + + HRESULT (STDMETHODCALLTYPE *SetTimeouts)( + IWinHttpRequest *This, + LONG resolve_timeout, + LONG connect_timeout, + LONG send_timeout, + LONG receive_timeout); + + HRESULT (STDMETHODCALLTYPE *SetClientCertificate)( + IWinHttpRequest *This, + BSTR certificate); + + HRESULT (STDMETHODCALLTYPE *SetAutoLogonPolicy)( + IWinHttpRequest *This, + WinHttpRequestAutoLogonPolicy policy); + + END_INTERFACE +} IWinHttpRequestVtbl; + +interface IWinHttpRequest { + CONST_VTBL IWinHttpRequestVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IWinHttpRequest_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IWinHttpRequest_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IWinHttpRequest_Release(This) (This)->lpVtbl->Release(This) +/*** IDispatch methods ***/ +#define IWinHttpRequest_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo) +#define IWinHttpRequest_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) +#define IWinHttpRequest_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) +#define IWinHttpRequest_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) +/*** IWinHttpRequest methods ***/ +#define IWinHttpRequest_SetProxy(This,proxy_setting,proxy_server,bypass_list) (This)->lpVtbl->SetProxy(This,proxy_setting,proxy_server,bypass_list) +#define IWinHttpRequest_SetCredentials(This,username,password,flags) (This)->lpVtbl->SetCredentials(This,username,password,flags) +#define IWinHttpRequest_Open(This,method,url,async) (This)->lpVtbl->Open(This,method,url,async) +#define IWinHttpRequest_SetRequestHeader(This,header,value) (This)->lpVtbl->SetRequestHeader(This,header,value) +#define IWinHttpRequest_GetResponseHeader(This,header,value) (This)->lpVtbl->GetResponseHeader(This,header,value) +#define IWinHttpRequest_GetAllResponseHeaders(This,headers) (This)->lpVtbl->GetAllResponseHeaders(This,headers) +#define IWinHttpRequest_Send(This,body) (This)->lpVtbl->Send(This,body) +#define IWinHttpRequest_get_Status(This,status) (This)->lpVtbl->get_Status(This,status) +#define IWinHttpRequest_get_StatusText(This,status) (This)->lpVtbl->get_StatusText(This,status) +#define IWinHttpRequest_get_ResponseText(This,body) (This)->lpVtbl->get_ResponseText(This,body) +#define IWinHttpRequest_get_ResponseBody(This,body) (This)->lpVtbl->get_ResponseBody(This,body) +#define IWinHttpRequest_get_ResponseStream(This,body) (This)->lpVtbl->get_ResponseStream(This,body) +#define IWinHttpRequest_get_Option(This,option,value) (This)->lpVtbl->get_Option(This,option,value) +#define IWinHttpRequest_put_Option(This,option,value) (This)->lpVtbl->put_Option(This,option,value) +#define IWinHttpRequest_WaitForResponse(This,timeout,succeeded) (This)->lpVtbl->WaitForResponse(This,timeout,succeeded) +#define IWinHttpRequest_Abort(This) (This)->lpVtbl->Abort(This) +#define IWinHttpRequest_SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout) (This)->lpVtbl->SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout) +#define IWinHttpRequest_SetClientCertificate(This,certificate) (This)->lpVtbl->SetClientCertificate(This,certificate) +#define IWinHttpRequest_SetAutoLogonPolicy(This,policy) (This)->lpVtbl->SetAutoLogonPolicy(This,policy) +#else +/*** IUnknown methods ***/ +static inline HRESULT IWinHttpRequest_QueryInterface(IWinHttpRequest* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IWinHttpRequest_AddRef(IWinHttpRequest* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IWinHttpRequest_Release(IWinHttpRequest* This) { + return This->lpVtbl->Release(This); +} +/*** IDispatch methods ***/ +static inline HRESULT IWinHttpRequest_GetTypeInfoCount(IWinHttpRequest* This,UINT *pctinfo) { + return This->lpVtbl->GetTypeInfoCount(This,pctinfo); +} +static inline HRESULT IWinHttpRequest_GetTypeInfo(IWinHttpRequest* This,UINT iTInfo,LCID lcid,ITypeInfo **ppTInfo) { + return This->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo); +} +static inline HRESULT IWinHttpRequest_GetIDsOfNames(IWinHttpRequest* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) { + return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId); +} +static inline HRESULT IWinHttpRequest_Invoke(IWinHttpRequest* 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); +} +/*** IWinHttpRequest methods ***/ +static inline HRESULT IWinHttpRequest_SetProxy(IWinHttpRequest* This,HTTPREQUEST_PROXY_SETTING proxy_setting,VARIANT proxy_server,VARIANT bypass_list) { + return This->lpVtbl->SetProxy(This,proxy_setting,proxy_server,bypass_list); +} +static inline HRESULT IWinHttpRequest_SetCredentials(IWinHttpRequest* This,BSTR username,BSTR password,HTTPREQUEST_SETCREDENTIALS_FLAGS flags) { + return This->lpVtbl->SetCredentials(This,username,password,flags); +} +static inline HRESULT IWinHttpRequest_Open(IWinHttpRequest* This,BSTR method,BSTR url,VARIANT async) { + return This->lpVtbl->Open(This,method,url,async); +} +static inline HRESULT IWinHttpRequest_SetRequestHeader(IWinHttpRequest* This,BSTR header,BSTR value) { + return This->lpVtbl->SetRequestHeader(This,header,value); +} +static inline HRESULT IWinHttpRequest_GetResponseHeader(IWinHttpRequest* This,BSTR header,BSTR *value) { + return This->lpVtbl->GetResponseHeader(This,header,value); +} +static inline HRESULT IWinHttpRequest_GetAllResponseHeaders(IWinHttpRequest* This,BSTR *headers) { + return This->lpVtbl->GetAllResponseHeaders(This,headers); +} +static inline HRESULT IWinHttpRequest_Send(IWinHttpRequest* This,VARIANT body) { + return This->lpVtbl->Send(This,body); +} +static inline HRESULT IWinHttpRequest_get_Status(IWinHttpRequest* This,LONG *status) { + return This->lpVtbl->get_Status(This,status); +} +static inline HRESULT IWinHttpRequest_get_StatusText(IWinHttpRequest* This,BSTR *status) { + return This->lpVtbl->get_StatusText(This,status); +} +static inline HRESULT IWinHttpRequest_get_ResponseText(IWinHttpRequest* This,BSTR *body) { + return This->lpVtbl->get_ResponseText(This,body); +} +static inline HRESULT IWinHttpRequest_get_ResponseBody(IWinHttpRequest* This,VARIANT *body) { + return This->lpVtbl->get_ResponseBody(This,body); +} +static inline HRESULT IWinHttpRequest_get_ResponseStream(IWinHttpRequest* This,VARIANT *body) { + return This->lpVtbl->get_ResponseStream(This,body); +} +static inline HRESULT IWinHttpRequest_get_Option(IWinHttpRequest* This,WinHttpRequestOption option,VARIANT *value) { + return This->lpVtbl->get_Option(This,option,value); +} +static inline HRESULT IWinHttpRequest_put_Option(IWinHttpRequest* This,WinHttpRequestOption option,VARIANT value) { + return This->lpVtbl->put_Option(This,option,value); +} +static inline HRESULT IWinHttpRequest_WaitForResponse(IWinHttpRequest* This,VARIANT timeout,VARIANT_BOOL *succeeded) { + return This->lpVtbl->WaitForResponse(This,timeout,succeeded); +} +static inline HRESULT IWinHttpRequest_Abort(IWinHttpRequest* This) { + return This->lpVtbl->Abort(This); +} +static inline HRESULT IWinHttpRequest_SetTimeouts(IWinHttpRequest* This,LONG resolve_timeout,LONG connect_timeout,LONG send_timeout,LONG receive_timeout) { + return This->lpVtbl->SetTimeouts(This,resolve_timeout,connect_timeout,send_timeout,receive_timeout); +} +static inline HRESULT IWinHttpRequest_SetClientCertificate(IWinHttpRequest* This,BSTR certificate) { + return This->lpVtbl->SetClientCertificate(This,certificate); +} +static inline HRESULT IWinHttpRequest_SetAutoLogonPolicy(IWinHttpRequest* This,WinHttpRequestAutoLogonPolicy policy) { + return This->lpVtbl->SetAutoLogonPolicy(This,policy); +} +#endif +#endif + +#endif + + +#endif /* __IWinHttpRequest_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * WinHttpRequest coclass + */ + +DEFINE_GUID(CLSID_WinHttpRequest, 0x2087c2f4, 0x2cef, 0x4953, 0xa8,0xab, 0x66,0x77,0x9b,0x67,0x04,0x95); + +#ifdef __cplusplus +class DECLSPEC_UUID("2087c2f4-2cef-4953-a8ab-66779b670495") WinHttpRequest; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(WinHttpRequest, 0x2087c2f4, 0x2cef, 0x4953, 0xa8,0xab, 0x66,0x77,0x9b,0x67,0x04,0x95) +#endif +#endif + +#endif /* __WinHttp_LIBRARY_DEFINED__ */ +/* Begin additional prototypes for all interfaces */ + +ULONG __RPC_USER VARIANT_UserSize (ULONG *, ULONG, VARIANT *); +unsigned char * __RPC_USER VARIANT_UserMarshal (ULONG *, unsigned char *, VARIANT *); +unsigned char * __RPC_USER VARIANT_UserUnmarshal(ULONG *, unsigned char *, VARIANT *); +void __RPC_USER VARIANT_UserFree (ULONG *, VARIANT *); +ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *); +unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *); +unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *); +void __RPC_USER BSTR_UserFree (ULONG *, BSTR *); + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __httprequest_h__ */ diff --git a/lib/libc/include/any-windows-any/icftypes.h b/lib/libc/include/any-windows-any/icftypes.h index 094c79228f..dfaa59f0fb 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.0-rc1 from include/icftypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 3ca910a71c..21a3c32fb3 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.0-rc1 from include/icodecapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/icodecapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/iisext_i.c b/lib/libc/include/any-windows-any/iisext_i.c deleted file mode 100644 index eb359ce09c..0000000000 --- a/lib/libc/include/any-windows-any/iisext_i.c +++ /dev/null @@ -1,66 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ - -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - - MIDL_DEFINE_GUID(IID,LIBID_IISExt,0x2a56ea30,0xafeb,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03); - MIDL_DEFINE_GUID(IID,IID_IISApplicationPool,0x0B3CB1E1,0x829A,0x4c06,0x8B,0x09,0xF5,0x6D,0xA1,0x89,0x4C,0x88); - MIDL_DEFINE_GUID(IID,IID_IISApplicationPools,0x587F123F,0x49B4,0x49dd,0x93,0x9E,0xF4,0x54,0x7A,0xA3,0xFA,0x75); - MIDL_DEFINE_GUID(IID,IID_IISWebService,0xEE46D40C,0x1B38,0x4a02,0x89,0x8D,0x35,0x8E,0x74,0xDF,0xC9,0xD2); - MIDL_DEFINE_GUID(IID,IID_IISDsCrMap,0xedcd6a60,0xb053,0x11d0,0xa6,0x2f,0x00,0xa0,0xc9,0x22,0xe7,0x52); - MIDL_DEFINE_GUID(IID,IID_IISApp,0x46FBBB80,0x0192,0x11d1,0x9C,0x39,0x00,0xA0,0xC9,0x22,0xE7,0x03); - MIDL_DEFINE_GUID(IID,IID_IISApp2,0x603DCBEA,0x7350,0x11d2,0xA7,0xBE,0x00,0x00,0xF8,0x08,0x5B,0x95); - MIDL_DEFINE_GUID(IID,IID_IISApp3,0x2812B639,0x8FAC,0x4510,0x96,0xC5,0x71,0xDD,0xBD,0x1F,0x54,0xFC); - MIDL_DEFINE_GUID(IID,IID_IISComputer,0xCF87A2E0,0x078B,0x11d1,0x9C,0x3D,0x00,0xA0,0xC9,0x22,0xE7,0x03); - MIDL_DEFINE_GUID(IID,IID_IISComputer2,0x63d89839,0x5762,0x4a68,0xb1,0xb9,0x35,0x07,0xea,0x76,0xcb,0xbf); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtComputer,0x91ef9258,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApp,0xb4f34438,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtServer,0xc3b32488,0xafec,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtDsCrMap,0xbc36cde8,0xafeb,0x11d1,0x98,0x68,0x00,0xa0,0xc9,0x22,0xe7,0x03); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApplicationPool,0xE99F9D0C,0xFB39,0x402b,0x9E,0xEB,0xAA,0x18,0x52,0x37,0xBD,0x34); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtApplicationPools,0x95863074,0xA389,0x406a,0xA2,0xD7,0xD9,0x8B,0xFC,0x95,0xB9,0x05); - MIDL_DEFINE_GUID(CLSID,CLSID_IISExtWebService,0x40B8F873,0xB30E,0x475d,0xBE,0xC5,0x4D,0x0E,0xBB,0x0D,0xBA,0xF3); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/iketypes.h b/lib/libc/include/any-windows-any/iketypes.h index eab9250121..6f59e09277 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.0-rc1 from include/iketypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f9b644fd96..843c1b1994 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.0-rc1 from include/inputpaneinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f8758ad360..265b2396c0 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.0-rc1 from include/inputscope.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f86af4e928..eb68e25085 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.0-rc1 from include/inspectable.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/inspectable.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/iwscapi.h b/lib/libc/include/any-windows-any/iwscapi.h index 02afadb647..4ba584d2d1 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.0-rc1 from include/iwscapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 9b695e333a..f69bd6ed78 100644 --- a/lib/libc/include/any-windows-any/locale.h +++ b/lib/libc/include/any-windows-any/locale.h @@ -103,6 +103,10 @@ extern "C" { _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); #endif +#if __MSVCRT_VERSION__ >= 0xB00 + _CRTIMP _locale_t __cdecl _wcreate_locale(int _Category, const wchar_t *_Locale); +#endif + #ifdef __CHAR_UNSIGNED__ /* Pull in the constructor from 'charmax.c'. */ extern int __mingw_initcharmax; diff --git a/lib/libc/include/any-windows-any/locationapi.h b/lib/libc/include/any-windows-any/locationapi.h index c39752da77..42f20e5688 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.0-rc1 from include/locationapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/locationapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/malloc.h b/lib/libc/include/any-windows-any/malloc.h index 9c498c2918..48ae0db904 100644 --- a/lib/libc/include/any-windows-any/malloc.h +++ b/lib/libc/include/any-windows-any/malloc.h @@ -102,12 +102,10 @@ extern "C" { _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); -# if __MSVCRT_VERSION__ >= 0x900 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); _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); -# endif #if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) #pragma pop_macro("calloc") @@ -131,7 +129,9 @@ extern "C" { void * __mingw_aligned_malloc (size_t _Size, size_t _Alignment); void __mingw_aligned_free (void *_Memory); void * __mingw_aligned_offset_realloc (void *_Memory, size_t _Size, size_t _Alignment, size_t _Offset); +void * __mingw_aligned_offset_malloc (size_t, size_t, size_t); void * __mingw_aligned_realloc (void *_Memory, size_t _Size, size_t _Offset); +size_t __mingw_aligned_msize (void *memblock, size_t alignment, size_t offset); #if defined(__x86_64__) || defined(__i386__) /* Get the compiler's definition of _mm_malloc and _mm_free. */ diff --git a/lib/libc/include/any-windows-any/math.h b/lib/libc/include/any-windows-any/math.h index 85ef067733..65c41cd6da 100644 --- a/lib/libc/include/any-windows-any/math.h +++ b/lib/libc/include/any-windows-any/math.h @@ -206,7 +206,7 @@ extern "C" { __CRT_INLINE long double __cdecl fabsl (long double x) { -#if defined(__arm__) || defined(__aarch64__) +#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ return __builtin_fabsl (x); #else long double res = 0.0l; @@ -397,7 +397,9 @@ typedef long double double_t; #ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __fpclassifyl (long double x) { -#if defined(__x86_64__) || defined(_AMD64_) +#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ + return __fpclassify(x); +#elif defined(__x86_64__) || defined(_AMD64_) __mingw_ldbl_type_t hlp; unsigned int e; hlp.x = x; @@ -414,8 +416,6 @@ typedef long double double_t; return (((hlp.lh.high & 0x7fffffff) | hlp.lh.low) == 0 ? FP_INFINITE : FP_NAN); return FP_NORMAL; -#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - return __fpclassify(x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); @@ -551,7 +551,9 @@ __mingw_choose_expr ( \ __CRT_INLINE int __cdecl __isnanl (long double _x) { -#if defined(__x86_64__) || defined(_AMD64_) +#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ + return __isnan(_x); +#elif defined(__x86_64__) || defined(_AMD64_) __mingw_ldbl_type_t ld; unsigned int xx, signexp; @@ -561,8 +563,6 @@ __mingw_choose_expr ( \ signexp |= (xx | (-xx)) >> 31; signexp = 0xfffe - signexp; return (int) signexp >> 16; -#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - return __isnan(_x); #elif defined(__i386__) || defined(_X86_) unsigned short sw; __asm__ __volatile__ ("fxam;" @@ -621,12 +621,12 @@ __mingw_choose_expr ( \ } __CRT_INLINE int __cdecl __signbitl (long double x) { -#if defined(__x86_64__) || defined(_AMD64_) +#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ + return __signbit(x); +#elif defined(__x86_64__) || defined(_AMD64_) __mingw_ldbl_type_t ld; ld.x = x; return ((ld.lh.sign_exponent & 0x8000) != 0); -#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - return __signbit(x); #elif defined(__i386__) || defined(_X86_) unsigned short stw; __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); @@ -766,90 +766,6 @@ __mingw_choose_expr ( \ extern float __cdecl logbf (float); extern long double __cdecl logbl (long double); -#ifndef __CRT__NO_INLINE -/* When compiling with gcc, always use gcc's builtins. - * The asm inlines below are kept here for future reference: - * they were written for gcc and do no error handling - * (exceptions/errno), therefore only valid if __FAST_MATH__ - * is defined (-ffast-math) . */ -#if 0 /*defined(__GNUC__) && defined(__FAST_MATH__)*/ - __CRT_INLINE double __cdecl logb (double x) - { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_dbl_type_t hlp; - int lx, hx; - - hlp.x = x; - lx = hlp.lh.low; - hx = hlp.lh.high & 0x7fffffff; /* high |x| */ - if ((hx | lx) == 0) - return -1.0 / fabs (x); - if (hx >= 0x7ff00000) - return x * x; - if ((hx >>= 20) == 0) { - unsigned long long mantissa = hlp.val & 0xfffffffffffffULL; - return -1023.0 - (__builtin_clzll(mantissa) - 12); - } - return (double) (hx - 1023); -#elif defined(__i386__) || defined(_X86_) - double res = 0.0; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE float __cdecl logbf (float x) - { -#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - int v; - __mingw_flt_type_t hlp; - - hlp.x = x; - v = hlp.val & 0x7fffffff; /* high |x| */ - if (!v) - return (float)-1.0 / fabsf (x); - if (v >= 0x7f800000) - return x * x; - if ((v >>= 23) == 0) - return -127.0 - (__builtin_clzl(hlp.val & 0x7fffff) - 9); - return (float) (v - 127); -#elif defined(__i386__) || defined(_X86_) - float res = 0.0F; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE long double __cdecl logbl (long double x) - { -#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) - __mingw_ldbl_type_t hlp; - int lx, hx; - - hlp.x = x; - lx = hlp.lh.low; - hx = hlp.lh.high & 0x7fffffff; /* high |x| */ - if ((hx | lx) == 0) - return -1.0 / fabs (x); - if (hx >= 0x7ff00000) - return x * x; - if ((hx >>= 20) == 0) { - unsigned long long mantissa = hlp.val & 0xfffffffffffffULL; - return -1023.0 - (__builtin_clzll(mantissa) - 12); - } - return (double) (hx - 1023); -#elif defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) - long double res = 0.0l; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } -#endif /* defined(__GNUC__) && defined(__FAST_MATH__) */ -#endif /* __CRT__NO_INLINE */ - /* 7.12.6.12 Double in C89 */ extern float __cdecl modff (float, float*); extern long double __cdecl modfl (long double, long double*); @@ -938,84 +854,6 @@ __MINGW_EXTENSION long long __cdecl llrint (double); __MINGW_EXTENSION long long __cdecl llrintf (float); __MINGW_EXTENSION long long __cdecl llrintl (long double); -#ifndef __CRT__NO_INLINE -/* When compiling with gcc, always use gcc's builtins. - * The asm inlines below are kept here for future reference: - * they were written for gcc and do no error handling - * (exceptions/errno), therefore only valid if __FAST_MATH__ - * is defined (-ffast-math) . */ -#if 0 /*defined(__GNUC__) && defined(__FAST_MATH__)*/ - __CRT_INLINE double __cdecl rint (double x) - { - double retval = 0.0; - __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); - return retval; - } - - __CRT_INLINE float __cdecl rintf (float x) - { - float retval = 0.0; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long double __cdecl rintl (long double x) - { - long double retval = 0.0l; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long __cdecl lrint (double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } -#endif /* defined(__GNUC__) && defined(__FAST_MATH__) */ -#endif /* !__CRT__NO_INLINE */ - /* 7.12.9.6 */ /* round away from zero, regardless of fpu control word settings */ extern double __cdecl round (double); diff --git a/lib/libc/include/any-windows-any/mediaobj.h b/lib/libc/include/any-windows-any/mediaobj.h index 0b53802502..41a69a04d2 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.0-rc1 from include/mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d214447dbd..c5300fafbe 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.0-rc1 from include/medparam.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/medparam.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/memoryapi.h b/lib/libc/include/any-windows-any/memoryapi.h index 889c2a5049..cebecd8855 100644 --- a/lib/libc/include/any-windows-any/memoryapi.h +++ b/lib/libc/include/any-windows-any/memoryapi.h @@ -159,7 +159,9 @@ extern "C" { #if NTDDI_VERSION >= NTDDI_WIN10_RS2 WINBASEAPI PVOID WINAPI MapViewOfFileNuma2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection, ULONG PreferredNode); - WINBASEAPI PVOID MapViewOfFile2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection); + FORCEINLINE PVOID MapViewOfFile2(HANDLE FileMappingHandle, HANDLE ProcessHandle, ULONG64 Offset, PVOID BaseAddress, SIZE_T ViewSize, ULONG AllocationType, ULONG PageProtection) { + return MapViewOfFileNuma2(FileMappingHandle, ProcessHandle, Offset, BaseAddress, ViewSize, AllocationType, PageProtection, NUMA_NO_PREFERRED_NODE); + } #endif #if NTDDI_VERSION >= NTDDI_WIN10_RS4 diff --git a/lib/libc/include/any-windows-any/mfapi.h b/lib/libc/include/any-windows-any/mfapi.h index 899d15d2ff..2902a22fdb 100644 --- a/lib/libc/include/any-windows-any/mfapi.h +++ b/lib/libc/include/any-windows-any/mfapi.h @@ -104,7 +104,7 @@ extern "C" { typedef enum { MF_STANDARD_WORKQUEUE = 0, MF_WINDOW_WORKQUEUE = 1, - MF_MULTITHREADED_WORKQUEUE = 2, + MF_MULTITHREADED_WORKQUEUE = 2 } MFASYNC_WORKQUEUE_TYPE; #endif @@ -198,7 +198,7 @@ extern "C" { MF_TOPOSTATUS_DYNAMIC_CHANGED = 210, #endif MF_TOPOSTATUS_SINK_SWITCHED = 300, - MF_TOPOSTATUS_ENDED = 400, + MF_TOPOSTATUS_ENDED = 400 } MF_TOPOSTATUS; EXTERN_C const GUID MR_BUFFER_SERVICE; @@ -451,26 +451,26 @@ DEFINE_MEDIATYPE_GUID(MFVideoFormat_Theora, FCC('theo')); MFVideo3DSampleFormat_BaseView = 0, MFVideo3DSampleFormat_MultiView = 1, MFVideo3DSampleFormat_Packed_LeftRight = 2, - MFVideo3DSampleFormat_Packed_TopBottom = 3, + MFVideo3DSampleFormat_Packed_TopBottom = 3 } MFVideo3DFormat; typedef enum _MFVideo3DSampleFormat { MFSampleExtension_3DVideo_MultiView = 1, - MFSampleExtension_3DVideo_Packed = 0, + MFSampleExtension_3DVideo_Packed = 0 } MFVideo3DSampleFormat; typedef enum _MFVideoRotationFormat { MFVideoRotationFormat_0 = 0, MFVideoRotationFormat_90 = 90, MFVideoRotationFormat_180 = 180, - MFVideoRotationFormat_270 = 270, + MFVideoRotationFormat_270 = 270 } MFVideoRotationFormat; #endif typedef enum _MFVideoDRMFlags { MFVideoDRMFlag_None = 0, MFVideoDRMFlag_AnalogProtected = 1, - MFVideoDRMFlag_DigitallyProtected = 2, + MFVideoDRMFlag_DigitallyProtected = 2 } MFVideoDRMFlags; typedef enum _MFVideoPadFlags { diff --git a/lib/libc/include/any-windows-any/mfcaptureengine.h b/lib/libc/include/any-windows-any/mfcaptureengine.h index eafa112fc7..20ab91f7b3 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.0-rc1 from include/mfcaptureengine.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 8032d9e62d..28ce385e43 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.0-rc1 from include/mfd3d12.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 031276a396..58005f0605 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.0-rc1 from include/mfidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d22d73fff0..a65ee5a97d 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.0-rc1 from include/mfmediacapture.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2b53c0d635..ff72d4ee87 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.0-rc1 from include/mfmediaengine.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/mfmediaengine.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mfobjects.h b/lib/libc/include/any-windows-any/mfobjects.h index 50df22a456..59ce5edbeb 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.0-rc1 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e9748a7df7..9abb387580 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.0-rc1 from include/mfplay.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 caebaadb5c..6bd90c2b45 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.0-rc1 from include/mfreadwrite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7ab6676eec..7268f9b462 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.0-rc1 from include/mftransform.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d272da0b72..c12e2ee032 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.0-rc1 from include/mmdeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 fbee4c0c0b..022963122f 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.0-rc1 from include/mmstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/mmstream.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mpeg2bits.h b/lib/libc/include/any-windows-any/mpeg2bits.h index 74258bd94d..9d9c40a718 100644 --- a/lib/libc/include/any-windows-any/mpeg2bits.h +++ b/lib/libc/include/any-windows-any/mpeg2bits.h @@ -1,23 +1,69 @@ -/** - * 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. +/* + * Copyright (C) 2025 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __INC_MPEG2BITS__ -#define __INC_MPEG2BITS__ -#include -typedef struct _MPEG_HEADER_BITS { - WORD SectionLength :12; - WORD Reserved :2; - WORD PrivateIndicator :1; - WORD SectionSyntaxIndicator :1; +#ifndef _MPEG2BITS_H_ +#define _MPEG2BITS_H_ + +#pragma pack(push) +#pragma pack(1) + +#if defined(__midl) || defined(__WIDL__) +typedef struct +{ + WORD Bits; +} PID_BITS_MIDL; +#else +typedef struct +{ + WORD Reserved : 3; + WORD ProgramId : 13; +} PID_BITS, *PPID_BITS; +#endif + +#if defined(__midl) || defined(__WIDL__) +typedef struct +{ + WORD Bits; +} MPEG_HEADER_BITS_MIDL; +#else +typedef struct +{ + WORD SectionLength : 12; + WORD Reserved : 2; + WORD PrivateIndicator : 1; + WORD SectionSyntaxIndicator : 1; } MPEG_HEADER_BITS, *PMPEG_HEADER_BITS; +#endif -typedef struct _MPEG_HEADER_VERSION_BITS { - BYTE CurrentNextIndicator :1; - BYTE VersionNumber :5; - BYTE Reserved :2; +#if defined(__midl) || defined(__WIDL__) +typedef struct +{ + BYTE Bits; +} MPEG_HEADER_VERSION_BITS_MIDL; +#else +typedef struct +{ + BYTE CurrentNextIndicator : 1; + BYTE VersionNumber : 5; + BYTE Reserved : 2; } MPEG_HEADER_VERSION_BITS, *PMPEG_HEADER_VERSION_BITS; +#endif + +#pragma pack(pop) -#endif /* __INC_MPEG2BITS__ */ +#endif /* _MPEG2BITS_H_ */ diff --git a/lib/libc/include/any-windows-any/mpeg2data.h b/lib/libc/include/any-windows-any/mpeg2data.h index caf985623a..cfff85b908 100644 --- a/lib/libc/include/any-windows-any/mpeg2data.h +++ b/lib/libc/include/any-windows-any/mpeg2data.h @@ -1,138 +1,778 @@ -/** - * 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_MPEG2DATA__ -#define __INC_MPEG2DATA__ +/*** Autogenerated by WIDL 10.4 from include/mpeg2data.idl - Do not edit ***/ -#include +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include +#include +#endif -typedef WORD PID; -typedef BYTE TID; +#ifndef COM_NO_WINDOWS_H +#include +#include +#endif -typedef struct _ATSC_FILTER_OPTIONS { - WINBOOL fSpecifyEtmId; - DWORD EtmId; -} ATSC_FILTER_OPTIONS; +#ifndef __mpeg2data_h__ +#define __mpeg2data_h__ -#include +/* Forward declarations */ -#ifndef __ISectionList_FWD_DEFINED__ -#define __ISectionList_FWD_DEFINED__ -typedef struct ISectionList ISectionList; +#ifndef __IMpeg2TableFilter_FWD_DEFINED__ +#define __IMpeg2TableFilter_FWD_DEFINED__ +typedef interface IMpeg2TableFilter IMpeg2TableFilter; +#ifdef __cplusplus +interface IMpeg2TableFilter; +#endif /* __cplusplus */ #endif +#ifndef __Mpeg2TableFilter_FWD_DEFINED__ +#define __Mpeg2TableFilter_FWD_DEFINED__ +#ifdef __cplusplus +typedef class Mpeg2TableFilter Mpeg2TableFilter; +#else +typedef struct Mpeg2TableFilter Mpeg2TableFilter; +#endif /* defined __cplusplus */ +#endif /* defined __Mpeg2TableFilter_FWD_DEFINED__ */ + #ifndef __IMpeg2Data_FWD_DEFINED__ #define __IMpeg2Data_FWD_DEFINED__ -typedef struct IMpeg2Data IMpeg2Data; +typedef interface IMpeg2Data IMpeg2Data; +#ifdef __cplusplus +interface IMpeg2Data; +#endif /* __cplusplus */ +#endif + +#ifndef __ISectionList_FWD_DEFINED__ +#define __ISectionList_FWD_DEFINED__ +typedef interface ISectionList ISectionList; +#ifdef __cplusplus +interface ISectionList; +#endif /* __cplusplus */ #endif #ifndef __IMpeg2Stream_FWD_DEFINED__ #define __IMpeg2Stream_FWD_DEFINED__ -typedef struct IMpeg2Stream IMpeg2Stream; +typedef interface IMpeg2Stream IMpeg2Stream; +#ifdef __cplusplus +interface IMpeg2Stream; +#endif /* __cplusplus */ #endif -#undef INTERFACE -#define INTERFACE ISectionList -#ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +#ifndef __SectionList_FWD_DEFINED__ +#define __SectionList_FWD_DEFINED__ +#ifdef __cplusplus +typedef class SectionList SectionList; +#else +typedef struct SectionList SectionList; +#endif /* defined __cplusplus */ +#endif /* defined __SectionList_FWD_DEFINED__ */ + +#ifndef __Mpeg2Stream_FWD_DEFINED__ +#define __Mpeg2Stream_FWD_DEFINED__ +#ifdef __cplusplus +typedef class Mpeg2Stream Mpeg2Stream; +#else +typedef struct Mpeg2Stream Mpeg2Stream; +#endif /* defined __cplusplus */ +#endif /* defined __Mpeg2Stream_FWD_DEFINED__ */ + +#ifndef __Mpeg2Data_FWD_DEFINED__ +#define __Mpeg2Data_FWD_DEFINED__ +#ifdef __cplusplus +typedef class Mpeg2Data Mpeg2Data; +#else +typedef struct Mpeg2Data Mpeg2Data; +#endif /* defined __cplusplus */ +#endif /* defined __Mpeg2Data_FWD_DEFINED__ */ + +/* Headers for imported files */ + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { #endif -DECLARE_INTERFACE_(ISectionList,IUnknown) + +#ifndef __ISectionList_FWD_DEFINED__ +#define __ISectionList_FWD_DEFINED__ +typedef interface ISectionList ISectionList; +#ifdef __cplusplus +interface ISectionList; +#endif /* __cplusplus */ +#endif + +#ifndef __IMpeg2Stream_FWD_DEFINED__ +#define __IMpeg2Stream_FWD_DEFINED__ +typedef interface IMpeg2Stream IMpeg2Stream; +#ifdef __cplusplus +interface IMpeg2Stream; +#endif /* __cplusplus */ +#endif + +#define MPEG_PAT_PID 0x0000 +#define MPEG_PAT_TID 0x00 +#define MPEG_CAT_PID 0x0001 +#define MPEG_CAT_TID 0x01 +#define MPEG_PMT_TID 0x02 +#define MPEG_TSDT_PID 0x0002 +#define MPEG_TSDT_TID 0x03 +#define ATSC_MGT_PID 0x1ffb +#define ATSC_MGT_TID 0xc7 +#define ATSC_VCT_PID 0x1ffb +#define ATSC_VCT_TERR_TID 0xc8 +#define ATSC_VCT_CABL_TID 0xc9 +#define ATSC_EIT_TID 0xcb +#define ATSC_ETT_TID 0xcc +#define ATSC_RRT_TID 0xca +#define ATSC_RRT_PID 0x1ffb +#define ATSC_STT_PID 0x1ffb +#define ATSC_STT_TID 0xcd +#define ATSC_PIT_TID 0xd0 +#define DVB_NIT_PID 0x0010 +#define DVB_NIT_ACTUAL_TID 0x40 +#define DVB_NIT_OTHER_TID 0x41 +#define DVB_SDT_PID 0x0011 +#define DVB_SDT_ACTUAL_TID 0x42 +#define DVB_SDT_OTHER_TID 0x46 +#define DVB_BAT_PID 0x0011 +#define DVB_BAT_TID 0x4a +#define DVB_EIT_PID 0x0012 +#define DVB_EIT_ACTUAL_TID 0x4e +#define DVB_EIT_OTHER_TID 0x4f +#define DVB_RST_PID 0x0013 +#define DVB_RST_TID 0x71 +#define DVB_TDT_PID 0x0014 +#define DVB_TDT_TID 0x70 +#define DVB_ST_PID_16 0x0010 +#define DVB_ST_PID_17 0x0011 +#define DVB_ST_PID_18 0x0012 +#define DVB_ST_PID_19 0x0013 +#define DVB_ST_PID_20 0x0014 +#define DVB_ST_TID 0x72 +#define ISDB_ST_TID 0x72 +#define DVB_TOT_PID 0x0014 +#define DVB_TOT_TID 0x73 +#define DVB_DIT_PID 0x001e +#define DVB_DIT_TID 0x7e +#define DVB_SIT_PID 0x001f +#define DVB_SIT_TID 0x7f +#define ISDB_EMM_TID 0x85 +#define ISDB_BIT_PID 0x0024 +#define ISDB_BIT_TID 0xc4 +#define ISDB_NBIT_PID 0x0025 +#define ISDB_NBIT_MSG_TID 0xc5 +#define ISDB_NBIT_REF_TID 0xc6 +#define ISDB_LDT_PID 0x0025 +#define ISDB_LDT_TID 0xc7 +#define ISDB_SDTT_PID 0x0023 +#define ISDB_SDTT_ALT_PID 0x0028 +#define ISDB_SDTT_TID 0xc3 +#define ISDB_CDT_PID 0x0029 +#define ISDB_CDT_TID 0xc8 +#define SCTE_EAS_TID 0xd8 +#define SCTE_EAS_IB_PID 0x1ffb +#define SCTE_EAS_OOB_PID 0x1ffc +/***************************************************************************** + * IMpeg2TableFilter interface + */ +#ifndef __IMpeg2TableFilter_INTERFACE_DEFINED__ +#define __IMpeg2TableFilter_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMpeg2TableFilter, 0xbdcdd913, 0x9ecd, 0x4fb2, 0x81,0xae, 0xad,0xf7,0x47,0xea,0x75,0xa5); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("bdcdd913-9ecd-4fb2-81ae-adf747ea75a5") +IMpeg2TableFilter : public IUnknown { + virtual HRESULT STDMETHODCALLTYPE AddPID( + PID p) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddTable( + PID p, + TID t) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddExtension( + PID p, + TID t, + TEID e) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemovePID( + PID p) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveTable( + PID p, + TID t) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveExtension( + PID p, + TID t, + TEID e) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMpeg2TableFilter, 0xbdcdd913, 0x9ecd, 0x4fb2, 0x81,0xae, 0xad,0xf7,0x47,0xea,0x75,0xa5) +#endif +#else +typedef struct IMpeg2TableFilterVtbl { BEGIN_INTERFACE - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMpeg2TableFilter *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMpeg2TableFilter *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMpeg2TableFilter *This); + + /*** IMpeg2TableFilter methods ***/ + HRESULT (STDMETHODCALLTYPE *AddPID)( + IMpeg2TableFilter *This, + PID p); + + HRESULT (STDMETHODCALLTYPE *AddTable)( + IMpeg2TableFilter *This, + PID p, + TID t); - /* ISectionList methods */ - STDMETHOD_(HRESULT,CancelPendingRequest)(THIS) PURE; - STDMETHOD_(HRESULT,GetNumberOfSections)(THIS_ WORD *pCount) PURE; - STDMETHOD_(HRESULT,GetProgramIdentifier)(THIS_ PID *pPid) PURE; - STDMETHOD_(HRESULT,GetSectionData)(THIS_ WORD sectionNumber,DWORD *pdwRawPacketLength,PSECTION *ppSection) PURE; - STDMETHOD_(HRESULT,GetTableIdentifier)(THIS_ TID *pTableId) PURE; - STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD timeout,HANDLE hDoneEvent) PURE; - STDMETHOD_(HRESULT,InitializeWithRawSections)(THIS_ PMPEG_PACKET_LIST pmplSections) PURE; + HRESULT (STDMETHODCALLTYPE *AddExtension)( + IMpeg2TableFilter *This, + PID p, + TID t, + TEID e); + + HRESULT (STDMETHODCALLTYPE *RemovePID)( + IMpeg2TableFilter *This, + PID p); + + HRESULT (STDMETHODCALLTYPE *RemoveTable)( + IMpeg2TableFilter *This, + PID p, + TID t); + + HRESULT (STDMETHODCALLTYPE *RemoveExtension)( + IMpeg2TableFilter *This, + PID p, + TID t, + TEID e); END_INTERFACE +} IMpeg2TableFilterVtbl; + +interface IMpeg2TableFilter { + CONST_VTBL IMpeg2TableFilterVtbl* lpVtbl; }; + #ifdef COBJMACROS -#define ISectionList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) -#define ISectionList_AddRef(This) (This)->lpVtbl->AddRef(This) -#define ISectionList_Release(This) (This)->lpVtbl->Release(This) -#define ISectionList_CancelPendingRequest() (This)->lpVtbl->CancelPendingRequest(This) -#define ISectionList_GetNumberOfSections(This,pCount) (This)->lpVtbl->GetNumberOfSections(This,pCount) -#define ISectionList_GetProgramIdentifier(This,pPid) (This)->lpVtbl->GetProgramIdentifier(This,pPid) -#define ISectionList_GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection) (This)->lpVtbl->GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection) -#define ISectionList_GetTableIdentifier(This,pTableId) (This)->lpVtbl->GetTableIdentifier(This,pTableId) -#define ISectionList_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent) -#define ISectionList_InitializeWithRawSections(This,pmplSections) (This)->lpVtbl->InitializeWithRawSections(This,pmplSections) -#endif /*COBJMACROS*/ - -#undef INTERFACE -#define INTERFACE IMpeg2Data -#ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) -#endif -DECLARE_INTERFACE_(IMpeg2Data,IUnknown) +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMpeg2TableFilter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMpeg2TableFilter_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMpeg2TableFilter_Release(This) (This)->lpVtbl->Release(This) +/*** IMpeg2TableFilter methods ***/ +#define IMpeg2TableFilter_AddPID(This,p) (This)->lpVtbl->AddPID(This,p) +#define IMpeg2TableFilter_AddTable(This,p,t) (This)->lpVtbl->AddTable(This,p,t) +#define IMpeg2TableFilter_AddExtension(This,p,t,e) (This)->lpVtbl->AddExtension(This,p,t,e) +#define IMpeg2TableFilter_RemovePID(This,p) (This)->lpVtbl->RemovePID(This,p) +#define IMpeg2TableFilter_RemoveTable(This,p,t) (This)->lpVtbl->RemoveTable(This,p,t) +#define IMpeg2TableFilter_RemoveExtension(This,p,t,e) (This)->lpVtbl->RemoveExtension(This,p,t,e) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMpeg2TableFilter_QueryInterface(IMpeg2TableFilter* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMpeg2TableFilter_AddRef(IMpeg2TableFilter* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMpeg2TableFilter_Release(IMpeg2TableFilter* This) { + return This->lpVtbl->Release(This); +} +/*** IMpeg2TableFilter methods ***/ +static inline HRESULT IMpeg2TableFilter_AddPID(IMpeg2TableFilter* This,PID p) { + return This->lpVtbl->AddPID(This,p); +} +static inline HRESULT IMpeg2TableFilter_AddTable(IMpeg2TableFilter* This,PID p,TID t) { + return This->lpVtbl->AddTable(This,p,t); +} +static inline HRESULT IMpeg2TableFilter_AddExtension(IMpeg2TableFilter* This,PID p,TID t,TEID e) { + return This->lpVtbl->AddExtension(This,p,t,e); +} +static inline HRESULT IMpeg2TableFilter_RemovePID(IMpeg2TableFilter* This,PID p) { + return This->lpVtbl->RemovePID(This,p); +} +static inline HRESULT IMpeg2TableFilter_RemoveTable(IMpeg2TableFilter* This,PID p,TID t) { + return This->lpVtbl->RemoveTable(This,p,t); +} +static inline HRESULT IMpeg2TableFilter_RemoveExtension(IMpeg2TableFilter* This,PID p,TID t,TEID e) { + return This->lpVtbl->RemoveExtension(This,p,t,e); +} +#endif +#endif + +#endif + + +#endif /* __IMpeg2TableFilter_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * Mpeg2TableFilter coclass + */ + +DEFINE_GUID(CLSID_Mpeg2TableFilter, 0x752845f1, 0x758f, 0x4c83, 0xa0,0x43, 0x42,0x70,0xc5,0x93,0x30,0x8e); + +#ifdef __cplusplus +class DECLSPEC_UUID("752845f1-758f-4c83-a043-4270c593308e") Mpeg2TableFilter; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(Mpeg2TableFilter, 0x752845f1, 0x758f, 0x4c83, 0xa0,0x43, 0x42,0x70,0xc5,0x93,0x30,0x8e) +#endif +#endif + +typedef struct Mpeg2TableSampleHdr { + BYTE SectionCount; + BYTE Reserved[3]; + LONG SectionOffsets[1]; +} Mpeg2TableSampleHdr; +#ifndef __Mpeg2DataLib_LIBRARY_DEFINED__ +#define __Mpeg2DataLib_LIBRARY_DEFINED__ + +DEFINE_GUID(LIBID_Mpeg2DataLib, 0xdbaf6c1b, 0xb6a4, 0x4898, 0xae,0x65, 0x20,0x4f,0x0d,0x95,0x09,0xa1); + +/***************************************************************************** + * IMpeg2Data interface + */ +#ifndef __IMpeg2Data_INTERFACE_DEFINED__ +#define __IMpeg2Data_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMpeg2Data, 0x9b396d40, 0xf380, 0x4e3c, 0xa5,0x14, 0x1a,0x82,0xbf,0x6e,0xbf,0xe6); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("9b396d40-f380-4e3c-a514-1a82bf6ebfe6") +IMpeg2Data : public IUnknown { + virtual HRESULT STDMETHODCALLTYPE GetSection( + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + ISectionList **section_list) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetTable( + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + ISectionList **section_list) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetStreamOfSections( + PID pid, + TID tid, + PMPEG2_FILTER filter, + HANDLE data_ready_event, + IMpeg2Stream **mpeg_stream) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMpeg2Data, 0x9b396d40, 0xf380, 0x4e3c, 0xa5,0x14, 0x1a,0x82,0xbf,0x6e,0xbf,0xe6) +#endif +#else +typedef struct IMpeg2DataVtbl { BEGIN_INTERFACE - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMpeg2Data *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMpeg2Data *This); - /* IMpeg2Data methods */ - STDMETHOD_(HRESULT,GetSection)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE; - STDMETHOD_(HRESULT,GetStreamOfSections)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent,IMpeg2Stream **ppMpegStream) PURE; - STDMETHOD_(HRESULT,GetTable)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE; + ULONG (STDMETHODCALLTYPE *Release)( + IMpeg2Data *This); + + /*** IMpeg2Data methods ***/ + HRESULT (STDMETHODCALLTYPE *GetSection)( + IMpeg2Data *This, + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + ISectionList **section_list); + + HRESULT (STDMETHODCALLTYPE *GetTable)( + IMpeg2Data *This, + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + ISectionList **section_list); + + HRESULT (STDMETHODCALLTYPE *GetStreamOfSections)( + IMpeg2Data *This, + PID pid, + TID tid, + PMPEG2_FILTER filter, + HANDLE data_ready_event, + IMpeg2Stream **mpeg_stream); END_INTERFACE +} IMpeg2DataVtbl; + +interface IMpeg2Data { + CONST_VTBL IMpeg2DataVtbl* lpVtbl; }; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IMpeg2Data_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IMpeg2Data_AddRef(This) (This)->lpVtbl->AddRef(This) #define IMpeg2Data_Release(This) (This)->lpVtbl->Release(This) -#define IMpeg2Data_GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList) -#define IMpeg2Data_GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream) -#define IMpeg2Data_GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList) -#endif /*COBJMACROS*/ - -#undef INTERFACE -#define INTERFACE IMpeg2Stream -#ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) -#endif -DECLARE_INTERFACE_(IMpeg2Stream,IUnknown) +/*** IMpeg2Data methods ***/ +#define IMpeg2Data_GetSection(This,pid,tid,filter,timeout,section_list) (This)->lpVtbl->GetSection(This,pid,tid,filter,timeout,section_list) +#define IMpeg2Data_GetTable(This,pid,tid,filter,timeout,section_list) (This)->lpVtbl->GetTable(This,pid,tid,filter,timeout,section_list) +#define IMpeg2Data_GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMpeg2Data_QueryInterface(IMpeg2Data* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMpeg2Data_AddRef(IMpeg2Data* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMpeg2Data_Release(IMpeg2Data* This) { + return This->lpVtbl->Release(This); +} +/*** IMpeg2Data methods ***/ +static inline HRESULT IMpeg2Data_GetSection(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,ISectionList **section_list) { + return This->lpVtbl->GetSection(This,pid,tid,filter,timeout,section_list); +} +static inline HRESULT IMpeg2Data_GetTable(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,ISectionList **section_list) { + return This->lpVtbl->GetTable(This,pid,tid,filter,timeout,section_list); +} +static inline HRESULT IMpeg2Data_GetStreamOfSections(IMpeg2Data* This,PID pid,TID tid,PMPEG2_FILTER filter,HANDLE data_ready_event,IMpeg2Stream **mpeg_stream) { + return This->lpVtbl->GetStreamOfSections(This,pid,tid,filter,data_ready_event,mpeg_stream); +} +#endif +#endif + +#endif + + +#endif /* __IMpeg2Data_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * ISectionList interface + */ +#ifndef __ISectionList_INTERFACE_DEFINED__ +#define __ISectionList_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_ISectionList, 0xafec1eb5, 0x2a64, 0x46c6, 0xbf,0x4b, 0xae,0x3c,0xcb,0x6a,0xfd,0xb0); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("afec1eb5-2a64-46c6-bf4b-ae3ccb6afdb0") +ISectionList : public IUnknown { + virtual HRESULT STDMETHODCALLTYPE Initialize( + MPEG_REQUEST_TYPE request_type, + IMpeg2Data *mpeg2_data, + PMPEG_CONTEXT context, + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + HANDLE done_event) = 0; + + virtual HRESULT STDMETHODCALLTYPE InitializeWithRawSections( + PMPEG_PACKET_LIST mpl_sections) = 0; + + virtual HRESULT STDMETHODCALLTYPE CancelPendingRequest( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetNumberOfSections( + WORD *count) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSectionData( + WORD section_number, + DWORD *raw_packet_length, + PSECTION *section) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetProgramIdentifier( + PID *pid) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetTableIdentifier( + TID *tid) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(ISectionList, 0xafec1eb5, 0x2a64, 0x46c6, 0xbf,0x4b, 0xae,0x3c,0xcb,0x6a,0xfd,0xb0) +#endif +#else +typedef struct ISectionListVtbl { BEGIN_INTERFACE - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + ISectionList *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + ISectionList *This); + + ULONG (STDMETHODCALLTYPE *Release)( + ISectionList *This); + + /*** ISectionList methods ***/ + HRESULT (STDMETHODCALLTYPE *Initialize)( + ISectionList *This, + MPEG_REQUEST_TYPE request_type, + IMpeg2Data *mpeg2_data, + PMPEG_CONTEXT context, + PID pid, + TID tid, + PMPEG2_FILTER filter, + DWORD timeout, + HANDLE done_event); + + HRESULT (STDMETHODCALLTYPE *InitializeWithRawSections)( + ISectionList *This, + PMPEG_PACKET_LIST mpl_sections); + + HRESULT (STDMETHODCALLTYPE *CancelPendingRequest)( + ISectionList *This); + + HRESULT (STDMETHODCALLTYPE *GetNumberOfSections)( + ISectionList *This, + WORD *count); + + HRESULT (STDMETHODCALLTYPE *GetSectionData)( + ISectionList *This, + WORD section_number, + DWORD *raw_packet_length, + PSECTION *section); + + HRESULT (STDMETHODCALLTYPE *GetProgramIdentifier)( + ISectionList *This, + PID *pid); - /* IMpeg2Stream methods */ - STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent) PURE; - STDMETHOD_(HRESULT,SupplyDataBuffer)(THIS_ PMPEG_STREAM_BUFFER pStreamBuffer) PURE; + HRESULT (STDMETHODCALLTYPE *GetTableIdentifier)( + ISectionList *This, + TID *tid); END_INTERFACE +} ISectionListVtbl; + +interface ISectionList { + CONST_VTBL ISectionListVtbl* lpVtbl; }; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define ISectionList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define ISectionList_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISectionList_Release(This) (This)->lpVtbl->Release(This) +/*** ISectionList methods ***/ +#define ISectionList_Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event) (This)->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event) +#define ISectionList_InitializeWithRawSections(This,mpl_sections) (This)->lpVtbl->InitializeWithRawSections(This,mpl_sections) +#define ISectionList_CancelPendingRequest(This) (This)->lpVtbl->CancelPendingRequest(This) +#define ISectionList_GetNumberOfSections(This,count) (This)->lpVtbl->GetNumberOfSections(This,count) +#define ISectionList_GetSectionData(This,section_number,raw_packet_length,section) (This)->lpVtbl->GetSectionData(This,section_number,raw_packet_length,section) +#define ISectionList_GetProgramIdentifier(This,pid) (This)->lpVtbl->GetProgramIdentifier(This,pid) +#define ISectionList_GetTableIdentifier(This,tid) (This)->lpVtbl->GetTableIdentifier(This,tid) +#else +/*** IUnknown methods ***/ +static inline HRESULT ISectionList_QueryInterface(ISectionList* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG ISectionList_AddRef(ISectionList* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG ISectionList_Release(ISectionList* This) { + return This->lpVtbl->Release(This); +} +/*** ISectionList methods ***/ +static inline HRESULT ISectionList_Initialize(ISectionList* This,MPEG_REQUEST_TYPE request_type,IMpeg2Data *mpeg2_data,PMPEG_CONTEXT context,PID pid,TID tid,PMPEG2_FILTER filter,DWORD timeout,HANDLE done_event) { + return This->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,timeout,done_event); +} +static inline HRESULT ISectionList_InitializeWithRawSections(ISectionList* This,PMPEG_PACKET_LIST mpl_sections) { + return This->lpVtbl->InitializeWithRawSections(This,mpl_sections); +} +static inline HRESULT ISectionList_CancelPendingRequest(ISectionList* This) { + return This->lpVtbl->CancelPendingRequest(This); +} +static inline HRESULT ISectionList_GetNumberOfSections(ISectionList* This,WORD *count) { + return This->lpVtbl->GetNumberOfSections(This,count); +} +static inline HRESULT ISectionList_GetSectionData(ISectionList* This,WORD section_number,DWORD *raw_packet_length,PSECTION *section) { + return This->lpVtbl->GetSectionData(This,section_number,raw_packet_length,section); +} +static inline HRESULT ISectionList_GetProgramIdentifier(ISectionList* This,PID *pid) { + return This->lpVtbl->GetProgramIdentifier(This,pid); +} +static inline HRESULT ISectionList_GetTableIdentifier(ISectionList* This,TID *tid) { + return This->lpVtbl->GetTableIdentifier(This,tid); +} +#endif +#endif + +#endif + + +#endif /* __ISectionList_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * IMpeg2Stream interface + */ +#ifndef __IMpeg2Stream_INTERFACE_DEFINED__ +#define __IMpeg2Stream_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMpeg2Stream, 0x400cc286, 0x32a0, 0x4ce4, 0x90,0x41, 0x39,0x57,0x11,0x25,0xa6,0x35); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("400cc286-32a0-4ce4-9041-39571125a635") +IMpeg2Stream : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE Initialize( + MPEG_REQUEST_TYPE request_type, + IMpeg2Data *mpeg2_data, + PMPEG_CONTEXT context, + PID pid, + TID tid, + PMPEG2_FILTER filter, + HANDLE data_ready_event) = 0; + + virtual HRESULT STDMETHODCALLTYPE SupplyDataBuffer( + PMPEG_STREAM_BUFFER stream_buffer) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMpeg2Stream, 0x400cc286, 0x32a0, 0x4ce4, 0x90,0x41, 0x39,0x57,0x11,0x25,0xa6,0x35) +#endif +#else +typedef struct IMpeg2StreamVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMpeg2Stream *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMpeg2Stream *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMpeg2Stream *This); + + /*** IMpeg2Stream methods ***/ + HRESULT (STDMETHODCALLTYPE *Initialize)( + IMpeg2Stream *This, + MPEG_REQUEST_TYPE request_type, + IMpeg2Data *mpeg2_data, + PMPEG_CONTEXT context, + PID pid, + TID tid, + PMPEG2_FILTER filter, + HANDLE data_ready_event); + + HRESULT (STDMETHODCALLTYPE *SupplyDataBuffer)( + IMpeg2Stream *This, + PMPEG_STREAM_BUFFER stream_buffer); + + END_INTERFACE +} IMpeg2StreamVtbl; + +interface IMpeg2Stream { + CONST_VTBL IMpeg2StreamVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IMpeg2Stream_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IMpeg2Stream_AddRef(This) (This)->lpVtbl->AddRef(This) #define IMpeg2Stream_Release(This) (This)->lpVtbl->Release(This) -#define IMpeg2Stream_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,hDataReadyEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,hDataReadyEvent) -#define IMpeg2Stream_SupplyDataBuffer(This,pStreamBuffer) (This)->lpVtbl->SupplyDataBuffer(This,pStreamBuffer) -#endif /*COBJMACROS*/ +/*** IMpeg2Stream methods ***/ +#define IMpeg2Stream_Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event) (This)->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event) +#define IMpeg2Stream_SupplyDataBuffer(This,stream_buffer) (This)->lpVtbl->SupplyDataBuffer(This,stream_buffer) +#else +/*** IUnknown methods ***/ +static inline HRESULT IMpeg2Stream_QueryInterface(IMpeg2Stream* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG IMpeg2Stream_AddRef(IMpeg2Stream* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG IMpeg2Stream_Release(IMpeg2Stream* This) { + return This->lpVtbl->Release(This); +} +/*** IMpeg2Stream methods ***/ +static inline HRESULT IMpeg2Stream_Initialize(IMpeg2Stream* This,MPEG_REQUEST_TYPE request_type,IMpeg2Data *mpeg2_data,PMPEG_CONTEXT context,PID pid,TID tid,PMPEG2_FILTER filter,HANDLE data_ready_event) { + return This->lpVtbl->Initialize(This,request_type,mpeg2_data,context,pid,tid,filter,data_ready_event); +} +static inline HRESULT IMpeg2Stream_SupplyDataBuffer(IMpeg2Stream* This,PMPEG_STREAM_BUFFER stream_buffer) { + return This->lpVtbl->SupplyDataBuffer(This,stream_buffer); +} +#endif +#endif + +#endif + + +#endif /* __IMpeg2Stream_INTERFACE_DEFINED__ */ + +/***************************************************************************** + * SectionList coclass + */ + +DEFINE_GUID(CLSID_SectionList, 0x73da5d04, 0x4347, 0x45d3, 0xa9,0xdc, 0xfa,0xe9,0xdd,0xbe,0x55,0x8d); + +#ifdef __cplusplus +class DECLSPEC_UUID("73da5d04-4347-45d3-a9dc-fae9ddbe558d") SectionList; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(SectionList, 0x73da5d04, 0x4347, 0x45d3, 0xa9,0xdc, 0xfa,0xe9,0xdd,0xbe,0x55,0x8d) +#endif +#endif + +/***************************************************************************** + * Mpeg2Stream coclass + */ + +DEFINE_GUID(CLSID_Mpeg2Stream, 0xf91d96c7, 0x8509, 0x4d0b, 0xab,0x26, 0xa0,0xdd,0x10,0x90,0x4b,0xb7); + +#ifdef __cplusplus +class DECLSPEC_UUID("f91d96c7-8509-4d0b-ab26-a0dd10904bb7") Mpeg2Stream; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(Mpeg2Stream, 0xf91d96c7, 0x8509, 0x4d0b, 0xab,0x26, 0xa0,0xdd,0x10,0x90,0x4b,0xb7) +#endif +#endif + +/***************************************************************************** + * Mpeg2Data coclass + */ + +DEFINE_GUID(CLSID_Mpeg2Data, 0xc666e115, 0xbb62, 0x4027, 0xa1,0x13, 0x82,0xd6,0x43,0xfe,0x2d,0x99); + +#ifdef __cplusplus +class DECLSPEC_UUID("c666e115-bb62-4027-a113-82d643fe2d99") Mpeg2Data; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(Mpeg2Data, 0xc666e115, 0xbb62, 0x4027, 0xa1,0x13, 0x82,0xd6,0x43,0xfe,0x2d,0x99) +#endif +#endif + +#endif /* __Mpeg2DataLib_LIBRARY_DEFINED__ */ +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif -#endif /*__INC_MPEG2DATA__*/ +#endif /* __mpeg2data_h__ */ diff --git a/lib/libc/include/any-windows-any/mpeg2structs.h b/lib/libc/include/any-windows-any/mpeg2structs.h index 7557b26c49..3eaa7e46c9 100644 --- a/lib/libc/include/any-windows-any/mpeg2structs.h +++ b/lib/libc/include/any-windows-any/mpeg2structs.h @@ -1,222 +1,281 @@ -/** - * 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. - */ +/*** Autogenerated by WIDL 10.4 from include/mpeg2structs.idl - Do not edit ***/ -#include -#include +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include +#include +#endif -#ifndef __INC_MPEG2STRUCTS__ -#define __INC_MPEG2STRUCTS__ +#ifndef COM_NO_WINDOWS_H +#include +#include +#endif -typedef enum _MPEG_CONTEXT_TYPE { - MPEG_CONTEXT_BCS_DEMUX = 0, - MPEG_CONTEXT_WINSOCK -} MPEG_CONTEXT_TYPE; +#ifndef __mpeg2structs_h__ +#define __mpeg2structs_h__ -typedef enum _MPEG_CURRENT_NEXT_BIT { - MPEG_SECTION_IS_NEXT = 0, - MPEG_SECTION_IS_CURRENT = 1 -} MPEG_CURRENT_NEXT_BIT; +/* Forward declarations */ -typedef enum _MPEG_REQUEST_TYPE { - MPEG_RQST_UNKNOWN = 0, - MPEG_RQST_GET_SECTION, - MPEG_RQST_GET_SECTION_ASYNC, - MPEG_RQST_GET_TABLE, - MPEG_RQST_GET_TABLE_ASYNC, - MPEG_RQST_GET_SECTIONS_STREAM, - MPEG_RQST_GET_PES_STREAM, - MPEG_RQST_GET_TS_STREAM, - MPEG_RQST_START_MPE_STREAM -} MPEG_REQUEST_TYPE; +/* Headers for imported files */ -typedef struct _DSMCC_ELEMENT { - PID pid; - BYTE bComponentTag; - DWORD dwCarouselId; - DWORD dwTransactionId; - struct _DSMCC_ELEMENT *pNext; -} DSMCC_ELEMENT, *PDSMCC_ELEMENT; +#include -typedef struct { - WINBOOL fSpecifyProtocol; - BYTE Protocol; - WINBOOL fSpecifyType; - BYTE Type; - WINBOOL fSpecifyMessageId; - WORD MessageId; - WINBOOL fSpecifyTransactionId; - WINBOOL fUseTrxIdMessageIdMask; - DWORD TransactionId; - WINBOOL fSpecifyModuleVersion; - BYTE ModuleVersion; - WINBOOL fSpecifyBlockNumber; - WORD BlockNumber; - WINBOOL fGetModuleCall; - WORD NumberOfBlocksInModule; -} DSMCC_FILTER_OPTIONS; +#ifdef __cplusplus +extern "C" { +#endif -typedef struct _MPEG_HEADER_BITS_MIDL { - WORD Bits; +#pragma pack(push) +#pragma pack(1) +typedef struct __WIDL_mpeg2structs_generated_name_0000000C { + WORD Bits; +} PID_BITS_MIDL; +typedef struct __WIDL_mpeg2structs_generated_name_0000000D { + WORD Bits; } MPEG_HEADER_BITS_MIDL; - -typedef struct _MPEG_HEADER_VERSION_BITS_MIDL { +typedef struct __WIDL_mpeg2structs_generated_name_0000000E { BYTE Bits; } MPEG_HEADER_VERSION_BITS_MIDL; - -typedef struct _DSMCC_SECTION { - TID TableId; - __C89_NAMELESS union { - MPEG_HEADER_BITS_MIDL S; - WORD W; - } Header; - WORD TableIdExtension; - __C89_NAMELESS union { - MPEG_HEADER_VERSION_BITS_MIDL S; - BYTE B; - } Version; - BYTE SectionNumber; - BYTE LastSectionNumber; - BYTE ProtocolDiscriminator; - BYTE DsmccType; - WORD MessageId; - DWORD TransactionId; - BYTE Reserved; - BYTE AdaptationLength; - WORD MessageLength; - BYTE RemainingData[1]; -} DSMCC_SECTION, *PDSMCC_SECTION; - -typedef struct _DVB_EIT_FILTER_OPTIONS { - WINBOOL fSpecifySegment; - BYTE bSegment; -} DVB_EIT_FILTER_OPTIONS, *PDVB_EIT_FILTER_OPTIONS; - -typedef struct { - TID TableId; - __C89_NAMELESS union { - MPEG_HEADER_BITS_MIDL S; - WORD W; - } Header; - WORD TableIdExtension; - __C89_NAMELESS union { - MPEG_HEADER_VERSION_BITS_MIDL S; - BYTE B; - } Version; - BYTE SectionNumber; - BYTE LastSectionNumber; - BYTE RemainingData[1]; -} LONG_SECTION, *PLONG_SECTION; - -typedef struct _MPE_ELEMENT { - PID pid; - BYTE bComponentTag; - struct _MPE_ELEMENT *pNext; -} MPE_ELEMENT, *PMPE_ELEMENT; - -typedef struct _MPEG2_FILTER { - BYTE bVersionNumber; - WORD wFilterSize; - WINBOOL fUseRawFilteringBits; - BYTE Filter[16]; - BYTE Mask[16]; - WINBOOL fSpecifyTableIdExtension; - WORD TableIdExtension; - WINBOOL fSpecifyVersion; - BYTE Version; - WINBOOL fSpecifySectionNumber; - BYTE SectionNumber; - WINBOOL fSpecifyCurrentNext; - WINBOOL fNext; - WINBOOL fSpecifyDsmccOptions; - DSMCC_FILTER_OPTIONS Dsmcc; - WINBOOL fSpecifyAtscOptions; - ATSC_FILTER_OPTIONS Atsc; -} MPEG2_FILTER, *PMPEG2_FILTER; - -typedef struct { - BYTE bVersionNumber; - WORD wFilterSize; - WINBOOL fUseRawFilteringBits; - BYTE Filter[16]; - BYTE Mask[16]; - WINBOOL fSpecifyTableIdExtension; - WORD TableIdExtension; - WINBOOL fSpecifyVersion; - BYTE Version; - WINBOOL fSpecifySectionNumber; - BYTE SectionNumber; - WINBOOL fSpecifyCurrentNext; - WINBOOL fNext; - WINBOOL fSpecifyDsmccOptions; - DSMCC_FILTER_OPTIONS Dsmcc; - WINBOOL fSpecifyAtscOptions; - ATSC_FILTER_OPTIONS Atsc; - WINBOOL fSpecifyDvbEitOptions; - DVB_EIT_FILTER_OPTIONS Dvb_Eit; -} MPEG2_FILTER2, *PMPEG2_FILTER2; - -typedef struct _MPEG_BCS_DEMUX { - DWORD AVMGraphId; -} MPEG_BCS_DEMUX; - -typedef struct _MPEG_WINSOCK { - DWORD AVMGraphId; -} MPEG_WINSOCK; - -typedef struct _MPEG_CONTEXT { - MPEG_CONTEXT_TYPE Type; - __C89_NAMELESS union { - MPEG_BCS_DEMUX Demux; - MPEG_WINSOCK Winsock; - } U; -} MPEG_CONTEXT, *PMPEG_CONTEXT; - -typedef struct _MPEG_DATE { - BYTE Date; - BYTE Month; - WORD Year; -} MPEG_DATE; - -typedef struct _MPEG_TIME { - BYTE Hours; - BYTE Minutes; - BYTE Seconds; +#pragma pack(pop) +typedef WORD PID; +typedef BYTE TID; +typedef WORD TEID; +typedef UINT ClientKey; +typedef enum __WIDL_mpeg2structs_generated_name_0000000F { + MPEG_SECTION_IS_NEXT = 0, + MPEG_SECTION_IS_CURRENT = 1 +} MPEG_CURRENT_NEXT_BIT; +typedef struct __WIDL_mpeg2structs_generated_name_00000010 { + WORD wTidExt; + WORD wCount; +} TID_EXTENSION; +typedef struct __WIDL_mpeg2structs_generated_name_00000010 *PTID_EXTENSION; +typedef struct __WIDL_mpeg2structs_generated_name_00000011 { + TID TableId; + union { + MPEG_HEADER_BITS_MIDL S; + WORD W; + } Header; + BYTE SectionData[1]; +} SECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000011 *PSECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000012 { + TID TableId; + union { + MPEG_HEADER_BITS_MIDL S; + WORD W; + } Header; + TEID TableIdExtension; + union { + MPEG_HEADER_VERSION_BITS_MIDL S; + BYTE B; + } Version; + BYTE SectionNumber; + BYTE LastSectionNumber; + BYTE RemainingData[1]; +} LONG_SECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000012 *PLONG_SECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000013 { + TID TableId; + union { + MPEG_HEADER_BITS_MIDL S; + WORD W; + } Header; + TEID TableIdExtension; + union { + MPEG_HEADER_VERSION_BITS_MIDL S; + BYTE B; + } Version; + BYTE SectionNumber; + BYTE LastSectionNumber; + BYTE ProtocolDiscriminator; + BYTE DsmccType; + WORD MessageId; + DWORD TransactionId; + BYTE Reserved; + BYTE AdaptationLength; + WORD MessageLength; + BYTE RemainingData[1]; +} DSMCC_SECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000013 *PDSMCC_SECTION; +typedef struct __WIDL_mpeg2structs_generated_name_00000014 { + DWORD dwLength; + PSECTION pSection; +} MPEG_RQST_PACKET; +typedef struct __WIDL_mpeg2structs_generated_name_00000014 *PMPEG_RQST_PACKET; +typedef struct __WIDL_mpeg2structs_generated_name_00000015 { + WORD wPacketCount; + PMPEG_RQST_PACKET PacketList[1]; +} MPEG_PACKET_LIST; +typedef struct __WIDL_mpeg2structs_generated_name_00000015 *PMPEG_PACKET_LIST; +typedef struct __WIDL_mpeg2structs_generated_name_00000016 { + WINBOOL fSpecifyProtocol; + BYTE Protocol; + WINBOOL fSpecifyType; + BYTE Type; + WINBOOL fSpecifyMessageId; + WORD MessageId; + WINBOOL fSpecifyTransactionId; + WINBOOL fUseTrxIdMessageIdMask; + DWORD TransactionId; + WINBOOL fSpecifyModuleVersion; + BYTE ModuleVersion; + WINBOOL fSpecifyBlockNumber; + WORD BlockNumber; + WINBOOL fGetModuleCall; + WORD NumberOfBlocksInModule; +} DSMCC_FILTER_OPTIONS; +typedef struct __WIDL_mpeg2structs_generated_name_00000017 { + WINBOOL fSpecifyEtmId; + DWORD EtmId; +} ATSC_FILTER_OPTIONS; +typedef struct __WIDL_mpeg2structs_generated_name_00000018 { + WINBOOL fSpecifySegment; + BYTE bSegment; +} DVB_EIT_FILTER_OPTIONS; +typedef struct __WIDL_mpeg2structs_generated_name_00000019 { + BYTE bVersionNumber; + WORD wFilterSize; + WINBOOL fUseRawFilteringBits; + BYTE Filter[16]; + BYTE Mask[16]; + WINBOOL fSpecifyTableIdExtension; + WORD TableIdExtension; + WINBOOL fSpecifyVersion; + BYTE Version; + WINBOOL fSpecifySectionNumber; + BYTE SectionNumber; + WINBOOL fSpecifyCurrentNext; + WINBOOL fNext; + WINBOOL fSpecifyDsmccOptions; + DSMCC_FILTER_OPTIONS Dsmcc; + WINBOOL fSpecifyAtscOptions; + ATSC_FILTER_OPTIONS Atsc; +} MPEG2_FILTER; +typedef struct __WIDL_mpeg2structs_generated_name_00000019 *PMPEG2_FILTER; +typedef struct __WIDL_mpeg2structs_generated_name_0000001A { + __C89_NAMELESS union { + __C89_NAMELESS struct { + BYTE bVersionNumber; + WORD wFilterSize; + WINBOOL fUseRawFilteringBits; + BYTE Filter[16]; + BYTE Mask[16]; + WINBOOL fSpecifyTableIdExtension; + WORD TableIdExtension; + WINBOOL fSpecifyVersion; + BYTE Version; + WINBOOL fSpecifySectionNumber; + BYTE SectionNumber; + WINBOOL fSpecifyCurrentNext; + WINBOOL fNext; + WINBOOL fSpecifyDsmccOptions; + DSMCC_FILTER_OPTIONS Dsmcc; + WINBOOL fSpecifyAtscOptions; + ATSC_FILTER_OPTIONS Atsc; + } __C89_NAMELESSSTRUCTNAME; + BYTE bVersion1Bytes[124]; + } __C89_NAMELESSUNIONNAME; + WINBOOL fSpecifyDvbEitOptions; + DVB_EIT_FILTER_OPTIONS DvbEit; +} MPEG2_FILTER2; +typedef struct __WIDL_mpeg2structs_generated_name_0000001A *PMPEG2_FILTER2; +#define MPEG2_FILTER_VERSION_1_SIZE 124 +#define MPEG2_FILTER_VERSION_2_SIZE 133 +typedef struct __WIDL_mpeg2structs_generated_name_0000001B { + HRESULT hr; + DWORD dwDataBufferSize; + DWORD dwSizeOfDataRead; + BYTE *pDataBuffer; +} MPEG_STREAM_BUFFER; +typedef struct __WIDL_mpeg2structs_generated_name_0000001B *PMPEG_STREAM_BUFFER; +typedef struct __WIDL_mpeg2structs_generated_name_0000001C { + BYTE Hours; + BYTE Minutes; + BYTE Seconds; } MPEG_TIME; - -typedef struct _MPEG_DATE_AND_TIME { - MPEG_DATE D; - MPEG_TIME T; -} MPEG_DATE_AND_TIME; - typedef MPEG_TIME MPEG_DURATION; +typedef struct __WIDL_mpeg2structs_generated_name_0000001D { + BYTE Date; + BYTE Month; + WORD Year; +} MPEG_DATE; +typedef struct __WIDL_mpeg2structs_generated_name_0000001E { + MPEG_DATE D; + MPEG_TIME T; +} MPEG_DATE_AND_TIME; +typedef enum __WIDL_mpeg2structs_generated_name_0000001F { + MPEG_CONTEXT_BCS_DEMUX = 0, + MPEG_CONTEXT_WINSOCK = 1 +} MPEG_CONTEXT_TYPE; +typedef struct __WIDL_mpeg2structs_generated_name_00000020 { + DWORD AVMGraphId; +} MPEG_BCS_DEMUX; +typedef struct __WIDL_mpeg2structs_generated_name_00000021 { + DWORD AVMGraphId; +} MPEG_WINSOCK; +typedef struct __WIDL_mpeg2structs_generated_name_00000022 { + MPEG_CONTEXT_TYPE Type; + union { + MPEG_BCS_DEMUX Demux; + MPEG_WINSOCK Winsock; + } U; +} MPEG_CONTEXT; +typedef struct __WIDL_mpeg2structs_generated_name_00000022 *PMPEG_CONTEXT; +typedef enum __WIDL_mpeg2structs_generated_name_00000023 { + MPEG_RQST_UNKNOWN = 0, + MPEG_RQST_GET_SECTION = 1, + MPEG_RQST_GET_SECTION_ASYNC = 2, + MPEG_RQST_GET_TABLE = 3, + MPEG_RQST_GET_TABLE_ASYNC = 4, + MPEG_RQST_GET_SECTIONS_STREAM = 5, + MPEG_RQST_GET_PES_STREAM = 6, + MPEG_RQST_GET_TS_STREAM = 7, + MPEG_RQST_START_MPE_STREAM = 8 +} MPEG_REQUEST_TYPE; +typedef struct __WIDL_mpeg2structs_generated_name_00000024 { + MPEG_REQUEST_TYPE Type; + MPEG_CONTEXT Context; + PID Pid; + TID TableId; + MPEG2_FILTER Filter; + DWORD Flags; +} MPEG_SERVICE_REQUEST; +typedef struct __WIDL_mpeg2structs_generated_name_00000024 *PMPEG_SERVICE_REQUEST; +typedef struct __WIDL_mpeg2structs_generated_name_00000025 { + DWORD IPAddress; + WORD Port; +} MPEG_SERVICE_RESPONSE; +typedef struct __WIDL_mpeg2structs_generated_name_00000025 *PMPEG_SERVICE_RESPONSE; +typedef struct _DSMCC_ELEMENT { + PID pid; + BYTE bComponentTag; + DWORD dwCarouselId; + DWORD dwTransactionId; + struct _DSMCC_ELEMENT *pNext; +} DSMCC_ELEMENT; +typedef struct _DSMCC_ELEMENT *PDSMCC_ELEMENT; +typedef struct _MPE_ELEMENT { + PID pid; + BYTE bComponentTag; + struct _MPE_ELEMENT *pNext; +} MPE_ELEMENT; +typedef struct _MPE_ELEMENT *PMPE_ELEMENT; +typedef struct _MPEG_STREAM_FILTER { + WORD wPidValue; + DWORD dwFilterSize; + WINBOOL fCrcEnabled; + BYTE rgchFilter[16]; + BYTE rgchMask[16]; +} MPEG_STREAM_FILTER; +/* Begin additional prototypes for all interfaces */ -typedef struct { - TID TableId; - __C89_NAMELESS union { - MPEG_HEADER_BITS_MIDL S; - WORD W; - } Header; - BYTE SectionData[1]; -} SECTION, *PSECTION; - -typedef struct _MPEG_RQST_PACKET { - DWORD dwLength; - PSECTION pSection; -} MPEG_RQST_PACKET, *PMPEG_RQST_PACKET; -typedef struct _MPEG_PACKET_LIST { - WORD wPacketCount; - PMPEG_RQST_PACKET PacketList[1]; -} MPEG_PACKET_LIST, *PMPEG_PACKET_LIST; +/* End additional prototypes */ -typedef struct _MPEG_STREAM_BUFFER { - HRESULT hr; - DWORD dwDataBufferSize; - DWORD dwSizeOfDataRead; - BYTE *pDataBuffer; -} MPEG_STREAM_BUFFER, *PMPEG_STREAM_BUFFER; +#ifdef __cplusplus +} +#endif -#endif /*__INC_MPEG2STRUCTS__*/ +#endif /* __mpeg2structs_h__ */ diff --git a/lib/libc/include/any-windows-any/mscat.h b/lib/libc/include/any-windows-any/mscat.h index af0201f992..24715dae19 100644 --- a/lib/libc/include/any-windows-any/mscat.h +++ b/lib/libc/include/any-windows-any/mscat.h @@ -66,7 +66,7 @@ extern "C" { #define CRYPTCAT_VERSION_1 0x100 #define CRYPTCAT_VERSION_2 0x200 -#include +#pragma pack(push,8) typedef struct CRYPTCATATTRIBUTE_ { @@ -110,7 +110,7 @@ typedef struct CRYPTCATCDF_ HANDLE hCATStore; } CRYPTCATCDF; -#include +#pragma pack(pop) typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *); diff --git a/lib/libc/include/any-windows-any/mscoree.h b/lib/libc/include/any-windows-any/mscoree.h index 296142f062..05d546ff88 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.0-rc1 from include/mscoree.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 665bdd3cb6..51105b85db 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.0-rc1 from include/msctf.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 07c54f351d..2feed97736 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.0-rc1 from include/mshtmhst.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 eeb895beba..fd933602ec 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.0-rc1 from include/mshtml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b46b0c1cb3..256e06ff85 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.0-rc1 from include/msinkaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 a654270442..f8e01bfa2f 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.0-rc1 from msinkaut.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 cbeeaca3c1..e3d615481f 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.0-rc1 from include/msopc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/msopc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msxml.h b/lib/libc/include/any-windows-any/msxml.h index 089d93f165..bbacd5417c 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.0-rc1 from include/msxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/msxml.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msxml2.h b/lib/libc/include/any-windows-any/msxml2.h index 7ce7bf2d8e..b5a7f78acc 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.0-rc1 from include/msxml2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/msxml2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/msxml6.h b/lib/libc/include/any-windows-any/msxml6.h index 72fdc6e6c3..21b6820d81 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.0-rc1 from include/msxml6.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/msxml6.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/mtsadmin_i.c b/lib/libc/include/any-windows-any/mtsadmin_i.c deleted file mode 100644 index c0160a645a..0000000000 --- a/lib/libc/include/any-windows-any/mtsadmin_i.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - - const IID IID_ICatalog = {0x6eb22870,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IComponentUtil = {0x6eb22873,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IPackageUtil = {0x6eb22874,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IRemoteComponentUtil = {0x6eb22875,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IRoleAssociationUtil = {0x6eb22876,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID LIBID_MTSAdmin = {0x6eb22880,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_Catalog = {0x6eb22881,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_CatalogObject = {0x6eb22882,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_CatalogCollection = {0x6eb22883,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_ComponentUtil = {0x6eb22884,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_PackageUtil = {0x6eb22885,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_RemoteComponentUtil = {0x6eb22886,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_RoleAssociationUtil = {0x6eb22887,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/mtxadmin_i.c b/lib/libc/include/any-windows-any/mtxadmin_i.c deleted file mode 100644 index c0160a645a..0000000000 --- a/lib/libc/include/any-windows-any/mtxadmin_i.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - - const IID IID_ICatalog = {0x6eb22870,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IComponentUtil = {0x6eb22873,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IPackageUtil = {0x6eb22874,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IRemoteComponentUtil = {0x6eb22875,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID IID_IRoleAssociationUtil = {0x6eb22876,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const IID LIBID_MTSAdmin = {0x6eb22880,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_Catalog = {0x6eb22881,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_CatalogObject = {0x6eb22882,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_CatalogCollection = {0x6eb22883,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_ComponentUtil = {0x6eb22884,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_PackageUtil = {0x6eb22885,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_RemoteComponentUtil = {0x6eb22886,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - const CLSID CLSID_RoleAssociationUtil = {0x6eb22887,0x8a19,0x11d0,{0x81,0xb6,0x00,0xa0,0xc9,0x23,0x1c,0x29}}; - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/napcertrelyingparty.h b/lib/libc/include/any-windows-any/napcertrelyingparty.h index 2dd48812d3..3f24f29cbf 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.0-rc1 from include/napcertrelyingparty.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 9c9cef8e4e..a2d05c9ff8 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.0-rc1 from include/napcommon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1c7a57b9c3..11f1383e52 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.0-rc1 from include/napenforcementclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e2d9b4462c..9ec056b45d 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.0-rc1 from include/napmanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d0e3bdf955..507ee2c36b 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.0-rc1 from include/napprotocol.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 63d42d6064..f24e83e99d 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.0-rc1 from include/napservermanagement.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c8ae4b9e9b..1154bed7bb 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.0-rc1 from include/napsystemhealthagent.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7a19423187..43c815ab60 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.0-rc1 from include/napsystemhealthvalidator.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7a26bdbc46..4c1590eb88 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.0-rc1 from include/naptypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0e013f9d82..b0ae4fcb8c 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.0-rc1 from include/netcfgn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 f3fe8324e1..041b417a23 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.0-rc1 from include/netcfgx.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2aac3ac4a6..f6f489873b 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.0-rc1 from include/netfw.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 8b7e783a06..e268472c23 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.0-rc1 from include/netlistmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/netlistmgr.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/nldef.h b/lib/libc/include/any-windows-any/nldef.h index e61f104fd0..ebbaab1c25 100644 --- a/lib/libc/include/any-windows-any/nldef.h +++ b/lib/libc/include/any-windows-any/nldef.h @@ -19,7 +19,7 @@ typedef enum { IpDadStateTentative, IpDadStateDuplicate, IpDadStateDeprecated, - IpDadStatePreferred, + IpDadStatePreferred } NL_DAD_STATE; #define MAKE_ROUTE_PROTOCOL(N, V) MIB_IPPROTO_ ## N = V, PROTO_IP_ ## N = V @@ -98,7 +98,7 @@ typedef enum _NL_ROUTE_ORIGIN { NlroWellKnown, NlroDHCP, NlroRouterAdvertisement, - Nlro6to4, + Nlro6to4 } NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN; typedef enum _NL_NEIGHBOR_STATE { @@ -109,7 +109,7 @@ typedef enum _NL_NEIGHBOR_STATE { NlnsStale, NlnsReachable, NlnsPermanent, - NlnsMaximum, + NlnsMaximum } NL_NEIGHBOR_STATE, *PNL_NEIGHBOR_STATE; typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR { diff --git a/lib/libc/include/any-windows-any/ntddmmc.h b/lib/libc/include/any-windows-any/ntddmmc.h index f98368af13..1d81fab4b6 100644 --- a/lib/libc/include/any-windows-any/ntddmmc.h +++ b/lib/libc/include/any-windows-any/ntddmmc.h @@ -125,7 +125,7 @@ typedef enum _FEATURE_NUMBER { FeatureDvdCPRM = 0x010B, FeatureFirmwareDate = 0x010C, FeatureAACS = 0x010D, - FeatureVCPS = 0x0110, + FeatureVCPS = 0x0110 } FEATURE_NUMBER, *PFEATURE_NUMBER; typedef struct _FEATURE_DATA_PROFILE_LIST_EX { diff --git a/lib/libc/include/any-windows-any/ntddndis.h b/lib/libc/include/any-windows-any/ntddndis.h index d19e885c6c..46760071c5 100644 --- a/lib/libc/include/any-windows-any/ntddndis.h +++ b/lib/libc/include/any-windows-any/ntddndis.h @@ -1181,7 +1181,7 @@ extern "C" { typedef enum _NDIS_802_11_MEDIA_STREAM_MODE { Ndis802_11MediaStreamOff, - Ndis802_11MediaStreamOn, + Ndis802_11MediaStreamOn } NDIS_802_11_MEDIA_STREAM_MODE, *PNDIS_802_11_MEDIA_STREAM_MODE; typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; @@ -2457,7 +2457,7 @@ extern "C" { #if NDIS_SUPPORT_NDIS630 NdisPortTypeNdisImPlatform, #endif - NdisPortTypeMax, + NdisPortTypeMax } NDIS_PORT_TYPE, *PNDIS_PORT_TYPE; typedef enum _NDIS_PORT_AUTHORIZATION_STATE { @@ -2923,7 +2923,7 @@ extern "C" { NdisWakeReasonWlan4WayHandshakeRequest = 0x1003, NdisWakeReasonWwanRegisterState = 0x2000, NdisWakeReasonWwanSMSReceive = 0x2001, - NdisWakeReasonWwanUSSDReceive = 0x2002, + NdisWakeReasonWwanUSSDReceive = 0x2002 } NDIS_PM_WAKE_REASON_TYPE, *PNDIS_PM_WAKE_REASON_TYPE; typedef struct _NDIS_PM_WAKE_REASON { @@ -3445,7 +3445,7 @@ extern "C" { NdisRssProfileNuma, NdisRssProfileNumaStatic, NdisRssProfileConservative, - NdisRssProfileMaximum, + NdisRssProfileMaximum } NDIS_RSS_PROFILE, *PNDIS_RSS_PROFILE; #endif @@ -3977,7 +3977,7 @@ extern "C" { NdisNicSwitchVPortInterruptModerationOff = 2, NdisNicSwitchVPortInterruptModerationLow = 100, NdisNicSwitchVPortInterruptModerationMedium = 200, - NdisNicSwitchVPortInterruptModerationHigh = 300, + NdisNicSwitchVPortInterruptModerationHigh = 300 } NDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION, *PNDIS_NIC_SWITCH_VPORT_INTERRUPT_MODERATION; typedef struct _NDIS_NIC_SWITCH_VPORT_PARAMETERS { diff --git a/lib/libc/include/any-windows-any/ntsecapi.h b/lib/libc/include/any-windows-any/ntsecapi.h index 246194c9c3..c7d74db822 100644 --- a/lib/libc/include/any-windows-any/ntsecapi.h +++ b/lib/libc/include/any-windows-any/ntsecapi.h @@ -2572,7 +2572,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE { } KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE, *PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE; typedef enum _KERB_CERTIFICATE_INFO_TYPE { - CertHashInfo = 1, + CertHashInfo = 1 } KERB_CERTIFICATE_INFO_TYPE, *PKERB_CERTIFICATE_INFO_TYPE; typedef struct _KERB_CERTIFICATE_HASHINFO { @@ -2827,7 +2827,7 @@ typedef enum _SE_ADT_PARAMETER_TYPE { } PKU2U_CREDUI_CONTEXT, *PPKU2U_CREDUI_CONTEXT; typedef enum _PKU2U_LOGON_SUBMIT_TYPE { - Pku2uCertificateS4ULogon = 14, + Pku2uCertificateS4ULogon = 14 } PKU2U_LOGON_SUBMIT_TYPE, *PPKU2U_LOGON_SUBMIT_TYPE; typedef struct _PKU2U_CERTIFICATE_S4U_LOGON { diff --git a/lib/libc/include/any-windows-any/oaidl.h b/lib/libc/include/any-windows-any/oaidl.h index 28f4f39955..345b2db139 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.0-rc1 from include/oaidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 a03a8dc462..9dad738adb 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.0-rc1 from include/objectarray.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 85dc6e8276..693baa4fc7 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.0-rc1 from include/objidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 3ea0c25a25..332c06c930 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.0-rc1 from include/objidlbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2ea4659310..d428aa5ef4 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.0-rc1 from include/ocidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/ocidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/odbcinst.h b/lib/libc/include/any-windows-any/odbcinst.h index d2e2589b55..4d8a33b1e5 100644 --- a/lib/libc/include/any-windows-any/odbcinst.h +++ b/lib/libc/include/any-windows-any/odbcinst.h @@ -13,7 +13,7 @@ extern "C" { #endif #ifndef ODBCVER -#define ODBCVER 0x0351 +#define ODBCVER 0x0380 #endif #define ODBC_ADD_DSN 1 diff --git a/lib/libc/include/any-windows-any/oleacc.h b/lib/libc/include/any-windows-any/oleacc.h index c5474849ee..83d74297ae 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.0-rc1 from include/oleacc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 df821e6d8c..2f37fb2022 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.0-rc1 from include/oleidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 8c8c3a076e..5b038fe5b3 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.0-rc1 from include/optary.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/optary.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/p2p.h b/lib/libc/include/any-windows-any/p2p.h index 1c803f9021..46a0f18702 100644 --- a/lib/libc/include/any-windows-any/p2p.h +++ b/lib/libc/include/any-windows-any/p2p.h @@ -34,23 +34,23 @@ extern "C" { PEER_RECORD_ADDED = 1, PEER_RECORD_UPDATED = 2, PEER_RECORD_DELETED = 3, - PEER_RECORD_EXPIRED = 4, + PEER_RECORD_EXPIRED = 4 } PEER_RECORD_CHANGE_TYPE; typedef enum peer_connection_status_tag { PEER_CONNECTED = 1, PEER_DISCONNECTED = 2, - PEER_CONNECTION_FAILED = 3, + PEER_CONNECTION_FAILED = 3 } PEER_CONNECTION_STATUS; typedef enum peer_connection_flags_tag { PEER_CONNECTION_NEIGHBOR = 0x0001, - PEER_CONNECTION_DIRECT = 0x0002, + PEER_CONNECTION_DIRECT = 0x0002 } PEER_CONNECTION_FLAGS; typedef enum peer_record_flags_tag { PEER_RECORD_FLAG_AUTOREFRESH = 0x0001, - PEER_RECORD_FLAG_DELETED = 0x0002, + PEER_RECORD_FLAG_DELETED = 0x0002 } PEER_RECORD_FLAGS; typedef @@ -155,24 +155,24 @@ extern "C" { PEER_GRAPH_EVENT_INCOMING_DATA = 6, PEER_GRAPH_EVENT_CONNECTION_REQUIRED = 7, PEER_GRAPH_EVENT_NODE_CHANGED = 8, - PEER_GRAPH_EVENT_SYNCHRONIZED = 9, + PEER_GRAPH_EVENT_SYNCHRONIZED = 9 } PEER_GRAPH_EVENT_TYPE; typedef enum peer_node_change_type_tag { PEER_NODE_CHANGE_CONNECTED = 1, PEER_NODE_CHANGE_DISCONNECTED = 2, - PEER_NODE_CHANGE_UPDATED = 3, + PEER_NODE_CHANGE_UPDATED = 3 } PEER_NODE_CHANGE_TYPE; typedef enum peer_graph_status_flags_tag { PEER_GRAPH_STATUS_LISTENING = 0x0001, PEER_GRAPH_STATUS_HAS_CONNECTIONS = 0x0002, - PEER_GRAPH_STATUS_SYNCHRONIZED = 0x0004, + PEER_GRAPH_STATUS_SYNCHRONIZED = 0x0004 } PEER_GRAPH_STATUS_FLAGS; typedef enum peer_graph_property_flags_tag { PEER_GRAPH_PROPERTY_HEARTBEATS = 0x0001, - PEER_GRAPH_PROPERTY_DEFER_EXPIRATION = 0x0002, + PEER_GRAPH_PROPERTY_DEFER_EXPIRATION = 0x0002 } PEER_GRAPH_PROPERTY_FLAGS; typedef enum peer_graph_scope_tag { @@ -317,24 +317,24 @@ extern "C" { typedef enum peer_group_status_tag { PEER_GROUP_STATUS_LISTENING = 0x0001, - PEER_GROUP_STATUS_HAS_CONNECTIONS = 0x0002, + PEER_GROUP_STATUS_HAS_CONNECTIONS = 0x0002 } PEER_GROUP_STATUS; typedef enum peer_group_property_flags_tag { PEER_MEMBER_DATA_OPTIONAL = 0x0001, PEER_DISABLE_PRESENCE = 0x0002, - PEER_DEFER_EXPIRATION = 0x0004, + PEER_DEFER_EXPIRATION = 0x0004 } PEER_GROUP_PROPERTY_FLAGS; #if NTDDI_VERSION >= 0x06000000 typedef enum peer_group_authentication_scheme_tag { PEER_GROUP_GMC_AUTHENTICATION = 0x00000001, - PEER_GROUP_PASSWORD_AUTHENTICATION = 0x00000002, + PEER_GROUP_PASSWORD_AUTHENTICATION = 0x00000002 } PEER_GROUP_AUTHENTICATION_SCHEME; #endif typedef enum peer_member_flags_tag { - PEER_MEMBER_PRESENT = 0x0001, + PEER_MEMBER_PRESENT = 0x0001 } PEER_MEMBER_FLAGS; typedef enum peer_member_change_type_tag { @@ -342,11 +342,11 @@ extern "C" { PEER_MEMBER_DISCONNECTED = 2, PEER_MEMBER_UPDATED = 3, PEER_MEMBER_JOINED = 4, - PEER_MEMBER_LEFT = 5, + PEER_MEMBER_LEFT = 5 } PEER_MEMBER_CHANGE_TYPE; typedef enum peer_issue_credential_flags_tag { - PEER_GROUP_STORE_CREDENTIALS = 0x0001, + PEER_GROUP_STORE_CREDENTIALS = 0x0001 } PEER_GROUP_ISSUE_CREDENTIAL_FLAGS; #ifndef __WIDL__ diff --git a/lib/libc/include/any-windows-any/pnrpdef.h b/lib/libc/include/any-windows-any/pnrpdef.h index e5b221e107..a1aff18928 100644 --- a/lib/libc/include/any-windows-any/pnrpdef.h +++ b/lib/libc/include/any-windows-any/pnrpdef.h @@ -74,7 +74,7 @@ typedef struct _PNRP_CLOUD_ID { typedef enum _PNRP_EXTENDED_PAYLOAD_TYPE { PNRP_EXTENDED_PAYLOAD_TYPE_NONE = 0, PNRP_EXTENDED_PAYLOAD_TYPE_BINARY, - PNRP_EXTENDED_PAYLOAD_TYPE_STRING, + PNRP_EXTENDED_PAYLOAD_TYPE_STRING } PNRP_EXTENDED_PAYLOAD_TYPE,*PPNRP_EXTENDED_PAYLOAD_TYPE; #endif diff --git a/lib/libc/include/any-windows-any/portabledeviceapi.h b/lib/libc/include/any-windows-any/portabledeviceapi.h index cd88501c3b..4ca9da7ca7 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.0-rc1 from include/portabledeviceapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 36829fac5f..37bbde4e98 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.0-rc1 from include/portabledevicetypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 14a2094f67..dc494e6338 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.0-rc1 from include/proofofpossessioncookieinfo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 786d0bf3fc..82ccb7ac16 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.0-rc1 from include/propidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 737e608c07..46b0601598 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.0-rc1 from include/propsys.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/propsys.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/pthread.h b/lib/libc/include/any-windows-any/pthread.h index bc9735924e..3ab5db741b 100644 --- a/lib/libc/include/any-windows-any/pthread.h +++ b/lib/libc/include/any-windows-any/pthread.h @@ -86,8 +86,6 @@ extern "C" { /* MSB 8-bit major version, 8-bit minor version, 16-bit patch level. */ #define __WINPTHREADS_VERSION 0x00050000 -/* #define WINPTHREAD_DBG 1 */ - /* Compatibility stuff: */ #define RWLS_PER_THREAD 8 @@ -141,7 +139,16 @@ extern "C" { #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE WINPTHREAD_API void * pthread_timechange_handler_np(void * dummy); -WINPTHREAD_API int pthread_delay_np (const struct timespec *interval); +WINPTHREAD_API int pthread_delay32_np (const struct _timespec32 *interval); +WINPTHREAD_API int pthread_delay64_np (const struct _timespec64 *interval); +WINPTHREAD_THREAD_DECL int pthread_delay_np (const struct timespec *interval) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_delay32_np ((const struct _timespec32 *) interval); +#else + return pthread_delay64_np ((const struct _timespec64 *) interval); +#endif +} WINPTHREAD_API int pthread_num_processors_np(void); WINPTHREAD_API int pthread_set_num_processors_np(int n); @@ -158,7 +165,7 @@ WINPTHREAD_API int pthread_set_num_processors_np(int n); #define pthread_mutex_setprioceiling(M, P) ENOTSUP #define pthread_getcpuclockid(T, C) ENOTSUP #define pthread_attr_getguardsize(A, S) ENOTSUP -#define pthread_attr_setgaurdsize(A, S) ENOTSUP +#define pthread_attr_setguardsize(A, S) ENOTSUP typedef long pthread_once_t; typedef unsigned pthread_mutexattr_t; @@ -166,16 +173,6 @@ typedef unsigned pthread_key_t; typedef void *pthread_barrierattr_t; typedef int pthread_condattr_t; typedef int pthread_rwlockattr_t; - -/* -struct _pthread_v; - -typedef struct pthread_t { - struct _pthread_v *p; - int x; -} pthread_t; -*/ - typedef uintptr_t pthread_t; typedef struct _pthread_cleanup _pthread_cleanup; @@ -281,12 +278,29 @@ WINPTHREAD_API int pthread_detach(pthread_t t); WINPTHREAD_API int pthread_setname_np(pthread_t thread, const char *name); WINPTHREAD_API int pthread_getname_np(pthread_t thread, char *name, size_t len); - WINPTHREAD_API int pthread_rwlock_init(pthread_rwlock_t *rwlock_, const pthread_rwlockattr_t *attr); WINPTHREAD_API int pthread_rwlock_wrlock(pthread_rwlock_t *l); -WINPTHREAD_API int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *ts); +WINPTHREAD_API int pthread_rwlock_timedwrlock32(pthread_rwlock_t *rwlock, const struct _timespec32 *ts); +WINPTHREAD_API int pthread_rwlock_timedwrlock64(pthread_rwlock_t *rwlock, const struct _timespec64 *ts); +WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock, const struct timespec *ts) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_rwlock_timedwrlock32 (rwlock, (const struct _timespec32 *) ts); +#else + return pthread_rwlock_timedwrlock64 (rwlock, (const struct _timespec64 *) ts); +#endif +} WINPTHREAD_API int pthread_rwlock_rdlock(pthread_rwlock_t *l); -WINPTHREAD_API int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts); +WINPTHREAD_API int pthread_rwlock_timedrdlock32(pthread_rwlock_t *l, const struct _timespec32 *ts); +WINPTHREAD_API int pthread_rwlock_timedrdlock64(pthread_rwlock_t *l, const struct _timespec64 *ts); +WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_rwlock_timedrdlock32 (l, (const struct _timespec32 *) ts); +#else + return pthread_rwlock_timedrdlock64 (l, (const struct _timespec64 *) ts); +#endif +} WINPTHREAD_API int pthread_rwlock_unlock(pthread_rwlock_t *l); WINPTHREAD_API int pthread_rwlock_tryrdlock(pthread_rwlock_t *l); WINPTHREAD_API int pthread_rwlock_trywrlock(pthread_rwlock_t *l); @@ -297,11 +311,38 @@ WINPTHREAD_API int pthread_cond_destroy(pthread_cond_t *cv); WINPTHREAD_API int pthread_cond_signal (pthread_cond_t *cv); WINPTHREAD_API int pthread_cond_broadcast (pthread_cond_t *cv); WINPTHREAD_API int pthread_cond_wait (pthread_cond_t *cv, pthread_mutex_t *external_mutex); -WINPTHREAD_API int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t); -WINPTHREAD_API int pthread_cond_timedwait_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t); +WINPTHREAD_API int pthread_cond_timedwait32(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec32 *t); +WINPTHREAD_API int pthread_cond_timedwait64(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec64 *t); +WINPTHREAD_COND_DECL int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_cond_timedwait32 (cv, external_mutex, (const struct _timespec32 *) t); +#else + return pthread_cond_timedwait64 (cv, external_mutex, (const struct _timespec64 *) t); +#endif +} +WINPTHREAD_API int pthread_cond_timedwait32_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec32 *t); +WINPTHREAD_API int pthread_cond_timedwait64_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct _timespec64 *t); +WINPTHREAD_COND_DECL int pthread_cond_timedwait_relative_np(pthread_cond_t *cv, pthread_mutex_t *external_mutex, const struct timespec *t) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_cond_timedwait32_relative_np (cv, external_mutex, (const struct _timespec32 *) t); +#else + return pthread_cond_timedwait64_relative_np (cv, external_mutex, (const struct _timespec64 *) t); +#endif +} WINPTHREAD_API int pthread_mutex_lock(pthread_mutex_t *m); -WINPTHREAD_API int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts); +WINPTHREAD_API int pthread_mutex_timedlock32(pthread_mutex_t *m, const struct _timespec32 *ts); +WINPTHREAD_API int pthread_mutex_timedlock64(pthread_mutex_t *m, const struct _timespec64 *ts); +WINPTHREAD_MUTEX_DECL int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *ts) +{ +#if WINPTHREADS_TIME_BITS == 32 + return pthread_mutex_timedlock32 (m, (const struct _timespec32 *) ts); +#else + return pthread_mutex_timedlock64 (m, (const struct _timespec64 *) ts); +#endif +} WINPTHREAD_API int pthread_mutex_unlock(pthread_mutex_t *m); WINPTHREAD_API int pthread_mutex_trylock(pthread_mutex_t *m); WINPTHREAD_API int pthread_mutex_init(pthread_mutex_t *m, const pthread_mutexattr_t *a); @@ -355,7 +396,6 @@ WINPTHREAD_API int pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t *clock_id); WINPTHREAD_API int pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clock_id); -WINPTHREAD_API int __pthread_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp); WINPTHREAD_API int pthread_barrierattr_init(void **attr); WINPTHREAD_API int pthread_barrierattr_destroy(void **attr); @@ -367,9 +407,6 @@ WINPTHREAD_API struct _pthread_cleanup ** pthread_getclean (void); WINPTHREAD_API void * pthread_gethandle (pthread_t t); WINPTHREAD_API void * pthread_getevent (void); -WINPTHREAD_API unsigned long long _pthread_rel_time_in_ms(const struct timespec *ts); -WINPTHREAD_API unsigned long long _pthread_time_in_ms(void); -WINPTHREAD_API unsigned long long _pthread_time_in_ms_from_timespec(const struct timespec *ts); WINPTHREAD_API int _pthread_tryjoin (pthread_t t, void **res); WINPTHREAD_API int pthread_rwlockattr_destroy(pthread_rwlockattr_t *a); WINPTHREAD_API int pthread_rwlockattr_getpshared(pthread_rwlockattr_t *a, int *s); diff --git a/lib/libc/include/any-windows-any/pthread_compat.h b/lib/libc/include/any-windows-any/pthread_compat.h index 96118722d5..3a8552882e 100644 --- a/lib/libc/include/any-windows-any/pthread_compat.h +++ b/lib/libc/include/any-windows-any/pthread_compat.h @@ -60,6 +60,12 @@ #ifndef WIN_PTHREADS_PTHREAD_COMPAT_H #define WIN_PTHREADS_PTHREAD_COMPAT_H +#if defined(_USE_32BIT_TIME_T) || (defined(_TIME_BITS) && _TIME_BITS == 32) +#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 */ @@ -97,7 +103,8 @@ typedef unsigned short mode_t; #ifdef __GNUC__ -#define WINPTHREADS_INLINE inline +#define WINPTHREADS_INLINE __inline__ +#define WINPTHREADS_ALWAYS_INLINE __inline__ __attribute__((__always_inline__)) #define WINPTHREADS_ATTRIBUTE(X) __attribute__(X) #define WINPTHREADS_SECTION(X) __section__(X) @@ -110,9 +117,32 @@ typedef int pid_t; #endif #define WINPTHREADS_INLINE __inline +#define WINPTHREADS_ALWAYS_INLINE __inline __forceinline #define WINPTHREADS_ATTRIBUTE(X) __declspec X #define WINPTHREADS_SECTION(X) allocate(X) #endif +#ifndef WINPTHREAD_CLOCK_DECL +#define WINPTHREAD_CLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_COND_DECL +#define WINPTHREAD_COND_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_MUTEX_DECL +#define WINPTHREAD_MUTEX_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_NANOSLEEP_DECL +#define WINPTHREAD_NANOSLEEP_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_RWLOCK_DECL +#define WINPTHREAD_RWLOCK_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_SEM_DECL +#define WINPTHREAD_SEM_DECL static WINPTHREADS_ALWAYS_INLINE +#endif +#ifndef WINPTHREAD_THREAD_DECL +#define WINPTHREAD_THREAD_DECL static WINPTHREADS_ALWAYS_INLINE +#endif + #endif diff --git a/lib/libc/include/any-windows-any/pthread_time.h b/lib/libc/include/any-windows-any/pthread_time.h index 363154d678..27f7566f0f 100644 --- a/lib/libc/include/any-windows-any/pthread_time.h +++ b/lib/libc/include/any-windows-any/pthread_time.h @@ -23,6 +23,7 @@ #ifndef WIN_PTHREADS_TIME_H #define WIN_PTHREADS_TIME_H +#include #include "pthread_compat.h" /* Posix timers are supported */ @@ -73,12 +74,60 @@ extern "C" { #endif -WINPTHREAD_API int __cdecl nanosleep(const struct timespec *request, struct timespec *remain); +WINPTHREAD_API int __cdecl nanosleep32(const struct _timespec32 *request, struct _timespec32 *remain); +WINPTHREAD_API int __cdecl nanosleep64(const struct _timespec64 *request, struct _timespec64 *remain); +WINPTHREAD_NANOSLEEP_DECL int __cdecl nanosleep(const struct timespec *request, struct timespec *remain) +{ +#if WINPTHREADS_TIME_BITS == 32 + return nanosleep32 ((struct _timespec32 *)request, (struct _timespec32 *)remain); +#else + return nanosleep64 ((struct _timespec64 *)request, (struct _timespec64 *)remain); +#endif +} -WINPTHREAD_API int __cdecl clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *request, struct timespec *remain); -WINPTHREAD_API int __cdecl clock_getres(clockid_t clock_id, struct timespec *res); -WINPTHREAD_API int __cdecl clock_gettime(clockid_t clock_id, struct timespec *tp); -WINPTHREAD_API int __cdecl clock_settime(clockid_t clock_id, const struct timespec *tp); +WINPTHREAD_API int __cdecl clock_nanosleep32(clockid_t clock_id, int flags, const struct _timespec32 *request, struct _timespec32 *remain); +WINPTHREAD_API int __cdecl clock_nanosleep64(clockid_t clock_id, int flags, const struct _timespec64 *request, struct _timespec64 *remain); +WINPTHREAD_CLOCK_DECL int __cdecl clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *request, struct timespec *remain) +{ +#if WINPTHREADS_TIME_BITS == 32 + return clock_nanosleep32 (clock_id, flags, (struct _timespec32 *)request, (struct _timespec32 *)remain); +#else + return clock_nanosleep64 (clock_id, flags, (struct _timespec64 *)request, (struct _timespec64 *)remain); +#endif +} + +WINPTHREAD_API int __cdecl clock_getres32(clockid_t clock_id, struct _timespec32 *res); +WINPTHREAD_API int __cdecl clock_getres64(clockid_t clock_id, struct _timespec64 *res); +WINPTHREAD_CLOCK_DECL int __cdecl clock_getres(clockid_t clock_id, struct timespec *res) +{ +#if WINPTHREADS_TIME_BITS == 32 + return clock_getres32 (clock_id, (struct _timespec32 *)res); +#else + return clock_getres64 (clock_id, (struct _timespec64 *)res); +#endif +} + +WINPTHREAD_API int __cdecl clock_gettime32(clockid_t clock_id, struct _timespec32 *tp); +WINPTHREAD_API int __cdecl clock_gettime64(clockid_t clock_id, struct _timespec64 *tp); +WINPTHREAD_CLOCK_DECL int __cdecl clock_gettime(clockid_t clock_id, struct timespec *tp) +{ +#if WINPTHREADS_TIME_BITS == 32 + return clock_gettime32 (clock_id, (struct _timespec32 *)tp); +#else + return clock_gettime64 (clock_id, (struct _timespec64 *)tp); +#endif +} + +WINPTHREAD_API int __cdecl clock_settime32(clockid_t clock_id, const struct _timespec32 *tp); +WINPTHREAD_API int __cdecl clock_settime64(clockid_t clock_id, const struct _timespec64 *tp); +WINPTHREAD_CLOCK_DECL int __cdecl clock_settime(clockid_t clock_id, const struct timespec *tp) +{ +#if WINPTHREADS_TIME_BITS == 32 + return clock_settime32 (clock_id, (struct _timespec32 *)tp); +#else + return clock_settime64 (clock_id, (struct _timespec64 *)tp); +#endif +} #ifdef __cplusplus } diff --git a/lib/libc/include/any-windows-any/qedit.h b/lib/libc/include/any-windows-any/qedit.h index 8e9781a3c7..bec47289ae 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.0-rc1 from include/qedit.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 66f7510527..315d9e1e67 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.0-rc1 from include/qnetwork.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/qnetwork.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/rasshost.h b/lib/libc/include/any-windows-any/rasshost.h index ea88a7b9ac..3cd3c3c455 100644 --- a/lib/libc/include/any-windows-any/rasshost.h +++ b/lib/libc/include/any-windows-any/rasshost.h @@ -5,8 +5,8 @@ #ifndef _RASSHOST_ #define _RASSHOST_ -#include - +#include + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) #include diff --git a/lib/libc/include/any-windows-any/rdpencomapi.h b/lib/libc/include/any-windows-any/rdpencomapi.h index 21d9a40540..c7557e5e70 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.0-rc1 from include/rdpencomapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 264337d55f..88a28fcca6 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.0-rc1 from include/regbag.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 cfe965fc8f..07ab6fcd63 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.0-rc1 from include/relogger.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 517a2d5ac0..c401477681 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.0-rc1 from include/robuffer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1ee55df51e..6cb0d6bb55 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.0-rc1 from include/rtworkq.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/rtworkq.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sapi51.h b/lib/libc/include/any-windows-any/sapi51.h index 868433f96b..8678420efc 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.0-rc1 from include/sapi51.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 000e18fe90..897f937435 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.0-rc1 from include/sapi53.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 31fdff3164..9addb7331b 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.0-rc1 from include/sapi54.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/sapi54.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/scardssp_i.c b/lib/libc/include/any-windows-any/scardssp_i.c deleted file mode 100644 index b23c29f920..0000000000 --- a/lib/libc/include/any-windows-any/scardssp_i.c +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C"{ -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - - MIDL_DEFINE_GUID(IID,IID_IByteBuffer,0xE126F8FE,0xA7AF,0x11D0,0xB8,0x8A,0x00,0xC0,0x4F,0xD4,0x24,0xB9); - MIDL_DEFINE_GUID(IID,IID_ISCardTypeConv,0x53B6AA63,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,IID_ISCardCmd,0xD5778AE3,0x43DE,0x11D0,0x91,0x71,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,IID_ISCardISO7816,0x53B6AA68,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,IID_ISCard,0x1461AAC3,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,IID_ISCardDatabase,0x1461AAC8,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,IID_ISCardLocate,0x1461AACD,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(IID,LIBID_SCARDSSPLib,0x82C38704,0x19F1,0x11D3,0xA1,0x1F,0x00,0xC0,0x4F,0x79,0xF8,0x00); - MIDL_DEFINE_GUID(CLSID,CLSID_CByteBuffer,0xE126F8FF,0xA7AF,0x11D0,0xB8,0x8A,0x00,0xC0,0x4F,0xD4,0x24,0xB9); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCardTypeConv,0x53B6AA67,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCardCmd,0xD5778AE7,0x43DE,0x11D0,0x91,0x71,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCardISO7816,0x53B6AA6C,0x3F56,0x11D0,0x91,0x6B,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCard,0x1461AAC7,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCardDatabase,0x1461AACC,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - MIDL_DEFINE_GUID(CLSID,CLSID_CSCardLocate,0x1461AAD1,0x6810,0x11D0,0x91,0x8F,0x00,0xAA,0x00,0xC1,0x80,0x68); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/scardssp_p.c b/lib/libc/include/any-windows-any/scardssp_p.c deleted file mode 100644 index b317790572..0000000000 --- a/lib/libc/include/any-windows-any/scardssp_p.c +++ /dev/null @@ -1,285 +0,0 @@ -/** - * 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. - */ -#define USE_STUBLESS_PROXY - -#ifndef __REDQ_RPCPROXY_H_VERSION__ -#define __REQUIRED_RPCPROXY_H_VERSION__ 475 -#endif - -#include "rpcproxy.h" -#ifndef __RPCPROXY_H_VERSION__ -#error This stub requires an updated version of -#endif - -#include "scardssp.h" - -#define TYPE_FORMAT_STRING_SIZE 1313 -#define PROC_FORMAT_STRING_SIZE 3859 -#define TRANSMIT_AS_TABLE_SIZE 0 -#define WIRE_MARSHAL_TABLE_SIZE 3 - -typedef struct _MIDL_TYPE_FORMAT_STRING { - short Pad; - unsigned char Format[TYPE_FORMAT_STRING_SIZE]; -} MIDL_TYPE_FORMAT_STRING; - -typedef struct _MIDL_PROC_FORMAT_STRING { - short Pad; - unsigned char Format[PROC_FORMAT_STRING_SIZE]; -} MIDL_PROC_FORMAT_STRING; - -extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString; -extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO IByteBuffer_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short IByteBuffer_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,0,36,72,108,144,198,240,288,336,366,414,450,492,540 -}; - -static const MIDL_SERVER_INFO IByteBuffer_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&IByteBuffer_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO IByteBuffer_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&IByteBuffer_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(21) _IByteBufferProxyVtbl = { - &IByteBuffer_ProxyInfo,&IID_IByteBuffer,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION IByteBuffer_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _IByteBufferStubVtbl = { - &IID_IByteBuffer,&IByteBuffer_ServerInfo,21,&IByteBuffer_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_SERVER_INFO ISCardTypeConv_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCardTypeConv_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,588,636,678,720,762,804,846,888,930,972 -}; - -static const MIDL_SERVER_INFO ISCardTypeConv_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardTypeConv_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCardTypeConv_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardTypeConv_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(17) _ISCardTypeConvProxyVtbl = { - &ISCardTypeConv_ProxyInfo,&IID_ISCardTypeConv,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCardTypeConv_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardTypeConvStubVtbl = { - &IID_ISCardTypeConv,&ISCardTypeConv_ServerInfo,17,&ISCardTypeConv_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO ISCardCmd_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCardCmd_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,1014,1050,1086,1122,1158,1194,1230,1266,1302,1338,1374,1410,1446,1482,1518,1554,1590,1626,1662,1698,1734,1770,1806,1842,1878,1914,1950,1986,2022,2088,2118,2160,2196 -}; - -static const MIDL_SERVER_INFO ISCardCmd_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardCmd_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCardCmd_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardCmd_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(40) _ISCardCmdProxyVtbl = { - &ISCardCmd_ProxyInfo,&IID_ISCardCmd,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCardCmd_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardCmdStubVtbl = { - &IID_ISCardCmd,&ISCardCmd_ServerInfo,40,&ISCardCmd_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO ISCardISO7816_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCardISO7816_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,2232,2280,2334,2388,2430,2484,2538,2598,2646,2700,2754,2808,1446,2868,2922,2976,3024,3078 -}; - -static const MIDL_SERVER_INFO ISCardISO7816_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardISO7816_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCardISO7816_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardISO7816_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(25) _ISCardISO7816ProxyVtbl = { - &ISCardISO7816_ProxyInfo,&IID_ISCardISO7816,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCardISO7816_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardISO7816StubVtbl = { - &IID_ISCardISO7816,&ISCardISO7816_ServerInfo,25,&ISCardISO7816_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO ISCard_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCard_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,1014,3132,1086,3168,3204,3240,3276,3324,336,3360,3402,3438 -}; - -static const MIDL_SERVER_INFO ISCard_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCard_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCard_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCard_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(19) _ISCardProxyVtbl = { - &ISCard_ProxyInfo,&IID_ISCard,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCard_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardStubVtbl = { - &IID_ISCard,&ISCard_ServerInfo,19,&ISCard_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO ISCardDatabase_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCardDatabase_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,3474,3516,3558,3612,3654 -}; - -static const MIDL_SERVER_INFO ISCardDatabase_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardDatabase_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCardDatabase_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardDatabase_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(12) _ISCardDatabaseProxyVtbl = { - &ISCardDatabase_ProxyInfo,&IID_ISCardDatabase,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCardDatabase_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardDatabaseStubVtbl = { - &IID_ISCardDatabase,&ISCardDatabase_ServerInfo,12,&ISCardDatabase_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const MIDL_STUB_DESC Object_StubDesc; -static const MIDL_SERVER_INFO ISCardLocate_ServerInfo; - -#pragma code_seg(".orpc") -static const unsigned short ISCardLocate_FormatStringOffsetTable[] = { - (unsigned short) -1,(unsigned short) -1,(unsigned short) -1,(unsigned short) -1,3696,3750,3804 -}; - -static const MIDL_SERVER_INFO ISCardLocate_ServerInfo = { - &Object_StubDesc,0,__MIDL_ProcFormatString.Format,&ISCardLocate_FormatStringOffsetTable[-3],0,0,0,0 -}; - -static const MIDL_STUBLESS_PROXY_INFO ISCardLocate_ProxyInfo = { - &Object_StubDesc,__MIDL_ProcFormatString.Format,&ISCardLocate_FormatStringOffsetTable[-3],0,0,0 -}; - -CINTERFACE_PROXY_VTABLE(10) _ISCardLocateProxyVtbl = { - &ISCardLocate_ProxyInfo,&IID_ISCardLocate,IUnknown_QueryInterface_Proxy,IUnknown_AddRef_Proxy,IUnknown_Release_Proxy ,0 ,0 ,0 ,0 ,(void *)-1 ,(void *)-1 ,(void *)-1 -}; - -static const PRPC_STUB_FUNCTION ISCardLocate_table[] = { - STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,STUB_FORWARDING_FUNCTION,NdrStubCall2,NdrStubCall2,NdrStubCall2 -}; - -CInterfaceStubVtbl _ISCardLocateStubVtbl = { - &IID_ISCardLocate,&ISCardLocate_ServerInfo,10,&ISCardLocate_table[-3],CStdStubBuffer_DELEGATING_METHODS -}; - -static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[WIRE_MARSHAL_TABLE_SIZE]; - -static const MIDL_STUB_DESC Object_StubDesc = { - 0,NdrOleAllocate,NdrOleFree,0,0,0,0,0,__MIDL_TypeFormatString.Format,1,0x50002,0,0x5030117,0,UserMarshalRoutines,0,0x1,0,0,0 -}; - -#pragma data_seg(".rdata") -static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[WIRE_MARSHAL_TABLE_SIZE] = { - { HGLOBAL_UserSize,HGLOBAL_UserMarshal,HGLOBAL_UserUnmarshal,HGLOBAL_UserFree }, - { LPSAFEARRAY_UserSize,LPSAFEARRAY_UserMarshal,LPSAFEARRAY_UserUnmarshal,LPSAFEARRAY_UserFree}, - { BSTR_UserSize,BSTR_UserMarshal,BSTR_UserUnmarshal,BSTR_UserFree } -}; - -#if !defined(__RPC_WIN32__) -#error Invalid build platform for this stub. -#endif - -const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString = { - 0,{ 0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x2),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x18),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0x18),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x18),NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x10),NdrFcShort(0xd),NdrFcShort(0x8),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x148),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x8),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x14),NdrFcShort(0x15),NdrFcShort(0x15),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x158),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x8),0x44,0x1,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x70),NdrFcShort(0x4),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x10),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0x10),NdrFcShort(0x24),NdrFcShort(0x24),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x11a),NdrFcShort(0x4),NdrFcShort(0x3a),NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x13),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0x8),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0x14),NdrFcShort(0x15),NdrFcShort(0x15),0x44,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x158),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x158),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x14),NdrFcShort(0xd),NdrFcShort(0x8),0x45,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x148),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x8,0x0,NdrFcShort(0x13),NdrFcShort(0xc),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x3),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x2013),NdrFcShort(0x8),NdrFcShort(0x48),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x13),NdrFcShort(0x8),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x15),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2012),NdrFcShort(0x8),NdrFcShort(0x4c2),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x13),NdrFcShort(0x8),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x10),NdrFcShort(0x5),NdrFcShort(0x8),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x148),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x3,NdrFcShort(0x3),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x2013),NdrFcShort(0x8),NdrFcShort(0x48),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x18),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x6),NdrFcShort(0x2112),NdrFcShort(0x8),NdrFcShort(0x2ce),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x45,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x13),NdrFcShort(0x4),NdrFcShort(0x44),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x46,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x13),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x15),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x16),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x17),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x18),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x19),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1a),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xe),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x6,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1b),NdrFcShort(0xc),NdrFcShort(0x6),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x6,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1c),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1d),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1e),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xe),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2010),NdrFcShort(0x4),NdrFcShort(0x4d6),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x1f),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x20),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x21),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x22),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x23),NdrFcShort(0x20),NdrFcShort(0x1c),NdrFcShort(0x8),0x46,0x7,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x10),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x14),NdrFcShort(0x1c),NdrFcShort(0x148),NdrFcShort(0x18),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x1c),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x24),NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x8),0x44,0x1,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x70),NdrFcShort(0x4),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x25),NdrFcShort(0x10),NdrFcShort(0x6),NdrFcShort(0x8),0x46,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x8),0xd,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x26),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xd),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x27),NdrFcShort(0xc),NdrFcShort(0x5),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x14),NdrFcShort(0x5),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x8),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x47,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x8),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x1c),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x6,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x14),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x18),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0x14),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xf),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0x18),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0x1c),NdrFcShort(0x12),NdrFcShort(0x8),0x47,0x6,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x201b),NdrFcShort(0x14),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x18),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x14),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x15),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x16),NdrFcShort(0x14),NdrFcShort(0x5),NdrFcShort(0x8),0x47,0x4,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0x8),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0xc),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x17),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0xa),NdrFcShort(0x8),0x47,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x2,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0x2,0x0,NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x1c),NdrFcShort(0x201b),NdrFcShort(0x10),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x10),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x2150),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xc),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xd),NdrFcShort(0x14),NdrFcShort(0x10),NdrFcShort(0x8),0x46,0x4,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x10),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xe),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x10),NdrFcShort(0x8),0x44,0x3,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x11),NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x201b),NdrFcShort(0x4),NdrFcShort(0x4da),NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x12),NdrFcShort(0xc),NdrFcShort(0x8),NdrFcShort(0x8),0x44,0x2,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x70),NdrFcShort(0x8),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x30),0x46,0x3,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x2012),NdrFcShort(0x8),NdrFcShort(0x502),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0x8),0x47,0x3,0x8,0x7,NdrFcShort(0x12),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4f8),NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x47,0x5,0x8,0x7,NdrFcShort(0x12),NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0xb),NdrFcShort(0x4),NdrFcShort(0x1c),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x10),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xa),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0xb),NdrFcShort(0x10),NdrFcShort(0x8),NdrFcShort(0x8),0x45,0x3,0x8,0x3,NdrFcShort(0x12),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0x8,0x0,NdrFcShort(0x2113),NdrFcShort(0x8),NdrFcShort(0x4a6),NdrFcShort(0x70),NdrFcShort(0xc),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x7),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x46,0x5,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x25),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0xc),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x8),NdrFcShort(0x18),NdrFcShort(0x8),NdrFcShort(0x8),0x46,0x5,0x8,0x5,NdrFcShort(0x0),NdrFcShort(0x25),NdrFcShort(0x0),NdrFcShort(0x8b),NdrFcShort(0x4),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0x8),NdrFcShort(0x4b8),NdrFcShort(0x8b),NdrFcShort(0xc),NdrFcShort(0x4f8),NdrFcShort(0x48),NdrFcShort(0x10),0x8,0x0,NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x33,0x6c,NdrFcLong(0x0),NdrFcShort(0x9),NdrFcShort(0x18),NdrFcShort(0x18),NdrFcShort(0x38),0x44,0x5,0x8,0x1,NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x0),NdrFcShort(0x48),NdrFcShort(0x4),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0x8),0xe,0x0,NdrFcShort(0x48),NdrFcShort(0xc),0x8,0x0,NdrFcShort(0x2012),NdrFcShort(0x10),NdrFcShort(0x50a),NdrFcShort(0x70),NdrFcShort(0x14),0x8,0x0,0x0 } -}; - -const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString = { - 0,{ NdrFcShort(0x0),0x11,0x10,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xc),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x11,0x14,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xe126f8fe),NdrFcShort(0xa7af),NdrFcShort(0x11d0),0xb8,0x8a,0x0,0xc0,0x4f,0xd4,0x24,0xb9,0x11,0x8,0x8,0x5c,0x11,0x8,0x2,0x5c,0x11,0x0,NdrFcShort(0x2),0x15,0x3,NdrFcShort(0x14),0x8,0x8,0x8,0x8,0x8,0x5b,0x11,0x10,NdrFcShort(0xffffffd6),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x50),0x13,0x0,NdrFcShort(0x2),0x2a,0x88,NdrFcShort(0x8),NdrFcShort(0x3),NdrFcLong(0x48746457),NdrFcShort(0x8008),NdrFcLong(0x52746457),NdrFcShort(0xa),NdrFcLong(0x50746457),NdrFcShort(0x800b),NdrFcShort(0xffffffff),0x13,0x0,NdrFcShort(0xe),0x1b,0x0,NdrFcShort(0x1),0x9,0x0,NdrFcShort(0xfffc),NdrFcShort(0x1),0x1,0x5b,0x17,0x3,NdrFcShort(0x8),NdrFcShort(0xfffffff0),0x8,0x8,0x5c,0x5b,0xb4,0x83,NdrFcShort(0x0),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xffffffc0),0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x4),NdrFcShort(0x1),0x2,0x5b,0x1a,0x3,NdrFcShort(0xc),NdrFcShort(0x0),NdrFcShort(0xa),0x4c,0x0,NdrFcShort(0xffffffe0),0x8,0x36,0x5c,0x5b,0x13,0x0,NdrFcShort(0xffffffe2),0x11,0x4,NdrFcShort(0x3f2),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x3d8),0x2a,0x49,NdrFcShort(0x18),NdrFcShort(0xa),NdrFcLong(0x8),NdrFcShort(0x70),NdrFcLong(0xd),NdrFcShort(0xa6),NdrFcLong(0x9),NdrFcShort(0xd8),NdrFcLong(0xc),NdrFcShort(0x2bc),NdrFcLong(0x24),NdrFcShort(0x2e6),NdrFcLong(0x800d),NdrFcShort(0x302),NdrFcLong(0x10),NdrFcShort(0x31c),NdrFcLong(0x2),NdrFcShort(0x336),NdrFcLong(0x3),NdrFcShort(0x350),NdrFcLong(0x14),NdrFcShort(0x36a),NdrFcShort(0xffffffff),0x1b,0x1,NdrFcShort(0x2),0x9,0x0,NdrFcShort(0xfffc),NdrFcShort(0x1),0x6,0x5b,0x17,0x3,NdrFcShort(0x8),NdrFcShort(0xfffffff0),0x8,0x8,0x5c,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffffdc),0x5b,0x8,0x5c,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x11,0x0,NdrFcShort(0xffffffd2),0x5b,0x8,0x8,0x5b,0x2f,0x5a,NdrFcLong(0x0),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x21,0x3,NdrFcShort(0x0),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcLong(0xffffffff),NdrFcShort(0x0),0x4c,0x0,NdrFcShort(0xffffffdc),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffdc),0x2f,0x5a,NdrFcLong(0x20400),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x21,0x3,NdrFcShort(0x0),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),NdrFcLong(0xffffffff),NdrFcShort(0x0),0x4c,0x0,NdrFcShort(0xffffffdc),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffdc),0x2b,0x9,0x7,0x0,NdrFcShort(0xfff8),NdrFcShort(0x1),NdrFcShort(0x2),NdrFcShort(0x10),NdrFcShort(0x2b),NdrFcLong(0x3),NdrFcShort(0x8008),NdrFcLong(0x11),NdrFcShort(0x8001),NdrFcLong(0x2),NdrFcShort(0x8006),NdrFcLong(0x4),NdrFcShort(0x800a),NdrFcLong(0x5),NdrFcShort(0x800c),NdrFcLong(0xb),NdrFcShort(0x8006),NdrFcLong(0xa),NdrFcShort(0x8008),NdrFcLong(0x6),NdrFcShort(0xd6),NdrFcLong(0x7),NdrFcShort(0x800c),NdrFcLong(0x8),NdrFcShort(0xd0),NdrFcLong(0xd),NdrFcShort(0xffffff42),NdrFcLong(0x9),NdrFcShort(0xffffff74),NdrFcLong(0x2000),NdrFcShort(0xc2),NdrFcLong(0x24),NdrFcShort(0xc4),NdrFcLong(0x4024),NdrFcShort(0xbe),NdrFcLong(0x4011),NdrFcShort(0xee),NdrFcLong(0x4002),NdrFcShort(0xec),NdrFcLong(0x4003),NdrFcShort(0xea),NdrFcLong(0x4004),NdrFcShort(0xe8),NdrFcLong(0x4005),NdrFcShort(0xe6),NdrFcLong(0x400b),NdrFcShort(0xd4),NdrFcLong(0x400a),NdrFcShort(0xd2),NdrFcLong(0x4006),NdrFcShort(0xd8),NdrFcLong(0x4007),NdrFcShort(0xce),NdrFcLong(0x4008),NdrFcShort(0xd0),NdrFcLong(0x400d),NdrFcShort(0xce),NdrFcLong(0x4009),NdrFcShort(0xcc),NdrFcLong(0x6000),NdrFcShort(0xca),NdrFcLong(0x400c),NdrFcShort(0xd0),NdrFcLong(0x10),NdrFcShort(0x8002),NdrFcLong(0x12),NdrFcShort(0x8006),NdrFcLong(0x13),NdrFcShort(0x8008),NdrFcLong(0x16),NdrFcShort(0x8008),NdrFcLong(0x17),NdrFcShort(0x8008),NdrFcLong(0xe),NdrFcShort(0xb4),NdrFcLong(0x400e),NdrFcShort(0xba),NdrFcLong(0x4010),NdrFcShort(0xb8),NdrFcLong(0x4012),NdrFcShort(0x6e),NdrFcLong(0x4013),NdrFcShort(0x6c),NdrFcLong(0x4016),NdrFcShort(0x66),NdrFcLong(0x4017),NdrFcShort(0x60),NdrFcLong(0x0),NdrFcShort(0x0),NdrFcLong(0x1),NdrFcShort(0x0),NdrFcShort(0xffffffff),0x15,0x7,NdrFcShort(0x8),0xb,0x5b,0x13,0x0,NdrFcShort(0xfffffe38),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x1b6),0x13,0x0,NdrFcShort(0x20),0x2f,0x5a,NdrFcLong(0x2f),NdrFcShort(0x0),NdrFcShort(0x0),0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x4),NdrFcShort(0x1),0x1,0x5b,0x1a,0x3,NdrFcShort(0x10),NdrFcShort(0x0),NdrFcShort(0xa),0x8,0x8,0x4c,0x0,NdrFcShort(0xffffffd6),0x36,0x5b,0x13,0x0,NdrFcShort(0xffffffe2),0x13,0x8,0x1,0x5c,0x13,0x8,0x6,0x5c,0x13,0x8,0x8,0x5c,0x13,0x8,0xa,0x5c,0x13,0x8,0xc,0x5c,0x13,0x0,NdrFcShort(0xffffffa2),0x13,0x10,NdrFcShort(0xffffffa4),0x13,0x10,NdrFcShort(0xfffffe18),0x13,0x10,NdrFcShort(0xfffffe4c),0x13,0x10,NdrFcShort(0x2),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x150),0x13,0x10,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x16),0x15,0x7,NdrFcShort(0x10),0x6,0x1,0x1,0x38,0x8,0x39,0xb,0x5b,0x13,0x0,NdrFcShort(0xfffffff2),0x13,0x8,0x2,0x5c,0x1a,0x7,NdrFcShort(0x20),NdrFcShort(0x0),NdrFcShort(0x0),0x8,0x8,0x6,0x6,0x6,0x6,0x4c,0x0,NdrFcShort(0xfffffe4a),0x5c,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffffd2),0x5b,0x8,0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffd2),0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x4b,0x5c,0x48,0x49,NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0x1),NdrFcShort(0x0),NdrFcShort(0x0),0x13,0x0,NdrFcShort(0xffffff42),0x5b,0x8,0x5c,0x5b,0x1a,0x3,NdrFcShort(0x8),NdrFcShort(0x0),NdrFcShort(0x6),0x8,0x36,0x5c,0x5b,0x11,0x0,NdrFcShort(0xffffffd2),0x1d,0x0,NdrFcShort(0x8),0x2,0x5b,0x15,0x3,NdrFcShort(0x10),0x8,0x6,0x6,0x4c,0x0,NdrFcShort(0xfffffff1),0x5b,0x1a,0x3,NdrFcShort(0x18),NdrFcShort(0x0),NdrFcShort(0xa),0x8,0x36,0x4c,0x0,NdrFcShort(0xffffffe8),0x5c,0x5b,0x11,0x0,NdrFcShort(0xfffffd64),0x1b,0x0,NdrFcShort(0x1),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x1,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x1,NdrFcShort(0x2),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x6,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x3,NdrFcShort(0x4),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0x8,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x1b,0x7,NdrFcShort(0x8),0x19,0x0,NdrFcShort(0x0),NdrFcShort(0x1),0xb,0x5b,0x16,0x3,NdrFcShort(0x8),0x4b,0x5c,0x46,0x5c,NdrFcShort(0x4),NdrFcShort(0x4),0x13,0x0,NdrFcShort(0xffffffe6),0x5b,0x8,0x8,0x5b,0x15,0x3,NdrFcShort(0x8),0x8,0x8,0x5c,0x5b,0x1b,0x3,NdrFcShort(0x8),0x7,0x0,NdrFcShort(0xffd8),NdrFcShort(0x1),0x4c,0x0,NdrFcShort(0xffffffec),0x5c,0x5b,0x1a,0x3,NdrFcShort(0x28),NdrFcShort(0xffffffec),NdrFcShort(0x0),0x6,0x6,0x38,0x8,0x8,0x4c,0x0,NdrFcShort(0xfffffc1b),0x5b,0xb4,0x83,NdrFcShort(0x1),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffc08),0x12,0x10,NdrFcShort(0x2),0x12,0x0,NdrFcShort(0xffffffde),0xb4,0x83,NdrFcShort(0x1),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffff0),0x11,0x14,NdrFcShort(0xfffffe9a),0x11,0x4,NdrFcShort(0xfffffe06),0x11,0xc,0x8,0x5c,0x11,0xc,0x2,0x5c,0x11,0xc,0x6,0x5c,0x11,0xc,0xd,0x5c,0x11,0x14,NdrFcShort(0x2),0x2f,0x5a,NdrFcLong(0xd5778ae3),NdrFcShort(0x43de),NdrFcShort(0x11d0),0x91,0x71,0x0,0xaa,0x0,0xc1,0x80,0x68,0x11,0xc,0xe,0x5c,0x12,0x0,NdrFcShort(0xfffffc18),0xb4,0x83,NdrFcShort(0x2),NdrFcShort(0x4),NdrFcShort(0x0),NdrFcShort(0xfffffff4),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0xfffffed4),0x11,0x14,NdrFcShort(0x2),0x13,0x0,NdrFcShort(0x2),0x15,0x3,NdrFcShort(0x20),0x8,0x8,0xe,0xe,0x8,0x8,0x8,0x8,0x5c,0x5b,0x0 } -}; - -const CInterfaceProxyVtbl *_scardssp_ProxyVtblList[] = { - (CInterfaceProxyVtbl *) &_ISCardTypeConvProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardISO7816ProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardDatabaseProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardLocateProxyVtbl,(CInterfaceProxyVtbl *) &_ISCardCmdProxyVtbl,(CInterfaceProxyVtbl *) &_IByteBufferProxyVtbl,0 -}; - -const CInterfaceStubVtbl *_scardssp_StubVtblList[] = { - (CInterfaceStubVtbl *) &_ISCardTypeConvStubVtbl,(CInterfaceStubVtbl *) &_ISCardISO7816StubVtbl,(CInterfaceStubVtbl *) &_ISCardStubVtbl,(CInterfaceStubVtbl *) &_ISCardDatabaseStubVtbl,(CInterfaceStubVtbl *) &_ISCardLocateStubVtbl,(CInterfaceStubVtbl *) &_ISCardCmdStubVtbl,(CInterfaceStubVtbl *) &_IByteBufferStubVtbl,0 -}; - -PCInterfaceName const _scardssp_InterfaceNamesList[] = { - "ISCardTypeConv","ISCardISO7816","ISCard","ISCardDatabase","ISCardLocate","ISCardCmd","IByteBuffer",0 -}; - -const IID *_scardssp_BaseIIDList[] = { - &IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,&IID_IDispatch,0 -}; - -#define _scardssp_CHECK_IID(n) IID_GENERIC_CHECK_IID(_scardssp,pIID,n) - -int __stdcall _scardssp_IID_Lookup(const IID *pIID,int *pIndex) { - IID_BS_LOOKUP_SETUP - IID_BS_LOOKUP_INITIAL_TEST(_scardssp,7,4) - IID_BS_LOOKUP_NEXT_TEST(_scardssp,2) - IID_BS_LOOKUP_NEXT_TEST(_scardssp,1) - IID_BS_LOOKUP_RETURN_RESULT(_scardssp,7,*pIndex) -} - -const ExtendedProxyFileInfo scardssp_ProxyFileInfo = { - (PCInterfaceProxyVtblList *) & _scardssp_ProxyVtblList,(PCInterfaceStubVtblList *) & _scardssp_StubVtblList,(const PCInterfaceName *) & _scardssp_InterfaceNamesList,(const IID **) & _scardssp_BaseIIDList,& _scardssp_IID_Lookup,7,2,0,0,0,0 -}; diff --git a/lib/libc/include/any-windows-any/semaphore.h b/lib/libc/include/any-windows-any/semaphore.h index 50630ea5e4..9a6c211a93 100644 --- a/lib/libc/include/any-windows-any/semaphore.h +++ b/lib/libc/include/any-windows-any/semaphore.h @@ -23,15 +23,13 @@ #ifndef WIN_PTHREADS_SEMAPHORE_H #define WIN_PTHREADS_SEMAPHORE_H +#include #include "pthread_compat.h" #ifdef __cplusplus extern "C" { #endif -/* Set this to 0 to disable it */ -#define USE_SEM_CriticalSection_SpinCount 100 - #define SEM_VALUE_MAX INT_MAX typedef void *sem_t; @@ -46,7 +44,16 @@ WINPTHREAD_API int sem_trywait(sem_t *sem); WINPTHREAD_API int sem_wait(sem_t *sem); -WINPTHREAD_API int sem_timedwait(sem_t * sem, const struct timespec *t); +WINPTHREAD_API int sem_timedwait32(sem_t * sem, const struct _timespec32 *t); +WINPTHREAD_API int sem_timedwait64(sem_t * sem, const struct _timespec64 *t); +WINPTHREAD_SEM_DECL int sem_timedwait(sem_t * sem, const struct timespec *t) +{ +#if WINPTHREADS_TIME_BITS == 32 + return sem_timedwait32 (sem, (const struct _timespec32 *) t); +#else + return sem_timedwait64 (sem, (const struct _timespec64 *) t); +#endif +} WINPTHREAD_API int sem_post(sem_t *sem); diff --git a/lib/libc/include/any-windows-any/sensorsapi.h b/lib/libc/include/any-windows-any/sensorsapi.h index fa90551051..c173dd49e2 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.0-rc1 from include/sensorsapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b1a311cefa..11d7aa20c0 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.0-rc1 from include/servprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2dc7d8739e..74e7c7ea4a 100644 --- a/lib/libc/include/any-windows-any/setjmp.h +++ b/lib/libc/include/any-windows-any/setjmp.h @@ -224,21 +224,21 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void); #ifndef _INC_SETJMPEX # if defined(_X86_) || defined(__i386__) # define setjmp(BUF) _setjmp3((BUF), NULL) -# elif ((defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) && (!defined(__SEH__) || !__has_builtin(__builtin_sponentry) || defined(__USE_MINGW_SETJMP_NON_SEH))) -# 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); -# elif defined(__SEH__) && !defined(__USE_MINGW_SETJMP_NON_SEH) -# if defined(__aarch64__) || defined(_ARM64_) || defined(__arm__) || defined(_ARM_) -# define setjmp(BUF) _setjmp((BUF), __builtin_sponentry()) -# elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__) -# define setjmp(BUF) _setjmp((BUF), mingw_getsp()) +# 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), __builtin_frame_address (0)) +# define setjmp(BUF) _setjmp((BUF), NULL) # endif +# elif __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), NULL) +# 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); diff --git a/lib/libc/include/any-windows-any/shldisp.h b/lib/libc/include/any-windows-any/shldisp.h index d8c9e29e56..f0afd65c54 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.0-rc1 from include/shldisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/shldisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/shlobj.h b/lib/libc/include/any-windows-any/shlobj.h index c775f50b5c..4b0811b36d 100644 --- a/lib/libc/include/any-windows-any/shlobj.h +++ b/lib/libc/include/any-windows-any/shlobj.h @@ -33,7 +33,7 @@ typedef enum { SHGFP_TYPE_CURRENT = 0, - SHGFP_TYPE_DEFAULT = 1, + SHGFP_TYPE_DEFAULT = 1 } SHGFP_TYPE; SHFOLDERAPI SHGetFolderPathW (HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath); @@ -1108,7 +1108,7 @@ extern "C" { STDMETHOD(GetBandInfoSFB) (THIS_ PBANDINFOSFB pbi) PURE; }; enum { - SFBID_PIDLCHANGED, + SFBID_PIDLCHANGED }; #undef INTERFACE @@ -1550,7 +1550,7 @@ extern "C" { DROPIMAGE_LINK = DROPEFFECT_LINK, DROPIMAGE_LABEL = 6, DROPIMAGE_WARNING = 7, - DROPIMAGE_NOIMAGE = 8, + DROPIMAGE_NOIMAGE = 8 } DROPIMAGETYPE; typedef struct { @@ -2747,7 +2747,7 @@ DECLARE_INTERFACE_IID_ (INamedPropertyBag, IUnknown, "FB700430-952C-11d1-946F-00 IESHORTCUT_NEWBROWSER = 0x01, IESHORTCUT_OPENNEWTAB = 0x02, IESHORTCUT_FORCENAVIGATE = 0x04, - IESHORTCUT_BACKGROUNDTAB = 0x08, + IESHORTCUT_BACKGROUNDTAB = 0x08 } IESHORTCUTFLAGS; #endif diff --git a/lib/libc/include/any-windows-any/shobjidl.h b/lib/libc/include/any-windows-any/shobjidl.h index bb5d9a2feb..e6ead3ac01 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.0-rc1 from include/shobjidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c62de44260..e87fe79b18 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.0-rc1 from include/shtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/shtypes.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/spatialaudioclient.h b/lib/libc/include/any-windows-any/spatialaudioclient.h index 05c8e5e985..0eb9fd3d47 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.0-rc1 from include/spatialaudioclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 49a1106c1c..0d9d36d4b5 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.0-rc1 from include/spellcheck.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0a4f67b7f6..bdfd6b7510 100644 --- a/lib/libc/include/any-windows-any/sql.h +++ b/lib/libc/include/any-windows-any/sql.h @@ -7,7 +7,7 @@ #define __SQL #ifndef ODBCVER -#define ODBCVER 0x0351 +#define ODBCVER 0x0380 #endif #include diff --git a/lib/libc/include/any-windows-any/sqlext.h b/lib/libc/include/any-windows-any/sqlext.h index 419caad997..53f7ad22a2 100644 --- a/lib/libc/include/any-windows-any/sqlext.h +++ b/lib/libc/include/any-windows-any/sqlext.h @@ -13,10 +13,12 @@ extern "C" { #endif #define SQL_SPEC_MAJOR 3 -#define SQL_SPEC_MINOR 52 -#define SQL_SPEC_STRING "03.52" +#define SQL_SPEC_MINOR 80 +#define SQL_SPEC_STRING "03.80" #define SQL_SQLSTATE_SIZE 5 +typedef SQLTCHAR SQLSTATE[SQL_SQLSTATE_SIZE + 1]; + #define SQL_MAX_DSN_LENGTH 32 #define SQL_MAX_OPTION_STRING_LENGTH 256 @@ -35,6 +37,7 @@ extern "C" { #define SQL_ATTR_ODBC_VERSION 200 #define SQL_ATTR_CONNECTION_POOLING 201 #define SQL_ATTR_CP_MATCH 202 +#define SQL_ATTR_APPLICATION_KEY 203 #endif #if (ODBCVER >= 0x0300) @@ -42,6 +45,7 @@ extern "C" { #define SQL_CP_OFF __MSABI_LONG(0U) #define SQL_CP_ONE_PER_DRIVER __MSABI_LONG(1U) #define SQL_CP_ONE_PER_HENV __MSABI_LONG(2U) +#define SQL_CP_DRIVER_AWARE __MSABI_LONG(3U) #define SQL_CP_DEFAULT SQL_CP_OFF #define SQL_CP_STRICT_MATCH __MSABI_LONG(0U) @@ -52,6 +56,10 @@ extern "C" { #define SQL_OV_ODBC3 __MSABI_LONG(3U) #endif +#if (ODBCVER >= 0x0380) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) +#endif + #define SQL_ACCESS_MODE 101 #define SQL_AUTOCOMMIT 102 #define SQL_LOGIN_TIMEOUT 103 @@ -91,6 +99,15 @@ extern "C" { #define SQL_ATTR_ANSI_APP 115 #endif +#if (ODBCVER >= 0x0380) +#define SQL_ATTR_RESET_CONNECTION 116 +#define SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE 117 +#endif + +#if (ODBCVER >= 0x0380) +#define SQL_ATTR_ASYNC_DBC_EVENT 119 +#endif + #if (ODBCVER < 0x0300) #define SQL_CONNECT_OPT_DRVR_START 1000 #endif @@ -136,6 +153,16 @@ extern "C" { #define SQL_AA_FALSE __MSABI_LONG(0) #endif +#if (ODBCVER >= 0x0380) +#define SQL_RESET_CONNECTION_YES __MSABI_LONG(1U) +#endif + +#if (ODBCVER >= 0x0380) +#define SQL_ASYNC_DBC_ENABLE_ON __MSABI_LONG(1U) +#define SQL_ASYNC_DBC_ENABLE_OFF __MSABI_LONG(0U) +#define SQL_ASYNC_DBC_ENABLE_DEFAULT SQL_ASYNC_DBC_ENABLE_OFF +#endif + #define SQL_QUERY_TIMEOUT 0 #define SQL_MAX_ROWS 1 #define SQL_NOSCAN 2 @@ -181,6 +208,10 @@ extern "C" { #define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS #endif +#if (ODBCVER >= 0x0380) +#define SQL_ATTR_ASYNC_STMT_EVENT 29 +#endif + #if (ODBCVER < 0x0300) #define SQL_STMT_OPT_MAX SQL_ROW_NUMBER #define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT @@ -439,6 +470,19 @@ extern "C" { #define SQL_TYPE_MAX SQL_VARCHAR #endif +#if (ODBCVER >= 0x380) +#define SQL_DRIVER_C_TYPE_BASE 0x4000 +#endif + +#if (ODBCVER >= 0x380) +#define SQL_DRIVER_SQL_TYPE_BASE 0x4000 +#define SQL_DRIVER_DESC_FIELD_BASE 0x4000 +#define SQL_DRIVER_DIAG_FIELD_BASE 0x4000 +#define SQL_DRIVER_INFO_TYPE_BASE 0x4000 +#define SQL_DRIVER_CONN_ATTR_BASE 0x00004000 +#define SQL_DRIVER_STMT_ATTR_BASE 0x00004000 +#endif + #if (ODBCVER >= 0x0300) #define SQL_C_VARBOOKMARK SQL_C_BINARY #endif @@ -513,6 +557,7 @@ extern "C" { #define SQL_API_SQLDESCRIBEPARAM 58 #define SQL_API_SQLDRIVERCONNECT 41 #define SQL_API_SQLDRIVERS 71 +#define SQL_API_SQLPRIVATEDRIVERS 79 #define SQL_API_SQLEXTENDEDFETCH 59 #define SQL_API_SQLFOREIGNKEYS 60 #define SQL_API_SQLMORERESULTS 61 @@ -705,8 +750,21 @@ extern "C" { #define SQL_INSERT_STATEMENT 172 #define SQL_CONVERT_GUID 173 #define SQL_UNION_STATEMENT SQL_UNION + +#if (ODBCVER >= 0x0380) +#define SQL_ASYNC_DBC_FUNCTIONS 10023 +#endif + +#define SQL_DRIVER_AWARE_POOLING_SUPPORTED 10024 + +#if (ODBCVER >= 0x0380) +#define SQL_ASYNC_NOTIFICATION 10025 +#define SQL_ASYNC_NOTIFICATION_NOT_CAPABLE __MSABI_LONG(0x00000000) +#define SQL_ASYNC_NOTIFICATION_CAPABLE __MSABI_LONG(0x00000001) #endif +#endif /* ODBCVER >= 0x0300 */ + #define SQL_DTC_TRANSITION_COST 1750 #if (ODBCVER >= 0x0300) @@ -968,6 +1026,9 @@ extern "C" { #define SQL_GD_BLOCK __MSABI_LONG(0x00000004) #define SQL_GD_BOUND __MSABI_LONG(0x00000008) +#if (ODBCVER >= 0x0380) +#define SQL_GD_OUTPUT_PARAMS __MSABI_LONG(0x00000010) +#endif #define SQL_PS_POSITIONED_DELETE __MSABI_LONG(0x00000001) #define SQL_PS_POSITIONED_UPDATE __MSABI_LONG(0x00000002) @@ -1302,11 +1363,19 @@ extern "C" { #define SQL_US_UNION SQL_U_UNION #define SQL_US_UNION_ALL SQL_U_UNION_ALL + +#define SQL_DRIVER_AWARE_POOLING_NOT_CAPABLE __MSABI_LONG(0x00000000) +#define SQL_DRIVER_AWARE_POOLING_CAPABLE __MSABI_LONG(0x00000001) #endif #define SQL_DTC_ENLIST_EXPENSIVE __MSABI_LONG(0x00000001) #define SQL_DTC_UNENLIST_EXPENSIVE __MSABI_LONG(0x00000002) +#if (ODBCVER >= 0x0380) +#define SQL_ASYNC_DBC_NOT_CAPABLE __MSABI_LONG(0x00000000) +#define SQL_ASYNC_DBC_CAPABLE __MSABI_LONG(0x00000001) +#endif + #if (ODBCVER >= 0x0300) #define SQL_FETCH_FIRST_USER 31 #define SQL_FETCH_FIRST_SYSTEM 32 @@ -1412,6 +1481,10 @@ extern "C" { #define SQL_RESULT_COL 3 #define SQL_PARAM_OUTPUT 4 #define SQL_RETURN_VALUE 5 +#if (ODBCVER >= 0x0380) +#define SQL_PARAM_INPUT_OUTPUT_STREAM 8 +#define SQL_PARAM_OUTPUT_STREAM 16 +#endif #define SQL_PT_UNKNOWN 0 #define SQL_PT_PROCEDURE 1 diff --git a/lib/libc/include/any-windows-any/sqltypes.h b/lib/libc/include/any-windows-any/sqltypes.h index 809b11fd9c..f66c7ceead 100644 --- a/lib/libc/include/any-windows-any/sqltypes.h +++ b/lib/libc/include/any-windows-any/sqltypes.h @@ -7,7 +7,7 @@ #define __SQLTYPES #ifndef ODBCVER -#define ODBCVER 0x0351 +#define ODBCVER 0x0380 #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/stdio.h b/lib/libc/include/any-windows-any/stdio.h index 7e0d3d9175..91d617fc0f 100644 --- a/lib/libc/include/any-windows-any/stdio.h +++ b/lib/libc/include/any-windows-any/stdio.h @@ -206,32 +206,62 @@ extern extern __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...); + int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(sscanf); +extern + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vsscanf(const char * __restrict__ _Str,const char * __restrict__ _Format,va_list argp) + __MINGW_ASM_CALL(vsscanf); extern __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_scanf(const char * __restrict__ _Format,...); + int __cdecl __ms_scanf(const char * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(scanf); +extern + __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) + int __cdecl __ms_vscanf(const char * __restrict__ _Format,va_list argp) + __MINGW_ASM_CALL(vscanf); extern __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); + int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(fscanf); +extern + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vfscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,va_list argp) + __MINGW_ASM_CALL(vfscanf); extern __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_printf(const char * __restrict__ , ... ) __MINGW_NOTHROW; + int __cdecl __ms_printf(const char * __restrict__ , ... ) + __MINGW_UCRT_ASM_CALL(printf) __MINGW_NOTHROW; extern __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_vprintf (const char * __restrict__ , va_list) __MINGW_NOTHROW; + int __cdecl __ms_vprintf (const char * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vprintf) __MINGW_NOTHROW; extern __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; + int __cdecl __ms_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(fprintf) __MINGW_NOTHROW; extern __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; + int __cdecl __ms_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vfprintf) __MINGW_NOTHROW +; extern __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_sprintf (char * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; + int __cdecl __ms_sprintf (char * __restrict__ , const char * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(sprintf) __MINGW_NOTHROW; extern __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; + int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vsprintf) __MINGW_NOTHROW; +extern + __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_snprintf (char * __restrict__ , size_t , const char * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(snprintf) __MINGW_NOTHROW; +extern + __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_vsnprintf (char * __restrict__ , size_t , const char * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vsnprintf) __MINGW_NOTHROW; #ifdef _UCRT int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, _locale_t locale, va_list valist); @@ -487,24 +517,12 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li #pragma GCC diagnostic ignored "-Wshadow" #endif - __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_vscanf(const char * __restrict__ Format, va_list argp); - __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vfscanf (FILE * __restrict__ fp, const char * __restrict__ Format,va_list argp); __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); - - __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) - __MINGW_ASM_CALL(__ms_vfscanf); - + int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv); __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) - int vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv) - __MINGW_ASM_CALL(__ms_vsscanf); - + int vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv); __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) - int vscanf(const char *__format, __builtin_va_list __local_argv) - __MINGW_ASM_CALL(__ms_vscanf); + int vscanf(const char *__format, __builtin_va_list __local_argv); #ifdef __GNUC__ #pragma GCC diagnostic pop @@ -794,10 +812,6 @@ char * tmpnam(char * __dst) #pragma GCC diagnostic ignored "-Wshadow" #endif - __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_vsnprintf(char * __restrict__ d,size_t n,const char * __restrict__ format,va_list arg) - __MINGW_ATTRIB_DEPRECATED_MSVC2005 __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __mingw_bos_ovr __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) int vsnprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, va_list __local_argv) @@ -810,9 +824,6 @@ char * tmpnam(char * __dst) return __ms_vsnprintf (__stream, __n, __format, __local_argv); } - __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); - #ifndef __NO_ISOCEXT #if __MINGW_FORTIFY_VA_ARG @@ -928,24 +939,49 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format, int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list); /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(swscanf); +/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,va_list) + __MINGW_ASM_CALL(vswscanf); /* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(wscanf); +/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1) + int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list) + __MINGW_ASM_CALL(vwscanf); /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(fwscanf); +/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list) + __MINGW_ASM_CALL(vfwscanf); /* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + /* No __MINGW_UCRT_ASM_CALL for __ms_fwprintf; this is provided as an + * actual function in the ucrt import libraries. */ /* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(wprintf); /* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); + int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList) + __MINGW_UCRT_ASM_CALL(vfwprintf); /*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); + int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) + __MINGW_UCRT_ASM_CALL(vwprintf); +/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(swprintf); +/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list) + __MINGW_UCRT_ASM_CALL(vswprintf); /* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...); + int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(snwprintf); /* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list); + int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vsnwprintf); #ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); @@ -1062,98 +1098,38 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #else /* !__USE_MINGW_ANSI_STDIO */ #ifdef _UCRT - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr + __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) - { - return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv); - } + int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv); - __mingw_ovr __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv) - { - return __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, (size_t)-1, __format, NULL, __local_argv); - } - __mingw_ovr + 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) - { - return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv); - } + int vwscanf(const wchar_t *__format, va_list __local_argv); int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); - __mingw_ovr - int __cdecl wprintf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr - int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList); - } - __mingw_ovr - int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList); - } + 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 */ - int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list); - int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list); - int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list); - __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv) - __MINGW_ASM_CALL(__ms_vfwscanf); + 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) - __MINGW_ASM_CALL(__ms_vswscanf); + int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv); __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv) - __MINGW_ASM_CALL(__ms_vwscanf); + int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv); #endif /* __NO_ISOCEXT */ @@ -1203,59 +1179,11 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti 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 - __mingw_ovr - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - /* - * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and - * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is - * executed in "standard snprintf behavior" and returns number of (wide) - * chars required to allocate. For all other cases it is executed in a way - * that returns negative value on error. But C95+ compliant swprintf() for - * case _Count == 0 returns negative value, so handle this case specially. - */ - if (_Dest == NULL && _Count == 0) - return -1; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret < 0 ? -1 : __ret; - } - __mingw_ovr - int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) - { - int __ret; - /* - * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and - * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is - * executed in "standard snprintf behavior" and returns number of (wide) - * chars required to allocate. For all other cases it is executed in a way - * that returns negative value on error. But C95+ compliant vswprintf() for - * case _Count == 0 returns negative value, so handle this case specially. - */ - if (_Dest == NULL && _Count == 0) - return -1; - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args); - return __ret < 0 ? -1 : __ret; - } + 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); - __mingw_ovr - int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, 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, s, n, format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) - { - return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg); - } + 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 @@ -1291,8 +1219,6 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ #if __USE_MINGW_ANSI_STDIO == 0 - int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); - int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list); 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 diff --git a/lib/libc/include/any-windows-any/stdlib.h b/lib/libc/include/any-windows-any/stdlib.h index d43fa33b7f..482971357c 100644 --- a/lib/libc/include/any-windows-any/stdlib.h +++ b/lib/libc/include/any-windows-any/stdlib.h @@ -458,12 +458,10 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); -# if __MSVCRT_VERSION__ >= 0x900 _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); _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); -# endif #if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) #pragma pop_macro("calloc") diff --git a/lib/libc/include/any-windows-any/strmif.h b/lib/libc/include/any-windows-any/strmif.h index 6c8658afe8..16e6d17408 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.0-rc1 from include/strmif.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 abb285e157..d253110575 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.0-rc1 from include/structuredquerycondition.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/structuredquerycondition.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/sys/stat.h b/lib/libc/include/any-windows-any/sys/stat.h index 5a85c2c483..5d2e6dfaf0 100644 --- a/lib/libc/include/any-windows-any/sys/stat.h +++ b/lib/libc/include/any-windows-any/sys/stat.h @@ -70,67 +70,21 @@ extern "C" { _CRTIMP int __cdecl _stat32(const char *_Name,struct _stat32 *_Stat); _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat); _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat); - int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat) - { - struct _stat64 st; - int __ret=_fstat64(_FileDes,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct _stat64i32)); - return -1; - } - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return __ret; - } -#endif /* __CRT__NO_INLINE */ + _CRTIMP int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat); _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat); - int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat) - { - struct _stat64 st; - int __ret=_stat64(_Name,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct _stat64i32)); - return -1; - } - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return __ret; - } -#endif /* __CRT__NO_INLINE */ + _CRTIMP int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); - int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); + _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); #endif #ifndef NO_OLDNAMES -#define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ +#define _S_IFBLK 0x6000 /* Block: Is this ever set under w32? */ #define S_IFMT _S_IFMT #define S_IFDIR _S_IFDIR @@ -170,115 +124,69 @@ extern "C" { #endif -#if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) -int __cdecl fstat(int _Desc,struct stat *_Stat); -#ifdef _UCRT - __mingw_ovr int __cdecl stat(const char *_Filename,struct stat *_Stat) - { - return _stat(_Filename, (struct _stat *)_Stat); - } - __mingw_ovr int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat) - { - return _wstat(_Filename, (struct _stat *)_Stat); - } -#else -int __cdecl stat(const char *_Filename,struct stat *_Stat); -int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat); -#endif +#if !defined(NO_OLDNAMES) || defined(_POSIX) -#ifndef __CRT__NO_INLINE +/* + * When building mingw-w64 CRT files it is required that the fstat, stat and + * wstat functions are not declared with __MINGW_ASM_CALL redirection. + * Otherwise the mingw-w64 would provide broken fstat, stat and wstat symbols. + * To prevent ABI issues, the mingw-w64 runtime should not call the fstat, + * stat and wstat functions, instead it should call the fixed-size variants. + */ +#ifndef _CRTBLD +struct stat { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + off_t st_size; /* off_t follows _FILE_OFFSET_BITS */ + time_t st_atime; /* time_t follows _USE_32BIT_TIME_T */ + time_t st_mtime; + time_t st_ctime; +}; +#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) #ifdef _USE_32BIT_TIME_T -__CRT_INLINE int __cdecl - fstat(int _Desc,struct stat *_Stat) { - struct _stat32 st; - int __ret=_fstat32(_Desc,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct stat)); - return -1; - } - /* struct stat and struct _stat32 - are the same for this case. */ - memcpy(_Stat, &st, sizeof(struct _stat32)); - return __ret; -} -/* Disable it for making sure trailing slash issue is fixed. */ -#if 0 -__CRT_INLINE int __cdecl - stat(const char *_Filename,struct stat *_Stat) { - struct _stat32 st; - int __ret=_stat32(_Filename,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct stat)); - return -1; - } - /* struct stat and struct _stat32 - are the same for this case. */ - memcpy(_Stat, &st, sizeof(struct _stat32)); - return __ret; -} -#endif +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 -__CRT_INLINE int __cdecl - fstat(int _Desc,struct stat *_Stat) { - struct _stat64 st; - int __ret=_fstat64(_Desc,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct stat)); - return -1; - } - /* struct stat and struct _stat64i32 - are the same for this case. */ - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return __ret; -} -/* Disable it for making sure trailing slash issue is fixed. */ -#if 0 -__CRT_INLINE int __cdecl - stat(const char *_Filename,struct stat *_Stat) { - struct _stat64 st; - int __ret=_stat64(_Filename,&st); - if (__ret == -1) { - memset(_Stat,0,sizeof(struct stat)); - return -1; - } - /* struct stat and struct _stat64i32 - are the same for this case. */ - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return __ret; -} +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 -#endif /* _USE_32BIT_TIME_T */ -#endif /* __CRT__NO_INLINE */ -#endif /* !RC_INVOKED && !NO_OLDNAMES */ - -#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) +#else #ifdef _USE_32BIT_TIME_T -#define stat _stat32i64 -#define fstat _fstat32i64 +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 -#define stat _stat64 -#define fstat _fstat64 -#endif +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 +#endif +#endif + +struct stat64 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __MINGW_EXTENSION __int64 st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; +}; +int __cdecl fstat64(int _Desc, struct stat64 *_Stat); +int __cdecl stat64(const char *_Filename, struct stat64 *_Stat); +int __cdecl wstat64(const wchar_t *_Filename, struct stat64 *_Stat); + #endif #ifdef __cplusplus diff --git a/lib/libc/include/any-windows-any/sysinfoapi.h b/lib/libc/include/any-windows-any/sysinfoapi.h index dfacf62963..ef4537f060 100644 --- a/lib/libc/include/any-windows-any/sysinfoapi.h +++ b/lib/libc/include/any-windows-any/sysinfoapi.h @@ -41,8 +41,18 @@ extern "C" { #if _WIN32_WINNT >= 0x0600 WINBASEAPI ULONGLONG WINAPI GetTickCount64 (VOID); #endif + +#define USER_CET_ENVIRONMENT_WIN32_PROCESS 0x00000000 +#define USER_CET_ENVIRONMENT_SGX2_ENCLAVE 0x00000002 +#define USER_CET_ENVIRONMENT_VBS_ENCLAVE 0x00000010 +#define USER_CET_ENVIRONMENT_VBS_BASIC_ENCLAVE 0x00000011 + +#if (NTDDI_VERSION >= NTDDI_WIN10_VB) + WINBASEAPI WINBOOL WINAPI IsUserCetAvailableInEnvironment(DWORD UserCetEnvironment); #endif +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= _WIN32_WINNT_WIN10 typedef struct _MEMORYSTATUSEX { diff --git a/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h b/lib/libc/include/any-windows-any/systemmediatransportcontrolsinterop.h index 71f031c2a7..a6972303f0 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.0-rc1 from include/systemmediatransportcontrolsinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 801080b9a9..fbabd1f6ac 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.0-rc1 from include/taskschd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/taskschd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tchar.h b/lib/libc/include/any-windows-any/tchar.h index 42d6b1ae35..356d8ee524 100644 --- a/lib/libc/include/any-windows-any/tchar.h +++ b/lib/libc/include/any-windows-any/tchar.h @@ -473,9 +473,7 @@ extern "C" { #define _istxdigit iswxdigit #define _istxdigit_l _iswxdigit_l #define _istblank iswblank -#if __MSVCRT_VERSION__ >= 0xC00 #define _istblank_l _iswblank_l -#endif /* msvcr120 */ #define _totupper towupper #define _totupper_l _towupper_l @@ -1005,9 +1003,7 @@ extern "C" { #define _istupper _ismbcupper #define _istupper_l _ismbcupper_l #define _istblank _ismbcblank -#if __MSVCRT_VERSION__ >= 0xC00 #define _istblank_l _ismbcblank_l -#endif /* msvcr120 */ #define _totupper _mbctoupper #define _totupper_l _mbctoupper_l @@ -1146,9 +1142,7 @@ extern "C" { #define _istupper isupper #define _istupper_l _isupper_l #define _istblank isblank -#if __MSVCRT_VERSION__ >= 0xC00 #define _istblank_l _isblank_l -#endif /* msvcr120 */ #define _totupper toupper #define _totupper_l _toupper_l diff --git a/lib/libc/include/any-windows-any/textstor.h b/lib/libc/include/any-windows-any/textstor.h index fff21396f8..7c1a23241f 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.0-rc1 from include/textstor.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 6bf6c46563..b36d0cafc7 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.0-rc1 from include/thumbcache.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/thumbcache.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tlbref.h b/lib/libc/include/any-windows-any/tlbref.h index 7d285dc2ce..0ad1d6a0a3 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.0-rc1 from include/tlbref.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 26104fe044..c448b0138c 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.0-rc1 from include/tlogstg.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b471a77a79..c82889ef40 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.0-rc1 from include/tpcshrd.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/tpcshrd.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/tsattrs.h b/lib/libc/include/any-windows-any/tsattrs.h index c119cbdfad..b60d752c42 100644 --- a/lib/libc/include/any-windows-any/tsattrs.h +++ b/lib/libc/include/any-windows-any/tsattrs.h @@ -1,100 +1,100 @@ -/** - * 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 _TSATTRS_H_ -#define _TSATTRS_H_ - -DEFINE_GUID(TSATTRID_OTHERS, 0xb3c32af9,0x57d0,0x46a9,0xbc,0xa8,0xda,0xc2,0x38,0xa1,0x30,0x57); - -DEFINE_GUID(TSATTRID_Font, 0x573ea825,0x749b,0x4f8a,0x9c,0xfd,0x21,0xc3,0x60,0x5c,0xa8,0x28); -DEFINE_GUID(TSATTRID_Font_FaceName, 0xb536aeb6,0x053b,0x4eb8,0xb6,0x5a,0x50,0xda,0x1e,0x81,0xe7,0x2e); -DEFINE_GUID(TSATTRID_Font_SizePts, 0xc8493302,0xa5e9,0x456d,0xaf,0x04,0x80,0x05,0xe4,0x13,0x0f,0x03); -DEFINE_GUID(TSATTRID_Font_Style, 0x68b2a77f,0x6b0e,0x4f28,0x81,0x77,0x57,0x1c,0x2f,0x3a,0x42,0xb1); -DEFINE_GUID(TSATTRID_Font_Style_Bold, 0x48813a43,0x8a20,0x4940,0x8e,0x58,0x97,0x82,0x3f,0x7b,0x26,0x8a); -DEFINE_GUID(TSATTRID_Font_Style_Italic, 0x8740682a,0xa765,0x48e1,0xac,0xfc,0xd2,0x22,0x22,0xb2,0xf8,0x10); -DEFINE_GUID(TSATTRID_Font_Style_SmallCaps, 0xfacb6bc6,0x9100,0x4cc6,0xb9,0x69,0x11,0xee,0xa4,0x5a,0x86,0xb4); -DEFINE_GUID(TSATTRID_Font_Style_Capitalize, 0x7d85a3ba,0xb4fd,0x43b3,0xbe,0xfc,0x6b,0x98,0x5c,0x84,0x31,0x41); -DEFINE_GUID(TSATTRID_Font_Style_Uppercase, 0x33a300e8,0xe340,0x4937,0xb6,0x97,0x8f,0x23,0x40,0x45,0xcd,0x9a); -DEFINE_GUID(TSATTRID_Font_Style_Lowercase, 0x76d8ccb5,0xca7b,0x4498,0x8e,0xe9,0xd5,0xc4,0xf6,0xf7,0x4c,0x60); -DEFINE_GUID(TSATTRID_Font_Style_Animation, 0xdcf73d22,0xe029,0x47b7,0xbb,0x36,0xf2,0x63,0xa3,0xd0,0x04,0xcc); -DEFINE_GUID(TSATTRID_Font_Style_Animation_LasVegasLights, 0xf40423d5,0x0f87,0x4f8f,0xba,0xda,0xe6,0xd6,0x0c,0x25,0xe1,0x52); -DEFINE_GUID(TSATTRID_Font_Style_Animation_BlinkingBackground, 0x86e5b104,0x0104,0x4b10,0xb5,0x85,0x00,0xf2,0x52,0x75,0x22,0xb5); -DEFINE_GUID(TSATTRID_Font_Style_Animation_SparkleText, 0x533aad20,0x962c,0x4e9f,0x8c,0x09,0xb4,0x2e,0xa4,0x74,0x97,0x11); -DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingBlackAnts, 0x7644e067,0xf186,0x4902,0xbf,0xc6,0xec,0x81,0x5a,0xa2,0x0e,0x9d); -DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingRedAnts, 0x78368dad,0x50fb,0x4c6f,0x84,0x0b,0xd4,0x86,0xbb,0x6c,0xf7,0x81); -DEFINE_GUID(TSATTRID_Font_Style_Animation_Shimmer, 0x2ce31b58,0x5293,0x4c36,0x88,0x09,0xbf,0x8b,0xb5,0x1a,0x27,0xb3); -DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeDown, 0x5872e874,0x367b,0x4803,0xb1,0x60,0xc9,0x0f,0xf6,0x25,0x69,0xd0); -DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeRight, 0xb855cbe3,0x3d2c,0x4600,0xb1,0xe9,0xe1,0xc9,0xce,0x02,0xf8,0x42); -DEFINE_GUID(TSATTRID_Font_Style_Emboss, 0xbd8ed742,0x349e,0x4e37,0x82,0xfb,0x43,0x79,0x79,0xcb,0x53,0xa7); -DEFINE_GUID(TSATTRID_Font_Style_Engrave, 0x9c3371de,0x8332,0x4897,0xbe,0x5d,0x89,0x23,0x32,0x23,0x17,0x9a); -DEFINE_GUID(TSATTRID_Font_Style_Hidden, 0xb1e28770,0x881c,0x475f,0x86,0x3f,0x88,0x7a,0x64,0x7b,0x10,0x90); -DEFINE_GUID(TSATTRID_Font_Style_Kerning, 0xcc26e1b4,0x2f9a,0x47c8,0x8b,0xff,0xbf,0x1e,0xb7,0xcc,0xe0,0xdd); -DEFINE_GUID(TSATTRID_Font_Style_Outlined, 0x10e6db31,0xdb0d,0x4ac6,0xa7,0xf5,0x9c,0x9c,0xff,0x6f,0x2a,0xb4); -DEFINE_GUID(TSATTRID_Font_Style_Position, 0x15cd26ab,0xf2fb,0x4062,0xb5,0xa6,0x9a,0x49,0xe1,0xa5,0xcc,0x0b); -DEFINE_GUID(TSATTRID_Font_Style_Protected, 0x1c557cb2,0x14cf,0x4554,0xa5,0x74,0xec,0xb2,0xf7,0xe7,0xef,0xd4); -DEFINE_GUID(TSATTRID_Font_Style_Shadow, 0x5f686d2f,0xc6cd,0x4c56,0x8a,0x1a,0x99,0x4a,0x4b,0x97,0x66,0xbe); -DEFINE_GUID(TSATTRID_Font_Style_Spacing, 0x98c1200d,0x8f06,0x409a,0x8e,0x49,0x6a,0x55,0x4b,0xf7,0xc1,0x53); -DEFINE_GUID(TSATTRID_Font_Style_Weight, 0x12f3189c,0x8bb0,0x461b,0xb1,0xfa,0xea,0xf9,0x07,0x04,0x7f,0xe0); -DEFINE_GUID(TSATTRID_Font_Style_Height, 0x7e937477,0x12e6,0x458b,0x92,0x6a,0x1f,0xa4,0x4e,0xe8,0xf3,0x91); -DEFINE_GUID(TSATTRID_Font_Style_Underline, 0xc3c9c9f3,0x7902,0x444b,0x9a,0x7b,0x48,0xe7,0x0f,0x4b,0x50,0xf7); -DEFINE_GUID(TSATTRID_Font_Style_Underline_Single, 0x1b6720e5,0x0f73,0x4951,0xa6,0xb3,0x6f,0x19,0xe4,0x3c,0x94,0x61); -DEFINE_GUID(TSATTRID_Font_Style_Underline_Double, 0x74d24aa6,0x1db3,0x4c69,0xa1,0x76,0x31,0x12,0x0e,0x75,0x86,0xd5); -DEFINE_GUID(TSATTRID_Font_Style_Strikethrough, 0x0c562193,0x2d08,0x4668,0x96,0x01,0xce,0xd4,0x13,0x09,0xd7,0xaf); -DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Single, 0x75d736b6,0x3c8f,0x4b97,0xab,0x78,0x18,0x77,0xcb,0x99,0x0d,0x31); -DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Double, 0x62489b31,0xa3e7,0x4f94,0xac,0x43,0xeb,0xaf,0x8f,0xcc,0x7a,0x9f); -DEFINE_GUID(TSATTRID_Font_Style_Overline, 0xe3989f4a,0x992b,0x4301,0x8c,0xe1,0xa5,0xb7,0xc6,0xd1,0xf3,0xc8); -DEFINE_GUID(TSATTRID_Font_Style_Overline_Single, 0x8440d94c,0x51ce,0x47b2,0x8d,0x4c,0x15,0x75,0x1e,0x5f,0x72,0x1b); -DEFINE_GUID(TSATTRID_Font_Style_Overline_Double, 0xdc46063a,0xe115,0x46e3,0xbc,0xd8,0xca,0x67,0x72,0xaa,0x95,0xb4); -DEFINE_GUID(TSATTRID_Font_Style_Blink, 0xbfb2c036,0x7acf,0x4532,0xb7,0x20,0xb4,0x16,0xdd,0x77,0x65,0xa8); -DEFINE_GUID(TSATTRID_Font_Style_Subscript, 0x5774fb84,0x389b,0x43bc,0xa7,0x4b,0x15,0x68,0x34,0x7c,0xf0,0xf4); -DEFINE_GUID(TSATTRID_Font_Style_Superscript, 0x2ea4993c,0x563c,0x49aa,0x93,0x72,0x0b,0xef,0x09,0xa9,0x25,0x5b); -DEFINE_GUID(TSATTRID_Font_Style_Color, 0x857a7a37,0xb8af,0x4e9a,0x81,0xb4,0xac,0xf7,0x00,0xc8,0x41,0x1b); -DEFINE_GUID(TSATTRID_Font_Style_BackgroundColor, 0xb50eaa4e,0x3091,0x4468,0x81,0xdb,0xd7,0x9e,0xa1,0x90,0xc7,0xc7); - -DEFINE_GUID(TSATTRID_Text, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); -DEFINE_GUID(TSATTRID_Text_VerticalWriting, 0x6bba8195,0x046f,0x4ea9,0xb3,0x11,0x97,0xfd,0x66,0xc4,0x27,0x4b); -DEFINE_GUID(TSATTRID_Text_RightToLeft, 0xca666e71,0x1b08,0x453d,0xbf,0xdd,0x28,0xe0,0x8c,0x8a,0xaf,0x7a); -DEFINE_GUID(TSATTRID_Text_Orientation, 0x6bab707f,0x8785,0x4c39,0x8b,0x52,0x96,0xf8,0x78,0x30,0x3f,0xfb); -DEFINE_GUID(TSATTRID_Text_Language, 0xd8c04ef1,0x5753,0x4c25,0x88,0x87,0x85,0x44,0x3f,0xe5,0xf8,0x19); -DEFINE_GUID(TSATTRID_Text_ReadOnly, 0x85836617,0xde32,0x4afd,0xa5,0x0f,0xa2,0xdb,0x11,0x0e,0x6e,0x4d); -DEFINE_GUID(TSATTRID_Text_EmbeddedObject, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); -DEFINE_GUID(TSATTRID_Text_Alignment, 0x139941e6,0x1767,0x456d,0x93,0x8e,0x35,0xba,0x56,0x8b,0x5c,0xd4); -DEFINE_GUID(TSATTRID_Text_Alignment_Left, 0x16ae95d3,0x6361,0x43a2,0x84,0x95,0xd0,0x0f,0x39,0x7f,0x16,0x93); -DEFINE_GUID(TSATTRID_Text_Alignment_Right, 0xb36f0f98,0x1b9e,0x4360,0x86,0x16,0x03,0xfb,0x08,0xa7,0x84,0x56); -DEFINE_GUID(TSATTRID_Text_Alignment_Center, 0xa4a95c16,0x53bf,0x4d55,0x8b,0x87,0x4b,0xdd,0x8d,0x42,0x75,0xfc); -DEFINE_GUID(TSATTRID_Text_Alignment_Justify, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); -DEFINE_GUID(TSATTRID_Text_Link, 0x47cd9051,0x3722,0x4cd8,0xb7,0xc8,0x4e,0x17,0xca,0x17,0x59,0xf5); -DEFINE_GUID(TSATTRID_Text_Hyphenation, 0xdadf4525,0x618e,0x49eb,0xb1,0xa8,0x3b,0x68,0xbd,0x76,0x48,0xe3); -DEFINE_GUID(TSATTRID_Text_Para, 0x5edc5822,0x99dc,0x4dd6,0xae,0xc3,0xb6,0x2b,0xaa,0x5b,0x2e,0x7c); -DEFINE_GUID(TSATTRID_Text_Para_FirstLineIndent, 0x07c97a13,0x7472,0x4dd8,0x90,0xa9,0x91,0xe3,0xd7,0xe4,0xf2,0x9c); -DEFINE_GUID(TSATTRID_Text_Para_LeftIndent, 0xfb2848e9,0x7471,0x41c9,0xb6,0xb3,0x8a,0x14,0x50,0xe0,0x18,0x97); -DEFINE_GUID(TSATTRID_Text_Para_RightIndent, 0x2c7f26f9,0xa5e2,0x48da,0xb9,0x8a,0x52,0x0c,0xb1,0x65,0x13,0xbf); -DEFINE_GUID(TSATTRID_Text_Para_SpaceAfter, 0x7b0a3f55,0x22dc,0x425f,0xa4,0x11,0x93,0xda,0x1d,0x8f,0x9b,0xaa); -DEFINE_GUID(TSATTRID_Text_Para_SpaceBefore, 0x8df98589,0x194a,0x4601,0xb2,0x51,0x98,0x65,0xa3,0xe9,0x06,0xdd); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing, 0x699b380d,0x7f8c,0x46d6,0xa7,0x3b,0xdf,0xe3,0xd1,0x53,0x8d,0xf3); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Single, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_OnePtFive, 0x0428a021,0x0397,0x4b57,0x9a,0x17,0x07,0x95,0x99,0x4c,0xd3,0xc5); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Double, 0x82fb1805,0xa6c4,0x4231,0xac,0x12,0x62,0x60,0xaf,0x2a,0xba,0x28); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_AtLeast, 0xadfedf31,0x2d44,0x4434,0xa5,0xff,0x7f,0x4c,0x49,0x90,0xa9,0x05); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Exactly, 0x3d45ad40,0x23de,0x48d7,0xa6,0xb3,0x76,0x54,0x20,0xc6,0x20,0xcc); -DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Multiple, 0x910f1e3c,0xd6d0,0x4f65,0x8a,0x3c,0x42,0xb4,0xb3,0x18,0x68,0xc5); - -DEFINE_GUID(TSATTRID_List, 0x436d673b,0x26f1,0x4aee,0x9e,0x65,0x8f,0x83,0xa4,0xed,0x48,0x84); -DEFINE_GUID(TSATTRID_List_LevelIndel, 0x7f7cc899,0x311f,0x487b,0xad,0x5d,0xe2,0xa4,0x59,0xe1,0x2d,0x42); -DEFINE_GUID(TSATTRID_List_Type, 0xae3e665e,0x4bce,0x49e3,0xa0,0xfe,0x2d,0xb4,0x7d,0x3a,0x17,0xae); -DEFINE_GUID(TSATTRID_List_Type_Bullet, 0xbccd77c5,0x4c4d,0x4ce2,0xb1,0x02,0x55,0x9f,0x3b,0x2b,0xfc,0xea); -DEFINE_GUID(TSATTRID_List_Type_Arabic, 0x1338c5d6,0x98a3,0x4fa3,0x9b,0xd1,0x7a,0x60,0xee,0xf8,0xe9,0xe0); -DEFINE_GUID(TSATTRID_List_Type_LowerLetter, 0x96372285,0xf3cf,0x491e,0xa9,0x25,0x38,0x32,0x34,0x7f,0xd2,0x37); -DEFINE_GUID(TSATTRID_List_Type_UpperLetter, 0x7987b7cd,0xce52,0x428b,0x9b,0x95,0xa3,0x57,0xf6,0xf1,0x0c,0x45); -DEFINE_GUID(TSATTRID_List_Type_LowerRoman, 0x90466262,0x3980,0x4b8e,0x93,0x68,0x91,0x8b,0xd1,0x21,0x8a,0x41); -DEFINE_GUID(TSATTRID_List_Type_UpperRoman, 0x0f6ab552,0x4a80,0x467f,0xb2,0xf1,0x12,0x7e,0x2a,0xa3,0xba,0x9e); - -DEFINE_GUID(TSATTRID_App, 0xa80f77df,0x4237,0x40e5,0x84,0x9c,0xb5,0xfa,0x51,0xc1,0x3a,0xc7); -DEFINE_GUID(TSATTRID_App_IncorrectSpelling, 0xf42de43c,0xef12,0x430d,0x94,0x4c,0x9a,0x08,0x97,0x0a,0x25,0xd2); -DEFINE_GUID(TSATTRID_App_IncorrectGrammar, 0xbd54e398,0xad03,0x4b74,0xb6,0xb3,0x5e,0xdb,0x19,0x99,0x63,0x88); - -#endif - +/** + * 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 _TSATTRS_H_ +#define _TSATTRS_H_ + +DEFINE_GUID(TSATTRID_OTHERS, 0xb3c32af9,0x57d0,0x46a9,0xbc,0xa8,0xda,0xc2,0x38,0xa1,0x30,0x57); + +DEFINE_GUID(TSATTRID_Font, 0x573ea825,0x749b,0x4f8a,0x9c,0xfd,0x21,0xc3,0x60,0x5c,0xa8,0x28); +DEFINE_GUID(TSATTRID_Font_FaceName, 0xb536aeb6,0x053b,0x4eb8,0xb6,0x5a,0x50,0xda,0x1e,0x81,0xe7,0x2e); +DEFINE_GUID(TSATTRID_Font_SizePts, 0xc8493302,0xa5e9,0x456d,0xaf,0x04,0x80,0x05,0xe4,0x13,0x0f,0x03); +DEFINE_GUID(TSATTRID_Font_Style, 0x68b2a77f,0x6b0e,0x4f28,0x81,0x77,0x57,0x1c,0x2f,0x3a,0x42,0xb1); +DEFINE_GUID(TSATTRID_Font_Style_Bold, 0x48813a43,0x8a20,0x4940,0x8e,0x58,0x97,0x82,0x3f,0x7b,0x26,0x8a); +DEFINE_GUID(TSATTRID_Font_Style_Italic, 0x8740682a,0xa765,0x48e1,0xac,0xfc,0xd2,0x22,0x22,0xb2,0xf8,0x10); +DEFINE_GUID(TSATTRID_Font_Style_SmallCaps, 0xfacb6bc6,0x9100,0x4cc6,0xb9,0x69,0x11,0xee,0xa4,0x5a,0x86,0xb4); +DEFINE_GUID(TSATTRID_Font_Style_Capitalize, 0x7d85a3ba,0xb4fd,0x43b3,0xbe,0xfc,0x6b,0x98,0x5c,0x84,0x31,0x41); +DEFINE_GUID(TSATTRID_Font_Style_Uppercase, 0x33a300e8,0xe340,0x4937,0xb6,0x97,0x8f,0x23,0x40,0x45,0xcd,0x9a); +DEFINE_GUID(TSATTRID_Font_Style_Lowercase, 0x76d8ccb5,0xca7b,0x4498,0x8e,0xe9,0xd5,0xc4,0xf6,0xf7,0x4c,0x60); +DEFINE_GUID(TSATTRID_Font_Style_Animation, 0xdcf73d22,0xe029,0x47b7,0xbb,0x36,0xf2,0x63,0xa3,0xd0,0x04,0xcc); +DEFINE_GUID(TSATTRID_Font_Style_Animation_LasVegasLights, 0xf40423d5,0x0f87,0x4f8f,0xba,0xda,0xe6,0xd6,0x0c,0x25,0xe1,0x52); +DEFINE_GUID(TSATTRID_Font_Style_Animation_BlinkingBackground, 0x86e5b104,0x0104,0x4b10,0xb5,0x85,0x00,0xf2,0x52,0x75,0x22,0xb5); +DEFINE_GUID(TSATTRID_Font_Style_Animation_SparkleText, 0x533aad20,0x962c,0x4e9f,0x8c,0x09,0xb4,0x2e,0xa4,0x74,0x97,0x11); +DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingBlackAnts, 0x7644e067,0xf186,0x4902,0xbf,0xc6,0xec,0x81,0x5a,0xa2,0x0e,0x9d); +DEFINE_GUID(TSATTRID_Font_Style_Animation_MarchingRedAnts, 0x78368dad,0x50fb,0x4c6f,0x84,0x0b,0xd4,0x86,0xbb,0x6c,0xf7,0x81); +DEFINE_GUID(TSATTRID_Font_Style_Animation_Shimmer, 0x2ce31b58,0x5293,0x4c36,0x88,0x09,0xbf,0x8b,0xb5,0x1a,0x27,0xb3); +DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeDown, 0x5872e874,0x367b,0x4803,0xb1,0x60,0xc9,0x0f,0xf6,0x25,0x69,0xd0); +DEFINE_GUID(TSATTRID_Font_Style_Animation_WipeRight, 0xb855cbe3,0x3d2c,0x4600,0xb1,0xe9,0xe1,0xc9,0xce,0x02,0xf8,0x42); +DEFINE_GUID(TSATTRID_Font_Style_Emboss, 0xbd8ed742,0x349e,0x4e37,0x82,0xfb,0x43,0x79,0x79,0xcb,0x53,0xa7); +DEFINE_GUID(TSATTRID_Font_Style_Engrave, 0x9c3371de,0x8332,0x4897,0xbe,0x5d,0x89,0x23,0x32,0x23,0x17,0x9a); +DEFINE_GUID(TSATTRID_Font_Style_Hidden, 0xb1e28770,0x881c,0x475f,0x86,0x3f,0x88,0x7a,0x64,0x7b,0x10,0x90); +DEFINE_GUID(TSATTRID_Font_Style_Kerning, 0xcc26e1b4,0x2f9a,0x47c8,0x8b,0xff,0xbf,0x1e,0xb7,0xcc,0xe0,0xdd); +DEFINE_GUID(TSATTRID_Font_Style_Outlined, 0x10e6db31,0xdb0d,0x4ac6,0xa7,0xf5,0x9c,0x9c,0xff,0x6f,0x2a,0xb4); +DEFINE_GUID(TSATTRID_Font_Style_Position, 0x15cd26ab,0xf2fb,0x4062,0xb5,0xa6,0x9a,0x49,0xe1,0xa5,0xcc,0x0b); +DEFINE_GUID(TSATTRID_Font_Style_Protected, 0x1c557cb2,0x14cf,0x4554,0xa5,0x74,0xec,0xb2,0xf7,0xe7,0xef,0xd4); +DEFINE_GUID(TSATTRID_Font_Style_Shadow, 0x5f686d2f,0xc6cd,0x4c56,0x8a,0x1a,0x99,0x4a,0x4b,0x97,0x66,0xbe); +DEFINE_GUID(TSATTRID_Font_Style_Spacing, 0x98c1200d,0x8f06,0x409a,0x8e,0x49,0x6a,0x55,0x4b,0xf7,0xc1,0x53); +DEFINE_GUID(TSATTRID_Font_Style_Weight, 0x12f3189c,0x8bb0,0x461b,0xb1,0xfa,0xea,0xf9,0x07,0x04,0x7f,0xe0); +DEFINE_GUID(TSATTRID_Font_Style_Height, 0x7e937477,0x12e6,0x458b,0x92,0x6a,0x1f,0xa4,0x4e,0xe8,0xf3,0x91); +DEFINE_GUID(TSATTRID_Font_Style_Underline, 0xc3c9c9f3,0x7902,0x444b,0x9a,0x7b,0x48,0xe7,0x0f,0x4b,0x50,0xf7); +DEFINE_GUID(TSATTRID_Font_Style_Underline_Single, 0x1b6720e5,0x0f73,0x4951,0xa6,0xb3,0x6f,0x19,0xe4,0x3c,0x94,0x61); +DEFINE_GUID(TSATTRID_Font_Style_Underline_Double, 0x74d24aa6,0x1db3,0x4c69,0xa1,0x76,0x31,0x12,0x0e,0x75,0x86,0xd5); +DEFINE_GUID(TSATTRID_Font_Style_Strikethrough, 0x0c562193,0x2d08,0x4668,0x96,0x01,0xce,0xd4,0x13,0x09,0xd7,0xaf); +DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Single, 0x75d736b6,0x3c8f,0x4b97,0xab,0x78,0x18,0x77,0xcb,0x99,0x0d,0x31); +DEFINE_GUID(TSATTRID_Font_Style_Strikethrough_Double, 0x62489b31,0xa3e7,0x4f94,0xac,0x43,0xeb,0xaf,0x8f,0xcc,0x7a,0x9f); +DEFINE_GUID(TSATTRID_Font_Style_Overline, 0xe3989f4a,0x992b,0x4301,0x8c,0xe1,0xa5,0xb7,0xc6,0xd1,0xf3,0xc8); +DEFINE_GUID(TSATTRID_Font_Style_Overline_Single, 0x8440d94c,0x51ce,0x47b2,0x8d,0x4c,0x15,0x75,0x1e,0x5f,0x72,0x1b); +DEFINE_GUID(TSATTRID_Font_Style_Overline_Double, 0xdc46063a,0xe115,0x46e3,0xbc,0xd8,0xca,0x67,0x72,0xaa,0x95,0xb4); +DEFINE_GUID(TSATTRID_Font_Style_Blink, 0xbfb2c036,0x7acf,0x4532,0xb7,0x20,0xb4,0x16,0xdd,0x77,0x65,0xa8); +DEFINE_GUID(TSATTRID_Font_Style_Subscript, 0x5774fb84,0x389b,0x43bc,0xa7,0x4b,0x15,0x68,0x34,0x7c,0xf0,0xf4); +DEFINE_GUID(TSATTRID_Font_Style_Superscript, 0x2ea4993c,0x563c,0x49aa,0x93,0x72,0x0b,0xef,0x09,0xa9,0x25,0x5b); +DEFINE_GUID(TSATTRID_Font_Style_Color, 0x857a7a37,0xb8af,0x4e9a,0x81,0xb4,0xac,0xf7,0x00,0xc8,0x41,0x1b); +DEFINE_GUID(TSATTRID_Font_Style_BackgroundColor, 0xb50eaa4e,0x3091,0x4468,0x81,0xdb,0xd7,0x9e,0xa1,0x90,0xc7,0xc7); + +DEFINE_GUID(TSATTRID_Text, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); +DEFINE_GUID(TSATTRID_Text_VerticalWriting, 0x6bba8195,0x046f,0x4ea9,0xb3,0x11,0x97,0xfd,0x66,0xc4,0x27,0x4b); +DEFINE_GUID(TSATTRID_Text_RightToLeft, 0xca666e71,0x1b08,0x453d,0xbf,0xdd,0x28,0xe0,0x8c,0x8a,0xaf,0x7a); +DEFINE_GUID(TSATTRID_Text_Orientation, 0x6bab707f,0x8785,0x4c39,0x8b,0x52,0x96,0xf8,0x78,0x30,0x3f,0xfb); +DEFINE_GUID(TSATTRID_Text_Language, 0xd8c04ef1,0x5753,0x4c25,0x88,0x87,0x85,0x44,0x3f,0xe5,0xf8,0x19); +DEFINE_GUID(TSATTRID_Text_ReadOnly, 0x85836617,0xde32,0x4afd,0xa5,0x0f,0xa2,0xdb,0x11,0x0e,0x6e,0x4d); +DEFINE_GUID(TSATTRID_Text_EmbeddedObject, 0x7edb8e68,0x81f9,0x449d,0xa1,0x5a,0x87,0xa8,0x38,0x8f,0xaa,0xc0); +DEFINE_GUID(TSATTRID_Text_Alignment, 0x139941e6,0x1767,0x456d,0x93,0x8e,0x35,0xba,0x56,0x8b,0x5c,0xd4); +DEFINE_GUID(TSATTRID_Text_Alignment_Left, 0x16ae95d3,0x6361,0x43a2,0x84,0x95,0xd0,0x0f,0x39,0x7f,0x16,0x93); +DEFINE_GUID(TSATTRID_Text_Alignment_Right, 0xb36f0f98,0x1b9e,0x4360,0x86,0x16,0x03,0xfb,0x08,0xa7,0x84,0x56); +DEFINE_GUID(TSATTRID_Text_Alignment_Center, 0xa4a95c16,0x53bf,0x4d55,0x8b,0x87,0x4b,0xdd,0x8d,0x42,0x75,0xfc); +DEFINE_GUID(TSATTRID_Text_Alignment_Justify, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); +DEFINE_GUID(TSATTRID_Text_Link, 0x47cd9051,0x3722,0x4cd8,0xb7,0xc8,0x4e,0x17,0xca,0x17,0x59,0xf5); +DEFINE_GUID(TSATTRID_Text_Hyphenation, 0xdadf4525,0x618e,0x49eb,0xb1,0xa8,0x3b,0x68,0xbd,0x76,0x48,0xe3); +DEFINE_GUID(TSATTRID_Text_Para, 0x5edc5822,0x99dc,0x4dd6,0xae,0xc3,0xb6,0x2b,0xaa,0x5b,0x2e,0x7c); +DEFINE_GUID(TSATTRID_Text_Para_FirstLineIndent, 0x07c97a13,0x7472,0x4dd8,0x90,0xa9,0x91,0xe3,0xd7,0xe4,0xf2,0x9c); +DEFINE_GUID(TSATTRID_Text_Para_LeftIndent, 0xfb2848e9,0x7471,0x41c9,0xb6,0xb3,0x8a,0x14,0x50,0xe0,0x18,0x97); +DEFINE_GUID(TSATTRID_Text_Para_RightIndent, 0x2c7f26f9,0xa5e2,0x48da,0xb9,0x8a,0x52,0x0c,0xb1,0x65,0x13,0xbf); +DEFINE_GUID(TSATTRID_Text_Para_SpaceAfter, 0x7b0a3f55,0x22dc,0x425f,0xa4,0x11,0x93,0xda,0x1d,0x8f,0x9b,0xaa); +DEFINE_GUID(TSATTRID_Text_Para_SpaceBefore, 0x8df98589,0x194a,0x4601,0xb2,0x51,0x98,0x65,0xa3,0xe9,0x06,0xdd); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing, 0x699b380d,0x7f8c,0x46d6,0xa7,0x3b,0xdf,0xe3,0xd1,0x53,0x8d,0xf3); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Single, 0xed350740,0xa0f7,0x42d3,0x8e,0xa8,0xf8,0x1b,0x64,0x88,0xfa,0xf0); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_OnePtFive, 0x0428a021,0x0397,0x4b57,0x9a,0x17,0x07,0x95,0x99,0x4c,0xd3,0xc5); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Double, 0x82fb1805,0xa6c4,0x4231,0xac,0x12,0x62,0x60,0xaf,0x2a,0xba,0x28); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_AtLeast, 0xadfedf31,0x2d44,0x4434,0xa5,0xff,0x7f,0x4c,0x49,0x90,0xa9,0x05); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Exactly, 0x3d45ad40,0x23de,0x48d7,0xa6,0xb3,0x76,0x54,0x20,0xc6,0x20,0xcc); +DEFINE_GUID(TSATTRID_Text_Para_LineSpacing_Multiple, 0x910f1e3c,0xd6d0,0x4f65,0x8a,0x3c,0x42,0xb4,0xb3,0x18,0x68,0xc5); + +DEFINE_GUID(TSATTRID_List, 0x436d673b,0x26f1,0x4aee,0x9e,0x65,0x8f,0x83,0xa4,0xed,0x48,0x84); +DEFINE_GUID(TSATTRID_List_LevelIndel, 0x7f7cc899,0x311f,0x487b,0xad,0x5d,0xe2,0xa4,0x59,0xe1,0x2d,0x42); +DEFINE_GUID(TSATTRID_List_Type, 0xae3e665e,0x4bce,0x49e3,0xa0,0xfe,0x2d,0xb4,0x7d,0x3a,0x17,0xae); +DEFINE_GUID(TSATTRID_List_Type_Bullet, 0xbccd77c5,0x4c4d,0x4ce2,0xb1,0x02,0x55,0x9f,0x3b,0x2b,0xfc,0xea); +DEFINE_GUID(TSATTRID_List_Type_Arabic, 0x1338c5d6,0x98a3,0x4fa3,0x9b,0xd1,0x7a,0x60,0xee,0xf8,0xe9,0xe0); +DEFINE_GUID(TSATTRID_List_Type_LowerLetter, 0x96372285,0xf3cf,0x491e,0xa9,0x25,0x38,0x32,0x34,0x7f,0xd2,0x37); +DEFINE_GUID(TSATTRID_List_Type_UpperLetter, 0x7987b7cd,0xce52,0x428b,0x9b,0x95,0xa3,0x57,0xf6,0xf1,0x0c,0x45); +DEFINE_GUID(TSATTRID_List_Type_LowerRoman, 0x90466262,0x3980,0x4b8e,0x93,0x68,0x91,0x8b,0xd1,0x21,0x8a,0x41); +DEFINE_GUID(TSATTRID_List_Type_UpperRoman, 0x0f6ab552,0x4a80,0x467f,0xb2,0xf1,0x12,0x7e,0x2a,0xa3,0xba,0x9e); + +DEFINE_GUID(TSATTRID_App, 0xa80f77df,0x4237,0x40e5,0x84,0x9c,0xb5,0xfa,0x51,0xc1,0x3a,0xc7); +DEFINE_GUID(TSATTRID_App_IncorrectSpelling, 0xf42de43c,0xef12,0x430d,0x94,0x4c,0x9a,0x08,0x97,0x0a,0x25,0xd2); +DEFINE_GUID(TSATTRID_App_IncorrectGrammar, 0xbd54e398,0xad03,0x4b74,0xb6,0xb3,0x5e,0xdb,0x19,0x99,0x63,0x88); + +#endif + diff --git a/lib/libc/include/any-windows-any/tsuserex_i.c b/lib/libc/include/any-windows-any/tsuserex_i.c deleted file mode 100644 index 735d6b7d78..0000000000 --- a/lib/libc/include/any-windows-any/tsuserex_i.c +++ /dev/null @@ -1,53 +0,0 @@ -/** - * 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. - */ -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#ifdef _MIDL_USE_GUIDDEF_ - -#ifndef INITGUID -#define INITGUID -#include -#undef INITGUID -#else -#include -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -#else - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - typedef struct _IID { - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; - } IID; -#endif - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED - typedef IID CLSID; -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif - - MIDL_DEFINE_GUID(IID,LIBID_TSUSEREXLib,0x45413F04,0xDF86,0x11D1,0xAE,0x27,0x00,0xC0,0x4F,0xA3,0x58,0x13); - MIDL_DEFINE_GUID(CLSID,CLSID_TSUserExInterfaces,0x0910dd01,0xdf8c,0x11d1,0xae,0x27,0x00,0xc0,0x4f,0xa3,0x58,0x13); - MIDL_DEFINE_GUID(IID,IID_IADsTSUserEx,0xC4930E79,0x2989,0x4462,0x8A,0x60,0x2F,0xCF,0x2F,0x29,0x55,0xEF); - MIDL_DEFINE_GUID(CLSID,CLSID_ADsTSUserEx,0xE2E9CAE6,0x1E7B,0x4B8E,0xBA,0xBD,0xE9,0xBF,0x62,0x92,0xAC,0x29); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif diff --git a/lib/libc/include/any-windows-any/tsvirtualchannels.h b/lib/libc/include/any-windows-any/tsvirtualchannels.h index 7d8339b8ee..a02d2e8ea5 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.0-rc1 from include/tsvirtualchannels.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e34cb57c40..e057a850f1 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.0-rc1 from include/tuner.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/tuner.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/uianimation.h b/lib/libc/include/any-windows-any/uianimation.h index df02ca0cd6..28d6219b79 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.0-rc1 from include/uianimation.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 bff5b3e176..1c59acd6d4 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.0-rc1 from include/uiautomationclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 775e5e2504..e79b2800c9 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.0-rc1 from include/uiautomationcore.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 eeefdd5b28..53898728b2 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.0-rc1 from include/uiviewsettingsinterop.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/uiviewsettingsinterop.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/unknwn.h b/lib/libc/include/any-windows-any/unknwn.h index a2cc43d23c..98c00ca3e9 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.0-rc1 from include/unknwn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b587289d1c..61544a8709 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.0-rc1 from include/unknwnbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5dc1ad9fd5..ce038ab9e2 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.0-rc1 from include/urlhist.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 015c7342db..d677106ff3 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.0-rc1 from include/urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/urlmon.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/usp10.h b/lib/libc/include/any-windows-any/usp10.h index c276f480a3..9f04255100 100644 --- a/lib/libc/include/any-windows-any/usp10.h +++ b/lib/libc/include/any-windows-any/usp10.h @@ -129,7 +129,7 @@ extern "C" { SCRIPT_JUSTIFY_ARABIC_BA = 12, SCRIPT_JUSTIFY_ARABIC_BARA = 13, SCRIPT_JUSTIFY_ARABIC_SEEN = 14, - SCRIPT_JUSTIFY_ARABIC_SEEN_M = 15, + SCRIPT_JUSTIFY_ARABIC_SEEN_M = 15 } SCRIPT_JUSTIFY; typedef struct tag_SCRIPT_VISATTR { diff --git a/lib/libc/include/any-windows-any/uxtheme.h b/lib/libc/include/any-windows-any/uxtheme.h index d4f43c98a8..250f9b4979 100644 --- a/lib/libc/include/any-windows-any/uxtheme.h +++ b/lib/libc/include/any-windows-any/uxtheme.h @@ -39,7 +39,7 @@ typedef enum TA_PROPERTY { TAP_STAGGERDELAY, TAP_STAGGERDELAYCAP, TAP_STAGGERDELAYFACTOR, - TAP_ZORDER, + TAP_ZORDER } TA_PROPERTY; typedef enum TA_PROPERTY_FLAG { @@ -48,7 +48,7 @@ typedef enum TA_PROPERTY_FLAG { TAPF_ISRTLAWARE = 0x2, TAPF_ALLOWCOLLECTION = 0x4, TAPF_HASBACKGROUND = 0x8, - TAPF_HASPERSPECTIVE = 0x10, + TAPF_HASPERSPECTIVE = 0x10 } TA_PROPERTY_FLAG; THEMEAPI GetThemeAnimationProperty(HTHEME hTheme, int iStoryboardId, int iTargetId, TA_PROPERTY eProperty, VOID *pvProperty, DWORD cbSize, DWORD *pcbSizeOut); @@ -57,14 +57,14 @@ typedef enum TA_TRANSFORM_TYPE { TATT_TRANSLATE_2D, TATT_SCALE_2D, TATT_OPACITY, - TATT_CLIP, + TATT_CLIP } TA_TRANSFORM_TYPE; typedef enum TA_TRANSFORM_FLAG { TATF_NONE = 0x0, TATF_TARGETVALUES_USER = 0x1, TATF_HASINITIALVALUES = 0x2, - TATF_HASORIGINVALUES = 0x4, + TATF_HASORIGINVALUES = 0x4 } TA_TRANSFORM_FLAG; typedef struct TA_TRANSFORM { @@ -107,7 +107,7 @@ THEMEAPI GetThemeAnimationTransform(HTHEME hTheme, int iStoryboardId, int iTarge typedef enum TA_TIMINGFUNCTION_TYPE { TTFT_UNDEFINED, - TTFT_CUBIC_BEZIER, + TTFT_CUBIC_BEZIER } TA_TIMINGFUNCTION_TYPE; typedef struct TA_TIMINGFUNCTION { diff --git a/lib/libc/include/any-windows-any/vdslun.h b/lib/libc/include/any-windows-any/vdslun.h index 409e74f03c..6a3f8b54e9 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.0-rc1 from include/vdslun.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 38dda1ad1f..440895482d 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.0-rc1 from include/vidcap.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c968813984..319222a390 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.0-rc1 from include/vmr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 54627433c6..290d316da2 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.0-rc1 from include/vsadmin.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7c62b7457e..08bd51fd3b 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.0-rc1 from include/vsbackup.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 14eadea44e..adcc65038a 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.0-rc1 from include/vsmgmt.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 54d5de6f45..870f287ca6 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.0-rc1 from include/vsprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c6e9e1f9e9..42d5ddb451 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.0-rc1 from include/vss.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/vss.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/vsstyle.h b/lib/libc/include/any-windows-any/vsstyle.h index 85403783ad..9c250b6c37 100644 --- a/lib/libc/include/any-windows-any/vsstyle.h +++ b/lib/libc/include/any-windows-any/vsstyle.h @@ -66,22 +66,22 @@ enum AEROWIZARDPARTS { AW_HEADERAREA = 2, AW_CONTENTAREA = 3, AW_COMMANDAREA = 4, - AW_BUTTON = 5, + AW_BUTTON = 5 }; #define AEROWIZARDSTYLEPARTS AEROWIZARDPARTS; enum TITLEBARSTATES { AW_S_TITLEBAR_ACTIVE = 1, - AW_S_TITLEBAR_INACTIVE = 2, + AW_S_TITLEBAR_INACTIVE = 2 }; enum HEADERAREASTATES { - AW_S_HEADERAREA_NOMARGIN = 1, + AW_S_HEADERAREA_NOMARGIN = 1 }; enum CONTENTAREASTATES { - AW_S_CONTENTAREA_NOMARGIN = 1, + AW_S_CONTENTAREA_NOMARGIN = 1 }; /* BUTTONSTYLE class */ @@ -103,7 +103,7 @@ enum BUTTONPARTS { BP_GROUPBOX = 4, BP_USERBUTTON = 5, BP_COMMANDLINK = 6, - BP_COMMANDLINKGLYPH = 7, + BP_COMMANDLINKGLYPH = 7 }; #define BUTTONSTYLEPARTS BUTTONPARTS; @@ -114,7 +114,7 @@ enum PUSHBUTTONSTATES { PBS_PRESSED = 3, PBS_DISABLED = 4, PBS_DEFAULTED = 5, - PBS_DEFAULTED_ANIMATING = 6, + PBS_DEFAULTED_ANIMATING = 6 }; enum RADIOBUTTONSTATES { @@ -125,7 +125,7 @@ enum RADIOBUTTONSTATES { RBS_CHECKEDNORMAL = 5, RBS_CHECKEDHOT = 6, RBS_CHECKEDPRESSED = 7, - RBS_CHECKEDDISABLED = 8, + RBS_CHECKEDDISABLED = 8 }; enum CHECKBOXSTATES { @@ -148,12 +148,12 @@ enum CHECKBOXSTATES { CBS_EXCLUDEDNORMAL = 17, CBS_EXCLUDEDHOT = 18, CBS_EXCLUDEDPRESSED = 19, - CBS_EXCLUDEDDISABLED = 20, + CBS_EXCLUDEDDISABLED = 20 }; enum GROUPBOXSTATES { GBS_NORMAL = 1, - GBS_DISABLED = 2, + GBS_DISABLED = 2 }; enum COMMANDLINKSTATES { @@ -162,7 +162,7 @@ enum COMMANDLINKSTATES { CMDLS_PRESSED = 3, CMDLS_DISABLED = 4, CMDLS_DEFAULTED = 5, - CMDLS_DEFAULTED_ANIMATING = 6, + CMDLS_DEFAULTED_ANIMATING = 6 }; enum COMMANDLINKGLYPHSTATES { @@ -170,7 +170,7 @@ enum COMMANDLINKGLYPHSTATES { CMDLGS_HOT = 2, CMDLGS_PRESSED = 3, CMDLGS_DISABLED = 4, - CMDLGS_DEFAULTED = 5, + CMDLGS_DEFAULTED = 5 }; /* COMBOBOXSTYLE class */ @@ -193,7 +193,7 @@ enum COMBOBOXPARTS { CP_READONLY = 5, CP_DROPDOWNBUTTONRIGHT = 6, CP_DROPDOWNBUTTONLEFT = 7, - CP_CUEBANNER = 8, + CP_CUEBANNER = 8 }; #define COMBOBOXSTYLEPARTS COMBOBOXPARTS; @@ -202,49 +202,49 @@ enum COMBOBOXSTYLESTATES { CBXS_NORMAL = 1, CBXS_HOT = 2, CBXS_PRESSED = 3, - CBXS_DISABLED = 4, + CBXS_DISABLED = 4 }; enum DROPDOWNBUTTONRIGHTSTATES { CBXSR_NORMAL = 1, CBXSR_HOT = 2, CBXSR_PRESSED = 3, - CBXSR_DISABLED = 4, + CBXSR_DISABLED = 4 }; enum DROPDOWNBUTTONLEFTSTATES { CBXSL_NORMAL = 1, CBXSL_HOT = 2, CBXSL_PRESSED = 3, - CBXSL_DISABLED = 4, + CBXSL_DISABLED = 4 }; enum TRANSPARENTBACKGROUNDSTATES { CBTBS_NORMAL = 1, CBTBS_HOT = 2, CBTBS_DISABLED = 3, - CBTBS_FOCUSED = 4, + CBTBS_FOCUSED = 4 }; enum BORDERSTATES { CBB_NORMAL = 1, CBB_HOT = 2, CBB_FOCUSED = 3, - CBB_DISABLED = 4, + CBB_DISABLED = 4 }; enum READONLYSTATES { CBRO_NORMAL = 1, CBRO_HOT = 2, CBRO_PRESSED = 3, - CBRO_DISABLED = 4, + CBRO_DISABLED = 4 }; enum CUEBANNERSTATES { CBCB_NORMAL = 1, CBCB_HOT = 2, CBCB_PRESSED = 3, - CBCB_DISABLED = 4, + CBCB_DISABLED = 4 }; /* COMMUNICATIONSSTYLE class */ @@ -260,7 +260,7 @@ static const WCHAR VSCLASS_COMMUNICATIONS [] = {'C','O','M','M','U','N','I','C', #endif enum COMMUNICATIONSPARTS { - CSST_TAB = 1, + CSST_TAB = 1 }; #define COMMUNICATIONSSTYLEPARTS COMMUNICATIONSPARTS; @@ -268,7 +268,7 @@ enum COMMUNICATIONSPARTS { enum TABSTATES { CSTB_NORMAL = 1, CSTB_HOT = 2, - CSTB_SELECTED = 3, + CSTB_SELECTED = 3 }; /* CONTROLPANELSTYLE class */ @@ -302,7 +302,7 @@ enum CONTROLPANELPARTS { CPANEL_NAVIGATIONPANELINE = 16, CPANEL_CONTENTPANELINE = 17, CPANEL_BANNERAREA = 18, - CPANEL_BODYTITLE = 19, + CPANEL_BODYTITLE = 19 }; #define CONTROLPANELSTYLEPARTS CONTROLPANELPARTS; @@ -311,7 +311,7 @@ enum HELPLINKSTATES { CPHL_NORMAL = 1, CPHL_HOT = 2, CPHL_PRESSED = 3, - CPHL_DISABLED = 4, + CPHL_DISABLED = 4 }; enum TASKLINKSTATES { @@ -319,19 +319,19 @@ enum TASKLINKSTATES { CPTL_HOT = 2, CPTL_PRESSED = 3, CPTL_DISABLED = 4, - CPTL_PAGE = 5, + CPTL_PAGE = 5 }; enum CONTENTLINKSTATES { CPCL_NORMAL = 1, CPCL_HOT = 2, CPCL_PRESSED = 3, - CPCL_DISABLED = 4, + CPCL_DISABLED = 4 }; enum SECTIONTITLELINKSTATES { CPSTL_NORMAL = 1, - CPSTL_HOT = 2, + CPSTL_HOT = 2 }; /* DATEPICKERSTYLE class */ @@ -349,7 +349,7 @@ static const WCHAR VSCLASS_DATEPICKER [] = {'D','A','T','E','P','I','C','K','E', enum DATEPICKERPARTS { DP_DATETEXT = 1, DP_DATEBORDER = 2, - DP_SHOWCALENDARBUTTONRIGHT = 3, + DP_SHOWCALENDARBUTTONRIGHT = 3 }; #define DATEPICKERSTYLEPARTS DATEPICKERPARTS; @@ -357,21 +357,21 @@ enum DATEPICKERPARTS { enum DATETEXTSTATES { DPDT_NORMAL = 1, DPDT_DISABLED = 2, - DPDT_SELECTED = 3, + DPDT_SELECTED = 3 }; enum DATEBORDERSTATES { DPDB_NORMAL = 1, DPDB_HOT = 2, DPDB_FOCUSED = 3, - DPDB_DISABLED = 4, + DPDB_DISABLED = 4 }; enum SHOWCALENDARBUTTONRIGHTSTATES { DPSCBR_NORMAL = 1, DPSCBR_HOT = 2, DPSCBR_PRESSED = 3, - DPSCBR_DISABLED = 4, + DPSCBR_DISABLED = 4 }; /* DRAGDROPSTYLE class */ @@ -394,39 +394,39 @@ enum DRAGDROPPARTS { DD_WARNING = 5, DD_NONE = 6, DD_IMAGEBG = 7, - DD_TEXTBG = 8, + DD_TEXTBG = 8 }; #define DRAGDROPSTYLEPARTS DRAGDROPPARTS; enum COPYSTATES { DDCOPY_HIGHLIGHT = 1, - DDCOPY_NOHIGHLIGHT = 2, + DDCOPY_NOHIGHLIGHT = 2 }; enum MOVESTATES { DDMOVE_HIGHLIGHT = 1, - DDMOVE_NOHIGHLIGHT = 2, + DDMOVE_NOHIGHLIGHT = 2 }; enum UPDATEMETADATASTATES { DDUPDATEMETADATA_HIGHLIGHT = 1, - DDUPDATEMETADATA_NOHIGHLIGHT = 2, + DDUPDATEMETADATA_NOHIGHLIGHT = 2 }; enum CREATELINKSTATES { DDCREATELINK_HIGHLIGHT = 1, - DDCREATELINK_NOHIGHLIGHT = 2, + DDCREATELINK_NOHIGHLIGHT = 2 }; enum WARNINGSTATES { DDWARNING_HIGHLIGHT = 1, - DDWARNING_NOHIGHLIGHT = 2, + DDWARNING_NOHIGHLIGHT = 2 }; enum NONESTATES { DDNONE_HIGHLIGHT = 1, - DDNONE_NOHIGHLIGHT = 2, + DDNONE_NOHIGHLIGHT = 2 }; /* EDITSTYLE class */ @@ -450,7 +450,7 @@ enum EDITPARTS { EP_EDITBORDER_NOSCROLL = 6, EP_EDITBORDER_HSCROLL = 7, EP_EDITBORDER_VSCROLL = 8, - EP_EDITBORDER_HVSCROLL = 9, + EP_EDITBORDER_HVSCROLL = 9 }; #define EDITSTYLEPARTS EDITPARTS; @@ -463,7 +463,7 @@ enum EDITTEXTSTATES { ETS_FOCUSED = 5, ETS_READONLY = 6, ETS_ASSIST = 7, - ETS_CUEBANNER = 8, + ETS_CUEBANNER = 8 }; enum BACKGROUNDSTATES { @@ -472,42 +472,42 @@ enum BACKGROUNDSTATES { EBS_DISABLED = 3, EBS_FOCUSED = 4, EBS_READONLY = 5, - EBS_ASSIST = 6, + EBS_ASSIST = 6 }; enum BACKGROUNDWITHBORDERSTATES { EBWBS_NORMAL = 1, EBWBS_HOT = 2, EBWBS_DISABLED = 3, - EBWBS_FOCUSED = 4, + EBWBS_FOCUSED = 4 }; enum EDITBORDER_NOSCROLLSTATES { EPSN_NORMAL = 1, EPSN_HOT = 2, EPSN_FOCUSED = 3, - EPSN_DISABLED = 4, + EPSN_DISABLED = 4 }; enum EDITBORDER_HSCROLLSTATES { EPSH_NORMAL = 1, EPSH_HOT = 2, EPSH_FOCUSED = 3, - EPSH_DISABLED = 4, + EPSH_DISABLED = 4 }; enum EDITBORDER_VSCROLLSTATES { EPSV_NORMAL = 1, EPSV_HOT = 2, EPSV_FOCUSED = 3, - EPSV_DISABLED = 4, + EPSV_DISABLED = 4 }; enum EDITBORDER_HVSCROLLSTATES { EPSHV_NORMAL = 1, EPSHV_HOT = 2, EPSHV_FOCUSED = 3, - EPSHV_DISABLED = 4, + EPSHV_DISABLED = 4 }; /* EXPLORERBARSTYLE class */ @@ -534,7 +534,7 @@ enum EXPLORERBARPARTS { EBP_SPECIALGROUPBACKGROUND = 9, EBP_SPECIALGROUPCOLLAPSE = 10, EBP_SPECIALGROUPEXPAND = 11, - EBP_SPECIALGROUPHEAD = 12, + EBP_SPECIALGROUPHEAD = 12 }; #define EXPLORERBARSTYLEPARTS EXPLORERBARPARTS; @@ -542,7 +542,7 @@ enum EXPLORERBARPARTS { enum HEADERCLOSESTATES { EBHC_NORMAL = 1, EBHC_HOT = 2, - EBHC_PRESSED = 3, + EBHC_PRESSED = 3 }; enum HEADERPINSTATES { @@ -551,37 +551,37 @@ enum HEADERPINSTATES { EBHP_PRESSED = 3, EBHP_SELECTEDNORMAL = 4, EBHP_SELECTEDHOT = 5, - EBHP_SELECTEDPRESSED = 6, + EBHP_SELECTEDPRESSED = 6 }; enum IEBARMENUSTATES { EBM_NORMAL = 1, EBM_HOT = 2, - EBM_PRESSED = 3, + EBM_PRESSED = 3 }; enum NORMALGROUPCOLLAPSESTATES { EBNGC_NORMAL = 1, EBNGC_HOT = 2, - EBNGC_PRESSED = 3, + EBNGC_PRESSED = 3 }; enum NORMALGROUPEXPANDSTATES { EBNGE_NORMAL = 1, EBNGE_HOT = 2, - EBNGE_PRESSED = 3, + EBNGE_PRESSED = 3 }; enum SPECIALGROUPCOLLAPSESTATES { EBSGC_NORMAL = 1, EBSGC_HOT = 2, - EBSGC_PRESSED = 3, + EBSGC_PRESSED = 3 }; enum SPECIALGROUPEXPANDSTATES { EBSGE_NORMAL = 1, EBSGE_HOT = 2, - EBSGE_PRESSED = 3, + EBSGE_PRESSED = 3 }; /* FLYOUTSTYLE class */ @@ -604,7 +604,7 @@ enum FLYOUTPARTS { FLYOUT_DIVIDER = 5, FLYOUT_WINDOW = 6, FLYOUT_LINKAREA = 7, - FLYOUT_LINKHEADER = 8, + FLYOUT_LINKHEADER = 8 }; #define FLYOUTSTYLEPARTS FLYOUTPARTS; @@ -613,22 +613,22 @@ enum LABELSTATES { FLS_NORMAL = 1, FLS_SELECTED = 2, FLS_EMPHASIZED = 3, - FLS_DISABLED = 4, + FLS_DISABLED = 4 }; enum LINKSTATES { FLYOUTLINK_NORMAL = 1, - FLYOUTLINK_HOVER = 2, + FLYOUTLINK_HOVER = 2 }; enum BODYSTATES { FBS_NORMAL = 1, - FBS_EMPHASIZED = 2, + FBS_EMPHASIZED = 2 }; enum LINKHEADERSTATES { FLH_NORMAL = 1, - FLH_HOVER = 2, + FLH_HOVER = 2 }; /* HEADERSTYLE class */ @@ -650,14 +650,14 @@ enum HEADERPARTS { HP_HEADERSORTARROW = 4, HP_HEADERDROPDOWN = 5, HP_HEADERDROPDOWNFILTER = 6, - HP_HEADEROVERFLOW = 7, + HP_HEADEROVERFLOW = 7 }; #define HEADERSTYLEPARTS HEADERPARTS; enum HEADERSTYLESTATES { HBG_DETAILS = 1, - HBG_ICON = 2, + HBG_ICON = 2 }; enum HEADERITEMSTATES { @@ -672,41 +672,41 @@ enum HEADERITEMSTATES { HIS_ICONPRESSED = 9, HIS_ICONSORTEDNORMAL = 10, HIS_ICONSORTEDHOT = 11, - HIS_ICONSORTEDPRESSED = 12, + HIS_ICONSORTEDPRESSED = 12 }; enum HEADERITEMLEFTSTATES { HILS_NORMAL = 1, HILS_HOT = 2, - HILS_PRESSED = 3, + HILS_PRESSED = 3 }; enum HEADERITEMRIGHTSTATES { HIRS_NORMAL = 1, HIRS_HOT = 2, - HIRS_PRESSED = 3, + HIRS_PRESSED = 3 }; enum HEADERSORTARROWSTATES { HSAS_SORTEDUP = 1, - HSAS_SORTEDDOWN = 2, + HSAS_SORTEDDOWN = 2 }; enum HEADERDROPDOWNSTATES { HDDS_NORMAL = 1, HDDS_SOFTHOT = 2, - HDDS_HOT = 3, + HDDS_HOT = 3 }; enum HEADERDROPDOWNFILTERSTATES { HDDFS_NORMAL = 1, HDDFS_SOFTHOT = 2, - HDDFS_HOT = 3, + HDDFS_HOT = 3 }; enum HEADEROVERFLOWSTATES { HOFS_NORMAL = 1, - HOFS_HOT = 2, + HOFS_HOT = 2 }; /* LISTBOXSTYLE class */ @@ -726,7 +726,7 @@ enum LISTBOXPARTS { LBCP_BORDER_HVSCROLL = 2, LBCP_BORDER_NOSCROLL = 3, LBCP_BORDER_VSCROLL = 4, - LBCP_ITEM = 5, + LBCP_ITEM = 5 }; #define LISTBOXSTYLEPARTS LISTBOXPARTS; @@ -735,35 +735,35 @@ enum BORDER_HSCROLLSTATES { LBPSH_NORMAL = 1, LBPSH_FOCUSED = 2, LBPSH_HOT = 3, - LBPSH_DISABLED = 4, + LBPSH_DISABLED = 4 }; enum BORDER_HVSCROLLSTATES { LBPSHV_NORMAL = 1, LBPSHV_FOCUSED = 2, LBPSHV_HOT = 3, - LBPSHV_DISABLED = 4, + LBPSHV_DISABLED = 4 }; enum BORDER_NOSCROLLSTATES { LBPSN_NORMAL = 1, LBPSN_FOCUSED = 2, LBPSN_HOT = 3, - LBPSN_DISABLED = 4, + LBPSN_DISABLED = 4 }; enum BORDER_VSCROLLSTATES { LBPSV_NORMAL = 1, LBPSV_FOCUSED = 2, LBPSV_HOT = 3, - LBPSV_DISABLED = 4, + LBPSV_DISABLED = 4 }; enum ITEMSTATES { LBPSI_HOT = 1, LBPSI_HOTSELECTED = 2, LBPSI_SELECTED = 3, - LBPSI_SELECTEDNOTFOCUS = 4, + LBPSI_SELECTEDNOTFOCUS = 4 }; /* LISTVIEWSTYLE class */ @@ -788,7 +788,7 @@ enum LISTVIEWPARTS { LVP_GROUPHEADERLINE = 7, LVP_EXPANDBUTTON = 8, LVP_COLLAPSEBUTTON = 9, - LVP_COLUMNDETAIL = 10, + LVP_COLUMNDETAIL = 10 }; #define LISTVIEWSTYLEPARTS LISTVIEWPARTS; @@ -799,7 +799,7 @@ enum LISTITEMSTATES { LISS_SELECTED = 3, LISS_DISABLED = 4, LISS_SELECTEDNOTFOCUS = 5, - LISS_HOTSELECTED = 6, + LISS_HOTSELECTED = 6 }; enum GROUPHEADERSTATES { @@ -818,7 +818,7 @@ enum GROUPHEADERSTATES { LVGH_CLOSESELECTEDNOTFOCUSED = 13, LVGH_CLOSESELECTEDNOTFOCUSEDHOT = 14, LVGH_CLOSEMIXEDSELECTION = 15, - LVGH_CLOSEMIXEDSELECTIONHOT = 16, + LVGH_CLOSEMIXEDSELECTIONHOT = 16 }; enum GROUPHEADERLINESTATES { @@ -837,19 +837,19 @@ enum GROUPHEADERLINESTATES { LVGHL_CLOSESELECTEDNOTFOCUSED = 13, LVGHL_CLOSESELECTEDNOTFOCUSEDHOT = 14, LVGHL_CLOSEMIXEDSELECTION = 15, - LVGHL_CLOSEMIXEDSELECTIONHOT = 16, + LVGHL_CLOSEMIXEDSELECTIONHOT = 16 }; enum EXPANDBUTTONSTATES { LVEB_NORMAL = 1, LVEB_HOVER = 2, - LVEB_PUSHED = 3, + LVEB_PUSHED = 3 }; enum COLLAPSEBUTTONSTATES { LVCB_NORMAL = 1, LVCB_HOVER = 2, - LVCB_PUSHED = 3, + LVCB_PUSHED = 3 }; /* MENUSTYLE class */ @@ -884,14 +884,14 @@ enum MENUPARTS { MENU_SYSTEMCLOSE = 17, MENU_SYSTEMMAXIMIZE = 18, MENU_SYSTEMMINIMIZE = 19, - MENU_SYSTEMRESTORE = 20, + MENU_SYSTEMRESTORE = 20 }; #define MENUSTYLEPARTS MENUPARTS; enum BARBACKGROUNDSTATES { MB_ACTIVE = 1, - MB_INACTIVE = 2, + MB_INACTIVE = 2 }; enum BARITEMSTATES { @@ -900,52 +900,52 @@ enum BARITEMSTATES { MBI_PUSHED = 3, MBI_DISABLED = 4, MBI_DISABLEDHOT = 5, - MBI_DISABLEDPUSHED = 6, + MBI_DISABLEDPUSHED = 6 }; enum POPUPCHECKSTATES { MC_CHECKMARKNORMAL = 1, MC_CHECKMARKDISABLED = 2, MC_BULLETNORMAL = 3, - MC_BULLETDISABLED = 4, + MC_BULLETDISABLED = 4 }; enum POPUPCHECKBACKGROUNDSTATES { MCB_DISABLED = 1, MCB_NORMAL = 2, - MCB_BITMAP = 3, + MCB_BITMAP = 3 }; enum POPUPITEMSTATES { MPI_NORMAL = 1, MPI_HOT = 2, MPI_DISABLED = 3, - MPI_DISABLEDHOT = 4, + MPI_DISABLEDHOT = 4 }; enum POPUPSUBMENUSTATES { MSM_NORMAL = 1, - MSM_DISABLED = 2, + MSM_DISABLED = 2 }; enum SYSTEMCLOSESTATES { MSYSC_NORMAL = 1, - MSYSC_DISABLED = 2, + MSYSC_DISABLED = 2 }; enum SYSTEMMAXIMIZESTATES { MSYSMX_NORMAL = 1, - MSYSMX_DISABLED = 2, + MSYSMX_DISABLED = 2 }; enum SYSTEMMINIMIZESTATES { MSYSMN_NORMAL = 1, - MSYSMN_DISABLED = 2, + MSYSMN_DISABLED = 2 }; enum SYSTEMRESTORESTATES { MSYSR_NORMAL = 1, - MSYSR_DISABLED = 2, + MSYSR_DISABLED = 2 }; /* NAVIGATION class */ @@ -960,28 +960,28 @@ static const WCHAR VSCLASS_NAVIGATION [] = {'N','A','V','I','G','A','T','I','O', enum NAVIGATIONPARTS { NAV_BACKBUTTON = 1, NAV_FORWARDBUTTON = 2, - NAV_MENUBUTTON = 3, + NAV_MENUBUTTON = 3 }; enum NAV_BACKBUTTONSTATES { NAV_BB_NORMAL = 1, NAV_BB_HOT = 2, NAV_BB_PRESSED = 3, - NAV_BB_DISABLED = 4, + NAV_BB_DISABLED = 4 }; enum NAV_FORWARDBUTTONSTATES { NAV_FB_NORMAL = 1, NAV_FB_HOT = 2, NAV_FB_PRESSED = 3, - NAV_FB_DISABLED = 4, + NAV_FB_DISABLED = 4 }; enum NAV_MENUBUTTONSTATES { NAV_MB_NORMAL = 1, NAV_MB_HOT = 2, NAV_MB_PRESSED = 3, - NAV_MB_DISABLED = 4, + NAV_MB_DISABLED = 4 }; /* PROGRESSSTYLE class */ @@ -1008,33 +1008,33 @@ enum PROGRESSPARTS { PP_PULSEOVERLAYVERT = 9, PP_MOVEOVERLAYVERT = 10, PP_TRANSPARENTBAR = 11, - PP_TRANSPARENTBARVERT = 12, + PP_TRANSPARENTBARVERT = 12 }; #define PROGRESSSTYLEPARTS PROGRESSPARTS; enum TRANSPARENTBARSTATES { PBBS_NORMAL = 1, - PBBS_PARTIAL = 2, + PBBS_PARTIAL = 2 }; enum TRANSPARENTBARVERTSTATES { PBBVS_NORMAL = 1, - PBBVS_PARTIAL = 2, + PBBVS_PARTIAL = 2 }; enum FILLSTATES { PBFS_NORMAL = 1, PBFS_ERROR = 2, PBFS_PAUSED = 3, - PBFS_PARTIAL = 4, + PBFS_PARTIAL = 4 }; enum FILLVERTSTATES { PBFVS_NORMAL = 1, PBFVS_ERROR = 2, PBFVS_PAUSED = 3, - PBFVS_PARTIAL = 4, + PBFVS_PARTIAL = 4 }; /* REBARSTYLE class */ @@ -1057,7 +1057,7 @@ enum REBARPARTS { RP_CHEVRONVERT = 5, RP_BACKGROUND = 6, RP_SPLITTER = 7, - RP_SPLITTERVERT = 8, + RP_SPLITTERVERT = 8 }; #define REBARSTYLEPARTS REBARPARTS; @@ -1065,25 +1065,25 @@ enum REBARPARTS { enum CHEVRONSTATES { CHEVS_NORMAL = 1, CHEVS_HOT = 2, - CHEVS_PRESSED = 3, + CHEVS_PRESSED = 3 }; enum CHEVRONVERTSTATES { CHEVSV_NORMAL = 1, CHEVSV_HOT = 2, - CHEVSV_PRESSED = 3, + CHEVSV_PRESSED = 3 }; enum SPLITTERSTATES { SPLITS_NORMAL = 1, SPLITS_HOT = 2, - SPLITS_PRESSED = 3, + SPLITS_PRESSED = 3 }; enum SPLITTERVERTSTATES { SPLITSV_NORMAL = 1, SPLITSV_HOT = 2, - SPLITSV_PRESSED = 3, + SPLITSV_PRESSED = 3 }; /* SCROLLBARSTYLE class */ @@ -1108,7 +1108,7 @@ enum SCROLLBARPARTS { SBP_UPPERTRACKVERT = 7, SBP_GRIPPERHORZ = 8, SBP_GRIPPERVERT = 9, - SBP_SIZEBOX = 10, + SBP_SIZEBOX = 10 }; #define SCROLLBARSTYLEPARTS SCROLLBARPARTS; @@ -1133,7 +1133,7 @@ enum ARROWBTNSTATES { ABS_UPHOVER = 17, ABS_DOWNHOVER = 18, ABS_LEFTHOVER = 19, - ABS_RIGHTHOVER = 20, + ABS_RIGHTHOVER = 20 }; enum SCROLLBARSTYLESTATES { @@ -1141,7 +1141,7 @@ enum SCROLLBARSTYLESTATES { SCRBS_HOT = 2, SCRBS_PRESSED = 3, SCRBS_DISABLED = 4, - SCRBS_HOVER = 5, + SCRBS_HOVER = 5 }; enum SIZEBOXSTATES { @@ -1152,7 +1152,7 @@ enum SIZEBOXSTATES { SZB_HALFBOTTOMRIGHTALIGN = 5, SZB_HALFBOTTOMLEFTALIGN = 6, SZB_HALFTOPRIGHTALIGN = 7, - SZB_HALFTOPLEFTALIGN = 8, + SZB_HALFTOPLEFTALIGN = 8 }; /* SPINSTYLE class */ @@ -1175,7 +1175,7 @@ enum SPINPARTS { SPNP_UP = 1, SPNP_DOWN = 2, SPNP_UPHORZ = 3, - SPNP_DOWNHORZ = 4, + SPNP_DOWNHORZ = 4 }; #define SPINSTYLEPARTS SPINPARTS; @@ -1184,28 +1184,28 @@ enum UPSTATES { UPS_NORMAL = 1, UPS_HOT = 2, UPS_PRESSED = 3, - UPS_DISABLED = 4, + UPS_DISABLED = 4 }; enum DOWNSTATES { DNS_NORMAL = 1, DNS_HOT = 2, DNS_PRESSED = 3, - DNS_DISABLED = 4, + DNS_DISABLED = 4 }; enum UPHORZSTATES { UPHZS_NORMAL = 1, UPHZS_HOT = 2, UPHZS_PRESSED = 3, - UPHZS_DISABLED = 4, + UPHZS_DISABLED = 4 }; enum DOWNHORZSTATES { DNHZS_NORMAL = 1, DNHZS_HOT = 2, DNHZS_PRESSED = 3, - DNHZS_DISABLED = 4, + DNHZS_DISABLED = 4 }; /* STATUSSTYLE class */ @@ -1223,7 +1223,7 @@ static const WCHAR VSCLASS_STATUS [] = {'S','T','A','T','U','S',0}; enum STATUSPARTS { SP_PANE = 1, SP_GRIPPERPANE = 2, - SP_GRIPPER = 3, + SP_GRIPPER = 3 }; #define STATUSSTYLEPARTS STATUSPARTS; @@ -1251,7 +1251,7 @@ enum TABPARTS { TABP_TOPTABITEMBOTHEDGE = 8, TABP_PANE = 9, TABP_BODY = 10, - TABP_AEROWIZARDBODY = 11, + TABP_AEROWIZARDBODY = 11 }; #define TABSTYLEPARTS TABPARTS; @@ -1261,7 +1261,7 @@ enum TABITEMSTATES { TIS_HOT = 2, TIS_SELECTED = 3, TIS_DISABLED = 4, - TIS_FOCUSED = 5, + TIS_FOCUSED = 5 }; enum TABITEMLEFTEDGESTATES { @@ -1269,7 +1269,7 @@ enum TABITEMLEFTEDGESTATES { TILES_HOT = 2, TILES_SELECTED = 3, TILES_DISABLED = 4, - TILES_FOCUSED = 5, + TILES_FOCUSED = 5 }; enum TABITEMRIGHTEDGESTATES { @@ -1277,7 +1277,7 @@ enum TABITEMRIGHTEDGESTATES { TIRES_HOT = 2, TIRES_SELECTED = 3, TIRES_DISABLED = 4, - TIRES_FOCUSED = 5, + TIRES_FOCUSED = 5 }; enum TABITEMBOTHEDGESTATES { @@ -1285,7 +1285,7 @@ enum TABITEMBOTHEDGESTATES { TIBES_HOT = 2, TIBES_SELECTED = 3, TIBES_DISABLED = 4, - TIBES_FOCUSED = 5, + TIBES_FOCUSED = 5 }; enum TOPTABITEMSTATES { @@ -1293,7 +1293,7 @@ enum TOPTABITEMSTATES { TTIS_HOT = 2, TTIS_SELECTED = 3, TTIS_DISABLED = 4, - TTIS_FOCUSED = 5, + TTIS_FOCUSED = 5 }; enum TOPTABITEMLEFTEDGESTATES { @@ -1301,7 +1301,7 @@ enum TOPTABITEMLEFTEDGESTATES { TTILES_HOT = 2, TTILES_SELECTED = 3, TTILES_DISABLED = 4, - TTILES_FOCUSED = 5, + TTILES_FOCUSED = 5 }; enum TOPTABITEMRIGHTEDGESTATES { @@ -1309,7 +1309,7 @@ enum TOPTABITEMRIGHTEDGESTATES { TTIRES_HOT = 2, TTIRES_SELECTED = 3, TTIRES_DISABLED = 4, - TTIRES_FOCUSED = 5, + TTIRES_FOCUSED = 5 }; enum TOPTABITEMBOTHEDGESTATES { @@ -1317,7 +1317,7 @@ enum TOPTABITEMBOTHEDGESTATES { TTIBES_HOT = 2, TTIBES_SELECTED = 3, TTIBES_DISABLED = 4, - TTIBES_FOCUSED = 5, + TTIBES_FOCUSED = 5 }; /* TASKDIALOGSTYLE class */ @@ -1353,13 +1353,13 @@ enum TASKDIALOGPARTS { TDLG_EXPANDEDFOOTERAREA = 18, TDLG_PROGRESSBAR = 19, TDLG_IMAGEALIGNMENT = 20, - TDLG_RADIOBUTTONPANE = 21, + TDLG_RADIOBUTTONPANE = 21 }; #define TASKDIALOGSTYLEPARTS TASKDIALOGPARTS; enum CONTENTPANESTATES { - TDLGCPS_STANDALONE = 1, + TDLGCPS_STANDALONE = 1 }; enum EXPANDOBUTTONSTATES { @@ -1368,7 +1368,7 @@ enum EXPANDOBUTTONSTATES { TDLGEBS_PRESSED = 3, TDLGEBS_EXPANDEDNORMAL = 4, TDLGEBS_EXPANDEDHOVER = 5, - TDLGEBS_EXPANDEDPRESSED = 6, + TDLGEBS_EXPANDEDPRESSED = 6 }; /* TEXTSTYLE class */ @@ -1389,19 +1389,19 @@ enum TEXTSTYLEPARTS { TEXT_HYPERLINKTEXT = 6, TEXT_EXPANDED = 7, TEXT_LABEL = 8, - TEXT_CONTROLLABEL = 9, + TEXT_CONTROLLABEL = 9 }; enum HYPERLINKTEXTSTATES { TS_HYPERLINK_NORMAL = 1, TS_HYPERLINK_HOT = 2, TS_HYPERLINK_PRESSED = 3, - TS_HYPERLINK_DISABLED = 4, + TS_HYPERLINK_DISABLED = 4 }; enum CONTROLLABELSTATES { TS_CONTROLLABEL_NORMAL = 1, - TS_CONTROLLABEL_DISABLED = 2, + TS_CONTROLLABEL_DISABLED = 2 }; /* TOOLBARSTYLE class */ @@ -1423,7 +1423,7 @@ enum TOOLBARPARTS { TP_SPLITBUTTONDROPDOWN = 4, TP_SEPARATOR = 5, TP_SEPARATORVERT = 6, - TP_DROPDOWNBUTTONGLYPH = 7, + TP_DROPDOWNBUTTONGLYPH = 7 }; #define TOOLBARSTYLEPARTS TOOLBARPARTS; @@ -1436,7 +1436,7 @@ enum TOOLBARSTYLESTATES { TS_CHECKED = 5, TS_HOTCHECKED = 6, TS_NEARHOT = 7, - TS_OTHERSIDEHOT = 8, + TS_OTHERSIDEHOT = 8 }; /* TOOLTIPSTYLE class */ @@ -1458,7 +1458,7 @@ enum TOOLTIPPARTS { TTP_BALLOONTITLE = 4, TTP_CLOSE = 5, TTP_BALLOONSTEM = 6, - TTP_WRENCH = 7, + TTP_WRENCH = 7 }; #define TOOLTIPSTYLEPARTS TOOLTIPPARTS; @@ -1466,17 +1466,17 @@ enum TOOLTIPPARTS { enum CLOSESTATES { TTCS_NORMAL = 1, TTCS_HOT = 2, - TTCS_PRESSED = 3, + TTCS_PRESSED = 3 }; enum STANDARDSTATES { TTSS_NORMAL = 1, - TTSS_LINK = 2, + TTSS_LINK = 2 }; enum BALLOONSTATES { TTBS_NORMAL = 1, - TTBS_LINK = 2, + TTBS_LINK = 2 }; enum BALLOONSTEMSTATES { @@ -1485,13 +1485,13 @@ enum BALLOONSTEMSTATES { TTBSS_POINTINGUPRIGHTWALL = 3, TTBSS_POINTINGDOWNRIGHTWALL = 4, TTBSS_POINTINGDOWNCENTERED = 5, - TTBSS_POINTINGDOWNLEFTWALL = 6, + TTBSS_POINTINGDOWNLEFTWALL = 6 }; enum WRENCHSTATES { TTWS_NORMAL = 1, TTWS_HOT = 2, - TTWS_PRESSED = 3, + TTWS_PRESSED = 3 }; /* TRACKBARSTYLE class */ @@ -1516,21 +1516,21 @@ enum TRACKBARPARTS { TKP_THUMBLEFT = 7, TKP_THUMBRIGHT = 8, TKP_TICS = 9, - TKP_TICSVERT = 10, + TKP_TICSVERT = 10 }; #define TRACKBARSTYLEPARTS TRACKBARPARTS; enum TRACKBARSTYLESTATES { - TKS_NORMAL = 1, + TKS_NORMAL = 1 }; enum TRACKSTATES { - TRS_NORMAL = 1, + TRS_NORMAL = 1 }; enum TRACKVERTSTATES { - TRVS_NORMAL = 1, + TRVS_NORMAL = 1 }; enum THUMBSTATES { @@ -1538,7 +1538,7 @@ enum THUMBSTATES { TUS_HOT = 2, TUS_PRESSED = 3, TUS_FOCUSED = 4, - TUS_DISABLED = 5, + TUS_DISABLED = 5 }; enum THUMBBOTTOMSTATES { @@ -1546,7 +1546,7 @@ enum THUMBBOTTOMSTATES { TUBS_HOT = 2, TUBS_PRESSED = 3, TUBS_FOCUSED = 4, - TUBS_DISABLED = 5, + TUBS_DISABLED = 5 }; enum THUMBTOPSTATES { @@ -1554,7 +1554,7 @@ enum THUMBTOPSTATES { TUTS_HOT = 2, TUTS_PRESSED = 3, TUTS_FOCUSED = 4, - TUTS_DISABLED = 5, + TUTS_DISABLED = 5 }; enum THUMBVERTSTATES { @@ -1562,7 +1562,7 @@ enum THUMBVERTSTATES { TUVS_HOT = 2, TUVS_PRESSED = 3, TUVS_FOCUSED = 4, - TUVS_DISABLED = 5, + TUVS_DISABLED = 5 }; enum THUMBLEFTSTATES { @@ -1570,7 +1570,7 @@ enum THUMBLEFTSTATES { TUVLS_HOT = 2, TUVLS_PRESSED = 3, TUVLS_FOCUSED = 4, - TUVLS_DISABLED = 5, + TUVLS_DISABLED = 5 }; enum THUMBRIGHTSTATES { @@ -1578,15 +1578,15 @@ enum THUMBRIGHTSTATES { TUVRS_HOT = 2, TUVRS_PRESSED = 3, TUVRS_FOCUSED = 4, - TUVRS_DISABLED = 5, + TUVRS_DISABLED = 5 }; enum TICSSTATES { - TSS_NORMAL = 1, + TSS_NORMAL = 1 }; enum TICSVERTSTATES { - TSVS_NORMAL = 1, + TSVS_NORMAL = 1 }; /* TREEVIEWSTYLE class */ @@ -1605,7 +1605,7 @@ enum TREEVIEWPARTS { TVP_TREEITEM = 1, TVP_GLYPH = 2, TVP_BRANCH = 3, - TVP_HOTGLYPH = 4, + TVP_HOTGLYPH = 4 }; #define TREEVIEWSTYLEPARTS TREEVIEWPARTS; @@ -1616,17 +1616,17 @@ enum TREEITEMSTATES { TREIS_SELECTED = 3, TREIS_DISABLED = 4, TREIS_SELECTEDNOTFOCUS = 5, - TREIS_HOTSELECTED = 6, + TREIS_HOTSELECTED = 6 }; enum GLYPHSTATES { GLPS_CLOSED = 1, - GLPS_OPENED = 2, + GLPS_OPENED = 2 }; enum HOTGLYPHSTATES { HGLPS_CLOSED = 1, - HGLPS_OPENED = 2, + HGLPS_OPENED = 2 }; /* WINDOWSTYLE class */ @@ -1679,102 +1679,102 @@ enum WINDOWPARTS { WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35, WP_FRAMEBOTTOMSIZINGTEMPLATE = 36, WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37, - WP_FRAME = 38, + WP_FRAME = 38 }; #define WINDOWSTYLEPARTS WINDOWPARTS; enum FRAMESTATES { FS_ACTIVE = 1, - FS_INACTIVE = 2, + FS_INACTIVE = 2 }; enum CAPTIONSTATES { CS_ACTIVE = 1, CS_INACTIVE = 2, - CS_DISABLED = 3, + CS_DISABLED = 3 }; enum MAXCAPTIONSTATES { MXCS_ACTIVE = 1, MXCS_INACTIVE = 2, - MXCS_DISABLED = 3, + MXCS_DISABLED = 3 }; enum MINCAPTIONSTATES { MNCS_ACTIVE = 1, MNCS_INACTIVE = 2, - MNCS_DISABLED = 3, + MNCS_DISABLED = 3 }; enum HORZSCROLLSTATES { HSS_NORMAL = 1, HSS_HOT = 2, HSS_PUSHED = 3, - HSS_DISABLED = 4, + HSS_DISABLED = 4 }; enum HORZTHUMBSTATES { HTS_NORMAL = 1, HTS_HOT = 2, HTS_PUSHED = 3, - HTS_DISABLED = 4, + HTS_DISABLED = 4 }; enum VERTSCROLLSTATES { VSS_NORMAL = 1, VSS_HOT = 2, VSS_PUSHED = 3, - VSS_DISABLED = 4, + VSS_DISABLED = 4 }; enum VERTTHUMBSTATES { VTS_NORMAL = 1, VTS_HOT = 2, VTS_PUSHED = 3, - VTS_DISABLED = 4, + VTS_DISABLED = 4 }; enum SYSBUTTONSTATES { SBS_NORMAL = 1, SBS_HOT = 2, SBS_PUSHED = 3, - SBS_DISABLED = 4, + SBS_DISABLED = 4 }; enum MINBUTTONSTATES { MINBS_NORMAL = 1, MINBS_HOT = 2, MINBS_PUSHED = 3, - MINBS_DISABLED = 4, + MINBS_DISABLED = 4 }; enum MAXBUTTONSTATES { MAXBS_NORMAL = 1, MAXBS_HOT = 2, MAXBS_PUSHED = 3, - MAXBS_DISABLED = 4, + MAXBS_DISABLED = 4 }; enum RESTOREBUTTONSTATES { RBS_NORMAL = 1, RBS_HOT = 2, RBS_PUSHED = 3, - RBS_DISABLED = 4, + RBS_DISABLED = 4 }; enum HELPBUTTONSTATES { HBS_NORMAL = 1, HBS_HOT = 2, HBS_PUSHED = 3, - HBS_DISABLED = 4, + HBS_DISABLED = 4 }; enum CLOSEBUTTONSTATES { CBS_NORMAL = 1, CBS_HOT = 2, CBS_PUSHED = 3, - CBS_DISABLED = 4, + CBS_DISABLED = 4 }; #endif /* __VSSTYLE_H__ */ diff --git a/lib/libc/include/any-windows-any/vssym32.h b/lib/libc/include/any-windows-any/vssym32.h index 88ec01f944..f4d05b5496 100644 --- a/lib/libc/include/any-windows-any/vssym32.h +++ b/lib/libc/include/any-windows-any/vssym32.h @@ -51,18 +51,18 @@ enum BGTYPE { BT_IMAGEFILE = 0, BT_BORDERFILL = 1, - BT_NONE = 2, + BT_NONE = 2 }; enum IMAGELAYOUT { IL_VERTICAL = 0, - IL_HORIZONTAL = 1, + IL_HORIZONTAL = 1 }; enum BORDERTYPE { BT_RECT = 0, BT_ROUNDRECT = 1, - BT_ELLIPSE = 2, + BT_ELLIPSE = 2 }; enum FILLTYPE { @@ -70,31 +70,31 @@ enum FILLTYPE { FT_VERTGRADIENT = 1, FT_HORZGRADIENT = 2, FT_RADIALGRADIENT = 3, - FT_TILEIMAGE = 4, + FT_TILEIMAGE = 4 }; enum SIZINGTYPE { ST_TRUESIZE = 0, ST_STRETCH = 1, - ST_TILE = 2, + ST_TILE = 2 }; enum HALIGN { HA_LEFT = 0, HA_CENTER = 1, - HA_RIGHT = 2, + HA_RIGHT = 2 }; enum CONTENTALIGNMENT { CA_LEFT = 0, CA_CENTER = 1, - CA_RIGHT = 2, + CA_RIGHT = 2 }; enum VALIGN { VA_TOP = 0, VA_CENTER = 1, - VA_BOTTOM = 2, + VA_BOTTOM = 2 }; enum OFFSETTYPE { @@ -111,7 +111,7 @@ enum OFFSETTYPE { OT_LEFTOFLASTBUTTON = 10, OT_RIGHTOFLASTBUTTON = 11, OT_ABOVELASTBUTTON = 12, - OT_BELOWLASTBUTTON = 13, + OT_BELOWLASTBUTTON = 13 }; enum ICONEFFECT { @@ -119,37 +119,37 @@ enum ICONEFFECT { ICE_GLOW = 1, ICE_SHADOW = 2, ICE_PULSE = 3, - ICE_ALPHA = 4, + ICE_ALPHA = 4 }; enum TEXTSHADOWTYPE { TST_NONE = 0, TST_SINGLE = 1, - TST_CONTINUOUS = 2, + TST_CONTINUOUS = 2 }; enum GLYPHTYPE { GT_NONE = 0, GT_IMAGEGLYPH = 1, - GT_FONTGLYPH = 2, + GT_FONTGLYPH = 2 }; enum IMAGESELECTTYPE { IST_NONE = 0, IST_SIZE = 1, - IST_DPI = 2, + IST_DPI = 2 }; enum TRUESIZESCALINGTYPE { TSST_NONE = 0, TSST_SIZE = 1, - TSST_DPI = 2, + TSST_DPI = 2 }; enum GLYPHFONTSIZINGTYPE { GFST_NONE = 0, GFST_SIZE = 1, - GFST_DPI = 2, + GFST_DPI = 2 }; #define TMT_RESERVEDLOW 0 @@ -413,12 +413,12 @@ static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0}; #endif enum LINKPARTS { - LP_HYPERLINK = 1, + LP_HYPERLINK = 1 }; enum HYPERLINKSTATES { HLS_NORMALTEXT = 1, - HLS_LINKTEXT = 2, + HLS_LINKTEXT = 2 }; /* EMPTYMARKUP class */ @@ -431,12 +431,12 @@ static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K', #endif enum EMPTYMARKUPPARTS { - EMP_MARKUPTEXT = 1, + EMP_MARKUPTEXT = 1 }; enum MARKUPTEXTSTATES { EMT_NORMALTEXT = 1, - EMT_LINKTEXT = 2, + EMT_LINKTEXT = 2 }; /* STATIC class */ @@ -449,7 +449,7 @@ static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0}; #endif enum STATICPARTS { - STAT_TEXT = 1, + STAT_TEXT = 1 }; /* PAGE class */ @@ -465,7 +465,7 @@ enum PAGEPARTS { PGRP_UP = 1, PGRP_DOWN = 2, PGRP_UPHORZ = 3, - PGRP_DOWNHORZ = 4, + PGRP_DOWNHORZ = 4 }; /* MONTHCAL class */ @@ -488,7 +488,7 @@ enum MONTHCALPARTS { MC_TRAILINGGRIDCELL = 8, MC_TRAILINGGRIDCELLUPPER = 9, MC_NAVNEXT = 10, - MC_NAVPREV = 11, + MC_NAVPREV = 11 }; enum GRIDCELLBACKGROUNDSTATES { @@ -496,47 +496,47 @@ enum GRIDCELLBACKGROUNDSTATES { MCGCB_HOT = 2, MCGCB_SELECTEDHOT = 3, MCGCB_SELECTEDNOTFOCUSED = 4, - MCGCB_TODAY = 5, + MCGCB_TODAY = 5 }; enum GRIDCELLSTATES { MCGC_HOT = 1, MCGC_HASSTATE = 2, MCGC_HASSTATEHOT = 3, - MCGC_TODAY = 4, + MCGC_TODAY = 4 }; enum GRIDCELLUPPERSTATES { MCGCU_HOT = 1, MCGCU_HASSTATE = 2, - MCGCU_HASSTATEHOT = 3, + MCGCU_HASSTATEHOT = 3 }; enum TRAILINGGRIDCELLSTATES { MCTGC_HOT = 1, MCTGC_HASSTATE = 2, MCTGC_HASSTATEHOT = 3, - MCTGC_TODAY = 4, + MCTGC_TODAY = 4 }; enum TRAILINGGRIDCELLUPPERSTATES { MCTGCU_HOT = 1, MCTGCU_HASSTATE = 2, - MCTGCU_HASSTATEHOT = 3, + MCTGCU_HASSTATEHOT = 3 }; enum NAVNEXTSTATES { MCNN_NORMAL = 1, MCNN_HOT = 2, MCNN_PRESSED = 3, - MCNN_DISABLED = 4, + MCNN_DISABLED = 4 }; enum NAVPREVSTATES { MCNP_NORMAL = 1, MCNP_HOT = 2, MCNP_PRESSED = 3, - MCNP_DISABLED = 4, + MCNP_DISABLED = 4 }; /* CLOCK class */ @@ -549,13 +549,13 @@ static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0}; #endif enum CLOCKPARTS { - CLP_TIME = 1, + CLP_TIME = 1 }; enum CLOCKSTATES { CLS_NORMAL = 1, CLS_HOT = 2, - CLS_PRESSED = 3, + CLS_PRESSED = 3 }; /* TRAYNOTIFY class */ @@ -569,7 +569,7 @@ static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F',' enum TRAYNOTIFYPARTS { TNP_BACKGROUND = 1, - TNP_ANIMBACKGROUND = 2, + TNP_ANIMBACKGROUND = 2 }; /* TASKBAR class */ @@ -589,7 +589,7 @@ enum TASKBARPARTS { TBP_SIZINGBARBOTTOM = 5, TBP_SIZINGBARRIGHT = 6, TBP_SIZINGBARTOP = 7, - TBP_SIZINGBARLEFT = 8, + TBP_SIZINGBARLEFT = 8 }; /* TASKBAND class */ @@ -604,7 +604,7 @@ static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0}; enum TASKBANDPARTS { TDP_GROUPCOUNT = 1, TDP_FLASHBUTTON = 2, - TDP_FLASHBUTTONGROUPMENU = 3, + TDP_FLASHBUTTONGROUPMENU = 3 }; /* STARTPANEL class */ @@ -635,7 +635,7 @@ enum STARTPANELPARTS { SPP_SEARCHVIEW = 16, SPP_MOREPROGRAMSARROWBACK = 17, SPP_TOPMATCH = 18, - SPP_LOGOFFSPLITBUTTONDROPDOWN = 19, + SPP_LOGOFFSPLITBUTTONDROPDOWN = 19 }; enum MOREPROGRAMSTABSTATES { @@ -643,7 +643,7 @@ enum MOREPROGRAMSTABSTATES { SPMPT_HOT = 2, SPMPT_SELECTED = 3, SPMPT_DISABLED = 4, - SPMPT_FOCUSED = 5, + SPMPT_FOCUSED = 5 }; enum SOFTWAREEXPLORERSTATES { @@ -651,7 +651,7 @@ enum SOFTWAREEXPLORERSTATES { SPSE_HOT = 2, SPSE_SELECTED = 3, SPSE_DISABLED = 4, - SPSE_FOCUSED = 5, + SPSE_FOCUSED = 5 }; enum OPENBOXSTATES { @@ -659,25 +659,25 @@ enum OPENBOXSTATES { SPOB_HOT = 2, SPOB_SELECTED = 3, SPOB_DISABLED = 4, - SPOB_FOCUSED = 5, + SPOB_FOCUSED = 5 }; enum MOREPROGRAMSARROWSTATES { SPS_NORMAL = 1, SPS_HOT = 2, - SPS_PRESSED = 3, + SPS_PRESSED = 3 }; enum MOREPROGRAMSARROWBACKSTATES { SPSB_NORMAL = 1, SPSB_HOT = 2, - SPSB_PRESSED = 3, + SPSB_PRESSED = 3 }; enum LOGOFFBUTTONSSTATES { SPLS_NORMAL = 1, SPLS_HOT = 2, - SPLS_PRESSED = 3, + SPLS_PRESSED = 3 }; /* MENUBAND class */ @@ -691,7 +691,7 @@ static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0}; enum MENUBANDPARTS { MDP_NEWAPPBUTTON = 1, - MDP_SEPERATOR = 2, + MDP_SEPERATOR = 2 }; enum MENUBANDSTATES { @@ -700,7 +700,7 @@ enum MENUBANDSTATES { MDS_PRESSED = 3, MDS_DISABLED = 4, MDS_CHECKED = 5, - MDS_HOTCHECKED = 6, + MDS_HOTCHECKED = 6 }; #endif /* __VSSYM32_H__ */ diff --git a/lib/libc/include/any-windows-any/vswriter.h b/lib/libc/include/any-windows-any/vswriter.h index 814a3c011a..d75afb166f 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.0-rc1 from include/vswriter.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 994f3cf963..d4a0bceb38 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.0-rc1 from include/wbemads.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 1f5d7ba70b..1f64731d0c 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.0-rc1 from include/wbemcli.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 9ee50d7909..8970c4a1f1 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.0-rc1 from include/wbemdisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wbemdisp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wbemidl.h b/lib/libc/include/any-windows-any/wbemidl.h index 7c22158327..a055944ef6 100644 --- a/lib/libc/include/any-windows-any/wbemidl.h +++ b/lib/libc/include/any-windows-any/wbemidl.h @@ -6,8 +6,8 @@ #ifndef __WBEMIDL_H_ #define __WBEMIDL_H_ -#include - +#include + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) #include diff --git a/lib/libc/include/any-windows-any/wbemprov.h b/lib/libc/include/any-windows-any/wbemprov.h index 11718bd70d..df6c098e19 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.0-rc1 from include/wbemprov.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7f3f61de7a..a925bee638 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.0-rc1 from include/wbemtran.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 ca2c1fc70c..c72530c18d 100644 --- a/lib/libc/include/any-windows-any/wchar.h +++ b/lib/libc/include/any-windows-any/wchar.h @@ -9,6 +9,7 @@ #include #include #include +#include #if __USE_MINGW_ANSI_STDIO && !defined (__USE_MINGW_STRTOX) && !defined(_CRTBLD) #define __USE_MINGW_STRTOX 1 @@ -148,109 +149,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); #define _WConst_return _CONST_RETURN -#ifndef _CRT_CTYPEDATA_DEFINED -#define _CRT_CTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS - -#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 - -#define _UPPER 0x1 -#define _LOWER 0x2 -#define _DIGIT 0x4 -#define _SPACE 0x8 - -#define _PUNCT 0x10 -#define _CONTROL 0x20 -#define _BLANK 0x40 -#define _HEX 0x80 - -#define _LEADBYTE 0x8000 -#define _ALPHA (0x0100|_UPPER|_LOWER) - -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED - - int __cdecl iswalpha(wint_t _C); - int __cdecl iswupper(wint_t _C); - int __cdecl iswlower(wint_t _C); - int __cdecl iswdigit(wint_t _C); - int __cdecl iswxdigit(wint_t _C); - int __cdecl iswspace(wint_t _C); - int __cdecl iswpunct(wint_t _C); - int __cdecl iswalnum(wint_t _C); - int __cdecl iswprint(wint_t _C); - int __cdecl iswgraph(wint_t _C); - int __cdecl iswcntrl(wint_t _C); - int __cdecl iswascii(wint_t _C); -#ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP - int __cdecl isleadbyte(int _C); -#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ - wint_t __cdecl towupper(wint_t _C); - wint_t __cdecl towlower(wint_t _C); - int __cdecl iswctype(wint_t _C,wctype_t _Type); -#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); -# 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 wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsymf(wint_t _C); - _CRTIMP int __cdecl __iswcsym(wint_t _C); -#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 - int __cdecl is_wctype(wint_t _C,wctype_t _Type); -#endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ - -#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) || defined (__cplusplus) - int __cdecl iswblank(wint_t _C); -#endif - -#endif - #ifndef _WDIRECT_DEFINED #define _WDIRECT_DEFINED @@ -304,6 +202,10 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); #endif +#if __MSVCRT_VERSION__ >= 0xB00 + _CRTIMP _locale_t __cdecl _wcreate_locale(int _Category, const wchar_t *_Locale); +#endif + #ifdef _CRT_USE_WINAPI_FAMILY_DESKTOP_APP #ifndef _WEXEC_DEFINED #define _WEXEC_DEFINED @@ -335,41 +237,6 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); #endif #endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */ -#ifndef _WCTYPE_INLINE_DEFINED -#undef _CRT_WCTYPE_NOINLINE -#if !defined(__cplusplus) || defined(_CRT_WCTYPE_NOINLINE) -#define iswalpha(_c) (iswctype(_c,_ALPHA)) -#define iswupper(_c) (iswctype(_c,_UPPER)) -#define iswlower(_c) (iswctype(_c,_LOWER)) -#define iswdigit(_c) (iswctype(_c,_DIGIT)) -#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) -#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)) -#endif /* __MSVCRT_VERSION__ >= 0x800 */ -#if !defined(_CTYPE_DISABLE_MACROS) && defined(_CRT_USE_WINAPI_FAMILY_DESKTOP_APP) -#define isleadbyte(_c) (__PCTYPE_FUNC[(unsigned char)(_c)] & _LEADBYTE) -#endif -#endif -#define _WCTYPE_INLINE_DEFINED -#endif - #if !defined(_POSIX_) || defined(__GNUC__) #ifndef _INO_T_DEFINED #define _INO_T_DEFINED @@ -395,7 +262,7 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); - int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); + _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); #endif #endif @@ -472,24 +339,49 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list); /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(swscanf); +/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vswscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,va_list) + __MINGW_ASM_CALL(vswscanf); /* __attribute__((__format__ (ms_wscanf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_wscanf(const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(wscanf); +/* __attribute__((__format__ (ms_wscanf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1) + int __cdecl __ms_vwscanf(const wchar_t * __restrict__ _Format, va_list) + __MINGW_ASM_CALL(vwscanf); /* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(fwscanf); +/* __attribute__((__format__ (ms_wscanf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2) + int __cdecl __ms_vfwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list) + __MINGW_ASM_CALL(vfwscanf); /* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); + /* No __MINGW_UCRT_ASM_CALL for __ms_fwprintf; this is provided as an + * actual function in the ucrt import libraries. */ /* __attribute__((__format__ (ms_wprintf, 1, 2))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...); + int __cdecl __ms_wprintf(const wchar_t * __restrict__ _Format,...) + __MINGW_UCRT_ASM_CALL(wprintf); /* __attribute__((__format__ (ms_wprintf, 2, 0))) */__MINGW_ATTRIB_NONNULL(2) - int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); + int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList) + __MINGW_UCRT_ASM_CALL(vfwprintf); /*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1) - int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); + int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) + __MINGW_UCRT_ASM_CALL(vwprintf); /* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...); + int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(swprintf); /* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3) - int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list); + int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list) + __MINGW_UCRT_ASM_CALL(vswprintf); +/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_snwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...) + __MINGW_UCRT_ASM_CALL(snwprintf); +/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3) + int __cdecl __ms_vsnwprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list) + __MINGW_UCRT_ASM_CALL(vsnwprintf); #ifdef _UCRT int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist); @@ -570,145 +462,41 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #else /* !__USE_MINGW_ANSI_STDIO */ #ifdef _UCRT - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, (size_t)-1, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr __MINGW_ATTRIB_DEPRECATED_SEC_WARN - int __cdecl wscanf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr + __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) - { - return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, __format, NULL, __local_argv); - } + int vfwscanf (FILE *__stream, const wchar_t *__format, va_list __local_argv); - __mingw_ovr __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, va_list __local_argv) - { - return __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, (size_t)-1, __format, NULL, __local_argv); - } - __mingw_ovr + 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) - { - return __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, __format, NULL, __local_argv); - } + int vwscanf(const wchar_t *__format, va_list __local_argv); int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); - __mingw_ovr - int __cdecl wprintf(const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret; - } - __mingw_ovr - int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _File, _Format, NULL, _ArgList); - } - __mingw_ovr - int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList) - { - return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, _Format, NULL, _ArgList); - } + 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); - __mingw_ovr - int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...) - { - __builtin_va_list __ap; - int __ret; - /* - * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and - * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is - * executed in "standard snprintf behavior" and returns number of (wide) - * chars required to allocate. For all other cases it is executed in a way - * that returns negative value on error. But C95+ compliant swprintf() for - * case _Count == 0 returns negative value, so handle this case specially. - */ - if (_Dest == NULL && _Count == 0) - return -1; - __builtin_va_start(__ap, _Format); - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap); - __builtin_va_end(__ap); - return __ret < 0 ? -1 : __ret; - } - __mingw_ovr - int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) - { - int __ret; - /* - * __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and - * without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is - * executed in "standard snprintf behavior" and returns number of (wide) - * chars required to allocate. For all other cases it is executed in a way - * that returns negative value on error. But C95+ compliant vswprintf() for - * case _Count == 0 returns negative value, so handle this case specially. - */ - if (_Dest == NULL && _Count == 0) - return -1; - __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args); - return __ret < 0 ? -1 : __ret; - } + 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 */ - int __cdecl __ms_vwscanf (const wchar_t * __restrict__ , va_list); - int __cdecl __ms_vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list); - int __cdecl __ms_vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list); - - __mingw_ovr __MINGW_ATTRIB_NONNULL(2) - int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv) - { - return __ms_vfwscanf (__stream, __format, __local_argv); - } + int vfwscanf (FILE *__stream, const wchar_t *__format, __builtin_va_list __local_argv); - __mingw_ovr __MINGW_ATTRIB_NONNULL(2) - int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv) - { - return __ms_vswscanf( __source, __format, __local_argv ); - } - __mingw_ovr - __MINGW_ATTRIB_NONNULL(1) - int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv) - { - return __ms_vwscanf (__format, __local_argv); - } + int vswscanf (const wchar_t * __restrict__ __source, const wchar_t * __restrict__ __format, __builtin_va_list __local_argv); + __MINGW_ATTRIB_NONNULL(1) + int vwscanf(const wchar_t *__format, __builtin_va_list __local_argv); #endif /* __NO_ISOCEXT */ int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); @@ -765,22 +553,8 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); } #if __USE_MINGW_ANSI_STDIO == 0 - __mingw_ovr - int snwprintf (wchar_t * __restrict__ s, size_t n, 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, s, n, format, NULL, __ap); - __builtin_va_end(__ap); - return __ret < 0 ? -1 : __ret; - } - __mingw_ovr - int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) - { - int __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg); - return __ret < 0 ? -1 : __ret; - } + 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 @@ -798,8 +572,6 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf); #pragma push_macro("vsnwprintf") # undef snwprintf # undef vsnwprintf - int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); - int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list); 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); #pragma pop_macro ("vsnwprintf") diff --git a/lib/libc/include/any-windows-any/wctype.h b/lib/libc/include/any-windows-any/wctype.h index b45ba26c9e..418d75e9e2 100644 --- a/lib/libc/include/any-windows-any/wctype.h +++ b/lib/libc/include/any-windows-any/wctype.h @@ -6,145 +6,10 @@ #ifndef _INC_WCTYPE #define _INC_WCTYPE -#ifndef _WIN32 -#error Only Win32 target is supported! -#endif - -#include - -#pragma pack(push,_CRT_PACKING) +#include #ifdef __cplusplus extern "C" { -#endif - -#ifndef _CRTIMP -#define _CRTIMP __declspec(dllimport) -#endif - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif /* C++ */ -#endif /* _WCHAR_T_DEFINED */ - -#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 - -#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 - -#define _UPPER 0x1 -#define _LOWER 0x2 -#define _DIGIT 0x4 -#define _SPACE 0x8 - -#define _PUNCT 0x10 -#define _CONTROL 0x20 -#define _BLANK 0x40 -#define _HEX 0x80 - -#define _LEADBYTE 0x8000 -#define _ALPHA (0x0100|_UPPER|_LOWER) - -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED - - int __cdecl iswalpha(wint_t); - int __cdecl iswupper(wint_t); - int __cdecl iswlower(wint_t); - int __cdecl iswdigit(wint_t); - int __cdecl iswxdigit(wint_t); - int __cdecl iswspace(wint_t); - int __cdecl iswpunct(wint_t); - int __cdecl iswalnum(wint_t); - int __cdecl iswprint(wint_t); - int __cdecl iswgraph(wint_t); - int __cdecl iswcntrl(wint_t); - int __cdecl iswascii(wint_t); - int __cdecl isleadbyte(int); - wint_t __cdecl towupper(wint_t); - wint_t __cdecl towlower(wint_t); - int __cdecl iswctype(wint_t,wctype_t); -#if __MSVCRT_VERSION__ >= 0x800 - _CRTIMP int __cdecl __iswcsymf(wint_t); - _CRTIMP int __cdecl __iswcsym(wint_t); -#endif - int __cdecl is_wctype(wint_t,wctype_t); -#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) || defined (__cplusplus) -int __cdecl iswblank(wint_t _C); -#endif -#endif - -#ifndef _WCTYPE_INLINE_DEFINED -#define _WCTYPE_INLINE_DEFINED -#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)) -#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 isleadbyte(c) (__pctype_func()[(unsigned char)(c)] & _LEADBYTE) -#else -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl iswalpha(wint_t _C) {return (iswctype(_C,_ALPHA)); } - __CRT_INLINE int __cdecl iswupper(wint_t _C) {return (iswctype(_C,_UPPER)); } - __CRT_INLINE int __cdecl iswlower(wint_t _C) {return (iswctype(_C,_LOWER)); } - __CRT_INLINE int __cdecl iswdigit(wint_t _C) {return (iswctype(_C,_DIGIT)); } - __CRT_INLINE int __cdecl iswxdigit(wint_t _C) {return (iswctype(_C,_HEX)); } - __CRT_INLINE int __cdecl iswspace(wint_t _C) {return (iswctype(_C,_SPACE)); } - __CRT_INLINE int __cdecl iswpunct(wint_t _C) {return (iswctype(_C,_PUNCT)); } - __CRT_INLINE int __cdecl iswalnum(wint_t _C) {return (iswctype(_C,_ALPHA|_DIGIT)); } - __CRT_INLINE int __cdecl iswprint(wint_t _C) {return (iswctype(_C,_BLANK|_PUNCT|_ALPHA|_DIGIT)); } - __CRT_INLINE int __cdecl iswgraph(wint_t _C) {return (iswctype(_C,_PUNCT|_ALPHA|_DIGIT)); } - __CRT_INLINE int __cdecl iswcntrl(wint_t _C) {return (iswctype(_C,_CONTROL)); } - __CRT_INLINE int __cdecl iswascii(wint_t _C) {return ((unsigned)(_C) < 0x80); } - __CRT_INLINE int __cdecl isleadbyte(int _C) {return (__pctype_func()[(unsigned char)(_C)] & _LEADBYTE); } -#endif /* !__CRT__NO_INLINE */ -#endif /* __cplusplus */ #endif typedef wchar_t wctrans_t; @@ -156,5 +21,4 @@ int __cdecl iswblank(wint_t _C); } #endif -#pragma pack(pop) #endif diff --git a/lib/libc/include/any-windows-any/wdstptmgmt.h b/lib/libc/include/any-windows-any/wdstptmgmt.h index 0e73ec6540..2a645f400a 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.0-rc1 from include/wdstptmgmt.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 de9c7bec4f..6975e8f95f 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.0-rc1 from include/weakreference.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/weakreference.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wia_lh.h b/lib/libc/include/any-windows-any/wia_lh.h index a3e99f042d..84c3b526ab 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.0-rc1 from include/wia_lh.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 3364c2fdf2..5acc750d30 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.0-rc1 from include/wia_xp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wia_xp.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wiadef.h b/lib/libc/include/any-windows-any/wiadef.h index c6d5a62b17..b007390086 100644 --- a/lib/libc/include/any-windows-any/wiadef.h +++ b/lib/libc/include/any-windows-any/wiadef.h @@ -253,9 +253,9 @@ extern "C" { #define WIA_DIP_DRIVER_VERSION_STR L"Driver Version" #ifdef WIA_DECLARE_DEVINFO_PROP_ARRAY - PROPSPEC g_psDeviceInfo[WIA_NUM_DIP] = { {PRSPEC_PROPID,WIA_DIP_DEV_ID},{PRSPEC_PROPID,WIA_DIP_VEND_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_TYPE},{PRSPEC_PROPID,WIA_DIP_PORT_NAME},{PRSPEC_PROPID,WIA_DIP_DEV_NAME},{PRSPEC_PROPID,WIA_DIP_SERVER_NAME},{PRSPEC_PROPID,WIA_DIP_REMOTE_DEV_ID},{PRSPEC_PROPID,WIA_DIP_UI_CLSID},{PRSPEC_PROPID,WIA_DIP_HW_CONFIG},{PRSPEC_PROPID,WIA_DIP_BAUDRATE},{PRSPEC_PROPID,WIA_DIP_STI_GEN_CAPABILITIES},{PRSPEC_PROPID,WIA_DIP_WIA_VERSION},{PRSPEC_PROPID,WIA_DIP_DRIVER_VERSION},}; - PROPID g_piDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID,WIA_DIP_VEND_DESC,WIA_DIP_DEV_DESC,WIA_DIP_DEV_TYPE,WIA_DIP_PORT_NAME,WIA_DIP_DEV_NAME,WIA_DIP_SERVER_NAME,WIA_DIP_REMOTE_DEV_ID,WIA_DIP_UI_CLSID,WIA_DIP_HW_CONFIG,WIA_DIP_BAUDRATE,WIA_DIP_STI_GEN_CAPABILITIES,WIA_DIP_WIA_VERSION,WIA_DIP_DRIVER_VERSION,}; - LPOLESTR g_pszDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID_STR,WIA_DIP_VEND_DESC_STR,WIA_DIP_DEV_DESC_STR,WIA_DIP_DEV_TYPE_STR,WIA_DIP_PORT_NAME_STR,WIA_DIP_DEV_NAME_STR,WIA_DIP_SERVER_NAME_STR,WIA_DIP_REMOTE_DEV_ID_STR,WIA_DIP_UI_CLSID_STR,WIA_DIP_HW_CONFIG_STR,WIA_DIP_BAUDRATE_STR,WIA_DIP_STI_GEN_CAPABILITIES_STR,WIA_DIP_WIA_VERSION_STR,WIA_DIP_DRIVER_VERSION_STR,}; + PROPSPEC g_psDeviceInfo[WIA_NUM_DIP] = { {PRSPEC_PROPID,WIA_DIP_DEV_ID},{PRSPEC_PROPID,WIA_DIP_VEND_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_DESC},{PRSPEC_PROPID,WIA_DIP_DEV_TYPE},{PRSPEC_PROPID,WIA_DIP_PORT_NAME},{PRSPEC_PROPID,WIA_DIP_DEV_NAME},{PRSPEC_PROPID,WIA_DIP_SERVER_NAME},{PRSPEC_PROPID,WIA_DIP_REMOTE_DEV_ID},{PRSPEC_PROPID,WIA_DIP_UI_CLSID},{PRSPEC_PROPID,WIA_DIP_HW_CONFIG},{PRSPEC_PROPID,WIA_DIP_BAUDRATE},{PRSPEC_PROPID,WIA_DIP_STI_GEN_CAPABILITIES},{PRSPEC_PROPID,WIA_DIP_WIA_VERSION},{PRSPEC_PROPID,WIA_DIP_DRIVER_VERSION}}; + PROPID g_piDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID,WIA_DIP_VEND_DESC,WIA_DIP_DEV_DESC,WIA_DIP_DEV_TYPE,WIA_DIP_PORT_NAME,WIA_DIP_DEV_NAME,WIA_DIP_SERVER_NAME,WIA_DIP_REMOTE_DEV_ID,WIA_DIP_UI_CLSID,WIA_DIP_HW_CONFIG,WIA_DIP_BAUDRATE,WIA_DIP_STI_GEN_CAPABILITIES,WIA_DIP_WIA_VERSION,WIA_DIP_DRIVER_VERSION}; + LPOLESTR g_pszDeviceInfo[WIA_NUM_DIP] = { WIA_DIP_DEV_ID_STR,WIA_DIP_VEND_DESC_STR,WIA_DIP_DEV_DESC_STR,WIA_DIP_DEV_TYPE_STR,WIA_DIP_PORT_NAME_STR,WIA_DIP_DEV_NAME_STR,WIA_DIP_SERVER_NAME_STR,WIA_DIP_REMOTE_DEV_ID_STR,WIA_DIP_UI_CLSID_STR,WIA_DIP_HW_CONFIG_STR,WIA_DIP_BAUDRATE_STR,WIA_DIP_STI_GEN_CAPABILITIES_STR,WIA_DIP_WIA_VERSION_STR,WIA_DIP_DRIVER_VERSION_STR}; #else extern PROPSPEC g_psDeviceInfo[WIA_NUM_DIP]; extern PROPID g_piDeviceInfo[WIA_NUM_DIP]; diff --git a/lib/libc/include/any-windows-any/winbase.h b/lib/libc/include/any-windows-any/winbase.h index f7337843f1..43d80a79ee 100644 --- a/lib/libc/include/any-windows-any/winbase.h +++ b/lib/libc/include/any-windows-any/winbase.h @@ -2311,7 +2311,7 @@ typedef enum FILE_FLUSH_MODE { COPYFILE2_CALLBACK_STREAM_FINISHED, COPYFILE2_CALLBACK_POLL_CONTINUE, COPYFILE2_CALLBACK_ERROR, - COPYFILE2_CALLBACK_MAX, + COPYFILE2_CALLBACK_MAX } COPYFILE2_MESSAGE_TYPE; typedef enum _COPYFILE2_MESSAGE_ACTION { @@ -2319,7 +2319,7 @@ typedef enum FILE_FLUSH_MODE { COPYFILE2_PROGRESS_CANCEL, COPYFILE2_PROGRESS_STOP, COPYFILE2_PROGRESS_QUIET, - COPYFILE2_PROGRESS_PAUSE, + COPYFILE2_PROGRESS_PAUSE } COPYFILE2_MESSAGE_ACTION; typedef enum _COPYFILE2_COPY_PHASE { @@ -2330,7 +2330,7 @@ typedef enum FILE_FLUSH_MODE { COPYFILE2_PHASE_WRITE_DESTINATION, COPYFILE2_PHASE_SERVER_COPY, COPYFILE2_PHASE_NAMEGRAFT_COPY, - COPYFILE2_PHASE_MAX, + COPYFILE2_PHASE_MAX } COPYFILE2_COPY_PHASE; #define COPYFILE2_MESSAGE_COPY_OFFLOAD (__MSABI_LONG (0x00000001)) diff --git a/lib/libc/include/any-windows-any/wincodec.h b/lib/libc/include/any-windows-any/wincodec.h index 104526b69e..4b1b306d6c 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.0-rc1 from include/wincodec.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wincodec.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wincodecsdk.h b/lib/libc/include/any-windows-any/wincodecsdk.h index f0ff12dfdd..011b1f17ba 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.0-rc1 from include/wincodecsdk.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wincodecsdk.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/winddi.h b/lib/libc/include/any-windows-any/winddi.h index 9b4b197dd8..d402129698 100644 --- a/lib/libc/include/any-windows-any/winddi.h +++ b/lib/libc/include/any-windows-any/winddi.h @@ -2027,7 +2027,7 @@ typedef enum _ENG_SYSTEM_ATTRIBUTE { EngProcessorFeature = 1, EngNumberOfProcessors, EngOptimumAvailableUserMemory, - EngOptimumAvailableSystemMemory, + EngOptimumAvailableSystemMemory } ENG_SYSTEM_ATTRIBUTE; #define QSA_MMX 0x00000100 diff --git a/lib/libc/include/any-windows-any/windot11.h b/lib/libc/include/any-windows-any/windot11.h index 0b3e14ff45..dab7858685 100644 --- a/lib/libc/include/any-windows-any/windot11.h +++ b/lib/libc/include/any-windows-any/windot11.h @@ -1444,7 +1444,7 @@ typedef struct _DOT11_SEND_EXTENSION_INFO { typedef enum _DOT11_ACK_POLICY { dot11_ack_policy_none = 0, dot11_ack_policy_acknowledge = 1, - dot11_ack_policy_do_not_acknowledge = 2, + dot11_ack_policy_do_not_acknowledge = 2 } DOT11_ACK_POLICY, *PDOT11_ACK_POLICY; typedef struct _DOT11_SEND_EXTENSION_INFO_V2 { diff --git a/lib/libc/include/any-windows-any/windowsnumerics.impl.h b/lib/libc/include/any-windows-any/windowsnumerics.impl.h index e089602e41..04cc734556 100644 --- a/lib/libc/include/any-windows-any/windowsnumerics.impl.h +++ b/lib/libc/include/any-windows-any/windowsnumerics.impl.h @@ -372,7 +372,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { return { 1.0f, 0.0f, 0.0f, 1.0f, - 0.0f, 0.0f, + 0.0f, 0.0f }; } @@ -422,21 +422,21 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { return { dot(v1r1, v2c1), dot(v1r1, v2c2), dot(v1r2, v2c1), dot(v1r2, v2c2), - dot(v1r3, v2c1), dot(v1r3, v2c2), + dot(v1r3, v2c1), dot(v1r3, v2c2) }; } inline float3x2 operator*(const float3x2 &val1, float val2) { return { val1.m11 * val2, val1.m12 * val2, val1.m21 * val2, val1.m22 * val2, - val1.m31 * val2, val1.m32 * val2, + val1.m31 * val2, val1.m32 * val2 }; } inline float3x2 operator-(const float3x2 &val) { return { -val.m11, -val.m12, -val.m21, -val.m22, - -val.m31, -val.m32, + -val.m31, -val.m32 }; } #undef _WINDOWS_NUMERICS_IMPL_BINARY_OP @@ -479,7 +479,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.0f, 1.0f }; } @@ -552,7 +552,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { dot(v1r1, v2c1), dot(v1r1, v2c2), dot(v1r1, v2c3), dot(v1r1, v2c4), dot(v1r2, v2c1), dot(v1r2, v2c2), dot(v1r2, v2c3), dot(v1r2, v2c4), dot(v1r3, v2c1), dot(v1r3, v2c2), dot(v1r3, v2c3), dot(v1r3, v2c4), - dot(v1r4, v2c1), dot(v1r4, v2c2), dot(v1r4, v2c3), dot(v1r4, v2c4), + dot(v1r4, v2c1), dot(v1r4, v2c2), dot(v1r4, v2c3), dot(v1r4, v2c4) }; } inline float4x4 operator*(const float4x4 &val1, float val2) { @@ -560,7 +560,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { val1.m11 * val2, val1.m12 * val2, val1.m13 * val2, val1.m14 * val2, val1.m21 * val2, val1.m22 * val2, val1.m23 * val2, val1.m24 * val2, val1.m31 * val2, val1.m32 * val2, val1.m33 * val2, val1.m34 * val2, - val1.m41 * val2, val1.m42 * val2, val1.m43 * val2, val1.m44 * val2, + val1.m41 * val2, val1.m42 * val2, val1.m43 * val2, val1.m44 * val2 }; } inline float4x4 operator-(const float4x4 &val) { @@ -568,7 +568,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { -val.m11, -val.m12, -val.m13, -val.m14, -val.m21, -val.m22, -val.m23, -val.m24, -val.m31, -val.m32, -val.m33, -val.m34, - -val.m41, -val.m42, -val.m43, -val.m44, + -val.m41, -val.m42, -val.m43, -val.m44 }; } #undef _WINDOWS_NUMERICS_IMPL_BINARY_OP @@ -678,7 +678,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { val1.w * val2.x + val1.x * val2.w + val1.y * val2.z - val1.z * val2.y, val1.w * val2.y - val1.x * val2.z + val1.y * val2.w + val1.z * val2.x, val1.w * val2.z + val1.x * val2.y - val1.y * val2.x + val1.z * val2.w, - val1.w * val2.w - val1.x * val2.x - val1.y * val2.y - val1.z * val2.z, + val1.w * val2.w - val1.x * val2.x - val1.y * val2.y - val1.z * val2.z }; } inline quaternion operator*(const quaternion &val1, float val2) { return { val1.x * val2, val1.y * val2, val1.z * val2, val1.w * val2 }; @@ -783,7 +783,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { return { val1.y * val2.z - val2.y * val1.z, val1.z * val2.x - val2.z * val1.x, - val1.x * val2.y - val2.x * val1.y, + val1.x * val2.y - val2.x * val1.y }; } inline float3 reflect(const float3 &vec, const float3 &norm) { @@ -845,7 +845,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { ::std::min(val1.x, val2.x), ::std::min(val1.y, val2.y), ::std::min(val1.z, val2.z), - ::std::min(val1.w, val2.w), + ::std::min(val1.w, val2.w) }; } inline float4 max(const float4 &val1, const float4 &val2) { @@ -853,7 +853,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { ::std::max(val1.x, val2.x), ::std::max(val1.y, val2.y), ::std::max(val1.z, val2.z), - ::std::max(val1.w, val2.w), + ::std::max(val1.w, val2.w) }; } inline float4 clamp(const float4 &val, const float4 &min, const float4 &max) { @@ -861,7 +861,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { _impl::clamp(val.x, min.x, max.x), _impl::clamp(val.y, min.y, max.y), _impl::clamp(val.z, min.z, max.z), - _impl::clamp(val.w, min.w, max.w), + _impl::clamp(val.w, min.w, max.w) }; } inline float4 lerp(const float4 &val1, const float4 &val2, float amount) { @@ -869,7 +869,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { _impl::lerp(val1.x, val2.x, amount), _impl::lerp(val1.y, val2.y, amount), _impl::lerp(val1.z, val2.z, amount), - _impl::lerp(val1.w, val2.w, amount), + _impl::lerp(val1.w, val2.w, amount) }; } // TODO: impl @@ -1018,7 +1018,7 @@ _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ { val.m11, val.m21, val.m31, val.m41, val.m12, val.m22, val.m32, val.m42, val.m13, val.m23, val.m33, val.m43, - val.m14, val.m24, val.m34, val.m44, + val.m14, val.m24, val.m34, val.m44 }; } inline float4x4 lerp(const float4x4 &val1, const float4x4 &val2, float amount); diff --git a/lib/libc/include/any-windows-any/winhttp.h b/lib/libc/include/any-windows-any/winhttp.h index d0ba52d611..4b3683af87 100644 --- a/lib/libc/include/any-windows-any/winhttp.h +++ b/lib/libc/include/any-windows-any/winhttp.h @@ -20,9 +20,9 @@ #define __WINE_WINHTTP_H #ifdef _WIN64 -#include +#pragma pack(push,8) #else -#include +#pragma pack(push,4) #endif #ifdef _WINHTTP_INTERNAL_ @@ -178,7 +178,53 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED 145 #define WINHTTP_OPTION_REQUEST_STATS 146 #define WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT 147 -#define WINHTTP_LAST_OPTION WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT +#define WINHTTP_OPTION_CONNECTION_STATS_V1 150 +#define WINHTTP_OPTION_SECURITY_INFO 151 +#define WINHTTP_OPTION_TCP_KEEPALIVE 152 +#define WINHTTP_OPTION_TCP_FAST_OPEN 153 +#define WINHTTP_OPTION_TCP_FALSE_START 154 +#define WINHTTP_OPTION_IGNORE_CERT_REVOCATION_OFFLINE 155 +#define WINHTTP_OPTION_TLS_PROTOCOL_INSECURE_FALLBACK 158 +#define WINHTTP_OPTION_STREAM_ERROR_CODE 159 +#define WINHTTP_OPTION_REQUIRE_STREAM_END 160 +#define WINHTTP_OPTION_ENABLE_HTTP2_PLUS_CLIENT_CERT 161 +#define WINHTTP_OPTION_FAILED_CONNECTION_RETRIES 162 +#define WINHTTP_OPTION_HTTP2_KEEPALIVE 164 +#define WINHTTP_OPTION_RESOLUTION_HOSTNAME 165 +#define WINHTTP_OPTION_SET_TOKEN_BINDING 166 +#define WINHTTP_OPTION_TOKEN_BINDING_PUBLIC_KEY 167 +#define WINHTTP_OPTION_REFERER_TOKEN_BINDING_HOSTNAME 168 +#define WINHTTP_OPTION_HTTP2_PLUS_TRANSFER_ENCODING 169 +#define WINHTTP_OPTION_RESOLVER_CACHE_CONFIG 170 +#define WINHTTP_OPTION_DISABLE_CERT_CHAIN_BUILDING 171 +#define WINHTTP_OPTION_BACKGROUND_CONNECTIONS 172 +#define WINHTTP_OPTION_FIRST_AVAILABLE_CONNECTION 173 +#define WINHTTP_OPTION_TCP_PRIORITY_STATUS 177 +#define WINHTTP_OPTION_CONNECTION_GUID 178 +#define WINHTTP_OPTION_MATCH_CONNECTION_GUID 179 +#define WINHTTP_OPTION_HTTP2_RECEIVE_WINDOW 183 +#define WINHTTP_OPTION_FEATURE_SUPPORTED 184 +#define WINHTTP_OPTION_QUIC_STATS 185 +#define WINHTTP_OPTION_HTTP3_KEEPALIVE 188 +#define WINHTTP_OPTION_HTTP3_HANDSHAKE_TIMEOUT 189 +#define WINHTTP_OPTION_HTTP3_INITIAL_RTT 190 +#define WINHTTP_OPTION_HTTP3_STREAM_ERROR_CODE 191 +#define WINHTTP_OPTION_REQUEST_ANNOTATION 192 +#define WINHTTP_OPTION_DISABLE_PROXY_AUTH_SCHEMES 193 +#define WINHTTP_OPTION_REVERT_IMPERSONATION_SERVER_CERT 194 +#define WINHTTP_OPTION_DISABLE_GLOBAL_POOLING 195 +#define WINHTTP_OPTION_USE_SESSION_SCH_CRED 196 +#define WINHTTP_OPTION_QUIC_STATS_V2 200 +#define WINHTTP_OPTION_QUIC_STREAM_STATS 202 +#define WINHTTP_OPTION_USE_LOOKASIDE 203 +#define WINHTTP_OPTION_ERROR_LOG_GUID 204 +#define WINHTTP_OPTION_ENABLE_FAST_FORWARDING 205 +#define WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_DATA 206 +#define WINHTTP_OPTION_UPGRADE_TO_PROTOCOL 207 +#define WINHTTP_OPTION_CONNECTION_STATS_V2 208 +#define WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_STATUS 209 + +#define WINHTTP_LAST_OPTION WINHTTP_OPTION_FAST_FORWARDING_RESPONSE_STATUS #define WINHTTP_OPTION_USERNAME 0x1000 #define WINHTTP_OPTION_PASSWORD 0x1001 #define WINHTTP_OPTION_PROXY_USERNAME 0x1002 @@ -816,6 +862,16 @@ typedef struct _WINHTTP_WEB_SOCKET_STATUS #define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123 #define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000 +#ifdef __SCHANNEL_H__ + +typedef struct _WINHTTP_SECURITY_INFO +{ + SecPkgContext_ConnectionInfo ConnectionInfo; + SecPkgContext_CipherInfo CipherInfo; +} WINHTTP_SECURITY_INFO, *PWINHTTP_SECURITY_INFO; + +#endif + #ifdef __cplusplus extern "C" { #endif @@ -872,6 +928,6 @@ WINHTTPAPI DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,WINBOOL,WINHTT } #endif -#include +#pragma pack(pop) #endif /* __WINE_WINHTTP_H */ diff --git a/lib/libc/include/any-windows-any/winhvemulation.h b/lib/libc/include/any-windows-any/winhvemulation.h index 112f62bf7a..b15127de10 100644 --- a/lib/libc/include/any-windows-any/winhvemulation.h +++ b/lib/libc/include/any-windows-any/winhvemulation.h @@ -15,6 +15,8 @@ #include +#if defined(__x86_64__) + typedef union WHV_EMULATOR_STATUS { __C89_NAMELESS struct { UINT32 EmulationSuccessful : 1; @@ -77,6 +79,8 @@ HRESULT WINAPI WHvEmulatorTryMmioEmulation(WHV_EMULATOR_HANDLE Emulator, VOID *C } #endif -#endif +#endif /* defined(__x86_64__) */ + +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif diff --git a/lib/libc/include/any-windows-any/winhvplatform.h b/lib/libc/include/any-windows-any/winhvplatform.h index b148804fba..b1914a4aa1 100644 --- a/lib/libc/include/any-windows-any/winhvplatform.h +++ b/lib/libc/include/any-windows-any/winhvplatform.h @@ -15,6 +15,8 @@ #include +#if defined(__x86_64__) || defined(__aarch64__) + #ifdef __cplusplus extern "C" { #endif @@ -39,16 +41,22 @@ HRESULT WINAPI WHvRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpI HRESULT WINAPI WHvCancelRunVirtualProcessor(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Flags); HRESULT WINAPI WHvGetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, WHV_REGISTER_VALUE *RegisterValues); HRESULT WINAPI WHvSetVirtualProcessorRegisters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME *RegisterNames, UINT32 RegisterCount, const WHV_REGISTER_VALUE *RegisterValues); +#if defined(__x86_64__) HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize); HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize); +#endif HRESULT WINAPI WHvRequestInterrupt(WHV_PARTITION_HANDLE Partition, const WHV_INTERRUPT_CONTROL *Interrupt, UINT32 InterruptControlSize); +#if defined(__x86_64__) HRESULT WINAPI WHvGetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten); HRESULT WINAPI WHvSetVirtualProcessorXsaveState(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *Buffer, UINT32 BufferSizeInBytes); +#endif HRESULT WINAPI WHvQueryGpaRangeDirtyBitmap(WHV_PARTITION_HANDLE Partition, WHV_GUEST_PHYSICAL_ADDRESS GuestAddress, UINT64 RangeSizeInBytes, UINT64 *Bitmap, UINT32 BitmapSizeInBytes); HRESULT WINAPI WHvGetPartitionCounters(WHV_PARTITION_HANDLE Partition, WHV_PARTITION_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten); HRESULT WINAPI WHvGetVirtualProcessorCounters(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, WHV_PROCESSOR_COUNTER_SET CounterSet, VOID *Buffer, UINT32 BufferSizeInBytes, UINT32 *BytesWritten); +#if defined(__x86_64__) HRESULT WINAPI WHvGetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, VOID *State, UINT32 StateSize, UINT32 *WrittenSize); HRESULT WINAPI WHvSetVirtualProcessorInterruptControllerState2(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const VOID *State, UINT32 StateSize); +#endif HRESULT WINAPI WHvRegisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData, HANDLE EventHandle); HRESULT WINAPI WHvUnregisterPartitionDoorbellEvent(WHV_PARTITION_HANDLE Partition, const WHV_DOORBELL_MATCH_DATA *MatchData); HRESULT WINAPI WHvAdviseGpaRange(WHV_PARTITION_HANDLE Partition, const WHV_MEMORY_RANGE_ENTRY *GpaRanges, UINT32 GpaRangesCount, WHV_ADVISE_GPA_RANGE_CODE Advice, const VOID *AdviceBuffer, UINT32 AdviceBufferSizeInBytes); @@ -79,8 +87,10 @@ HRESULT WINAPI WHvCreateNotificationPort(WHV_PARTITION_HANDLE Partition, const W HRESULT WINAPI WHvSetNotificationPortProperty(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle, WHV_NOTIFICATION_PORT_PROPERTY_CODE PropertyCode, WHV_NOTIFICATION_PORT_PROPERTY PropertyValue); HRESULT WINAPI WHvDeleteNotificationPort(WHV_PARTITION_HANDLE Partition, WHV_NOTIFICATION_PORT_HANDLE PortHandle); HRESULT WINAPI WHvPostVirtualProcessorSynicMessage(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 SintIndex, const VOID *Message, UINT32 MessageSizeInBytes); +#if defined(__x86_64__) HRESULT WINAPI WHvGetVirtualProcessorCpuidOutput(WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Eax, UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput); HRESULT WINAPI WHvGetInterruptTargetVpSet(WHV_PARTITION_HANDLE Partition, UINT64 Destination, WHV_INTERRUPT_DESTINATION_MODE DestinationMode, UINT32 *TargetVps, UINT32 VpCount, UINT32 *TargetVpCount); +#endif HRESULT WINAPI WHvStartPartitionMigration(WHV_PARTITION_HANDLE Partition, HANDLE *MigrationHandle); HRESULT WHvCancelPartitionMigration(WHV_PARTITION_HANDLE Partition); HRESULT WHvCompletePartitionMigration(WHV_PARTITION_HANDLE Partition); @@ -90,6 +100,101 @@ HRESULT WINAPI WHvAcceptPartitionMigration(HANDLE MigrationHandle, WHV_PARTITION } #endif +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* _WINHVAPI_H_ */ + + +#ifndef ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines +#define ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(__x86_64__) || defined(__aarch64__) + +BOOLEAN WINAPI IsWHvGetCapabilityPresent(VOID); +BOOLEAN WINAPI IsWHvCreatePartitionPresent(VOID); +BOOLEAN WINAPI IsWHvSetupPartitionPresent(VOID); +BOOLEAN WINAPI IsWHvResetPartitionPresent(VOID); +BOOLEAN WINAPI IsWHvDeletePartitionPresent(VOID); +BOOLEAN WINAPI IsWHvGetPartitionPropertyPresent(VOID); +BOOLEAN WINAPI IsWHvSetPartitionPropertyPresent(VOID); +BOOLEAN WINAPI IsWHvSuspendPartitionTimePresent(VOID); +BOOLEAN WINAPI IsWHvResumePartitionTimePresent(VOID); +BOOLEAN WINAPI IsWHvMapGpaRangePresent(VOID); +BOOLEAN WINAPI IsWHvMapGpaRange2Present(VOID); +BOOLEAN WINAPI IsWHvUnmapGpaRangePresent(VOID); +BOOLEAN WINAPI IsWHvTranslateGvaPresent(VOID); +BOOLEAN WINAPI IsWHvCreateVirtualProcessorPresent(VOID); +BOOLEAN WINAPI IsWHvCreateVirtualProcessor2Present(VOID); +BOOLEAN WINAPI IsWHvDeleteVirtualProcessorPresent(VOID); +BOOLEAN WINAPI IsWHvRunVirtualProcessorPresent(VOID); +BOOLEAN WINAPI IsWHvCancelRunVirtualProcessorPresent(VOID); +BOOLEAN WINAPI IsWHvGetVirtualProcessorRegistersPresent(VOID); +BOOLEAN WINAPI IsWHvSetVirtualProcessorRegistersPresent(VOID); +#if defined(__x86_64__) +BOOLEAN WINAPI IsWHvGetVirtualProcessorInterruptControllerStatePresent(VOID); +BOOLEAN WINAPI IsWHvSetVirtualProcessorInterruptControllerStatePresent(VOID); +#endif +BOOLEAN WINAPI IsWHvRequestInterruptPresent(VOID); +#if defined(__x86_64__) +BOOLEAN WINAPI IsWHvGetVirtualProcessorXsaveStatePresent(VOID); +BOOLEAN WINAPI IsWHvSetVirtualProcessorXsaveStatePresent(VOID); +#endif +BOOLEAN WINAPI IsWHvQueryGpaRangeDirtyBitmapPresent(VOID); +BOOLEAN WINAPI IsWHvGetPartitionCountersPresent(VOID); +BOOLEAN WINAPI IsWHvGetVirtualProcessorCountersPresent(VOID); +#if defined(__x86_64__) +BOOLEAN WINAPI IsWHvGetVirtualProcessorInterruptControllerState2Present(VOID); +BOOLEAN WINAPI IsWHvSetVirtualProcessorInterruptControllerState2Present(VOID); +#endif +BOOLEAN WINAPI IsWHvRegisterPartitionDoorbellEventPresent(VOID); +BOOLEAN WINAPI IsWHvUnregisterPartitionDoorbellEventPresent(VOID); +BOOLEAN WINAPI IsWHvAdviseGpaRangePresent(VOID); +BOOLEAN WINAPI IsWHvReadGpaRangePresent(VOID); +BOOLEAN WINAPI IsWHvWriteGpaRangePresent(VOID); +BOOLEAN WINAPI IsWHvSignalVirtualProcessorSynicEventPresent(VOID); +BOOLEAN WINAPI IsWHvGetVirtualProcessorStatePresent(VOID); +BOOLEAN WINAPI IsWHvSetVirtualProcessorStatePresent(VOID); +BOOLEAN WINAPI IsWHvAllocateVpciResourcePresent(VOID); +BOOLEAN WINAPI IsWHvCreateVpciDevicePresent(VOID); +BOOLEAN WINAPI IsWHvDeleteVpciDevicePresent(VOID); +BOOLEAN WINAPI IsWHvGetVpciDevicePropertyPresent(VOID); +BOOLEAN WINAPI IsWHvGetVpciDeviceNotificationPresent(VOID); +BOOLEAN WINAPI IsWHvMapVpciDeviceMmioRangesPresent(VOID); +BOOLEAN WINAPI IsWHvUnmapVpciDeviceMmioRangesPresent(VOID); +BOOLEAN WINAPI IsWHvSetVpciDevicePowerStatePresent(VOID); +BOOLEAN WINAPI IsWHvReadVpciDeviceRegisterPresent(VOID); +BOOLEAN WINAPI IsWHvWriteVpciDeviceRegisterPresent(VOID); +BOOLEAN WINAPI IsWHvMapVpciDeviceInterruptPresent(VOID); +BOOLEAN WINAPI IsWHvUnmapVpciDeviceInterruptPresent(VOID); +BOOLEAN WINAPI IsWHvRetargetVpciDeviceInterruptPresent(VOID); +BOOLEAN WINAPI IsWHvRequestVpciDeviceInterruptPresent(VOID); +BOOLEAN WINAPI IsWHvGetVpciDeviceInterruptTargetPresent(VOID); +BOOLEAN WINAPI IsWHvCreateTriggerPresent(VOID); +BOOLEAN WINAPI IsWHvUpdateTriggerParametersPresent(VOID); +BOOLEAN WINAPI IsWHvDeleteTriggerPresent(VOID); +BOOLEAN WINAPI IsWHvCreateNotificationPortPresent(VOID); +BOOLEAN WINAPI IsWHvSetNotificationPortPropertyPresent(VOID); +BOOLEAN WINAPI IsWHvDeleteNotificationPortPresent(VOID); +BOOLEAN WINAPI IsWHvPostVirtualProcessorSynicMessagePresent(VOID); +#if defined(__x86_64__) +BOOLEAN WINAPI IsWHvGetVirtualProcessorCpuidOutputPresent(VOID); +BOOLEAN WINAPI IsWHvGetInterruptTargetVpSetPresent(VOID); +#endif +BOOLEAN WINAPI IsWHvStartPartitionMigrationPresent(VOID); +BOOLEAN WINAPI IsWHvCancelPartitionMigrationPresent(VOID); +BOOLEAN WINAPI IsWHvCompletePartitionMigrationPresent(VOID); +BOOLEAN WINAPI IsWHvAcceptPartitionMigrationPresent(VOID); + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +#ifdef __cplusplus +} +#endif + +#endif /* ext_ms_win_hyperv_hvplatform_l1_1_5_query_routines */ diff --git a/lib/libc/include/any-windows-any/winhvplatformdefs.h b/lib/libc/include/any-windows-any/winhvplatformdefs.h index 9cf239cd36..b547b7a567 100644 --- a/lib/libc/include/any-windows-any/winhvplatformdefs.h +++ b/lib/libc/include/any-windows-any/winhvplatformdefs.h @@ -6,790 +6,7 @@ #ifndef _WINHVAPIDEFS_H_ #define _WINHVAPIDEFS_H_ -typedef enum WHV_CAPABILITY_CODE { - WHvCapabilityCodeHypervisorPresent = 0x00000000 - ,WHvCapabilityCodeFeatures = 0x00000001 - ,WHvCapabilityCodeExtendedVmExits = 0x00000002 -#if defined(__x86_64__) - ,WHvCapabilityCodeExceptionExitBitmap = 0x00000003 - ,WHvCapabilityCodeX64MsrExitBitmap = 0x00000004 -#endif - ,WHvCapabilityCodeGpaRangePopulateFlags = 0x00000005 - ,WHvCapabilityCodeSchedulerFeatures = 0x00000006 - ,WHvCapabilityCodeProcessorVendor = 0x00001000 - ,WHvCapabilityCodeProcessorFeatures = 0x00001001 - ,WHvCapabilityCodeProcessorClFlushSize = 0x00001002 -#if defined(__x86_64__) - ,WHvCapabilityCodeProcessorXsaveFeatures = 0x00001003 -#endif - ,WHvCapabilityCodeProcessorClockFrequency = 0x00001004 -#if defined(__x86_64__) - ,WHvCapabilityCodeInterruptClockFrequency = 0x00001005 -#endif - ,WHvCapabilityCodeProcessorFeaturesBanks = 0x00001006 - ,WHvCapabilityCodeProcessorFrequencyCap = 0x00001007 - ,WHvCapabilityCodeSyntheticProcessorFeaturesBanks = 0x00001008 -#if defined(__x86_64__) - ,WHvCapabilityCodeProcessorPerfmonFeatures = 0x00001009 -#endif - ,WHvCapabilityCodePhysicalAddressWidth = 0x0000100A -#if defined(__x86_64__) - ,WHvCapabilityCodeVmxBasic = 0x00002000 - ,WHvCapabilityCodeVmxPinbasedCtls = 0x00002001 - ,WHvCapabilityCodeVmxProcbasedCtls = 0x00002002 - ,WHvCapabilityCodeVmxExitCtls = 0x00002003 - ,WHvCapabilityCodeVmxEntryCtls = 0x00002004 - ,WHvCapabilityCodeVmxMisc = 0x00002005 - ,WHvCapabilityCodeVmxCr0Fixed0 = 0x00002006 - ,WHvCapabilityCodeVmxCr0Fixed1 = 0x00002007 - ,WHvCapabilityCodeVmxCr4Fixed0 = 0x00002008 - ,WHvCapabilityCodeVmxCr4Fixed1 = 0x00002009 - ,WHvCapabilityCodeVmxVmcsEnum = 0x0000200A - ,WHvCapabilityCodeVmxProcbasedCtls2 = 0x0000200B - ,WHvCapabilityCodeVmxEptVpidCap = 0x0000200C - ,WHvCapabilityCodeVmxTruePinbasedCtls = 0x0000200D - ,WHvCapabilityCodeVmxTrueProcbasedCtls = 0x0000200E - ,WHvCapabilityCodeVmxTrueExitCtls = 0x0000200F - ,WHvCapabilityCodeVmxTrueEntryCtls = 0x00002010 -#endif -} WHV_CAPABILITY_CODE; - -typedef union WHV_CAPABILITY_FEATURES { - __C89_NAMELESS struct { - UINT64 PartialUnmap : 1; -#if defined(__x86_64__) - UINT64 LocalApicEmulation : 1; - UINT64 Xsave : 1; -#else - UINT64 ReservedArm0 : 2; -#endif - UINT64 DirtyPageTracking : 1; - UINT64 SpeculationControl : 1; -#if defined(__x86_64__) - UINT64 ApicRemoteRead : 1; -#else - UINT64 ReservedArm1 : 1; -#endif - UINT64 IdleSuspend : 1; - UINT64 VirtualPciDeviceSupport : 1; - UINT64 IommuSupport : 1; - UINT64 VpHotAddRemove : 1; - UINT64 Reserved : 54; - }; - UINT64 AsUINT64; -} WHV_CAPABILITY_FEATURES; - -C_ASSERT(sizeof(WHV_CAPABILITY_FEATURES) == sizeof(UINT64)); - -typedef union WHV_EXTENDED_VM_EXITS { - __C89_NAMELESS struct { -#if defined(__x86_64__) - UINT64 X64CpuidExit : 1; - UINT64 X64MsrExit : 1; - UINT64 ExceptionExit : 1; - UINT64 X64RdtscExit : 1; - UINT64 X64ApicSmiExitTrap : 1; -#else - UINT64 ReservedArm0 : 5; -#endif - UINT64 HypercallExit : 1; -#if defined(__x86_64__) - UINT64 X64ApicInitSipiExitTrap : 1; - UINT64 X64ApicWriteLint0ExitTrap : 1; - UINT64 X64ApicWriteLint1ExitTrap : 1; - UINT64 X64ApicWriteSvrExitTrap : 1; -#else - UINT64 ReservedArm1 : 4; -#endif - UINT64 UnknownSynicConnection : 1; - UINT64 RetargetUnknownVpciDevice : 1; -#if defined(__x86_64__) - UINT64 X64ApicWriteLdrExitTrap : 1; - UINT64 X64ApicWriteDfrExitTrap : 1; -#else - UINT64 ReservedArm2 : 2; -#endif - UINT64 GpaAccessFaultExit : 1; - UINT64 Reserved : 49; - }; - UINT64 AsUINT64; -} WHV_EXTENDED_VM_EXITS; - -C_ASSERT(sizeof(WHV_EXTENDED_VM_EXITS) == sizeof(UINT64)); - -typedef enum WHV_PROCESSOR_VENDOR { - WHvProcessorVendorAmd = 0x0000, - WHvProcessorVendorIntel = 0x0001, - WHvProcessorVendorHygon = 0x0002, - WHvProcessorVendorArm = 0x0010 -} WHV_PROCESSOR_VENDOR; - -#if defined(__x86_64__) - -typedef union WHV_X64_PROCESSOR_FEATURES { - __C89_NAMELESS struct { - UINT64 Sse3Support : 1; - UINT64 LahfSahfSupport : 1; - UINT64 Ssse3Support : 1; - UINT64 Sse4_1Support : 1; - UINT64 Sse4_2Support : 1; - UINT64 Sse4aSupport : 1; - UINT64 XopSupport : 1; - UINT64 PopCntSupport : 1; - UINT64 Cmpxchg16bSupport : 1; - UINT64 Altmovcr8Support : 1; - UINT64 LzcntSupport : 1; - UINT64 MisAlignSseSupport : 1; - UINT64 MmxExtSupport : 1; - UINT64 Amd3DNowSupport : 1; - UINT64 ExtendedAmd3DNowSupport : 1; - UINT64 Page1GbSupport : 1; - UINT64 AesSupport : 1; - UINT64 PclmulqdqSupport : 1; - UINT64 PcidSupport : 1; - UINT64 Fma4Support : 1; - UINT64 F16CSupport : 1; - UINT64 RdRandSupport : 1; - UINT64 RdWrFsGsSupport : 1; - UINT64 SmepSupport : 1; - UINT64 EnhancedFastStringSupport : 1; - UINT64 Bmi1Support : 1; - UINT64 Bmi2Support : 1; - UINT64 Reserved1 : 2; - UINT64 MovbeSupport : 1; - UINT64 Npiep1Support : 1; - UINT64 DepX87FPUSaveSupport : 1; - UINT64 RdSeedSupport : 1; - UINT64 AdxSupport : 1; - UINT64 IntelPrefetchSupport : 1; - UINT64 SmapSupport : 1; - UINT64 HleSupport : 1; - UINT64 RtmSupport : 1; - UINT64 RdtscpSupport : 1; - UINT64 ClflushoptSupport : 1; - UINT64 ClwbSupport : 1; - UINT64 ShaSupport : 1; - UINT64 X87PointersSavedSupport : 1; - UINT64 InvpcidSupport : 1; - UINT64 IbrsSupport : 1; - UINT64 StibpSupport : 1; - UINT64 IbpbSupport : 1; - UINT64 UnrestrictedGuestSupport : 1; - UINT64 SsbdSupport : 1; - UINT64 FastShortRepMovSupport : 1; - UINT64 Reserved3 : 1; - UINT64 RdclNo : 1; - UINT64 IbrsAllSupport : 1; - UINT64 Reserved4 : 1; - UINT64 SsbNo : 1; - UINT64 RsbANo : 1; - UINT64 Reserved5 : 1; - UINT64 RdPidSupport : 1; - UINT64 UmipSupport : 1; - UINT64 MdsNoSupport : 1; - UINT64 MdClearSupport : 1; - UINT64 TaaNoSupport : 1; - UINT64 TsxCtrlSupport : 1; - UINT64 Reserved6 : 1; - }; - UINT64 AsUINT64; -} WHV_X64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES; - -C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES) == sizeof(UINT64)); - -typedef union WHV_X64_PROCESSOR_FEATURES1 { - __C89_NAMELESS struct { - UINT64 ACountMCountSupport : 1; - UINT64 TscInvariantSupport : 1; - UINT64 ClZeroSupport : 1; - UINT64 RdpruSupport : 1; - UINT64 La57Support : 1; - UINT64 MbecSupport : 1; - UINT64 NestedVirtSupport : 1; - UINT64 PsfdSupport: 1; - UINT64 CetSsSupport : 1; - UINT64 CetIbtSupport : 1; - UINT64 VmxExceptionInjectSupport : 1; - UINT64 Reserved2 : 1; - UINT64 UmwaitTpauseSupport : 1; - UINT64 MovdiriSupport : 1; - UINT64 Movdir64bSupport : 1; - UINT64 CldemoteSupport : 1; - UINT64 SerializeSupport : 1; - UINT64 TscDeadlineTmrSupport : 1; - UINT64 TscAdjustSupport : 1; - UINT64 FZLRepMovsb : 1; - UINT64 FSRepStosb : 1; - UINT64 FSRepCmpsb : 1; - UINT64 TsxLdTrkSupport : 1; - UINT64 VmxInsOutsExitInfoSupport : 1; - UINT64 Reserved3 : 1; - UINT64 SbdrSsdpNoSupport : 1; - UINT64 FbsdpNoSupport : 1; - UINT64 PsdpNoSupport : 1; - UINT64 FbClearSupport : 1; - UINT64 BtcNoSupport : 1; - UINT64 IbpbRsbFlushSupport : 1; - UINT64 StibpAlwaysOnSupport : 1; - UINT64 PerfGlobalCtrlSupport : 1; - UINT64 NptExecuteOnlySupport : 1; - UINT64 NptADFlagsSupport : 1; - UINT64 Npt1GbPageSupport : 1; - UINT64 Reserved4 : 1; - UINT64 Reserved5 : 1; - UINT64 Reserved6 : 1; - UINT64 Reserved7 : 1; - UINT64 CmpccxaddSupport : 1; - UINT64 Reserved8 : 1; - UINT64 Reserved9 : 1; - UINT64 Reserved10 : 1; - UINT64 Reserved11 : 1; - UINT64 PrefetchISupport : 1; - UINT64 Sha512Support : 1; - UINT64 Reserved12 : 1; - UINT64 Reserved13 : 1; - UINT64 Reserved14 : 1; - UINT64 SM3Support : 1; - UINT64 SM4Support : 1; - UINT64 Reserved15 : 12; - }; - UINT64 AsUINT64; -} WHV_X64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1; - -C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES1) == sizeof(UINT64)); - -#elif defined(__aarch64__) - -typedef union WHV_ARM64_PROCESSOR_FEATURES { - __C89_NAMELESS struct { - UINT64 Asid16 : 1; - UINT64 TGran16 : 1; - UINT64 TGran64 : 1; - UINT64 Haf : 1; - UINT64 Hdbs : 1; - UINT64 Pan : 1; - UINT64 AtS1E1 : 1; - UINT64 Uao : 1; - UINT64 El0Aarch32 : 1; - UINT64 Fp : 1; - UINT64 FpHp : 1; - UINT64 AdvSimd : 1; - UINT64 AdvSimdHp : 1; - UINT64 GicV3V4 : 1; - UINT64 GicV41 : 1; - UINT64 Ras : 1; - UINT64 PmuV3 : 1; - UINT64 PmuV3ArmV81 : 1; - UINT64 PmuV3ArmV84 : 1; - UINT64 PmuV3ArmV85 : 1; - UINT64 Aes : 1; - UINT64 PolyMul : 1; - UINT64 Sha1 : 1; - UINT64 Sha256 : 1; - UINT64 Sha512 : 1; - UINT64 Crc32 : 1; - UINT64 Atomic : 1; - UINT64 Rdm : 1; - UINT64 Sha3 : 1; - UINT64 Sm3 : 1; - UINT64 Sm4 : 1; - UINT64 Dp : 1; - UINT64 Fhm : 1; - UINT64 DcCvap : 1; - UINT64 DcCvadp : 1; - UINT64 ApaBase : 1; - UINT64 ApaEp : 1; - UINT64 ApaEp2 : 1; - UINT64 ApaEp2Fp : 1; - UINT64 ApaEp2Fpc : 1; - UINT64 Jscvt : 1; - UINT64 Fcma : 1; - UINT64 RcpcV83 : 1; - UINT64 RcpcV84 : 1; - UINT64 Gpa : 1; - UINT64 L1ipPipt : 1; - UINT64 DzPermitted : 1; - UINT64 Reserved : 17; - }; - UINT64 AsUINT64; -} WHV_ARM64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES; - -typedef union WHV_ARM64_PROCESSOR_FEATURES1 { - __C89_NAMELESS struct { - UINT64 Reserved : 64; - }; - UINT64 AsUINT64; -} WHV_ARM64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1; - -#endif /* __x86_64__ || __aarch64__ */ - -#define WHV_PROCESSOR_FEATURES_BANKS_COUNT 2 - -typedef struct WHV_PROCESSOR_FEATURES_BANKS { - UINT32 BanksCount; - UINT32 Reserved0; - __C89_NAMELESS union { - __C89_NAMELESS struct { - WHV_PROCESSOR_FEATURES Bank0; - WHV_PROCESSOR_FEATURES1 Bank1; - }; - UINT64 AsUINT64[WHV_PROCESSOR_FEATURES_BANKS_COUNT]; - }; -} WHV_PROCESSOR_FEATURES_BANKS; - -C_ASSERT(sizeof(WHV_PROCESSOR_FEATURES_BANKS) == sizeof(UINT64) * (WHV_PROCESSOR_FEATURES_BANKS_COUNT + 1)); - -typedef union WHV_SYNTHETIC_PROCESSOR_FEATURES { - __C89_NAMELESS struct { - UINT64 HypervisorPresent : 1; - UINT64 Hv1 : 1; - UINT64 AccessVpRunTimeReg : 1; - UINT64 AccessPartitionReferenceCounter : 1; - UINT64 AccessSynicRegs : 1; - UINT64 AccessSyntheticTimerRegs : 1; - UINT64 AccessIntrCtrlRegs : 1; - UINT64 AccessHypercallRegs : 1; - UINT64 AccessVpIndex : 1; - UINT64 AccessPartitionReferenceTsc : 1; -#ifdef __x86_64__ - UINT64 AccessGuestIdleReg : 1; - UINT64 AccessFrequencyRegs : 1; -#else - UINT64 ReservedZ10 : 1; - UINT64 ReservedZ11 : 1; -#endif - UINT64 ReservedZ12 : 1; - UINT64 ReservedZ13 : 1; - UINT64 ReservedZ14 : 1; -#ifdef __x86_64__ - UINT64 EnableExtendedGvaRangesForFlushVirtualAddressList : 1; -#else - UINT64 ReservedZ15 : 1; -#endif - UINT64 ReservedZ16 : 1; - UINT64 ReservedZ17 : 1; - UINT64 FastHypercallOutput : 1; - UINT64 ReservedZ19 : 1; - UINT64 ReservedZ20 : 1; - UINT64 ReservedZ21 : 1; - UINT64 DirectSyntheticTimers : 1; - UINT64 ReservedZ23 : 1; - UINT64 ExtendedProcessorMasks : 1; -#ifdef __x86_64__ - UINT64 TbFlushHypercalls : 1; -#else - UINT64 ReservedZ25 : 1; -#endif - UINT64 SyntheticClusterIpi : 1; - UINT64 NotifyLongSpinWait : 1; - UINT64 QueryNumaDistance : 1; - UINT64 SignalEvents : 1; - UINT64 RetargetDeviceInterrupt : 1; -#ifdef __x86_64__ - UINT64 RestoreTime : 1; - UINT64 EnlightenedVmcs : 1; - UINT64 NestedDebugCtl : 1; - UINT64 SyntheticTimeUnhaltedTimer : 1; - UINT64 IdleSpecCtrl : 1; -#else - UINT64 ReservedZ31 : 1; - UINT64 ReservedZ32 : 1; - UINT64 ReservedZ33 : 1; - UINT64 ReservedZ34 : 1; - UINT64 ReservedZ35 : 1; -#endif - UINT64 ReservedZ36 : 1; - UINT64 WakeVps : 1; - UINT64 AccessVpRegs : 1; -#ifdef __aarch64__ - UINT64 SyncContext : 1; -#else - UINT64 ReservedZ39 : 1; -#endif - UINT64 ReservedZ40 : 1; - UINT64 Reserved : 23; - }; - UINT64 AsUINT64; -} WHV_SYNTHETIC_PROCESSOR_FEATURES; - -C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES) == 8); - -#define WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT 1 - -typedef struct WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS { - UINT32 BanksCount; - UINT32 Reserved0; - __C89_NAMELESS union { - __C89_NAMELESS struct { - WHV_SYNTHETIC_PROCESSOR_FEATURES Bank0; - }; - UINT64 AsUINT64[WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT]; - }; -} WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS; - -C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS) == 16); - -typedef union _WHV_PROCESSOR_XSAVE_FEATURES { - __C89_NAMELESS struct { - UINT64 XsaveSupport : 1; - UINT64 XsaveoptSupport : 1; - UINT64 AvxSupport : 1; - UINT64 Avx2Support : 1; - UINT64 FmaSupport : 1; - UINT64 MpxSupport : 1; - UINT64 Avx512Support : 1; - UINT64 Avx512DQSupport : 1; - UINT64 Avx512CDSupport : 1; - UINT64 Avx512BWSupport : 1; - UINT64 Avx512VLSupport : 1; - UINT64 XsaveCompSupport : 1; - UINT64 XsaveSupervisorSupport : 1; - UINT64 Xcr1Support : 1; - UINT64 Avx512BitalgSupport : 1; - UINT64 Avx512IfmaSupport : 1; - UINT64 Avx512VBmiSupport : 1; - UINT64 Avx512VBmi2Support : 1; - UINT64 Avx512VnniSupport : 1; - UINT64 GfniSupport : 1; - UINT64 VaesSupport : 1; - UINT64 Avx512VPopcntdqSupport : 1; - UINT64 VpclmulqdqSupport : 1; - UINT64 Avx512Bf16Support : 1; - UINT64 Avx512Vp2IntersectSupport : 1; - UINT64 Avx512Fp16Support : 1; - UINT64 XfdSupport : 1; - UINT64 AmxTileSupport : 1; - UINT64 AmxBf16Support : 1; - UINT64 AmxInt8Support : 1; - UINT64 AvxVnniSupport : 1; - UINT64 Reserved : 33; - }; - UINT64 AsUINT64; -} WHV_PROCESSOR_XSAVE_FEATURES, *PWHV_PROCESSOR_XSAVE_FEATURES; - -C_ASSERT(sizeof(WHV_PROCESSOR_XSAVE_FEATURES) == sizeof(UINT64)); - -typedef union WHV_PROCESSOR_PERFMON_FEATURES { - __C89_NAMELESS struct { - UINT64 PmuSupport : 1; - UINT64 LbrSupport : 1; - UINT64 Reserved : 62; - }; - UINT64 AsUINT64; -} WHV_PROCESSOR_PERFMON_FEATURES, *PWHV_PROCESSOR_PERFMON_FEATURES; - -C_ASSERT(sizeof(WHV_PROCESSOR_PERFMON_FEATURES) == 8); - -typedef union WHV_X64_MSR_EXIT_BITMAP { - UINT64 AsUINT64; - __C89_NAMELESS struct { - UINT64 UnhandledMsrs : 1; - UINT64 TscMsrWrite : 1; - UINT64 TscMsrRead : 1; - UINT64 ApicBaseMsrWrite : 1; - UINT64 MiscEnableMsrRead:1; - UINT64 McUpdatePatchLevelMsrRead:1; - UINT64 Reserved:58; - }; -} WHV_X64_MSR_EXIT_BITMAP; - -C_ASSERT(sizeof(WHV_X64_MSR_EXIT_BITMAP) == sizeof(UINT64)); - -typedef struct WHV_MEMORY_RANGE_ENTRY { - UINT64 GuestAddress; - UINT64 SizeInBytes; -} WHV_MEMORY_RANGE_ENTRY; - -C_ASSERT(sizeof(WHV_MEMORY_RANGE_ENTRY) == 16); - -typedef union WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS { - UINT32 AsUINT32; - __C89_NAMELESS struct { - UINT32 Prefetch:1; - UINT32 AvoidHardFaults:1; - UINT32 Reserved:30; - }; -} WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS; - -C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS) == 4); - -typedef enum WHV_MEMORY_ACCESS_TYPE { - WHvMemoryAccessRead = 0, - WHvMemoryAccessWrite = 1, - WHvMemoryAccessExecute = 2 -} WHV_MEMORY_ACCESS_TYPE; - -typedef struct WHV_ADVISE_GPA_RANGE_POPULATE { - WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS Flags; - WHV_MEMORY_ACCESS_TYPE AccessType; -} WHV_ADVISE_GPA_RANGE_POPULATE; - -C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE) == 8); - -typedef struct WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP { - UINT32 IsSupported:1; - UINT32 Reserved:31; - UINT32 HighestFrequencyMhz; - UINT32 NominalFrequencyMhz; - UINT32 LowestFrequencyMhz; - UINT32 FrequencyStepMhz; -} WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP; - -C_ASSERT(sizeof(WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP) == 20); - -typedef union WHV_SCHEDULER_FEATURES { - __C89_NAMELESS struct { - UINT64 CpuReserve: 1; - UINT64 CpuCap: 1; - UINT64 CpuWeight: 1; - UINT64 CpuGroupId: 1; - UINT64 DisableSmt: 1; - UINT64 Reserved: 59; - }; - UINT64 AsUINT64; -} WHV_SCHEDULER_FEATURES; - -C_ASSERT(sizeof(WHV_SCHEDULER_FEATURES) == 8); - -typedef union WHV_CAPABILITY { - WINBOOL HypervisorPresent; - WHV_CAPABILITY_FEATURES Features; - WHV_EXTENDED_VM_EXITS ExtendedVmExits; - WHV_PROCESSOR_VENDOR ProcessorVendor; - WHV_PROCESSOR_FEATURES ProcessorFeatures; - WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks; - WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures; - UINT8 ProcessorClFlushSize; - UINT64 ExceptionExitBitmap; - WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap; - UINT64 ProcessorClockFrequency; - UINT64 InterruptClockFrequency; - WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks; - WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS GpaRangePopulateFlags; - WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP ProcessorFrequencyCap; - WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures; - WHV_SCHEDULER_FEATURES SchedulerFeatures; -} WHV_CAPABILITY; - -typedef VOID* WHV_PARTITION_HANDLE; - -typedef enum WHV_PARTITION_PROPERTY_CODE { - WHvPartitionPropertyCodeExtendedVmExits = 0x00000001, - WHvPartitionPropertyCodeExceptionExitBitmap = 0x00000002, - WHvPartitionPropertyCodeSeparateSecurityDomain = 0x00000003, - WHvPartitionPropertyCodeNestedVirtualization = 0x00000004, - WHvPartitionPropertyCodeX64MsrExitBitmap = 0x00000005, - WHvPartitionPropertyCodePrimaryNumaNode = 0x00000006, - WHvPartitionPropertyCodeCpuReserve = 0x00000007, - WHvPartitionPropertyCodeCpuCap = 0x00000008, - WHvPartitionPropertyCodeCpuWeight = 0x00000009, - WHvPartitionPropertyCodeCpuGroupId = 0x0000000A, - WHvPartitionPropertyCodeProcessorFrequencyCap = 0x0000000B, - WHvPartitionPropertyCodeAllowDeviceAssignment = 0x0000000C, - WHvPartitionPropertyCodeDisableSmt = 0x0000000D, - WHvPartitionPropertyCodeProcessorFeatures = 0x00001001, - WHvPartitionPropertyCodeProcessorClFlushSize = 0x00001002, - WHvPartitionPropertyCodeCpuidExitList = 0x00001003, - WHvPartitionPropertyCodeCpuidResultList = 0x00001004, - WHvPartitionPropertyCodeLocalApicEmulationMode = 0x00001005, - WHvPartitionPropertyCodeProcessorXsaveFeatures = 0x00001006, - WHvPartitionPropertyCodeProcessorClockFrequency = 0x00001007, - WHvPartitionPropertyCodeInterruptClockFrequency = 0x00001008, - WHvPartitionPropertyCodeApicRemoteReadSupport = 0x00001009, - WHvPartitionPropertyCodeProcessorFeaturesBanks = 0x0000100A, - WHvPartitionPropertyCodeReferenceTime = 0x0000100B, - WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks = 0x0000100C, - WHvPartitionPropertyCodeCpuidResultList2 = 0x0000100D, - WHvPartitionPropertyCodeProcessorPerfmonFeatures = 0x0000100E, - WHvPartitionPropertyCodeMsrActionList = 0x0000100F, - WHvPartitionPropertyCodeUnimplementedMsrAction = 0x00001010, - WHvPartitionPropertyCodeProcessorCount = 0x00001fff -} WHV_PARTITION_PROPERTY_CODE; - -typedef struct WHV_X64_CPUID_RESULT { - UINT32 Function; - UINT32 Reserved[3]; - UINT32 Eax; - UINT32 Ebx; - UINT32 Ecx; - UINT32 Edx; -} WHV_X64_CPUID_RESULT; - -C_ASSERT(sizeof(WHV_X64_CPUID_RESULT) == 32); - -typedef enum WHV_X64_CPUID_RESULT2_FLAGS { - WHvX64CpuidResult2FlagSubleafSpecific = 0x00000001, - WHvX64CpuidResult2FlagVpSpecific = 0x00000002 -} WHV_X64_CPUID_RESULT2_FLAGS; - -DEFINE_ENUM_FLAG_OPERATORS(WHV_X64_CPUID_RESULT2_FLAGS); - -typedef struct WHV_CPUID_OUTPUT { - UINT32 Eax; - UINT32 Ebx; - UINT32 Ecx; - UINT32 Edx; -} WHV_CPUID_OUTPUT; - -C_ASSERT(sizeof(WHV_CPUID_OUTPUT) == 16); - -typedef struct WHV_X64_CPUID_RESULT2 { - UINT32 Function; - UINT32 Index; - UINT32 VpIndex; - WHV_X64_CPUID_RESULT2_FLAGS Flags; - WHV_CPUID_OUTPUT Output; - WHV_CPUID_OUTPUT Mask; -} WHV_X64_CPUID_RESULT2; - -C_ASSERT(sizeof(WHV_X64_CPUID_RESULT2) == 48); - -typedef struct WHV_MSR_ACTION_ENTRY { - UINT32 Index; - UINT8 ReadAction; - UINT8 WriteAction; - UINT16 Reserved; -} WHV_MSR_ACTION_ENTRY; - -C_ASSERT(sizeof(WHV_MSR_ACTION_ENTRY) == 8); - -typedef enum WHV_MSR_ACTION { - WHvMsrActionArchitectureDefault = 0, - WHvMsrActionIgnoreWriteReadZero = 1, - WHvMsrActionExit = 2 -} WHV_MSR_ACTION; - -typedef enum WHV_EXCEPTION_TYPE { - WHvX64ExceptionTypeDivideErrorFault = 0x0, - WHvX64ExceptionTypeDebugTrapOrFault = 0x1, - WHvX64ExceptionTypeBreakpointTrap = 0x3, - WHvX64ExceptionTypeOverflowTrap = 0x4, - WHvX64ExceptionTypeBoundRangeFault = 0x5, - WHvX64ExceptionTypeInvalidOpcodeFault = 0x6, - WHvX64ExceptionTypeDeviceNotAvailableFault = 0x7, - WHvX64ExceptionTypeDoubleFaultAbort = 0x8, - WHvX64ExceptionTypeInvalidTaskStateSegmentFault = 0x0A, - WHvX64ExceptionTypeSegmentNotPresentFault = 0x0B, - WHvX64ExceptionTypeStackFault = 0x0C, - WHvX64ExceptionTypeGeneralProtectionFault = 0x0D, - WHvX64ExceptionTypePageFault = 0x0E, - WHvX64ExceptionTypeFloatingPointErrorFault = 0x10, - WHvX64ExceptionTypeAlignmentCheckFault = 0x11, - WHvX64ExceptionTypeMachineCheckAbort = 0x12, - WHvX64ExceptionTypeSimdFloatingPointFault = 0x13 -} WHV_EXCEPTION_TYPE; - -typedef enum WHV_X64_LOCAL_APIC_EMULATION_MODE { - WHvX64LocalApicEmulationModeNone, - WHvX64LocalApicEmulationModeXApic, - WHvX64LocalApicEmulationModeX2Apic -} WHV_X64_LOCAL_APIC_EMULATION_MODE; - -typedef union WHV_PARTITION_PROPERTY { - WHV_EXTENDED_VM_EXITS ExtendedVmExits; - WHV_PROCESSOR_FEATURES ProcessorFeatures; - WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks; - WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures; - UINT8 ProcessorClFlushSize; - UINT32 ProcessorCount; - UINT32 CpuidExitList[1]; - WHV_X64_CPUID_RESULT CpuidResultList[1]; - WHV_X64_CPUID_RESULT2 CpuidResultList2[1]; - WHV_MSR_ACTION_ENTRY MsrActionList[1]; - WHV_MSR_ACTION UnimplementedMsrAction; - UINT64 ExceptionExitBitmap; - WHV_X64_LOCAL_APIC_EMULATION_MODE LocalApicEmulationMode; - WINBOOL SeparateSecurityDomain; - WINBOOL NestedVirtualization; - WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap; - UINT64 ProcessorClockFrequency; - UINT64 InterruptClockFrequency; - WINBOOL ApicRemoteRead; - WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks; - UINT64 ReferenceTime; - USHORT PrimaryNumaNode; - UINT32 CpuReserve; - UINT32 CpuCap; - UINT32 CpuWeight; - UINT64 CpuGroupId; - UINT32 ProcessorFrequencyCap; - WINBOOL AllowDeviceAssignment; - WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures; - WINBOOL DisableSmt; -} WHV_PARTITION_PROPERTY; - -typedef UINT64 WHV_GUEST_PHYSICAL_ADDRESS; -typedef UINT64 WHV_GUEST_VIRTUAL_ADDRESS; - -typedef enum WHV_MAP_GPA_RANGE_FLAGS { - WHvMapGpaRangeFlagNone = 0x00000000, - WHvMapGpaRangeFlagRead = 0x00000001, - WHvMapGpaRangeFlagWrite = 0x00000002, - WHvMapGpaRangeFlagExecute = 0x00000004, - WHvMapGpaRangeFlagTrackDirtyPages = 0x00000008 -} WHV_MAP_GPA_RANGE_FLAGS; - -DEFINE_ENUM_FLAG_OPERATORS(WHV_MAP_GPA_RANGE_FLAGS); - -typedef enum WHV_TRANSLATE_GVA_FLAGS { - WHvTranslateGvaFlagNone = 0x00000000, - WHvTranslateGvaFlagValidateRead = 0x00000001, - WHvTranslateGvaFlagValidateWrite = 0x00000002, - WHvTranslateGvaFlagValidateExecute = 0x00000004, - WHvTranslateGvaFlagPrivilegeExempt = 0x00000008, - WHvTranslateGvaFlagSetPageTableBits = 0x00000010, - WHvTranslateGvaFlagEnforceSmap = 0x00000100, - WHvTranslateGvaFlagOverrideSmap = 0x00000200 -} WHV_TRANSLATE_GVA_FLAGS; - -DEFINE_ENUM_FLAG_OPERATORS(WHV_TRANSLATE_GVA_FLAGS); - -typedef enum WHV_TRANSLATE_GVA_RESULT_CODE { - WHvTranslateGvaResultSuccess = 0, - WHvTranslateGvaResultPageNotPresent = 1, - WHvTranslateGvaResultPrivilegeViolation = 2, - WHvTranslateGvaResultInvalidPageTableFlags = 3, - WHvTranslateGvaResultGpaUnmapped = 4, - WHvTranslateGvaResultGpaNoReadAccess = 5, - WHvTranslateGvaResultGpaNoWriteAccess = 6, - WHvTranslateGvaResultGpaIllegalOverlayAccess = 7, - WHvTranslateGvaResultIntercept = 8 -} WHV_TRANSLATE_GVA_RESULT_CODE; - -typedef struct WHV_TRANSLATE_GVA_RESULT { - WHV_TRANSLATE_GVA_RESULT_CODE ResultCode; - UINT32 Reserved; -} WHV_TRANSLATE_GVA_RESULT; - -C_ASSERT(sizeof(WHV_TRANSLATE_GVA_RESULT) == 8); - -typedef union WHV_ADVISE_GPA_RANGE { - WHV_ADVISE_GPA_RANGE_POPULATE Populate; -} WHV_ADVISE_GPA_RANGE; - -C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE) == 8); - -typedef enum WHV_CACHE_TYPE { - WHvCacheTypeUncached = 0, - WHvCacheTypeWriteCombining = 1, - WHvCacheTypeWriteThrough = 4, -#ifdef __x86_64__ - WHvCacheTypeWriteProtected = 5, -#endif - WHvCacheTypeWriteBack = 6 -} WHV_CACHE_TYPE; - -typedef union WHV_ACCESS_GPA_CONTROLS { - UINT64 AsUINT64; - __C89_NAMELESS struct { - WHV_CACHE_TYPE CacheType; - UINT32 Reserved; - }; -} WHV_ACCESS_GPA_CONTROLS; - -C_ASSERT(sizeof(WHV_ACCESS_GPA_CONTROLS) == 8); - -#define WHV_READ_WRITE_GPA_RANGE_MAX_SIZE 16 +#if defined(__x86_64__) || defined(__aarch64__) #if defined(__x86_64__) @@ -1086,7 +303,6 @@ typedef enum WHV_REGISTER_NAME { WHvArm64RegisterFp = 0x0002001D, WHvArm64RegisterLr = 0x0002001E, WHvArm64RegisterPc = 0x00020022, - WHvArm64RegisterXzr = 0x0002FFFE, WHvArm64RegisterQ0 = 0x00030000, WHvArm64RegisterQ1 = 0x00030001, WHvArm64RegisterQ2 = 0x00030002, @@ -1119,52 +335,143 @@ typedef enum WHV_REGISTER_NAME { WHvArm64RegisterQ29 = 0x0003001D, WHvArm64RegisterQ30 = 0x0003001E, WHvArm64RegisterQ31 = 0x0003001F, - WHvArm64RegisterCurrentEl = 0x00021003, - WHvArm64RegisterDaif = 0x00021004, - WHvArm64RegisterDit = 0x00021005, WHvArm64RegisterPstate = 0x00020023, WHvArm64RegisterElrEl1 = 0x00040015, WHvArm64RegisterFpcr = 0x00040012, WHvArm64RegisterFpsr = 0x00040013, - WHvArm64RegisterNzcv = 0x00021006, - WHvArm64RegisterPan = 0x00021007, WHvArm64RegisterSp = 0x0002001F, WHvArm64RegisterSpEl0 = 0x00020020, WHvArm64RegisterSpEl1 = 0x00020021, - WHvArm64RegisterSpSel = 0x00021008, WHvArm64RegisterSpsrEl1 = 0x00040014, - WHvArm64RegisterSsbs = 0x00021009, - WHvArm64RegisterTco = 0x0002100A, - WHvArm64RegisterUao = 0x0002100B, + WHvArm64RegisterIdMidrEl1 = 0x00022000, + WHvArm64RegisterIdRes01El1 = 0x00022001, + WHvArm64RegisterIdRes02El1 = 0x00022002, + WHvArm64RegisterIdRes03El1 = 0x00022003, + WHvArm64RegisterIdRes04El1 = 0x00022004, + WHvArm64RegisterIdMpidrEl1 = 0x00022005, + WHvArm64RegisterIdRevidrEl1 = 0x00022006, + WHvArm64RegisterIdRes07El1 = 0x00022007, + WHvArm64RegisterIdPfr0El1 = 0x00022008, + WHvArm64RegisterIdPfr1El1 = 0x00022009, + WHvArm64RegisterIdDfr0El1 = 0x0002200A, + WHvArm64RegisterIdRes13El1 = 0x0002200B, + WHvArm64RegisterIdMmfr0El1 = 0x0002200C, + WHvArm64RegisterIdMmfr1El1 = 0x0002200D, + WHvArm64RegisterIdMmfr2El1 = 0x0002200E, + WHvArm64RegisterIdMmfr3El1 = 0x0002200F, + WHvArm64RegisterIdIsar0El1 = 0x00022010, + WHvArm64RegisterIdIsar1El1 = 0x00022011, + WHvArm64RegisterIdIsar2El1 = 0x00022012, + WHvArm64RegisterIdIsar3El1 = 0x00022013, + WHvArm64RegisterIdIsar4El1 = 0x00022014, + WHvArm64RegisterIdIsar5El1 = 0x00022015, + WHvArm64RegisterIdRes26El1 = 0x00022016, + WHvArm64RegisterIdRes27El1 = 0x00022017, + WHvArm64RegisterIdMvfr0El1 = 0x00022018, + WHvArm64RegisterIdMvfr1El1 = 0x00022019, + WHvArm64RegisterIdMvfr2El1 = 0x0002201A, + WHvArm64RegisterIdRes33El1 = 0x0002201B, + WHvArm64RegisterIdPfr2El1 = 0x0002201C, + WHvArm64RegisterIdRes35El1 = 0x0002201D, + WHvArm64RegisterIdRes36El1 = 0x0002201E, + WHvArm64RegisterIdRes37El1 = 0x0002201F, + WHvArm64RegisterIdAa64Pfr0El1 = 0x00022020, + WHvArm64RegisterIdAa64Pfr1El1 = 0x00022021, + WHvArm64RegisterIdAa64Pfr2El1 = 0x00022022, + WHvArm64RegisterIdRes43El1 = 0x00022023, + WHvArm64RegisterIdAa64Zfr0El1 = 0x00022024, + WHvArm64RegisterIdAa64Smfr0El1 = 0x00022025, + WHvArm64RegisterIdRes46El1 = 0x00022026, + WHvArm64RegisterIdRes47El1 = 0x00022027, WHvArm64RegisterIdAa64Dfr0El1 = 0x00022028, WHvArm64RegisterIdAa64Dfr1El1 = 0x00022029, + WHvArm64RegisterIdRes52El1 = 0x0002202A, + WHvArm64RegisterIdRes53El1 = 0x0002202B, + WHvArm64RegisterIdRes54El1 = 0x0002202C, + WHvArm64RegisterIdRes55El1 = 0x0002202D, + WHvArm64RegisterIdRes56El1 = 0x0002202E, + WHvArm64RegisterIdRes57El1 = 0x0002202F, WHvArm64RegisterIdAa64Isar0El1 = 0x00022030, WHvArm64RegisterIdAa64Isar1El1 = 0x00022031, WHvArm64RegisterIdAa64Isar2El1 = 0x00022032, + WHvArm64RegisterIdRes63El1 = 0x00022033, + WHvArm64RegisterIdRes64El1 = 0x00022034, + WHvArm64RegisterIdRes65El1 = 0x00022035, + WHvArm64RegisterIdRes66El1 = 0x00022036, + WHvArm64RegisterIdRes67El1 = 0x00022037, WHvArm64RegisterIdAa64Mmfr0El1 = 0x00022038, WHvArm64RegisterIdAa64Mmfr1El1 = 0x00022039, WHvArm64RegisterIdAa64Mmfr2El1 = 0x0002203A, WHvArm64RegisterIdAa64Mmfr3El1 = 0x0002203B, WHvArm64RegisterIdAa64Mmfr4El1 = 0x0002203C, - WHvArm64RegisterIdAa64Pfr0El1 = 0x00022020, - WHvArm64RegisterIdAa64Pfr1El1 = 0x00022021, - WHvArm64RegisterIdAa64Pfr2El1 = 0x00022022, - WHvArm64RegisterIdAa64Smfr0El1 = 0x00022025, - WHvArm64RegisterIdAa64Zfr0El1 = 0x00022024, - WHvArm64RegisterIdDfr0El1 = 0x0002200A, - WHvArm64RegisterIdIsar0El1 = 0x00022010, - WHvArm64RegisterIdIsar1El1 = 0x00022011, - WHvArm64RegisterIdIsar2El1 = 0x00022012, - WHvArm64RegisterIdIsar3El1 = 0x00022013, - WHvArm64RegisterIdIsar4El1 = 0x00022014, - WHvArm64RegisterIdIsar5El1 = 0x00022015, - WHvArm64RegisterIdMmfr0El1 = 0x0002200C, - WHvArm64RegisterIdMmfr1El1 = 0x0002200D, - WHvArm64RegisterIdMmfr2El1 = 0x0002200E, - WHvArm64RegisterIdMmfr3El1 = 0x0002200F, - WHvArm64RegisterIdPfr0El1 = 0x00022008, - WHvArm64RegisterIdPfr1El1 = 0x00022009, - WHvArm64RegisterIdPfr2El1 = 0x0002201C, + WHvArm64RegisterIdRes75El1 = 0x0002203D, + WHvArm64RegisterIdRes76El1 = 0x0002203E, + WHvArm64RegisterIdRes77El1 = 0x0002203F, + WHvArm64RegisterIdRes80El1 = 0x00022040, + WHvArm64RegisterIdRes81El1 = 0x00022041, + WHvArm64RegisterIdRes82El1 = 0x00022042, + WHvArm64RegisterIdRes83El1 = 0x00022043, + WHvArm64RegisterIdRes84El1 = 0x00022044, + WHvArm64RegisterIdRes85El1 = 0x00022045, + WHvArm64RegisterIdRes86El1 = 0x00022046, + WHvArm64RegisterIdRes87El1 = 0x00022047, + WHvArm64RegisterIdRes90El1 = 0x00022048, + WHvArm64RegisterIdRes91El1 = 0x00022049, + WHvArm64RegisterIdRes92El1 = 0x0002204A, + WHvArm64RegisterIdRes93El1 = 0x0002204B, + WHvArm64RegisterIdRes94El1 = 0x0002204C, + WHvArm64RegisterIdRes95El1 = 0x0002204D, + WHvArm64RegisterIdRes96El1 = 0x0002204E, + WHvArm64RegisterIdRes97El1 = 0x0002204F, + WHvArm64RegisterIdRes100El1 = 0x00022050, + WHvArm64RegisterIdRes101El1 = 0x00022051, + WHvArm64RegisterIdRes102El1 = 0x00022052, + WHvArm64RegisterIdRes103El1 = 0x00022053, + WHvArm64RegisterIdRes104El1 = 0x00022054, + WHvArm64RegisterIdRes105El1 = 0x00022055, + WHvArm64RegisterIdRes106El1 = 0x00022056, + WHvArm64RegisterIdRes107El1 = 0x00022057, + WHvArm64RegisterIdRes110El1 = 0x00022058, + WHvArm64RegisterIdRes111El1 = 0x00022059, + WHvArm64RegisterIdRes112El1 = 0x0002205A, + WHvArm64RegisterIdRes113El1 = 0x0002205B, + WHvArm64RegisterIdRes114El1 = 0x0002205C, + WHvArm64RegisterIdRes115El1 = 0x0002205D, + WHvArm64RegisterIdRes116El1 = 0x0002205E, + WHvArm64RegisterIdRes117El1 = 0x0002205F, + WHvArm64RegisterIdRes120El1 = 0x00022060, + WHvArm64RegisterIdRes121El1 = 0x00022061, + WHvArm64RegisterIdRes122El1 = 0x00022062, + WHvArm64RegisterIdRes123El1 = 0x00022063, + WHvArm64RegisterIdRes124El1 = 0x00022064, + WHvArm64RegisterIdRes125El1 = 0x00022065, + WHvArm64RegisterIdRes126El1 = 0x00022066, + WHvArm64RegisterIdRes127El1 = 0x00022067, + WHvArm64RegisterIdRes130El1 = 0x00022068, + WHvArm64RegisterIdRes131El1 = 0x00022069, + WHvArm64RegisterIdRes132El1 = 0x0002206A, + WHvArm64RegisterIdRes133El1 = 0x0002206B, + WHvArm64RegisterIdRes134El1 = 0x0002206C, + WHvArm64RegisterIdRes135El1 = 0x0002206D, + WHvArm64RegisterIdRes136El1 = 0x0002206E, + WHvArm64RegisterIdRes137El1 = 0x0002206F, + WHvArm64RegisterIdRes140El1 = 0x00022070, + WHvArm64RegisterIdRes141El1 = 0x00022071, + WHvArm64RegisterIdRes142El1 = 0x00022072, + WHvArm64RegisterIdRes143El1 = 0x00022073, + WHvArm64RegisterIdRes144El1 = 0x00022074, + WHvArm64RegisterIdRes145El1 = 0x00022075, + WHvArm64RegisterIdRes146El1 = 0x00022076, + WHvArm64RegisterIdRes147El1 = 0x00022077, + WHvArm64RegisterIdRes150El1 = 0x00022078, + WHvArm64RegisterIdRes151El1 = 0x00022079, + WHvArm64RegisterIdRes152El1 = 0x0002207A, + WHvArm64RegisterIdRes153El1 = 0x0002207B, + WHvArm64RegisterIdRes154El1 = 0x0002207C, + WHvArm64RegisterIdRes155El1 = 0x0002207D, + WHvArm64RegisterIdRes156El1 = 0x0002207E, + WHvArm64RegisterIdRes157El1 = 0x0002207F, + WHvArm64RegisterActlrEl1 = 0x00040003, WHvArm64RegisterApdAKeyHiEl1 = 0x00040026, WHvArm64RegisterApdAKeyLoEl1 = 0x00040027, WHvArm64RegisterApdBKeyHiEl1 = 0x00040028, @@ -1175,28 +482,15 @@ typedef enum WHV_REGISTER_NAME { WHvArm64RegisterApiAKeyLoEl1 = 0x0004002D, WHvArm64RegisterApiBKeyHiEl1 = 0x0004002E, WHvArm64RegisterApiBKeyLoEl1 = 0x0004002F, - WHvArm64RegisterCcsidrEl1 = 0x00040030, - WHvArm64RegisterCcsidr2El1 = 0x00040031, - WHvArm64RegisterClidrEl1 = 0x00040032, WHvArm64RegisterContextidrEl1 = 0x0004000D, WHvArm64RegisterCpacrEl1 = 0x00040004, WHvArm64RegisterCsselrEl1 = 0x00040035, - WHvArm64RegisterCtrEl0 = 0x00040036, - WHvArm64RegisterDczidEl0 = 0x00040038, WHvArm64RegisterEsrEl1 = 0x00040008, WHvArm64RegisterFarEl1 = 0x00040009, - WHvArm64RegisterIsrEl1 = 0x0004004A, WHvArm64RegisterMairEl1 = 0x0004000B, WHvArm64RegisterMidrEl1 = 0x00040051, WHvArm64RegisterMpidrEl1 = 0x00040001, - WHvArm64RegisterMvfr0El1 = 0x00040052, - WHvArm64RegisterMvfr1El1 = 0x00040053, - WHvArm64RegisterMvfr2El1 = 0x00040054, WHvArm64RegisterParEl1 = 0x0004000A, - WHvArm64RegisterRevidrEl1 = 0x00040055, - WHvArm64RegisterRgsrEl1 = 0x00040056, - WHvArm64RegisterRndr = 0x00040057, - WHvArm64RegisterRndrrs = 0x00040058, WHvArm64RegisterSctlrEl1 = 0x00040002, WHvArm64RegisterTcrEl1 = 0x00040007, WHvArm64RegisterTpidrEl0 = 0x00040011, @@ -1205,6 +499,7 @@ typedef enum WHV_REGISTER_NAME { WHvArm64RegisterTtbr0El1 = 0x00040005, WHvArm64RegisterTtbr1El1 = 0x00040006, WHvArm64RegisterVbarEl1 = 0x0004000C, + WHvArm64RegisterZcrEl1 = 0x00040071, WHvArm64RegisterDbgbcr0El1 = 0x00050000, WHvArm64RegisterDbgbcr1El1 = 0x00050001, WHvArm64RegisterDbgbcr2El1 = 0x00050002, @@ -1349,32 +644,12 @@ typedef enum WHV_REGISTER_NAME { WHvArm64RegisterPmovsclrEl0 = 0x00052048, WHvArm64RegisterPmovssetEl0 = 0x00052049, WHvArm64RegisterPmselrEl0 = 0x0005204A, - WHvArm64RegisterPmswincEl0 = 0x0005204B, WHvArm64RegisterPmuserenrEl0 = 0x0005204C, - WHvArm64RegisterPmxevcntrEl0 = 0x0005204D, - WHvArm64RegisterPmxevtyperEl0 = 0x0005204E, - WHvArm64RegisterCntfrqEl0 = 0x00058000, WHvArm64RegisterCntkctlEl1 = 0x00058008, WHvArm64RegisterCntvCtlEl0 = 0x0005800E, WHvArm64RegisterCntvCvalEl0 = 0x0005800F, - WHvArm64RegisterCntvTvalEl0 = 0x00058010, WHvArm64RegisterCntvctEl0 = 0x00058011, - WHvArm64RegisterIccAp1R0El1 = 0x00060000, - WHvArm64RegisterIccAp1R1El1 = 0x00060001, - WHvArm64RegisterIccAp1R2El1 = 0x00060002, - WHvArm64RegisterIccAp1R3El1 = 0x00060003, - WHvArm64RegisterIccAsgi1REl1 = 0x00060004, - WHvArm64RegisterIccBpr1El1 = 0x00060005, - WHvArm64RegisterIccCtlrEl1 = 0x00060006, - WHvArm64RegisterIccDirEl1 = 0x00060007, - WHvArm64RegisterIccEoir1El1 = 0x00060008, - WHvArm64RegisterIccHppir1El1 = 0x00060009, - WHvArm64RegisterIccIar1El1 = 0x0006000A, - WHvArm64RegisterIccIgrpen1El1 = 0x0006000B, - WHvArm64RegisterIccPmrEl1 = 0x0006000C, - WHvArm64RegisterIccRprEl1 = 0x0006000D, - WHvArm64RegisterIccSgi1REl1 = 0x0006000E, - WHvArm64RegisterIccSreEl1 = 0x0006000F, + WHvArm64RegisterGicrBaseGpa = 0x00063000, WHvRegisterSint0 = 0x000A0000, WHvRegisterSint1 = 0x000A0001, WHvRegisterSint2 = 0x000A0002, @@ -1396,6 +671,19 @@ typedef enum WHV_REGISTER_NAME { WHvRegisterSifp = 0x000A0012, WHvRegisterSipp = 0x000A0013, WHvRegisterEom = 0x000A0014, + WHvRegisterHypervisorVersion = 0x00000100, + WHvRegisterPrivilegesAndFeaturesInfo = 0x00000200, + WHvRegisterFeaturesInfo = 0x00000201, + WHvRegisterImplementationLimitsInfo = 0x00000202, + WHvRegisterHardwareFeaturesInfo = 0x00000203, + WHvRegisterCpuManagementFeaturesInfo = 0x00000204, + WHvRegisterPasidFeaturesInfo = 0x00000205, + WHvRegisterGuestCrashP0 = 0x00000210, + WHvRegisterGuestCrashP1 = 0x00000211, + WHvRegisterGuestCrashP2 = 0x00000212, + WHvRegisterGuestCrashP3 = 0x00000213, + WHvRegisterGuestCrashP4 = 0x00000214, + WHvRegisterGuestCrashCtl = 0x00000215, WHvRegisterVpRuntime = 0x00090000, WHvRegisterGuestOsId = 0x00090002, WHvRegisterVpAssistPage = 0x00090013, @@ -1410,362 +698,1463 @@ typedef enum WHV_REGISTER_NAME { WHvRegisterPendingEvent3 = 0x00010009 } WHV_REGISTER_NAME; -#define WHvRegisterSiefp WHvRegisterSifp -#define WHvRegisterSimp WHvRegisterSipp -#define WHvRegisterPendingEvent WHvRegisterPendingEvent0 +#define WHvRegisterSiefp WHvRegisterSifp +#define WHvRegisterSimp WHvRegisterSipp +#define WHvRegisterPendingEvent WHvRegisterPendingEvent0 + +#endif /* __x86_64__ || __aarch64__ */ + +typedef UINT64 WHV_GUEST_PHYSICAL_ADDRESS; +typedef UINT64 WHV_GUEST_VIRTUAL_ADDRESS; + +typedef union DECLSPEC_ALIGN(16) WHV_UINT128 { + __C89_NAMELESS struct { + UINT64 Low64; + UINT64 High64; + }; + UINT32 Dword[4]; +} WHV_UINT128; + +C_ASSERT(sizeof(WHV_UINT128) == 16); + +#if defined(__x86_64__) + +typedef union WHV_X64_FP_REGISTER { + __C89_NAMELESS struct { + UINT64 Mantissa; + UINT64 BiasedExponent:15; + UINT64 Sign:1; + UINT64 Reserved:48; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_FP_REGISTER; + +C_ASSERT(sizeof(WHV_X64_FP_REGISTER) == 16); + +typedef union WHV_X64_FP_CONTROL_STATUS_REGISTER { + __C89_NAMELESS struct { + UINT16 FpControl; + UINT16 FpStatus; + UINT8 FpTag; + UINT8 Reserved; + UINT16 LastFpOp; + __C89_NAMELESS union { + UINT64 LastFpRip; + __C89_NAMELESS struct { + UINT32 LastFpEip; + UINT16 LastFpCs; + UINT16 Reserved2; + }; + }; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_FP_CONTROL_STATUS_REGISTER; + +C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16); + +typedef union WHV_X64_XMM_CONTROL_STATUS_REGISTER { + __C89_NAMELESS struct { + __C89_NAMELESS union { + UINT64 LastFpRdp; + __C89_NAMELESS struct { + UINT32 LastFpDp; + UINT16 LastFpDs; + UINT16 Reserved; + }; + }; + UINT32 XmmStatusControl; + UINT32 XmmStatusControlMask; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_XMM_CONTROL_STATUS_REGISTER; + +C_ASSERT(sizeof(WHV_X64_XMM_CONTROL_STATUS_REGISTER) == 16); + +typedef struct WHV_X64_SEGMENT_REGISTER { + UINT64 Base; + UINT32 Limit; + UINT16 Selector; + __C89_NAMELESS union { + __C89_NAMELESS struct { + UINT16 SegmentType:4; + UINT16 NonSystemSegment:1; + UINT16 DescriptorPrivilegeLevel:2; + UINT16 Present:1; + UINT16 Reserved:4; + UINT16 Available:1; + UINT16 Long:1; + UINT16 Default:1; + UINT16 Granularity:1; + }; + UINT16 Attributes; + }; +} WHV_X64_SEGMENT_REGISTER; + +C_ASSERT(sizeof(WHV_X64_SEGMENT_REGISTER) == 16); + +typedef struct WHV_X64_TABLE_REGISTER { + UINT16 Pad[3]; + UINT16 Limit; + UINT64 Base; +} WHV_X64_TABLE_REGISTER; + +C_ASSERT(sizeof(WHV_X64_TABLE_REGISTER) == 16); + +typedef union WHV_X64_INTERRUPT_STATE_REGISTER { + __C89_NAMELESS struct { + UINT64 InterruptShadow:1; + UINT64 NmiMasked:1; + UINT64 Reserved:62; + }; + UINT64 AsUINT64; +} WHV_X64_INTERRUPT_STATE_REGISTER; + +C_ASSERT(sizeof(WHV_X64_INTERRUPT_STATE_REGISTER) == 8); + +typedef union WHV_X64_PENDING_INTERRUPTION_REGISTER { + __C89_NAMELESS struct { + UINT32 InterruptionPending:1; + UINT32 InterruptionType:3; + UINT32 DeliverErrorCode:1; + UINT32 InstructionLength:4; + UINT32 NestedEvent:1; + UINT32 Reserved:6; + UINT32 InterruptionVector:16; + UINT32 ErrorCode; + }; + UINT64 AsUINT64; +} WHV_X64_PENDING_INTERRUPTION_REGISTER; + +C_ASSERT(sizeof(WHV_X64_PENDING_INTERRUPTION_REGISTER) == sizeof(UINT64)); + +typedef enum WHV_X64_PENDING_EVENT_TYPE { + WHvX64PendingEventException = 0, + WHvX64PendingEventExtInt = 5, + WHvX64PendingEventSvmNestedExit = 7, + WHvX64PendingEventVmxNestedExit = 8 +} WHV_X64_PENDING_EVENT_TYPE; + +typedef union WHV_X64_PENDING_EXCEPTION_EVENT { + __C89_NAMELESS struct { + UINT32 EventPending : 1; + UINT32 EventType : 3; + UINT32 Reserved0 : 4; + UINT32 DeliverErrorCode : 1; + UINT32 Reserved1 : 7; + UINT32 Vector : 16; + UINT32 ErrorCode; + UINT64 ExceptionParameter; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_EXCEPTION_EVENT; + +C_ASSERT(sizeof(WHV_X64_PENDING_EXCEPTION_EVENT) == sizeof(WHV_UINT128)); + +typedef union WHV_X64_PENDING_EXT_INT_EVENT { + __C89_NAMELESS struct { + UINT64 EventPending : 1; + UINT64 EventType : 3; + UINT64 Reserved0 : 4; + UINT64 Vector : 8; + UINT64 Reserved1 : 48; + UINT64 Reserved2; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_EXT_INT_EVENT; + +C_ASSERT(sizeof(WHV_X64_PENDING_EXT_INT_EVENT) == sizeof(WHV_UINT128)); + +typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 { + __C89_NAMELESS struct { + UINT64 EventPending : 1; + UINT64 EventType : 4; + UINT64 Reserved0 : 3; + UINT64 InstructionBytesValid : 1; + UINT64 Reserved1 : 55; + UINT64 ExitCode; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0; + +typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 { + __C89_NAMELESS struct { + UINT64 ExitInfo1; + UINT64 ExitInfo2; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1; + +typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 { + __C89_NAMELESS struct { + UINT64 NextRip; + UINT8 InstructionBytesFetchedCount; + UINT8 InstructionBytes[7]; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2; + +typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 { + __C89_NAMELESS struct { + UINT8 InstructionBytes[8]; + UINT64 Reserved2; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3; + +C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0) == 16); +C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1) == 16); +C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2) == 16); +C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3) == 16); + +typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 { + __C89_NAMELESS struct { + UINT32 EventPending : 1; + UINT32 EventType : 4; + UINT32 Reserved0 : 27; + UINT32 ExitReason; + UINT64 ExitQualification; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0; + +typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 { + __C89_NAMELESS struct { + UINT32 InstructionLength; + UINT32 InstructionInfo; + UINT32 ExitInterruptionInfo; + UINT32 ExitExceptionErrorCode; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1; + +typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 { + __C89_NAMELESS struct { + UINT64 GuestLinearAddress; + UINT64 GuestPhysicalAddress; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2; + +C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0) == 16); +C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1) == 16); +C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2) == 16); + +typedef union WHV_X64_NESTED_INVEPT_REGISTER { + __C89_NAMELESS struct { + UINT8 Type; + UINT8 Reserved[7]; + UINT64 Eptp; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_NESTED_INVEPT_REGISTER; + +C_ASSERT(sizeof(WHV_X64_NESTED_INVEPT_REGISTER) == 16); + +typedef union WHV_X64_NESTED_INVVPID_REGISTER { + __C89_NAMELESS struct { + UINT8 Type; + UINT8 Reserved[3]; + UINT32 Vpid; + UINT64 LinearAddress; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_NESTED_INVVPID_REGISTER; + +C_ASSERT(sizeof(WHV_X64_NESTED_INVVPID_REGISTER) == 16); + +typedef union WHV_X64_NESTED_GUEST_STATE { + __C89_NAMELESS struct { + UINT64 NestedVirtActive : 1; + UINT64 NestedGuestMode : 1; + UINT64 VmEntryPending : 1; + UINT64 Reserved0 : 61; + UINT64 Reserved1; + }; + WHV_UINT128 AsUINT128; +} WHV_X64_NESTED_GUEST_STATE; + +C_ASSERT(sizeof(WHV_X64_NESTED_GUEST_STATE) == 16); + +#endif /* defined(__x86_64__) */ + +typedef union WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER { + __C89_NAMELESS struct { +#if defined(__x86_64__) + UINT64 NmiNotification:1; + UINT64 InterruptNotification:1; + UINT64 InterruptPriority:4; + UINT64 Reserved:42; +#elif defined(__aarch64__) + UINT64 Reserved:48; +#endif + UINT64 Sint:16; + }; + UINT64 AsUINT64; +} WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER, WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER; + +C_ASSERT(sizeof(WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER) == 8); + +typedef union WHV_INTERNAL_ACTIVITY_REGISTER { + __C89_NAMELESS struct { + UINT64 StartupSuspend : 1; + UINT64 HaltSuspend : 1; + UINT64 IdleSuspend : 1; + UINT64 Reserved :61; + }; + UINT64 AsUINT64; +} WHV_INTERNAL_ACTIVITY_REGISTER; + +C_ASSERT(sizeof(WHV_INTERNAL_ACTIVITY_REGISTER) == 8); + +#if defined(__x86_64__) + +typedef union WHV_X64_PENDING_DEBUG_EXCEPTION { + UINT64 AsUINT64; + __C89_NAMELESS struct { + UINT64 Breakpoint0 : 1; + UINT64 Breakpoint1 : 1; + UINT64 Breakpoint2 : 1; + UINT64 Breakpoint3 : 1; + UINT64 SingleStep : 1; + UINT64 Reserved0 : 59; + }; +} WHV_X64_PENDING_DEBUG_EXCEPTION; + +C_ASSERT(sizeof(WHV_X64_PENDING_DEBUG_EXCEPTION) == 8); + +#elif defined(__aarch64__) + +typedef enum WHV_ARM64_PENDING_EVENT_TYPE { + WHvArm64PendingEventException = 0, + WHvArm64PendingEventSyntheticException = 1 +} WHV_ARM64_PENDING_EVENT_TYPE; + +#define WHV_ARM64_PENDING_EVENT_HEADER \ + UINT8 EventPending : 1; \ + UINT8 EventType : 3; \ + UINT8 Reserved : 4 + +typedef union WHV_ARM64_PENDING_EXCEPTION_EVENT { + UINT64 AsUINT64[3]; + __C89_NAMELESS struct { + WHV_ARM64_PENDING_EVENT_HEADER; + UINT8 Reserved1; + UINT16 Reserved2; + UINT32 Reserved3; + UINT64 EsrElx; + UINT64 FarElx; + }; +} WHV_ARM64_PENDING_EXCEPTION_EVENT; + +typedef enum WHV_ARM64_SYNTHETIC_EXCEPTION_TYPE { + WHvArm64SyntheticExceptionTypeSmc = 0x0, + WHvArm64SyntheticExceptionTypeSecure = 0x1, + WHvArm64SyntheticExceptionTypeCrashdump = 0x2, + WHvArm64SyntheticExceptionTypeVirtualizationFault = 0x3, + WHvArm64SyntheticExceptionTypeMax = 0x3F + 1 +} WHV_ARM64_SYNTHETIC_EXCEPTION_TYPE; + +typedef union WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT { + UINT64 AsUINT64[2]; + __C89_NAMELESS struct { + WHV_ARM64_PENDING_EVENT_HEADER; + UINT8 Reserved1; + UINT16 Reserved2; + UINT32 ExceptionType; + UINT64 Context; + }; +} WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT; + +typedef union WHV_ARM64_PENDING_EVENT { + __C89_NAMELESS struct { + WHV_UINT128 Reg0; + WHV_UINT128 Reg1; + }; + __C89_NAMELESS struct { + WHV_ARM64_PENDING_EVENT_HEADER; + UINT8 EventData[15]; + }; + WHV_ARM64_PENDING_EXCEPTION_EVENT Exception; + WHV_ARM64_PENDING_SYNTHETIC_EXCEPTION_EVENT SyntheticException; +} WHV_ARM64_PENDING_EVENT; + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +typedef union WHV_REGISTER_VALUE { + WHV_UINT128 Reg128; + UINT64 Reg64; + UINT32 Reg32; + UINT16 Reg16; + UINT8 Reg8; + WHV_INTERNAL_ACTIVITY_REGISTER InternalActivity; + WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER DeliverabilityNotifications; +#if defined(__x86_64__) + WHV_X64_FP_REGISTER Fp; + WHV_X64_FP_CONTROL_STATUS_REGISTER FpControlStatus; + WHV_X64_XMM_CONTROL_STATUS_REGISTER XmmControlStatus; + WHV_X64_SEGMENT_REGISTER Segment; + WHV_X64_TABLE_REGISTER Table; + WHV_X64_INTERRUPT_STATE_REGISTER InterruptState; + WHV_X64_PENDING_INTERRUPTION_REGISTER PendingInterruption; + WHV_X64_PENDING_EXCEPTION_EVENT ExceptionEvent; + WHV_X64_PENDING_EXT_INT_EVENT ExtIntEvent; + WHV_X64_PENDING_DEBUG_EXCEPTION PendingDebugException; + WHV_X64_NESTED_GUEST_STATE NestedState; + WHV_X64_NESTED_INVEPT_REGISTER InvEpt; + WHV_X64_NESTED_INVVPID_REGISTER InvVpid; + WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 SvmNestedExit0; + WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 SvmNestedExit1; + WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 SvmNestedExit2; + WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 SvmNestedExit3; + WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 VmxNestedExit0; + WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 VmxNestedExit1; + WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 VmxNestedExit2; +#endif +} WHV_REGISTER_VALUE; + +C_ASSERT(sizeof(WHV_REGISTER_VALUE) == 16); + +typedef enum WHV_CAPABILITY_CODE { + WHvCapabilityCodeHypervisorPresent = 0x00000000 + ,WHvCapabilityCodeFeatures = 0x00000001 + ,WHvCapabilityCodeExtendedVmExits = 0x00000002 +#if defined(__x86_64__) + ,WHvCapabilityCodeExceptionExitBitmap = 0x00000003 + ,WHvCapabilityCodeX64MsrExitBitmap = 0x00000004 +#endif + ,WHvCapabilityCodeGpaRangePopulateFlags = 0x00000005 + ,WHvCapabilityCodeSchedulerFeatures = 0x00000006 + ,WHvCapabilityCodeProcessorVendor = 0x00001000 + ,WHvCapabilityCodeProcessorFeatures = 0x00001001 + ,WHvCapabilityCodeProcessorClFlushSize = 0x00001002 +#if defined(__x86_64__) + ,WHvCapabilityCodeProcessorXsaveFeatures = 0x00001003 +#endif + ,WHvCapabilityCodeProcessorClockFrequency = 0x00001004 +#if defined(__x86_64__) + ,WHvCapabilityCodeInterruptClockFrequency = 0x00001005 +#endif + ,WHvCapabilityCodeProcessorFeaturesBanks = 0x00001006 + ,WHvCapabilityCodeProcessorFrequencyCap = 0x00001007 + ,WHvCapabilityCodeSyntheticProcessorFeaturesBanks = 0x00001008 +#if defined(__x86_64__) + ,WHvCapabilityCodeProcessorPerfmonFeatures = 0x00001009 +#endif + ,WHvCapabilityCodePhysicalAddressWidth = 0x0000100A +#if defined(__x86_64__) + ,WHvCapabilityCodeVmxBasic = 0x00002000 + ,WHvCapabilityCodeVmxPinbasedCtls = 0x00002001 + ,WHvCapabilityCodeVmxProcbasedCtls = 0x00002002 + ,WHvCapabilityCodeVmxExitCtls = 0x00002003 + ,WHvCapabilityCodeVmxEntryCtls = 0x00002004 + ,WHvCapabilityCodeVmxMisc = 0x00002005 + ,WHvCapabilityCodeVmxCr0Fixed0 = 0x00002006 + ,WHvCapabilityCodeVmxCr0Fixed1 = 0x00002007 + ,WHvCapabilityCodeVmxCr4Fixed0 = 0x00002008 + ,WHvCapabilityCodeVmxCr4Fixed1 = 0x00002009 + ,WHvCapabilityCodeVmxVmcsEnum = 0x0000200A + ,WHvCapabilityCodeVmxProcbasedCtls2 = 0x0000200B + ,WHvCapabilityCodeVmxEptVpidCap = 0x0000200C + ,WHvCapabilityCodeVmxTruePinbasedCtls = 0x0000200D + ,WHvCapabilityCodeVmxTrueProcbasedCtls = 0x0000200E + ,WHvCapabilityCodeVmxTrueExitCtls = 0x0000200F + ,WHvCapabilityCodeVmxTrueEntryCtls = 0x00002010 +#elif defined (__aarch64__) + ,WHvCapabilityCodeGicLpiIntIdBits = 0x00002011 + ,WHvCapabilityCodeMaxSveVectorLength = 0x00002012 +#endif +} WHV_CAPABILITY_CODE; + +typedef union WHV_CAPABILITY_FEATURES { + __C89_NAMELESS struct { + UINT64 PartialUnmap : 1; +#if defined(__x86_64__) + UINT64 LocalApicEmulation : 1; + UINT64 Xsave : 1; +#else + UINT64 ReservedArm0 : 2; +#endif + UINT64 DirtyPageTracking : 1; + UINT64 SpeculationControl : 1; +#if defined(__x86_64__) + UINT64 ApicRemoteRead : 1; +#else + UINT64 ReservedArm1 : 1; +#endif + UINT64 IdleSuspend : 1; + UINT64 VirtualPciDeviceSupport : 1; + UINT64 IommuSupport : 1; + UINT64 VpHotAddRemove : 1; + UINT64 DeviceAccessTracking : 1; +#if defined(__x86_64__) + UINT64 ReservedX640 : 1; +#else + UINT64 Arm64Support : 1; +#endif + UINT64 Reserved : 52; + }; + UINT64 AsUINT64; +} WHV_CAPABILITY_FEATURES; + +C_ASSERT(sizeof(WHV_CAPABILITY_FEATURES) == sizeof(UINT64)); + +typedef union WHV_EXTENDED_VM_EXITS { + __C89_NAMELESS struct { +#if defined(__x86_64__) + UINT64 X64CpuidExit : 1; + UINT64 X64MsrExit : 1; + UINT64 ExceptionExit : 1; + UINT64 X64RdtscExit : 1; + UINT64 X64ApicSmiExitTrap : 1; +#else + UINT64 ReservedArm0 : 5; +#endif + UINT64 HypercallExit : 1; +#if defined(__x86_64__) + UINT64 X64ApicInitSipiExitTrap : 1; + UINT64 X64ApicWriteLint0ExitTrap : 1; + UINT64 X64ApicWriteLint1ExitTrap : 1; + UINT64 X64ApicWriteSvrExitTrap : 1; +#else + UINT64 ReservedArm1 : 4; +#endif + UINT64 UnknownSynicConnection : 1; + UINT64 RetargetUnknownVpciDevice : 1; +#if defined(__x86_64__) + UINT64 X64ApicWriteLdrExitTrap : 1; + UINT64 X64ApicWriteDfrExitTrap : 1; +#else + UINT64 ReservedArm2 : 2; +#endif + UINT64 GpaAccessFaultExit : 1; + UINT64 Reserved : 49; + }; + UINT64 AsUINT64; +} WHV_EXTENDED_VM_EXITS; + +C_ASSERT(sizeof(WHV_EXTENDED_VM_EXITS) == sizeof(UINT64)); + +typedef enum WHV_PROCESSOR_VENDOR { + WHvProcessorVendorAmd = 0x0000, + WHvProcessorVendorIntel = 0x0001, + WHvProcessorVendorHygon = 0x0002, + WHvProcessorVendorArm = 0x0010 +} WHV_PROCESSOR_VENDOR; + +#if defined(__x86_64__) + +typedef union WHV_X64_PROCESSOR_FEATURES { + __C89_NAMELESS struct { + UINT64 Sse3Support : 1; + UINT64 LahfSahfSupport : 1; + UINT64 Ssse3Support : 1; + UINT64 Sse4_1Support : 1; + UINT64 Sse4_2Support : 1; + UINT64 Sse4aSupport : 1; + UINT64 XopSupport : 1; + UINT64 PopCntSupport : 1; + UINT64 Cmpxchg16bSupport : 1; + UINT64 Altmovcr8Support : 1; + UINT64 LzcntSupport : 1; + UINT64 MisAlignSseSupport : 1; + UINT64 MmxExtSupport : 1; + UINT64 Amd3DNowSupport : 1; + UINT64 ExtendedAmd3DNowSupport : 1; + UINT64 Page1GbSupport : 1; + UINT64 AesSupport : 1; + UINT64 PclmulqdqSupport : 1; + UINT64 PcidSupport : 1; + UINT64 Fma4Support : 1; + UINT64 F16CSupport : 1; + UINT64 RdRandSupport : 1; + UINT64 RdWrFsGsSupport : 1; + UINT64 SmepSupport : 1; + UINT64 EnhancedFastStringSupport : 1; + UINT64 Bmi1Support : 1; + UINT64 Bmi2Support : 1; + UINT64 Reserved1 : 2; + UINT64 MovbeSupport : 1; + UINT64 Npiep1Support : 1; + UINT64 DepX87FPUSaveSupport : 1; + UINT64 RdSeedSupport : 1; + UINT64 AdxSupport : 1; + UINT64 IntelPrefetchSupport : 1; + UINT64 SmapSupport : 1; + UINT64 HleSupport : 1; + UINT64 RtmSupport : 1; + UINT64 RdtscpSupport : 1; + UINT64 ClflushoptSupport : 1; + UINT64 ClwbSupport : 1; + UINT64 ShaSupport : 1; + UINT64 X87PointersSavedSupport : 1; + UINT64 InvpcidSupport : 1; + UINT64 IbrsSupport : 1; + UINT64 StibpSupport : 1; + UINT64 IbpbSupport : 1; + UINT64 UnrestrictedGuestSupport : 1; + UINT64 SsbdSupport : 1; + UINT64 FastShortRepMovSupport : 1; + UINT64 Reserved3 : 1; + UINT64 RdclNo : 1; + UINT64 IbrsAllSupport : 1; + UINT64 Reserved4 : 1; + UINT64 SsbNo : 1; + UINT64 RsbANo : 1; + UINT64 Reserved5 : 1; + UINT64 RdPidSupport : 1; + UINT64 UmipSupport : 1; + UINT64 MdsNoSupport : 1; + UINT64 MdClearSupport : 1; + UINT64 TaaNoSupport : 1; + UINT64 TsxCtrlSupport : 1; + UINT64 Reserved6 : 1; + }; + UINT64 AsUINT64; +} WHV_X64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES; + +C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES) == sizeof(UINT64)); + +typedef union WHV_X64_PROCESSOR_FEATURES1 { + __C89_NAMELESS struct { + UINT64 ACountMCountSupport : 1; + UINT64 TscInvariantSupport : 1; + UINT64 ClZeroSupport : 1; + UINT64 RdpruSupport : 1; + UINT64 La57Support : 1; + UINT64 MbecSupport : 1; + UINT64 NestedVirtSupport : 1; + UINT64 PsfdSupport: 1; + UINT64 CetSsSupport : 1; + UINT64 CetIbtSupport : 1; + UINT64 VmxExceptionInjectSupport : 1; + UINT64 Reserved2 : 1; + UINT64 UmwaitTpauseSupport : 1; + UINT64 MovdiriSupport : 1; + UINT64 Movdir64bSupport : 1; + UINT64 CldemoteSupport : 1; + UINT64 SerializeSupport : 1; + UINT64 TscDeadlineTmrSupport : 1; + UINT64 TscAdjustSupport : 1; + UINT64 FZLRepMovsb : 1; + UINT64 FSRepStosb : 1; + UINT64 FSRepCmpsb : 1; + UINT64 TsxLdTrkSupport : 1; + UINT64 VmxInsOutsExitInfoSupport : 1; + UINT64 Reserved3 : 1; + UINT64 SbdrSsdpNoSupport : 1; + UINT64 FbsdpNoSupport : 1; + UINT64 PsdpNoSupport : 1; + UINT64 FbClearSupport : 1; + UINT64 BtcNoSupport : 1; + UINT64 IbpbRsbFlushSupport : 1; + UINT64 StibpAlwaysOnSupport : 1; + UINT64 PerfGlobalCtrlSupport : 1; + UINT64 NptExecuteOnlySupport : 1; + UINT64 NptADFlagsSupport : 1; + UINT64 Npt1GbPageSupport : 1; + UINT64 Reserved4 : 1; + UINT64 Reserved5 : 1; + UINT64 Reserved6 : 1; + UINT64 Reserved7 : 1; + UINT64 CmpccxaddSupport : 1; + UINT64 Reserved8 : 1; + UINT64 Reserved9 : 1; + UINT64 Reserved10 : 1; + UINT64 Reserved11 : 1; + UINT64 PrefetchISupport : 1; + UINT64 Sha512Support : 1; + UINT64 Reserved12 : 1; + UINT64 Reserved13 : 1; + UINT64 Reserved14 : 1; + UINT64 SM3Support : 1; + UINT64 SM4Support : 1; + UINT64 Reserved15 : 1; + UINT64 Reserved16 : 1; + UINT64 SbpbSupported : 1; + UINT64 IbpbBrTypeSupported : 1; + UINT64 SrsoNoSupported : 1; + UINT64 SrsoUserKernelNoSupported : 1; + UINT64 Reserved17 : 1; + UINT64 Reserved18 : 1; + UINT64 Reserved19 : 1; + UINT64 Reserved20 : 3; + }; + UINT64 AsUINT64; +} WHV_X64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1; + +C_ASSERT(sizeof(WHV_X64_PROCESSOR_FEATURES1) == sizeof(UINT64)); + +#elif defined(__aarch64__) + +typedef union WHV_ARM64_PROCESSOR_FEATURES { + __C89_NAMELESS struct { + UINT64 Asid16 : 1; + UINT64 TGran16 : 1; + UINT64 TGran64 : 1; + UINT64 Haf : 1; + UINT64 Hdbs : 1; + UINT64 Pan : 1; + UINT64 AtS1E1 : 1; + UINT64 Uao : 1; + UINT64 El0Aarch32 : 1; + UINT64 Fp : 1; + UINT64 FpHp : 1; + UINT64 AdvSimd : 1; + UINT64 AdvSimdHp : 1; + UINT64 GicV3V4 : 1; + UINT64 GicV41 : 1; + UINT64 Ras : 1; + UINT64 PmuV3 : 1; + UINT64 PmuV3ArmV81 : 1; + UINT64 PmuV3ArmV84 : 1; + UINT64 PmuV3ArmV85 : 1; + UINT64 Aes : 1; + UINT64 PolyMul : 1; + UINT64 Sha1 : 1; + UINT64 Sha256 : 1; + UINT64 Sha512 : 1; + UINT64 Crc32 : 1; + UINT64 Atomic : 1; + UINT64 Rdm : 1; + UINT64 Sha3 : 1; + UINT64 Sm3 : 1; + UINT64 Sm4 : 1; + UINT64 Dp : 1; + UINT64 Fhm : 1; + UINT64 DcCvap : 1; + UINT64 DcCvadp : 1; + UINT64 ApaBase : 1; + UINT64 ApaEp : 1; + UINT64 ApaEp2 : 1; + UINT64 ApaEp2Fp : 1; + UINT64 ApaEp2Fpc : 1; + UINT64 Jscvt : 1; + UINT64 Fcma : 1; + UINT64 RcpcV83 : 1; + UINT64 RcpcV84 : 1; + UINT64 Gpa : 1; + UINT64 L1ipPipt : 1; + UINT64 DzPermitted : 1; + UINT64 Ssbs : 1; + UINT64 SsbsRw : 1; + UINT64 Reserved49 : 1; + UINT64 Reserved50 : 1; + UINT64 Reserved51 : 1; + UINT64 Reserved52 : 1; + UINT64 Csv2 : 1; + UINT64 Csv3 : 1; + UINT64 Sb : 1; + UINT64 Idc : 1; + UINT64 Dic : 1; + UINT64 TlbiOs : 1; + UINT64 TlbiOsRange : 1; + UINT64 FlagsM : 1; + UINT64 FlagsM2 : 1; + UINT64 Bf16 : 1; + UINT64 Ebf16 : 1; + }; + UINT64 AsUINT64; +} WHV_ARM64_PROCESSOR_FEATURES, WHV_PROCESSOR_FEATURES; + +typedef union WHV_ARM64_PROCESSOR_FEATURES1 { + __C89_NAMELESS struct { + UINT64 SveBf16 : 1; + UINT64 SveEbf16 : 1; + UINT64 I8mm : 1; + UINT64 SveI8mm : 1; + UINT64 Frintts : 1; + UINT64 Specres : 1; + UINT64 Reserved6 : 1; + UINT64 Rpres : 1; + UINT64 Exs : 1; + UINT64 SpecSei : 1; + UINT64 Ets : 1; + UINT64 Afp : 1; + UINT64 Iesb : 1; + UINT64 Rng : 1; + UINT64 Lse2 : 1; + UINT64 Idst : 1; + UINT64 Reserved16 : 1; + UINT64 Reserved17 : 1; + UINT64 Reserved18 : 1; + UINT64 Reserved19 : 1; + UINT64 Reserved20 : 1; + UINT64 Reserved21 : 1; + UINT64 Ccidx : 1; + UINT64 Reserved23 : 1; + UINT64 Reserved24 : 1; + UINT64 Reserved25 : 1; + UINT64 Reserved26 : 1; + UINT64 Reserved27 : 1; + UINT64 Reserved28 : 1; + UINT64 Reserved29 : 1; + UINT64 Reserved30 : 1; + UINT64 Reserved31 : 1; + UINT64 Reserved32 : 1; + UINT64 Reserved33 : 1; + UINT64 Reserved34 : 1; + UINT64 TtCnp : 1; + UINT64 Hpds : 1; + UINT64 Sve : 1; + UINT64 SveV2 : 1; + UINT64 SveV2P1 : 1; + UINT64 SpecFpacc : 1; + UINT64 SveAes : 1; + UINT64 SveBitPerm : 1; + UINT64 SveSha3 : 1; + UINT64 SveSm4 : 1; + UINT64 E0PD : 1; + UINT64 Reserved : 8; + }; + UINT64 AsUINT64; +} WHV_ARM64_PROCESSOR_FEATURES1, WHV_PROCESSOR_FEATURES1; + +#endif /* __x86_64__ || __aarch64__ */ + +#define WHV_PROCESSOR_FEATURES_BANKS_COUNT 2 + +typedef struct WHV_PROCESSOR_FEATURES_BANKS { + UINT32 BanksCount; + UINT32 Reserved0; + __C89_NAMELESS union { + __C89_NAMELESS struct { + WHV_PROCESSOR_FEATURES Bank0; + WHV_PROCESSOR_FEATURES1 Bank1; + }; + UINT64 AsUINT64[WHV_PROCESSOR_FEATURES_BANKS_COUNT]; + }; +} WHV_PROCESSOR_FEATURES_BANKS; + +C_ASSERT(sizeof(WHV_PROCESSOR_FEATURES_BANKS) == sizeof(UINT64) * (WHV_PROCESSOR_FEATURES_BANKS_COUNT + 1)); + +typedef union WHV_SYNTHETIC_PROCESSOR_FEATURES { + __C89_NAMELESS struct { + UINT64 HypervisorPresent : 1; + UINT64 Hv1 : 1; + UINT64 AccessVpRunTimeReg : 1; + UINT64 AccessPartitionReferenceCounter : 1; + UINT64 AccessSynicRegs : 1; + UINT64 AccessSyntheticTimerRegs : 1; + UINT64 AccessIntrCtrlRegs : 1; + UINT64 AccessHypercallRegs : 1; + UINT64 AccessVpIndex : 1; + UINT64 AccessPartitionReferenceTsc : 1; +#ifdef __x86_64__ + UINT64 AccessGuestIdleReg : 1; + UINT64 AccessFrequencyRegs : 1; +#else + UINT64 ReservedZ10 : 1; + UINT64 ReservedZ11 : 1; +#endif + UINT64 ReservedZ12 : 1; + UINT64 ReservedZ13 : 1; + UINT64 ReservedZ14 : 1; +#ifdef __x86_64__ + UINT64 EnableExtendedGvaRangesForFlushVirtualAddressList : 1; +#else + UINT64 ReservedZ15 : 1; +#endif + UINT64 ReservedZ16 : 1; + UINT64 ReservedZ17 : 1; + UINT64 FastHypercallOutput : 1; + UINT64 ReservedZ19 : 1; + UINT64 ReservedZ20 : 1; + UINT64 ReservedZ21 : 1; + UINT64 DirectSyntheticTimers : 1; + UINT64 ReservedZ23 : 1; + UINT64 ExtendedProcessorMasks : 1; + UINT64 TbFlushHypercalls : 1; + UINT64 SyntheticClusterIpi : 1; + UINT64 NotifyLongSpinWait : 1; + UINT64 QueryNumaDistance : 1; + UINT64 SignalEvents : 1; + UINT64 RetargetDeviceInterrupt : 1; +#ifdef __x86_64__ + UINT64 RestoreTime : 1; + UINT64 EnlightenedVmcs : 1; + UINT64 NestedDebugCtl : 1; + UINT64 SyntheticTimeUnhaltedTimer : 1; + UINT64 IdleSpecCtrl : 1; +#else + UINT64 ReservedZ31 : 1; + UINT64 ReservedZ32 : 1; + UINT64 ReservedZ33 : 1; + UINT64 ReservedZ34 : 1; + UINT64 ReservedZ35 : 1; +#endif + UINT64 ReservedZ36 : 1; + UINT64 WakeVps : 1; + UINT64 AccessVpRegs : 1; +#ifdef __aarch64__ + UINT64 SyncContext : 1; +#else + UINT64 ReservedZ39 : 1; +#endif + UINT64 ReservedZ40 : 1; + UINT64 ReservedZ41 : 1; + UINT64 ReservedZ42 : 1; + UINT64 ReservedZ43 : 1; + UINT64 ReservedZ44 : 1; + UINT64 Reserved : 19; + }; + UINT64 AsUINT64; +} WHV_SYNTHETIC_PROCESSOR_FEATURES; + +C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES) == 8); + +#define WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT 1 + +typedef struct WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS { + UINT32 BanksCount; + UINT32 Reserved0; + __C89_NAMELESS union { + __C89_NAMELESS struct { + WHV_SYNTHETIC_PROCESSOR_FEATURES Bank0; + }; + UINT64 AsUINT64[WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS_COUNT]; + }; +} WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS; + +C_ASSERT(sizeof(WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS) == 16); + +typedef UINT8 WHV_VTL; + +#define WHV_VTL_ALL 0xF + +typedef union WHV_INPUT_VTL { + UINT8 AsUINT8; + __C89_NAMELESS struct { + UINT8 TargetVtl : 4; + UINT8 UseTargetVtl : 1; + UINT8 Reserved : 3; + }; +} WHV_INPUT_VTL; + +typedef union WHV_ENABLE_PARTITION_VTL_FLAGS { + UINT8 AsUINT8; + __C89_NAMELESS struct { + UINT8 EnableMbec : 1; + UINT8 EnableSupervisorShadowStack : 1; + UINT8 EnableHardwareHvpt : 1; + UINT8 Reserved : 5; + }; +} WHV_ENABLE_PARTITION_VTL_FLAGS; + +typedef union WHV_DISABLE_PARTITION_VTL_FLAGS { + UINT8 AsUINT8; + __C89_NAMELESS struct { + UINT8 ScrubOnly : 1; + UINT8 Reserved : 7; + }; +} WHV_DISABLE_PARTITION_VTL_FLAGS; + +typedef struct WHV_INITIAL_VP_CONTEXT { +#if defined(__aarch64__) + UINT64 Pc; + UINT64 Sp_ELh; + UINT64 SCTLR_EL1; + UINT64 MAIR_EL1; + UINT64 TCR_EL1; + UINT64 VBAR_EL1; + UINT64 TTBR0_EL1; + UINT64 TTBR1_EL1; + UINT64 X18; +#else + UINT64 Rip; + UINT64 Rsp; + UINT64 Rflags; + WHV_X64_SEGMENT_REGISTER Cs; + WHV_X64_SEGMENT_REGISTER Ds; + WHV_X64_SEGMENT_REGISTER Es; + WHV_X64_SEGMENT_REGISTER Fs; + WHV_X64_SEGMENT_REGISTER Gs; + WHV_X64_SEGMENT_REGISTER Ss; + WHV_X64_SEGMENT_REGISTER Tr; + WHV_X64_SEGMENT_REGISTER Ldtr; + WHV_X64_TABLE_REGISTER Idtr; + WHV_X64_TABLE_REGISTER Gdtr; + UINT64 Efer; + UINT64 Cr0; + UINT64 Cr3; + UINT64 Cr4; + UINT64 MsrCrPat; +#endif +} WHV_INITIAL_VP_CONTEXT; + +typedef union WHV_DISABLE_VP_VTL_FLAGS { + UINT8 AsUINT8; + __C89_NAMELESS struct { + UINT8 ScrubOnly : 1; + UINT8 Reserved : 7; + }; +} WHV_DISABLE_VP_VTL_FLAGS; + +typedef VOID* WHV_PARTITION_HANDLE; + +typedef enum WHV_PARTITION_PROPERTY_CODE { + WHvPartitionPropertyCodeExtendedVmExits = 0x00000001, +#if defined(__x86_64__) + WHvPartitionPropertyCodeExceptionExitBitmap = 0x00000002, +#endif + WHvPartitionPropertyCodeSeparateSecurityDomain = 0x00000003, + WHvPartitionPropertyCodeNestedVirtualization = 0x00000004, +#if defined(__x86_64__) + WHvPartitionPropertyCodeX64MsrExitBitmap = 0x00000005, +#endif + WHvPartitionPropertyCodePrimaryNumaNode = 0x00000006, + WHvPartitionPropertyCodeCpuReserve = 0x00000007, + WHvPartitionPropertyCodeCpuCap = 0x00000008, + WHvPartitionPropertyCodeCpuWeight = 0x00000009, + WHvPartitionPropertyCodeCpuGroupId = 0x0000000A, + WHvPartitionPropertyCodeProcessorFrequencyCap = 0x0000000B, + WHvPartitionPropertyCodeAllowDeviceAssignment = 0x0000000C, + WHvPartitionPropertyCodeDisableSmt = 0x0000000D, + WHvPartitionPropertyCodeProcessorFeatures = 0x00001001, + WHvPartitionPropertyCodeProcessorClFlushSize = 0x00001002, +#if defined(__x86_64__) + WHvPartitionPropertyCodeCpuidExitList = 0x00001003, + WHvPartitionPropertyCodeCpuidResultList = 0x00001004, + WHvPartitionPropertyCodeLocalApicEmulationMode = 0x00001005, + WHvPartitionPropertyCodeProcessorXsaveFeatures = 0x00001006, +#endif + WHvPartitionPropertyCodeProcessorClockFrequency = 0x00001007, +#if defined(__x86_64__) + WHvPartitionPropertyCodeInterruptClockFrequency = 0x00001008, + WHvPartitionPropertyCodeApicRemoteReadSupport = 0x00001009, +#endif + WHvPartitionPropertyCodeProcessorFeaturesBanks = 0x0000100A, + WHvPartitionPropertyCodeReferenceTime = 0x0000100B, + WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks = 0x0000100C, +#if defined(__x86_64__) + WHvPartitionPropertyCodeCpuidResultList2 = 0x0000100D, + WHvPartitionPropertyCodeProcessorPerfmonFeatures = 0x0000100E, + WHvPartitionPropertyCodeMsrActionList = 0x0000100F, + WHvPartitionPropertyCodeUnimplementedMsrAction = 0x00001010, +#endif + WHvPartitionPropertyCodePhysicalAddressWidth = 0x00001011, +#if defined(__aarch64__) + WHvPartitionPropertyCodeArm64IcParameters = 0x00001012, +#endif + WHvPartitionPropertyCodeProcessorCount = 0x00001fff +} WHV_PARTITION_PROPERTY_CODE; -#endif /* __x86_64__ || __aarch64__ */ +#if defined(__x86_64__) -typedef union DECLSPEC_ALIGN(16) WHV_UINT128 { +typedef union WHV_PROCESSOR_XSAVE_FEATURES { __C89_NAMELESS struct { - UINT64 Low64; - UINT64 High64; + UINT64 XsaveSupport : 1; + UINT64 XsaveoptSupport : 1; + UINT64 AvxSupport : 1; + UINT64 Avx2Support : 1; + UINT64 FmaSupport : 1; + UINT64 MpxSupport : 1; + UINT64 Avx512Support : 1; + UINT64 Avx512DQSupport : 1; + UINT64 Avx512CDSupport : 1; + UINT64 Avx512BWSupport : 1; + UINT64 Avx512VLSupport : 1; + UINT64 XsaveCompSupport : 1; + UINT64 XsaveSupervisorSupport : 1; + UINT64 Xcr1Support : 1; + UINT64 Avx512BitalgSupport : 1; + UINT64 Avx512IfmaSupport : 1; + UINT64 Avx512VBmiSupport : 1; + UINT64 Avx512VBmi2Support : 1; + UINT64 Avx512VnniSupport : 1; + UINT64 GfniSupport : 1; + UINT64 VaesSupport : 1; + UINT64 Avx512VPopcntdqSupport : 1; + UINT64 VpclmulqdqSupport : 1; + UINT64 Avx512Bf16Support : 1; + UINT64 Avx512Vp2IntersectSupport : 1; + UINT64 Avx512Fp16Support : 1; + UINT64 XfdSupport : 1; + UINT64 AmxTileSupport : 1; + UINT64 AmxBf16Support : 1; + UINT64 AmxInt8Support : 1; + UINT64 AvxVnniSupport : 1; + UINT64 AvxIfmaSupport : 1; + UINT64 AvxNeConvertSupport : 1; + UINT64 AvxVnniInt8Support : 1; + UINT64 AvxVnniInt16Support : 1; + UINT64 Avx10_1_256Support : 1; + UINT64 Avx10_1_512Support : 1; + UINT64 AmxFp16Support : 1; + UINT64 Reserved : 26; }; - UINT32 Dword[4]; -} WHV_UINT128; + UINT64 AsUINT64; +} WHV_PROCESSOR_XSAVE_FEATURES, *PWHV_PROCESSOR_XSAVE_FEATURES; -C_ASSERT(sizeof(WHV_UINT128) == 16); +C_ASSERT(sizeof(WHV_PROCESSOR_XSAVE_FEATURES) == sizeof(UINT64)); -typedef union WHV_X64_FP_REGISTER { +typedef union WHV_PROCESSOR_PERFMON_FEATURES { __C89_NAMELESS struct { - UINT64 Mantissa; - UINT64 BiasedExponent:15; - UINT64 Sign:1; - UINT64 Reserved:48; + UINT64 PmuSupport : 1; + UINT64 LbrSupport : 1; + UINT64 Reserved : 62; }; - WHV_UINT128 AsUINT128; -} WHV_X64_FP_REGISTER; + UINT64 AsUINT64; +} WHV_PROCESSOR_PERFMON_FEATURES, *PWHV_PROCESSOR_PERFMON_FEATURES; -C_ASSERT(sizeof(WHV_X64_FP_REGISTER) == 16); +C_ASSERT(sizeof(WHV_PROCESSOR_PERFMON_FEATURES) == 8); -typedef union WHV_X64_FP_CONTROL_STATUS_REGISTER { +typedef union WHV_X64_MSR_EXIT_BITMAP { + UINT64 AsUINT64; __C89_NAMELESS struct { - UINT16 FpControl; - UINT16 FpStatus; - UINT8 FpTag; - UINT8 Reserved; - UINT16 LastFpOp; - __C89_NAMELESS union { - UINT64 LastFpRip; - __C89_NAMELESS struct { - UINT32 LastFpEip; - UINT16 LastFpCs; - UINT16 Reserved2; - }; - }; + UINT64 UnhandledMsrs : 1; + UINT64 TscMsrWrite : 1; + UINT64 TscMsrRead : 1; + UINT64 ApicBaseMsrWrite : 1; + UINT64 MiscEnableMsrRead : 1; + UINT64 McUpdatePatchLevelMsrRead : 1; + UINT64 Reserved : 58; }; - WHV_UINT128 AsUINT128; -} WHV_X64_FP_CONTROL_STATUS_REGISTER; - -C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16); +} WHV_X64_MSR_EXIT_BITMAP; -typedef union WHV_X64_XMM_CONTROL_STATUS_REGISTER { - __C89_NAMELESS struct { - __C89_NAMELESS union { - UINT64 LastFpRdp; - __C89_NAMELESS struct { - UINT32 LastFpDp; - UINT16 LastFpDs; - UINT16 Reserved; - }; - }; - UINT32 XmmStatusControl; - UINT32 XmmStatusControlMask; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_XMM_CONTROL_STATUS_REGISTER; +C_ASSERT(sizeof(WHV_X64_MSR_EXIT_BITMAP) == sizeof(UINT64)); -C_ASSERT(sizeof(WHV_X64_FP_CONTROL_STATUS_REGISTER) == 16); +#endif /* defined(__x86_64__) */ -typedef struct WHV_X64_SEGMENT_REGISTER { - UINT64 Base; - UINT32 Limit; - UINT16 Selector; - __C89_NAMELESS union { - __C89_NAMELESS struct { - UINT16 SegmentType:4; - UINT16 NonSystemSegment:1; - UINT16 DescriptorPrivilegeLevel:2; - UINT16 Present:1; - UINT16 Reserved:4; - UINT16 Available:1; - UINT16 Long:1; - UINT16 Default:1; - UINT16 Granularity:1; - }; - UINT16 Attributes; - }; -} WHV_X64_SEGMENT_REGISTER; +typedef enum WHV_MAP_GPA_RANGE_FLAGS { + WHvMapGpaRangeFlagNone = 0x00000000, + WHvMapGpaRangeFlagRead = 0x00000001, + WHvMapGpaRangeFlagWrite = 0x00000002, + WHvMapGpaRangeFlagExecute = 0x00000004, + WHvMapGpaRangeFlagTrackDirtyPages = 0x00000008 +} WHV_MAP_GPA_RANGE_FLAGS; -C_ASSERT(sizeof(WHV_X64_SEGMENT_REGISTER) == 16); +DEFINE_ENUM_FLAG_OPERATORS(WHV_MAP_GPA_RANGE_FLAGS); -typedef struct WHV_X64_TABLE_REGISTER { - UINT16 Pad[3]; - UINT16 Limit; - UINT64 Base; -} WHV_X64_TABLE_REGISTER; +typedef enum WHV_TRANSLATE_GVA_FLAGS { + WHvTranslateGvaFlagNone = 0x00000000, + WHvTranslateGvaFlagValidateRead = 0x00000001, + WHvTranslateGvaFlagValidateWrite = 0x00000002, + WHvTranslateGvaFlagValidateExecute = 0x00000004 +#if defined(__x86_64__) + ,WHvTranslateGvaFlagPrivilegeExempt = 0x00000008 +#endif + ,WHvTranslateGvaFlagSetPageTableBits = 0x00000010 +#if defined(__x86_64__) + ,WHvTranslateGvaFlagEnforceSmap = 0x00000100 + ,WHvTranslateGvaFlagOverrideSmap = 0x00000200 +#endif +} WHV_TRANSLATE_GVA_FLAGS; -C_ASSERT(sizeof(WHV_X64_TABLE_REGISTER) == 16); +DEFINE_ENUM_FLAG_OPERATORS(WHV_TRANSLATE_GVA_FLAGS); -typedef union WHV_X64_INTERRUPT_STATE_REGISTER { +typedef union WHV_TRANSLATE_GVA_2_FLAGS { __C89_NAMELESS struct { - UINT64 InterruptShadow:1; - UINT64 NmiMasked:1; - UINT64 Reserved:62; + UINT64 ValidateRead : 1; + UINT64 ValidateWrite : 1; + UINT64 ValidateExecute : 1; +#if defined(__x86_64__) + UINT64 PrivilegeExempt : 1; +#else + UINT64 Reserved0 : 1; +#endif + UINT64 SetPageTableBits : 1; + UINT64 Reserved1 : 3; +#if defined(__x86_64__) + UINT64 EnforceSmap : 1; + UINT64 OverrideSmap : 1; +#else + UINT64 Reserved2 : 1; + UINT64 Reserved3 : 1; +#endif + UINT64 Reserved4 : 46; + UINT64 InputVtl : 8; }; UINT64 AsUINT64; -} WHV_X64_INTERRUPT_STATE_REGISTER; +} WHV_TRANSLATE_GVA_2_FLAGS; -C_ASSERT(sizeof(WHV_X64_INTERRUPT_STATE_REGISTER) == 8); +C_ASSERT(sizeof(WHV_TRANSLATE_GVA_2_FLAGS) == 8); -typedef union WHV_X64_PENDING_INTERRUPTION_REGISTER { - __C89_NAMELESS struct { - UINT32 InterruptionPending:1; - UINT32 InterruptionType:3; - UINT32 DeliverErrorCode:1; - UINT32 InstructionLength:4; - UINT32 NestedEvent:1; - UINT32 Reserved:6; - UINT32 InterruptionVector:16; - UINT32 ErrorCode; - }; - UINT64 AsUINT64; -} WHV_X64_PENDING_INTERRUPTION_REGISTER; +typedef enum WHV_TRANSLATE_GVA_RESULT_CODE { + WHvTranslateGvaResultSuccess = 0, + WHvTranslateGvaResultPageNotPresent = 1, + WHvTranslateGvaResultPrivilegeViolation = 2, + WHvTranslateGvaResultInvalidPageTableFlags = 3, + WHvTranslateGvaResultGpaUnmapped = 4, + WHvTranslateGvaResultGpaNoReadAccess = 5, + WHvTranslateGvaResultGpaNoWriteAccess = 6, + WHvTranslateGvaResultGpaIllegalOverlayAccess = 7, + WHvTranslateGvaResultIntercept = 8 +} WHV_TRANSLATE_GVA_RESULT_CODE; -C_ASSERT(sizeof(WHV_X64_PENDING_INTERRUPTION_REGISTER) == sizeof(UINT64)); +typedef struct WHV_TRANSLATE_GVA_RESULT { + WHV_TRANSLATE_GVA_RESULT_CODE ResultCode; + UINT32 Reserved; +} WHV_TRANSLATE_GVA_RESULT; -typedef union WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER { +C_ASSERT(sizeof(WHV_TRANSLATE_GVA_RESULT) == 8); + +#define WHV_READ_WRITE_GPA_RANGE_MAX_SIZE 16 + +typedef struct WHV_MEMORY_RANGE_ENTRY { + UINT64 GuestAddress; + UINT64 SizeInBytes; +} WHV_MEMORY_RANGE_ENTRY; + +C_ASSERT(sizeof(WHV_MEMORY_RANGE_ENTRY) == 16); + +typedef union WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS { + UINT32 AsUINT32; __C89_NAMELESS struct { -#if defined(__x86_64__) - UINT64 NmiNotification:1; - UINT64 InterruptNotification:1; - UINT64 InterruptPriority:4; - UINT64 Reserved:42; -#elif defined(__aarch64__) - UINT64 Reserved:48; -#endif - UINT64 Sint:16; + UINT32 Prefetch:1; + UINT32 AvoidHardFaults:1; + UINT32 Reserved:30; }; - UINT64 AsUINT64; -} WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER, WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER; +} WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS; + +C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS) == 4); + +typedef enum WHV_MEMORY_ACCESS_TYPE { + WHvMemoryAccessRead = 0, + WHvMemoryAccessWrite = 1, + WHvMemoryAccessExecute = 2 +} WHV_MEMORY_ACCESS_TYPE; + +typedef struct WHV_ADVISE_GPA_RANGE_POPULATE { + WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS Flags; + WHV_MEMORY_ACCESS_TYPE AccessType; +} WHV_ADVISE_GPA_RANGE_POPULATE; + +C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE_POPULATE) == 8); + +typedef union WHV_ADVISE_GPA_RANGE { + WHV_ADVISE_GPA_RANGE_POPULATE Populate; +} WHV_ADVISE_GPA_RANGE; -C_ASSERT(sizeof(WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER) == sizeof(UINT64)); +C_ASSERT(sizeof(WHV_ADVISE_GPA_RANGE) == 8); -typedef enum WHV_X64_PENDING_EVENT_TYPE { - WHvX64PendingEventException = 0, - WHvX64PendingEventExtInt = 5, - WHvX64PendingEventSvmNestedExit = 7, - WHvX64PendingEventVmxNestedExit = 8 -} WHV_X64_PENDING_EVENT_TYPE; +typedef enum WHV_CACHE_TYPE { + WHvCacheTypeUncached = 0, + WHvCacheTypeWriteCombining = 1, + WHvCacheTypeWriteThrough = 4, +#ifdef __x86_64__ + WHvCacheTypeWriteProtected = 5, +#endif + WHvCacheTypeWriteBack = 6 +} WHV_CACHE_TYPE; -typedef union WHV_X64_PENDING_EXCEPTION_EVENT { +typedef union WHV_ACCESS_GPA_CONTROLS { + UINT64 AsUINT64; __C89_NAMELESS struct { - UINT32 EventPending : 1; - UINT32 EventType : 3; - UINT32 Reserved0 : 4; - UINT32 DeliverErrorCode : 1; - UINT32 Reserved1 : 7; - UINT32 Vector : 16; - UINT32 ErrorCode; - UINT64 ExceptionParameter; + WHV_CACHE_TYPE CacheType; + WHV_INPUT_VTL InputVtl; + UINT8 Reserved; + UINT16 Reserved1; }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_EXCEPTION_EVENT; +} WHV_ACCESS_GPA_CONTROLS; -C_ASSERT(sizeof(WHV_X64_PENDING_EXCEPTION_EVENT) == sizeof(WHV_UINT128)); +C_ASSERT(sizeof(WHV_ACCESS_GPA_CONTROLS) == 8); -typedef union WHV_X64_PENDING_EXT_INT_EVENT { - __C89_NAMELESS struct { - UINT64 EventPending : 1; - UINT64 EventType : 3; - UINT64 Reserved0 : 4; - UINT64 Vector : 8; - UINT64 Reserved1 : 48; - UINT64 Reserved2; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_EXT_INT_EVENT; +typedef struct WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP { + UINT32 IsSupported:1; + UINT32 Reserved:31; + UINT32 HighestFrequencyMhz; + UINT32 NominalFrequencyMhz; + UINT32 LowestFrequencyMhz; + UINT32 FrequencyStepMhz; +} WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP; -C_ASSERT(sizeof(WHV_X64_PENDING_EXT_INT_EVENT) == sizeof(WHV_UINT128)); +C_ASSERT(sizeof(WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP) == 20); -typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 { +typedef union WHV_SCHEDULER_FEATURES { __C89_NAMELESS struct { - UINT64 EventPending : 1; - UINT64 EventType : 4; - UINT64 Reserved0 : 3; - UINT64 InstructionBytesValid : 1; - UINT64 Reserved1 : 55; - UINT64 ExitCode; + UINT64 CpuReserve: 1; + UINT64 CpuCap: 1; + UINT64 CpuWeight: 1; + UINT64 CpuGroupId: 1; + UINT64 DisableSmt: 1; + UINT64 Reserved: 59; }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0; + UINT64 AsUINT64; +} WHV_SCHEDULER_FEATURES; -typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 { - __C89_NAMELESS struct { - UINT64 ExitInfo1; - UINT64 ExitInfo2; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1; +C_ASSERT(sizeof(WHV_SCHEDULER_FEATURES) == 8); -typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 { - __C89_NAMELESS struct { - UINT64 NextRip; - UINT8 InstructionBytesFetchedCount; - UINT8 InstructionBytes[7]; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2; +typedef union WHV_CAPABILITY { + WINBOOL HypervisorPresent; + WHV_CAPABILITY_FEATURES Features; + WHV_EXTENDED_VM_EXITS ExtendedVmExits; + WHV_PROCESSOR_VENDOR ProcessorVendor; + WHV_PROCESSOR_FEATURES ProcessorFeatures; + WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks; + UINT8 ProcessorClFlushSize; + UINT64 ProcessorClockFrequency; + WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks; + WHV_ADVISE_GPA_RANGE_POPULATE_FLAGS GpaRangePopulateFlags; + WHV_CAPABILITY_PROCESSOR_FREQUENCY_CAP ProcessorFrequencyCap; + WHV_SCHEDULER_FEATURES SchedulerFeatures; + UINT32 PhysicalAddressWidth; + UINT64 NestedFeatureRegister; +#if defined(__x86_64__) + WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures; + UINT64 InterruptClockFrequency; + WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures; + WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap; + UINT64 ExceptionExitBitmap; +#elif defined (__aarch64__) + UINT32 GicLpiIntIdBits; + UINT32 MaxSveVectorLength; +#endif +} WHV_CAPABILITY; -typedef union WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 { - __C89_NAMELESS struct { - UINT8 InstructionBytes[8]; - UINT64 Reserved2; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3; +#if defined(__x86_64__) -C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0) == 16); -C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1) == 16); -C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2) == 16); -C_ASSERT(sizeof(WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3) == 16); +typedef struct WHV_X64_CPUID_RESULT { + UINT32 Function; + UINT32 Reserved[3]; + UINT32 Eax; + UINT32 Ebx; + UINT32 Ecx; + UINT32 Edx; +} WHV_X64_CPUID_RESULT; -typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 { - __C89_NAMELESS struct { - UINT32 EventPending : 1; - UINT32 EventType : 4; - UINT32 Reserved0 : 27; - UINT32 ExitReason; - UINT64 ExitQualification; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0; +C_ASSERT(sizeof(WHV_X64_CPUID_RESULT) == 32); -typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 { - __C89_NAMELESS struct { - UINT32 InstructionLength; - UINT32 InstructionInfo; - UINT32 ExitInterruptionInfo; - UINT32 ExitExceptionErrorCode; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1; +typedef enum WHV_X64_CPUID_RESULT2_FLAGS { + WHvX64CpuidResult2FlagSubleafSpecific = 0x00000001, + WHvX64CpuidResult2FlagVpSpecific = 0x00000002 +} WHV_X64_CPUID_RESULT2_FLAGS; -typedef union WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 { - __C89_NAMELESS struct { - UINT64 GuestLinearAddress; - UINT64 GuestPhysicalAddress; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2; +DEFINE_ENUM_FLAG_OPERATORS(WHV_X64_CPUID_RESULT2_FLAGS); -C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0) == 16); -C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1) == 16); -C_ASSERT(sizeof(WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2) == 16); +typedef struct WHV_CPUID_OUTPUT { + UINT32 Eax; + UINT32 Ebx; + UINT32 Ecx; + UINT32 Edx; +} WHV_CPUID_OUTPUT; -typedef union WHV_X64_NESTED_INVEPT_REGISTER { - __C89_NAMELESS struct { - UINT8 Type; - UINT8 Reserved[7]; - UINT64 Eptp; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_NESTED_INVEPT_REGISTER; +C_ASSERT(sizeof(WHV_CPUID_OUTPUT) == 16); -C_ASSERT(sizeof(WHV_X64_NESTED_INVEPT_REGISTER) == 16); +typedef struct WHV_X64_CPUID_RESULT2 { + UINT32 Function; + UINT32 Index; + UINT32 VpIndex; + WHV_X64_CPUID_RESULT2_FLAGS Flags; + WHV_CPUID_OUTPUT Output; + WHV_CPUID_OUTPUT Mask; +} WHV_X64_CPUID_RESULT2; -typedef union WHV_X64_NESTED_INVVPID_REGISTER { - __C89_NAMELESS struct { - UINT8 Type; - UINT8 Reserved[3]; - UINT32 Vpid; - UINT64 LinearAddress; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_NESTED_INVVPID_REGISTER; +C_ASSERT(sizeof(WHV_X64_CPUID_RESULT2) == 48); -C_ASSERT(sizeof(WHV_X64_NESTED_INVVPID_REGISTER) == 16); +typedef struct WHV_MSR_ACTION_ENTRY { + UINT32 Index; + UINT8 ReadAction; + UINT8 WriteAction; + UINT16 Reserved; +} WHV_MSR_ACTION_ENTRY; -typedef union WHV_X64_NESTED_GUEST_STATE { - __C89_NAMELESS struct { - UINT64 NestedVirtActive : 1; - UINT64 NestedGuestMode : 1; - UINT64 VmEntryPending : 1; - UINT64 Reserved0 : 61; - UINT64 Reserved1; - }; - WHV_UINT128 AsUINT128; -} WHV_X64_NESTED_GUEST_STATE; +C_ASSERT(sizeof(WHV_MSR_ACTION_ENTRY) == 8); -C_ASSERT(sizeof(WHV_X64_NESTED_GUEST_STATE) == 16); +typedef enum WHV_MSR_ACTION { + WHvMsrActionArchitectureDefault = 0, + WHvMsrActionIgnoreWriteReadZero = 1, + WHvMsrActionExit = 2 +} WHV_MSR_ACTION; -typedef union WHV_INTERNAL_ACTIVITY_REGISTER { - __C89_NAMELESS struct { - UINT64 StartupSuspend : 1; - UINT64 HaltSuspend : 1; - UINT64 IdleSuspend : 1; - UINT64 Reserved :61; - }; - UINT64 AsUINT64; -} WHV_INTERNAL_ACTIVITY_REGISTER; +typedef enum WHV_EXCEPTION_TYPE { + WHvX64ExceptionTypeDivideErrorFault = 0x0, + WHvX64ExceptionTypeDebugTrapOrFault = 0x1, + WHvX64ExceptionTypeBreakpointTrap = 0x3, + WHvX64ExceptionTypeOverflowTrap = 0x4, + WHvX64ExceptionTypeBoundRangeFault = 0x5, + WHvX64ExceptionTypeInvalidOpcodeFault = 0x6, + WHvX64ExceptionTypeDeviceNotAvailableFault = 0x7, + WHvX64ExceptionTypeDoubleFaultAbort = 0x8, + WHvX64ExceptionTypeInvalidTaskStateSegmentFault = 0x0A, + WHvX64ExceptionTypeSegmentNotPresentFault = 0x0B, + WHvX64ExceptionTypeStackFault = 0x0C, + WHvX64ExceptionTypeGeneralProtectionFault = 0x0D, + WHvX64ExceptionTypePageFault = 0x0E, + WHvX64ExceptionTypeFloatingPointErrorFault = 0x10, + WHvX64ExceptionTypeAlignmentCheckFault = 0x11, + WHvX64ExceptionTypeMachineCheckAbort = 0x12, + WHvX64ExceptionTypeSimdFloatingPointFault = 0x13, + WHvX64ExceptionTypeControlProtectionFault = 0x15 +} WHV_EXCEPTION_TYPE; + +typedef enum WHV_X64_LOCAL_APIC_EMULATION_MODE { + WHvX64LocalApicEmulationModeNone, + WHvX64LocalApicEmulationModeXApic, + WHvX64LocalApicEmulationModeX2Apic +} WHV_X64_LOCAL_APIC_EMULATION_MODE; -C_ASSERT(sizeof(WHV_INTERNAL_ACTIVITY_REGISTER) == sizeof(UINT64)); +#elif defined(__aarch64__) -typedef union WHV_X64_PENDING_DEBUG_EXCEPTION { - UINT64 AsUINT64; - __C89_NAMELESS struct { - UINT64 Breakpoint0 : 1; - UINT64 Breakpoint1 : 1; - UINT64 Breakpoint2 : 1; - UINT64 Breakpoint3 : 1; - UINT64 SingleStep : 1; - UINT64 Reserved0 : 59; - }; -} WHV_X64_PENDING_DEBUG_EXCEPTION; +typedef enum WHV_ARM64_IC_EMULATION_MODE { + WHvArm64IcEmulationModeNone = 0, + WHvArm64IcEmulationModeGicV3 +} WHV_ARM64_IC_EMULATION_MODE; -C_ASSERT(sizeof(WHV_X64_PENDING_DEBUG_EXCEPTION) == sizeof(UINT64)); +typedef UINT32 WHV_ARM64_INTERRUPT_VECTOR; -typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT { - UINT16 DeliverableSints; - UINT16 Reserved1; - UINT32 Reserved2; -} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT; +typedef struct WHV_ARM64_IC_GIC_V3_PARAMETERS { + WHV_GUEST_PHYSICAL_ADDRESS GicdBaseAddress; + WHV_GUEST_PHYSICAL_ADDRESS GitsTranslaterBaseAddress; + UINT32 Reserved; + UINT32 GicLpiIntIdBits; + WHV_ARM64_INTERRUPT_VECTOR GicPpiOverflowInterruptFromCntv; + WHV_ARM64_INTERRUPT_VECTOR GicPpiPerformanceMonitorsInterrupt; + UINT32 Reserved1[6]; +} WHV_ARM64_IC_GIC_V3_PARAMETERS; -C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 8); +C_ASSERT(sizeof(WHV_ARM64_IC_GIC_V3_PARAMETERS) == 56); -typedef union WHV_REGISTER_VALUE { - WHV_UINT128 Reg128; - UINT64 Reg64; - UINT32 Reg32; - UINT16 Reg16; - UINT8 Reg8; - WHV_INTERNAL_ACTIVITY_REGISTER InternalActivity; - WHV_DELIVERABILITY_NOTIFICATIONS_REGISTER DeliverabilityNotifications; +typedef struct WHV_ARM64_IC_PARAMETERS { + WHV_ARM64_IC_EMULATION_MODE EmulationMode; + UINT32 Reserved; + __C89_NAMELESS union { + WHV_ARM64_IC_GIC_V3_PARAMETERS GicV3Parameters; + }; +} WHV_ARM64_IC_PARAMETERS; + +C_ASSERT(sizeof(WHV_ARM64_IC_PARAMETERS) == 64); + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +typedef union WHV_PARTITION_PROPERTY { + WHV_EXTENDED_VM_EXITS ExtendedVmExits; + WHV_PROCESSOR_FEATURES ProcessorFeatures; + WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS SyntheticProcessorFeaturesBanks; + UINT8 ProcessorClFlushSize; + UINT32 ProcessorCount; + WINBOOL SeparateSecurityDomain; + WINBOOL NestedVirtualization; + UINT64 ProcessorClockFrequency; + WHV_PROCESSOR_FEATURES_BANKS ProcessorFeaturesBanks; + UINT64 ReferenceTime; + USHORT PrimaryNumaNode; + UINT32 CpuReserve; + UINT32 CpuCap; + UINT32 CpuWeight; + UINT64 CpuGroupId; + UINT32 ProcessorFrequencyCap; + WINBOOL AllowDeviceAssignment; + WINBOOL DisableSmt; + UINT32 PhysicalAddressWidth; #if defined(__x86_64__) - WHV_X64_FP_REGISTER Fp; - WHV_X64_FP_CONTROL_STATUS_REGISTER FpControlStatus; - WHV_X64_XMM_CONTROL_STATUS_REGISTER XmmControlStatus; - WHV_X64_SEGMENT_REGISTER Segment; - WHV_X64_TABLE_REGISTER Table; - WHV_X64_INTERRUPT_STATE_REGISTER InterruptState; - WHV_X64_PENDING_INTERRUPTION_REGISTER PendingInterruption; - WHV_X64_PENDING_EXCEPTION_EVENT ExceptionEvent; - WHV_X64_PENDING_EXT_INT_EVENT ExtIntEvent; - WHV_X64_PENDING_DEBUG_EXCEPTION PendingDebugException; - WHV_X64_NESTED_GUEST_STATE NestedState; - WHV_X64_NESTED_INVEPT_REGISTER InvEpt; - WHV_X64_NESTED_INVVPID_REGISTER InvVpid; - WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT0 SvmNestedExit0; - WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT1 SvmNestedExit1; - WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT2 SvmNestedExit2; - WHV_X64_PENDING_SVM_NESTED_EXIT_EVENT3 SvmNestedExit3; - WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT0 VmxNestedExit0; - WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT1 VmxNestedExit1; - WHV_X64_PENDING_VMX_NESTED_EXIT_EVENT2 VmxNestedExit2; + WHV_PROCESSOR_XSAVE_FEATURES ProcessorXsaveFeatures; + UINT32 CpuidExitList[1]; + UINT64 ExceptionExitBitmap; + WINBOOL ApicRemoteRead; + WHV_X64_MSR_EXIT_BITMAP X64MsrExitBitmap; + WHV_PROCESSOR_PERFMON_FEATURES ProcessorPerfmonFeatures; + UINT64 InterruptClockFrequency; + WHV_X64_CPUID_RESULT CpuidResultList[1]; + WHV_X64_CPUID_RESULT2 CpuidResultList2[1]; + WHV_MSR_ACTION_ENTRY MsrActionList[1]; + WHV_MSR_ACTION UnimplementedMsrAction; + WHV_X64_LOCAL_APIC_EMULATION_MODE LocalApicEmulationMode; +#elif defined(__aarch64__) + WHV_ARM64_IC_PARAMETERS Arm64IcParameters; #endif -} WHV_REGISTER_VALUE; +} WHV_PARTITION_PROPERTY; -C_ASSERT(sizeof(WHV_REGISTER_VALUE) == 16); +#if defined(__x86_64__) typedef enum WHV_RUN_VP_EXIT_REASON { WHvRunVpExitReasonNone = 0x00000000, @@ -1789,6 +2178,26 @@ typedef enum WHV_RUN_VP_EXIT_REASON { WHvRunVpExitReasonCanceled = 0x00002001 } WHV_RUN_VP_EXIT_REASON; +#elif defined(__aarch64__) + +typedef enum WHV_RUN_VP_EXIT_REASON { + WHvRunVpExitReasonNone = 0x00000000, + WHvRunVpExitReasonUnmappedGpa = 0x80000000, + WHvRunVpExitReasonGpaIntercept = 0x80000001, + WHvRunVpExitReasonUnrecoverableException = 0x80000021, + WHvRunVpExitReasonInvalidVpRegisterValue = 0x80000020, + WHvRunVpExitReasonUnsupportedFeature = 0x80000022, + WHvRunVpExitReasonSynicSintDeliverable = 0x80000062, + WHvMessageTypeRegisterIntercept = 0x80010006, + WHvRunVpExitReasonArm64Reset = 0x8001000c, + WHvRunVpExitReasonHypercall = 0x80000050, + WHvRunVpExitReasonCanceled = 0xFFFFFFFF +} WHV_RUN_VP_EXIT_REASON; + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +#if defined(__x86_64__) + typedef union WHV_X64_VP_EXECUTION_STATE { __C89_NAMELESS struct { UINT16 Cpl : 2; @@ -1806,7 +2215,7 @@ typedef union WHV_X64_VP_EXECUTION_STATE { C_ASSERT(sizeof(WHV_X64_VP_EXECUTION_STATE) == sizeof(UINT16)); -typedef struct WHV_VP_EXIT_CONTEXT { +typedef struct WHV_X64_VP_EXIT_CONTEXT { WHV_X64_VP_EXECUTION_STATE ExecutionState; UINT8 InstructionLength : 4; UINT8 Cr8 : 4; @@ -1815,9 +2224,17 @@ typedef struct WHV_VP_EXIT_CONTEXT { WHV_X64_SEGMENT_REGISTER Cs; UINT64 Rip; UINT64 Rflags; -} WHV_VP_EXIT_CONTEXT; +} WHV_X64_VP_EXIT_CONTEXT, WHV_VP_EXIT_CONTEXT; + +C_ASSERT(sizeof(WHV_X64_VP_EXIT_CONTEXT) == 40); + +typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT { + UINT16 DeliverableSints; + UINT16 Reserved1; + UINT32 Reserved2; +} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT; -C_ASSERT(sizeof(WHV_VP_EXIT_CONTEXT) == 40); +C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 8); typedef union WHV_MEMORY_ACCESS_INFO { __C89_NAMELESS struct { @@ -1853,7 +2270,7 @@ typedef union WHV_X64_IO_PORT_ACCESS_INFO { UINT32 AsUINT32; } WHV_X64_IO_PORT_ACCESS_INFO; -C_ASSERT(sizeof(WHV_X64_IO_PORT_ACCESS_INFO) == sizeof(UINT32)); +C_ASSERT(sizeof(WHV_X64_IO_PORT_ACCESS_INFO) == 4); typedef struct WHV_X64_IO_PORT_ACCESS_CONTEXT { UINT8 InstructionByteCount; @@ -1913,7 +2330,7 @@ typedef union WHV_VP_EXCEPTION_INFO { UINT32 AsUINT32; } WHV_VP_EXCEPTION_INFO; -C_ASSERT(sizeof(WHV_VP_EXCEPTION_INFO) == sizeof(UINT32)); +C_ASSERT(sizeof(WHV_VP_EXCEPTION_INFO) == 4); typedef struct WHV_VP_EXCEPTION_CONTEXT { UINT8 InstructionByteCount; @@ -1941,16 +2358,128 @@ typedef struct WHV_X64_UNSUPPORTED_FEATURE_CONTEXT { C_ASSERT(sizeof(WHV_X64_UNSUPPORTED_FEATURE_CONTEXT) == 16); +#elif defined(__aarch64__) + +typedef union WHV_VP_EXECUTION_STATE { + UINT16 AsUINT16; + __C89_NAMELESS struct { + UINT16 Cpl : 2; + UINT16 DebugActive : 1; + UINT16 InterruptionPending : 1; + UINT16 Vtl : 4; + UINT16 VirtualizationFaultActive : 1; + UINT16 Reserved : 7; + }; +} WHV_VP_EXECUTION_STATE; + +C_ASSERT(sizeof(WHV_VP_EXECUTION_STATE) == 2); + +typedef struct WHV_INTERCEPT_MESSAGE_HEADER { + UINT32 VpIndex; + UINT8 InstructionLength; + UINT8 InterceptAccessType; + WHV_VP_EXECUTION_STATE ExecutionState; + UINT64 Pc; + UINT64 Cpsr; +} WHV_INTERCEPT_MESSAGE_HEADER; + +C_ASSERT(sizeof(WHV_INTERCEPT_MESSAGE_HEADER) == 24); + +typedef union WHV_MEMORY_ACCESS_INFO { + UINT8 AsUINT8; + __C89_NAMELESS struct { + UINT8 GvaValid : 1; + UINT8 GvaGpaValid : 1; + UINT8 HypercallOutputPending : 1; + UINT8 Reserved : 5; + }; +} WHV_MEMORY_ACCESS_INFO; + +typedef struct WHV_MEMORY_ACCESS_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; + UINT32 Reserved0; + UINT8 InstructionByteCount; + WHV_MEMORY_ACCESS_INFO AccessInfo; + UINT16 Reserved1; + UINT8 InstructionBytes[4]; + UINT32 Reserved2; + UINT64 Gva; + UINT64 Gpa; + UINT64 Syndrome; +} WHV_MEMORY_ACCESS_CONTEXT; + +C_ASSERT(sizeof(WHV_MEMORY_ACCESS_CONTEXT) == 64); + +typedef struct WHV_UNRECOVERABLE_EXCEPTION_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; +} WHV_UNRECOVERABLE_EXCEPTION_CONTEXT; + +C_ASSERT(sizeof(WHV_UNRECOVERABLE_EXCEPTION_CONTEXT) == 24); + +typedef struct WHV_INVALID_VP_REGISTER_CONTEXT { + UINT32 VpIndex; + UINT32 Reserved; +} WHV_INVALID_VP_REGISTER_CONTEXT; + +C_ASSERT(sizeof(WHV_INVALID_VP_REGISTER_CONTEXT) == 8); + +typedef struct WHV_SYNIC_SINT_DELIVERABLE_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; + UINT16 DeliverableSints; + UINT16 Reserved1; + UINT32 Reserved2; +} WHV_SYNIC_SINT_DELIVERABLE_CONTEXT; + +C_ASSERT(sizeof(WHV_SYNIC_SINT_DELIVERABLE_CONTEXT) == 32); + +typedef union WHV_REGISTER_ACCESS_INFO { + WHV_REGISTER_VALUE SourceValue; + WHV_REGISTER_NAME DestinationRegister; +} WHV_REGISTER_ACCESS_INFO; + +typedef struct WHV_REGISTER_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; + __C89_NAMELESS struct { + UINT8 IsMemoryOp:1; + UINT8 Reserved:7; + }; + UINT8 Reserved8; + UINT16 Reserved16; + WHV_REGISTER_NAME RegisterName; + WHV_REGISTER_ACCESS_INFO AccessInfo; +} WHV_REGISTER_CONTEXT; + +C_ASSERT(sizeof(WHV_REGISTER_CONTEXT) == 48); + +typedef enum WHV_ARM64_RESET_TYPE { + WHvArm64ResetTypePowerOff = 0, + WHvArm64ResetTypeReboot +} WHV_ARM64_RESET_TYPE; + +typedef struct WHV_ARM64_RESET_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; + WHV_ARM64_RESET_TYPE ResetType; + UINT32 Reserved; +} WHV_ARM64_RESET_CONTEXT; + +C_ASSERT(sizeof(WHV_ARM64_RESET_CONTEXT) == 32); + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + typedef enum WHV_RUN_VP_CANCEL_REASON { - WhvRunVpCancelReasonUser = 0 + WHvRunVpCancelReasonUser = 0 } WHV_RUN_VP_CANCEL_REASON; +#define WhvRunVpCancelReasonUser WHvRunVpCancelReasonUser + typedef struct WHV_RUN_VP_CANCELED_CONTEXT { WHV_RUN_VP_CANCEL_REASON CancelReason; } WHV_RUN_VP_CANCELED_CONTEXT; C_ASSERT(sizeof(WHV_RUN_VP_CANCELED_CONTEXT) == 4); +#if defined(__x86_64__) + typedef enum WHV_X64_PENDING_INTERRUPTION_TYPE { WHvX64PendingInterrupt = 0, WHvX64PendingNmi = 2, @@ -1995,9 +2524,13 @@ typedef struct WHV_X64_APIC_SMI_CONTEXT { C_ASSERT(sizeof(WHV_X64_APIC_SMI_CONTEXT) == 8); +#endif /* defined(__x86_64__) */ + +#if defined(__x86_64__) + #define WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS 6 -typedef struct _WHV_HYPERCALL_CONTEXT { +typedef struct WHV_X64_HYPERCALL_CONTEXT { UINT64 Rax; UINT64 Rbx; UINT64 Rcx; @@ -2008,10 +2541,24 @@ typedef struct _WHV_HYPERCALL_CONTEXT { UINT64 Reserved0; WHV_UINT128 XmmRegisters[WHV_HYPERCALL_CONTEXT_MAX_XMM_REGISTERS]; UINT64 Reserved1[2]; -} WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT; +} WHV_X64_HYPERCALL_CONTEXT, WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT; C_ASSERT(sizeof(WHV_HYPERCALL_CONTEXT) == 176); +#elif defined(__aarch64__) + +typedef struct WHV_ARM64_HYPERCALL_CONTEXT { + WHV_INTERCEPT_MESSAGE_HEADER Header; + UINT16 Immediate; + UINT16 Reserved1; + UINT32 Reserved2; + UINT64 X[18]; +} WHV_ARM64_HYPERCALL_CONTEXT, WHV_HYPERCALL_CONTEXT, *PWHV_HYPERCALL_CONTEXT; + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +#if defined(__x86_64__) + typedef struct WHV_X64_APIC_INIT_SIPI_CONTEXT { UINT64 ApicIcr; } WHV_X64_APIC_INIT_SIPI_CONTEXT; @@ -2034,30 +2581,51 @@ typedef struct WHV_X64_APIC_WRITE_CONTEXT { C_ASSERT(sizeof(WHV_X64_APIC_WRITE_CONTEXT) == 16); +#endif /* defined(__x86_64__) */ + typedef struct WHV_RUN_VP_EXIT_CONTEXT { WHV_RUN_VP_EXIT_REASON ExitReason; UINT32 Reserved; +#if defined(__x86_64__) WHV_VP_EXIT_CONTEXT VpContext; +#elif defined(__aarch64__) + UINT64 Reserved1; +#endif __C89_NAMELESS union { WHV_MEMORY_ACCESS_CONTEXT MemoryAccess; + WHV_RUN_VP_CANCELED_CONTEXT CancelReason; + WHV_HYPERCALL_CONTEXT Hypercall; + WHV_SYNIC_SINT_DELIVERABLE_CONTEXT SynicSintDeliverable; +#if defined(__x86_64__) WHV_X64_IO_PORT_ACCESS_CONTEXT IoPortAccess; WHV_X64_MSR_ACCESS_CONTEXT MsrAccess; WHV_X64_CPUID_ACCESS_CONTEXT CpuidAccess; WHV_VP_EXCEPTION_CONTEXT VpException; WHV_X64_INTERRUPTION_DELIVERABLE_CONTEXT InterruptWindow; WHV_X64_UNSUPPORTED_FEATURE_CONTEXT UnsupportedFeature; - WHV_RUN_VP_CANCELED_CONTEXT CancelReason; WHV_X64_APIC_EOI_CONTEXT ApicEoi; WHV_X64_RDTSC_CONTEXT ReadTsc; WHV_X64_APIC_SMI_CONTEXT ApicSmi; - WHV_HYPERCALL_CONTEXT Hypercall; WHV_X64_APIC_INIT_SIPI_CONTEXT ApicInitSipi; WHV_X64_APIC_WRITE_CONTEXT ApicWrite; - WHV_SYNIC_SINT_DELIVERABLE_CONTEXT SynicSintDeliverable; + UINT64 AsUINT64[22]; +#elif defined(__aarch64__) + WHV_UNRECOVERABLE_EXCEPTION_CONTEXT UnrecoverableException; + WHV_INVALID_VP_REGISTER_CONTEXT InvalidVpRegister; + WHV_REGISTER_CONTEXT Register; + WHV_ARM64_RESET_CONTEXT Arm64Reset; + UINT64 AsUINT64[32]; +#endif }; } WHV_RUN_VP_EXIT_CONTEXT; +#if defined(__x86_64__) C_ASSERT(sizeof(WHV_RUN_VP_EXIT_CONTEXT) == 224); +#elif defined(__aarch64__) +C_ASSERT(sizeof(WHV_RUN_VP_EXIT_CONTEXT) == 272); +#endif + +#if defined(__x86_64__) typedef enum WHV_INTERRUPT_TYPE { WHvX64InterruptTypeFixed = 0, @@ -2082,13 +2650,48 @@ typedef struct WHV_INTERRUPT_CONTROL { UINT64 Type : 8; UINT64 DestinationMode : 4; UINT64 TriggerMode : 4; - UINT64 Reserved : 48; + UINT64 TargetVtl : 8; + UINT64 Reserved : 40; UINT32 Destination; UINT32 Vector; } WHV_INTERRUPT_CONTROL; C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL) == 16); +#elif defined(__aarch64__) + +typedef enum WHV_INTERRUPT_TYPE { + WHvArm64InterruptTypeFixed = 0x0000, + WHvArm64InterruptTypeMaximum = 0x0008 +} WHV_INTERRUPT_TYPE; + +typedef union WHV_INTERRUPT_CONTROL2 { + UINT64 AsUINT64; + __C89_NAMELESS struct { + WHV_INTERRUPT_TYPE InterruptType; + UINT32 Reserved1 : 2; + UINT32 Asserted : 1; + UINT32 Retarget : 1; + UINT32 Reserved2 : 28; + }; +} WHV_INTERRUPT_CONTROL2; + +C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL2) == 8); + +typedef struct WHV_INTERRUPT_CONTROL { + UINT64 TargetPartition; + WHV_INTERRUPT_CONTROL2 InterruptControl; + UINT64 DestinationAddress; + UINT32 RequestedVector; + UINT8 TargetVtl; + UINT8 ReservedZ0; + UINT16 ReservedZ1; +} WHV_INTERRUPT_CONTROL; + +C_ASSERT(sizeof(WHV_INTERRUPT_CONTROL) == 32); + +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + typedef struct WHV_DOORBELL_MATCH_DATA { WHV_GUEST_PHYSICAL_ADDRESS GuestAddress; UINT64 Value; @@ -2113,11 +2716,13 @@ typedef struct WHV_PARTITION_MEMORY_COUNTERS { C_ASSERT(sizeof(WHV_PARTITION_MEMORY_COUNTERS) == 24); typedef enum WHV_PROCESSOR_COUNTER_SET { - WHvProcessorCounterSetRuntime, - WHvProcessorCounterSetIntercepts, - WHvProcessorCounterSetEvents, - WHvProcessorCounterSetApic, - WHvProcessorCounterSetSyntheticFeatures + WHvProcessorCounterSetRuntime = 0, + WHvProcessorCounterSetIntercepts = 1, + WHvProcessorCounterSetEvents = 2, +#if defined(__x86_64__) + WHvProcessorCounterSetApic = 3, +#endif + WHvProcessorCounterSetSyntheticFeatures = 4 } WHV_PROCESSOR_COUNTER_SET; typedef struct WHV_PROCESSOR_RUNTIME_COUNTERS { @@ -2135,6 +2740,7 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTER { C_ASSERT(sizeof(WHV_PROCESSOR_INTERCEPT_COUNTER) == 16); typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS { +#if defined(__x86_64__) WHV_PROCESSOR_INTERCEPT_COUNTER PageInvalidations; WHV_PROCESSOR_INTERCEPT_COUNTER ControlRegisterAccesses; WHV_PROCESSOR_INTERCEPT_COUNTER IoInstructions; @@ -2149,6 +2755,13 @@ typedef struct WHV_PROCESSOR_INTERCEPT_COUNTERS { WHV_PROCESSOR_INTERCEPT_COUNTER NestedPageFaultIntercepts; WHV_PROCESSOR_INTERCEPT_COUNTER Hypercalls; WHV_PROCESSOR_INTERCEPT_COUNTER RdpmcInstructions; +#elif defined(__aarch64__) + WHV_PROCESSOR_INTERCEPT_COUNTER OtherIntercepts; + WHV_PROCESSOR_INTERCEPT_COUNTER PendingInterrupts; + WHV_PROCESSOR_INTERCEPT_COUNTER NestedPageFaultIntercepts; + WHV_PROCESSOR_INTERCEPT_COUNTER Hypercalls; + WHV_PROCESSOR_INTERCEPT_COUNTER Reserved[10]; +#endif /* defined(__x86_64__) || defined(__aarch64__) */ } WHV_PROCESSOR_ACTIVITY_COUNTERS; C_ASSERT(sizeof(WHV_PROCESSOR_ACTIVITY_COUNTERS) == 224); @@ -2161,6 +2774,8 @@ typedef struct WHV_PROCESSOR_EVENT_COUNTERS { C_ASSERT(sizeof(WHV_PROCESSOR_GUEST_EVENT_COUNTERS) == 24); +#if defined(__x86_64__) + typedef struct WHV_PROCESSOR_APIC_COUNTERS { UINT64 MmioAccessCount; UINT64 EoiAccessCount; @@ -2171,6 +2786,8 @@ typedef struct WHV_PROCESSOR_APIC_COUNTERS { C_ASSERT(sizeof(WHV_PROCESSOR_APIC_COUNTERS) == 40); +#endif /* defined(__x86_64__) */ + typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS { UINT64 SyntheticInterruptsCount; UINT64 LongSpinWaitHypercallsCount; @@ -2182,24 +2799,216 @@ typedef struct WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS { C_ASSERT(sizeof(WHV_PROCESSOR_SYNTHETIC_FEATURES_COUNTERS) == 48); +typedef union WHV_VTL_PERMISSION_SET { + UINT32 AsUINT32; + __C89_NAMELESS struct { + UINT16 VtlPermissionFrom1[2]; + }; +} WHV_VTL_PERMISSION_SET; + typedef enum WHV_ADVISE_GPA_RANGE_CODE { WHvAdviseGpaRangeCodePopulate = 0x00000000, WHvAdviseGpaRangeCodePin = 0x00000001, WHvAdviseGpaRangeCodeUnpin = 0x00000002 } WHV_ADVISE_GPA_RANGE_CODE; +#if defined(__x86_64__) + typedef enum WHV_VIRTUAL_PROCESSOR_STATE_TYPE { WHvVirtualProcessorStateTypeSynicMessagePage = 0x00000000, WHvVirtualProcessorStateTypeSynicEventFlagPage = 0x00000001, WHvVirtualProcessorStateTypeSynicTimerState = 0x00000002, WHvVirtualProcessorStateTypeInterruptControllerState2 = 0x00001000, - WHvVirtualProcessorStateTypeXsaveState = 0x00001001 + WHvVirtualProcessorStateTypeXsaveState = 0x00001001, + WHvVirtualProcessorStateTypeNestedState = 0x00001002 +} WHV_VIRTUAL_PROCESSOR_STATE_TYPE; + +#elif defined(__aarch64__) + +#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN (1U << 31) +#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP (1U << 30) + +typedef enum WHV_VIRTUAL_PROCESSOR_STATE_TYPE { + WHvVirtualProcessorStateTypeInterruptControllerState = 0x00000000 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN, + WHvVirtualProcessorStateTypeSynicMessagePage = 0x00000002 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN, + WHvVirtualProcessorStateTypeSynicEventFlagPage = 0x00000003 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN, + WHvVirtualProcessorStateTypeSynicTimerState = 0x00000004, + WHvVirtualProcessorStateTypeGlobalInterruptState = 0x00000006 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP, + WHvVirtualProcessorStateTypeSveState = 0x00000007 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN } WHV_VIRTUAL_PROCESSOR_STATE_TYPE; +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + +typedef enum WHV_NESTED_STATE_TYPE { + WHvNestedStateTypeVmx, + WHvNestedStateTypeSvm +} WHV_NESTED_STATE_TYPE; + +typedef struct WHV_NESTED_ENLIGHTENMENTS_CONTROL { + __C89_NAMELESS union { + UINT32 AsUINT32; + __C89_NAMELESS struct { + UINT32 DirectHypercall:1; + UINT32 VirtualizationException:1; + UINT32 Reserved:30; + }; + } Features; + __C89_NAMELESS union { + UINT32 AsUINT32; + __C89_NAMELESS struct { + UINT32 InterPartitionCommunication:1; + UINT32 Reserved:31; + }; + } HypercallControls; +} WHV_NESTED_ENLIGHTENMENTS_CONTROL; + +typedef struct WHV_X64_VMX_NESTED_STATE { + WHV_NESTED_STATE_TYPE Vendor; + __C89_NAMELESS struct { + UINT32 GuestMode : 1; + UINT32 Vmxon : 1; + UINT32 CurrentVmcsValid : 1; + UINT32 VmEntryPending : 1; + UINT32 VmcsEnlightened : 1; + UINT32 EnlightenedVmEntry : 1; + UINT32 Reserved : 26; + } Flags; + WHV_NESTED_ENLIGHTENMENTS_CONTROL NestedEnlightenmentsControl; + UINT64 Pdpt[4]; + UINT64 VmxonRegionGpa; + UINT64 VmcsGpa; + UINT64 CurrentEnlightenedVmcs; + __C89_NAMELESS struct { + UINT32 Tpr; + UINT32 Ppr; + UINT32 Isr[8]; + UINT32 Irr[8]; + UINT32 IcrLow; + UINT32 IcrHigh; + } VirtualApicRegs; + UINT8 Reserved[3944]; + DECLSPEC_ALIGN(4096) UINT8 VmcsBytes[4096]; +} WHV_X64_VMX_NESTED_STATE; + +typedef struct WHV_SVM_VMCB_SELECTOR { + UINT16 Selector; + UINT16 Attrib; + UINT32 Limit; + UINT64 Base; +} WHV_SVM_VMCB_SELECTOR; + +typedef struct WHV_SVM_NESTED_HOST_STATE { + UINT64 Rip; + UINT64 Rsp; + UINT64 Rflags; + UINT64 Rax; + WHV_SVM_VMCB_SELECTOR Es; + WHV_SVM_VMCB_SELECTOR Cs; + WHV_SVM_VMCB_SELECTOR Ss; + WHV_SVM_VMCB_SELECTOR Ds; + WHV_SVM_VMCB_SELECTOR Gdtr; + WHV_SVM_VMCB_SELECTOR Idtr; + UINT64 Efer; + UINT64 Cr0; + UINT64 Cr3; + UINT64 Cr4; + UINT64 VirtualTpr; + UINT64 Reserved[6]; +} WHV_SVM_NESTED_HOST_STATE; + +typedef struct WHV_X64_SVM_NESTED_STATE { + WHV_NESTED_STATE_TYPE Vendor; + __C89_NAMELESS struct { + UINT32 GuestMode : 1; + UINT32 VmEntryPending : 1; + UINT32 HostSaveGpaValid : 1; + UINT32 CurrentVmcbValid : 1; + UINT32 Reserved : 28; + } Flags; + WHV_NESTED_ENLIGHTENMENTS_CONTROL NestedEnlightenmentsControl; + UINT64 HostSaveGpa; + UINT64 VmControlMsr; + UINT64 VirtualTscRatioMsr; + UINT64 VmcbGpa; + WHV_SVM_NESTED_HOST_STATE HostState; + UINT8 Reserved[3832]; + DECLSPEC_ALIGN(4096) UINT8 VmcbBytes[4096]; +} WHV_X64_SVM_NESTED_STATE; + +typedef union WHV_X64_NESTED_STATE { + WHV_X64_VMX_NESTED_STATE Vmx; + WHV_X64_SVM_NESTED_STATE Svm; +} WHV_X64_NESTED_STATE; + +C_ASSERT(sizeof(WHV_X64_NESTED_STATE) == (2 * 4096)); + +#if defined (__aarch64__) + +typedef struct WHV_ARM64_INTERRUPT_STATE { + __C89_NAMELESS struct { + UINT8 Enabled : 1; + UINT8 EdgeTriggered : 1; + UINT8 Asserted : 1; + UINT8 SetPending : 1; + UINT8 Active : 1; + UINT8 Direct : 1; + UINT8 Reserved0 : 2; + }; + UINT8 GicrIpriorityrConfigured; + UINT8 GicrIpriorityrActive; + UINT8 Reserved1; +} WHV_ARM64_INTERRUPT_STATE; + +typedef struct WHV_ARM64_GLOBAL_INTERRUPT_STATE { + UINT32 InterruptId; + UINT32 ActiveVpIndex; + __C89_NAMELESS union { + UINT32 TargetMpidr; + UINT32 TargetVpIndex; + }; + WHV_ARM64_INTERRUPT_STATE InterruptState; +} WHV_ARM64_GLOBAL_INTERRUPT_STATE; + +#define WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE_VERSION_CURRENT (1) + +typedef struct WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE { + UINT8 Version; + UINT8 GicVersion; + UINT8 Reserved0[2]; + UINT32 NumInterrupts; + UINT64 GicdCtlrEnableGrp1A; + WHV_ARM64_GLOBAL_INTERRUPT_STATE Interrupts[ANYSIZE_ARRAY]; +} WHV_ARM64_GLOBAL_INTERRUPT_CONTROLLER_STATE; + +#define WHV_ARM64_INTERRUPT_CONTROLLER_STATE_VERSION_CURRENT (1) + +typedef struct WHV_ARM64_LOCAL_INTERRUPT_CONTROLLER_STATE { + UINT8 Version; + UINT8 GicVersion; + UINT8 Reserved0[6]; + UINT64 IccIgrpen1El1; + UINT64 GicrCtlrEnableLpis; + UINT64 IccBpr1El1; + UINT64 IccPmrEl1; + UINT64 GicrPropbaser; + UINT64 GicrPendbaser; + UINT32 IchAp1REl2[4]; + WHV_ARM64_INTERRUPT_STATE BankedInterruptState[32]; +} WHV_ARM64_LOCAL_INTERRUPT_CONTROLLER_STATE; + +typedef struct WHV_ARM64_VP_STATE_SVE { + USHORT Version; + USHORT RegisterDataOffset; + UINT32 VectorLength; + UINT64 Reserved0; +} WHV_ARM64_VP_STATE_SVE; + +#endif /* defined(__aarch64__) */ + typedef struct WHV_SYNIC_EVENT_PARAMETERS { UINT32 VpIndex; UINT8 TargetSint; - UINT8 Reserved; + WHV_VTL TargetVtl; UINT16 FlagNumber; } WHV_SYNIC_EVENT_PARAMETERS; @@ -2326,7 +3135,9 @@ typedef struct WHV_VPCI_INTERRUPT_TARGET { C_ASSERT(sizeof(WHV_VPCI_INTERRUPT_TARGET) == 16); typedef enum WHV_TRIGGER_TYPE { +#if defined(__x86_64__) WHvTriggerTypeInterrupt = 0, +#endif WHvTriggerTypeSynicEvent = 1, WHvTriggerTypeDeviceInterrupt = 2 } WHV_TRIGGER_TYPE; @@ -2335,7 +3146,9 @@ typedef struct WHV_TRIGGER_PARAMETERS { WHV_TRIGGER_TYPE TriggerType; UINT32 Reserved; __C89_NAMELESS union { +#if defined(__x86_64__) WHV_INTERRUPT_CONTROL Interrupt; +#endif WHV_SYNIC_EVENT_PARAMETERS SynicEvent; __C89_NAMELESS struct { UINT64 LogicalDeviceId; @@ -2372,7 +3185,9 @@ typedef enum WHV_NOTIFICATION_PORT_TYPE { typedef struct WHV_NOTIFICATION_PORT_PARAMETERS { WHV_NOTIFICATION_PORT_TYPE NotificationPortType; - UINT32 Reserved; + UINT16 Reserved; + UINT8 Reserved1; + UINT8 ConnectionVtl; __C89_NAMELESS union { WHV_DOORBELL_MATCH_DATA Doorbell; __C89_NAMELESS struct { @@ -2398,4 +3213,6 @@ typedef PVOID WHV_NOTIFICATION_PORT_HANDLE; #define WHV_SYNIC_MESSAGE_SIZE 256 +#endif /* defined(__x86_64__) || defined(__aarch64__) */ + #endif /* _WINHVAPIDEFS_H_ */ diff --git a/lib/libc/include/any-windows-any/winioctl.h b/lib/libc/include/any-windows-any/winioctl.h index 55aa288be7..036297cd81 100644 --- a/lib/libc/include/any-windows-any/winioctl.h +++ b/lib/libc/include/any-windows-any/winioctl.h @@ -3229,6 +3229,54 @@ typedef struct _CSV_NAMESPACE_INFO { #define FSCTL_LMR_QUERY_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 286, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif +#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) +typedef struct _DUPLICATE_EXTENTS_DATA { + HANDLE FileHandle; + LARGE_INTEGER SourceFileOffset; + LARGE_INTEGER TargetFileOffset; + LARGE_INTEGER ByteCount; +} DUPLICATE_EXTENTS_DATA, *PDUPLICATE_EXTENTS_DATA; + +#if ((NTDDI_VERSION >= NTDDI_WIN10_RS2) && defined(_WIN64)) +typedef struct _DUPLICATE_EXTENTS_DATA32 { + UINT32 FileHandle; + LARGE_INTEGER SourceFileOffset; + LARGE_INTEGER TargetFileOffset; + LARGE_INTEGER ByteCount; +} DUPLICATE_EXTENTS_DATA32, *PDUPLICATE_EXTENTS_DATA32; +#endif /* ((NTDDI_VERSION >= NTDDI_WIN10_RS2) && defined(_WIN64)) */ + +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) */ + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS3) +#define DUPLICATE_EXTENTS_DATA_EX_SOURCE_ATOMIC 0x00000001 + +#if (NTDDI_VERSION >= NTDDI_WIN10_VB) +#define DUPLICATE_EXTENTS_DATA_EX_ASYNC 0x00000002 +#endif /* (NTDDI_VERSION >= NTDDI_WIN10_VB) */ + +typedef struct _DUPLICATE_EXTENTS_DATA_EX { + SIZE_T Size; + HANDLE FileHandle; + LARGE_INTEGER SourceFileOffset; + LARGE_INTEGER TargetFileOffset; + LARGE_INTEGER ByteCount; + DWORD Flags; +} DUPLICATE_EXTENTS_DATA_EX, *PDUPLICATE_EXTENTS_DATA_EX; + +#if ((NTDDI_VERSION >= NTDDI_WIN10_RS3) && defined(_WIN64)) +typedef struct _DUPLICATE_EXTENTS_DATA_EX32 { + DWORD32 Size; + DWORD32 FileHandle; + LARGE_INTEGER SourceFileOffset; + LARGE_INTEGER TargetFileOffset; + LARGE_INTEGER ByteCount; + DWORD Flags; +} DUPLICATE_EXTENTS_DATA_EX32, *PDUPLICATE_EXTENTS_DATA_EX32; +#endif /* ((NTDDI_VERSION >= NTDDI_WIN10_RS3) && defined(_WIN64)) */ + +#endif /* (NTDDI_VERSION >= NTDDI_WIN10_RS3) */ + #endif /* _FILESYSTEMFSCTL_ */ diff --git a/lib/libc/include/any-windows-any/winnt.h b/lib/libc/include/any-windows-any/winnt.h index 9373525f12..9e57bb1006 100644 --- a/lib/libc/include/any-windows-any/winnt.h +++ b/lib/libc/include/any-windows-any/winnt.h @@ -2454,6 +2454,21 @@ extern "C" { #define UNW_FLAG_EHANDLER 0x1 #define UNW_FLAG_UHANDLER 0x2 +#define NONVOL_INT_NUMREG_ARM64 (11) +#define NONVOL_FP_NUMREG_ARM64 (8) + +#define NONVOL_INT_SIZE_ARM64 (NONVOL_INT_NUMREG_ARM64 * sizeof(DWORD64)) +#define NONVOL_FP_SIZE_ARM64 (NONVOL_FP_NUMREG_ARM64 * sizeof(double)) + + typedef union _DISPATCHER_CONTEXT_NONVOLREG_ARM64 { + BYTE Buffer[NONVOL_INT_SIZE_ARM64 + NONVOL_FP_SIZE_ARM64]; + + __C89_NAMELESS struct { + DWORD64 GpNvRegs[NONVOL_INT_NUMREG_ARM64]; + double FpNvRegs[NONVOL_FP_NUMREG_ARM64]; + } DUMMYSTRUCTNAME; + } DISPATCHER_CONTEXT_NONVOLREG_ARM64; + typedef struct _DISPATCHER_CONTEXT_ARM64 { ULONG_PTR ControlPc; ULONG_PTR ImageBase; @@ -5401,7 +5416,7 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS) SERVERSILO_STARTED, SERVERSILO_SHUTTING_DOWN, SERVERSILO_TERMINATING, - SERVERSILO_TERMINATED, + SERVERSILO_TERMINATED } SERVERSILO_STATE, *PSERVERSILO_STATE; typedef struct _SERVERSILO_BASIC_INFORMATION { @@ -8805,14 +8820,14 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS) typedef enum ARM64_FNPDATA_FLAGS { PdataRefToFullXdata = 0, PdataPackedUnwindFunction = 1, - PdataPackedUnwindFragment = 2, + PdataPackedUnwindFragment = 2 } ARM64_FNPDATA_FLAGS; typedef enum ARM64_FNPDATA_CR { PdataCrUnchained = 0, PdataCrUnchainedSavedLr = 1, PdataCrChainedWithPac = 2, - PdataCrChained = 3, + PdataCrChained = 3 } ARM64_FNPDATA_CR; typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY { @@ -9125,27 +9140,27 @@ DEFINE_ENUM_FLAG_OPERATORS(JOB_OBJECT_IO_RATE_CONTROL_FLAGS) #endif #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) - NTSYSAPI VOID NTAPI RtlUnwind (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue); + NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN 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 RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, 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 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 RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, 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 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 RtlUnwindEx (PVOID TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, 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 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 RtlUnwindEx (FRAME_POINTERS TargetFrame, PVOID TargetIp, PEXCEPTION_RECORD ExceptionRecord, PVOID ReturnValue, PCONTEXT ContextRecord, PUNWIND_HISTORY_TABLE HistoryTable); + NTSYSAPI VOID NTAPI __MINGW_ATTRIB_NORETURN 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 @@ -9470,7 +9485,7 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); typedef enum _RTL_UMS_SCHEDULER_REASON { UmsSchedulerStartup = 0, UmsSchedulerThreadBlocked, - UmsSchedulerThreadYield, + UmsSchedulerThreadYield } RTL_UMS_SCHEDULER_REASON,*PRTL_UMS_SCHEDULER_REASON; typedef VOID NTAPI RTL_UMS_SCHEDULER_ENTRY_POINT (RTL_UMS_SCHEDULER_REASON Reason, ULONG_PTR ActivationPayload, PVOID SchedulerParam); @@ -10457,13 +10472,13 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *); typedef enum _TRANSACTION_OUTCOME { TransactionOutcomeUndetermined = 1, TransactionOutcomeCommitted, - TransactionOutcomeAborted, + TransactionOutcomeAborted } TRANSACTION_OUTCOME; typedef enum _TRANSACTION_STATE { TransactionStateNormal = 1, TransactionStateIndoubt, - TransactionStateCommittedNotify, + TransactionStateCommittedNotify } TRANSACTION_STATE; typedef struct _TRANSACTION_BASIC_INFORMATION { diff --git a/lib/libc/include/any-windows-any/winuser.h b/lib/libc/include/any-windows-any/winuser.h index d68333f7b9..5423c72ea1 100644 --- a/lib/libc/include/any-windows-any/winuser.h +++ b/lib/libc/include/any-windows-any/winuser.h @@ -2836,7 +2836,7 @@ DIALOG_DPI_CHANGE_BEHAVIORS WINAPI GetDialogDpiChangeBehavior(HWND hDlg); POINTER_CHANGE_FOURTHBUTTON_DOWN, POINTER_CHANGE_FOURTHBUTTON_UP, POINTER_CHANGE_FIFTHBUTTON_DOWN, - POINTER_CHANGE_FIFTHBUTTON_UP, + POINTER_CHANGE_FIFTHBUTTON_UP } POINTER_BUTTON_CHANGE_TYPE; typedef struct tagPOINTER_INFO { @@ -6705,7 +6705,7 @@ WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetDpiAwarenessContextForProcess(HANDLE IMO_UNAVAILABLE = 0x00000000, IMO_HARDWARE = 0x00000001, IMO_INJECTED = 0x00000002, - IMO_SYSTEM = 0x00000004, + IMO_SYSTEM = 0x00000004 } INPUT_MESSAGE_ORIGIN_ID; typedef struct tagINPUT_MESSAGE_SOURCE { diff --git a/lib/libc/include/any-windows-any/wmcodecdsp.h b/lib/libc/include/any-windows-any/wmcodecdsp.h index ae24fd05b9..82de8a4c29 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.0-rc1 from include/wmcodecdsp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c91f014043..3c28f613d0 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.0-rc1 from include/wmcontainer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 d2ff2488c1..3a78e2e881 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.0-rc1 from include/wmdrmsdk.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 012e32eb4b..fd6ebe482a 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.0-rc1 from include/wmp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e91b830e11..ac1a805b68 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.0-rc1 from include/wmprealestate.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 2871fce98f..35cfcd8166 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.0-rc1 from include/wmpservices.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 e4f206ed3d..859c6454b2 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.0-rc1 from include/wmsbuffer.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 65b0de7b87..a5e7e64a28 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.0-rc1 from include/wmsdkidl.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wmsdkidl.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -652,6 +652,7 @@ typedef enum tagWMT_STORAGE_FORMAT { WMT_Storage_Format_MP3 = 0, WMT_Storage_Format_V1 = 1 } WMT_STORAGE_FORMAT; +#pragma pack(push,2) typedef struct _WMStreamPrioritizationRecord { WORD wStreamNumber; WINBOOL fMandatory; @@ -662,6 +663,7 @@ typedef struct _WMT_TIMECODE_EXTENSION_DATA { DWORD dwUserbits; DWORD dwAmFlags; } WMT_TIMECODE_EXTENSION_DATA; +#pragma pack(pop) typedef struct _WM_PORT_NUMBER_RANGE { WORD wPortBegin; WORD wPortEnd; diff --git a/lib/libc/include/any-windows-any/wmsecure.h b/lib/libc/include/any-windows-any/wmsecure.h index 2cd92bf48f..f1526c8e49 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.0-rc1 from include/wmsecure.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 ca7a03b1f2..02c6a1506d 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.0-rc1 from include/wpcapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wpcapi.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wrl/client.h b/lib/libc/include/any-windows-any/wrl/client.h index aeb886ea8a..07cedbe4e4 100644 --- a/lib/libc/include/any-windows-any/wrl/client.h +++ b/lib/libc/include/any-windows-any/wrl/client.h @@ -7,7 +7,7 @@ #ifndef _WRL_CLIENT_H_ #define _WRL_CLIENT_H_ -#include +#include #include /* #include */ #include @@ -263,6 +263,51 @@ namespace Microsoft { return tmp->Release(); } }; + + template + bool operator==(const ComPtr &a, const ComPtr &b) throw() + { + static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible"); + return a.Get() == b.Get(); + } + + template + bool operator==(const ComPtr &a, std::nullptr_t) throw() + { + return a.Get() == nullptr; + } + + template + bool operator==(std::nullptr_t, const ComPtr &a) throw() + { + return a.Get() == nullptr; + } + + template + bool operator!=(const ComPtr &a, const ComPtr &b) throw() + { + static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible"); + return a.Get() != b.Get(); + } + + template + bool operator!=(const ComPtr &a, std::nullptr_t) throw() + { + return a.Get() != nullptr; + } + + template + bool operator!=(std::nullptr_t, const ComPtr &a) throw() + { + return a.Get() != nullptr; + } + + template + bool operator<(const ComPtr &a, const ComPtr &b) throw() + { + static_assert(__is_base_of(T, U) || __is_base_of(U, T), "Type incompatible"); + return a.Get() < b.Get(); + } } } diff --git a/lib/libc/include/any-windows-any/wsdattachment.h b/lib/libc/include/any-windows-any/wsdattachment.h index 07fa5e6fe2..a0e5c16c83 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.0-rc1 from include/wsdattachment.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 7e98ef7230..62e66f2973 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.0-rc1 from include/wsdbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 6d8a20fd39..689fbf52ce 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.0-rc1 from include/wsdclient.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 5596bcf4bb..465bcfb04f 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.0-rc1 from include/wsddisco.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 0fe49dc0bc..41939a3741 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.0-rc1 from include/wsdhost.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wsdhost.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsdtypes.h b/lib/libc/include/any-windows-any/wsdtypes.h index d5a2b188d0..866a46bbd6 100644 --- a/lib/libc/include/any-windows-any/wsdtypes.h +++ b/lib/libc/include/any-windows-any/wsdtypes.h @@ -55,7 +55,7 @@ typedef enum _WSD_PROTOCOL_TYPE { WSD_PT_UDP = 0x01, WSD_PT_HTTP = 0x02, WSD_PT_HTTPS = 0x04, - WSD_PT_ALL = 0xff, + WSD_PT_ALL = 0xff } WSD_PROTOCOL_TYPE; typedef enum _WSDEventType { diff --git a/lib/libc/include/any-windows-any/wsdxml.h b/lib/libc/include/any-windows-any/wsdxml.h index 2d0a28299c..59e059301b 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.0-rc1 from include/wsdxml.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/wsdxml.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/lib/libc/include/any-windows-any/wsman.h b/lib/libc/include/any-windows-any/wsman.h index ae7a70962d..a2f7bc0d1d 100644 --- a/lib/libc/include/any-windows-any/wsman.h +++ b/lib/libc/include/any-windows-any/wsman.h @@ -101,7 +101,7 @@ extern "C" { WSMAN_OPTION_PROXY_IE_PROXY_CONFIG = 1, WSMAN_OPTION_PROXY_WINHTTP_PROXY_CONFIG = 2, WSMAN_OPTION_PROXY_AUTO_DETECT = 4, - WSMAN_OPTION_PROXY_NO_PROXY_SERVER = 8, + WSMAN_OPTION_PROXY_NO_PROXY_SERVER = 8 }; typedef enum WSManSessionOption { diff --git a/lib/libc/include/any-windows-any/wsmandisp.h b/lib/libc/include/any-windows-any/wsmandisp.h index 550e6fa180..914ba4fba1 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.0-rc1 from include/wsmandisp.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 8a4b51804c..9b10fa4865 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.0-rc1 from include/wtypes.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 99c07c2bd9..1eef5f9cb9 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.0-rc1 from include/wtypesbase.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 6f48641e38..6824a76e92 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.0-rc1 from include/wuapi.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 42f035a8cd..80bb68c296 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.0-rc1 from include/xamlom.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 c0177b0973..ed76e42f92 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.0-rc1 from include/xapo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 331fa21661..122343323f 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.0-rc1 from include/xaudio2.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/xaudio2.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -87,36 +87,13 @@ interface IXAudio2Extension; #include #include #include +#include #ifdef __cplusplus extern "C" { #endif -#include -#if 0 -typedef struct WAVEFORMATEX { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; - WORD wBitsPerSample; - WORD cbSize; -} WAVEFORMATEX; -typedef struct __WIDL_xaudio2_generated_name_00000020 { - WAVEFORMATEX Format; - union { - WORD wValidBitsPerSample; - WORD wSamplesPerBlock; - WORD wReserved; - } Samples; - DWORD dwChannelMask; - GUID SubFormat; -} WAVEFORMATEXTENSIBLE; -typedef struct __WIDL_xaudio2_generated_name_00000020 *PWAVEFORMATEXTENSIBLE; -#else -#include -#endif +#pragma pack(push,1) #ifndef __IXAudio2Voice_FWD_DEFINED__ #define __IXAudio2Voice_FWD_DEFINED__ typedef interface IXAudio2Voice IXAudio2Voice; @@ -1879,7 +1856,7 @@ inline static float XAudio2FrequencyRatioToSemitones(float freqratio) { return 3 inline static float XAudio2CutoffFrequencyToRadians(float cutofffreq, UINT32 samplerate) { if ((UINT32)(cutofffreq * 6.0f) >= samplerate) { return XAUDIO2_MAX_FILTER_FREQUENCY; } return 2.0f * sinf((float)M_PI * cutofffreq / samplerate); } inline static float XAudio2RadiansToCutoffFrequency(float radians, float samplerate) { return samplerate * asinf(radians/2.0f) / (float)M_PI; } #endif -#include +#pragma pack(pop) HRESULT WINAPI XAudio2Create(IXAudio2** pxaudio2, UINT32 flags, XAUDIO2_PROCESSOR processor); /* 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 8d859970ea..3fed8dcdf6 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.0-rc1 from include/xaudio2fx.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 73541e1542..3731c973d9 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.0-rc1 from include/xmllite.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 b0877ff3c3..242783edd8 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.0-rc1 from include/xpsdigitalsignature.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 ddce0ab8d9..7e778de62a 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.0-rc1 from include/xpsobjectmodel.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 353f5fe094..63acf5805e 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.0-rc1 from include/xpsobjectmodel_1.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 774ffe7966..0a62e574dd 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.0-rc1 from include/xpsprint.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 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 50287864fe..a91297a89b 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.0-rc1 from include/xpsrassvc.idl - Do not edit ***/ +/*** Autogenerated by WIDL 10.4 from include/xpsrassvc.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ -- cgit v1.2.3