Restore main remaps

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: jevansaks

docs/copilot/plans/auto-type-remappings-plan.md

@@ -204,12 +204,12 @@ regressions:
 - `NoInvalidEmptyDelegates`
 - `NoCyclicalNamespaces`
 
-Temporary compatibility note: `DxcBuffer` is intentionally pinned with
-`DxcBuffer=DxcBuffer` in `scraper.settings.rsp`. The DXC docs now use the
-newer `DxcText` name, but the clean `main` baseline still emits `DxcBuffer`,
-so the branch keeps the historical public name until we intentionally accept
-that winmd change. The scraper response-file parser now skips `#` comment
-lines, so that note can also live inline next to the pin in the `.rsp`.
+The scraper response-file parser now skips whole `#` comment lines, so inline
+notes in `scraper.settings.rsp` are safe again. In the current branch state we
+removed the temporary branch-only `DxcBuffer=DxcBuffer` pin so the file stays a
+pure subset of clean `main`; that means `DxcBuffer` vs `DxcText` is again an
+open compatibility drift to resolve separately from the restored main-era
+manual remaps such as `IDxcBlobWide=IDxcBlobUtf16`.
 
 ### 4. Tightened fn-ptr discovery semantics
 

generation/WinSDK/scraper.settings.rsp

@@ -175,9 +175,6 @@ ABI::Windows::Foundation::IActivatableClassRegistration=IActivatableClassRegistr
 D3D11_AUTHENTICATED_PROTECTION_FLAGS::__MIDL___MIDL_itf_d3d11_0000_0034_0001=_Flags_e__Struct
 DEVPROPGUID=Guid
 DWORD_PTR=UIntPtr
-# Temporary compatibility pin: clean main still emits DxcBuffer.
-DxcBuffer=DxcBuffer
-PEXCEPTION_ROUTINE=EXCEPTION_ROUTINE
 PBOOL=BOOL*
 LPBOOL=BOOL*
 PBOOLEAN=BOOLEAN*
@@ -207,14 +204,15 @@ ULONG_PTR=UIntPtr
 WPARAM=UIntPtr
 X3DAUDIO_VECTOR=Vector3
 _ACTIVATION_CONTEXT*=IntPtr
+_CONTEXT=CONTEXT
 _CRYPTOAPI_BLOB=CRYPT_INTEGER_BLOB
 _ENUM_PAGE_FILE_INFORMATION_=ENUM_PAGE_FILE_INFORMATION
+_EXCEPTION_RECORD=EXCEPTION_RECORD
 _GDI_NONREMOTE::__MIDL_IWinTypes_0002=_u_e__Struct
 _GDI_OBJECT::__MIDL_IAdviseSink_0002=_u_e__Struct
 _GUID=Guid
 _HIDP_PREPARSED_DATA*=IntPtr
 _IMAGE_RUNTIME_FUNCTION_ENTRY=IMAGE_RUNTIME_FUNCTION_ENTRY
-__WTS_PROPERTY_VALUE=WTS_PROPERTY_VALUE
 _LARGE_INTEGER=long
 _PRIVKEYVER3=PRIVKEYVER3
 _PROC_THREAD_ATTRIBUTE_LIST*=IntPtr
@@ -278,18 +276,22 @@ _INTERFACE_TIMESTAMP_CAPABILITY_FLAGS=INTERFACE_TIMESTAMP_CAPABILITY_FLAGS
 _ARM64_FPCR_REG=ARM64_FPCR_REG
 _ARM64_FPSR_REG=ARM64_FPSR_REG
 _AMD64_MXCSR_REG=AMD64_MXCSR_REG
+_DISPATCHER_CONTEXT_NONVOLREG_ARM64=DISPATCHER_CONTEXT_NONVOLREG_ARM64
+_DISPATCHER_CONTEXT_ARM64=DISPATCHER_CONTEXT_ARM64
 _SCM_BUS_SPECIAL_PURPOSE_DEVICE_INFO=SCM_BUS_SPECIAL_PURPOSE_DEVICE_INFO
 _SCM_BUS_SPECIAL_PURPOSE_DEVICES_INFO=SCM_BUS_SPECIAL_PURPOSE_DEVICES_INFO
 _SCM_BUS_SPECIAL_PURPOSE_MEMORY_STATE=SCM_BUS_SPECIAL_PURPOSE_MEMORY_STATE
 _SERVER_CERTIFICATE_TYPE=SERVER_CERTIFICATE_TYPE
 _SERVER_CERTIFICATE_INFO_0=SERVER_CERTIFICATE_INFO_0
 _VSS_COMPONENTINFO=VSS_COMPONENTINFO
 _OLD_LARGE_INTEGER=long
+_DISPATCHER_CONTEXT=DISPATCHER_CONTEXT
 tagKSP_PINMODE=KSP_PINMODE
 _SdpAttributeRange=SdpAttributeRange
 NDR_CCONTEXT=IntPtr
 _NDR_SCONTEXT=NDR_SCONTEXT
 RO_REGISTRATION_COOKIE=IntPtr
+PEXCEPTION_ROUTINE=EXCEPTION_ROUTINE
 __MIDL___MIDL_itf_ads_0000_0000_0001=ADSTYPE
 __MIDL___MIDL_itf_audioenginebaseapo_0000_0011_0001=AudioFXExtensionParams
 _InlineInterlockedAdd64=InterlockedAdd64
@@ -302,6 +304,8 @@ _BATTERY_WMI_STATUS_CHANGE=BATTERY_WMI_STATUS_CHANGE
 _BATTERY_WMI_STATUS=BATTERY_WMI_STATUS
 _BATTERY_WMI_TEMPERATURE=BATTERY_WMI_TEMPERATURE
 _CIMFS_FILE_METADATA=CIMFS_FILE_METADATA
+_ACTRL_ALISTA=ACTRL_ACCESSA
+_ACTRL_ALISTW=ACTRL_ACCESSW
 tagIMAGEINFO=IMAGEINFO
 _PROPSHEETPAGEA_V4=PROPSHEETPAGEA_V4
 _PROPSHEETPAGEW_V4=PROPSHEETPAGEW_V4
@@ -358,12 +362,19 @@ tagDBSETFUNC=DBSETFUNC
 tagDBSORTINFO=DBSORTINFO
 tagDBTEXT=DBTEXT
 tagCIPROPERTYDEF=CIPROPERTYDEF
+NET_ADDRESS_INFO_=NET_ADDRESS_INFO
+berval=LDAP_BERVAL
+ColumnSortOrder=_ColumnSortOrder
 __MIDL___MIDL_itf_mfobjects_0000_0017_0001=MF_FILE_ACCESSMODE
 __MIDL___MIDL_itf_mfobjects_0000_0017_0003=MF_FILE_FLAGS
 __MIDL___MIDL_itf_mfobjects_0000_0017_0002=MF_FILE_OPENMODE
 __MIDL___MIDL_itf_mfobjects_0000_0008_0003=MFT_REGISTER_TYPE_INFO
 _MFP_CREATION_OPTIONS=MFP_CREATION_OPTIONS
 _MFT_DRAIN_TYPE=MFT_DRAIN_TYPE
+DocumentMode=_DocumentMode
+ExportListOptions=_ExportListOptions
+ListViewMode=_ListViewMode
+ViewOptions=_ViewOptions
 __MIDL___MIDL_itf_msclus_0000_0000_0005=CLUS_GROUP_START_SETTING
 __MIDL___MIDL_itf_msclus_0000_0000_0001=CLUSGROUP_TYPE
 __MIDL___MIDL_itf_msclus_0000_0000_0002=CLUSTER_MGMT_POINT_TYPE
@@ -450,6 +461,7 @@ __MIDL___MIDL_itf_msp_0000_0000_0004=MSP_EVENT
 __MIDL___MIDL_itf_msp_0000_0000_0005=MSP_EVENT_INFO
 linecallhubtrackinginfo_tag=LINECALLHUBTRACKINGINFO
 __MIDL___MIDL_itf_termmgr_0000_0000_0001=TMGR_DIRECTION
+__WTS_PROPERTY_VALUE=WTS_PROPERTY_VALUE
 _WINHTTP_SECURITY_INFO=WINHTTP_SECURITY_INFO
 _BLOB=BLOB
 _WSAOVERLAPPED=WSAOVERLAPPED
@@ -606,6 +618,7 @@ sockaddr_storage=SOCKADDR_STORAGE
 sockaddr_in6=SOCKADDR_IN6
 SOCKADDR_IN6_LH=SOCKADDR_IN6
 SOCKADDR_STORAGE_LH=SOCKADDR_STORAGE
+in_addr=IN_ADDR
 _DEDUP_SET_PARAM_TYPE=DEDUP_SET_PARAM_TYPE
 PUINT_PTR=UIntPtr*
 PULONG_PTR=UIntPtr*
@@ -646,6 +659,8 @@ _SHGDNF=SHGDNF
 ADSTYPEENUM=ADSTYPE
 JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE=JOBOBJECT_IO_RATE_CONTROL_INFORMATION_NATIVE_V1
 cmsghdr=CMSGHDR
+fd_set=FD_SET
+sockaddr_atm=SOCKADDR_ATM
 _BLUETOOTH_ADDRESS=BLUETOOTH_ADDRESS
 _BLUETOOTH_LOCAL_SERVICE_INFO=BLUETOOTH_LOCAL_SERVICE_INFO
 _BLUETOOTH_DEVICE_INFO=BLUETOOTH_DEVICE_INFO
@@ -689,6 +704,7 @@ NVME_CDW11_FEATURE_ERROR_INJECTION=NVME_CDW0_FEATURE_ERROR_INJECTION
 _PROCESS_MITIGATION_ACTIVATION_CONTEXT_TRUST_POLICY=PROCESS_MITIGATION_ACTIVATION_CONTEXT_TRUST_POLICY
 PREGHANDLE=REGHANDLE*
 TOUCHPAD_PARAMETERS=TOUCHPAD_PARAMETERS_V1
+IDxcBlobWide=IDxcBlobUtf16
 _NVMEOF_DISC_LPE=NVMEOF_DISC_LPE
 _NVMEOF_DISC_LOGPAGE=NVMEOF_DISC_LOGPAGE
 _EXPERIMENTAL_WEBAUTHN_PLUGIN_REMOVE_AUTHENTICATOR_OPTIONS=EXPERIMENTAL_WEBAUTHN_PLUGIN_REMOVE_AUTHENTICATOR_OPTIONS
@@ -697,6 +713,3 @@ _EXPERIMENTAL2_WEBAUTHN_PLUGIN_ADD_AUTHENTICATOR_OPTIONS=EXPERIMENTAL2_WEBAUTHN_
 _EXPERIMENTAL2_WEBAUTHN_PLUGIN_UPDATE_AUTHENTICATOR_DETAILS=EXPERIMENTAL2_WEBAUTHN_PLUGIN_UPDATE_AUTHENTICATOR_DETAILS
 _EXPERIMENTAL2_WEBAUTHN_PLUGIN_CREDENTIAL_DETAILS=EXPERIMENTAL2_WEBAUTHN_PLUGIN_CREDENTIAL_DETAILS
 _EXPERIMENTAL2_WEBAUTHN_PLUGIN_USER_VERIFICATION_REQUEST=EXPERIMENTAL2_WEBAUTHN_PLUGIN_USER_VERIFICATION_REQUEST
-_CONTEXT=CONTEXT
-_EXCEPTION_RECORD=EXCEPTION_RECORD
-NET_ADDRESS_INFO_=NET_ADDRESS_INFO