From 182b4eea73881c611a0f519576aa6ad2aa6799c2 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 27 Nov 2021 15:26:58 +0100
Subject: Update dependencies (#333)
---
 .../modernc.org/sqlite/lib/sqlite_windows_amd64.go | 19235 ++++++++++---------
 1 file changed, 10175 insertions(+), 9060 deletions(-)
(limited to 'vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go')
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
index 10c8cbd94..5d1d2e55b 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
@@ -222,6 +222,7 @@ const (
 	ALG_TYPE_STREAM                                                                = 2048
 	ALIGNMENT_MACHINE                                                              = 0
 	ALTERNATE                                                                      = 1
+	ALTNUMPAD_BIT                                                                  = 0x4000000
 	ALT_SCHEMA_TABLE                                                               = "sqlite_schema"
 	ALT_TEMP_SCHEMA_TABLE                                                          = "sqlite_temp_schema"
 	ANSI_CHARSET                                                                   = 0
@@ -387,6 +388,7 @@ const (
 	APPMODEL_ERROR_NO_PACKAGE                                                      = 15700
 	APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT                                        = 15702
 	APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT                                         = 15701
+	APP_LOCAL_DEVICE_ID_SIZE                                                       = 32
 	ARABIC_CHARSET                                                                 = 178
 	ARW_BOTTOMLEFT                                                                 = 0
 	ARW_BOTTOMRIGHT                                                                = 1
@@ -1126,21 +1128,59 @@ const (
 	CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID                                     = 81
 	CERT_CA_SUBJECT_FLAG                                                           = 0x80
 	CERT_CEP_PROP_ID                                                               = 87
+	CERT_CHAIN_AUTO_CURRENT_USER                                                   = 1
+	CERT_CHAIN_AUTO_FLUSH_DISABLE_FLAG                                             = 0x00000001
+	CERT_CHAIN_AUTO_FLUSH_FIRST_DELTA_SECONDS_DEFAULT                              = 300
+	CERT_CHAIN_AUTO_FLUSH_NEXT_DELTA_SECONDS_DEFAULT                               = 1800
+	CERT_CHAIN_AUTO_HPKP_RULE_INFO                                                 = 8
+	CERT_CHAIN_AUTO_IMPERSONATED                                                   = 3
+	CERT_CHAIN_AUTO_LOCAL_MACHINE                                                  = 2
+	CERT_CHAIN_AUTO_LOG_CREATE_FLAG                                                = 0x00000002
+	CERT_CHAIN_AUTO_LOG_FLAGS                                                      = 14
+	CERT_CHAIN_AUTO_LOG_FLUSH_FLAG                                                 = 0x00000008
+	CERT_CHAIN_AUTO_LOG_FREE_FLAG                                                  = 0x00000004
+	CERT_CHAIN_AUTO_NETWORK_INFO                                                   = 6
+	CERT_CHAIN_AUTO_PINRULE_INFO                                                   = 5
+	CERT_CHAIN_AUTO_PROCESS_INFO                                                   = 4
+	CERT_CHAIN_AUTO_SERIAL_LOCAL_MACHINE                                           = 7
 	CERT_CHAIN_CACHE_END_CERT                                                      = 0x1
 	CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL                                            = 0x4
 	CERT_CHAIN_CRL_VALIDITY_EXT_PERIOD_HOURS_DEFAULT                               = 12
 	CERT_CHAIN_CROSS_CERT_DOWNLOAD_INTERVAL_HOURS_DEFAULT                          = 168
+	CERT_CHAIN_DISABLE_AIA                                                         = 0x2000
+	CERT_CHAIN_DISABLE_ALL_EKU_WEAK_FLAG                                           = 0x00010000
 	CERT_CHAIN_DISABLE_AUTH_ROOT_AUTO_UPDATE                                       = 0x100
+	CERT_CHAIN_DISABLE_CODE_SIGNING_WEAK_FLAG                                      = 0x00400000
+	CERT_CHAIN_DISABLE_FILE_HASH_WEAK_FLAG                                         = 0x00001000
+	CERT_CHAIN_DISABLE_FILE_HASH_WEAK_FLAGS                                        = 12288
 	CERT_CHAIN_DISABLE_MD2_MD4                                                     = 0x1000
+	CERT_CHAIN_DISABLE_MOTW_CODE_SIGNING_WEAK_FLAG                                 = 0x00800000
+	CERT_CHAIN_DISABLE_MOTW_FILE_HASH_WEAK_FLAG                                    = 0x00002000
+	CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_HASH_WEAK_FLAG                               = 0x00008000
+	CERT_CHAIN_DISABLE_MOTW_TIMESTAMP_WEAK_FLAG                                    = 0x08000000
 	CERT_CHAIN_DISABLE_MY_PEER_TRUST                                               = 0x800
+	CERT_CHAIN_DISABLE_OPT_IN_SERVER_AUTH_WEAK_FLAG                                = 0x00040000
 	CERT_CHAIN_DISABLE_PASS1_QUALITY_FILTERING                                     = 0x40
+	CERT_CHAIN_DISABLE_SERVER_AUTH_WEAK_FLAG                                       = 0x00100000
+	CERT_CHAIN_DISABLE_TIMESTAMP_HASH_WEAK_FLAG                                    = 0x00004000
+	CERT_CHAIN_DISABLE_TIMESTAMP_HASH_WEAK_FLAGS                                   = 49152
+	CERT_CHAIN_DISABLE_TIMESTAMP_WEAK_FLAG                                         = 0x04000000
+	CERT_CHAIN_DISABLE_WEAK_FLAGS                                                  = 215285760
+	CERT_CHAIN_ENABLE_ALL_EKU_HYGIENE_FLAG                                         = 0x00020000
 	CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE                                            = 0x10
+	CERT_CHAIN_ENABLE_CODE_SIGNING_HYGIENE_FLAG                                    = 0x01000000
+	CERT_CHAIN_ENABLE_HYGIENE_FLAGS                                                = 857866240
 	CERT_CHAIN_ENABLE_MD2_MD4_FLAG                                                 = 0x1
+	CERT_CHAIN_ENABLE_MOTW_CODE_SIGNING_HYGIENE_FLAG                               = 0x02000000
+	CERT_CHAIN_ENABLE_MOTW_TIMESTAMP_HYGIENE_FLAG                                  = 0x20000000
 	CERT_CHAIN_ENABLE_ONLY_WEAK_LOGGING_FLAG                                       = 0x8
 	CERT_CHAIN_ENABLE_PEER_TRUST                                                   = 0x400
+	CERT_CHAIN_ENABLE_SERVER_AUTH_HYGIENE_FLAG                                     = 0x00200000
 	CERT_CHAIN_ENABLE_SHARE_STORE                                                  = 0x20
+	CERT_CHAIN_ENABLE_TIMESTAMP_HYGIENE_FLAG                                       = 0x10000000
 	CERT_CHAIN_ENABLE_WEAK_LOGGING_FLAG                                            = 0x4
 	CERT_CHAIN_ENABLE_WEAK_RSA_ROOT_FLAG                                           = 0x2
+	CERT_CHAIN_ENABLE_WEAK_SETTINGS_FLAG                                           = 0x80000000
 	CERT_CHAIN_FIND_BY_ISSUER                                                      = 1
 	CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG                                      = 0x8000
 	CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG                                  = 0x4
@@ -1148,16 +1188,25 @@ const (
 	CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG                                   = 0x2
 	CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG                                   = 0x8
 	CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG                                          = 0x4000
+	CERT_CHAIN_HAS_MOTW                                                            = 0x4000
 	CERT_CHAIN_MAX_AIA_URL_COUNT_IN_CERT_DEFAULT                                   = 5
 	CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_BYTE_COUNT_DEFAULT                            = 100000
 	CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_CERT_COUNT_DEFAULT                            = 10
 	CERT_CHAIN_MAX_AIA_URL_RETRIEVAL_COUNT_PER_CHAIN_DEFAULT                       = 3
+	CERT_CHAIN_MAX_SSL_TIME_UPDATED_EVENT_COUNT_DEFAULT                            = 5
+	CERT_CHAIN_MAX_SSL_TIME_UPDATED_EVENT_COUNT_DISABLE                            = 0xFFFFFFFF
 	CERT_CHAIN_MAX_URL_RETRIEVAL_BYTE_COUNT_DEFAULT                                = 104857600
+	CERT_CHAIN_MIN_PUB_KEY_BIT_LENGTH_DISABLE                                      = 0xFFFFFFFF
 	CERT_CHAIN_MIN_RSA_PUB_KEY_BIT_LENGTH_DEFAULT                                  = 1023
 	CERT_CHAIN_MIN_RSA_PUB_KEY_BIT_LENGTH_DISABLE                                  = 0xffffffff
+	CERT_CHAIN_MOTW_IGNORE_AFTER_TIME_WEAK_FLAG                                    = 0x40000000
+	CERT_CHAIN_MOTW_WEAK_FLAGS                                                     = 1786773504
 	CERT_CHAIN_OCSP_VALIDITY_SECONDS_DEFAULT                                       = 43200
+	CERT_CHAIN_ONLY_ADDITIONAL_AND_AUTH_ROOT                                       = 0x8000
 	CERT_CHAIN_OPTION_DISABLE_AIA_URL_RETRIEVAL                                    = 0x2
 	CERT_CHAIN_OPTION_ENABLE_SIA_URL_RETRIEVAL                                     = 0x4
+	CERT_CHAIN_OPT_IN_WEAK_FLAGS                                                   = 262144
+	CERT_CHAIN_OPT_IN_WEAK_SIGNATURE                                               = 0x10000
 	CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG                                          = 0x8000
 	CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG                                        = 0x10
 	CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS                              = 7
@@ -1175,6 +1224,17 @@ const (
 	CERT_CHAIN_POLICY_IGNORE_PEER_TRUST_FLAG                                       = 0x1000
 	CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG                                 = 0x800
 	CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG                                      = 0x20
+	CERT_CHAIN_POLICY_SSL_F12_ERROR_LEVEL                                          = 2
+	CERT_CHAIN_POLICY_SSL_F12_NONE_CATEGORY                                        = 0
+	CERT_CHAIN_POLICY_SSL_F12_ROOT_PROGRAM_CATEGORY                                = 2
+	CERT_CHAIN_POLICY_SSL_F12_SUCCESS_LEVEL                                        = 0
+	CERT_CHAIN_POLICY_SSL_F12_WARNING_LEVEL                                        = 1
+	CERT_CHAIN_POLICY_SSL_F12_WEAK_CRYPTO_CATEGORY                                 = 1
+	CERT_CHAIN_POLICY_SSL_KEY_PIN_MISMATCH_ERROR                                   = -2
+	CERT_CHAIN_POLICY_SSL_KEY_PIN_MISMATCH_WARNING                                 = 2
+	CERT_CHAIN_POLICY_SSL_KEY_PIN_MITM_ERROR                                       = -1
+	CERT_CHAIN_POLICY_SSL_KEY_PIN_MITM_WARNING                                     = 1
+	CERT_CHAIN_POLICY_SSL_KEY_PIN_SUCCESS                                          = 0
 	CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG                                          = 0x4000
 	CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS                                       = 0x80
 	CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT                                     = 0x8000000
@@ -1192,6 +1252,7 @@ const (
 	CERT_CHAIN_WEAK_RSA_PUB_KEY_TIME_DEFAULT                                       = 0x01ca8a755c6e0000
 	CERT_CLOSE_STORE_CHECK_FLAG                                                    = 0x2
 	CERT_CLOSE_STORE_FORCE_FLAG                                                    = 0x1
+	CERT_CLR_DELETE_KEY_PROP_ID                                                    = 125
 	CERT_COMPARE_ANY                                                               = 0
 	CERT_COMPARE_ATTR                                                              = 3
 	CERT_COMPARE_CERT_ID                                                           = 16
@@ -1225,6 +1286,7 @@ const (
 	CERT_CREATE_CONTEXT_SORTED_FLAG                                                = 0x2
 	CERT_CREATE_SELFSIGN_NO_KEY_INFO                                               = 2
 	CERT_CREATE_SELFSIGN_NO_SIGN                                                   = 1
+	CERT_CRL_SIGN_KEY_USAGE                                                        = 0x02
 	CERT_CROSS_CERT_DIST_POINTS_PROP_ID                                            = 23
 	CERT_CTL_USAGE_PROP_ID                                                         = 9
 	CERT_DATA_ENCIPHERMENT_KEY_USAGE                                               = 0x10
@@ -1233,6 +1295,7 @@ const (
 	CERT_DESCRIPTION_PROP_ID                                                       = 13
 	CERT_DIGITAL_SIGNATURE_KEY_USAGE                                               = 0x80
 	CERT_DISALLOWED_CERT_CTL_FILENAME_A                                            = "disallowedcert.stl"
+	CERT_DISALLOWED_ENHKEY_USAGE_PROP_ID                                           = 122
 	CERT_DISALLOWED_FILETIME_PROP_ID                                               = 104
 	CERT_DSS_R_LEN                                                                 = 20
 	CERT_DSS_SIGNATURE_LEN                                                         = 40
@@ -1310,6 +1373,7 @@ const (
 	CERT_INFO_SUBJECT_PUBLIC_KEY_INFO_FLAG                                         = 8
 	CERT_INFO_SUBJECT_UNIQUE_ID_FLAG                                               = 10
 	CERT_INFO_VERSION_FLAG                                                         = 1
+	CERT_ISOLATED_KEY_PROP_ID                                                      = 118
 	CERT_ISSUER_CHAIN_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID                           = 96
 	CERT_ISSUER_CHAIN_SIGN_HASH_CNG_ALG_PROP_ID                                    = 95
 	CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID                                        = 24
@@ -1318,6 +1382,7 @@ const (
 	CERT_KEYGEN_REQUEST_V1                                                         = 0
 	CERT_KEY_AGREEMENT_KEY_USAGE                                                   = 0x08
 	CERT_KEY_CERT_SIGN_KEY_USAGE                                                   = 0x04
+	CERT_KEY_CLASSIFICATION_PROP_ID                                                = 120
 	CERT_KEY_CONTEXT_PROP_ID                                                       = 5
 	CERT_KEY_ENCIPHERMENT_KEY_USAGE                                                = 0x20
 	CERT_KEY_IDENTIFIER_PROP_ID                                                    = 20
@@ -1369,10 +1434,14 @@ const (
 	CERT_NCRYPT_KEY_SPEC                                                           = 0xffffffff
 	CERT_NEW_KEY_PROP_ID                                                           = 74
 	CERT_NEXT_UPDATE_LOCATION_PROP_ID                                              = 10
+	CERT_NONCOMPLIANT_ROOT_URL_PROP_ID                                             = 123
 	CERT_NON_REPUDIATION_KEY_USAGE                                                 = 0x40
+	CERT_NOT_BEFORE_ENHKEY_USAGE_PROP_ID                                           = 127
+	CERT_NOT_BEFORE_FILETIME_PROP_ID                                               = 126
 	CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID                                              = 77
 	CERT_NO_EXPIRE_NOTIFICATION_PROP_ID                                            = 97
 	CERT_OCSP_CACHE_PREFIX_PROP_ID                                                 = 75
+	CERT_OCSP_MUST_STAPLE_PROP_ID                                                  = 121
 	CERT_OCSP_RESPONSE_PROP_ID                                                     = 70
 	CERT_OFFLINE_CRL_SIGN_KEY_USAGE                                                = 0x02
 	CERT_OID_NAME_STR                                                              = 2
@@ -1381,6 +1450,8 @@ const (
 	CERT_PHYSICAL_STORE_OPEN_DISABLE_FLAG                                          = 0x2
 	CERT_PHYSICAL_STORE_PREDEFINED_ENUM_FLAG                                       = 0x1
 	CERT_PHYSICAL_STORE_REMOTE_OPEN_DISABLE_FLAG                                   = 0x4
+	CERT_PIN_RULES_CTL_FILENAME_A                                                  = "pinrules.stl"
+	CERT_PIN_SHA256_HASH_PROP_ID                                                   = 124
 	CERT_PROT_ROOT_DISABLE_CURRENT_USER_FLAG                                       = 0x1
 	CERT_PROT_ROOT_DISABLE_LM_AUTH_FLAG                                            = 0x8
 	CERT_PROT_ROOT_DISABLE_NOT_DEFINED_NAME_CONSTRAINT_FLAG                        = 0x20
@@ -1479,12 +1550,24 @@ const (
 	CERT_ROOT_PROGRAM_NAME_CONSTRAINTS_PROP_ID                                     = 84
 	CERT_SCARD_PIN_ID_PROP_ID                                                      = 90
 	CERT_SCARD_PIN_INFO_PROP_ID                                                    = 91
+	CERT_SCEP_CA_CERT_PROP_ID                                                      = 111
+	CERT_SCEP_ENCRYPT_HASH_CNG_ALG_PROP_ID                                         = 114
+	CERT_SCEP_FLAGS_PROP_ID                                                        = 115
+	CERT_SCEP_GUID_PROP_ID                                                         = 116
+	CERT_SCEP_NONCE_PROP_ID                                                        = 113
+	CERT_SCEP_RA_ENCRYPTION_CERT_PROP_ID                                           = 110
+	CERT_SCEP_RA_SIGNATURE_CERT_PROP_ID                                            = 109
+	CERT_SCEP_SERVER_CERTS_PROP_ID                                                 = 108
+	CERT_SCEP_SIGNER_CERT_PROP_ID                                                  = 112
 	CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID                                            = 102
+	CERT_SERIALIZABLE_KEY_CONTEXT_PROP_ID                                          = 117
+	CERT_SERIAL_CHAIN_PROP_ID                                                      = 119
 	CERT_SET_KEY_CONTEXT_PROP_ID                                                   = 0x1
 	CERT_SET_KEY_PROV_HANDLE_PROP_ID                                               = 0x1
 	CERT_SET_PROPERTY_IGNORE_PERSIST_ERROR_FLAG                                    = 0x80000000
 	CERT_SET_PROPERTY_INHIBIT_PERSIST_FLAG                                         = 0x40000000
 	CERT_SHA1_HASH_PROP_ID                                                         = 3
+	CERT_SHA256_HASH_PROP_ID                                                       = 107
 	CERT_SIGNATURE_HASH_PROP_ID                                                    = 15
 	CERT_SIGN_HASH_CNG_ALG_PROP_ID                                                 = 89
 	CERT_SIMPLE_NAME_STR                                                           = 1
@@ -1495,8 +1578,10 @@ const (
 	CERT_SOURCE_LOCATION_PROP_ID                                                   = 72
 	CERT_SOURCE_URL_PROP_ID                                                        = 73
 	CERT_SRV_OCSP_RESP_MAX_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT                      = 14400
+	CERT_SRV_OCSP_RESP_MAX_SYNC_CERT_FILE_SECONDS_DEFAULT                          = 3600
 	CERT_SRV_OCSP_RESP_MIN_AFTER_NEXT_UPDATE_SECONDS_DEFAULT                       = 60
 	CERT_SRV_OCSP_RESP_MIN_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT                      = 120
+	CERT_SRV_OCSP_RESP_MIN_SYNC_CERT_FILE_SECONDS_DEFAULT                          = 5
 	CERT_SRV_OCSP_RESP_MIN_VALIDITY_SECONDS_DEFAULT                                = 600
 	CERT_SRV_OCSP_RESP_URL_RETRIEVAL_TIMEOUT_MILLISECONDS_DEFAULT                  = 15000
 	CERT_STORE_ADD_ALWAYS                                                          = 4
@@ -1606,6 +1691,8 @@ const (
 	CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY                                   = 524288
 	CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID                                = 8
 	CERT_SYSTEM_STORE_LOCAL_MACHINE_ID                                             = 2
+	CERT_SYSTEM_STORE_LOCAL_MACHINE_WCOS                                           = 655360
+	CERT_SYSTEM_STORE_LOCAL_MACHINE_WCOS_ID                                        = 10
 	CERT_SYSTEM_STORE_LOCATION_MASK                                                = 0x00ff0000
 	CERT_SYSTEM_STORE_LOCATION_SHIFT                                               = 16
 	CERT_SYSTEM_STORE_MASK                                                         = 0xffff0000
@@ -1637,10 +1724,11 @@ const (
 	CERT_TRUST_INVALID_EXTENSION                                                   = 0x100
 	CERT_TRUST_INVALID_NAME_CONSTRAINTS                                            = 0x800
 	CERT_TRUST_INVALID_POLICY_CONSTRAINTS                                          = 0x200
-	CERT_TRUST_IS_COMPLEX_CHAIN                                                    = 0x10000
+	CERT_TRUST_IS_COMPLEX_CHAIN                                                    = 0x00010000
 	CERT_TRUST_IS_CYCLIC                                                           = 0x80
 	CERT_TRUST_IS_EXPLICIT_DISTRUST                                                = 0x4000000
 	CERT_TRUST_IS_FROM_EXCLUSIVE_TRUST_STORE                                       = 0x2000
+	CERT_TRUST_IS_KEY_ROLLOVER                                                     = 0x00000080
 	CERT_TRUST_IS_NOT_SIGNATURE_VALID                                              = 0x8
 	CERT_TRUST_IS_NOT_TIME_NESTED                                                  = 0x2
 	CERT_TRUST_IS_NOT_TIME_VALID                                                   = 0x1
@@ -1654,6 +1742,7 @@ const (
 	CERT_TRUST_NO_ERROR                                                            = 0x0
 	CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY                                            = 0x2000000
 	CERT_TRUST_NO_OCSP_FAILOVER_TO_CRL                                             = 0x40
+	CERT_TRUST_NO_TIME_CHECK                                                       = 0x02000000
 	CERT_TRUST_PUB_ALLOW_END_USER_TRUST                                            = 0x0
 	CERT_TRUST_PUB_ALLOW_ENTERPRISE_ADMIN_TRUST                                    = 0x2
 	CERT_TRUST_PUB_ALLOW_MACHINE_ADMIN_TRUST                                       = 0x1
@@ -1661,6 +1750,10 @@ const (
 	CERT_TRUST_PUB_CHECK_PUBLISHER_REV_FLAG                                        = 0x100
 	CERT_TRUST_PUB_CHECK_TIMESTAMP_REV_FLAG                                        = 0x200
 	CERT_TRUST_REVOCATION_STATUS_UNKNOWN                                           = 0x40
+	CERT_TRUST_SSL_HANDSHAKE_OCSP                                                  = 0x00040000
+	CERT_TRUST_SSL_RECONNECT_OCSP                                                  = 0x00100000
+	CERT_TRUST_SSL_TIME_VALID                                                      = 0x01000000
+	CERT_TRUST_SSL_TIME_VALID_OCSP                                                 = 0x00080000
 	CERT_UNICODE_ATTR_ERR_INDEX_MASK                                               = 0x3f
 	CERT_UNICODE_ATTR_ERR_INDEX_SHIFT                                              = 16
 	CERT_UNICODE_IS_RDN_ATTRS_FLAG                                                 = 0x1
@@ -1697,6 +1790,9 @@ const (
 	CFERR_CHOOSEFONTCODES                                                          = 0x2000
 	CFERR_MAXLESSTHANMIN                                                           = 0x2002
 	CFERR_NOFONTS                                                                  = 0x2001
+	CFG_CALL_TARGET_CONVERT_EXPORT_SUPPRESSED_TO_VALID                             = 0x04
+	CFG_CALL_TARGET_PROCESSED                                                      = 0x02
+	CFG_CALL_TARGET_VALID                                                          = 0x01
 	CFSEPCHAR                                                                      = 43
 	CFS_CANDIDATEPOS                                                               = 0x0040
 	CFS_DEFAULT                                                                    = 0x0000
@@ -2014,6 +2110,7 @@ const (
 	CMSG_SIGNED_AND_ENVELOPED                                                      = 4
 	CMSG_SIGNED_AND_ENVELOPED_FLAG                                                 = 16
 	CMSG_SIGNED_DATA_CMS_VERSION                                                   = 3
+	CMSG_SIGNED_DATA_NO_SIGN_FLAG                                                  = 0x80
 	CMSG_SIGNED_DATA_PKCS_1_5_VERSION                                              = 1
 	CMSG_SIGNED_DATA_V1                                                            = 1
 	CMSG_SIGNED_DATA_V3                                                            = 3
@@ -2138,6 +2235,7 @@ const (
 	COM_RIGHTS_EXECUTE                                                             = 1
 	COM_RIGHTS_EXECUTE_LOCAL                                                       = 2
 	COM_RIGHTS_EXECUTE_REMOTE                                                      = 4
+	CONCURRENCYSAL_HXX                                                             = 0
 	CONDITION_VARIABLE_LOCKMODE_SHARED                                             = 1
 	CONFIRMSAFETYACTION_LOADOBJECT                                                 = 0x1
 	CONNDLG_CONN_POINT                                                             = 0x00000002
@@ -2268,6 +2366,8 @@ const (
 	CRL_FIND_ISSUED_BY_SIGNATURE_FLAG                                              = 0x2
 	CRL_FIND_ISSUED_FOR                                                            = 3
 	CRL_FIND_ISSUED_FOR_SET_STRONG_PROPERTIES_FLAG                                 = 0x10
+	CRL_REASON_AA_COMPROMISE                                                       = 10
+	CRL_REASON_AA_COMPROMISE_FLAG                                                  = 0x80
 	CRL_REASON_AFFILIATION_CHANGED                                                 = 3
 	CRL_REASON_AFFILIATION_CHANGED_FLAG                                            = 0x10
 	CRL_REASON_CA_COMPROMISE                                                       = 2
@@ -2278,6 +2378,8 @@ const (
 	CRL_REASON_CESSATION_OF_OPERATION_FLAG                                         = 0x04
 	CRL_REASON_KEY_COMPROMISE                                                      = 1
 	CRL_REASON_KEY_COMPROMISE_FLAG                                                 = 0x40
+	CRL_REASON_PRIVILEGE_WITHDRAWN                                                 = 9
+	CRL_REASON_PRIVILEGE_WITHDRAWN_FLAG                                            = 0x01
 	CRL_REASON_REMOVE_FROM_CRL                                                     = 8
 	CRL_REASON_SUPERSEDED                                                          = 4
 	CRL_REASON_SUPERSEDED_FLAG                                                     = 0x08
@@ -2292,6 +2394,13 @@ const (
 	CROSS_CERT_DIST_POINT_ERR_INDEX_SHIFT                                          = 24
 	CRYPTNET_CACHED_OCSP_SWITCH_TO_CRL_COUNT_DEFAULT                               = 50
 	CRYPTNET_CRL_BEFORE_OCSP_ENABLE                                                = 0xffffffff
+	CRYPTNET_CRL_PRE_FETCH_MAX_AGE_SECONDS_DEFAULT                                 = 7200
+	CRYPTNET_CRL_PRE_FETCH_MAX_AGE_SECONDS_MIN                                     = 300
+	CRYPTNET_CRL_PRE_FETCH_MIN_AFTER_NEXT_UPDATE_SECONDS_DEFAULT                   = 300
+	CRYPTNET_CRL_PRE_FETCH_MIN_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT                  = 300
+	CRYPTNET_CRL_PRE_FETCH_PUBLISH_BEFORE_NEXT_UPDATE_SECONDS_DEFAULT              = 3600
+	CRYPTNET_CRL_PRE_FETCH_PUBLISH_RANDOM_INTERVAL_SECONDS_DEFAULT                 = 300
+	CRYPTNET_CRL_PRE_FETCH_TIMEOUT_SECONDS_DEFAULT                                 = 300
 	CRYPTNET_MAX_CACHED_OCSP_PER_CRL_COUNT_DEFAULT                                 = 500
 	CRYPTNET_OCSP_AFTER_CRL_DISABLE                                                = 0xffffffff
 	CRYPTNET_PRE_FETCH_AFTER_CURRENT_TIME_PRE_FETCH_PERIOD_SECONDS_DEFAULT         = 1800
@@ -2317,6 +2426,7 @@ const (
 	CRYPTNET_URL_CACHE_PRE_FETCH_DISALLOWED_CERT_CAB                               = 6
 	CRYPTNET_URL_CACHE_PRE_FETCH_NONE                                              = 0
 	CRYPTNET_URL_CACHE_PRE_FETCH_OCSP                                              = 3
+	CRYPTNET_URL_CACHE_PRE_FETCH_PIN_RULES_CAB                                     = 7
 	CRYPTNET_URL_CACHE_RESPONSE_HTTP                                               = 1
 	CRYPTNET_URL_CACHE_RESPONSE_NONE                                               = 0
 	CRYPTNET_URL_CACHE_RESPONSE_VALIDATED                                          = 0x8000
@@ -2362,6 +2472,7 @@ const (
 	CRYPT_CACHE_ONLY_RETRIEVAL                                                     = 0x2
 	CRYPT_CHECK_FRESHNESS_TIME_VALIDITY                                            = 0x400
 	CRYPT_CREATE_IV                                                                = 0x200
+	CRYPT_CREATE_NEW_FLUSH_ENTRY                                                   = 0x10000000
 	CRYPT_CREATE_SALT                                                              = 0x4
 	CRYPT_DATA_KEY                                                                 = 0x800
 	CRYPT_DECODE_ALLOC_FLAG                                                        = 0x8000
@@ -2389,6 +2500,7 @@ const (
 	CRYPT_DONT_VERIFY_SIGNATURE                                                    = 0x100
 	CRYPT_ECC_CMS_SHARED_INFO_SUPPPUBINFO_BYTE_LENGTH                              = 4
 	CRYPT_ECC_PRIVATE_KEY_INFO_v1                                                  = 1
+	CRYPT_ENABLE_FILE_RETRIEVAL                                                    = 0x08000000
 	CRYPT_ENABLE_SSL_REVOCATION_RETRIEVAL                                          = 0x800000
 	CRYPT_ENCODE_ALLOC_FLAG                                                        = 0x8000
 	CRYPT_ENCODE_DECODE_NONE                                                       = 0
@@ -2538,6 +2650,8 @@ const (
 	CRYPT_OID_SIGN_AND_ENCODE_HASH_FUNC                                            = "CryptDllSignAndEncodeHash"
 	CRYPT_OID_UNREGISTER_PHYSICAL_STORE_FUNC                                       = "CertDllUnregisterPhysicalStore"
 	CRYPT_OID_UNREGISTER_SYSTEM_STORE_FUNC                                         = "CertDllUnregisterSystemStore"
+	CRYPT_OID_USE_CURVE_NAME_FOR_ENCODE_FLAG                                       = 0x20000000
+	CRYPT_OID_USE_CURVE_PARAMETERS_FOR_ENCODE_FLAG                                 = 0x10000000
 	CRYPT_OID_USE_PUBKEY_PARA_FOR_PKCS7_FLAG                                       = 0x2
 	CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC                                 = "CertDllVerifyCertificateChainPolicy"
 	CRYPT_OID_VERIFY_CTL_USAGE_FUNC                                                = "CertDllVerifyCTLUsage"
@@ -2565,6 +2679,7 @@ const (
 	CRYPT_RECIPIENT                                                                = 0x10
 	CRYPT_REGISTER_FIRST_INDEX                                                     = 0
 	CRYPT_REGISTER_LAST_INDEX                                                      = 0xffffffff
+	CRYPT_RETRIEVE_MAX_ERROR_CONTENT_LENGTH                                        = 0x1000
 	CRYPT_RETRIEVE_MULTIPLE_OBJECTS                                                = 0x1
 	CRYPT_SECRETDIGEST                                                             = 0x1
 	CRYPT_SEC_DESCR                                                                = 0x1
@@ -2582,9 +2697,11 @@ const (
 	CRYPT_STRING_BASE64                                                            = 0x1
 	CRYPT_STRING_BASE64HEADER                                                      = 0x0
 	CRYPT_STRING_BASE64REQUESTHEADER                                               = 0x00000003
+	CRYPT_STRING_BASE64URI                                                         = 0x0000000d
 	CRYPT_STRING_BASE64X509CRLHEADER                                               = 0x00000009
 	CRYPT_STRING_BASE64_ANY                                                        = 0x00000006
 	CRYPT_STRING_BINARY                                                            = 0x2
+	CRYPT_STRING_ENCODEMASK                                                        = 0x000000ff
 	CRYPT_STRING_HASHDATA                                                          = 0x10000000
 	CRYPT_STRING_HEX                                                               = 0x4
 	CRYPT_STRING_HEXADDR                                                           = 0x0000000a
@@ -2594,6 +2711,9 @@ const (
 	CRYPT_STRING_HEX_ANY                                                           = 0x8
 	CRYPT_STRING_NOCR                                                              = 0x80000000
 	CRYPT_STRING_NOCRLF                                                            = 0x40000000
+	CRYPT_STRING_PERCENTESCAPE                                                     = 0x08000000
+	CRYPT_STRING_RESERVED100                                                       = 0x00000100
+	CRYPT_STRING_RESERVED200                                                       = 0x00000200
 	CRYPT_STRING_STRICT                                                            = 0x20000000
 	CRYPT_SUCCEED                                                                  = 1
 	CRYPT_TEMPLATE_OID_GROUP_ID                                                    = 9
@@ -2797,6 +2917,7 @@ const (
 	CT_CTYPE1                                                                      = 0x00000001
 	CT_CTYPE2                                                                      = 0x00000002
 	CT_CTYPE3                                                                      = 0x00000004
+	CURRENT_IMPORT_REDIRECTION_VERSION                                             = 1
 	CURSOR_FAULT                                                                   = 4
 	CURSOR_INVALID                                                                 = 1
 	CURSOR_REQUIRESEEK                                                             = 3
@@ -3043,6 +3164,7 @@ const (
 	DIFFERENCE                                                                     = 11
 	DIRECT_MODE                                                                    = 0
 	DISABLE_MAX_PRIVILEGE                                                          = 0x1
+	DISABLE_NEWLINE_AUTO_RETURN                                                    = 0x8
 	DISABLE_SMART                                                                  = 0xD9
 	DISCHARGE_POLICY_CRITICAL                                                      = 0
 	DISCHARGE_POLICY_LOW                                                           = 1
@@ -3072,6 +3194,7 @@ const (
 	DISPLAY_DEVICE_MODESPRUNED                                                     = 0x08000000
 	DISPLAY_DEVICE_MULTI_DRIVER                                                    = 0x00000002
 	DISPLAY_DEVICE_PRIMARY_DEVICE                                                  = 0x00000004
+	DISPLAY_DEVICE_RDPUDD                                                          = 0x01000000
 	DISPLAY_DEVICE_REMOTE                                                          = 0x04000000
 	DISPLAY_DEVICE_REMOVABLE                                                       = 0x00000020
 	DISPLAY_DEVICE_TS_COMPATIBLE                                                   = 0x00200000
@@ -3556,6 +3679,7 @@ const (
 	DRAGDROP_S_FIRST                                                               = 262400
 	DRAGDROP_S_LAST                                                                = 262415
 	DRAWPATTERNRECT                                                                = 25
+	DRIVERSPECS_H                                                                  = 0
 	DRIVERVERSION                                                                  = 0
 	DRIVER_KERNELMODE                                                              = 0x00000001
 	DRIVER_USERMODE                                                                = 0x00000002
@@ -3698,6 +3822,7 @@ const (
 	EDGE_SUNKEN                                                                    = 10
 	EDOM                                                                           = 33
 	EDS_RAWMODE                                                                    = 0x00000002
+	EDS_ROTATEDMODE                                                                = 0x00000004
 	EEInfoGCCOM                                                                    = 11
 	EEInfoGCFRS                                                                    = 12
 	EEInfoNextRecordsMissing                                                       = 2
@@ -3950,11 +4075,14 @@ const (
 	ENABLE_EXTENDED_FLAGS                                                          = 0x80
 	ENABLE_INSERT_MODE                                                             = 0x20
 	ENABLE_LINE_INPUT                                                              = 0x2
+	ENABLE_LVB_GRID_WORLDWIDE                                                      = 0x10
 	ENABLE_MOUSE_INPUT                                                             = 0x10
 	ENABLE_PROCESSED_INPUT                                                         = 0x1
 	ENABLE_PROCESSED_OUTPUT                                                        = 0x1
 	ENABLE_QUICK_EDIT_MODE                                                         = 0x40
 	ENABLE_SMART                                                                   = 0xD8
+	ENABLE_VIRTUAL_TERMINAL_INPUT                                                  = 0x200
+	ENABLE_VIRTUAL_TERMINAL_PROCESSING                                             = 0x4
 	ENABLE_WINDOW_INPUT                                                            = 0x8
 	ENABLE_WRAP_AT_EOL_OUTPUT                                                      = 0x2
 	ENAMETOOLONG                                                                   = 38
@@ -5977,7 +6105,9 @@ const (
 	EV_RXFLAG                                                                      = 0x2
 	EV_TXEMPTY                                                                     = 0x4
 	EWOULDBLOCK                                                                    = 140
+	EWX_ARSO                                                                       = 0x04000000
 	EWX_BOOTOPTIONS                                                                = 0x01000000
+	EWX_CHECK_SAFE_FOR_SERVER                                                      = 0x08000000
 	EWX_FORCE                                                                      = 0x00000004
 	EWX_FORCEIFHUNG                                                                = 0x00000010
 	EWX_HYBRID_SHUTDOWN                                                            = 0x00400000
@@ -6177,21 +6307,29 @@ const (
 	FILE_DEVICE_ACPI                                                               = 0x00000032
 	FILE_DEVICE_BATTERY                                                            = 0x00000029
 	FILE_DEVICE_BEEP                                                               = 0x00000001
+	FILE_DEVICE_BIOMETRIC                                                          = 0x00000044
+	FILE_DEVICE_BLUETOOTH                                                          = 0x00000041
 	FILE_DEVICE_BUS_EXTENDER                                                       = 0x0000002a
 	FILE_DEVICE_CD_ROM                                                             = 0x00000002
 	FILE_DEVICE_CD_ROM_FILE_SYSTEM                                                 = 0x00000003
 	FILE_DEVICE_CHANGER                                                            = 0x00000030
+	FILE_DEVICE_CONSOLE                                                            = 0x00000050
 	FILE_DEVICE_CONTROLLER                                                         = 0x00000004
+	FILE_DEVICE_CRYPT_PROVIDER                                                     = 0x0000003F
 	FILE_DEVICE_DATALINK                                                           = 0x00000005
+	FILE_DEVICE_DEVAPI                                                             = 0x00000047
 	FILE_DEVICE_DFS                                                                = 0x00000006
 	FILE_DEVICE_DFS_FILE_SYSTEM                                                    = 0x00000035
 	FILE_DEVICE_DFS_VOLUME                                                         = 0x00000036
 	FILE_DEVICE_DISK                                                               = 0x00000007
 	FILE_DEVICE_DISK_FILE_SYSTEM                                                   = 0x00000008
 	FILE_DEVICE_DVD                                                                = 0x00000033
+	FILE_DEVICE_EHSTOR                                                             = 0x00000046
 	FILE_DEVICE_FILE_SYSTEM                                                        = 0x00000009
 	FILE_DEVICE_FIPS                                                               = 0x0000003A
 	FILE_DEVICE_FULLSCREEN_VIDEO                                                   = 0x00000034
+	FILE_DEVICE_GPIO                                                               = 0x00000048
+	FILE_DEVICE_HOLOGRAPHIC                                                        = 0x0000005b
 	FILE_DEVICE_INFINIBAND                                                         = 0x0000003B
 	FILE_DEVICE_INPORT_PORT                                                        = 0x0000000a
 	FILE_DEVICE_KEYBOARD                                                           = 0x0000000b
@@ -6203,35 +6341,53 @@ const (
 	FILE_DEVICE_MIDI_OUT                                                           = 0x0000000e
 	FILE_DEVICE_MODEM                                                              = 0x0000002b
 	FILE_DEVICE_MOUSE                                                              = 0x0000000f
+	FILE_DEVICE_MT_COMPOSITE                                                       = 0x00000042
+	FILE_DEVICE_MT_TRANSPORT                                                       = 0x00000043
 	FILE_DEVICE_MULTI_UNC_PROVIDER                                                 = 0x00000010
 	FILE_DEVICE_NAMED_PIPE                                                         = 0x00000011
 	FILE_DEVICE_NETWORK                                                            = 0x00000012
 	FILE_DEVICE_NETWORK_BROWSER                                                    = 0x00000013
 	FILE_DEVICE_NETWORK_FILE_SYSTEM                                                = 0x00000014
 	FILE_DEVICE_NETWORK_REDIRECTOR                                                 = 0x00000028
+	FILE_DEVICE_NFP                                                                = 0x00000051
 	FILE_DEVICE_NULL                                                               = 0x00000015
+	FILE_DEVICE_NVDIMM                                                             = 0x0000005a
 	FILE_DEVICE_PARALLEL_PORT                                                      = 0x00000016
+	FILE_DEVICE_PERSISTENT_MEMORY                                                  = 0x00000059
 	FILE_DEVICE_PHYSICAL_NETCARD                                                   = 0x00000017
+	FILE_DEVICE_PMI                                                                = 0x00000045
+	FILE_DEVICE_POINT_OF_SERVICE                                                   = 0x00000054
 	FILE_DEVICE_PRINTER                                                            = 0x00000018
 	FILE_DEVICE_SCANNER                                                            = 0x00000019
 	FILE_DEVICE_SCREEN                                                             = 0x0000001c
+	FILE_DEVICE_SDFXHCI                                                            = 0x0000005c
 	FILE_DEVICE_SERENUM                                                            = 0x00000037
 	FILE_DEVICE_SERIAL_MOUSE_PORT                                                  = 0x0000001a
 	FILE_DEVICE_SERIAL_PORT                                                        = 0x0000001b
 	FILE_DEVICE_SMARTCARD                                                          = 0x00000031
 	FILE_DEVICE_SMB                                                                = 0x0000002e
 	FILE_DEVICE_SOUND                                                              = 0x0000001d
+	FILE_DEVICE_STORAGE_REPLICATION                                                = 0x00000055
 	FILE_DEVICE_STREAMS                                                            = 0x0000001e
+	FILE_DEVICE_SYSENV                                                             = 0x00000052
 	FILE_DEVICE_TAPE                                                               = 0x0000001f
 	FILE_DEVICE_TAPE_FILE_SYSTEM                                                   = 0x00000020
 	FILE_DEVICE_TERMSRV                                                            = 0x00000038
 	FILE_DEVICE_TRANSPORT                                                          = 0x00000021
+	FILE_DEVICE_TRUST_ENV                                                          = 0x00000056
+	FILE_DEVICE_UCM                                                                = 0x00000057
+	FILE_DEVICE_UCMTCPCI                                                           = 0x00000058
+	FILE_DEVICE_UCMUCSI                                                            = 0x0000005d
 	FILE_DEVICE_UNKNOWN                                                            = 0x00000022
+	FILE_DEVICE_USBEX                                                              = 0x00000049
 	FILE_DEVICE_VDM                                                                = 0x0000002c
 	FILE_DEVICE_VIDEO                                                              = 0x00000023
+	FILE_DEVICE_VIRTUAL_BLOCK                                                      = 0x00000053
 	FILE_DEVICE_VIRTUAL_DISK                                                       = 0x00000024
+	FILE_DEVICE_VMBUS                                                              = 0x0000003E
 	FILE_DEVICE_WAVE_IN                                                            = 0x00000025
 	FILE_DEVICE_WAVE_OUT                                                           = 0x00000026
+	FILE_DEVICE_WPD                                                                = 0x00000040
 	FILE_DIRECTORY_FILE                                                            = 0x00000001
 	FILE_DIR_DISALLOWED                                                            = 9
 	FILE_ENCRYPTABLE                                                               = 0
@@ -6259,8 +6415,10 @@ const (
 	FILE_MAP_ALL_ACCESS                                                            = 983071
 	FILE_MAP_COPY                                                                  = 0x1
 	FILE_MAP_EXECUTE                                                               = 32
+	FILE_MAP_LARGE_PAGES                                                           = 0x20000000
 	FILE_MAP_READ                                                                  = 4
 	FILE_MAP_RESERVE                                                               = 0x80000000
+	FILE_MAP_TARGETS_INVALID                                                       = 0x40000000
 	FILE_MAP_WRITE                                                                 = 2
 	FILE_MAXIMUM_DISPOSITION                                                       = 0x00000005
 	FILE_NAMED_STREAMS                                                             = 0x00040000
@@ -6333,6 +6491,9 @@ const (
 	FILE_UNICODE_ON_DISK                                                           = 0x00000004
 	FILE_UNKNOWN                                                                   = 5
 	FILE_USER_DISALLOWED                                                           = 7
+	FILE_VER_GET_LOCALISED                                                         = 0x01
+	FILE_VER_GET_NEUTRAL                                                           = 0x02
+	FILE_VER_GET_PREFETCHED                                                        = 0x04
 	FILE_VOLUME_IS_COMPRESSED                                                      = 0x00008000
 	FILE_VOLUME_QUOTAS                                                             = 0x00000020
 	FILE_WRITE_ACCESS                                                              = 2
@@ -6712,7 +6873,7 @@ const (
 	GA_ROOT                                                                        = 2
 	GA_ROOTOWNER                                                                   = 3
 	GB2312_CHARSET                                                                 = 134
-	GCC_VERSION                                                                    = 8003000
+	GCC_VERSION                                                                    = 10000000
 	GCLP_HBRBACKGROUND                                                             = -10
 	GCLP_HCURSOR                                                                   = -12
 	GCLP_HICON                                                                     = -14
@@ -6951,6 +7112,7 @@ const (
 	HCF_HOTKEYSOUND                                                                = 0x00000010
 	HCF_INDICATOR                                                                  = 0x00000020
 	HCF_LOGONDESKTOP                                                               = 0x00000100
+	HCF_OPTION_NOTHEMECHANGE                                                       = 0x00001000
 	HCRYPTPROV_DEFINED                                                             = 0
 	HC_ACTION                                                                      = 0
 	HC_GETNEXT                                                                     = 1
@@ -7004,6 +7166,7 @@ const (
 	HIGH_SURROGATE_END                                                             = 0xdbff
 	HIGH_SURROGATE_START                                                           = 0xd800
 	HINSTANCE_ERROR                                                                = 32
+	HISTORY_NO_DUP_FLAG                                                            = 0x1
 	HIST_NO_OF_BUCKETS                                                             = 24
 	HKL_NEXT                                                                       = 1
 	HKL_PREV                                                                       = 0
@@ -7928,23 +8091,53 @@ const (
 	IOC_VOID                                                                       = 0x20000000
 	IO_COMPLETION_ALL_ACCESS                                                       = 2031619
 	IO_COMPLETION_MODIFY_STATE                                                     = 0x0002
+	IO_REPARSE_TAG_AF_UNIX                                                         = 2147483683
+	IO_REPARSE_TAG_APPEXECLINK                                                     = 2147483675
+	IO_REPARSE_TAG_CLOUD                                                           = 2415919130
+	IO_REPARSE_TAG_CLOUD_1                                                         = 2415923226
+	IO_REPARSE_TAG_CLOUD_2                                                         = 2415927322
+	IO_REPARSE_TAG_CLOUD_3                                                         = 2415931418
+	IO_REPARSE_TAG_CLOUD_4                                                         = 2415935514
+	IO_REPARSE_TAG_CLOUD_5                                                         = 2415939610
+	IO_REPARSE_TAG_CLOUD_6                                                         = 2415943706
+	IO_REPARSE_TAG_CLOUD_7                                                         = 2415947802
+	IO_REPARSE_TAG_CLOUD_8                                                         = 2415951898
+	IO_REPARSE_TAG_CLOUD_9                                                         = 2415955994
+	IO_REPARSE_TAG_CLOUD_A                                                         = 2415960090
+	IO_REPARSE_TAG_CLOUD_B                                                         = 2415964186
+	IO_REPARSE_TAG_CLOUD_C                                                         = 2415968282
+	IO_REPARSE_TAG_CLOUD_D                                                         = 2415972378
+	IO_REPARSE_TAG_CLOUD_E                                                         = 2415976474
+	IO_REPARSE_TAG_CLOUD_F                                                         = 2415980570
+	IO_REPARSE_TAG_CLOUD_MASK                                                      = 61440
 	IO_REPARSE_TAG_CSV                                                             = 2147483657
 	IO_REPARSE_TAG_DEDUP                                                           = 2147483667
 	IO_REPARSE_TAG_DFS                                                             = 2147483658
 	IO_REPARSE_TAG_DFSR                                                            = 2147483666
 	IO_REPARSE_TAG_DRIVE_EXTENDER                                                  = 2147483653
+	IO_REPARSE_TAG_FILE_PLACEHOLDER                                                = 2147483669
 	IO_REPARSE_TAG_FILTER_MANAGER                                                  = 2147483659
+	IO_REPARSE_TAG_GLOBAL_REPARSE                                                  = 2684354585
 	IO_REPARSE_TAG_HSM                                                             = 3221225476
 	IO_REPARSE_TAG_HSM2                                                            = 2147483654
 	IO_REPARSE_TAG_IIS_CACHE                                                       = 2684354576
 	IO_REPARSE_TAG_MOUNT_POINT                                                     = 2684354563
 	IO_REPARSE_TAG_NFS                                                             = 2147483668
+	IO_REPARSE_TAG_ONEDRIVE                                                        = 2147483681
+	IO_REPARSE_TAG_PROJFS                                                          = 2415919132
+	IO_REPARSE_TAG_PROJFS_TOMBSTONE                                                = 2684354594
 	IO_REPARSE_TAG_RESERVED_ONE                                                    = 1
 	IO_REPARSE_TAG_RESERVED_RANGE                                                  = 1
 	IO_REPARSE_TAG_RESERVED_ZERO                                                   = 0
 	IO_REPARSE_TAG_SIS                                                             = 2147483655
+	IO_REPARSE_TAG_STORAGE_SYNC                                                    = 2147483678
 	IO_REPARSE_TAG_SYMLINK                                                         = 2684354572
+	IO_REPARSE_TAG_UNHANDLED                                                       = 2147483680
+	IO_REPARSE_TAG_WCI                                                             = 2147483672
+	IO_REPARSE_TAG_WCI_1                                                           = 2415923224
+	IO_REPARSE_TAG_WCI_TOMBSTONE                                                   = 2684354591
 	IO_REPARSE_TAG_WIM                                                             = 2147483656
+	IO_REPARSE_TAG_WOF                                                             = 2147483671
 	IPPORT_BIFFUDP                                                                 = 512
 	IPPORT_CMDSERVER                                                               = 514
 	IPPORT_DAYTIME                                                                 = 13
@@ -8639,8 +8832,10 @@ const (
 	LLKHF_ALTDOWN                                                                  = 32
 	LLKHF_EXTENDED                                                                 = 1
 	LLKHF_INJECTED                                                                 = 0x00000010
+	LLKHF_LOWER_IL_INJECTED                                                        = 0x00000002
 	LLKHF_UP                                                                       = 128
 	LLMHF_INJECTED                                                                 = 0x00000001
+	LLMHF_LOWER_IL_INJECTED                                                        = 0x00000002
 	LLONG_MAX                                                                      = 9223372036854775807
 	LLONG_MIN                                                                      = -9223372036854775808
 	LMEM_DISCARDABLE                                                               = 0xf00
@@ -8664,6 +8859,7 @@ const (
 	LOAD_LIBRARY_SEARCH_DEFAULT_DIRS                                               = 0x1000
 	LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR                                               = 0x100
 	LOAD_LIBRARY_SEARCH_SYSTEM32                                                   = 0x800
+	LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER                                      = 2048
 	LOAD_LIBRARY_SEARCH_USER_DIRS                                                  = 0x400
 	LOAD_TLB_AS_32BIT                                                              = 0x20
 	LOAD_TLB_AS_64BIT                                                              = 0x40
@@ -9493,17 +9689,30 @@ const (
 	MEMBERID_NIL                                                                   = -1
 	MEMJOURNAL_DFLT_FILECHUNKSIZE                                                  = 1024
 	MEMORY_ALLOCATION_ALIGNMENT                                                    = 16
+	MEMORY_PRIORITY_BELOW_NORMAL                                                   = 4
+	MEMORY_PRIORITY_LOW                                                            = 2
+	MEMORY_PRIORITY_MEDIUM                                                         = 3
+	MEMORY_PRIORITY_NORMAL                                                         = 5
+	MEMORY_PRIORITY_VERY_LOW                                                       = 1
 	MEMTYPE_HEAP                                                                   = 0x01
 	MEMTYPE_LOOKASIDE                                                              = 0x02
 	MEMTYPE_PCACHE                                                                 = 0x04
 	MEM_4MB_PAGES                                                                  = 0x80000000
+	MEM_64K_PAGES                                                                  = 541065216
 	MEM_AffMask                                                                    = 0x003f
 	MEM_Agg                                                                        = 0x2000
 	MEM_Blob                                                                       = 0x0010
 	MEM_COMMIT                                                                     = 0x1000
 	MEM_Cleared                                                                    = 0x0100
 	MEM_DECOMMIT                                                                   = 0x4000
+	MEM_DIFFERENT_IMAGE_BASE_OK                                                    = 0x800000
 	MEM_Dyn                                                                        = 0x0400
+	MEM_EXTENDED_PARAMETER_GRAPHICS                                                = 0x01
+	MEM_EXTENDED_PARAMETER_NONPAGED                                                = 0x02
+	MEM_EXTENDED_PARAMETER_NONPAGED_HUGE                                           = 0x10
+	MEM_EXTENDED_PARAMETER_NONPAGED_LARGE                                          = 0x08
+	MEM_EXTENDED_PARAMETER_TYPE_BITS                                               = 8
+	MEM_EXTENDED_PARAMETER_ZERO_PAGES_OPTIONAL                                     = 0x04
 	MEM_Ephem                                                                      = 0x1000
 	MEM_FREE                                                                       = 0x10000
 	MEM_FromBind                                                                   = 0x0040
@@ -9518,6 +9727,7 @@ const (
 	MEM_RELEASE                                                                    = 0x8000
 	MEM_RESERVE                                                                    = 0x2000
 	MEM_RESET                                                                      = 0x80000
+	MEM_RESET_UNDO                                                                 = 0x1000000
 	MEM_ROTATE                                                                     = 0x800000
 	MEM_Real                                                                       = 0x0008
 	MEM_Static                                                                     = 0x0800
@@ -9674,8 +9884,9 @@ const (
 	MH_CREATE                                                                      = 1
 	MH_DELETE                                                                      = 3
 	MH_KEEP                                                                        = 2
-	MICROSOFT_ROOT_CERT_CHAIN_POLICY_CHECK_APPLICATION_ROOT_FLAG                   = 0x20000
-	MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG                         = 0x10000
+	MICROSOFT_ROOT_CERT_CHAIN_POLICY_CHECK_APPLICATION_ROOT_FLAG                   = 0x00020000
+	MICROSOFT_ROOT_CERT_CHAIN_POLICY_DISABLE_FLIGHT_ROOT_FLAG                      = 0x00040000
+	MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG                         = 0x00010000
 	MICROSOFT_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS                     = 0
 	MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS             = 1
 	MICROSOFT_WINDOWS_WINBASE_INTERLOCKED_CPLUSPLUS_H_INCLUDED                     = 0
@@ -9728,9 +9939,7 @@ const (
 	MIM_STYLE                                                                      = 0x00000010
 	MINCHAR                                                                        = 0x80
 	MINGW_DDK_H                                                                    = 0
-	MINGW_DDRAW_VERSION                                                            = 7
 	MINGW_HAS_DDK_H                                                                = 1
-	MINGW_HAS_DDRAW_H                                                              = 1
 	MINGW_HAS_SECURE_API                                                           = 1
 	MINGW_SDK_INIT                                                                 = 0
 	MINLONG                                                                        = 0x80000000
@@ -10424,10 +10633,16 @@ const (
 	NTDDI_VISTASP3                                                                 = 100664064
 	NTDDI_VISTASP4                                                                 = 100664320
 	NTDDI_WIN10                                                                    = 0x0A000000
+	NTDDI_WIN10_19H1                                                               = 0x0A000007
+	NTDDI_WIN10_FE                                                                 = 0x0A00000A
+	NTDDI_WIN10_MN                                                                 = 0x0A000009
 	NTDDI_WIN10_RS1                                                                = 0x0A000002
 	NTDDI_WIN10_RS2                                                                = 0x0A000003
 	NTDDI_WIN10_RS3                                                                = 0x0A000004
+	NTDDI_WIN10_RS4                                                                = 0x0A000005
+	NTDDI_WIN10_RS5                                                                = 0x0A000006
 	NTDDI_WIN10_TH2                                                                = 0x0A000001
+	NTDDI_WIN10_VB                                                                 = 0x0A000008
 	NTDDI_WIN2K                                                                    = 0x05000000
 	NTDDI_WIN2KSP1                                                                 = 0x05000100
 	NTDDI_WIN2KSP2                                                                 = 0x05000200
@@ -10930,15 +11145,28 @@ const (
 	PAGER_WRITER_LOCKED                                                            = 2
 	PAGESETUPDLGORD                                                                = 1546
 	PAGESETUPDLGORDMOTIF                                                           = 1550
+	PAGE_ENCLAVE_DECOMMIT                                                          = 0x10000000
+	PAGE_ENCLAVE_THREAD_CONTROL                                                    = 0x80000000
+	PAGE_ENCLAVE_UNVALIDATED                                                       = 0x20000000
 	PAGE_EXECUTE                                                                   = 0x10
 	PAGE_EXECUTE_READ                                                              = 0x20
 	PAGE_EXECUTE_READWRITE                                                         = 0x40
 	PAGE_EXECUTE_WRITECOPY                                                         = 0x80
+	PAGE_GRAPHICS_COHERENT                                                         = 0x20000
+	PAGE_GRAPHICS_EXECUTE                                                          = 0x4000
+	PAGE_GRAPHICS_EXECUTE_READ                                                     = 0x8000
+	PAGE_GRAPHICS_EXECUTE_READWRITE                                                = 0x10000
+	PAGE_GRAPHICS_NOACCESS                                                         = 0x0800
+	PAGE_GRAPHICS_READONLY                                                         = 0x1000
+	PAGE_GRAPHICS_READWRITE                                                        = 0x2000
 	PAGE_GUARD                                                                     = 0x100
 	PAGE_NOACCESS                                                                  = 0x01
 	PAGE_NOCACHE                                                                   = 0x200
 	PAGE_READONLY                                                                  = 0x02
 	PAGE_READWRITE                                                                 = 0x04
+	PAGE_REVERT_TO_FILE_MAP                                                        = 0x80000000
+	PAGE_TARGETS_INVALID                                                           = 0x40000000
+	PAGE_TARGETS_NO_UPDATE                                                         = 0x40000000
 	PAGE_WRITECOMBINE                                                              = 0x400
 	PAGE_WRITECOPY                                                                 = 0x08
 	PANOSE_COUNT                                                                   = 10
@@ -11291,6 +11519,9 @@ const (
 	PF_ARM_EXTERNAL_CACHE_AVAILABLE                                                = 26
 	PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE                                             = 27
 	PF_ARM_NEON_INSTRUCTIONS_AVAILABLE                                             = 19
+	PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE                                         = 31
+	PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE                                        = 30
+	PF_ARM_V8_INSTRUCTIONS_AVAILABLE                                               = 29
 	PF_ARM_VFP_32_REGISTERS_AVAILABLE                                              = 18
 	PF_BAN                                                                         = 21
 	PF_CCITT                                                                       = 10
@@ -11321,6 +11552,9 @@ const (
 	PF_PAE_ENABLED                                                                 = 9
 	PF_PPC_MOVEMEM_64BIT_OK                                                        = 4
 	PF_PUP                                                                         = 4
+	PF_RDPID_INSTRUCTION_AVAILABLE                                                 = 33
+	PF_RDRAND_INSTRUCTION_AVAILABLE                                                = 28
+	PF_RDTSCP_INSTRUCTION_AVAILABLE                                                = 32
 	PF_RDTSC_INSTRUCTION_AVAILABLE                                                 = 8
 	PF_RDWRFSGSBASE_AVAILABLE                                                      = 22
 	PF_SECOND_LEVEL_ADDRESS_TRANSLATION                                            = 20
@@ -11417,6 +11651,11 @@ const (
 	PIPE_WAIT                                                                      = 0x0
 	PKCS12_ALLOW_OVERWRITE_KEY                                                     = 0x4000
 	PKCS12_ALWAYS_CNG_KSP                                                          = 0x200
+	PKCS12_DISABLE_ENCRYPT_CERTIFICATES                                            = 0x0100
+	PKCS12_ENCRYPT_CERTIFICATES                                                    = 0x0200
+	PKCS12_EXPORT_ECC_CURVE_OID                                                    = 0x2000
+	PKCS12_EXPORT_ECC_CURVE_PARAMETERS                                             = 0x1000
+	PKCS12_EXPORT_PBES2_PARAMS                                                     = 0x0080
 	PKCS12_EXPORT_RESERVED_MASK                                                    = 0xffff0000
 	PKCS12_EXPORT_SILENT                                                           = 0x40
 	PKCS12_IMPORT_RESERVED_MASK                                                    = 0xffff0000
@@ -11424,8 +11663,16 @@ const (
 	PKCS12_INCLUDE_EXTENDED_PROPERTIES                                             = 0x10
 	PKCS12_NO_PERSIST_KEY                                                          = 0x8000
 	PKCS12_OBJECT_LOCATOR_ALL_IMPORT_FLAGS                                         = 33360
+	PKCS12_ONLY_CERTIFICATES                                                       = 0x00000400
+	PKCS12_ONLY_CERTIFICATES_PROVIDER_TYPE                                         = 0
+	PKCS12_ONLY_NOT_ENCRYPTED_CERTIFICATES                                         = 0x00000800
+	PKCS12_PBKDF2_ID_HMAC_SHA1                                                     = "1.2.840.113549.2.7"
+	PKCS12_PBKDF2_ID_HMAC_SHA256                                                   = "1.2.840.113549.2.9"
+	PKCS12_PBKDF2_ID_HMAC_SHA384                                                   = "1.2.840.113549.2.10"
+	PKCS12_PBKDF2_ID_HMAC_SHA512                                                   = "1.2.840.113549.2.11"
 	PKCS12_PREFER_CNG_KSP                                                          = 0x100
 	PKCS12_PROTECT_TO_DOMAIN_SIDS                                                  = 0x20
+	PKCS12_VIRTUAL_ISOLATION_KEY                                                   = 0x00010000
 	PKCS5_PADDING                                                                  = 1
 	PKCS_7_ASN_ENCODING                                                            = 0x10000
 	PKCS_7_NDR_ENCODING                                                            = 0x20000
@@ -11751,6 +11998,9 @@ const (
 	PROCESSOR_ARCHITECTURE_ALPHA64                                                 = 7
 	PROCESSOR_ARCHITECTURE_AMD64                                                   = 9
 	PROCESSOR_ARCHITECTURE_ARM                                                     = 5
+	PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64                                          = 13
+	PROCESSOR_ARCHITECTURE_ARM64                                                   = 12
+	PROCESSOR_ARCHITECTURE_IA32_ON_ARM64                                           = 14
 	PROCESSOR_ARCHITECTURE_IA32_ON_WIN64                                           = 10
 	PROCESSOR_ARCHITECTURE_IA64                                                    = 6
 	PROCESSOR_ARCHITECTURE_INTEL                                                   = 0
@@ -11798,6 +12048,7 @@ const (
 	PROCESS_HEAP_ENTRY_DDESHARE                                                    = 0x20
 	PROCESS_HEAP_ENTRY_MOVEABLE                                                    = 0x10
 	PROCESS_HEAP_REGION                                                            = 0x1
+	PROCESS_HEAP_SEG_ALLOC                                                         = 0x8
 	PROCESS_HEAP_UNCOMMITTED_RANGE                                                 = 0x2
 	PROCESS_MODE_BACKGROUND_BEGIN                                                  = 0x100000
 	PROCESS_MODE_BACKGROUND_END                                                    = 0x200000
@@ -12057,6 +12308,7 @@ const (
 	PSINJECT_BEGINSTREAM                                                           = 1
 	PSINJECT_BOUNDINGBOX                                                           = 9
 	PSINJECT_COMMENTS                                                              = 11
+	PSINJECT_DLFONT                                                                = 0xdddddddd
 	PSINJECT_DOCNEEDEDRES                                                          = 5
 	PSINJECT_DOCSUPPLIEDRES                                                        = 6
 	PSINJECT_DOCUMENTPROCESSCOLORS                                                 = 10
@@ -12427,6 +12679,7 @@ const (
 	REG_LEGAL_CHANGE_FILTER                                                        = 268435471
 	REG_LEGAL_OPTION                                                               = 15
 	REG_LINK                                                                       = 6
+	REG_MUI_STRING_TRUNCATE                                                        = 0x00000001
 	REG_MULTI_SZ                                                                   = 7
 	REG_NONE                                                                       = 0
 	REG_NOTIFY_CHANGE_ATTRIBUTES                                                   = 2
@@ -12443,6 +12696,7 @@ const (
 	REG_OPTION_OPEN_LINK                                                           = 8
 	REG_OPTION_RESERVED                                                            = 0
 	REG_OPTION_VOLATILE                                                            = 1
+	REG_PROCESS_APPKEY                                                             = 0x00000001
 	REG_PROCESS_PRIVATE                                                            = 32
 	REG_QWORD                                                                      = 11
 	REG_QWORD_LITTLE_ENDIAN                                                        = 11
@@ -12558,6 +12812,7 @@ const (
 	RIM_INPUTSINK                                                                  = 1
 	RIM_TYPEHID                                                                    = 2
 	RIM_TYPEKEYBOARD                                                               = 1
+	RIM_TYPEMAX                                                                    = 2
 	RIM_TYPEMOUSE                                                                  = 0
 	RIP_EVENT                                                                      = 9
 	RI_KEY_BREAK                                                                   = 1
@@ -13256,7 +13511,10 @@ const (
 	SECURITY_BUILTIN_CAPABILITY_RID_COUNT                                          = 2
 	SECURITY_BUILTIN_DOMAIN_RID                                                    = 32
 	SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE                                           = 1
+	SECURITY_BUILTIN_PACKAGE_ANY_RESTRICTED_PACKAGE                                = 2
+	SECURITY_CAPABILITY_APPOINTMENTS                                               = 11
 	SECURITY_CAPABILITY_BASE_RID                                                   = 3
+	SECURITY_CAPABILITY_CONTACTS                                                   = 12
 	SECURITY_CAPABILITY_DOCUMENTS_LIBRARY                                          = 7
 	SECURITY_CAPABILITY_ENTERPRISE_AUTHENTICATION                                  = 8
 	SECURITY_CAPABILITY_INTERNET_CLIENT                                            = 1
@@ -13353,12 +13611,14 @@ const (
 	SECURITY_WMIHOST_ID_RID_COUNT                                                  = 6
 	SECURITY_WORLD_RID                                                             = 0
 	SECURITY_WRITE_RESTRICTED_CODE_RID                                             = 33
+	SEC_64K_PAGES                                                                  = 0x80000
 	SEC_COMMIT                                                                     = 0x8000000
 	SEC_FILE                                                                       = 0x800000
 	SEC_IMAGE                                                                      = 0x1000000
 	SEC_IMAGE_NO_EXECUTE                                                           = 285212672
 	SEC_LARGE_PAGES                                                                = 0x80000000
 	SEC_NOCACHE                                                                    = 0x10000000
+	SEC_PARTITION_OWNER_HANDLE                                                     = 0x40000
 	SEC_PROTECTED_IMAGE                                                            = 0x2000000
 	SEC_RESERVE                                                                    = 0x4000000
 	SEC_WINNT_AUTH_IDENTITY_ANSI                                                   = 0x1
@@ -13708,6 +13968,7 @@ const (
 	SIMPLEREGION                                                                   = 2
 	SIMULATED_FONTTYPE                                                             = 0x8000
 	SING                                                                           = 2
+	SITE_PIN_RULES_ALL_SUBDOMAINS_FLAG                                             = 0x1
 	SIZEFULLSCREEN                                                                 = 2
 	SIZEICONIC                                                                     = 1
 	SIZENORMAL                                                                     = 0
@@ -14926,6 +15187,11 @@ const (
 	SSGF_DISPLAY                                                                   = 3
 	SSGF_NONE                                                                      = 0
 	SSIZE_MAX                                                                      = 9223372036854775807
+	SSL_F12_ERROR_TEXT_LENGTH                                                      = 256
+	SSL_HPKP_HEADER_COUNT                                                          = 2
+	SSL_HPKP_PKP_HEADER_INDEX                                                      = 0
+	SSL_HPKP_PKP_RO_HEADER_INDEX                                                   = 1
+	SSL_KEY_PIN_ERROR_TEXT_LENGTH                                                  = 512
 	SSTF_BORDER                                                                    = 2
 	SSTF_CHARS                                                                     = 1
 	SSTF_DISPLAY                                                                   = 3
@@ -14969,7 +15235,9 @@ const (
 	SS_WORDELLIPSIS                                                                = 49152
 	STACK_SIZE_PARAM_IS_A_RESERVATION                                              = 0x10000
 	STAMP_AXESLIST                                                                 = 134245473
+	STAMP_CFF2                                                                     = 134248035
 	STAMP_DESIGNVECTOR                                                             = 134248036
+	STAMP_TRUETYPE_VARIATION                                                       = 134248052
 	STANDARD_RIGHTS_ALL                                                            = 2031616
 	STANDARD_RIGHTS_EXECUTE                                                        = 131072
 	STANDARD_RIGHTS_READ                                                           = 131072
@@ -15883,6 +16151,7 @@ const (
 	TMPF_TRUETYPE                                                                  = 0x04
 	TMPF_VECTOR                                                                    = 0x02
 	TMP_MAX                                                                        = 32767
+	TMP_MAX_S                                                                      = 32767
 	TOKEN_ADJUST_DEFAULT                                                           = 128
 	TOKEN_ADJUST_GROUPS                                                            = 64
 	TOKEN_ADJUST_PRIVILEGES                                                        = 32
@@ -16053,6 +16322,7 @@ const (
 	UNW_FLAG_UHANDLER                                                              = 0x2
 	UOI_FLAGS                                                                      = 1
 	UOI_NAME                                                                       = 2
+	UOI_TIMERPROC_EXCEPTION_SUPPRESSION                                            = 7
 	UOI_TYPE                                                                       = 3
 	UOI_USER_SID                                                                   = 4
 	UPDFCACHE_IFBLANK                                                              = 16
@@ -16430,6 +16700,8 @@ const (
 	VK_ICO_00                                                                      = 0xE4
 	VK_ICO_CLEAR                                                                   = 0xE6
 	VK_ICO_HELP                                                                    = 0xE3
+	VK_IME_OFF                                                                     = 0x1A
+	VK_IME_ON                                                                      = 0x16
 	VK_INSERT                                                                      = 0x2D
 	VK_JUNJA                                                                       = 0x17
 	VK_KANA                                                                        = 0x15
@@ -16690,6 +16962,7 @@ const (
 	WC_DISCARDNS                                                                   = 0x00000010
 	WC_NO_BEST_FIT_CHARS                                                           = 0x00000400
 	WC_SEPCHARS                                                                    = 0x00000020
+	WDK_NTDDI_VERSION                                                              = 167772170
 	WDT_INPROC64_CALL                                                              = 1349805143
 	WDT_INPROC_CALL                                                                = 1215587415
 	WDT_REMOTE_CALL                                                                = 1383359575
@@ -16810,6 +17083,7 @@ const (
 	WINAPI_INLINE                                                                  = 0
 	WINAPI_PARTITION_APP                                                           = 0x2
 	WINAPI_PARTITION_DESKTOP                                                       = 0x1
+	WINCRYPT_DWORD_CPP_ONLY                                                        = 0
 	WINDING                                                                        = 2
 	WINDOW_AGGINVERSE                                                              = 2
 	WINDOW_AGGSTEP                                                                 = 3
@@ -17613,6 +17887,8 @@ const (
 	X_AVX2INTRIN_H_INCLUDED                                                        = 0
 	X_AVX5124FMAPSINTRIN_H_INCLUDED                                                = 0
 	X_AVX5124VNNIWINTRIN_H_INCLUDED                                                = 0
+	X_AVX512BF16INTRIN_H_INCLUDED                                                  = 0
+	X_AVX512BF16VLINTRIN_H_INCLUDED                                                = 0
 	X_AVX512BITALGINTRIN_H_INCLUDED                                                = 0
 	X_AVX512BWINTRIN_H_INCLUDED                                                    = 0
 	X_AVX512CDINTRIN_H_INCLUDED                                                    = 0
@@ -17629,6 +17905,8 @@ const (
 	X_AVX512VLDQINTRIN_H_INCLUDED                                                  = 0
 	X_AVX512VLINTRIN_H_INCLUDED                                                    = 0
 	X_AVX512VNNIVLINTRIN_H_INCLUDED                                                = 0
+	X_AVX512VP2INTERSECTINTRIN_H_INCLUDED                                          = 0
+	X_AVX512VP2INTERSECTVLINTRIN_H_INCLUDED                                        = 0
 	X_AVX512VPOPCNTDQINTRIN_H_INCLUDED                                             = 0
 	X_AVX512VPOPCNTDQVLINTRIN_H_INCLUDED                                           = 0
 	X_AVXINTRIN_H_INCLUDED                                                         = 0
@@ -17640,8 +17918,11 @@ const (
 	X_BMIINTRIN_H_INCLUDED                                                         = 0
 	X_BOOLEAN_                                                                     = 0
 	X_BSDTYPES_DEFINED                                                             = 0
+	X_Benign_race_begin_                                                           = 0
+	X_Benign_race_end_                                                             = 0
 	X_CALL_REPORTFAULT                                                             = 0x2
 	X_CETINTRIN_H_INCLUDED                                                         = 0
+	X_CLDEMOTE_H_INCLUDED                                                          = 0
 	X_CLFLUSHOPTINTRIN_H_INCLUDED                                                  = 0
 	X_CLOCK_T_DEFINED                                                              = 0
 	X_CLWBINTRIN_H_INCLUDED                                                        = 0
@@ -17698,6 +17979,16 @@ const (
 	X_CRT_DOUBLE_DEC                                                               = 0
 	X_CRT_ERRNO_DEFINED                                                            = 0
 	X_CRT_GETPID_DEFINED                                                           = 0
+	X_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS                                            = 4
+	X_CRT_INTERNAL_LOCAL_SCANF_OPTIONS                                             = 2
+	X_CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY                              = 0x0008
+	X_CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS                             = 0x0010
+	X_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION                         = 0x0001
+	X_CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS                                   = 0x0004
+	X_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR                               = 0x0002
+	X_CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY                               = 0x0004
+	X_CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS                                    = 0x0002
+	X_CRT_INTERNAL_SCANF_SECURECRT                                                 = 0x0001
 	X_CRT_MANAGED_HEAP_DEPRECATE                                                   = 0
 	X_CRT_MATHERR_DEFINED                                                          = 0
 	X_CRT_MEMORY_DEFINED                                                           = 0
@@ -17712,6 +18003,7 @@ const (
 	X_CRT_SWAB_DEFINED                                                             = 0
 	X_CRT_SYSTEM_DEFINED                                                           = 0
 	X_CRT_TERMINATE_DEFINED                                                        = 0
+	X_CRT_USE_WINAPI_FAMILY_DESKTOP_APP                                            = 0
 	X_CRT_WCTYPEDATA_DEFINED                                                       = 0
 	X_CRT_WPERROR_DEFINED                                                          = 0
 	X_CRT_WSYSTEM_DEFINED                                                          = 0
@@ -17730,8 +18022,10 @@ const (
 	X_DLGSH_INCLUDED_                                                              = 0
 	X_DLL                                                                          = 0
 	X_DOMAIN                                                                       = 1
+	X_DPI_AWARENESS_CONTEXTS_                                                      = 0
 	X_DWORDLONG_                                                                   = 0
 	X_EMMINTRIN_H_INCLUDED                                                         = 0
+	X_ENQCMDINTRIN_H_INCLUDED                                                      = 0
 	X_ERRCODE_DEFINED                                                              = 0
 	X_ERRHANDLING_H_                                                               = 0
 	X_ERROR_STATUS_T_DEFINED                                                       = 0
@@ -17800,7 +18094,9 @@ const (
 	X_IMM_SDK_DEFINED_                                                             = 0
 	X_INC_CDERR                                                                    = 0
 	X_INC_COMMDLG                                                                  = 0
+	X_INC_CORECRT                                                                  = 0
 	X_INC_CORECRT_STARTUP                                                          = 0
+	X_INC_CORECRT_WSTDLIB                                                          = 0
 	X_INC_CRTDEFS                                                                  = 0
 	X_INC_CRTDEFS_MACRO                                                            = 0
 	X_INC_CRT_UNICODE_MACROS                                                       = 2
@@ -17850,6 +18146,9 @@ const (
 	X_IOSTRG                                                                       = 0x0040
 	X_IOWRT                                                                        = 0x0002
 	X_IO_APISET_H_                                                                 = 0
+	X_IRQL_requires_same_                                                          = 0
+	X_IRQL_restores_                                                               = 0
+	X_IRQL_saves_                                                                  = 0
 	X_In_                                                                          = 0
 	X_In_opt_                                                                      = 0
 	X_In_opt_z_                                                                    = 0
@@ -17858,6 +18157,7 @@ const (
 	X_Inout_opt_                                                                   = 0
 	X_Inout_opt_z_                                                                 = 0
 	X_Inout_z_                                                                     = 0
+	X_Interlocked_                                                                 = 0
 	X_JBLEN                                                                        = 16
 	X_JMP_BUF_DEFINED                                                              = 0
 	X_JOBAPISET_H_                                                                 = 0
@@ -17920,6 +18220,7 @@ const (
 	X_LWPINTRIN_H_INCLUDED                                                         = 0
 	X_LZCNTINTRIN_H_INCLUDED                                                       = 0
 	X_LZEXPAND_                                                                    = 0
+	X_Literal_                                                                     = 0
 	X_MALLOC_H_                                                                    = 0
 	X_MATH_H_                                                                      = 0
 	X_MAX_DIR                                                                      = 256
@@ -18009,6 +18310,10 @@ const (
 	X_NTSTATUS_PSDK                                                                = 0
 	X_NTTMAPI_                                                                     = 0
 	X_NT_TIB_DEFINED                                                               = 0
+	X_No_competing_thread_                                                         = 0
+	X_No_competing_thread_begin_                                                   = 0
+	X_No_competing_thread_end_                                                     = 0
+	X_Notliteral_                                                                  = 0
 	X_NullNull_terminated_                                                         = 0
 	X_Null_terminated_                                                             = 0
 	X_OBJBASE_H_                                                                   = 0
@@ -18069,6 +18374,10 @@ const (
 	X_P_OVERLAY                                                                    = 2
 	X_P_WAIT                                                                       = 0
 	X_P_tmpdir                                                                     = "\\"
+	X_Points_to_data_                                                              = 0
+	X_Post_                                                                        = 0
+	X_Post_equals_last_error_                                                      = 0
+	X_Pre_notnull_                                                                 = 0
 	X_Printf_format_string_                                                        = 0
 	X_QSORT_S_DEFINED                                                              = 0
 	X_RDSEEDINTRIN_H_INCLUDED                                                      = 0
@@ -18086,6 +18395,7 @@ const (
 	X_RTL_RUN_ONCE_DEF                                                             = 1
 	X_RTMINTRIN_H_INCLUDED                                                         = 0
 	X_Raises_SEH_exception_                                                        = 0
+	X_Requires_no_locks_held_                                                      = 0
 	X_Reserved_                                                                    = 0
 	X_Result_nullonfailure_                                                        = 0
 	X_Result_zeroonfailure_                                                        = 0
@@ -18093,6 +18403,7 @@ const (
 	X_Ret_maybenull_z_                                                             = 0
 	X_Ret_notnull_                                                                 = 0
 	X_Ret_null_                                                                    = 0
+	X_Ret_valid_                                                                   = 0
 	X_Ret_z_                                                                       = 0
 	X_SECURECRT_ERRCODE_VALUES_DEFINED                                             = 0
 	X_SECURECRT_FILL_BUFFER_PATTERN                                                = 0xFD
@@ -18130,6 +18441,7 @@ const (
 	X_STDARG_H                                                                     = 0
 	X_STDDEF_H                                                                     = 0
 	X_STDDEF_H_                                                                    = 0
+	X_STDIO_CONFIG_DEFINED                                                         = 0
 	X_STDIO_DEFINED                                                                = 0
 	X_STDIO_S_DEFINED                                                              = 0
 	X_STDSTREAM_DEFINED                                                            = 0
@@ -18143,6 +18455,7 @@ const (
 	X_SYS_OPEN                                                                     = 20
 	X_Scanf_format_string_                                                         = 0
 	X_Scanf_s_format_string_                                                       = 0
+	X_Strict_type_match_                                                           = 0
 	X_TAGLC_ID_DEFINED                                                             = 0
 	X_TBMINTRIN_H_INCLUDED                                                         = 0
 	X_TCHAR_DEFINED                                                                = 0
@@ -18181,6 +18494,7 @@ const (
 	X_VA_LIST_T_H                                                                  = 0
 	X_VPCLMULQDQINTRIN_H_INCLUDED                                                  = 0
 	X_W64                                                                          = 0
+	X_WAITPKG_H_INCLUDED                                                           = 0
 	X_WAIT_CHILD                                                                   = 0
 	X_WAIT_GRANDCHILD                                                              = 1
 	X_WAVEFORMATEX_                                                                = 0
@@ -18194,6 +18508,7 @@ const (
 	X_WIN32                                                                        = 1
 	X_WIN32_IE                                                                     = 1538
 	X_WIN32_IE_IE100                                                               = 0x0a00
+	X_WIN32_IE_IE110                                                               = 0x0A00
 	X_WIN32_IE_IE20                                                                = 0x0200
 	X_WIN32_IE_IE30                                                                = 0x0300
 	X_WIN32_IE_IE302                                                               = 0x0302
@@ -18216,6 +18531,7 @@ const (
 	X_WIN32_IE_NT4SP4                                                              = 1025
 	X_WIN32_IE_NT4SP5                                                              = 1025
 	X_WIN32_IE_NT4SP6                                                              = 1280
+	X_WIN32_IE_WIN10                                                               = 2560
 	X_WIN32_IE_WIN2K                                                               = 1281
 	X_WIN32_IE_WIN2KSP1                                                            = 1281
 	X_WIN32_IE_WIN2KSP2                                                            = 1281
@@ -18228,6 +18544,7 @@ const (
 	X_WIN32_IE_WIN98SE                                                             = 1280
 	X_WIN32_IE_WINBLUE                                                             = 2560
 	X_WIN32_IE_WINME                                                               = 1360
+	X_WIN32_IE_WINTHRESHOLD                                                        = 2560
 	X_WIN32_IE_WS03                                                                = 0x0602
 	X_WIN32_IE_WS03SP1                                                             = 1539
 	X_WIN32_IE_XP                                                                  = 1536
@@ -18274,9 +18591,7 @@ const (
 	X_WSTDIO_DEFINED                                                               = 0
 	X_WSTDIO_S_DEFINED                                                             = 0
 	X_WSTDLIBP_DEFINED                                                             = 0
-	X_WSTDLIBP_S_DEFINED                                                           = 0
 	X_WSTDLIB_DEFINED                                                              = 0
-	X_WSTDLIB_S_DEFINED                                                            = 0
 	X_WSTRING_DEFINED                                                              = 0
 	X_WSTRING_S_DEFINED                                                            = 0
 	X_WTIME_DEFINED                                                                = 0
@@ -18527,6 +18842,12 @@ const (
 	SzKEY_CACHE_ENABLED                                                            = "CachePrivateKeys"
 	SzKEY_CACHE_SECONDS                                                            = "PrivateKeyLifetimeSeconds"
 	SzKEY_CRYPTOAPI_PRIVATE_KEY_OPTIONS                                            = "Software\\Policies\\Microsoft\\Cryptography"
+	SzOIDVerisign_FailInfo                                                         = "2.16.840.1.113733.1.9.4"
+	SzOIDVerisign_MessageType                                                      = "2.16.840.1.113733.1.9.2"
+	SzOIDVerisign_PkiStatus                                                        = "2.16.840.1.113733.1.9.3"
+	SzOIDVerisign_RecipientNonce                                                   = "2.16.840.1.113733.1.9.6"
+	SzOIDVerisign_SenderNonce                                                      = "2.16.840.1.113733.1.9.5"
+	SzOIDVerisign_TransactionID                                                    = "2.16.840.1.113733.1.9.7"
 	SzOID_ANSI_X942                                                                = "1.2.840.10046"
 	SzOID_ANSI_X942_DH                                                             = "1.2.840.10046.2.1"
 	SzOID_ANY_APPLICATION_POLICY                                                   = "1.3.6.1.4.1.311.10.12.1"
@@ -18537,6 +18858,11 @@ const (
 	SzOID_APPLICATION_POLICY_MAPPINGS                                              = "1.3.6.1.4.1.311.21.11"
 	SzOID_ARCHIVED_KEY_ATTR                                                        = "1.3.6.1.4.1.311.21.13"
 	SzOID_ARCHIVED_KEY_CERT_HASH                                                   = "1.3.6.1.4.1.311.21.16"
+	SzOID_ATTEST_WHQL_CRYPTO                                                       = "1.3.6.1.4.1.311.10.3.5.1"
+	SzOID_ATTR_PLATFORM_SPECIFICATION                                              = "2.23.133.2.17"
+	SzOID_ATTR_SUPPORTED_ALGORITHMS                                                = "2.5.4.52"
+	SzOID_ATTR_TPM_SECURITY_ASSERTIONS                                             = "2.23.133.2.18"
+	SzOID_ATTR_TPM_SPECIFICATION                                                   = "2.23.133.2.16"
 	SzOID_AUTHORITY_INFO_ACCESS                                                    = "1.3.6.1.5.5.7.1.1"
 	SzOID_AUTHORITY_KEY_IDENTIFIER                                                 = "2.5.29.1"
 	SzOID_AUTHORITY_KEY_IDENTIFIER2                                                = "2.5.29.35"
@@ -18546,6 +18872,7 @@ const (
 	SzOID_BASIC_CONSTRAINTS                                                        = "2.5.29.10"
 	SzOID_BASIC_CONSTRAINTS2                                                       = "2.5.29.19"
 	SzOID_BIOMETRIC_EXT                                                            = "1.3.6.1.5.5.7.1.2"
+	SzOID_BIOMETRIC_SIGNING                                                        = "1.3.6.1.4.1.311.10.3.41"
 	SzOID_BUSINESS_CATEGORY                                                        = "2.5.4.15"
 	SzOID_CA_CERTIFICATE                                                           = "2.5.4.37"
 	SzOID_CERTIFICATE_REVOCATION_LIST                                              = "2.5.4.39"
@@ -18591,6 +18918,7 @@ const (
 	SzOID_CMC_SENDER_NONCE                                                         = "1.3.6.1.5.5.7.7.6"
 	SzOID_CMC_STATUS_INFO                                                          = "1.3.6.1.5.5.7.7.1"
 	SzOID_CMC_TRANSACTION_ID                                                       = "1.3.6.1.5.5.7.7.5"
+	SzOID_CN_ECDSA_SHA256                                                          = "1.2.156.11235.1.1.1"
 	SzOID_COMMON_NAME                                                              = "2.5.4.3"
 	SzOID_COUNTRY_NAME                                                             = "2.5.4.6"
 	SzOID_CRL_DIST_POINTS                                                          = "2.5.29.31"
@@ -18602,6 +18930,7 @@ const (
 	SzOID_CROSS_CERTIFICATE_PAIR                                                   = "2.5.4.40"
 	SzOID_CROSS_CERT_DIST_POINTS                                                   = "1.3.6.1.4.1.311.10.9.1"
 	SzOID_CTL                                                                      = "1.3.6.1.4.1.311.10.1"
+	SzOID_CT_CERT_SCTLIST                                                          = "1.3.6.1.4.1.11129.2.4.2"
 	SzOID_CT_PKI_DATA                                                              = "1.3.6.1.5.5.7.12.2"
 	SzOID_CT_PKI_RESPONSE                                                          = "1.3.6.1.5.5.7.12.3"
 	SzOID_DELTA_CRL_INDICATOR                                                      = "2.5.29.27"
@@ -18623,9 +18952,40 @@ const (
 	SzOID_DSALG_RSA                                                                = "2.5.8.1.1"
 	SzOID_DSALG_SIGN                                                               = "2.5.8.3"
 	SzOID_DS_EMAIL_REPLICATION                                                     = "1.3.6.1.4.1.311.21.19"
+	SzOID_DYNAMIC_CODE_GEN_SIGNER                                                  = "1.3.6.1.4.1.311.76.5.1"
+	SzOID_ECC_CURVE_BRAINPOOLP160R1                                                = "1.3.36.3.3.2.8.1.1.1"
+	SzOID_ECC_CURVE_BRAINPOOLP160T1                                                = "1.3.36.3.3.2.8.1.1.2"
+	SzOID_ECC_CURVE_BRAINPOOLP192R1                                                = "1.3.36.3.3.2.8.1.1.3"
+	SzOID_ECC_CURVE_BRAINPOOLP192T1                                                = "1.3.36.3.3.2.8.1.1.4"
+	SzOID_ECC_CURVE_BRAINPOOLP224R1                                                = "1.3.36.3.3.2.8.1.1.5"
+	SzOID_ECC_CURVE_BRAINPOOLP224T1                                                = "1.3.36.3.3.2.8.1.1.6"
+	SzOID_ECC_CURVE_BRAINPOOLP256R1                                                = "1.3.36.3.3.2.8.1.1.7"
+	SzOID_ECC_CURVE_BRAINPOOLP256T1                                                = "1.3.36.3.3.2.8.1.1.8"
+	SzOID_ECC_CURVE_BRAINPOOLP320R1                                                = "1.3.36.3.3.2.8.1.1.9"
+	SzOID_ECC_CURVE_BRAINPOOLP320T1                                                = "1.3.36.3.3.2.8.1.1.10"
+	SzOID_ECC_CURVE_BRAINPOOLP384R1                                                = "1.3.36.3.3.2.8.1.1.11"
+	SzOID_ECC_CURVE_BRAINPOOLP384T1                                                = "1.3.36.3.3.2.8.1.1.12"
+	SzOID_ECC_CURVE_BRAINPOOLP512R1                                                = "1.3.36.3.3.2.8.1.1.13"
+	SzOID_ECC_CURVE_BRAINPOOLP512T1                                                = "1.3.36.3.3.2.8.1.1.14"
+	SzOID_ECC_CURVE_EC192WAPI                                                      = "1.2.156.11235.1.1.2.1"
+	SzOID_ECC_CURVE_NISTP192                                                       = "1.2.840.10045.3.1.1"
+	SzOID_ECC_CURVE_NISTP224                                                       = "1.3.132.0.33"
 	SzOID_ECC_CURVE_P256                                                           = "1.2.840.10045.3.1.7"
 	SzOID_ECC_CURVE_P384                                                           = "1.3.132.0.34"
 	SzOID_ECC_CURVE_P521                                                           = "1.3.132.0.35"
+	SzOID_ECC_CURVE_SECP160K1                                                      = "1.3.132.0.9"
+	SzOID_ECC_CURVE_SECP160R1                                                      = "1.3.132.0.8"
+	SzOID_ECC_CURVE_SECP160R2                                                      = "1.3.132.0.30"
+	SzOID_ECC_CURVE_SECP192K1                                                      = "1.3.132.0.31"
+	SzOID_ECC_CURVE_SECP224K1                                                      = "1.3.132.0.32"
+	SzOID_ECC_CURVE_SECP256K1                                                      = "1.3.132.0.10"
+	SzOID_ECC_CURVE_WTLS9                                                          = "2.23.43.1.4.9"
+	SzOID_ECC_CURVE_X962P192V1                                                     = "1.2.840.10045.3.1.1"
+	SzOID_ECC_CURVE_X962P192V2                                                     = "1.2.840.10045.3.1.2"
+	SzOID_ECC_CURVE_X962P192V3                                                     = "1.2.840.10045.3.1.3"
+	SzOID_ECC_CURVE_X962P239V1                                                     = "1.2.840.10045.3.1.4"
+	SzOID_ECC_CURVE_X962P239V2                                                     = "1.2.840.10045.3.1.5"
+	SzOID_ECC_CURVE_X962P239V3                                                     = "1.2.840.10045.3.1.6"
 	SzOID_ECC_PUBLIC_KEY                                                           = "1.2.840.10045.2.1"
 	SzOID_ECDSA_SHA1                                                               = "1.2.840.10045.4.1"
 	SzOID_ECDSA_SHA256                                                             = "1.2.840.10045.4.3.2"
@@ -18634,19 +18994,43 @@ const (
 	SzOID_ECDSA_SPECIFIED                                                          = "1.2.840.10045.4.3"
 	SzOID_EFS_RECOVERY                                                             = "1.3.6.1.4.1.311.10.3.4.1"
 	SzOID_EMBEDDED_NT_CRYPTO                                                       = "1.3.6.1.4.1.311.10.3.8"
+	SzOID_ENCLAVE_SIGNING                                                          = "1.3.6.1.4.1.311.10.3.42"
 	SzOID_ENCRYPTED_KEY_HASH                                                       = "1.3.6.1.4.1.311.21.21"
 	SzOID_ENHANCED_KEY_USAGE                                                       = "2.5.29.37"
 	SzOID_ENROLLMENT_AGENT                                                         = "1.3.6.1.4.1.311.20.2.1"
 	SzOID_ENROLLMENT_CSP_PROVIDER                                                  = "1.3.6.1.4.1.311.13.2.2"
 	SzOID_ENROLLMENT_NAME_VALUE_PAIR                                               = "1.3.6.1.4.1.311.13.2.1"
+	SzOID_ENROLL_AIK_INFO                                                          = "1.3.6.1.4.1.311.21.39"
+	SzOID_ENROLL_ATTESTATION_CHALLENGE                                             = "1.3.6.1.4.1.311.21.28"
+	SzOID_ENROLL_ATTESTATION_STATEMENT                                             = "1.3.6.1.4.1.311.21.24"
+	SzOID_ENROLL_CAXCHGCERT_HASH                                                   = "1.3.6.1.4.1.311.21.27"
 	SzOID_ENROLL_CERTTYPE_EXTENSION                                                = "1.3.6.1.4.1.311.20.2"
+	SzOID_ENROLL_EKPUB_CHALLENGE                                                   = "1.3.6.1.4.1.311.21.26"
+	SzOID_ENROLL_EKVERIFYCERT                                                      = "1.3.6.1.4.1.311.21.31"
+	SzOID_ENROLL_EKVERIFYCREDS                                                     = "1.3.6.1.4.1.311.21.32"
+	SzOID_ENROLL_EKVERIFYKEY                                                       = "1.3.6.1.4.1.311.21.30"
+	SzOID_ENROLL_EK_CA_KEYID                                                       = "1.3.6.1.4.1.311.21.43"
+	SzOID_ENROLL_EK_INFO                                                           = "1.3.6.1.4.1.311.21.23"
+	SzOID_ENROLL_ENCRYPTION_ALGORITHM                                              = "1.3.6.1.4.1.311.21.29"
+	SzOID_ENROLL_KEY_AFFINITY                                                      = "1.3.6.1.4.1.311.21.41"
+	SzOID_ENROLL_KSP_NAME                                                          = "1.3.6.1.4.1.311.21.25"
+	SzOID_ENROLL_SCEP_CHALLENGE_ANSWER                                             = "1.3.6.1.4.1.311.21.35"
+	SzOID_ENROLL_SCEP_CLIENT_REQUEST                                               = "1.3.6.1.4.1.311.21.37"
+	SzOID_ENROLL_SCEP_ERROR                                                        = "1.3.6.1.4.1.311.21.33"
+	SzOID_ENROLL_SCEP_SERVER_MESSAGE                                               = "1.3.6.1.4.1.311.21.38"
+	SzOID_ENROLL_SCEP_SERVER_SECRET                                                = "1.3.6.1.4.1.311.21.40"
+	SzOID_ENROLL_SCEP_SERVER_STATE                                                 = "1.3.6.1.4.1.311.21.34"
+	SzOID_ENROLL_SCEP_SIGNER_HASH                                                  = "1.3.6.1.4.1.311.21.42"
 	SzOID_ENTERPRISE_OID_ROOT                                                      = "1.3.6.1.4.1.311.21.8"
 	SzOID_EV_RDN_COUNTRY                                                           = "1.3.6.1.4.1.311.60.2.1.3"
 	SzOID_EV_RDN_LOCALE                                                            = "1.3.6.1.4.1.311.60.2.1.1"
 	SzOID_EV_RDN_STATE_OR_PROVINCE                                                 = "1.3.6.1.4.1.311.60.2.1.2"
+	SzOID_EV_WHQL_CRYPTO                                                           = "1.3.6.1.4.1.311.10.3.39"
 	SzOID_FACSIMILE_TELEPHONE_NUMBER                                               = "2.5.4.23"
 	SzOID_FRESHEST_CRL                                                             = "2.5.29.46"
 	SzOID_GIVEN_NAME                                                               = "2.5.4.42"
+	SzOID_HPKP_DOMAIN_NAME_CTL                                                     = "1.3.6.1.4.1.311.10.3.60"
+	SzOID_HPKP_HEADER_VALUE_CTL                                                    = "1.3.6.1.4.1.311.10.3.61"
 	SzOID_INFOSEC                                                                  = "2.16.840.1.101.2.1"
 	SzOID_INFOSEC_SuiteAConfidentiality                                            = "2.16.840.1.101.2.1.1.14"
 	SzOID_INFOSEC_SuiteAIntegrity                                                  = "2.16.840.1.101.2.1.1.15"
@@ -18678,6 +19062,7 @@ const (
 	SzOID_ISSUER_ALT_NAME                                                          = "2.5.29.8"
 	SzOID_ISSUER_ALT_NAME2                                                         = "2.5.29.18"
 	SzOID_ISSUING_DIST_POINT                                                       = "2.5.29.28"
+	SzOID_IUM_SIGNING                                                              = "1.3.6.1.4.1.311.10.3.37"
 	SzOID_KEYID_RDN                                                                = "1.3.6.1.4.1.311.10.7.1"
 	SzOID_KEY_ATTRIBUTES                                                           = "2.5.29.2"
 	SzOID_KEY_USAGE                                                                = "2.5.29.15"
@@ -18687,6 +19072,7 @@ const (
 	SzOID_KP_CTL_USAGE_SIGNING                                                     = "1.3.6.1.4.1.311.10.3.1"
 	SzOID_KP_DOCUMENT_SIGNING                                                      = "1.3.6.1.4.1.311.10.3.12"
 	SzOID_KP_EFS                                                                   = "1.3.6.1.4.1.311.10.3.4"
+	SzOID_KP_FLIGHT_SIGNING                                                        = "1.3.6.1.4.1.311.10.3.27"
 	SzOID_KP_KERNEL_MODE_CODE_SIGNING                                              = "1.3.6.1.4.1.311.61.1.1"
 	SzOID_KP_KERNEL_MODE_HAL_EXTENSION_SIGNING                                     = "1.3.6.1.4.1.311.61.5.1"
 	SzOID_KP_KERNEL_MODE_TRUSTED_BOOT_SIGNING                                      = "1.3.6.1.4.1.311.61.4.1"
@@ -18698,6 +19084,9 @@ const (
 	SzOID_KP_SMARTCARD_LOGON                                                       = "1.3.6.1.4.1.311.20.2.2"
 	SzOID_KP_SMART_DISPLAY                                                         = "1.3.6.1.4.1.311.10.3.15"
 	SzOID_KP_TIME_STAMP_SIGNING                                                    = "1.3.6.1.4.1.311.10.3.2"
+	SzOID_KP_TPM_AIK_CERTIFICATE                                                   = "2.23.133.8.3"
+	SzOID_KP_TPM_EK_CERTIFICATE                                                    = "2.23.133.8.1"
+	SzOID_KP_TPM_PLATFORM_CERTIFICATE                                              = "2.23.133.8.2"
 	SzOID_LEGACY_POLICY_MAPPINGS                                                   = "2.5.29.5"
 	SzOID_LICENSES                                                                 = "1.3.6.1.4.1.311.10.6.1"
 	SzOID_LICENSE_SERVER                                                           = "1.3.6.1.4.1.311.10.6.2"
@@ -18706,6 +19095,7 @@ const (
 	SzOID_LOGOTYPE_EXT                                                             = "1.3.6.1.5.5.7.1.12"
 	SzOID_LOYALTY_OTHER_LOGOTYPE                                                   = "1.3.6.1.5.5.7.20.1"
 	SzOID_MEMBER                                                                   = "2.5.4.31"
+	SzOID_MICROSOFT_PUBLISHER_SIGNER                                               = "1.3.6.1.4.1.311.76.8.1"
 	SzOID_NAME_CONSTRAINTS                                                         = "2.5.29.30"
 	SzOID_NETSCAPE                                                                 = "2.16.840.1.113730"
 	SzOID_NETSCAPE_BASE_URL                                                        = "2.16.840.1.113730.1.2"
@@ -18773,6 +19163,11 @@ const (
 	SzOID_OS_VERSION                                                               = "1.3.6.1.4.1.311.13.2.3"
 	SzOID_OWNER                                                                    = "2.5.4.32"
 	SzOID_PHYSICAL_DELIVERY_OFFICE_NAME                                            = "2.5.4.19"
+	SzOID_PIN_RULES_CTL                                                            = "1.3.6.1.4.1.311.10.3.32"
+	SzOID_PIN_RULES_DOMAIN_NAME                                                    = "1.3.6.1.4.1.311.10.3.34"
+	SzOID_PIN_RULES_EXT                                                            = "1.3.6.1.4.1.311.10.3.33"
+	SzOID_PIN_RULES_LOG_END_DATE_EXT                                               = "1.3.6.1.4.1.311.10.3.35"
+	SzOID_PIN_RULES_SIGNER                                                         = "1.3.6.1.4.1.311.10.3.31"
 	SzOID_PKCS                                                                     = "1.2.840.113549.1"
 	SzOID_PKCS_1                                                                   = "1.2.840.113549.1.1"
 	SzOID_PKCS_10                                                                  = "1.2.840.113549.1.10"
@@ -18793,6 +19188,8 @@ const (
 	SzOID_PKCS_3                                                                   = "1.2.840.113549.1.3"
 	SzOID_PKCS_4                                                                   = "1.2.840.113549.1.4"
 	SzOID_PKCS_5                                                                   = "1.2.840.113549.1.5"
+	SzOID_PKCS_5_PBES2                                                             = "1.2.840.113549.1.5.13"
+	SzOID_PKCS_5_PBKDF2                                                            = "1.2.840.113549.1.5.12"
 	SzOID_PKCS_6                                                                   = "1.2.840.113549.1.6"
 	SzOID_PKCS_7                                                                   = "1.2.840.113549.1.7"
 	SzOID_PKCS_7_DATA                                                              = "1.2.840.113549.1.7.1"
@@ -18829,6 +19226,7 @@ const (
 	SzOID_PKIX_POLICY_QUALIFIER_CPS                                                = "1.3.6.1.5.5.7.2.1"
 	SzOID_PKIX_POLICY_QUALIFIER_USERNOTICE                                         = "1.3.6.1.5.5.7.2.2"
 	SzOID_PKIX_TIME_STAMPING                                                       = "1.3.6.1.5.5.7.48.3"
+	SzOID_PLATFORM_MANIFEST_BINARY_ID                                              = "1.3.6.1.4.1.311.10.3.28"
 	SzOID_POLICY_CONSTRAINTS                                                       = "2.5.29.36"
 	SzOID_POLICY_MAPPINGS                                                          = "2.5.29.33"
 	SzOID_POSTAL_ADDRESS                                                           = "2.5.4.16"
@@ -18838,10 +19236,18 @@ const (
 	SzOID_PRESENTATION_ADDRESS                                                     = "2.5.4.29"
 	SzOID_PRIVATEKEY_USAGE_PERIOD                                                  = "2.5.29.16"
 	SzOID_PRODUCT_UPDATE                                                           = "1.3.6.1.4.1.311.31.1"
+	SzOID_PROTECTED_PROCESS_LIGHT_SIGNER                                           = "1.3.6.1.4.1.311.10.3.22"
+	SzOID_PROTECTED_PROCESS_SIGNER                                                 = "1.3.6.1.4.1.311.10.3.24"
 	SzOID_QC_EU_COMPLIANCE                                                         = "0.4.0.1862.1.1"
 	SzOID_QC_SSCD                                                                  = "0.4.0.1862.1.4"
 	SzOID_QC_STATEMENTS_EXT                                                        = "1.3.6.1.5.5.7.1.3"
 	SzOID_RDN_DUMMY_SIGNER                                                         = "1.3.6.1.4.1.311.21.9"
+	SzOID_RDN_TCG_PLATFORM_MANUFACTURER                                            = "2.23.133.2.4"
+	SzOID_RDN_TCG_PLATFORM_MODEL                                                   = "2.23.133.2.5"
+	SzOID_RDN_TCG_PLATFORM_VERSION                                                 = "2.23.133.2.6"
+	SzOID_RDN_TPM_MANUFACTURER                                                     = "2.23.133.2.1"
+	SzOID_RDN_TPM_MODEL                                                            = "2.23.133.2.2"
+	SzOID_RDN_TPM_VERSION                                                          = "2.23.133.2.3"
 	SzOID_REASON_CODE_HOLD                                                         = "2.5.29.23"
 	SzOID_REGISTERED_ADDRESS                                                       = "2.5.4.26"
 	SzOID_REMOVE_CERTIFICATE                                                       = "1.3.6.1.4.1.311.10.8.1"
@@ -18908,6 +19314,8 @@ const (
 	SzOID_SERIALIZED                                                               = "1.3.6.1.4.1.311.10.3.3.1"
 	SzOID_SERVER_GATED_CRYPTO                                                      = "1.3.6.1.4.1.311.10.3.3"
 	SzOID_SGC_NETSCAPE                                                             = "2.16.840.1.113730.4.1"
+	SzOID_SITE_PIN_RULES_FLAGS_ATTR                                                = "1.3.6.1.4.1.311.10.4.3"
+	SzOID_SITE_PIN_RULES_INDEX_ATTR                                                = "1.3.6.1.4.1.311.10.4.2"
 	SzOID_SORTED_CTL                                                               = "1.3.6.1.4.1.311.10.1.1"
 	SzOID_STATE_OR_PROVINCE_NAME                                                   = "2.5.4.8"
 	SzOID_STREET_ADDRESS                                                           = "2.5.4.9"
@@ -18918,11 +19326,13 @@ const (
 	SzOID_SUBJECT_KEY_IDENTIFIER                                                   = "2.5.29.14"
 	SzOID_SUPPORTED_APPLICATION_CONTEXT                                            = "2.5.4.30"
 	SzOID_SUR_NAME                                                                 = "2.5.4.4"
+	SzOID_SYNC_ROOT_CTL_EXT                                                        = "1.3.6.1.4.1.311.10.3.50"
 	SzOID_TELEPHONE_NUMBER                                                         = "2.5.4.20"
 	SzOID_TELETEXT_TERMINAL_IDENTIFIER                                             = "2.5.4.22"
 	SzOID_TELEX_NUMBER                                                             = "2.5.4.21"
 	SzOID_TIMESTAMP_TOKEN                                                          = "1.2.840.113549.1.9.16.1.4"
 	SzOID_TITLE                                                                    = "2.5.4.12"
+	SzOID_TLS_FEATURES_EXT                                                         = "1.3.6.1.5.5.7.1.24"
 	SzOID_USER_CERTIFICATE                                                         = "2.5.4.36"
 	SzOID_USER_PASSWORD                                                            = "2.5.4.35"
 	SzOID_VERISIGN_BITSTRING_6_13                                                  = "2.16.840.1.113733.1.6.13"
@@ -18930,6 +19340,12 @@ const (
 	SzOID_VERISIGN_ONSITE_JURISDICTION_HASH                                        = "2.16.840.1.113733.1.6.11"
 	SzOID_VERISIGN_PRIVATE_6_9                                                     = "2.16.840.1.113733.1.6.9"
 	SzOID_WHQL_CRYPTO                                                              = "1.3.6.1.4.1.311.10.3.5"
+	SzOID_WINDOWS_KITS_SIGNER                                                      = "1.3.6.1.4.1.311.10.3.20"
+	SzOID_WINDOWS_RT_SIGNER                                                        = "1.3.6.1.4.1.311.10.3.21"
+	SzOID_WINDOWS_SOFTWARE_EXTENSION_SIGNER                                        = "1.3.6.1.4.1.311.10.3.26"
+	SzOID_WINDOWS_STORE_SIGNER                                                     = "1.3.6.1.4.1.311.76.3.1"
+	SzOID_WINDOWS_TCB_SIGNER                                                       = "1.3.6.1.4.1.311.10.3.23"
+	SzOID_WINDOWS_THIRD_PARTY_COMPONENT_SIGNER                                     = "1.3.6.1.4.1.311.10.3.25"
 	SzOID_X21_ADDRESS                                                              = "2.5.4.24"
 	SzOID_X957                                                                     = "1.2.840.10040"
 	SzOID_X957_DSA                                                                 = "1.2.840.10040.4.1"
@@ -18962,7 +19378,7 @@ const (
 	WsdStatInit                                                                    = 0
 )
 
-const ( /* avx512fintrin.h:4200:1: */
+const ( /* avx512fintrin.h:4271:1: */
 	X_MM_PERM_AAAA = 0
 	X_MM_PERM_AAAB = 1
 	X_MM_PERM_AAAC = 2
@@ -19222,20 +19638,20 @@ const ( /* avx512fintrin.h:4200:1: */
 )
 
 // Constants for mantissa extraction
-const ( /* avx512fintrin.h:8510:1: */
+const ( /* avx512fintrin.h:8686:1: */
 	X_MM_MANT_NORM_1_2     = 0 // interval [1, 2)
 	X_MM_MANT_NORM_p5_2    = 1 // interval [0.5, 2)
 	X_MM_MANT_NORM_p5_1    = 2 // interval [0.5, 1)
 	X_MM_MANT_NORM_p75_1p5 = 3
 )
 
-const ( /* avx512fintrin.h:8518:1: */
+const ( /* avx512fintrin.h:8694:1: */
 	X_MM_MANT_SIGN_src  = 0 // sign = sign(SRC)
 	X_MM_MANT_SIGN_zero = 1 // sign = 0
 	X_MM_MANT_SIGN_nan  = 2
 )
 
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -19262,7 +19678,7 @@ const ( /* avx512fintrin.h:8518:1: */
 //    User Guide and Reference, version 9.0.
 
 // We need type definitions from the MMX header file.
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -19289,7 +19705,7 @@ const ( /* avx512fintrin.h:8518:1: */
 //    User Guide and Reference, version 9.0.
 
 // Get _mm_malloc () and _mm_free ().
-// Copyright (C) 2004-2018 Free Software Foundation, Inc.
+// Copyright (C) 2004-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -19446,12 +19862,12 @@ const ( /* combaseapi.h:149:1: */
 	COINITBASE_MULTITHREADED = 0
 )
 
-const ( /* combaseapi.h:214:1: */
+const ( /* combaseapi.h:216:1: */
 	SMEXF_SERVER  = 1
 	SMEXF_HANDLER = 2
 )
 
-const ( /* combaseapi.h:318:1: */
+const ( /* combaseapi.h:320:1: */
 	COWAIT_DEFAULT                  = 0
 	COWAIT_WAITALL                  = 1
 	COWAIT_ALERTABLE                = 2
@@ -19477,25 +19893,25 @@ const ( /* memoryapi.h:18:3: */
 	HighMemoryResourceNotification = 1
 )
 
-const ( /* minwinbase.h:100:3: */
+const ( /* minwinbase.h:102:3: */
+	FindExInfoStandard     = 0
+	FindExInfoBasic        = 1
+	FindExInfoMaxInfoLevel = 2
+)
+
+const ( /* minwinbase.h:114:3: */
 	FindExSearchNameMatch          = 0
 	FindExSearchLimitToDirectories = 1
 	FindExSearchLimitToDevices     = 2
 	FindExSearchMaxSearchOp        = 3
 )
 
-const ( /* minwinbase.h:107:3: */
+const ( /* minwinbase.h:131:3: */
 	GetFileExInfoStandard = 0
 	GetFileExMaxInfoLevel = 1
 )
 
-const ( /* minwinbase.h:91:3: */
-	FindExInfoStandard     = 0
-	FindExInfoBasic        = 1
-	FindExInfoMaxInfoLevel = 2
-)
-
-const ( /* msxml.h:241:3: */
+const ( /* msxml.h:242:3: */
 	NODE_INVALID                = 0
 	NODE_ELEMENT                = 1
 	NODE_ATTRIBUTE              = 2
@@ -19511,7 +19927,7 @@ const ( /* msxml.h:241:3: */
 	NODE_NOTATION               = 12
 )
 
-const ( /* msxml.h:247:3: */
+const ( /* msxml.h:248:3: */
 	XMLELEMTYPE_ELEMENT  = 0
 	XMLELEMTYPE_TEXT     = 1
 	XMLELEMTYPE_COMMENT  = 2
@@ -19521,21 +19937,7 @@ const ( /* msxml.h:247:3: */
 	XMLELEMTYPE_OTHER    = 6
 )
 
-const ( /* oaidl.h:284:1: */
-	SF_ERROR    = 10
-	SF_I1       = 16
-	SF_I2       = 2
-	SF_I4       = 3
-	SF_I8       = 20
-	SF_BSTR     = 8
-	SF_UNKNOWN  = 13
-	SF_DISPATCH = 9
-	SF_VARIANT  = 12
-	SF_RECORD   = 36
-	SF_HAVEIID  = 32781
-)
-
-const ( /* oaidl.h:2853:1: */
+const ( /* oaidl.h:2472:1: */
 	DESCKIND_NONE           = 0
 	DESCKIND_FUNCDESC       = 1
 	DESCKIND_VARDESC        = 2
@@ -19548,21 +19950,35 @@ const ( /* oaidl.h:2853:1: */
 //
 // ITypeLib interface
 
-const ( /* oaidl.h:4284:1: */
+const ( /* oaidl.h:3732:1: */
 	SYS_WIN16 = 0
 	SYS_WIN32 = 1
 	SYS_MAC   = 2
 	SYS_WIN64 = 3
 )
 
-const ( /* oaidl.h:4291:1: */
+const ( /* oaidl.h:3739:1: */
 	LIBFLAG_FRESTRICTED   = 1
 	LIBFLAG_FCONTROL      = 2
 	LIBFLAG_FHIDDEN       = 4
 	LIBFLAG_FHASDISKIMAGE = 8
 )
 
-const ( /* oaidl.h:4950:1: */
+const ( /* oaidl.h:399:1: */
+	SF_ERROR    = 10
+	SF_I1       = 16
+	SF_I2       = 2
+	SF_I4       = 3
+	SF_I8       = 20
+	SF_BSTR     = 8
+	SF_UNKNOWN  = 13
+	SF_DISPATCH = 9
+	SF_VARIANT  = 12
+	SF_RECORD   = 36
+	SF_HAVEIID  = 32781
+)
+
+const ( /* oaidl.h:4348:1: */
 	CHANGEKIND_ADDMEMBER        = 0
 	CHANGEKIND_DELETEMEMBER     = 1
 	CHANGEKIND_SETNAMES         = 2
@@ -19572,7 +19988,7 @@ const ( /* oaidl.h:4950:1: */
 	CHANGEKIND_CHANGEFAILED     = 6
 	CHANGEKIND_MAX              = 7
 )
-const ( /* oaidl.h:528:1: */
+const ( /* oaidl.h:640:1: */
 	TKIND_ENUM      = 0
 	TKIND_RECORD    = 1
 	TKIND_MODULE    = 2
@@ -19584,7 +20000,7 @@ const ( /* oaidl.h:528:1: */
 	TKIND_MAX       = 8
 )
 
-const ( /* oaidl.h:672:1: */
+const ( /* oaidl.h:784:1: */
 	CC_FASTCALL   = 0
 	CC_CDECL      = 1
 	CC_MSCPASCAL  = 2
@@ -19598,7 +20014,7 @@ const ( /* oaidl.h:672:1: */
 	CC_MAX        = 9
 )
 
-const ( /* oaidl.h:686:1: */
+const ( /* oaidl.h:798:1: */
 	FUNC_VIRTUAL     = 0
 	FUNC_PUREVIRTUAL = 1
 	FUNC_NONVIRTUAL  = 2
@@ -19606,21 +20022,21 @@ const ( /* oaidl.h:686:1: */
 	FUNC_DISPATCH    = 4
 )
 
-const ( /* oaidl.h:694:1: */
+const ( /* oaidl.h:806:1: */
 	INVOKE_FUNC           = 1
 	INVOKE_PROPERTYGET    = 2
 	INVOKE_PROPERTYPUT    = 4
 	INVOKE_PROPERTYPUTREF = 8
 )
 
-const ( /* oaidl.h:717:1: */
+const ( /* oaidl.h:829:1: */
 	VAR_PERINSTANCE = 0
 	VAR_STATIC      = 1
 	VAR_CONST       = 2
 	VAR_DISPATCH    = 3
 )
 
-const ( /* oaidl.h:746:1: */
+const ( /* oaidl.h:858:1: */
 	TYPEFLAG_FAPPOBJECT     = 1
 	TYPEFLAG_FCANCREATE     = 2
 	TYPEFLAG_FLICENSED      = 4
@@ -19638,7 +20054,7 @@ const ( /* oaidl.h:746:1: */
 	TYPEFLAG_FPROXY         = 16384
 )
 
-const ( /* oaidl.h:764:1: */
+const ( /* oaidl.h:876:1: */
 	FUNCFLAG_FRESTRICTED       = 1
 	FUNCFLAG_FSOURCE           = 2
 	FUNCFLAG_FBINDABLE         = 4
@@ -19654,7 +20070,7 @@ const ( /* oaidl.h:764:1: */
 	FUNCFLAG_FIMMEDIATEBIND    = 4096
 )
 
-const ( /* oaidl.h:780:1: */
+const ( /* oaidl.h:892:1: */
 	VARFLAG_FREADONLY        = 1
 	VARFLAG_FSOURCE          = 2
 	VARFLAG_FBINDABLE        = 4
@@ -19764,32 +20180,32 @@ const ( /* objidl.h:9060:1: */
 	MKRREDUCE_ALL         = 0
 )
 
-const ( /* objidlbase.h:1222:1: */
+const ( /* objidlbase.h:1267:1: */
 	EXTCONN_STRONG   = 1
 	EXTCONN_WEAK     = 2
 	EXTCONN_CALLABLE = 4
 )
 
-const ( /* objidlbase.h:2106:1: */
+const ( /* objidlbase.h:2057:1: */
 	STGTY_STORAGE   = 1
 	STGTY_STREAM    = 2
 	STGTY_LOCKBYTES = 3
 	STGTY_PROPERTY  = 4
 )
 
-const ( /* objidlbase.h:2113:1: */
+const ( /* objidlbase.h:2064:1: */
 	STREAM_SEEK_SET = 0
 	STREAM_SEEK_CUR = 1
 	STREAM_SEEK_END = 2
 )
 
-const ( /* objidlbase.h:2119:1: */
+const ( /* objidlbase.h:2070:1: */
 	LOCK_WRITE     = 1
 	LOCK_EXCLUSIVE = 2
 	LOCK_ONLYONCE  = 4
 )
 
-const ( /* objidlbase.h:3999:1: */
+const ( /* objidlbase.h:3588:1: */
 	EOAC_NONE              = 0
 	EOAC_MUTUAL_AUTH       = 1
 	EOAC_STATIC_CLOAKING   = 32
@@ -19807,19 +20223,19 @@ const ( /* objidlbase.h:3999:1: */
 	EOAC_DISABLE_AAA       = 4096
 )
 
-const ( /* objidlbase.h:4353:1: */
+const ( /* objidlbase.h:3870:1: */
 	COMBND_RPCTIMEOUT      = 1
 	COMBND_SERVER_LOCALITY = 2
 	COMBND_RESERVED1       = 4
 )
 
-const ( /* objidlbase.h:4359:1: */
+const ( /* objidlbase.h:3876:1: */
 	SERVER_LOCALITY_PROCESS_LOCAL = 0
 	SERVER_LOCALITY_MACHINE_LOCAL = 1
 	SERVER_LOCALITY_REMOTE        = 2
 )
 
-const ( /* objidlbase.h:4483:1: */
+const ( /* objidlbase.h:3981:1: */
 	COMGLB_EXCEPTION_HANDLING     = 1
 	COMGLB_APPID                  = 2
 	COMGLB_RPC_THREADPOOL_SETTING = 3
@@ -19827,19 +20243,19 @@ const ( /* objidlbase.h:4483:1: */
 	COMGLB_UNMARSHALING_POLICY    = 5
 )
 
-const ( /* objidlbase.h:4491:1: */
+const ( /* objidlbase.h:3989:1: */
 	COMGLB_EXCEPTION_HANDLE             = 0
 	COMGLB_EXCEPTION_DONOT_HANDLE_FATAL = 1
 	COMGLB_EXCEPTION_DONOT_HANDLE       = 1
 	COMGLB_EXCEPTION_DONOT_HANDLE_ANY   = 2
 )
 
-const ( /* objidlbase.h:4498:1: */
+const ( /* objidlbase.h:3996:1: */
 	COMGLB_RPC_THREADPOOL_SETTING_DEFAULT_POOL = 0
 	COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1
 )
 
-const ( /* objidlbase.h:4503:1: */
+const ( /* objidlbase.h:4001:1: */
 	COMGLB_STA_MODALLOOP_REMOVE_TOUCH_MESSAGES                    = 1
 	COMGLB_STA_MODALLOOP_SHARED_QUEUE_REMOVE_INPUT_MESSAGES       = 2
 	COMGLB_STA_MODALLOOP_SHARED_QUEUE_DONOT_REMOVE_INPUT_MESSAGES = 4
@@ -19850,7 +20266,7 @@ const ( /* objidlbase.h:4503:1: */
 	COMGLB_STA_MODALLOOP_SHARED_QUEUE_REORDER_POINTER_MESSAGES    = 128
 )
 
-const ( /* objidlbase.h:4514:1: */
+const ( /* objidlbase.h:4012:1: */
 	COMGLB_UNMARSHALING_POLICY_NORMAL = 0
 	COMGLB_UNMARSHALING_POLICY_STRONG = 1
 	COMGLB_UNMARSHALING_POLICY_HYBRID = 2
@@ -19860,13 +20276,13 @@ const ( /* objidlbase.h:4514:1: */
 //
 // IAsyncManager interface
 
-const ( /* objidlbase.h:5508:1: */
+const ( /* objidlbase.h:4875:1: */
 	DCOM_NONE          = 0
 	DCOM_CALL_COMPLETE = 1
 	DCOM_CALL_CANCELED = 2
 )
 
-const ( /* objidlbase.h:6915:1: */
+const ( /* objidlbase.h:6049:1: */
 	APTTYPEQUALIFIER_NONE               = 0
 	APTTYPEQUALIFIER_IMPLICIT_MTA       = 1
 	APTTYPEQUALIFIER_NA_ON_MTA          = 2
@@ -19876,7 +20292,7 @@ const ( /* objidlbase.h:6915:1: */
 	APTTYPEQUALIFIER_APPLICATION_STA    = 6
 )
 
-const ( /* objidlbase.h:6925:1: */
+const ( /* objidlbase.h:6059:1: */
 	APTTYPE_CURRENT = -1
 	APTTYPE_STA     = 0
 	APTTYPE_MTA     = 1
@@ -19884,12 +20300,12 @@ const ( /* objidlbase.h:6925:1: */
 	APTTYPE_MAINSTA = 3
 )
 
-const ( /* objidlbase.h:6935:1: */
+const ( /* objidlbase.h:6069:1: */
 	THDTYPE_BLOCKMESSAGES   = 0
 	THDTYPE_PROCESSMESSAGES = 1
 )
 
-const ( /* objidlbase.h:7232:1: */
+const ( /* objidlbase.h:6329:1: */
 	CO_MARSHALING_SOURCE_IS_APP_CONTAINER = 0
 )
 
@@ -19899,26 +20315,26 @@ const ( /* oleauto.h:590:1: */
 	REGKIND_NONE     = 2
 )
 
-const ( /* oleidl.h:1229:1: */
+const ( /* oleidl.h:1123:1: */
 	OLEGETMONIKER_ONLYIFTHERE = 1
 	OLEGETMONIKER_FORCEASSIGN = 2
 	OLEGETMONIKER_UNASSIGN    = 3
 	OLEGETMONIKER_TEMPFORUSER = 4
 )
 
-const ( /* oleidl.h:1236:1: */
+const ( /* oleidl.h:1130:1: */
 	OLEWHICHMK_CONTAINER = 1
 	OLEWHICHMK_OBJREL    = 2
 	OLEWHICHMK_OBJFULL   = 3
 )
 
-const ( /* oleidl.h:1242:1: */
+const ( /* oleidl.h:1136:1: */
 	USERCLASSTYPE_FULL    = 1
 	USERCLASSTYPE_SHORT   = 2
 	USERCLASSTYPE_APPNAME = 3
 )
 
-const ( /* oleidl.h:1248:1: */
+const ( /* oleidl.h:1142:1: */
 	OLEMISC_RECOMPOSEONRESIZE            = 1
 	OLEMISC_ONLYICONIC                   = 2
 	OLEMISC_INSERTNOTREPLACE             = 4
@@ -19942,34 +20358,34 @@ const ( /* oleidl.h:1248:1: */
 	OLEMISC_WANTSTOMENUMERGE             = 1048576
 	OLEMISC_SUPPORTSMULTILEVELUNDO       = 2097152
 )
-const ( /* oleidl.h:1272:1: */
+const ( /* oleidl.h:1166:1: */
 	OLECLOSE_SAVEIFDIRTY = 0
 	OLECLOSE_NOSAVE      = 1
 	OLECLOSE_PROMPTSAVE  = 2
 )
-const ( /* oleidl.h:1792:1: */
+const ( /* oleidl.h:1504:1: */
 	OLERENDER_NONE   = 0
 	OLERENDER_DRAW   = 1
 	OLERENDER_FORMAT = 2
 	OLERENDER_ASIS   = 3
 )
 
-const ( /* oleidl.h:1934:1: */
+const ( /* oleidl.h:1631:1: */
 	OLEUPDATE_ALWAYS = 1
 	OLEUPDATE_ONCALL = 3
 )
 
-const ( /* oleidl.h:1942:1: */
+const ( /* oleidl.h:1639:1: */
 	OLELINKBIND_EVENIFCLASSDIFF = 1
 )
 
-const ( /* oleidl.h:2225:1: */
+const ( /* oleidl.h:1835:1: */
 	BINDSPEED_INDEFINITE = 1
 	BINDSPEED_MODERATE   = 2
 	BINDSPEED_IMMEDIATE  = 3
 )
 
-const ( /* oleidl.h:2231:1: */
+const ( /* oleidl.h:1841:1: */
 	OLECONTF_EMBEDDINGS    = 1
 	OLECONTF_LINKS         = 2
 	OLECONTF_OTHERS        = 4
@@ -19977,17 +20393,17 @@ const ( /* oleidl.h:2231:1: */
 	OLECONTF_ONLYIFRUNNING = 16
 )
 
-const ( /* oleidl.h:4465:1: */
+const ( /* oleidl.h:3732:1: */
 	OLEVERBATTRIB_NEVERDIRTIES    = 1
 	OLEVERBATTRIB_ONCONTAINERMENU = 2
 )
 
-const ( /* oleidl.h:548:1: */
+const ( /* oleidl.h:535:1: */
 	DISCARDCACHE_SAVEIFDIRTY = 0
 	DISCARDCACHE_NOSAVE      = 1
 )
 
-const ( /* propidl.h:381:1: */
+const ( /* propidl.h:402:1: */
 	PIDMSI_STATUS_NORMAL     = 0
 	PIDMSI_STATUS_NEW        = 1
 	PIDMSI_STATUS_PRELIM     = 2
@@ -20143,13 +20559,7 @@ const ( /* sysinfoapi.h:70:3: */
 	ComputerNameMax                       = 8
 )
 
-const ( /* urlmon.h:10655:1: */
-	BINDHANDLETYPES_APPCACHE   = 0
-	BINDHANDLETYPES_DEPENDENCY = 1
-	BINDHANDLETYPES_COUNT      = 2
-)
-
-const ( /* urlmon.h:1195:1: */
+const ( /* urlmon.h:1295:1: */
 	BINDVERB_GET       = 0
 	BINDVERB_POST      = 1
 	BINDVERB_PUT       = 2
@@ -20157,12 +20567,12 @@ const ( /* urlmon.h:1195:1: */
 	BINDVERB_RESERVED1 = 4
 )
 
-const ( /* urlmon.h:1203:1: */
+const ( /* urlmon.h:1303:1: */
 	BINDINFOF_URLENCODESTGMEDDATA = 1
 	BINDINFOF_URLENCODEDEXTRAINFO = 2
 )
 
-const ( /* urlmon.h:1208:1: */
+const ( /* urlmon.h:1308:1: */
 	BINDF_ASYNCHRONOUS             = 1
 	BINDF_ASYNCSTORAGE             = 2
 	BINDF_NOPROGRESSIVERENDERING   = 4
@@ -20196,13 +20606,13 @@ const ( /* urlmon.h:1208:1: */
 	BINDF_RESERVED_8               = 536870912
 )
 
-const ( /* urlmon.h:1242:1: */
+const ( /* urlmon.h:1342:1: */
 	URL_ENCODING_NONE         = 0
 	URL_ENCODING_ENABLE_UTF8  = 268435456
 	URL_ENCODING_DISABLE_UTF8 = 536870912
 )
 
-const ( /* urlmon.h:1298:1: */
+const ( /* urlmon.h:1398:1: */
 	BINDINFO_OPTIONS_WININETFLAG              = 65536
 	BINDINFO_OPTIONS_ENABLE_UTF8              = 131072
 	BINDINFO_OPTIONS_DISABLE_UTF8             = 262144
@@ -20220,7 +20630,7 @@ const ( /* urlmon.h:1298:1: */
 	BINDINFO_OPTIONS_SHDOCVW_NAVIGATE         = -2147483648
 )
 
-const ( /* urlmon.h:1316:1: */
+const ( /* urlmon.h:1416:1: */
 	BSCF_FIRSTDATANOTIFICATION        = 1
 	BSCF_INTERMEDIATEDATANOTIFICATION = 2
 	BSCF_LASTDATANOTIFICATION         = 4
@@ -20230,7 +20640,7 @@ const ( /* urlmon.h:1316:1: */
 	BSCF_64BITLENGTHDOWNLOAD          = 64
 )
 
-const ( /* urlmon.h:1326:1: */
+const ( /* urlmon.h:1426:1: */
 	BINDSTATUS_FINDINGRESOURCE            = 1
 	BINDSTATUS_CONNECTING                 = 2
 	BINDSTATUS_REDIRECTING                = 3
@@ -20301,7 +20711,7 @@ const ( /* urlmon.h:1326:1: */
 	BINDSTATUS_LAST_PRIVATE               = 66
 )
 
-const ( /* urlmon.h:1675:1: */
+const ( /* urlmon.h:1722:1: */
 	BINDF2_DISABLEBASICOVERHTTP              = 1
 	BINDF2_DISABLEAUTOCOOKIEHANDLING         = 2
 	BINDF2_READ_DATA_GREATER_THAN_4GB        = 4
@@ -20327,13 +20737,13 @@ const ( /* urlmon.h:1675:1: */
 	BINDF2_RESERVED_1                        = 2147483648
 )
 
-const ( /* urlmon.h:1989:1: */
+const ( /* urlmon.h:2028:1: */
 	AUTHENTICATEF_PROXY = 1
 	AUTHENTICATEF_BASIC = 2
 	AUTHENTICATEF_HTTP  = 4
 )
 
-const ( /* urlmon.h:2702:1: */
+const ( /* urlmon.h:2669:1: */
 	CIP_DISK_FULL                            = 0
 	CIP_ACCESS_DENIED                        = 1
 	CIP_NEWER_VERSION_EXISTS                 = 2
@@ -20346,7 +20756,7 @@ const ( /* urlmon.h:2702:1: */
 	CIP_NEED_REBOOT_UI_PERMISSION            = 9
 )
 
-const ( /* urlmon.h:5266:1: */
+const ( /* urlmon.h:4774:1: */
 	BINDSTRING_HEADERS             = 1
 	BINDSTRING_ACCEPT_MIMES        = 2
 	BINDSTRING_EXTRA_URL           = 3
@@ -20372,7 +20782,7 @@ const ( /* urlmon.h:5266:1: */
 	BINDSTRING_PROXY_PASSWORD      = 23
 )
 
-const ( /* urlmon.h:5537:1: */
+const ( /* urlmon.h:5016:1: */
 	PI_PARSE_URL            = 1
 	PI_FILTER_MODE          = 2
 	PI_FORCE_ASYNC          = 4
@@ -20390,12 +20800,12 @@ const ( /* urlmon.h:5537:1: */
 	PI_PREFERDEFAULTHANDLER = 131072
 )
 
-const ( /* urlmon.h:6458:1: */
+const ( /* urlmon.h:5785:1: */
 	OIBDG_APARTMENTTHREADED = 256
 	OIBDG_DATAONLY          = 4096
 )
 
-const ( /* urlmon.h:6944:1: */
+const ( /* urlmon.h:6168:1: */
 	PARSE_CANONICALIZE       = 1
 	PARSE_FRIENDLY           = 2
 	PARSE_SECURITY_URL       = 3
@@ -20417,12 +20827,12 @@ const ( /* urlmon.h:6944:1: */
 	PARSE_UNESCAPE           = 19
 )
 
-const ( /* urlmon.h:6966:1: */
+const ( /* urlmon.h:6190:1: */
 	PSU_DEFAULT           = 1
 	PSU_SECURITY_URL_ONLY = 2
 )
 
-const ( /* urlmon.h:6971:1: */
+const ( /* urlmon.h:6195:1: */
 	QUERY_EXPIRATION_DATE              = 1
 	QUERY_TIME_OF_LAST_CHANGE          = 2
 	QUERY_CONTENT_ENCODING             = 3
@@ -20445,7 +20855,7 @@ const ( /* urlmon.h:6971:1: */
 //
 // IInternetSecurityManager interface
 
-const ( /* urlmon.h:7495:1: */
+const ( /* urlmon.h:6653:1: */
 	PUAF_DEFAULT                      = 0
 	PUAF_NOUI                         = 1
 	PUAF_ISFILE                       = 2
@@ -20468,25 +20878,17 @@ const ( /* urlmon.h:7495:1: */
 	PUAF_NOUIIFLOCKED                 = 1048576
 	PUAF_DRAGPROTOCOLCHECK            = 2097152
 )
-const ( /* urlmon.h:7518:1: */
+const ( /* urlmon.h:6676:1: */
 	PUAFOUT_DEFAULT          = 0
 	PUAFOUT_ISLOCKZONEPOLICY = 1
 )
 
-const ( /* urlmon.h:7524:1: */
+const ( /* urlmon.h:6682:1: */
 	SZM_CREATE = 0
 	SZM_DELETE = 1
 )
 
-const ( /* urlmon.h:793:1: */
-	MIMETYPEPROP        = 0
-	USE_SRC_URL         = 1
-	CLASSIDPROP         = 2
-	TRUSTEDDOWNLOADPROP = 3
-	POPUPLEVELPROP      = 4
-)
-
-const ( /* urlmon.h:8834:1: */
+const ( /* urlmon.h:7782:1: */
 	URLZONE_INVALID        = -1
 	URLZONE_PREDEFINED_MIN = 0
 	URLZONE_LOCAL_MACHINE  = 0
@@ -20499,7 +20901,7 @@ const ( /* urlmon.h:8834:1: */
 	URLZONE_USER_MAX       = 10000
 )
 
-const ( /* urlmon.h:8849:1: */
+const ( /* urlmon.h:7797:1: */
 	URLTEMPLATE_CUSTOM         = 0
 	URLTEMPLATE_PREDEFINED_MIN = 65536
 	URLTEMPLATE_LOW            = 65536
@@ -20510,12 +20912,12 @@ const ( /* urlmon.h:8849:1: */
 	URLTEMPLATE_PREDEFINED_MAX = 131072
 )
 
-const ( /* urlmon.h:8860:1: */
+const ( /* urlmon.h:7808:1: */
 	MAX_ZONE_PATH        = 260
 	MAX_ZONE_DESCRIPTION = 200
 )
 
-const ( /* urlmon.h:8866:1: */
+const ( /* urlmon.h:7813:1: */
 	ZAFLAGS_CUSTOM_EDIT              = 1
 	ZAFLAGS_ADD_SITES                = 2
 	ZAFLAGS_REQUIRE_VERIFICATION     = 4
@@ -20530,26 +20932,33 @@ const ( /* urlmon.h:8866:1: */
 	ZAFLAGS_NO_CACHE                 = 262144
 )
 
-const ( /* urlmon.h:8894:1: */
+const ( /* urlmon.h:7841:1: */
 	URLZONEREG_DEFAULT = 0
 	URLZONEREG_HKLM    = 1
 	URLZONEREG_HKCU    = 2
 )
 
-// TODO: Add RTL_UMS... to winnt.h header and add UMS-base API.
+const ( /* urlmon.h:9292:1: */
+	BINDHANDLETYPES_APPCACHE   = 0
+	BINDHANDLETYPES_DEPENDENCY = 1
+	BINDHANDLETYPES_COUNT      = 2
+)
+
+const ( /* urlmon.h:946:1: */
+	MIMETYPEPROP        = 0
+	USE_SRC_URL         = 1
+	CLASSIDPROP         = 2
+	TRUSTEDDOWNLOADPROP = 3
+	POPUPLEVELPROP      = 4
+)
 
-const ( /* winbase.h:1191:3: */
+const ( /* winbase.h:1184:3: */
 	ThreadMemoryPriority      = 0
 	ThreadAbsoluteCpuPriority = 1
 	ThreadInformationClassMax = 2
 )
 
-const ( /* winbase.h:1197:3: */
-	ProcessMemoryPriority      = 0
-	ProcessInformationClassMax = 1
-)
-
-const ( /* winbase.h:1298:3: */
+const ( /* winbase.h:1279:3: */
 	DEPPolicyAlwaysOff  = 0
 	DEPPolicyAlwaysOn   = 1
 	DEPPolicyOptIn      = 2
@@ -20557,12 +20966,42 @@ const ( /* winbase.h:1298:3: */
 	DEPTotalPolicyCount = 4
 )
 
-const ( /* winbase.h:2147:3: */
+const ( /* winbase.h:1570:3: */
+	ProcessMemoryPriority      = 0
+	ProcessInformationClassMax = 1
+)
+
+const ( /* winbase.h:2216:3: */
 	FindStreamInfoStandard     = 0
 	FindStreamInfoMaxInfoLevel = 1
 )
 
-const ( /* winioctl.h:1205:1: */
+const ( /* wincrypt.h:3656:3: */
+	KeyTypeOther             = 0
+	KeyTypeVirtualSmartCard  = 1
+	KeyTypePhysicalSmartCard = 2
+	KeyTypePassport          = 3
+	KeyTypePassportRemote    = 4
+	KeyTypePassportSmartCard = 5
+	KeyTypeHardware          = 6
+	KeyTypeSoftware          = 7
+	KeyTypeSelfSigned        = 8
+)
+
+const ( /* windef.h:157:1: */
+	DPI_AWARENESS_INVALID           = -1
+	DPI_AWARENESS_UNAWARE           = 0
+	DPI_AWARENESS_SYSTEM_AWARE      = 1
+	DPI_AWARENESS_PER_MONITOR_AWARE = 2
+)
+
+const ( /* windef.h:170:1: */
+	DPI_HOSTING_BEHAVIOR_INVALID = -1
+	DPI_HOSTING_BEHAVIOR_DEFAULT = 0
+	DPI_HOSTING_BEHAVIOR_MIXED   = 1
+)
+
+const ( /* winioctl.h:1231:1: */
 	DeviceProblemNone                 = 0
 	DeviceProblemHardware             = 1
 	DeviceProblemCHMError             = 2
@@ -20579,7 +21018,7 @@ const ( /* winioctl.h:1205:1: */
 	DeviceProblemDriveError           = 13
 )
 
-const ( /* winioctl.h:1736:1: */
+const ( /* winioctl.h:1762:1: */
 	StorageDeviceProperty            = 0
 	StorageAdapterProperty           = 1
 	StorageDeviceIdProperty          = 2
@@ -20591,14 +21030,14 @@ const ( /* winioctl.h:1736:1: */
 	StorageDeviceTrimProperty        = 8
 )
 
-const ( /* winioctl.h:1748:1: */
+const ( /* winioctl.h:1774:1: */
 	PropertyStandardQuery   = 0
 	PropertyExistsQuery     = 1
 	PropertyMaskQuery       = 2
 	PropertyQueryMaxDefined = 3
 )
 
-const ( /* winioctl.h:266:3: */
+const ( /* winioctl.h:292:3: */
 	DDS_4mm            = 32
 	MiniQic            = 33
 	Travan             = 34
@@ -20664,7 +21103,7 @@ const ( /* winioctl.h:266:3: */
 	VXATape            = 94
 )
 
-const ( /* winioctl.h:340:3: */
+const ( /* winioctl.h:366:3: */
 	BusTypeUnknown     = 0
 	BusTypeScsi        = 1
 	BusTypeAtapi       = 2
@@ -20678,7 +21117,7 @@ const ( /* winioctl.h:340:3: */
 	BusTypeMaxReserved = 127
 )
 
-const ( /* winioctl.h:499:1: */
+const ( /* winioctl.h:525:1: */
 	Unknown        = 0
 	F5_1Pt2_512    = 1
 	F3_1Pt44_512   = 2
@@ -20712,25 +21151,25 @@ const ( /* winioctl.h:499:1: */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-const ( /* winioctl.h:577:1: */
+const ( /* winioctl.h:603:1: */
 	PARTITION_STYLE_MBR = 0
 	PARTITION_STYLE_GPT = 1
 	PARTITION_STYLE_RAW = 2
 )
 
-const ( /* winioctl.h:667:1: */
+const ( /* winioctl.h:693:1: */
 	DetectNone    = 0
 	DetectInt13   = 1
 	DetectExInt13 = 2
 )
 
-const ( /* winioctl.h:729:1: */
+const ( /* winioctl.h:755:1: */
 	EqualPriority      = 0
 	KeepPrefetchedData = 1
 	KeepReadData       = 2
 )
 
-const ( /* winioctl.h:820:1: */
+const ( /* winioctl.h:846:1: */
 	RequestSize     = 0
 	RequestLocation = 1
 )
@@ -20740,7 +21179,7 @@ const ( /* winioctl.h:820:1: */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-const ( /* winioctl.h:968:1: */
+const ( /* winioctl.h:994:1: */
 	AllElements       = 0
 	ChangerTransport  = 1
 	ChangerSlot       = 2
@@ -20777,7 +21216,7 @@ const ( /* winnls.h:772:3: */
 	GEOCLASS_ALL    = 0
 )
 
-const ( /* winnt.h:2945:5: */
+const ( /* winnt.h:2946:5: */
 	SidTypeUser           = 1
 	SidTypeGroup          = 2
 	SidTypeDomain         = 3
@@ -20791,7 +21230,7 @@ const ( /* winnt.h:2945:5: */
 	SidTypeLogonSession   = 11
 )
 
-const ( /* winnt.h:3184:5: */
+const ( /* winnt.h:3189:5: */
 	WinNullSid                                    = 0
 	WinWorldSid                                   = 1
 	WinLocalSid                                   = 2
@@ -20912,17 +21351,17 @@ const ( /* winnt.h:3184:5: */
 	WinAuthenticationKeyPropertyAttestationSid    = 117
 )
 
-const ( /* winnt.h:3495:5: */
+const ( /* winnt.h:3500:5: */
 	AclRevisionInformation = 1
 	AclSizeInformation     = 2
 )
 
-const ( /* winnt.h:3565:5: */
+const ( /* winnt.h:3570:5: */
 	AuditEventObjectAccess           = 0
 	AuditEventDirectoryServiceAccess = 1
 )
 
-const ( /* winnt.h:3597:5: */
+const ( /* winnt.h:3602:5: */
 	AccessReasonNone                     = 0
 	AccessReasonAllowedAce               = 65536
 	AccessReasonDeniedAce                = 131072
@@ -20941,25 +21380,25 @@ const ( /* winnt.h:3597:5: */
 	AccessReasonNoGrant                  = 8388608
 )
 
-const ( /* winnt.h:3687:5: */
+const ( /* winnt.h:3692:5: */
 	SecurityAnonymous      = 0
 	SecurityIdentification = 1
 	SecurityImpersonation  = 2
 	SecurityDelegation     = 3
 )
 
-const ( /* winnt.h:3714:5: */
+const ( /* winnt.h:3719:5: */
 	TokenPrimary       = 1
 	TokenImpersonation = 2
 )
 
-const ( /* winnt.h:3719:5: */
+const ( /* winnt.h:3724:5: */
 	TokenElevationTypeDefault = 1
 	TokenElevationTypeFull    = 2
 	TokenElevationTypeLimited = 3
 )
 
-const ( /* winnt.h:3725:5: */
+const ( /* winnt.h:3730:5: */
 	TokenUser                            = 1
 	TokenGroups                          = 2
 	TokenPrivileges                      = 3
@@ -21003,7 +21442,7 @@ const ( /* winnt.h:3725:5: */
 	MaxTokenInfoClass                    = 41
 )
 
-const ( /* winnt.h:3893:5: */
+const ( /* winnt.h:3898:5: */
 	MandatoryLevelUntrusted     = 0
 	MandatoryLevelLow           = 1
 	MandatoryLevelMedium        = 2
@@ -21013,18 +21452,18 @@ const ( /* winnt.h:3893:5: */
 	MandatoryLevelCount         = 6
 )
 
-const ( /* winnt.h:4019:5: */
+const ( /* winnt.h:4024:5: */
 	SeLearningModeInvalidType = 0
 	SeLearningModeSettings    = 1
 	SeLearningModeMax         = 2
 )
 
-const ( /* winnt.h:4223:5: */
+const ( /* winnt.h:4228:5: */
 	PMCCounter             = 0
 	MaxHardwareCounterType = 1
 )
 
-const ( /* winnt.h:4228:5: */
+const ( /* winnt.h:4233:5: */
 	ProcessDEPPolicy                   = 0
 	ProcessASLRPolicy                  = 1
 	ProcessDynamicCodePolicy           = 2
@@ -21039,19 +21478,19 @@ const ( /* winnt.h:4228:5: */
 	MaxProcessMitigationPolicy         = 11
 )
 
-const ( /* winnt.h:4426:5: */
+const ( /* winnt.h:4431:5: */
 	ToleranceLow    = 1
 	ToleranceMedium = 2
 	ToleranceHigh   = 3
 )
 
-const ( /* winnt.h:4432:5: */
+const ( /* winnt.h:4437:5: */
 	ToleranceIntervalShort  = 1
 	ToleranceIntervalMedium = 2
 	ToleranceIntervalLong   = 3
 )
 
-const ( /* winnt.h:4551:5: */
+const ( /* winnt.h:4556:5: */
 	JobObjectBasicAccountingInformation         = 1
 	JobObjectBasicLimitInformation              = 2
 	JobObjectBasicProcessIdList                 = 3
@@ -21080,14 +21519,14 @@ const ( /* winnt.h:4551:5: */
 	MaxJobObjectInfoClass                       = 26
 )
 
-const ( /* winnt.h:4575:5: */
+const ( /* winnt.h:4580:5: */
 	FirmwareTypeUnknown = 0
 	FirmwareTypeBios    = 1
 	FirmwareTypeUefi    = 2
 	FirmwareTypeMax     = 3
 )
 
-const ( /* winnt.h:4600:5: */
+const ( /* winnt.h:4605:5: */
 	RelationProcessorCore    = 0
 	RelationNumaNode         = 1
 	RelationCache            = 2
@@ -21096,7 +21535,7 @@ const ( /* winnt.h:4600:5: */
 	RelationAll              = 65535
 )
 
-const ( /* winnt.h:4607:5: */
+const ( /* winnt.h:4612:5: */
 	CacheUnified     = 0
 	CacheInstruction = 1
 	CacheData        = 2
@@ -21108,7 +21547,24 @@ const ( /* winnt.h:467:1: */
 	DEFAULT_COMPARTMENT_ID     = 1
 )
 
-const ( /* winnt.h:5229:3: */
+const ( /* winnt.h:4908:3: */
+	MemExtendedParameterInvalidType         = 0
+	MemExtendedParameterAddressRequirements = 1
+	MemExtendedParameterNumaNode            = 2
+	MemExtendedParameterPartitionHandle     = 3
+	MemExtendedParameterUserPhysicalHandle  = 4
+	MemExtendedParameterAttributeFlags      = 5
+	MemExtendedParameterMax                 = 6
+)
+
+const ( /* winnt.h:4946:3: */
+	MemSectionExtendedParameterInvalidType       = 0
+	MemSectionExtendedParameterUserPhysicalFlags = 1
+	MemSectionExtendedParameterNumaNode          = 2
+	MemSectionExtendedParameterMax               = 3
+)
+
+const ( /* winnt.h:5346:3: */
 	PowerSystemUnspecified = 0
 	PowerSystemWorking     = 1
 	PowerSystemSleeping1   = 2
@@ -21119,7 +21575,7 @@ const ( /* winnt.h:5229:3: */
 	PowerSystemMaximum     = 7
 )
 
-const ( /* winnt.h:5235:3: */
+const ( /* winnt.h:5352:3: */
 	PowerActionNone          = 0
 	PowerActionReserved      = 1
 	PowerActionSleep         = 2
@@ -21130,7 +21586,7 @@ const ( /* winnt.h:5235:3: */
 	PowerActionWarmEject     = 7
 )
 
-const ( /* winnt.h:5241:3: */
+const ( /* winnt.h:5358:3: */
 	PowerDeviceUnspecified = 0
 	PowerDeviceD0          = 1
 	PowerDeviceD1          = 2
@@ -21139,13 +21595,13 @@ const ( /* winnt.h:5241:3: */
 	PowerDeviceMaximum     = 5
 )
 
-const ( /* winnt.h:5246:3: */
+const ( /* winnt.h:5363:3: */
 	PowerMonitorOff = 0
 	PowerMonitorOn  = 1
 	PowerMonitorDim = 2
 )
 
-const ( /* winnt.h:5250:3: */
+const ( /* winnt.h:5367:3: */
 	PowerUserPresent    = 0
 	PowerUserNotPresent = 1
 	PowerUserInactive   = 2
@@ -21153,19 +21609,19 @@ const ( /* winnt.h:5250:3: */
 	PowerUserInvalid    = 3
 )
 
-const ( /* winnt.h:5266:3: */
+const ( /* winnt.h:5383:3: */
 	LT_DONT_CARE      = 0
 	LT_LOWEST_LATENCY = 1
 )
 
-const ( /* winnt.h:5281:3: */
+const ( /* winnt.h:5398:3: */
 	PowerRequestDisplayRequired   = 0
 	PowerRequestSystemRequired    = 1
 	PowerRequestAwayModeRequired  = 2
 	PowerRequestExecutionRequired = 3
 )
 
-const ( /* winnt.h:5309:5: */
+const ( /* winnt.h:5426:5: */
 	SystemPowerPolicyAc                = 0
 	SystemPowerPolicyDc                = 1
 	VerifySystemPolicyAc               = 2
@@ -21249,13 +21705,13 @@ const ( /* winnt.h:5309:5: */
 	PowerInformationLevelMaximum       = 80
 )
 
-const ( /* winnt.h:5393:5: */
+const ( /* winnt.h:5510:5: */
 	UserNotPresent = 0
 	UserPresent    = 1
 	UserUnknown    = 255
 )
 
-const ( /* winnt.h:5429:5: */
+const ( /* winnt.h:5546:5: */
 	MonitorRequestReasonUnknown                 = 0
 	MonitorRequestReasonPowerButton             = 1
 	MonitorRequestReasonRemoteConnection        = 2
@@ -21273,14 +21729,14 @@ const ( /* winnt.h:5429:5: */
 	MonitorRequestReasonMax                     = 14
 )
 
-const ( /* winnt.h:5459:5: */
+const ( /* winnt.h:5576:5: */
 	PoAc               = 0
 	PoDc               = 1
 	PoHot              = 2
 	PoConditionMaximum = 3
 )
 
-const ( /* winnt.h:5486:5: */
+const ( /* winnt.h:5603:5: */
 	PlatformRoleUnspecified       = 0
 	PlatformRoleDesktop           = 1
 	PlatformRoleMobile            = 2
@@ -21293,24 +21749,24 @@ const ( /* winnt.h:5486:5: */
 	PlatformRoleMaximum           = 9
 )
 
-const ( /* winnt.h:6623:5: */
+const ( /* winnt.h:6740:5: */
 	IMAGE_AUX_SYMBOL_TYPE_TOKEN_DEF = 1
 )
 
-const ( /* winnt.h:7494:5: */
+const ( /* winnt.h:7611:5: */
 	IMPORT_OBJECT_CODE  = 0
 	IMPORT_OBJECT_DATA  = 1
 	IMPORT_OBJECT_CONST = 2
 )
 
-const ( /* winnt.h:7498:5: */
+const ( /* winnt.h:7615:5: */
 	IMPORT_OBJECT_ORDINAL         = 0
 	IMPORT_OBJECT_NAME            = 1
 	IMPORT_OBJECT_NAME_NO_PREFIX  = 2
 	IMPORT_OBJECT_NAME_UNDECORATE = 3
 )
 
-const ( /* winnt.h:7504:5: */
+const ( /* winnt.h:7621:5: */
 	COMIMAGE_FLAGS_ILONLY                = 1
 	COMIMAGE_FLAGS_32BITREQUIRED         = 2
 	COMIMAGE_FLAGS_IL_LIBRARY            = 4
@@ -21335,7 +21791,7 @@ const ( /* winnt.h:7504:5: */
 	MAX_PACKAGE_NAME                     = 1024
 )
 
-const ( /* winnt.h:7909:5: */
+const ( /* winnt.h:8028:5: */
 	UmsThreadInvalidInfoClass = 0
 	UmsThreadUserContext      = 1
 	UmsThreadPriority         = 2
@@ -21346,18 +21802,18 @@ const ( /* winnt.h:7909:5: */
 	UmsThreadMaxInfoClass     = 7
 )
 
-const ( /* winnt.h:7920:5: */
+const ( /* winnt.h:8039:5: */
 	UmsSchedulerStartup       = 0
 	UmsSchedulerThreadBlocked = 1
 	UmsSchedulerThreadYield   = 2
 )
 
-const ( /* winnt.h:7995:5: */
+const ( /* winnt.h:8114:5: */
 	HeapCompatibilityInformation      = 0
 	HeapEnableTerminationOnCorruption = 1
 )
 
-const ( /* winnt.h:8023:5: */
+const ( /* winnt.h:8142:5: */
 	ActivationContextBasicInformation                      = 1
 	ActivationContextDetailedInformation                   = 2
 	AssemblyDetailedInformationInActivationContext         = 3
@@ -21370,7 +21826,7 @@ const ( /* winnt.h:8023:5: */
 	FileInformationInAssemblyOfAssemblyInActivationContxt  = 4
 )
 
-const ( /* winnt.h:8036:5: */
+const ( /* winnt.h:8155:5: */
 	ACTCTX_RUN_LEVEL_UNSPECIFIED       = 0
 	ACTCTX_RUN_LEVEL_AS_INVOKER        = 1
 	ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE = 2
@@ -21378,13 +21834,13 @@ const ( /* winnt.h:8036:5: */
 	ACTCTX_RUN_LEVEL_NUMBERS           = 4
 )
 
-const ( /* winnt.h:8044:5: */
+const ( /* winnt.h:8163:5: */
 	ACTCTX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN    = 0
 	ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS         = 1
 	ACTCTX_COMPATIBILITY_ELEMENT_TYPE_MITIGATION = 2
 )
 
-const ( /* winnt.h:8465:5: */
+const ( /* winnt.h:8584:5: */
 	DriverType               = 1
 	FileSystemType           = 2
 	Win32ServiceOwnProcess   = 16
@@ -21393,7 +21849,7 @@ const ( /* winnt.h:8465:5: */
 	RecognizerType           = 8
 )
 
-const ( /* winnt.h:8470:5: */
+const ( /* winnt.h:8589:5: */
 	BootLoad    = 0
 	SystemLoad  = 1
 	AutoLoad    = 2
@@ -21401,14 +21857,14 @@ const ( /* winnt.h:8470:5: */
 	DisableLoad = 4
 )
 
-const ( /* winnt.h:8475:5: */
+const ( /* winnt.h:8594:5: */
 	IgnoreError   = 0
 	NormalError   = 1
 	SevereError   = 2
 	CriticalError = 3
 )
 
-const ( /* winnt.h:8675:5: */
+const ( /* winnt.h:8794:5: */
 	TapeDriveProblemNone         = 0
 	TapeDriveReadWriteWarning    = 1
 	TapeDriveReadWriteError      = 2
@@ -21425,7 +21881,7 @@ const ( /* winnt.h:8675:5: */
 	TapeDriveSnappedTape         = 13
 )
 
-const ( /* winnt.h:8685:3: */
+const ( /* winnt.h:8804:3: */
 	TP_CALLBACK_PRIORITY_HIGH    = 0
 	TP_CALLBACK_PRIORITY_NORMAL  = 1
 	TP_CALLBACK_PRIORITY_LOW     = 2
@@ -21433,19 +21889,19 @@ const ( /* winnt.h:8685:3: */
 	TP_CALLBACK_PRIORITY_COUNT   = 3
 )
 
-const ( /* winnt.h:8878:7: */
+const ( /* winnt.h:8997:7: */
 	TransactionOutcomeUndetermined = 1
 	TransactionOutcomeCommitted    = 2
 	TransactionOutcomeAborted      = 3
 )
 
-const ( /* winnt.h:8884:7: */
+const ( /* winnt.h:9003:7: */
 	TransactionStateNormal          = 1
 	TransactionStateIndoubt         = 2
 	TransactionStateCommittedNotify = 3
 )
 
-const ( /* winnt.h:8956:7: */
+const ( /* winnt.h:9075:7: */
 	TransactionBasicInformation              = 0
 	TransactionPropertiesInformation         = 1
 	TransactionEnlistmentInformation         = 2
@@ -21454,7 +21910,7 @@ const ( /* winnt.h:8956:7: */
 	TransactionDTCPrivateInformation         = 5
 )
 
-const ( /* winnt.h:8965:7: */
+const ( /* winnt.h:9084:7: */
 	TransactionManagerBasicInformation             = 0
 	TransactionManagerLogInformation               = 1
 	TransactionManagerLogPathInformation           = 2
@@ -21463,18 +21919,18 @@ const ( /* winnt.h:8965:7: */
 	TransactionManagerOldestTransactionInformation = 5
 )
 
-const ( /* winnt.h:8974:7: */
+const ( /* winnt.h:9093:7: */
 	ResourceManagerBasicInformation      = 0
 	ResourceManagerCompletionInformation = 1
 )
 
-const ( /* winnt.h:8991:7: */
+const ( /* winnt.h:9110:7: */
 	EnlistmentBasicInformation    = 0
 	EnlistmentRecoveryInformation = 1
 	EnlistmentCrmInformation      = 2
 )
 
-const ( /* winnt.h:9006:7: */
+const ( /* winnt.h:9125:7: */
 	KTMOBJECT_TRANSACTION         = 0
 	KTMOBJECT_TRANSACTION_MANAGER = 1
 	KTMOBJECT_RESOURCE_MANAGER    = 2
@@ -21508,14 +21964,27 @@ const ( /* winsvc.h:143:3: */
 	SC_ENUM_PROCESS_INFO = 0
 )
 
-const ( /* wtypes.h:181:1: */
+const ( /* winuser.h:2440:3: */
+	DCDC_DEFAULT             = 0
+	DCDC_DISABLE_FONT_UPDATE = 1
+	DCDC_DISABLE_RELAYOUT    = 2
+)
+
+const ( /* winuser.h:2449:3: */
+	DDC_DEFAULT                  = 0
+	DDC_DISABLE_ALL              = 1
+	DDC_DISABLE_RESIZE           = 2
+	DDC_DISABLE_CONTROL_RELAYOUT = 4
+)
+
+const ( /* wtypes.h:182:1: */
 	DVASPECT_CONTENT   = 1
 	DVASPECT_THUMBNAIL = 2
 	DVASPECT_ICON      = 4
 	DVASPECT_DOCPRINT  = 8
 )
 
-const ( /* wtypes.h:188:1: */
+const ( /* wtypes.h:189:1: */
 	STGC_DEFAULT                            = 0
 	STGC_OVERWRITE                          = 1
 	STGC_ONLYIFCURRENT                      = 2
@@ -21523,19 +21992,19 @@ const ( /* wtypes.h:188:1: */
 	STGC_CONSOLIDATE                        = 8
 )
 
-const ( /* wtypes.h:196:1: */
+const ( /* wtypes.h:197:1: */
 	STGMOVE_MOVE        = 0
 	STGMOVE_COPY        = 1
 	STGMOVE_SHALLOWCOPY = 2
 )
 
-const ( /* wtypes.h:202:1: */
+const ( /* wtypes.h:203:1: */
 	STATFLAG_DEFAULT = 0
 	STATFLAG_NONAME  = 1
 	STATFLAG_NOOPEN  = 2
 )
 
-const ( /* wtypes.h:512:1: */
+const ( /* wtypes.h:513:1: */
 	VT_EMPTY            = 0
 	VT_NULL             = 1
 	VT_I2               = 2
@@ -21600,7 +22069,7 @@ const ( /* wtypes.h:594:1: */
 	TYSPEC_OBJECTID    = 6
 )
 
-const ( /* wtypesbase.h:232:1: */
+const ( /* wtypesbase.h:233:1: */
 	MEMCTX_TASK      = 1
 	MEMCTX_SHARED    = 2
 	MEMCTX_MACSYSTEM = 3
@@ -21608,7 +22077,7 @@ const ( /* wtypesbase.h:232:1: */
 	MEMCTX_SAME      = -2
 )
 
-const ( /* wtypesbase.h:268:1: */
+const ( /* wtypesbase.h:269:1: */
 	CLSCTX_INPROC_SERVER          = 1
 	CLSCTX_INPROC_HANDLER         = 2
 	CLSCTX_LOCAL_SERVER           = 4
@@ -21635,7 +22104,7 @@ const ( /* wtypesbase.h:268:1: */
 	CLSCTX_PS_DLL                 = -2147483648
 )
 
-const ( /* wtypesbase.h:297:1: */
+const ( /* wtypesbase.h:298:1: */
 	MSHLFLAGS_NORMAL      = 0
 	MSHLFLAGS_TABLESTRONG = 1
 	MSHLFLAGS_TABLEWEAK   = 2
@@ -21646,7 +22115,7 @@ const ( /* wtypesbase.h:297:1: */
 	MSHLFLAGS_RESERVED4   = 64
 )
 
-const ( /* wtypesbase.h:308:1: */
+const ( /* wtypesbase.h:309:1: */
 	MSHCTX_LOCAL            = 0
 	MSHCTX_NOSHAREDMEM      = 1
 	MSHCTX_DIFFERENTMACHINE = 2
@@ -21967,9 +22436,11 @@ func Xsqlite3CompileOptions(tls *libc.TLS, pnOpt uintptr) uintptr { /* sqlite3.c
 
 type X__gnuc_va_list = X__builtin_va_list /* stdarg.h:45:27 */
 
+// for backward compatibility
+
 // Use GCC builtins
 
-// Copyright (C) 1989-2018 Free Software Foundation, Inc.
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -22115,21 +22586,21 @@ type sqlite3 = struct {
 	FmTrace                 U8
 	FnoSharedCache          U8
 	FnSqlExec               U8
-	_                       [3]byte
+	F__ccgo_pad1            [3]byte
 	FnextPagesize           int32
 	Fmagic                  U32
 	FnChange                int32
 	FnTotalChange           int32
 	FaLimit                 [12]int32
 	FnMaxSorterMmap         int32
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	Finit                   struct {
 		FnewTnum       Pgno
 		FiDb           U8
 		Fbusy          U8
-		_              [2]byte
+		F__ccgo_pad1   [2]byte
 		ForphanTrigger uint8 /* unsigned orphanTrigger: 1, unsigned imposterTable: 1, unsigned reopenMemdb: 1 */
-		_              [7]byte
+		F__ccgo_pad2   [7]byte
 		FazInit        uintptr
 	}
 	FnVdbeActive        int32
@@ -22160,9 +22631,9 @@ type sqlite3 = struct {
 	FpCollNeededArg     uintptr
 	FpErr               uintptr
 	Fu1                 struct {
-		_              [0]uint64
+		F__ccgo_pad1   [0]uint64
 		FisInterrupted int32
-		_              [4]byte
+		F__ccgo_pad2   [4]byte
 	}
 	Flookaside           Lookaside
 	FxAuth               Sqlite3_xauth
@@ -22455,7 +22926,7 @@ type sqlite3_file = struct{ FpMethods uintptr } /* sqlite3.c:1331:9 */
 type Sqlite3_file = sqlite3_file /* sqlite3.c:1766:29 */
 type sqlite3_io_methods = struct {
 	FiVersion               int32
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FxClose                 uintptr
 	FxRead                  uintptr
 	FxWrite                 uintptr
@@ -23011,7 +23482,7 @@ type sqlite3_vfs = struct {
 	FiVersion          int32
 	FszOsFile          int32
 	FmxPathname        int32
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpNext             uintptr
 	FzName             uintptr
 	FpAppData          uintptr
@@ -23441,16 +23912,16 @@ type Sqlite3_value = sqlite3_value /* sqlite3.c:5368:30 */
 // [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
 // and/or [sqlite3_set_auxdata()].
 type sqlite3_context = struct {
-	FpOut     uintptr
-	FpFunc    uintptr
-	FpMem     uintptr
-	FpVdbe    uintptr
-	FiOp      int32
-	FisError  int32
-	FskipFlag U8
-	Fargc     U8
-	_         [6]byte
-	Fargv     [1]uintptr
+	FpOut        uintptr
+	FpFunc       uintptr
+	FpMem        uintptr
+	FpVdbe       uintptr
+	FiOp         int32
+	FisError     int32
+	FskipFlag    U8
+	Fargc        U8
+	F__ccgo_pad1 [6]byte
+	Fargv        [1]uintptr
 } /* sqlite3.c:1331:9 */
 
 // CAPI3REF: SQL Function Context Object
@@ -23488,10 +23959,10 @@ type Sqlite3_destructor_type = uintptr /* sqlite3.c:6747:14 */
 
 // Structures used by the virtual table interface
 type sqlite3_vtab = struct {
-	FpModule uintptr
-	FnRef    int32
-	_        [4]byte
-	FzErrMsg uintptr
+	FpModule     uintptr
+	FnRef        int32
+	F__ccgo_pad1 [4]byte
+	FzErrMsg     uintptr
 } /* sqlite3.c:1331:9 */
 
 // The interface to the virtual-table mechanism is currently considered
@@ -23505,21 +23976,21 @@ type sqlite3_vtab = struct {
 type Sqlite3_vtab = sqlite3_vtab /* sqlite3.c:7866:29 */
 type sqlite3_index_info = struct {
 	FnConstraint      int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FaConstraint      uintptr
 	FnOrderBy         int32
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FaOrderBy         uintptr
 	FaConstraintUsage uintptr
 	FidxNum           int32
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FidxStr           uintptr
 	FneedToFreeIdxStr int32
 	ForderByConsumed  int32
 	FestimatedCost    float64
 	FestimatedRows    Sqlite3_int64
 	FidxFlags         int32
-	_                 [4]byte
+	F__ccgo_pad4      [4]byte
 	FcolUsed          Sqlite3_uint64
 } /* sqlite3.c:7867:9 */
 
@@ -23529,7 +24000,7 @@ type sqlite3_vtab_cursor = struct{ FpVtab uintptr } /* sqlite3.c:7868:9 */
 type Sqlite3_vtab_cursor = sqlite3_vtab_cursor /* sqlite3.c:7868:36 */
 type sqlite3_module = struct {
 	FiVersion      int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FxCreate       uintptr
 	FxConnect      uintptr
 	FxBestIndex    uintptr
@@ -23661,7 +24132,7 @@ type sqlite3_index_constraint = struct {
 	FiColumn     int32
 	Fop          uint8
 	Fusable      uint8
-	_            [2]byte
+	F__ccgo_pad1 [2]byte
 	FiTermOffset int32
 } /* sqlite3.c:7867:9 */
 
@@ -23766,9 +24237,9 @@ type sqlite3_index_constraint = struct {
 // sqlite3_libversion_number() returns a value greater than or equal to
 // 3009000.
 type sqlite3_index_orderby = struct {
-	FiColumn int32
-	Fdesc    uint8
-	_        [3]byte
+	FiColumn     int32
+	Fdesc        uint8
+	F__ccgo_pad1 [3]byte
 } /* sqlite3.c:7867:9 */
 
 // CAPI3REF: Virtual Table Indexing Information
@@ -23872,9 +24343,9 @@ type sqlite3_index_orderby = struct {
 // sqlite3_libversion_number() returns a value greater than or equal to
 // 3009000.
 type sqlite3_index_constraint_usage = struct {
-	FargvIndex int32
-	Fomit      uint8
-	_          [3]byte
+	FargvIndex   int32
+	Fomit        uint8
+	F__ccgo_pad1 [3]byte
 } /* sqlite3.c:7867:9 */
 
 // CAPI3REF: Mutex Methods Object
@@ -24039,7 +24510,7 @@ type sqlite3_str = struct {
 	FnChar       U32
 	FaccError    U8
 	FprintfFlags U8
-	_            [2]byte
+	F__ccgo_pad1 [2]byte
 } /* sqlite3.c:8964:9 */
 
 // CAPI3REF: Dynamic String Object
@@ -24239,20 +24710,20 @@ type Sqlite3_pcache_page = sqlite3_pcache_page /* sqlite3.c:9457:36 */
 // is not obligated to free any memory, but well-behaved implementations should
 // do their best.
 type sqlite3_pcache_methods2 = struct {
-	FiVersion   int32
-	_           [4]byte
-	FpArg       uintptr
-	FxInit      uintptr
-	FxShutdown  uintptr
-	FxCreate    uintptr
-	FxCachesize uintptr
-	FxPagecount uintptr
-	FxFetch     uintptr
-	FxUnpin     uintptr
-	FxRekey     uintptr
-	FxTruncate  uintptr
-	FxDestroy   uintptr
-	FxShrink    uintptr
+	FiVersion    int32
+	F__ccgo_pad1 [4]byte
+	FpArg        uintptr
+	FxInit       uintptr
+	FxShutdown   uintptr
+	FxCreate     uintptr
+	FxCachesize  uintptr
+	FxPagecount  uintptr
+	FxFetch      uintptr
+	FxUnpin      uintptr
+	FxRekey      uintptr
+	FxTruncate   uintptr
+	FxDestroy    uintptr
+	FxShrink     uintptr
 } /* sqlite3.c:9622:9 */
 
 // CAPI3REF: Application Defined Page Cache.
@@ -24450,7 +24921,7 @@ type sqlite3_backup = struct {
 	FiDestSchema U32
 	FbDestLocked int32
 	FiNext       Pgno
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpSrcDb      uintptr
 	FpSrc        uintptr
 	Frc          int32
@@ -24546,12 +25017,12 @@ type Sqlite3_snapshot = sqlite3_snapshot /* sqlite3.c:10714:3 */
 //
 
 type sqlite3_rtree_geometry = struct {
-	FpContext uintptr
-	FnParam   int32
-	_         [4]byte
-	FaParam   uintptr
-	FpUser    uintptr
-	FxDelUser uintptr
+	FpContext    uintptr
+	FnParam      int32
+	F__ccgo_pad1 [4]byte
+	FaParam      uintptr
+	FpUser       uintptr
+	FxDelUser    uintptr
 } /* sqlite3.c:11039:9 */
 
 // CAPI3REF: Flags for sqlite3_deserialize()
@@ -24593,7 +25064,7 @@ type Sqlite3_rtree_geometry = sqlite3_rtree_geometry /* sqlite3.c:11039:39 */
 type sqlite3_rtree_query_info = struct {
 	FpContext      uintptr
 	FnParam        int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FaParam        uintptr
 	FpUser         uintptr
 	FxDelUser      uintptr
@@ -24602,7 +25073,7 @@ type sqlite3_rtree_query_info = struct {
 	FnCoord        int32
 	FiLevel        int32
 	FmxLevel       int32
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FiRowid        Sqlite3_int64
 	FrParentScore  Sqlite3_rtree_dbl
 	FeParentWithin int32
@@ -24636,7 +25107,7 @@ type sqlite3_session = struct {
 	FbIndirect         int32
 	FbAutoAttach       int32
 	Frc                int32
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpFilterCtx        uintptr
 	FxTableFilter      uintptr
 	FnMalloc           I64
@@ -24665,20 +25136,20 @@ type Sqlite3_session = sqlite3_session /* sqlite3.c:11155:32 */
 // An instance of this object acts as a cursor for iterating
 // over the elements of a [changeset] or [patchset].
 type sqlite3_changeset_iter = struct {
-	Fin         SessionInput
-	Ftblhdr     SessionBuffer
-	FbPatchset  int32
-	FbInvert    int32
-	FbSkipEmpty int32
-	Frc         int32
-	FpConflict  uintptr
-	FzTab       uintptr
-	FnCol       int32
-	Fop         int32
-	FbIndirect  int32
-	_           [4]byte
-	FabPK       uintptr
-	FapValue    uintptr
+	Fin          SessionInput
+	Ftblhdr      SessionBuffer
+	FbPatchset   int32
+	FbInvert     int32
+	FbSkipEmpty  int32
+	Frc          int32
+	FpConflict   uintptr
+	FzTab        uintptr
+	FnCol        int32
+	Fop          int32
+	FbIndirect   int32
+	F__ccgo_pad1 [4]byte
+	FabPK        uintptr
+	FapValue     uintptr
 } /* sqlite3.c:11163:9 */
 
 // CAPI3REF: Changeset Iterator Handle
@@ -25139,7 +25610,7 @@ type Sqlite3_rebaser = sqlite3_rebaser /* sqlite3.c:12579:32 */
 
 type Fts5ExtensionApi1 = struct {
 	FiVersion           int32
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FxUserData          uintptr
 	FxColumnCount       uintptr
 	FxRowCount          uintptr
@@ -25222,7 +25693,7 @@ type Fts5_tokenizer = fts5_tokenizer /* sqlite3.c:13358:31 */
 // FTS5 EXTENSION REGISTRATION API
 type fts5_api = struct {
 	FiVersion         int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FxCreateTokenizer uintptr
 	FxFindTokenizer   uintptr
 	FxCreateFunction  uintptr
@@ -25242,24 +25713,24 @@ type fts5_api = struct {
 // FTS5 EXTENSION REGISTRATION API
 type Fts5_api = fts5_api /* sqlite3.c:13394:25 */
 
-type Ssize_t = int64 /* crtdefs.h:45:35 */
+type Ssize_t = int64 /* corecrt.h:50:35 */
 
-type Rsize_t = Size_t /* crtdefs.h:52:16 */
+type Rsize_t = Size_t /* corecrt.h:57:16 */
 
-type Intptr_t = int64 /* crtdefs.h:62:35 */
+type Intptr_t = int64 /* corecrt.h:67:35 */
 
-type Uintptr_t = uint64 /* crtdefs.h:75:44 */
+type Uintptr_t = uint64 /* corecrt.h:80:44 */
 
-type Wint_t = uint16   /* crtdefs.h:106:24 */
-type Wctype_t = uint16 /* crtdefs.h:107:24 */
+type Wint_t = uint16   /* corecrt.h:111:24 */
+type Wctype_t = uint16 /* corecrt.h:112:24 */
 
-type Errno_t = int32 /* crtdefs.h:113:13 */
+type Errno_t = int32 /* corecrt.h:118:13 */
 
-type X__time32_t = int32 /* crtdefs.h:118:14 */
+type X__time32_t = int32 /* corecrt.h:123:14 */
 
-type X__time64_t = int64 /* crtdefs.h:123:35 */
+type X__time64_t = int64 /* corecrt.h:128:35 */
 
-type Time_t = X__time64_t /* crtdefs.h:138:20 */
+type Time_t = X__time64_t /* corecrt.h:143:20 */
 
 type threadlocaleinfostruct = struct {
 	Frefcount      int32
@@ -25285,29 +25756,29 @@ type threadlocaleinfostruct = struct {
 	Fpclmap              uintptr
 	Fpcumap              uintptr
 	Flc_time_curr        uintptr
-} /* crtdefs.h:422:1 */
+} /* corecrt.h:435:1 */
 
-type Pthreadlocinfo = uintptr /* crtdefs.h:424:39 */
-type Pthreadmbcinfo = uintptr /* crtdefs.h:425:36 */
+type Pthreadlocinfo = uintptr /* corecrt.h:437:39 */
+type Pthreadmbcinfo = uintptr /* corecrt.h:438:36 */
 
 type localeinfo_struct = struct {
 	Flocinfo Pthreadlocinfo
 	Fmbcinfo Pthreadmbcinfo
-} /* crtdefs.h:428:9 */
+} /* corecrt.h:441:9 */
 
-type X_locale_tstruct = localeinfo_struct /* crtdefs.h:431:3 */
-type X_locale_t = uintptr                 /* crtdefs.h:431:19 */
+type X_locale_tstruct = localeinfo_struct /* corecrt.h:444:3 */
+type X_locale_t = uintptr                 /* corecrt.h:444:19 */
 
 type tagLC_ID = struct {
 	FwLanguage uint16
 	FwCountry  uint16
 	FwCodePage uint16
-} /* crtdefs.h:422:1 */
+} /* corecrt.h:435:1 */
 
-type LC_ID = tagLC_ID  /* crtdefs.h:439:3 */
-type LPLC_ID = uintptr /* crtdefs.h:439:9 */
+type LC_ID = tagLC_ID  /* corecrt.h:452:3 */
+type LPLC_ID = uintptr /* corecrt.h:452:9 */
 
-type Threadlocinfo = threadlocaleinfostruct /* crtdefs.h:468:3 */
+type Threadlocinfo = threadlocaleinfostruct /* corecrt.h:487:3 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -25427,17 +25898,8 @@ type Max_align_t = struct {
 	F__max_align_ll int64
 	F__max_align_ld float64
 } /* stddef.h:427:3 */
-// *
-// 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.
-
-// *
-// 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) 1992-2018 Free Software Foundation, Inc.
+// Copyright (C) 1992-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -25489,7 +25951,7 @@ type Max_align_t = struct {
 //       are semantically identical, with a limit of 259 characters for the
 //       path name, plus one for a terminating NUL, for a total of 260.
 
-// Copyright (C) 1991-2018 Free Software Foundation, Inc.
+// Copyright (C) 1991-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -25546,40 +26008,40 @@ type Max_align_t = struct {
 // This administrivia gets added to the end of limits.h
 //    if the system has its own version of limits.h.
 
-type X_onexit_t = uintptr /* stdlib.h:49:15 */
+type X_onexit_t = uintptr /* stdlib.h:50:15 */
 
 type _div_t = struct {
 	Fquot int32
 	Frem  int32
-} /* stdlib.h:59:11 */
+} /* stdlib.h:60:11 */
 
-type Div_t = _div_t /* stdlib.h:62:5 */
+type Div_t = _div_t /* stdlib.h:63:5 */
 
 type _ldiv_t = struct {
 	Fquot int32
 	Frem  int32
-} /* stdlib.h:64:11 */
+} /* stdlib.h:65:11 */
 
-type Ldiv_t = _ldiv_t /* stdlib.h:67:5 */
+type Ldiv_t = _ldiv_t /* stdlib.h:68:5 */
 
-type X_LDOUBLE = struct{ Fld [10]uint8 } /* stdlib.h:76:5 */
+type X_LDOUBLE = struct{ Fld [10]uint8 } /* stdlib.h:77:5 */
 
-type X_CRT_DOUBLE = struct{ Fx float64 } /* stdlib.h:83:5 */
+type X_CRT_DOUBLE = struct{ Fx float64 } /* stdlib.h:84:5 */
 
-type X_CRT_FLOAT = struct{ Ff float32 } /* stdlib.h:87:5 */
+type X_CRT_FLOAT = struct{ Ff float32 } /* stdlib.h:88:5 */
 
-type X_LONGDOUBLE = struct{ Fx float64 } /* stdlib.h:94:5 */
+type X_LONGDOUBLE = struct{ Fx float64 } /* stdlib.h:95:5 */
 
-type X_LDBL12 = struct{ Fld12 [12]uint8 } /* stdlib.h:101:5 */
+type X_LDBL12 = struct{ Fld12 [12]uint8 } /* stdlib.h:102:5 */
 
-type X_purecall_handler = uintptr /* stdlib.h:142:16 */
+type X_purecall_handler = uintptr /* stdlib.h:143:16 */
 
-type X_invalid_parameter_handler = uintptr /* stdlib.h:147:16 */
+type X_invalid_parameter_handler = uintptr /* stdlib.h:148:16 */
 
 type Lldiv_t = struct {
 	Fquot int64
 	Frem  int64
-} /* stdlib.h:699:61 */
+} /* stdlib.h:727:61 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -25597,10 +26059,10 @@ type Lldiv_t = struct {
 
 // The structure used to walk through the heap with _heapwalk.
 type _heapinfo = struct {
-	F_pentry  uintptr
-	F_size    Size_t
-	F_useflag int32
-	_         [4]byte
+	F_pentry     uintptr
+	F_size       Size_t
+	F_useflag    int32
+	F__ccgo_pad1 [4]byte
 } /* malloc.h:46:11 */
 
 // *
@@ -25623,7 +26085,31 @@ type X_HEAPINFO = _heapinfo /* malloc.h:50:5 */
 // On LP64 systems, longs are 64-bit.  Use the appropriate rotate
 // function.
 
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
+// For including AVX instructions
+// Copyright (C) 2008-2020 Free Software Foundation, Inc.
+//
+//    This file is part of GCC.
+//
+//    GCC is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 3, or (at your option)
+//    any later version.
+//
+//    GCC 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 General Public License for more details.
+//
+//    Under Section 7 of GPL version 3, you are granted additional
+//    permissions described in the GCC Runtime Library Exception, version
+//    3.1, as published by the Free Software Foundation.
+//
+//    You should have received a copy of the GNU General Public License and
+//    a copy of the GCC Runtime Library Exception along with this program;
+//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+//    .
+
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25651,17 +26137,17 @@ type X_HEAPINFO = _heapinfo /* malloc.h:50:5 */
 
 // The Intel API is flexible enough that we must allow aliasing with other
 //    vector types, and their scalar components.
-type X__m64 = [2]int32 /* mmintrin.h:42:13 */
+type X__m64 = [2]int32 /* mmintrin.h:44:13 */
 
 // Unaligned version of the same type
-type X__m64_u = [2]int32 /* mmintrin.h:45:13 */
+type X__m64_u = [2]int32 /* mmintrin.h:47:13 */
 
 // Internal data types for implementing the intrinsics.
-type X__v2si = [2]int32   /* mmintrin.h:48:13 */
-type X__v4hi = [4]int16   /* mmintrin.h:49:15 */
-type X__v8qi = [8]int8    /* mmintrin.h:50:14 */
-type X__v1di = [1]int64   /* mmintrin.h:51:19 */
-type X__v2sf = [2]float32 /* mmintrin.h:52:15 */
+type X__v2si = [2]int32   /* mmintrin.h:50:13 */
+type X__v4hi = [4]int16   /* mmintrin.h:51:15 */
+type X__v8qi = [8]int8    /* mmintrin.h:52:14 */
+type X__v1di = [1]int64   /* mmintrin.h:53:19 */
+type X__v2sf = [2]float32 /* mmintrin.h:54:15 */
 
 // Loads one cache line from address P to a location "closer" to the
 //    processor.  The selector I specifies the type of prefetch operation.
@@ -25679,7 +26165,7 @@ type X__v4sf = [4]float32 /* xmmintrin.h:75:15 */
 // Transpose the 4x4 matrix composed of row[0-3].
 
 // For backward source compatibility.
-// Copyright (C) 2003-2018 Free Software Foundation, Inc.
+// Copyright (C) 2003-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25706,7 +26192,7 @@ type X__v4sf = [4]float32 /* xmmintrin.h:75:15 */
 //    User Guide and Reference, version 9.0.
 
 // We need definitions from the SSE header files
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25753,42 +26239,7 @@ type X__m128d = [2]float64 /* emmintrin.h:54:16 */
 type X__m128i_u = [2]int64   /* emmintrin.h:57:19 */
 type X__m128d_u = [2]float64 /* emmintrin.h:58:16 */
 
-// Generates a m128i round key for the input m128i AES cipher key and
-//    byte round constant.  The second parameter must be a compile time
-//    constant.
-
-// PCLMUL
-
-// Performs carry-less integer multiplication of 64-bit halves of
-//    128-bit input operands.  The third parameter inducates which 64-bit
-//    haves of the input parameters v1 and v2 should be used. It must be
-//    a compile time constant.
-
-// For including AVX instructions
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
-
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
+// Copyright (C) 2008-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25812,35 +26263,33 @@ type X__m128d_u = [2]float64 /* emmintrin.h:58:16 */
 //    .
 
 // Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 9.0.
+//    User Guide and Reference, version 11.0.
 
-// Copyright (C) 2002-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
+// Internal data types for implementing the intrinsics.
+type X__v4df = [4]float64  /* avxintrin.h:41:16 */
+type X__v8sf = [8]float32  /* avxintrin.h:42:15 */
+type X__v4di = [4]int64    /* avxintrin.h:43:19 */
+type X__v4du = [4]uint64   /* avxintrin.h:44:28 */
+type X__v8si = [8]int32    /* avxintrin.h:45:13 */
+type X__v8su = [8]uint32   /* avxintrin.h:46:22 */
+type X__v16hi = [16]int16  /* avxintrin.h:47:15 */
+type X__v16hu = [16]uint16 /* avxintrin.h:48:24 */
+type X__v32qi = [32]int8   /* avxintrin.h:49:14 */
+type X__v32qs = [32]int8   /* avxintrin.h:50:21 */
+type X__v32qu = [32]uint8  /* avxintrin.h:51:23 */
 
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 9.0.
+// The Intel API is flexible enough that we must allow aliasing with other
+//    vector types, and their scalar components.
+type X__m256 = [8]float32  /* avxintrin.h:55:15 */
+type X__m256i = [4]int64   /* avxintrin.h:57:19 */
+type X__m256d = [4]float64 /* avxintrin.h:59:16 */
+
+// Unaligned version of the same types.
+type X__m256_u = [8]float32  /* avxintrin.h:63:15 */
+type X__m256i_u = [4]int64   /* avxintrin.h:66:19 */
+type X__m256d_u = [4]float64 /* avxintrin.h:69:16 */
 
-// Copyright (C) 2003-2018 Free Software Foundation, Inc.
+// Copyright (C) 2013-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25863,36 +26312,40 @@ type X__m128d_u = [2]float64 /* emmintrin.h:58:16 */
 //    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 //    .
 
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 9.0.
+// Internal data types for implementing the intrinsics.
+type X__v8df = [8]float64   /* avx512fintrin.h:38:16 */
+type X__v16sf = [16]float32 /* avx512fintrin.h:39:15 */
+type X__v8di = [8]int64     /* avx512fintrin.h:40:19 */
+type X__v8du = [8]uint64    /* avx512fintrin.h:41:28 */
+type X__v16si = [16]int32   /* avx512fintrin.h:42:13 */
+type X__v16su = [16]uint32  /* avx512fintrin.h:43:22 */
+type X__v32hi = [32]int16   /* avx512fintrin.h:44:15 */
+type X__v32hu = [32]uint16  /* avx512fintrin.h:45:24 */
+type X__v64qi = [64]int8    /* avx512fintrin.h:46:14 */
+type X__v64qu = [64]uint8   /* avx512fintrin.h:47:23 */
 
-// Copyright (C) 2003-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
+// The Intel API is flexible enough that we must allow aliasing with other
+//    vector types, and their scalar components.
+type X__m512 = [16]float32 /* avx512fintrin.h:51:15 */
+type X__m512i = [8]int64   /* avx512fintrin.h:52:19 */
+type X__m512d = [8]float64 /* avx512fintrin.h:53:16 */
 
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 9.0.
+// Unaligned version of the same type.
+type X__m512_u = [16]float32 /* avx512fintrin.h:56:15 */
+type X__m512i_u = [8]int64   /* avx512fintrin.h:57:19 */
+type X__m512d_u = [8]float64 /* avx512fintrin.h:58:16 */
+
+type X__mmask8 = uint8   /* avx512fintrin.h:60:24 */
+type X__mmask16 = uint16 /* avx512fintrin.h:61:24 */
+
+type X_MM_PERM_ENUM = uint32 /* avx512fintrin.h:4359:3 */
 
-// Copyright (C) 2006-2018 Free Software Foundation, Inc.
+// Constants for mantissa extraction
+type X_MM_MANTISSA_NORM_ENUM = uint32 /* avx512fintrin.h:8692:3 */
+
+type X_MM_MANTISSA_SIGN_ENUM = uint32 /* avx512fintrin.h:8699:3 */
+
+// Copyright (C) 2014-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25915,10 +26368,12 @@ type X__m128d_u = [2]float64 /* emmintrin.h:58:16 */
 //    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 //    .
 
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 9.1.
+// Internal data types for implementing the intrinsics.
+type X__mmask32 = uint32 /* avx512vlintrin.h:38:22 */
+
+type X__mmask64 = uint64 /* avx512bwintrin.h:41:28 */
 
-// Copyright (C) 2007-2018 Free Software Foundation, Inc.
+// Copyright (C) 2019-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -25941,85 +26396,16 @@ type X__m128d_u = [2]float64 /* emmintrin.h:58:16 */
 //    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 //    .
 
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 10.0.
-
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
-
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 10.1.
-
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
-
-// Implemented from the specification included in the Intel C++ Compiler
-//    User Guide and Reference, version 11.0.
-
 // Internal data types for implementing the intrinsics.
-type X__v4df = [4]float64  /* avxintrin.h:41:16 */
-type X__v8sf = [8]float32  /* avxintrin.h:42:15 */
-type X__v4di = [4]int64    /* avxintrin.h:43:19 */
-type X__v4du = [4]uint64   /* avxintrin.h:44:28 */
-type X__v8si = [8]int32    /* avxintrin.h:45:13 */
-type X__v8su = [8]uint32   /* avxintrin.h:46:22 */
-type X__v16hi = [16]int16  /* avxintrin.h:47:15 */
-type X__v16hu = [16]uint16 /* avxintrin.h:48:24 */
-type X__v32qi = [32]int8   /* avxintrin.h:49:14 */
-type X__v32qu = [32]uint8  /* avxintrin.h:50:23 */
+type X__v16bh = [16]int16 /* avx512bf16vlintrin.h:38:15 */
+type X__v8bh = [8]int16   /* avx512bf16vlintrin.h:39:15 */
 
 // The Intel API is flexible enough that we must allow aliasing with other
 //    vector types, and their scalar components.
-type X__m256 = [8]float32  /* avxintrin.h:54:15 */
-type X__m256i = [4]int64   /* avxintrin.h:56:19 */
-type X__m256d = [4]float64 /* avxintrin.h:58:16 */
-
-// Unaligned version of the same types.
-type X__m256_u = [8]float32  /* avxintrin.h:62:15 */
-type X__m256i_u = [4]int64   /* avxintrin.h:65:19 */
-type X__m256d_u = [4]float64 /* avxintrin.h:68:16 */
+type X__m256bh = [16]int16 /* avx512bf16vlintrin.h:43:15 */
+type X__m128bh = [8]int16  /* avx512bf16vlintrin.h:44:15 */
 
-// Copyright (C) 2013-2018 Free Software Foundation, Inc.
+// Copyright (C) 2019-2020 Free Software Foundation, Inc.
 //
 //    This file is part of GCC.
 //
@@ -26043,65 +26429,11 @@ type X__m256d_u = [4]float64 /* avxintrin.h:68:16 */
 //    .
 
 // Internal data types for implementing the intrinsics.
-type X__v8df = [8]float64   /* avx512fintrin.h:38:16 */
-type X__v16sf = [16]float32 /* avx512fintrin.h:39:15 */
-type X__v8di = [8]int64     /* avx512fintrin.h:40:19 */
-type X__v8du = [8]uint64    /* avx512fintrin.h:41:28 */
-type X__v16si = [16]int32   /* avx512fintrin.h:42:13 */
-type X__v16su = [16]uint32  /* avx512fintrin.h:43:22 */
-type X__v32hi = [32]int16   /* avx512fintrin.h:44:15 */
-type X__v32hu = [32]uint16  /* avx512fintrin.h:45:24 */
-type X__v64qi = [64]int8    /* avx512fintrin.h:46:14 */
-type X__v64qu = [64]uint8   /* avx512fintrin.h:47:23 */
+type X__v32bh = [32]int16 /* avx512bf16intrin.h:38:15 */
 
 // The Intel API is flexible enough that we must allow aliasing with other
 //    vector types, and their scalar components.
-type X__m512 = [16]float32 /* avx512fintrin.h:51:15 */
-type X__m512i = [8]int64   /* avx512fintrin.h:52:19 */
-type X__m512d = [8]float64 /* avx512fintrin.h:53:16 */
-
-// Unaligned version of the same type.
-type X__m512_u = [16]float32 /* avx512fintrin.h:56:15 */
-type X__m512i_u = [8]int64   /* avx512fintrin.h:57:19 */
-type X__m512d_u = [8]float64 /* avx512fintrin.h:58:16 */
-
-type X__mmask8 = uint8   /* avx512fintrin.h:60:24 */
-type X__mmask16 = uint16 /* avx512fintrin.h:61:24 */
-
-type X_MM_PERM_ENUM = uint32 /* avx512fintrin.h:4288:3 */
-
-// Constants for mantissa extraction
-type X_MM_MANTISSA_NORM_ENUM = uint32 /* avx512fintrin.h:8516:3 */
-
-type X_MM_MANTISSA_SIGN_ENUM = uint32 /* avx512fintrin.h:8523:3 */
-
-// Copyright (C) 2014-2018 Free Software Foundation, Inc.
-//
-//    This file is part of GCC.
-//
-//    GCC is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 3, or (at your option)
-//    any later version.
-//
-//    GCC 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 General Public License for more details.
-//
-//    Under Section 7 of GPL version 3, you are granted additional
-//    permissions described in the GCC Runtime Library Exception, version
-//    3.1, as published by the Free Software Foundation.
-//
-//    You should have received a copy of the GNU General Public License and
-//    a copy of the GCC Runtime Library Exception along with this program;
-//    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-//    .
-
-// Internal data types for implementing the intrinsics.
-type X__mmask32 = uint32 /* avx512vlintrin.h:38:22 */
-
-type X__mmask64 = uint64 /* avx512bwintrin.h:41:28 */
+type X__m512bh = [32]int16 /* avx512bf16intrin.h:42:15 */
 
 // The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 // 0 means mutexes are permanently disable and the library is never
@@ -26453,9 +26785,9 @@ type HashElem = HashElem1 /* sqlite3.c:14071:25 */
 // in the table, it is faster to do a linear search than to manage
 // the hash table.
 type _ht = struct {
-	Fcount uint32
-	_      [4]byte
-	Fchain uintptr
+	Fcount       uint32
+	F__ccgo_pad1 [4]byte
+	Fchain       uintptr
 } /* sqlite3.c:1331:9 */
 
 // Macros for looping over all elements of a hash table.  The idiom is
@@ -26488,7 +26820,7 @@ type _ht = struct {
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
-// This file is part of the mingw-w64 runtime package.
+// This file is part of the Wine project.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
 // *
@@ -26496,21 +26828,19 @@ type _ht = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-// Undefine __mingw_ macros.
-
 type _iobuf = struct {
-	F_ptr      uintptr
-	F_cnt      int32
-	_          [4]byte
-	F_base     uintptr
-	F_flag     int32
-	F_file     int32
-	F_charbuf  int32
-	F_bufsiz   int32
-	F_tmpfname uintptr
-} /* stdio.h:26:3 */
-
-type FILE = _iobuf /* stdio.h:36:25 */
+	F_ptr        uintptr
+	F_cnt        int32
+	F__ccgo_pad1 [4]byte
+	F_base       uintptr
+	F_flag       int32
+	F_file       int32
+	F_charbuf    int32
+	F_bufsiz     int32
+	F_tmpfname   uintptr
+} /* stdio.h:24:3 */
+
+type FILE = _iobuf /* stdio.h:34:25 */
 
 type X_off_t = int32 /* _mingw_off_t.h:5:16 */
 type Off32_t = int32 /* _mingw_off_t.h:7:16 */
@@ -26520,11 +26850,10 @@ type Off64_t = int64   /* _mingw_off_t.h:15:39 */
 
 type Off_t = Off64_t /* _mingw_off_t.h:24:17 */
 
-type Fpos_t = int64 /* stdio.h:104:37 */
-
-func vsnwprintf(tls *libc.TLS, s uintptr, n Size_t, format uintptr, arg Va_list) int32 { /* stdio.h:1213:15: */
-	return libc.X_vsnwprintf(tls, s, n, format, arg)
+type Fpos_t = int64 /* stdio.h:102:37 */
 
+func vsnwprintf(tls *libc.TLS, __stream uintptr, __n Size_t, __format uintptr, __local_argv X__builtin_va_list) int32 { /* stdio.h:1145:5: */
+	return libc.X__mingw_vsnwprintf(tls, __stream, __n, __format, __local_argv)
 }
 
 // *
@@ -26555,7 +26884,7 @@ func vswprintf(tls *libc.TLS, __stream uintptr, __count Size_t, __format uintptr
 
 // ISO C Standard:  7.17  Common definitions  
 
-// Copyright (C) 1989-2018 Free Software Foundation, Inc.
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -26695,7 +27024,7 @@ type BusyHandler1 = struct {
 	FxBusyHandler uintptr
 	FpBusyArg     uintptr
 	FnBusy        int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 } /* sqlite3.c:1331:9 */
 
 // An instance of the following structure is used to store the busy-handler
@@ -26757,7 +27086,7 @@ type BusyHandler = BusyHandler1 /* sqlite3.c:14788:28 */
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	_               [2]byte
+	F__ccgo_pad1    [2]byte
 	FsortingIdx     int32
 	FsortingIdxPTab int32
 	FnSortingColumn int32
@@ -26835,59 +27164,59 @@ type AutoincInfo1 = struct {
 
 type AutoincInfo = AutoincInfo1 /* sqlite3.c:14886:28 */
 type Bitvec1 = struct {
-	FiSize    U32
-	FnSet     U32
-	FiDivisor U32
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FaBitmap [496]U8
+	FiSize       U32
+	FnSet        U32
+	FiDivisor    U32
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FaBitmap     [496]U8
 	}
 } /* sqlite3.c:1331:9 */
 
 type Bitvec = Bitvec1 /* sqlite3.c:14887:23 */
 type CollSeq1 = struct {
-	FzName uintptr
-	Fenc   U8
-	_      [7]byte
-	FpUser uintptr
-	FxCmp  uintptr
-	FxDel  uintptr
+	FzName       uintptr
+	Fenc         U8
+	F__ccgo_pad1 [7]byte
+	FpUser       uintptr
+	FxCmp        uintptr
+	FxDel        uintptr
 } /* sqlite3.c:1331:9 */
 
 type CollSeq = CollSeq1 /* sqlite3.c:14888:24 */
 type Column1 = struct {
-	FzName    uintptr
-	FpDflt    uintptr
-	FzColl    uintptr
-	FnotNull  U8
-	Faffinity int8
-	FszEst    U8
-	FhName    U8
-	FcolFlags U16
-	_         [2]byte
+	FzName       uintptr
+	FpDflt       uintptr
+	FzColl       uintptr
+	FnotNull     U8
+	Faffinity    int8
+	FszEst       U8
+	FhName       U8
+	FcolFlags    U16
+	F__ccgo_pad1 [2]byte
 } /* sqlite3.c:1331:9 */
 
 type Column = Column1 /* sqlite3.c:14889:23 */
 type Cte1 = struct {
-	FzName   uintptr
-	FpCols   uintptr
-	FpSelect uintptr
-	FzCteErr uintptr
-	FpUse    uintptr
-	FeM10d   U8
-	_        [7]byte
+	FzName       uintptr
+	FpCols       uintptr
+	FpSelect     uintptr
+	FzCteErr     uintptr
+	FpUse        uintptr
+	FeM10d       U8
+	F__ccgo_pad1 [7]byte
 } /* sqlite3.c:1331:9 */
 
 type Cte = Cte1 /* sqlite3.c:14890:20 */
 type CteUse1 = struct {
-	FnUse    int32
-	FaddrM9e int32
-	FregRtn  int32
-	FiCur    int32
-	FnRowEst LogEst
-	FeM10d   U8
-	_        [1]byte
+	FnUse        int32
+	FaddrM9e     int32
+	FregRtn      int32
+	FiCur        int32
+	FnRowEst     LogEst
+	FeM10d       U8
+	F__ccgo_pad1 [1]byte
 } /* sqlite3.c:1331:9 */
 
 type CteUse = CteUse1 /* sqlite3.c:14891:23 */
@@ -26896,20 +27225,20 @@ type Db1 = struct {
 	FpBt          uintptr
 	Fsafety_level U8
 	FbSyncSet     U8
-	_             [6]byte
+	F__ccgo_pad1  [6]byte
 	FpSchema      uintptr
 } /* sqlite3.c:1331:9 */
 
 type Db = Db1 /* sqlite3.c:14892:19 */
 type DbFixer1 = struct {
-	FpParse  uintptr
-	Fw       Walker
-	FpSchema uintptr
-	FbTemp   U8
-	_        [7]byte
-	FzDb     uintptr
-	FzType   uintptr
-	FpName   uintptr
+	FpParse      uintptr
+	Fw           Walker
+	FpSchema     uintptr
+	FbTemp       U8
+	F__ccgo_pad1 [7]byte
+	FzDb         uintptr
+	FzType       uintptr
+	FpName       uintptr
 } /* sqlite3.c:14893:9 */
 
 type DbFixer = DbFixer1 /* sqlite3.c:14893:24 */
@@ -26932,7 +27261,7 @@ type Expr1 = struct {
 	Fop              U8
 	FaffExpr         int8
 	Fop2             U8
-	_                [1]byte
+	F__ccgo_pad1     [1]byte
 	Fflags           U32
 	Fu               struct{ FzToken uintptr }
 	FpLeft           uintptr
@@ -26952,63 +27281,63 @@ type ExprList1 = struct {
 	FnExpr  int32
 	FnAlloc int32
 	Fa      [1]struct {
-		FpExpr     uintptr
-		FzEName    uintptr
-		FsortFlags U8
-		_          [3]byte
-		FeEName    uint8 /* unsigned eEName: 2, unsigned done: 1, unsigned reusable: 1, unsigned bSorterRef: 1, unsigned bNulls: 1 */
-		_          [3]byte
-		Fu         struct {
-			_  [0]uint32
-			Fx struct {
+		FpExpr       uintptr
+		FzEName      uintptr
+		FsortFlags   U8
+		F__ccgo_pad1 [3]byte
+		FeEName      uint8 /* unsigned eEName: 2, unsigned done: 1, unsigned reusable: 1, unsigned bSorterRef: 1, unsigned bNulls: 1 */
+		F__ccgo_pad2 [3]byte
+		Fu           struct {
+			F__ccgo_pad1 [0]uint32
+			Fx           struct {
 				FiOrderByCol U16
 				FiAlias      U16
 			}
 		}
-		_ [4]byte
+		F__ccgo_pad3 [4]byte
 	}
 } /* sqlite3.c:1331:9 */
 
 type ExprList = ExprList1 /* sqlite3.c:14896:25 */
 type FKey1 = struct {
-	FpFrom      uintptr
-	FpNextFrom  uintptr
-	FzTo        uintptr
-	FpNextTo    uintptr
-	FpPrevTo    uintptr
-	FnCol       int32
-	FisDeferred U8
-	FaAction    [2]U8
-	_           [1]byte
-	FapTrigger  [2]uintptr
-	FaCol       [1]struct {
-		FiFrom int32
-		_      [4]byte
-		FzCol  uintptr
+	FpFrom       uintptr
+	FpNextFrom   uintptr
+	FzTo         uintptr
+	FpNextTo     uintptr
+	FpPrevTo     uintptr
+	FnCol        int32
+	FisDeferred  U8
+	FaAction     [2]U8
+	F__ccgo_pad1 [1]byte
+	FapTrigger   [2]uintptr
+	FaCol        [1]struct {
+		FiFrom       int32
+		F__ccgo_pad1 [4]byte
+		FzCol        uintptr
 	}
 } /* sqlite3.c:1331:9 */
 
 type FKey = FKey1 /* sqlite3.c:14897:21 */
 type FuncDestructor1 = struct {
-	FnRef      int32
-	_          [4]byte
-	FxDestroy  uintptr
-	FpUserData uintptr
+	FnRef        int32
+	F__ccgo_pad1 [4]byte
+	FxDestroy    uintptr
+	FpUserData   uintptr
 } /* sqlite3.c:14898:9 */
 
 type FuncDestructor = FuncDestructor1 /* sqlite3.c:14898:31 */
 type FuncDef1 = struct {
-	FnArg      I8
-	_          [3]byte
-	FfuncFlags U32
-	FpUserData uintptr
-	FpNext     uintptr
-	FxSFunc    uintptr
-	FxFinalize uintptr
-	FxValue    uintptr
-	FxInverse  uintptr
-	FzName     uintptr
-	Fu         struct{ FpHash uintptr }
+	FnArg        I8
+	F__ccgo_pad1 [3]byte
+	FfuncFlags   U32
+	FpUserData   uintptr
+	FpNext       uintptr
+	FxSFunc      uintptr
+	FxFinalize   uintptr
+	FxValue      uintptr
+	FxInverse    uintptr
+	FzName       uintptr
+	Fu           struct{ FpHash uintptr }
 } /* sqlite3.c:1331:9 */
 
 type FuncDef = FuncDef1                      /* sqlite3.c:14899:24 */
@@ -27016,9 +27345,9 @@ type FuncDefHash1 = struct{ Fa [23]uintptr } /* sqlite3.c:14900:9 */
 
 type FuncDefHash = FuncDefHash1 /* sqlite3.c:14900:28 */
 type IdList1 = struct {
-	Fa   uintptr
-	FnId int32
-	_    [4]byte
+	Fa           uintptr
+	FnId         int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 type IdList = IdList1 /* sqlite3.c:14901:23 */
@@ -27039,59 +27368,59 @@ type Index1 = struct {
 	FnKeyCol       U16
 	FnColumn       U16
 	FonError       U8
-	_              [1]byte
+	F__ccgo_pad1   [1]byte
 	FidxType       uint16 /* unsigned idxType: 2, unsigned bUnordered: 1, unsigned uniqNotNull: 1, unsigned isResized: 1, unsigned isCovering: 1, unsigned noSkipScan: 1, unsigned hasStat1: 1, unsigned bNoQuery: 1, unsigned bAscKeyBug: 1, unsigned bHasVCol: 1 */
-	_              [2]byte
+	F__ccgo_pad2   [2]byte
 	FnSample       int32
 	FnSampleCol    int32
 	FaAvgEq        uintptr
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	_              [4]byte
+	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 } /* sqlite3.c:1331:9 */
 
 type Index = Index1 /* sqlite3.c:14902:22 */
 type IndexSample1 = struct {
-	Fp     uintptr
-	Fn     int32
-	_      [4]byte
-	FanEq  uintptr
-	FanLt  uintptr
-	FanDLt uintptr
+	Fp           uintptr
+	Fn           int32
+	F__ccgo_pad1 [4]byte
+	FanEq        uintptr
+	FanLt        uintptr
+	FanDLt       uintptr
 } /* sqlite3.c:1331:9 */
 
 type IndexSample = IndexSample1 /* sqlite3.c:14903:28 */
 type KeyInfo1 = struct {
-	FnRef       U32
-	Fenc        U8
-	_           [1]byte
-	FnKeyField  U16
-	FnAllField  U16
-	_           [6]byte
-	Fdb         uintptr
-	FaSortFlags uintptr
-	FaColl      [1]uintptr
+	FnRef        U32
+	Fenc         U8
+	F__ccgo_pad1 [1]byte
+	FnKeyField   U16
+	FnAllField   U16
+	F__ccgo_pad2 [6]byte
+	Fdb          uintptr
+	FaSortFlags  uintptr
+	FaColl       [1]uintptr
 } /* sqlite3.c:1331:9 */
 
 type KeyInfo = KeyInfo1 /* sqlite3.c:14905:24 */
 type Lookaside1 = struct {
-	FbDisable   U32
-	Fsz         U16
-	FszTrue     U16
-	FbMalloced  U8
-	_           [3]byte
-	FnSlot      U32
-	FanStat     [3]U32
-	_           [4]byte
-	FpInit      uintptr
-	FpFree      uintptr
-	FpSmallInit uintptr
-	FpSmallFree uintptr
-	FpMiddle    uintptr
-	FpStart     uintptr
-	FpEnd       uintptr
+	FbDisable    U32
+	Fsz          U16
+	FszTrue      U16
+	FbMalloced   U8
+	F__ccgo_pad1 [3]byte
+	FnSlot       U32
+	FanStat      [3]U32
+	F__ccgo_pad2 [4]byte
+	FpInit       uintptr
+	FpFree       uintptr
+	FpSmallInit  uintptr
+	FpSmallFree  uintptr
+	FpMiddle     uintptr
+	FpStart      uintptr
+	FpEnd        uintptr
 } /* sqlite3.c:1331:9 */
 
 type Lookaside = Lookaside1                    /* sqlite3.c:14906:26 */
@@ -27099,26 +27428,26 @@ type LookasideSlot1 = struct{ FpNext uintptr } /* sqlite3.c:1331:9 */
 
 type LookasideSlot = LookasideSlot1 /* sqlite3.c:14907:30 */
 type Module1 = struct {
-	FpModule    uintptr
-	FzName      uintptr
-	FnRefModule int32
-	_           [4]byte
-	FpAux       uintptr
-	FxDestroy   uintptr
-	FpEpoTab    uintptr
+	FpModule     uintptr
+	FzName       uintptr
+	FnRefModule  int32
+	F__ccgo_pad1 [4]byte
+	FpAux        uintptr
+	FxDestroy    uintptr
+	FpEpoTab     uintptr
 } /* sqlite3.c:1331:9 */
 
 type Module = Module1 /* sqlite3.c:14908:23 */
 type NameContext1 = struct {
-	FpParse     uintptr
-	FpSrcList   uintptr
-	FuNC        struct{ FpEList uintptr }
-	FpNext      uintptr
-	FnRef       int32
-	FnNcErr     int32
-	FncFlags    int32
-	_           [4]byte
-	FpWinSelect uintptr
+	FpParse      uintptr
+	FpSrcList    uintptr
+	FuNC         struct{ FpEList uintptr }
+	FpNext       uintptr
+	FnRef        int32
+	FnNcErr      int32
+	FncFlags     int32
+	F__ccgo_pad1 [4]byte
+	FpWinSelect  uintptr
 } /* sqlite3.c:14909:9 */
 
 type NameContext = NameContext1 /* sqlite3.c:14909:28 */
@@ -27137,7 +27466,7 @@ type Parse1 = struct {
 	FokConstFactor    U8
 	FdisableLookaside U8
 	FdisableVtab      U8
-	_                 [2]byte
+	F__ccgo_pad1      [2]byte
 	FnRangeReg        int32
 	FiRangeReg        int32
 	FnErr             int32
@@ -27147,7 +27476,7 @@ type Parse1 = struct {
 	FiSelfTab         int32
 	FnLabel           int32
 	FnLabelAlloc      int32
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
 	FconstraintName   Token
@@ -27158,16 +27487,16 @@ type Parse1 = struct {
 	FnMaxArg          int32
 	FnSelect          int32
 	FnTableLock       int32
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FaTableLock       uintptr
 	FpAinc            uintptr
 	FpToplevel        uintptr
 	FpTriggerTab      uintptr
 	FpParentParse     uintptr
 	Fu1               struct {
-		_          [0]uint64
-		FaddrCrTab int32
-		_          [4]byte
+		F__ccgo_pad1 [0]uint64
+		FaddrCrTab   int32
+		F__ccgo_pad2 [4]byte
 	}
 	FnQueryLoop      U32
 	Foldmask         U32
@@ -27183,11 +27512,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	_                [3]byte
+	F__ccgo_pad4     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	_                [4]byte
+	F__ccgo_pad5     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -27215,7 +27544,7 @@ type PreUpdate1 = struct {
 	Fv            uintptr
 	FpCsr         uintptr
 	Fop           int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FaRecord      uintptr
 	Fkeyinfo      KeyInfo
 	FpUnpacked    uintptr
@@ -27245,14 +27574,14 @@ type RenameToken1 = struct {
 
 type RenameToken = RenameToken1 /* sqlite3.c:14914:28 */
 type Returning1 = struct {
-	FpParse    uintptr
-	FpReturnEL uintptr
-	FretTrig   Trigger
-	FretTStep  TriggerStep
-	FiRetCur   int32
-	FnRetCol   int32
-	FiRetReg   int32
-	_          [4]byte
+	FpParse      uintptr
+	FpReturnEL   uintptr
+	FretTrig     Trigger
+	FretTStep    TriggerStep
+	FiRetCur     int32
+	FnRetCol     int32
+	FiRetReg     int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:14915:9 */
 
 type Returning = Returning1 /* sqlite3.c:14915:26 */
@@ -27279,14 +27608,14 @@ type Savepoint1 = struct {
 type Savepoint = Savepoint1 /* sqlite3.c:14917:26 */
 type Select1 = struct {
 	Fop           U8
-	_             [1]byte
+	F__ccgo_pad1  [1]byte
 	FnSelectRow   LogEst
 	FselFlags     U32
 	FiLimit       int32
 	FiOffset      int32
 	FselId        U32
 	FaddrOpenEphm [2]int32
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	FpEList       uintptr
 	FpSrc         uintptr
 	FpWhere       uintptr
@@ -27303,25 +27632,25 @@ type Select1 = struct {
 
 type Select = Select1 /* sqlite3.c:14918:23 */
 type SQLiteThread1 = struct {
-	Ftid     uintptr
-	Fid      uint32
-	_        [4]byte
-	FxTask   uintptr
-	FpIn     uintptr
-	FpResult uintptr
+	Ftid         uintptr
+	Fid          uint32
+	F__ccgo_pad1 [4]byte
+	FxTask       uintptr
+	FpIn         uintptr
+	FpResult     uintptr
 } /* sqlite3.c:14919:9 */
 
 type SQLiteThread = SQLiteThread1 /* sqlite3.c:14919:29 */
 type SelectDest1 = struct {
-	FeDest    U8
-	_         [3]byte
-	FiSDParm  int32
-	FiSDParm2 int32
-	FiSdst    int32
-	FnSdst    int32
-	_         [4]byte
-	FzAffSdst uintptr
-	FpOrderBy uintptr
+	FeDest       U8
+	F__ccgo_pad1 [3]byte
+	FiSDParm     int32
+	FiSDParm2    int32
+	FiSdst       int32
+	FnSdst       int32
+	F__ccgo_pad2 [4]byte
+	FzAffSdst    uintptr
+	FpOrderBy    uintptr
 } /* sqlite3.c:14920:9 */
 
 type SelectDest = SelectDest1 /* sqlite3.c:14920:27 */
@@ -27336,11 +27665,11 @@ type SrcItem1 = struct {
 	FregReturn   int32
 	FregResult   int32
 	Ffg          struct {
-		_           [0]uint32
-		Fjointype   U8
-		_           [3]byte
-		FnotIndexed uint16 /* unsigned notIndexed: 1, unsigned isIndexedBy: 1, unsigned isTabFunc: 1, unsigned isCorrelated: 1, unsigned viaCoroutine: 1, unsigned isRecursive: 1, unsigned fromDDL: 1, unsigned isCte: 1, unsigned notCte: 1 */
-		_           [2]byte
+		F__ccgo_pad1 [0]uint32
+		Fjointype    U8
+		F__ccgo_pad2 [3]byte
+		FnotIndexed  uint16 /* unsigned notIndexed: 1, unsigned isIndexedBy: 1, unsigned isTabFunc: 1, unsigned isCorrelated: 1, unsigned viaCoroutine: 1, unsigned isRecursive: 1, unsigned fromDDL: 1, unsigned isCte: 1, unsigned notCte: 1 */
+		F__ccgo_pad3 [2]byte
 	}
 	FiCursor int32
 	FpOn     uintptr
@@ -27376,7 +27705,7 @@ type Table1 = struct {
 	FnRowLogEst   LogEst
 	FszTabRow     LogEst
 	FkeyConf      U8
-	_             [1]byte
+	F__ccgo_pad1  [1]byte
 	FaddColOffset int32
 	FnModuleArg   int32
 	FazModuleArg  uintptr
@@ -27391,72 +27720,72 @@ type TableLock1 = struct {
 	FiDb         int32
 	FiTab        Pgno
 	FisWriteLock U8
-	_            [7]byte
+	F__ccgo_pad1 [7]byte
 	FzLockName   uintptr
 } /* sqlite3.c:1331:9 */
 
 type TableLock = TableLock1 /* sqlite3.c:14925:26 */
 type Token1 = struct {
-	Fz uintptr
-	Fn uint32
-	_  [4]byte
+	Fz           uintptr
+	Fn           uint32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 type Token = Token1 /* sqlite3.c:14926:22 */
 type Trigger1 = struct {
-	FzName      uintptr
-	Ftable      uintptr
-	Fop         U8
-	Ftr_tm      U8
-	FbReturning U8
-	_           [5]byte
-	FpWhen      uintptr
-	FpColumns   uintptr
-	FpSchema    uintptr
-	FpTabSchema uintptr
-	Fstep_list  uintptr
-	FpNext      uintptr
+	FzName       uintptr
+	Ftable       uintptr
+	Fop          U8
+	Ftr_tm       U8
+	FbReturning  U8
+	F__ccgo_pad1 [5]byte
+	FpWhen       uintptr
+	FpColumns    uintptr
+	FpSchema     uintptr
+	FpTabSchema  uintptr
+	Fstep_list   uintptr
+	FpNext       uintptr
 } /* sqlite3.c:1331:9 */
 
 type Trigger = Trigger1 /* sqlite3.c:14928:24 */
 type TriggerPrg1 = struct {
-	FpTrigger uintptr
-	FpNext    uintptr
-	FpProgram uintptr
-	Forconf   int32
-	FaColmask [2]U32
-	_         [4]byte
+	FpTrigger    uintptr
+	FpNext       uintptr
+	FpProgram    uintptr
+	Forconf      int32
+	FaColmask    [2]U32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 type TriggerPrg = TriggerPrg1 /* sqlite3.c:14929:27 */
 type TriggerStep1 = struct {
-	Fop        U8
-	Forconf    U8
-	_          [6]byte
-	FpTrig     uintptr
-	FpSelect   uintptr
-	FzTarget   uintptr
-	FpFrom     uintptr
-	FpWhere    uintptr
-	FpExprList uintptr
-	FpIdList   uintptr
-	FpUpsert   uintptr
-	FzSpan     uintptr
-	FpNext     uintptr
-	FpLast     uintptr
+	Fop          U8
+	Forconf      U8
+	F__ccgo_pad1 [6]byte
+	FpTrig       uintptr
+	FpSelect     uintptr
+	FzTarget     uintptr
+	FpFrom       uintptr
+	FpWhere      uintptr
+	FpExprList   uintptr
+	FpIdList     uintptr
+	FpUpsert     uintptr
+	FzSpan       uintptr
+	FpNext       uintptr
+	FpLast       uintptr
 } /* sqlite3.c:1331:9 */
 
 type TriggerStep = TriggerStep1 /* sqlite3.c:14930:28 */
 type UnpackedRecord1 = struct {
-	FpKeyInfo   uintptr
-	FaMem       uintptr
-	FnField     U16
-	Fdefault_rc I8
-	FerrCode    U8
-	Fr1         I8
-	Fr2         I8
-	FeqSeen     U8
-	_           [1]byte
+	FpKeyInfo    uintptr
+	FaMem        uintptr
+	FnField      U16
+	Fdefault_rc  I8
+	FerrCode     U8
+	Fr1          I8
+	Fr2          I8
+	FeqSeen      U8
+	F__ccgo_pad1 [1]byte
 } /* sqlite3.c:1331:9 */
 
 type UnpackedRecord = UnpackedRecord1 /* sqlite3.c:14931:31 */
@@ -27467,14 +27796,14 @@ type Upsert1 = struct {
 	FpUpsertWhere       uintptr
 	FpNextUpsert        uintptr
 	FisDoUpdate         U8
-	_                   [7]byte
+	F__ccgo_pad1        [7]byte
 	FpToFree            uintptr
 	FpUpsertIdx         uintptr
 	FpUpsertSrc         uintptr
 	FregData            int32
 	FiDataCur           int32
 	FiIdxCur            int32
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 } /* sqlite3.c:1331:9 */
 
 type Upsert = Upsert1 /* sqlite3.c:14932:23 */
@@ -27485,19 +27814,19 @@ type VTable1 = struct {
 	FnRef        int32
 	FbConstraint U8
 	FeVtabRisk   U8
-	_            [2]byte
+	F__ccgo_pad1 [2]byte
 	FiSavepoint  int32
-	_            [4]byte
+	F__ccgo_pad2 [4]byte
 	FpNext       uintptr
 } /* sqlite3.c:1331:9 */
 
 type VTable = VTable1 /* sqlite3.c:14933:23 */
 type VtabCtx1 = struct {
-	FpVTable   uintptr
-	FpTab      uintptr
-	FpPrior    uintptr
-	FbDeclared int32
-	_          [4]byte
+	FpVTable     uintptr
+	FpTab        uintptr
+	FpPrior      uintptr
+	FbDeclared   int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 type VtabCtx = VtabCtx1 /* sqlite3.c:14934:24 */
@@ -27508,7 +27837,7 @@ type Walker1 = struct {
 	FxSelectCallback2 uintptr
 	FwalkerDepth      int32
 	FeCode            U16
-	_                 [2]byte
+	F__ccgo_pad1      [2]byte
 	Fu                struct{ FpNC uintptr }
 } /* sqlite3.c:14893:9 */
 
@@ -27530,7 +27859,7 @@ type WhereInfo1 = struct {
 	FeOnePass        U8
 	FeDistinct       U8
 	FbDeferredSeek   uint8 /* unsigned bDeferredSeek: 1, unsigned untestedTerms: 1, unsigned bOrderedInnerLoop: 1, unsigned sorted: 1 */
-	_                [1]byte
+	F__ccgo_pad1     [1]byte
 	FnRowOut         LogEst
 	FiTop            int32
 	FiEndWhere       int32
@@ -27553,7 +27882,7 @@ type Window1 = struct {
 	FeEnd           U8
 	FbImplicitFrame U8
 	FeExclude       U8
-	_               [3]byte
+	F__ccgo_pad1    [3]byte
 	FpStart         uintptr
 	FpEnd           uintptr
 	FppThis         uintptr
@@ -27573,7 +27902,7 @@ type Window1 = struct {
 	FregStartRowid  int32
 	FregEndRowid    int32
 	FbExprArgs      U8
-	_               [3]byte
+	F__ccgo_pad2    [3]byte
 } /* sqlite3.c:1331:9 */
 
 type Window = Window1 /* sqlite3.c:14937:23 */
@@ -27662,7 +27991,7 @@ type Pager1 = struct {
 	FnRec              int32
 	FcksumInit         U32
 	FnSubRec           U32
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpInJournal        uintptr
 	Ffd                uintptr
 	Fjfd               uintptr
@@ -27675,7 +28004,7 @@ type Pager1 = struct {
 	FiDataVersion      U32
 	FdbFileVers        [16]int8
 	FnMmapOut          int32
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FszMmap            Sqlite3_int64
 	FpMmapFreelist     uintptr
 	FnExtra            U16
@@ -27684,7 +28013,7 @@ type Pager1 = struct {
 	FsectorSize        U32
 	FpageSize          int32
 	FmxPgno            Pgno
-	_                  [4]byte
+	F__ccgo_pad3       [4]byte
 	FjournalSizeLimit  I64
 	FzFilename         uintptr
 	FzJournal          uintptr
@@ -27808,7 +28137,7 @@ type BtCursor1 = struct {
 	FcurIntKey     U8
 	Fix            U16
 	FaiIdx         [19]U16
-	_              [2]byte
+	F__ccgo_pad1   [2]byte
 	FpKeyInfo      uintptr
 	FpPage         uintptr
 	FapPage        [19]uintptr
@@ -27827,43 +28156,43 @@ type BtShared1 = struct {
 	FinTransaction   U8
 	Fmax1bytePayload U8
 	FnReserveWanted  U8
-	_                [1]byte
+	F__ccgo_pad1     [1]byte
 	FbtsFlags        U16
 	FmaxLocal        U16
 	FminLocal        U16
 	FmaxLeaf         U16
 	FminLeaf         U16
-	_                [2]byte
+	F__ccgo_pad2     [2]byte
 	FpageSize        U32
 	FusableSize      U32
 	FnTransaction    int32
 	FnPage           U32
-	_                [4]byte
+	F__ccgo_pad3     [4]byte
 	FpSchema         uintptr
 	FxFreeSchema     uintptr
 	Fmutex           uintptr
 	FpHasContent     uintptr
 	FnRef            int32
-	_                [4]byte
+	F__ccgo_pad4     [4]byte
 	FpNext           uintptr
 	FpLock           uintptr
 	FpWriter         uintptr
 	FpTmpSpace       uintptr
 	FnPreformatSize  int32
-	_                [4]byte
+	F__ccgo_pad5     [4]byte
 } /* sqlite3.c:1331:9 */
 
 type BtShared = BtShared1 /* sqlite3.c:15269:25 */
 type BtreePayload1 = struct {
-	FpKey  uintptr
-	FnKey  Sqlite3_int64
-	FpData uintptr
-	FaMem  uintptr
-	FnMem  U16
-	_      [2]byte
-	FnData int32
-	FnZero int32
-	_      [4]byte
+	FpKey        uintptr
+	FnKey        Sqlite3_int64
+	FpData       uintptr
+	FaMem        uintptr
+	FnMem        U16
+	F__ccgo_pad1 [2]byte
+	FnData       int32
+	FnZero       int32
+	F__ccgo_pad2 [4]byte
 } /* sqlite3.c:15270:9 */
 
 type BtreePayload = BtreePayload1 /* sqlite3.c:15270:29 */
@@ -27898,7 +28227,7 @@ type Vdbe1 = struct {
 	FpNext              uintptr
 	FpParse             uintptr
 	FnVar               YnVar
-	_                   [2]byte
+	F__ccgo_pad1        [2]byte
 	FiVdbeMagic         U32
 	FnMem               int32
 	FnCursor            int32
@@ -27907,7 +28236,7 @@ type Vdbe1 = struct {
 	Frc                 int32
 	FnChange            int32
 	FiStatement         int32
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FiCurrentTime       I64
 	FnFkConstraint      I64
 	FnStmtDefCons       I64
@@ -27929,9 +28258,9 @@ type Vdbe1 = struct {
 	FminWriteFileFormat U8
 	FprepFlags          U8
 	FdoingRerun         U8
-	_                   [2]byte
+	F__ccgo_pad3        [2]byte
 	Fexpired            uint16 /* bft expired: 2, bft explain: 2, bft changeCntOn: 1, bft runOnlyOnce: 1, bft usesStmtJournal: 1, bft readOnly: 1, bft bIsReader: 1 */
-	_                   [2]byte
+	F__ccgo_pad4        [2]byte
 	FbtreeMask          YDbMask
 	FlockMask           YDbMask
 	FaCounter           [7]U32
@@ -27975,14 +28304,14 @@ type Vdbe = Vdbe1 /* sqlite3.c:15668:21 */
 // for the VdbeOp definition.
 type Mem = sqlite3_value /* sqlite3.c:15674:30 */
 type SubProgram1 = struct {
-	FaOp   uintptr
-	FnOp   int32
-	FnMem  int32
-	FnCsr  int32
-	_      [4]byte
-	FaOnce uintptr
-	Ftoken uintptr
-	FpNext uintptr
+	FaOp         uintptr
+	FnOp         int32
+	FnMem        int32
+	FnCsr        int32
+	F__ccgo_pad1 [4]byte
+	FaOnce       uintptr
+	Ftoken       uintptr
+	FpNext       uintptr
 } /* sqlite3.c:1331:9 */
 
 type SubProgram = SubProgram1 /* sqlite3.c:15675:27 */
@@ -27998,9 +28327,9 @@ type VdbeOp1 = struct {
 	Fp2     int32
 	Fp3     int32
 	Fp4     struct {
-		_  [0]uint64
-		Fi int32
-		_  [4]byte
+		F__ccgo_pad1 [0]uint64
+		Fi           int32
+		F__ccgo_pad2 [4]byte
 	}
 } /* sqlite3.c:1331:9 */
 
@@ -28008,9 +28337,9 @@ type VdbeOp1 = struct {
 // and as many as three operands.  The instruction is recorded
 // as an instance of the following structure:
 type p4union = struct {
-	_  [0]uint64
-	Fi int32
-	_  [4]byte
+	F__ccgo_pad1 [0]uint64
+	Fi           int32
+	F__ccgo_pad2 [4]byte
 } /* sqlite3.c:1331:9 */
 
 type VdbeOp = VdbeOp1 /* sqlite3.c:15721:23 */
@@ -28093,20 +28422,20 @@ type RecordCompare = uintptr /* sqlite3.c:16156:13 */
 
 type PgHdr = PgHdr2 /* sqlite3.c:16289:22 */
 type PCache2 = struct {
-	FpDirty     uintptr
-	FpDirtyTail uintptr
-	FpSynced    uintptr
-	FnRefSum    int32
-	FszCache    int32
-	FszSpill    int32
-	FszPage     int32
-	FszExtra    int32
-	FbPurgeable U8
-	FeCreate    U8
-	_           [2]byte
-	FxStress    uintptr
-	FpStress    uintptr
-	FpCache     uintptr
+	FpDirty      uintptr
+	FpDirtyTail  uintptr
+	FpSynced     uintptr
+	FnRefSum     int32
+	FszCache     int32
+	FszSpill     int32
+	FszPage      int32
+	FszExtra     int32
+	FbPurgeable  U8
+	FeCreate     U8
+	F__ccgo_pad1 [2]byte
+	FxStress     uintptr
+	FpStress     uintptr
+	FpCache      uintptr
 } /* sqlite3.c:1331:9 */
 
 type PCache = PCache2 /* sqlite3.c:16290:23 */
@@ -28125,9 +28454,9 @@ type sqlite3InitInfo = struct {
 	FnewTnum       Pgno
 	FiDb           U8
 	Fbusy          U8
-	_              [2]byte
+	F__ccgo_pad1   [2]byte
 	ForphanTrigger uint8 /* unsigned orphanTrigger: 1, unsigned imposterTable: 1, unsigned reopenMemdb: 1 */
-	_              [7]byte
+	F__ccgo_pad2   [7]byte
 	FazInit        uintptr
 } /* sqlite3.c:1331:9 */
 
@@ -28183,9 +28512,9 @@ type sqlite3InitInfo = struct {
 // A list of all children for a table named Z (which might not even exist)
 // is held in Schema.fkeyHash with a hash key of Z.
 type sColMap = struct {
-	FiFrom int32
-	_      [4]byte
-	FzCol  uintptr
+	FiFrom       int32
+	F__ccgo_pad1 [4]byte
+	FzCol        uintptr
 } /* sqlite3.c:1331:9 */
 
 // An instance of this structure contains information needed to generate
@@ -28206,7 +28535,7 @@ type AggInfo_col = struct {
 	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* sqlite3.c:1331:9 */
 
 // An instance of this structure contains information needed to generate
@@ -28221,12 +28550,12 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr    uintptr
-	FpFunc     uintptr
-	FiMem      int32
-	FiDistinct int32
-	FiDistAddr int32
-	_          [4]byte
+	FpFExpr      uintptr
+	FpFunc       uintptr
+	FiMem        int32
+	FiDistinct   int32
+	FiDistAddr   int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -28290,20 +28619,20 @@ type YnVar = I16 /* sqlite3.c:18212:13 */
 //    ENAME_SPAN       Text of the original result set
 //                     expression.
 type ExprList_item = struct {
-	FpExpr     uintptr
-	FzEName    uintptr
-	FsortFlags U8
-	_          [3]byte
-	FeEName    uint8 /* unsigned eEName: 2, unsigned done: 1, unsigned reusable: 1, unsigned bSorterRef: 1, unsigned bNulls: 1 */
-	_          [3]byte
-	Fu         struct {
-		_  [0]uint32
-		Fx struct {
+	FpExpr       uintptr
+	FzEName      uintptr
+	FsortFlags   U8
+	F__ccgo_pad1 [3]byte
+	FeEName      uint8 /* unsigned eEName: 2, unsigned done: 1, unsigned reusable: 1, unsigned bSorterRef: 1, unsigned bNulls: 1 */
+	F__ccgo_pad2 [3]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint32
+		Fx           struct {
 			FiOrderByCol U16
 			FiAlias      U16
 		}
 	}
-	_ [4]byte
+	F__ccgo_pad3 [4]byte
 } /* sqlite3.c:1331:9 */
 
 // Allowed values for Expr.a.eEName
@@ -28322,9 +28651,9 @@ type ExprList_item = struct {
 //
 // If "a" is the k-th column of table "t", then IdList.a[0].idx==k.
 type IdList_item = struct {
-	FzName uintptr
-	Fidx   int32
-	_      [4]byte
+	FzName       uintptr
+	Fidx         int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:1331:9 */
 
 // The yDbMask datatype for the bitmask of all attached databases.
@@ -28333,14 +28662,14 @@ type YDbMask = uint32 /* sqlite3.c:18969:24 */
 // A pointer to this structure is used to communicate information
 // from sqlite3Init and OP_ParseSchema into the sqlite3InitCallback.
 type InitData = struct {
-	Fdb         uintptr
-	FpzErrMsg   uintptr
-	FiDb        int32
-	Frc         int32
-	FmInitFlags U32
-	FnInitRow   U32
-	FmxPage     Pgno
-	_           [4]byte
+	Fdb          uintptr
+	FpzErrMsg    uintptr
+	FiDb         int32
+	Frc          int32
+	FmInitFlags  U32
+	FnInitRow    U32
+	FmxPage      Pgno
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:19327:3 */
 
 // Allowed values for mInitFlags
@@ -28365,7 +28694,7 @@ type Sqlite3Config = struct {
 	FbUseCis             U8
 	FbSmallMalloc        U8
 	FbExtraSchemaChecks  U8
-	_                    [2]byte
+	F__ccgo_pad1         [2]byte
 	FmxStrlen            int32
 	FneverCorrupt        int32
 	FszLookaside         int32
@@ -28378,7 +28707,7 @@ type Sqlite3Config = struct {
 	FnHeap               int32
 	FmnReq               int32
 	FmxReq               int32
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FszMmap              Sqlite3_int64
 	FmxMmap              Sqlite3_int64
 	FpPage               uintptr
@@ -28393,7 +28722,7 @@ type Sqlite3Config = struct {
 	FisMallocInit        int32
 	FisPCacheInit        int32
 	FnRefInitMutex       int32
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FpInitMutex          uintptr
 	FxLog                uintptr
 	FpLogArg             uintptr
@@ -28422,11 +28751,11 @@ type Sqlite3Config = struct {
 
 // Context pointer passed down through the tree-walk.
 type SrcCount = struct {
-	FpSrc      uintptr
-	FiSrcInner int32
-	FnThis     int32
-	FnOther    int32
-	_          [4]byte
+	FpSrc        uintptr
+	FiSrcInner   int32
+	FnThis       int32
+	FnOther      int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:19454:5 */
 
 // This macro is used inside of assert() statements to indicate that
@@ -28446,9 +28775,9 @@ type SrcCount = struct {
 
 // Context pointer passed down through the tree-walk.
 type IdxCover = struct {
-	FpIdx uintptr
-	FiCur int32
-	_     [4]byte
+	FpIdx        uintptr
+	FiCur        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:19457:5 */
 
 // This macro is used inside of assert() statements to indicate that
@@ -28523,7 +28852,7 @@ type WhereConst1 = struct {
 	FnConst      int32
 	FnChng       int32
 	FbHasAffBlob int32
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FapExpr      uintptr
 } /* sqlite3.c:19462:5 */
 
@@ -28846,7 +29175,7 @@ type VdbeSorter1 = struct {
 	FiPrev       U8
 	FnTask       U8
 	FtypeMask    U8
-	_            [3]byte
+	F__ccgo_pad1 [3]byte
 	FaTask       [1]SortSubtask
 } /* sqlite3.c:21218:9 */
 
@@ -28881,11 +29210,11 @@ type VdbeCursor1 = struct {
 	FnullRow        U8
 	FdeferredMoveto U8
 	FisTable        U8
-	_               [3]byte
+	F__ccgo_pad1    [3]byte
 	FisEphemeral    uint8 /* Bool isEphemeral: 1, Bool useRandomRowid: 1, Bool isOrdered: 1, Bool hasBeenDuped: 1 */
-	_               [1]byte
+	F__ccgo_pad2    [1]byte
 	FseekHit        U16
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FpBtx           uintptr
 	FseqCount       I64
 	FaAltMap        uintptr
@@ -28898,14 +29227,14 @@ type VdbeCursor1 = struct {
 	FpgnoRoot       Pgno
 	FnField         I16
 	FnHdrParsed     U16
-	_               [4]byte
+	F__ccgo_pad4    [4]byte
 	FmovetoTarget   I64
 	FaOffset        uintptr
 	FaRow           uintptr
 	FpayloadSize    U32
 	FszRow          U32
 	FaType          [1]U32
-	_               [4]byte
+	F__ccgo_pad5    [4]byte
 } /* sqlite3.c:1331:9 */
 
 // Types of VDBE cursors
@@ -29007,7 +29336,7 @@ type ScanStatus1 = struct {
 	FaddrVisit   int32
 	FiSelectID   int32
 	FnEst        LogEst
-	_            [6]byte
+	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 } /* sqlite3.c:21514:9 */
 
@@ -29266,7 +29595,7 @@ func Xsqlite3_db_status(tls *libc.TLS, db uintptr, op int32, pCurrent uintptr, p
 				if pSchema != uintptr(0) {
 					var p uintptr
 
-					*(*int32)(unsafe.Pointer(bp /* nByte */)) += int32((uint32((*(*func(*libc.TLS, int32) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 32 /* &.xRoundup */))))(tls, int32(unsafe.Sizeof(HashElem{})))) * ((((*Schema)(unsafe.Pointer(pSchema)).FtblHash.Fcount +
+					*(*int32)(unsafe.Pointer(bp /* nByte */)) += int32((uint32((*struct{ f func(*libc.TLS, int32) int32 })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRoundup})).f(tls, int32(unsafe.Sizeof(HashElem{})))) * ((((*Schema)(unsafe.Pointer(pSchema)).FtblHash.Fcount +
 						(*Schema)(unsafe.Pointer(pSchema)).FtrigHash.Fcount) +
 						(*Schema)(unsafe.Pointer(pSchema)).FidxHash.Fcount) +
 						(*Schema)(unsafe.Pointer(pSchema)).FfkeyHash.Fcount)))
@@ -29436,9 +29765,13 @@ type tm = struct {
 	Ftm_isdst int32
 } /* time.h:97:3 */
 
-var Xdaylight int32    /* time.h:279:22: */
-var Xtimezone int32    /* time.h:280:23: */
-var Xtzname [2]uintptr /* time.h:281:23: */
+func localtime(tls *libc.TLS, _Time uintptr) uintptr { /* time.h:232:27: */
+	return libc.X_localtime64(tls, _Time)
+}
+
+var Xdaylight int32    /* time.h:256:22: */
+var Xtimezone int32    /* time.h:257:23: */
+var Xtzname [2]uintptr /* time.h:258:23: */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -29453,7 +29786,7 @@ type timeval = struct {
 type timezone = struct {
 	Ftz_minuteswest int32
 	Ftz_dsttime     int32
-} /* time.h:289:1 */
+} /* time.h:266:1 */
 
 // Adding timespec definition.
 // *
@@ -29467,47 +29800,47 @@ type timezone = struct {
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
 type __timeb32 = struct {
-	Ftime     X__time32_t
-	Fmillitm  uint16
-	Ftimezone int16
-	Fdstflag  int16
-	_         [2]byte
+	Ftime        X__time32_t
+	Fmillitm     uint16
+	Ftimezone    int16
+	Fdstflag     int16
+	F__ccgo_pad1 [2]byte
 } /* timeb.h:53:3 */
 
 type timeb = struct {
-	Ftime     Time_t
-	Fmillitm  uint16
-	Ftimezone int16
-	Fdstflag  int16
-	_         [2]byte
+	Ftime        Time_t
+	Fmillitm     uint16
+	Ftimezone    int16
+	Fdstflag     int16
+	F__ccgo_pad1 [2]byte
 } /* timeb.h:61:3 */
 
 type __timeb64 = struct {
-	Ftime     X__time64_t
-	Fmillitm  uint16
-	Ftimezone int16
-	Fdstflag  int16
-	_         [2]byte
+	Ftime        X__time64_t
+	Fmillitm     uint16
+	Ftimezone    int16
+	Fdstflag     int16
+	F__ccgo_pad1 [2]byte
 } /* timeb.h:69:3 */
 
 type timespec = struct {
-	Ftv_sec  Time_t
-	Ftv_nsec int32
-	_        [4]byte
-} /* timeb.h:90:1 */
+	Ftv_sec      Time_t
+	Ftv_nsec     int32
+	F__ccgo_pad1 [4]byte
+} /* timeb.h:91:1 */
 
 type itimerspec = struct {
 	Fit_interval struct {
-		Ftv_sec  Time_t
-		Ftv_nsec int32
-		_        [4]byte
+		Ftv_sec      Time_t
+		Ftv_nsec     int32
+		F__ccgo_pad1 [4]byte
 	}
 	Fit_value struct {
-		Ftv_sec  Time_t
-		Ftv_nsec int32
-		_        [4]byte
+		Ftv_sec      Time_t
+		Ftv_nsec     int32
+		F__ccgo_pad1 [4]byte
 	}
-} /* timeb.h:95:1 */
+} /* timeb.h:96:1 */
 
 // POSIX 2008 says clock_gettime and timespec are defined in time.h header,
 //    but other systems - like Linux, Solaris, etc - tend to declare such
@@ -29554,22 +29887,22 @@ type Clockid_t = int32 /* pthread_time.h:49:13 */
 
 // A structure for holding a single date and time.
 type DateTime1 = struct {
-	FiJD      Sqlite3_int64
-	FY        int32
-	FM        int32
-	FD        int32
-	Fh        int32
-	Fm        int32
-	Ftz       int32
-	Fs        float64
-	FvalidJD  int8
-	FrawS     int8
-	FvalidYMD int8
-	FvalidHMS int8
-	FvalidTZ  int8
-	FtzSet    int8
-	FisError  int8
-	_         [1]byte
+	FiJD         Sqlite3_int64
+	FY           int32
+	FM           int32
+	FD           int32
+	Fh           int32
+	Fm           int32
+	Ftz          int32
+	Fs           float64
+	FvalidJD     int8
+	FrawS        int8
+	FvalidYMD    int8
+	FvalidHMS    int8
+	FvalidTZ     int8
+	FtzSet       int8
+	FisError     int8
+	F__ccgo_pad1 [1]byte
 } /* sqlite3.c:22238:9 */
 
 // The MSVC CRT on Windows CE may not have a localtime() function.
@@ -29846,10 +30179,10 @@ func computeJD(tls *libc.TLS, p uintptr) { /* sqlite3.c:22423:13: */
 	B = ((2 - A) + (A / 4))
 	X1 = ((36525 * (Y + 4716)) / 100)
 	X2 = ((306001 * (M + 1)) / 10000)
-	(*DateTime)(unsafe.Pointer(p)).FiJD = (Sqlite3_int64(((float64(((X1 + X2) + D) + B)) - 1524.5) * float64(86400000)))
+	(*DateTime)(unsafe.Pointer(p)).FiJD = (libc.Int64FromFloat64(((float64(((X1 + X2) + D) + B)) - 1524.5) * float64(86400000)))
 	(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(1)
 	if (*DateTime)(unsafe.Pointer(p)).FvalidHMS != 0 {
-		*(*Sqlite3_int64)(unsafe.Pointer(p /* &.iJD */)) += ((Sqlite3_int64(((*DateTime)(unsafe.Pointer(p)).Fh * 3600000) + ((*DateTime)(unsafe.Pointer(p)).Fm * 60000))) + (Sqlite3_int64((*DateTime)(unsafe.Pointer(p)).Fs * float64(1000))))
+		*(*Sqlite3_int64)(unsafe.Pointer(p /* &.iJD */)) += ((Sqlite3_int64(((*DateTime)(unsafe.Pointer(p)).Fh * 3600000) + ((*DateTime)(unsafe.Pointer(p)).Fm * 60000))) + (libc.Int64FromFloat64((*DateTime)(unsafe.Pointer(p)).Fs * float64(1000))))
 		if (*DateTime)(unsafe.Pointer(p)).FvalidTZ != 0 {
 			*(*Sqlite3_int64)(unsafe.Pointer(p /* &.iJD */)) -= (Sqlite3_int64((*DateTime)(unsafe.Pointer(p)).Ftz * 60000))
 			(*DateTime)(unsafe.Pointer(p)).FvalidYMD = int8(0)
@@ -29939,7 +30272,7 @@ func setRawDateNumber(tls *libc.TLS, p uintptr, r float64) { /* sqlite3.c:22526:
 	(*DateTime)(unsafe.Pointer(p)).Fs = r
 	(*DateTime)(unsafe.Pointer(p)).FrawS = int8(1)
 	if (r >= 0.0) && (r < 5373484.5) {
-		(*DateTime)(unsafe.Pointer(p)).FiJD = (Sqlite3_int64((r * 86400000.0) + 0.5))
+		(*DateTime)(unsafe.Pointer(p)).FiJD = (libc.Int64FromFloat64((r * 86400000.0) + 0.5))
 		(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(1)
 	}
 }
@@ -30012,13 +30345,13 @@ func computeYMD(tls *libc.TLS, p uintptr) { /* sqlite3.c:22591:13: */
 		return
 	} else {
 		Z = (int32(((*DateTime)(unsafe.Pointer(p)).FiJD + int64(43200000)) / int64(86400000)))
-		A = (int32((float64(Z) - 1867216.25) / 36524.25))
+		A = (libc.Int32FromFloat64((float64(Z) - 1867216.25) / 36524.25))
 		A = (((Z + 1) + A) - (A / 4))
 		B = (A + 1524)
-		C = (int32((float64(B) - 122.1) / 365.25))
+		C = (libc.Int32FromFloat64((float64(B) - 122.1) / 365.25))
 		D = ((36525 * (C & 32767)) / 100)
-		E = (int32((float64(B - D)) / 30.6001))
-		X1 = (int32(30.6001 * float64(E)))
+		E = (libc.Int32FromFloat64((float64(B - D)) / 30.6001))
+		X1 = (libc.Int32FromFloat64(30.6001 * float64(E)))
 		(*DateTime)(unsafe.Pointer(p)).FD = ((B - D) - X1)
 		(*DateTime)(unsafe.Pointer(p)).FM = func() int32 {
 			if E < 14 {
@@ -30045,7 +30378,7 @@ func computeHMS(tls *libc.TLS, p uintptr) { /* sqlite3.c:22620:13: */
 	computeJD(tls, p)
 	s = (int32(((*DateTime)(unsafe.Pointer(p)).FiJD + int64(43200000)) % int64(86400000)))
 	(*DateTime)(unsafe.Pointer(p)).Fs = (float64(s) / 1000.0)
-	s = int32((*DateTime)(unsafe.Pointer(p)).Fs)
+	s = libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(p)).Fs)
 	*(*float64)(unsafe.Pointer(p + 32 /* &.s */)) -= (float64(s))
 	(*DateTime)(unsafe.Pointer(p)).Fh = (s / 3600)
 	s = s - ((*DateTime)(unsafe.Pointer(p)).Fh * 3600)
@@ -30095,7 +30428,7 @@ func osLocaltime(tls *libc.TLS, t uintptr, pTm uintptr) int32 { /* sqlite3.c:226
 	var pX uintptr
 	var mutex uintptr = Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_MAIN)
 	Xsqlite3_mutex_enter(tls, mutex)
-	pX = libc.Xlocaltime(tls, t)
+	pX = localtime(tls, t)
 	if Xsqlite3Config.FbLocaltimeFault != 0 {
 		pX = uintptr(0)
 	}
@@ -30142,7 +30475,7 @@ func localtimeOffset(tls *libc.TLS, p uintptr, pCtx uintptr, pRc uintptr) Sqlite
 		(*DateTime)(unsafe.Pointer(bp + 40 /* &x */)).Fm = 0
 		(*DateTime)(unsafe.Pointer(bp + 40 /* &x */)).Fs = 0.0
 	} else {
-		var s int32 = (int32((*DateTime)(unsafe.Pointer(bp+40 /* &x */)).Fs + 0.5))
+		var s int32 = (libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+40 /* &x */)).Fs + 0.5))
 		(*DateTime)(unsafe.Pointer(bp + 40 /* &x */)).Fs = float64(s)
 	}
 	(*DateTime)(unsafe.Pointer(bp + 40 /* &x */)).Ftz = 0
@@ -30178,12 +30511,12 @@ func localtimeOffset(tls *libc.TLS, p uintptr, pCtx uintptr, pRc uintptr) Sqlite
 // Where NNN is an arbitrary floating-point number and "days" can be one
 // of several units of time.
 var aXformType = [6]struct {
-	FeType  U8
-	FnName  U8
-	_       [6]byte
-	FzName  uintptr
-	FrLimit float64
-	FrXform float64
+	FeType       U8
+	FnName       U8
+	F__ccgo_pad1 [6]byte
+	FzName       uintptr
+	FrLimit      float64
+	FrXform      float64
 }{
 	{FnName: U8(6), FzName: ts + 384 /* "second" */, FrLimit: 464269060800.0, FrXform: 1000.0},
 	{FnName: U8(6), FzName: ts + 391 /* "minute" */, FrLimit: 7737817680.0, FrXform: 60000.0},
@@ -30247,7 +30580,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr) i
 				*(*float64)(unsafe.Pointer(bp + 8 /* r */)) = (((*DateTime)(unsafe.Pointer(p)).Fs * 1000.0) + 210866760000000.0)
 				if (*(*float64)(unsafe.Pointer(bp + 8 /* r */)) >= 0.0) && (*(*float64)(unsafe.Pointer(bp + 8 /* r */)) < 464269060800000.0) {
 					clearYMD_HMS_TZ(tls, p)
-					(*DateTime)(unsafe.Pointer(p)).FiJD = (Sqlite3_int64(*(*float64)(unsafe.Pointer(bp + 8 /* r */)) + 0.5))
+					(*DateTime)(unsafe.Pointer(p)).FiJD = (libc.Int64FromFloat64(*(*float64)(unsafe.Pointer(bp + 8 /* r */)) + 0.5))
 					(*DateTime)(unsafe.Pointer(p)).FvalidJD = int8(1)
 					(*DateTime)(unsafe.Pointer(p)).FrawS = int8(0)
 					*(*int32)(unsafe.Pointer(bp /* rc */)) = 0
@@ -30412,12 +30745,12 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr) i
 				rRounder = +0.5
 			}
 			for i = 0; i < (int32(uint64(unsafe.Sizeof(aXformType)) / uint64(unsafe.Sizeof(struct {
-				FeType  U8
-				FnName  U8
-				_       [6]byte
-				FzName  uintptr
-				FrLimit float64
-				FrXform float64
+				FeType       U8
+				FnName       U8
+				F__ccgo_pad1 [6]byte
+				FzName       uintptr
+				FrLimit      float64
+				FrXform      float64
 			}{})))); i++ {
 				if (((int32(aXformType[i].FnName) == n) &&
 					(Xsqlite3_strnicmp(tls, aXformType[i].FzName, z, n) == 0)) &&
@@ -30453,7 +30786,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr) i
 						}
 					}
 					computeJD(tls, p)
-					*(*Sqlite3_int64)(unsafe.Pointer(p /* &.iJD */)) += (Sqlite3_int64((*(*float64)(unsafe.Pointer(bp + 8 /* r */)) * aXformType[i].FrXform) + rRounder))
+					*(*Sqlite3_int64)(unsafe.Pointer(p /* &.iJD */)) += (libc.Int64FromFloat64((*(*float64)(unsafe.Pointer(bp + 8 /* r */)) * aXformType[i].FrXform) + rRounder))
 					*(*int32)(unsafe.Pointer(bp /* rc */)) = 0
 					break
 				}
@@ -30545,7 +30878,7 @@ func datetimeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) { /*
 
 		computeYMD_HMS(tls, bp+48 /* &x */)
 		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([100]int8{})), bp+96 /* &zBuf[0] */, ts+461, /* "%04d-%02d-%02d %..." */
-			libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FY, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FM, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FD, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fh, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fm, int32((*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fs)))
+			libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FY, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FM, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).FD, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fh, (*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fm, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+48 /* &x */)).Fs)))
 		Xsqlite3_result_text(tls, context, bp+96 /* &zBuf[0] */, -1, libc.UintptrFromInt32(-1))
 	}
 }
@@ -30563,7 +30896,7 @@ func timeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) { /* sql
 		// var zBuf [100]int8 at bp+72, 100
 
 		computeHMS(tls, bp+24 /* &x */)
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([100]int8{})), bp+72 /* &zBuf[0] */, ts+491 /* "%02d:%02d:%02d" */, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fh, (*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fm, int32((*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fs)))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([100]int8{})), bp+72 /* &zBuf[0] */, ts+491 /* "%02d:%02d:%02d" */, libc.VaList(bp, (*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fh, (*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fm, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+24 /* &x */)).Fs)))
 		Xsqlite3_result_text(tls, context, bp+72 /* &zBuf[0] */, -1, libc.UintptrFromInt32(-1))
 	}
 }
@@ -30781,7 +31114,7 @@ __3:
 				}
 				fallthrough
 			case 'S':
-				Xsqlite3_snprintf(tls, 3, (z + uintptr(j)), ts+521 /* "%02d" */, libc.VaList(bp+64, int32((*DateTime)(unsafe.Pointer(bp+80 /* &x */)).Fs)))
+				Xsqlite3_snprintf(tls, 3, (z + uintptr(j)), ts+521 /* "%02d" */, libc.VaList(bp+64, libc.Int32FromFloat64((*DateTime)(unsafe.Pointer(bp+80 /* &x */)).Fs)))
 				j = j + (uint64(2))
 				break
 				fallthrough
@@ -30912,50 +31245,68 @@ var aDateTimeFuncs = [8]FuncDef{
 // C++ instead of plain old C.
 func Xsqlite3OsClose(tls *libc.TLS, pId uintptr) { /* sqlite3.c:23507:21: */
 	if (*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods != 0 {
-		(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods + 8 /* &.xClose */))))(tls, pId)
+		(*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods)).FxClose})).f(tls, pId)
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = uintptr(0)
 	}
 }
 
 func Xsqlite3OsRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset I64) int32 { /* sqlite3.c:23513:20: */
 
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 16 /* &.xRead */))))(tls, id, pBuf, amt, offset)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxRead})).f(tls, id, pBuf, amt, offset)
 }
 
 func Xsqlite3OsWrite(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset I64) int32 { /* sqlite3.c:23517:20: */
 
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 24 /* &.xWrite */))))(tls, id, pBuf, amt, offset)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxWrite})).f(tls, id, pBuf, amt, offset)
 }
 
 func Xsqlite3OsTruncate(tls *libc.TLS, id uintptr, size I64) int32 { /* sqlite3.c:23521:20: */
-	return (*(*func(*libc.TLS, uintptr, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 32 /* &.xTruncate */))))(tls, id, size)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxTruncate})).f(tls, id, size)
 }
 
 func Xsqlite3OsSync(tls *libc.TLS, id uintptr, flags int32) int32 { /* sqlite3.c:23524:20: */
 
 	if flags != 0 {
-		return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 40 /* &.xSync */))))(tls, id, flags)
+		return (*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxSync})).f(tls, id, flags)
 	}
 	return SQLITE_OK
 }
 
 func Xsqlite3OsFileSize(tls *libc.TLS, id uintptr, pSize uintptr) int32 { /* sqlite3.c:23528:20: */
 
-	return (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 48 /* &.xFileSize */))))(tls, id, pSize)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxFileSize})).f(tls, id, pSize)
 }
 
 func Xsqlite3OsLock(tls *libc.TLS, id uintptr, lockType int32) int32 { /* sqlite3.c:23532:20: */
 
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 56 /* &.xLock */))))(tls, id, lockType)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxLock})).f(tls, id, lockType)
 }
 
 func Xsqlite3OsUnlock(tls *libc.TLS, id uintptr, lockType int32) int32 { /* sqlite3.c:23536:20: */
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 64 /* &.xUnlock */))))(tls, id, lockType)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxUnlock})).f(tls, id, lockType)
 }
 
 func Xsqlite3OsCheckReservedLock(tls *libc.TLS, id uintptr, pResOut uintptr) int32 { /* sqlite3.c:23539:20: */
 
-	return (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 72 /* &.xCheckReservedLock */))))(tls, id, pResOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxCheckReservedLock})).f(tls, id, pResOut)
 }
 
 // Use sqlite3OsFileControl() when we are doing something that might fail
@@ -30968,12 +31319,16 @@ func Xsqlite3OsFileControl(tls *libc.TLS, id uintptr, op int32, pArg uintptr) in
 	if (*Sqlite3_file)(unsafe.Pointer(id)).FpMethods == uintptr(0) {
 		return SQLITE_NOTFOUND
 	}
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 80 /* &.xFileControl */))))(tls, id, op, pArg)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxFileControl})).f(tls, id, op, pArg)
 }
 
 func Xsqlite3OsFileControlHint(tls *libc.TLS, id uintptr, op int32, pArg uintptr) { /* sqlite3.c:23580:21: */
 	if (*Sqlite3_file)(unsafe.Pointer(id)).FpMethods != 0 {
-		(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 80 /* &.xFileControl */))))(tls, id, op, pArg)
+		(*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxFileControl})).f(tls, id, op, pArg)
 	}
 }
 
@@ -30981,41 +31336,55 @@ func Xsqlite3OsSectorSize(tls *libc.TLS, id uintptr) int32 { /* sqlite3.c:23584:
 	var xSectorSize uintptr = (*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxSectorSize
 	return func() int32 {
 		if xSectorSize != 0 {
-			return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(&xSectorSize)))(tls, id)
+			return (*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xSectorSize})).f(tls, id)
 		}
 		return SQLITE_DEFAULT_SECTOR_SIZE
 	}()
 }
 
 func Xsqlite3OsDeviceCharacteristics(tls *libc.TLS, id uintptr) int32 { /* sqlite3.c:23588:20: */
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 96 /* &.xDeviceCharacteristics */))))(tls, id)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxDeviceCharacteristics})).f(tls, id)
 }
 
 func Xsqlite3OsShmLock(tls *libc.TLS, id uintptr, offset int32, n int32, flags int32) int32 { /* sqlite3.c:23592:20: */
-	return (*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 112 /* &.xShmLock */))))(tls, id, offset, n, flags)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, int32, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxShmLock})).f(tls, id, offset, n, flags)
 }
 
 func Xsqlite3OsShmBarrier(tls *libc.TLS, id uintptr) { /* sqlite3.c:23595:21: */
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 120 /* &.xShmBarrier */))))(tls, id)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxShmBarrier})).f(tls, id)
 }
 
 func Xsqlite3OsShmUnmap(tls *libc.TLS, id uintptr, deleteFlag int32) int32 { /* sqlite3.c:23598:20: */
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 128 /* &.xShmUnmap */))))(tls, id, deleteFlag)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxShmUnmap})).f(tls, id, deleteFlag)
 }
 
 func Xsqlite3OsShmMap(tls *libc.TLS, id uintptr, iPage int32, pgsz int32, bExtend int32, pp uintptr) int32 { /* sqlite3.c:23601:20: */
 
-	return (*(*func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 104 /* &.xShmMap */))))(tls, id, iPage, pgsz, bExtend, libc.AtomicLoadUintptr(&pp))
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxShmMap})).f(tls, id, iPage, pgsz, bExtend, pp)
 }
 
 // The real implementation of xFetch and xUnfetch
 func Xsqlite3OsFetch(tls *libc.TLS, id uintptr, iOff I64, iAmt int32, pp uintptr) int32 { /* sqlite3.c:23615:20: */
 
-	return (*(*func(*libc.TLS, uintptr, Sqlite3_int64, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 136 /* &.xFetch */))))(tls, id, iOff, iAmt, pp)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Sqlite3_int64, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxFetch})).f(tls, id, iOff, iAmt, pp)
 }
 
 func Xsqlite3OsUnfetch(tls *libc.TLS, id uintptr, iOff I64, p uintptr) int32 { /* sqlite3.c:23619:20: */
-	return (*(*func(*libc.TLS, uintptr, Sqlite3_int64, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods + 144 /* &.xUnfetch */))))(tls, id, iOff, p)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Sqlite3_int64, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(id)).FpMethods)).FxUnfetch})).f(tls, id, iOff, p)
 }
 
 // The next group of routines are convenience wrappers around the
@@ -31027,7 +31396,9 @@ func Xsqlite3OsOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr, pFile uintptr, f
 	// down into the VFS layer.  Some SQLITE_OPEN_ flags (for example,
 	// SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before
 	// reaching the VFS.
-	rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pVfs + 40 /* &.xOpen */))))(tls, pVfs, zPath, pFile, (flags & 0x1087f7f), pFlagsOut)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxOpen})).f(tls, pVfs, zPath, pFile, (flags & 0x1087f7f), pFlagsOut)
 
 	return rc
 }
@@ -31035,38 +31406,52 @@ func Xsqlite3OsOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr, pFile uintptr, f
 func Xsqlite3OsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 { /* sqlite3.c:23654:20: */
 
 	if (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete != uintptr(0) {
-		return (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer((pVfs + 48 /* &.xDelete */))))(tls, pVfs, zPath, dirSync)
+		return (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zPath, dirSync)
 	}
 	return SQLITE_OK
 }
 
 func Xsqlite3OsAccess(tls *libc.TLS, pVfs uintptr, zPath uintptr, flags int32, pResOut uintptr) int32 { /* sqlite3.c:23659:20: */
 
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pVfs + 56 /* &.xAccess */))))(tls, pVfs, zPath, flags, pResOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxAccess})).f(tls, pVfs, zPath, flags, pResOut)
 }
 
 func Xsqlite3OsFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nPathOut int32, zPathOut uintptr) int32 { /* sqlite3.c:23668:20: */
 
 	*(*int8)(unsafe.Pointer(zPathOut)) = int8(0)
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pVfs + 64 /* &.xFullPathname */))))(tls, pVfs, zPath, nPathOut, zPathOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxFullPathname})).f(tls, pVfs, zPath, nPathOut, zPathOut)
 }
 
 func Xsqlite3OsDlOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr) uintptr { /* sqlite3.c:23679:21: */
 
 	// tag-20210611-1
-	return (*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer((pVfs + 72 /* &.xDlOpen */))))(tls, pVfs, zPath)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDlOpen})).f(tls, pVfs, zPath)
 }
 
 func Xsqlite3OsDlError(tls *libc.TLS, pVfs uintptr, nByte int32, zBufOut uintptr) { /* sqlite3.c:23684:21: */
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer((pVfs + 80 /* &.xDlError */))))(tls, pVfs, nByte, zBufOut)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDlError})).f(tls, pVfs, nByte, zBufOut)
 }
 
 func Xsqlite3OsDlSym(tls *libc.TLS, pVfs uintptr, pHdle uintptr, zSym uintptr) uintptr { /* sqlite3.c:23687:21: */
-	return (*(*func(*libc.TLS, uintptr, uintptr, uintptr) uintptr)(unsafe.Pointer((pVfs + 88 /* &.xDlSym */))))(tls, pVfs, pHdle, zSym)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDlSym})).f(tls, pVfs, pHdle, zSym)
 }
 
 func Xsqlite3OsDlClose(tls *libc.TLS, pVfs uintptr, pHandle uintptr) { /* sqlite3.c:23690:21: */
-	(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pVfs + 96 /* &.xDlClose */))))(tls, pVfs, pHandle)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDlClose})).f(tls, pVfs, pHandle)
 }
 
 func Xsqlite3OsRandomness(tls *libc.TLS, pVfs uintptr, nByte int32, zBufOut uintptr) int32 { /* sqlite3.c:23694:20: */
@@ -31078,19 +31463,25 @@ func Xsqlite3OsRandomness(tls *libc.TLS, pVfs uintptr, nByte int32, zBufOut uint
 		libc.Xmemcpy(tls, zBufOut, (uintptr(unsafe.Pointer(&Xsqlite3Config)) + 420 /* &.iPrngSeed */), uint64(nByte))
 		return SQLITE_OK
 	} else {
-		return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pVfs + 104 /* &.xRandomness */))))(tls, pVfs, nByte, zBufOut)
+		return (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxRandomness})).f(tls, pVfs, nByte, zBufOut)
 	}
 	return int32(0)
 
 }
 
 func Xsqlite3OsSleep(tls *libc.TLS, pVfs uintptr, nMicro int32) int32 { /* sqlite3.c:23705:20: */
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((pVfs + 112 /* &.xSleep */))))(tls, pVfs, nMicro)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxSleep})).f(tls, pVfs, nMicro)
 }
 
 func Xsqlite3OsGetLastError(tls *libc.TLS, pVfs uintptr) int32 { /* sqlite3.c:23708:20: */
 	if (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxGetLastError != 0 {
-		return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pVfs + 128 /* &.xGetLastError */))))(tls, pVfs, 0, uintptr(0))
+		return (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxGetLastError})).f(tls, pVfs, 0, uintptr(0))
 	}
 	return 0
 }
@@ -31106,12 +31497,16 @@ func Xsqlite3OsCurrentTimeInt64(tls *libc.TLS, pVfs uintptr, pTimeOut uintptr) i
 	// will fall back to xCurrentTime() if xCurrentTimeInt64() is
 	// unavailable.
 	if ((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FiVersion >= 2) && ((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxCurrentTimeInt64 != 0) {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pVfs + 136 /* &.xCurrentTimeInt64 */))))(tls, pVfs, pTimeOut)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxCurrentTimeInt64})).f(tls, pVfs, pTimeOut)
 	} else {
 		// var r float64 at bp, 8
 
-		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pVfs + 120 /* &.xCurrentTime */))))(tls, pVfs, bp /* &r */)
-		*(*Sqlite3_int64)(unsafe.Pointer(pTimeOut)) = (Sqlite3_int64(*(*float64)(unsafe.Pointer(bp /* r */)) * 86400000.0))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxCurrentTime})).f(tls, pVfs, bp /* &r */)
+		*(*Sqlite3_int64)(unsafe.Pointer(pTimeOut)) = (libc.Int64FromFloat64(*(*float64)(unsafe.Pointer(bp /* r */)) * 86400000.0))
 	}
 	return rc
 }
@@ -31321,14 +31716,14 @@ func Xsqlite3BenignMallocHooks(tls *libc.TLS, xBenignBegin uintptr, xBenignEnd u
 func Xsqlite3BeginBenignMalloc(tls *libc.TLS) { /* sqlite3.c:23942:21: */
 
 	if sqlite3Hooks.FxBenignBegin != 0 {
-		(*(*func(*libc.TLS))(unsafe.Pointer((uintptr(unsafe.Pointer(&sqlite3Hooks)) /* &.xBenignBegin */))))(tls)
+		(*struct{ f func(*libc.TLS) })(unsafe.Pointer(&struct{ uintptr }{sqlite3Hooks.FxBenignBegin})).f(tls)
 	}
 }
 
 func Xsqlite3EndBenignMalloc(tls *libc.TLS) { /* sqlite3.c:23948:21: */
 
 	if sqlite3Hooks.FxBenignEnd != 0 {
-		(*(*func(*libc.TLS))(unsafe.Pointer((uintptr(unsafe.Pointer(&sqlite3Hooks)) + 8 /* &.xBenignEnd */))))(tls)
+		(*struct{ f func(*libc.TLS) })(unsafe.Pointer(&struct{ uintptr }{sqlite3Hooks.FxBenignEnd})).f(tls)
 	}
 }
 
@@ -31677,7 +32072,7 @@ func Xsqlite3MutexInit(tls *libc.TLS) int32 { /* sqlite3.c:26333:20: */
 		(*Sqlite3_mutex_methods)(unsafe.Pointer(pTo)).FxMutexAlloc = (*Sqlite3_mutex_methods)(unsafe.Pointer(pFrom)).FxMutexAlloc
 	}
 
-	rc = (*(*func(*libc.TLS) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ /* &.xMutexInit */))))(tls)
+	rc = (*struct{ f func(*libc.TLS) int32 })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexInit})).f(tls)
 
 	return rc
 }
@@ -31687,7 +32082,7 @@ func Xsqlite3MutexInit(tls *libc.TLS) int32 { /* sqlite3.c:26333:20: */
 func Xsqlite3MutexEnd(tls *libc.TLS) int32 { /* sqlite3.c:26379:20: */
 	var rc int32 = SQLITE_OK
 	if Xsqlite3Config.Fmutex.FxMutexEnd != 0 {
-		rc = (*(*func(*libc.TLS) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 8 /* &.xMutexEnd */))))(tls)
+		rc = (*struct{ f func(*libc.TLS) int32 })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexEnd})).f(tls)
 	}
 
 	return rc
@@ -31702,7 +32097,9 @@ func Xsqlite3_mutex_alloc(tls *libc.TLS, id int32) uintptr { /* sqlite3.c:26395:
 		return uintptr(0)
 	}
 
-	return (*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 16 /* &.xMutexAlloc */))))(tls, id)
+	return (*struct {
+		f func(*libc.TLS, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexAlloc})).f(tls, id)
 }
 
 func Xsqlite3MutexAlloc(tls *libc.TLS, id int32) uintptr { /* sqlite3.c:26404:30: */
@@ -31710,14 +32107,16 @@ func Xsqlite3MutexAlloc(tls *libc.TLS, id int32) uintptr { /* sqlite3.c:26404:30
 		return uintptr(0)
 	}
 
-	return (*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 16 /* &.xMutexAlloc */))))(tls, id)
+	return (*struct {
+		f func(*libc.TLS, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexAlloc})).f(tls, id)
 }
 
 // Free a dynamic mutex.
 func Xsqlite3_mutex_free(tls *libc.TLS, p uintptr) { /* sqlite3.c:26416:17: */
 	if p != 0 {
 
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 24 /* &.xMutexFree */))))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexFree})).f(tls, p)
 	}
 }
 
@@ -31726,7 +32125,7 @@ func Xsqlite3_mutex_free(tls *libc.TLS, p uintptr) { /* sqlite3.c:26416:17: */
 func Xsqlite3_mutex_enter(tls *libc.TLS, p uintptr) { /* sqlite3.c:26427:17: */
 	if p != 0 {
 
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 32 /* &.xMutexEnter */))))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexEnter})).f(tls, p)
 	}
 }
 
@@ -31736,7 +32135,9 @@ func Xsqlite3_mutex_try(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:26438:16:
 	var rc int32 = SQLITE_OK
 	if p != 0 {
 
-		return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 40 /* &.xMutexTry */))))(tls, p)
+		return (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexTry})).f(tls, p)
 	}
 	return rc
 }
@@ -31748,7 +32149,7 @@ func Xsqlite3_mutex_try(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:26438:16:
 func Xsqlite3_mutex_leave(tls *libc.TLS, p uintptr) { /* sqlite3.c:26453:17: */
 	if p != 0 {
 
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 96 /* &.mutex */ + 48 /* &.xMutexLeave */))))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fmutex.FxMutexLeave})).f(tls, p)
 	}
 }
 
@@ -31950,7 +32351,7 @@ func Xsqlite3DefaultMutex(tls *libc.TLS) uintptr { /* sqlite3.c:26689:44: */
 
 // _WIN32_IE
 
-// Mappings Between IE Version  and Windows Version
+// Mappings Between IE Version and Windows Version
 
 // NTDDI_VERSION
 
@@ -31996,7 +32397,7 @@ type _EXCEPTION_RECORD = struct {
 	FExceptionRecord      uintptr
 	FExceptionAddress     PVOID
 	FNumberParameters     DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FExceptionInformation [15]ULONG_PTR
 } /* excpt.h:17:3 */
 
@@ -32110,7 +32511,7 @@ type PEXCEPTION_HANDLER = uintptr /* excpt.h:87:33 */
 // 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) 1989-2018 Free Software Foundation, Inc.
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -32139,6 +32540,12 @@ type PEXCEPTION_HANDLER = uintptr /* excpt.h:87:33 */
 // 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.
+
+// WINAPI_FAMILY can be either desktop + App, or App.
+
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -32148,7 +32555,10 @@ type PEXCEPTION_HANDLER = uintptr /* excpt.h:87:33 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-// WINAPI_FAMILY can be either desktop + App, or App.
+// *
+// 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.
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -32160,16 +32570,20 @@ type PEXCEPTION_HANDLER = uintptr /* excpt.h:87:33 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-// Pointer parameters
+// Input parameters
 
-// Optional pointer parameters
+// Output parameters
+
+// Inout parameters
 
-// Output pointer parameters
+// Pointer to pointer parameters
 
 // Output reference parameters
 
 // Return values
 
+// Optional pointer parameters
+
 // Other common annotations
 
 // Function annotations
@@ -32199,7 +32613,15 @@ type PEXCEPTION_HANDLER = uintptr /* excpt.h:87:33 */
 // ABSTRACT:        This header stubs out Driver Verifier annotations to
 //                  allow drivers using them to compile with our header set.
 
-// Stubs
+// *
+// 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.
+
+// *
+// 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.
 
 type ULONG = uint32    /* minwindef.h:24:29 */
 type PULONG = uintptr  /* minwindef.h:25:17 */
@@ -32357,6 +32779,9 @@ type PUINT = uintptr   /* minwindef.h:160:24 */
 
 // *****************************************************
 
+// GCC 8 has already defined _xgetbv, Clang 9 has _xgetbv defined as a macro
+// redirecting to the __builtin_ia32_xgetbv builtin.
+
 // *****************************************************
 
 // *
@@ -32559,8 +32984,8 @@ type PULONGLONG = uintptr /* winnt.h:496:21 */
 type USN = LONGLONG       /* winnt.h:497:20 */
 
 type _LARGE_INTEGER = struct {
-	_  [0]uint64
-	Fs struct {
+	F__ccgo_pad1 [0]uint64
+	Fs           struct {
 		FLowPart  DWORD
 		FHighPart LONG
 	}
@@ -32571,8 +32996,8 @@ type LARGE_INTEGER = _LARGE_INTEGER /* winnt.h:516:5 */
 type PLARGE_INTEGER = uintptr /* winnt.h:518:25 */
 
 type _ULARGE_INTEGER = struct {
-	_  [0]uint64
-	Fs struct {
+	F__ccgo_pad1 [0]uint64
+	Fs           struct {
 		FLowPart  DWORD
 		FHighPart DWORD
 	}
@@ -32691,16 +33116,16 @@ type PEXCEPTION_ROUTINE = uintptr /* winnt.h:709:31 */
 
 // ??? #define SUBLANG_ROMANIAN_MOLDOVA                  0x01 ???
 
-type KSPIN_LOCK = ULONG_PTR /* winnt.h:1383:21 */
-type PKSPIN_LOCK = uintptr  /* winnt.h:1384:22 */
+type KSPIN_LOCK = ULONG_PTR /* winnt.h:1384:21 */
+type PKSPIN_LOCK = uintptr  /* winnt.h:1385:22 */
 
 type _M128A = struct {
 	FLow  ULONGLONG
 	FHigh LONGLONG
 } /* excpt.h:17:3 */
 
-type M128A = _M128A   /* winnt.h:1389:7 */
-type PM128A = uintptr /* winnt.h:1389:13 */
+type M128A = _M128A   /* winnt.h:1390:7 */
+type PM128A = uintptr /* winnt.h:1390:13 */
 
 type _XSAVE_FORMAT = struct {
 	FControlWord    WORD
@@ -32719,26 +33144,26 @@ type _XSAVE_FORMAT = struct {
 	FFloatRegisters [8]M128A
 	FXmmRegisters   [16]M128A
 	FReserved4      [96]BYTE
-} /* winnt.h:1391:13 */
+} /* winnt.h:1392:13 */
 
-type XSAVE_FORMAT = _XSAVE_FORMAT /* winnt.h:1414:7 */
-type PXSAVE_FORMAT = uintptr      /* winnt.h:1414:20 */
+type XSAVE_FORMAT = _XSAVE_FORMAT /* winnt.h:1415:7 */
+type PXSAVE_FORMAT = uintptr      /* winnt.h:1415:20 */
 
 type _XSAVE_AREA_HEADER = struct {
 	FMask     DWORD64
 	FReserved [7]DWORD64
-} /* winnt.h:1416:13 */
+} /* winnt.h:1417:13 */
 
-type XSAVE_AREA_HEADER = _XSAVE_AREA_HEADER /* winnt.h:1419:7 */
-type PXSAVE_AREA_HEADER = uintptr           /* winnt.h:1419:25 */
+type XSAVE_AREA_HEADER = _XSAVE_AREA_HEADER /* winnt.h:1420:7 */
+type PXSAVE_AREA_HEADER = uintptr           /* winnt.h:1420:25 */
 
 type _XSAVE_AREA = struct {
 	FLegacyState XSAVE_FORMAT
 	FHeader      XSAVE_AREA_HEADER
-} /* winnt.h:1421:13 */
+} /* winnt.h:1422:13 */
 
-type XSAVE_AREA = _XSAVE_AREA /* winnt.h:1424:7 */
-type PXSAVE_AREA = uintptr    /* winnt.h:1424:18 */
+type XSAVE_AREA = _XSAVE_AREA /* winnt.h:1425:7 */
+type PXSAVE_AREA = uintptr    /* winnt.h:1425:18 */
 
 type _XSTATE_CONTEXT = struct {
 	FMask      DWORD64
@@ -32746,10 +33171,10 @@ type _XSTATE_CONTEXT = struct {
 	FReserved1 DWORD
 	FArea      PXSAVE_AREA
 	FBuffer    PVOID
-} /* winnt.h:1426:13 */
+} /* winnt.h:1427:13 */
 
-type XSTATE_CONTEXT = _XSTATE_CONTEXT /* winnt.h:1438:7 */
-type PXSTATE_CONTEXT = uintptr        /* winnt.h:1438:22 */
+type XSTATE_CONTEXT = _XSTATE_CONTEXT /* winnt.h:1439:7 */
+type PXSTATE_CONTEXT = uintptr        /* winnt.h:1439:22 */
 
 type _SCOPE_TABLE_AMD64 = struct {
 	FCount       DWORD
@@ -32759,10 +33184,10 @@ type _SCOPE_TABLE_AMD64 = struct {
 		FHandlerAddress DWORD
 		FJumpTarget     DWORD
 	}
-} /* winnt.h:1440:13 */
+} /* winnt.h:1441:13 */
 
-type SCOPE_TABLE_AMD64 = _SCOPE_TABLE_AMD64 /* winnt.h:1448:7 */
-type PSCOPE_TABLE_AMD64 = uintptr           /* winnt.h:1448:25 */
+type SCOPE_TABLE_AMD64 = _SCOPE_TABLE_AMD64 /* winnt.h:1449:7 */
+type PSCOPE_TABLE_AMD64 = uintptr           /* winnt.h:1449:25 */
 
 // unsigned char __readgsbyte(unsigned __LONG32 Offset); moved to psdk_inc/intrin-impl.h
 // unsigned short __readgsword(unsigned __LONG32 Offset); moved to psdk_inc/intrin-impl.h
@@ -32790,7 +33215,7 @@ type _XMM_SAVE_AREA32 = struct {
 	FFloatRegisters [8]M128A
 	FXmmRegisters   [16]M128A
 	FReserved4      [96]BYTE
-} /* winnt.h:1678:11 */
+} /* winnt.h:1679:11 */
 
 // unsigned char __readgsbyte(unsigned __LONG32 Offset); moved to psdk_inc/intrin-impl.h
 // unsigned short __readgsword(unsigned __LONG32 Offset); moved to psdk_inc/intrin-impl.h
@@ -32801,11 +33226,11 @@ type _XMM_SAVE_AREA32 = struct {
 // void __writegsword(unsigned __LONG32 Offset,unsigned short Data); moved to psdk_inc/intrin-impl.h
 // void __writegsdword(unsigned __LONG32 Offset,unsigned __LONG32 Data); moved to psdk_inc/intrin-impl.h
 
-type XMM_SAVE_AREA32 = _XMM_SAVE_AREA32 /* winnt.h:1695:5 */
-type PXMM_SAVE_AREA32 = uintptr         /* winnt.h:1695:21 */
+type XMM_SAVE_AREA32 = _XMM_SAVE_AREA32 /* winnt.h:1696:5 */
+type PXMM_SAVE_AREA32 = uintptr         /* winnt.h:1696:21 */
 
-type CONTEXT = _CONTEXT /* winnt.h:1769:5 */
-type PCONTEXT = uintptr /* winnt.h:1769:13 */
+type CONTEXT = _CONTEXT /* winnt.h:1770:5 */
+type PCONTEXT = uintptr /* winnt.h:1770:13 */
 
 type _RUNTIME_FUNCTION = struct {
 	FBeginAddress DWORD
@@ -32813,11 +33238,11 @@ type _RUNTIME_FUNCTION = struct {
 	FUnwindData   DWORD
 } /* excpt.h:45:3 */
 
-type RUNTIME_FUNCTION = _RUNTIME_FUNCTION /* winnt.h:1777:5 */
-type PRUNTIME_FUNCTION = uintptr          /* winnt.h:1777:22 */
+type RUNTIME_FUNCTION = _RUNTIME_FUNCTION /* winnt.h:1778:5 */
+type PRUNTIME_FUNCTION = uintptr          /* winnt.h:1778:22 */
 
-type PGET_RUNTIME_FUNCTION_CALLBACK = uintptr          /* winnt.h:1779:29 */
-type POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK = uintptr /* winnt.h:1780:17 */
+type PGET_RUNTIME_FUNCTION_CALLBACK = uintptr          /* winnt.h:1780:29 */
+type POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK = uintptr /* winnt.h:1781:17 */
 
 // LONG WINAPI InterlockedIncrement(LONG volatile *); moved to psdk_inc/intrin-impl.h
 // LONG WINAPI InterlockedDecrement(LONG volatile *); moved to psdk_inc/intrin-impl.h
@@ -32827,28 +33252,28 @@ type _LDT_ENTRY = struct {
 	FLimitLow WORD
 	FBaseLow  WORD
 	FHighWord struct {
-		_      [0]uint32
-		FBytes struct {
+		F__ccgo_pad1 [0]uint32
+		FBytes       struct {
 			FBaseMid BYTE
 			FFlags1  BYTE
 			FFlags2  BYTE
 			FBaseHi  BYTE
 		}
 	}
-} /* winnt.h:2415:13 */
+} /* winnt.h:2416:13 */
 
 // LONG WINAPI InterlockedIncrement(LONG volatile *); moved to psdk_inc/intrin-impl.h
 // LONG WINAPI InterlockedDecrement(LONG volatile *); moved to psdk_inc/intrin-impl.h
 // LONG WINAPI InterlockedExchange(LONG volatile *, LONG); moved to psdk_inc/intrin-impl.h
 
-type LDT_ENTRY = _LDT_ENTRY /* winnt.h:2438:7 */
-type PLDT_ENTRY = uintptr   /* winnt.h:2438:17 */
+type LDT_ENTRY = _LDT_ENTRY /* winnt.h:2439:7 */
+type PLDT_ENTRY = uintptr   /* winnt.h:2439:17 */
 
 // http://www.nynaeve.net/?p=99
 
-type EXCEPTION_RECORD = _EXCEPTION_RECORD /* winnt.h:2783:7 */
+type EXCEPTION_RECORD = _EXCEPTION_RECORD /* winnt.h:2784:7 */
 
-type PEXCEPTION_RECORD = uintptr /* winnt.h:2785:30 */
+type PEXCEPTION_RECORD = uintptr /* winnt.h:2786:30 */
 
 type _EXCEPTION_RECORD32 = struct {
 	FExceptionCode        DWORD
@@ -32857,10 +33282,10 @@ type _EXCEPTION_RECORD32 = struct {
 	FExceptionAddress     DWORD
 	FNumberParameters     DWORD
 	FExceptionInformation [15]DWORD
-} /* winnt.h:2787:13 */
+} /* winnt.h:2788:13 */
 
-type EXCEPTION_RECORD32 = _EXCEPTION_RECORD32 /* winnt.h:2794:7 */
-type PEXCEPTION_RECORD32 = uintptr            /* winnt.h:2794:26 */
+type EXCEPTION_RECORD32 = _EXCEPTION_RECORD32 /* winnt.h:2795:7 */
+type PEXCEPTION_RECORD32 = uintptr            /* winnt.h:2795:26 */
 
 type _EXCEPTION_RECORD64 = struct {
 	FExceptionCode        DWORD
@@ -32870,13 +33295,13 @@ type _EXCEPTION_RECORD64 = struct {
 	FNumberParameters     DWORD
 	F__unusedAlignment    DWORD
 	FExceptionInformation [15]DWORD64
-} /* winnt.h:2796:13 */
+} /* winnt.h:2797:13 */
 
-type EXCEPTION_RECORD64 = _EXCEPTION_RECORD64 /* winnt.h:2804:7 */
-type PEXCEPTION_RECORD64 = uintptr            /* winnt.h:2804:26 */
+type EXCEPTION_RECORD64 = _EXCEPTION_RECORD64 /* winnt.h:2805:7 */
+type PEXCEPTION_RECORD64 = uintptr            /* winnt.h:2805:26 */
 
-type EXCEPTION_POINTERS = _EXCEPTION_POINTERS /* winnt.h:2809:7 */
-type PEXCEPTION_POINTERS = uintptr            /* winnt.h:2809:26 */
+type EXCEPTION_POINTERS = _EXCEPTION_POINTERS /* winnt.h:2810:7 */
+type PEXCEPTION_POINTERS = uintptr            /* winnt.h:2810:26 */
 
 // http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx
 
@@ -32887,8 +33312,8 @@ type _UNWIND_HISTORY_TABLE_ENTRY = struct {
 
 // http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx
 
-type UNWIND_HISTORY_TABLE_ENTRY = _UNWIND_HISTORY_TABLE_ENTRY /* winnt.h:2824:5 */
-type PUNWIND_HISTORY_TABLE_ENTRY = uintptr                    /* winnt.h:2824:33 */
+type UNWIND_HISTORY_TABLE_ENTRY = _UNWIND_HISTORY_TABLE_ENTRY /* winnt.h:2825:5 */
+type PUNWIND_HISTORY_TABLE_ENTRY = uintptr                    /* winnt.h:2825:33 */
 
 type _UNWIND_HISTORY_TABLE = struct {
 	FCount       ULONG
@@ -32901,39 +33326,39 @@ type _UNWIND_HISTORY_TABLE = struct {
 	FEntry       [12]UNWIND_HISTORY_TABLE_ENTRY
 } /* excpt.h:45:3 */
 
-type UNWIND_HISTORY_TABLE = _UNWIND_HISTORY_TABLE /* winnt.h:2839:5 */
-type PUNWIND_HISTORY_TABLE = uintptr              /* winnt.h:2839:27 */
-type DISPATCHER_CONTEXT = _DISPATCHER_CONTEXT     /* winnt.h:2844:38 */
-type PDISPATCHER_CONTEXT = uintptr                /* winnt.h:2845:38 */
+type UNWIND_HISTORY_TABLE = _UNWIND_HISTORY_TABLE /* winnt.h:2840:5 */
+type PUNWIND_HISTORY_TABLE = uintptr              /* winnt.h:2840:27 */
+type DISPATCHER_CONTEXT = _DISPATCHER_CONTEXT     /* winnt.h:2845:38 */
+type PDISPATCHER_CONTEXT = uintptr                /* winnt.h:2846:38 */
 
 // http://msdn.microsoft.com/en-us/library/ms680617(VS.85).aspx
 
 type _KNONVOLATILE_CONTEXT_POINTERS = struct {
 	FFloatingContext [16]PM128A
 	FIntegerContext  [16]PULONG64
-} /* winnt.h:2864:11 */
+} /* winnt.h:2865:11 */
 
 // http://msdn.microsoft.com/en-us/library/ms680617(VS.85).aspx
 
-type KNONVOLATILE_CONTEXT_POINTERS = _KNONVOLATILE_CONTEXT_POINTERS /* winnt.h:2868:5 */
-type PKNONVOLATILE_CONTEXT_POINTERS = uintptr                       /* winnt.h:2868:36 */
+type KNONVOLATILE_CONTEXT_POINTERS = _KNONVOLATILE_CONTEXT_POINTERS /* winnt.h:2869:5 */
+type PKNONVOLATILE_CONTEXT_POINTERS = uintptr                       /* winnt.h:2869:36 */
 
-type PACCESS_TOKEN = PVOID        /* winnt.h:2871:19 */
-type PSECURITY_DESCRIPTOR = PVOID /* winnt.h:2872:19 */
-type PSID = PVOID                 /* winnt.h:2873:19 */
-type PCLAIMS_BLOB = PVOID         /* winnt.h:2874:19 */
-type ACCESS_MASK = DWORD          /* winnt.h:2875:19 */
-type PACCESS_MASK = uintptr       /* winnt.h:2876:25 */
+type PACCESS_TOKEN = PVOID        /* winnt.h:2872:19 */
+type PSECURITY_DESCRIPTOR = PVOID /* winnt.h:2873:19 */
+type PSID = PVOID                 /* winnt.h:2874:19 */
+type PCLAIMS_BLOB = PVOID         /* winnt.h:2875:19 */
+type ACCESS_MASK = DWORD          /* winnt.h:2876:19 */
+type PACCESS_MASK = uintptr       /* winnt.h:2877:25 */
 
 type _GENERIC_MAPPING = struct {
 	FGenericRead    ACCESS_MASK
 	FGenericWrite   ACCESS_MASK
 	FGenericExecute ACCESS_MASK
 	FGenericAll     ACCESS_MASK
-} /* winnt.h:2902:13 */
+} /* winnt.h:2903:13 */
 
-type GENERIC_MAPPING = _GENERIC_MAPPING /* winnt.h:2907:7 */
-type PGENERIC_MAPPING = uintptr         /* winnt.h:2908:29 */
+type GENERIC_MAPPING = _GENERIC_MAPPING /* winnt.h:2908:7 */
+type PGENERIC_MAPPING = uintptr         /* winnt.h:2909:29 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -32942,70 +33367,70 @@ type PGENERIC_MAPPING = uintptr         /* winnt.h:2908:29 */
 type _LUID_AND_ATTRIBUTES = struct {
 	FLuid       LUID
 	FAttributes DWORD
-} /* winnt.h:2911:13 */
+} /* winnt.h:2912:13 */
 
 // *
 // 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.
-type LUID_AND_ATTRIBUTES = _LUID_AND_ATTRIBUTES         /* winnt.h:2914:7 */
-type PLUID_AND_ATTRIBUTES = uintptr                     /* winnt.h:2914:27 */
-type LUID_AND_ATTRIBUTES_ARRAY = [1]LUID_AND_ATTRIBUTES /* winnt.h:2915:33 */
-type PLUID_AND_ATTRIBUTES_ARRAY = uintptr               /* winnt.h:2916:39 */
+type LUID_AND_ATTRIBUTES = _LUID_AND_ATTRIBUTES         /* winnt.h:2915:7 */
+type PLUID_AND_ATTRIBUTES = uintptr                     /* winnt.h:2915:27 */
+type LUID_AND_ATTRIBUTES_ARRAY = [1]LUID_AND_ATTRIBUTES /* winnt.h:2916:33 */
+type PLUID_AND_ATTRIBUTES_ARRAY = uintptr               /* winnt.h:2917:39 */
 // *
 // 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.
 
-type _SID_IDENTIFIER_AUTHORITY = struct{ FValue [6]BYTE } /* winnt.h:2921:13 */
+type _SID_IDENTIFIER_AUTHORITY = struct{ FValue [6]BYTE } /* winnt.h:2922:13 */
 
 // *
 // 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.
 
-type SID_IDENTIFIER_AUTHORITY = _SID_IDENTIFIER_AUTHORITY /* winnt.h:2923:7 */
-type PSID_IDENTIFIER_AUTHORITY = uintptr                  /* winnt.h:2923:32 */
+type SID_IDENTIFIER_AUTHORITY = _SID_IDENTIFIER_AUTHORITY /* winnt.h:2924:7 */
+type PSID_IDENTIFIER_AUTHORITY = uintptr                  /* winnt.h:2924:32 */
 
 type _SID = struct {
 	FRevision            BYTE
 	FSubAuthorityCount   BYTE
 	FIdentifierAuthority SID_IDENTIFIER_AUTHORITY
 	FSubAuthority        [1]DWORD
-} /* winnt.h:2928:13 */
+} /* winnt.h:2929:13 */
 
-type SID = _SID      /* winnt.h:2933:7 */
-type PISID = uintptr /* winnt.h:2933:11 */
+type SID = _SID      /* winnt.h:2934:7 */
+type PISID = uintptr /* winnt.h:2934:11 */
 
-type SID_NAME_USE = uint32   /* winnt.h:2947:7 */
-type PSID_NAME_USE = uintptr /* winnt.h:2947:20 */
+type SID_NAME_USE = uint32   /* winnt.h:2948:7 */
+type PSID_NAME_USE = uintptr /* winnt.h:2948:20 */
 
 type _SID_AND_ATTRIBUTES = struct {
-	FSid        PSID
-	FAttributes DWORD
-	_           [4]byte
-} /* winnt.h:2949:13 */
+	FSid         PSID
+	FAttributes  DWORD
+	F__ccgo_pad1 [4]byte
+} /* winnt.h:2950:13 */
 
-type SID_AND_ATTRIBUTES = _SID_AND_ATTRIBUTES /* winnt.h:2956:7 */
-type PSID_AND_ATTRIBUTES = uintptr            /* winnt.h:2956:26 */
+type SID_AND_ATTRIBUTES = _SID_AND_ATTRIBUTES /* winnt.h:2957:7 */
+type PSID_AND_ATTRIBUTES = uintptr            /* winnt.h:2957:26 */
 
-type SID_AND_ATTRIBUTES_ARRAY = [1]SID_AND_ATTRIBUTES /* winnt.h:2958:32 */
-type PSID_AND_ATTRIBUTES_ARRAY = uintptr              /* winnt.h:2959:38 */
+type SID_AND_ATTRIBUTES_ARRAY = [1]SID_AND_ATTRIBUTES /* winnt.h:2959:32 */
+type PSID_AND_ATTRIBUTES_ARRAY = uintptr              /* winnt.h:2960:38 */
 
-type SID_HASH_ENTRY = ULONG_PTR /* winnt.h:2961:23 */
-type PSID_HASH_ENTRY = uintptr  /* winnt.h:2961:39 */
+type SID_HASH_ENTRY = ULONG_PTR /* winnt.h:2962:23 */
+type PSID_HASH_ENTRY = uintptr  /* winnt.h:2962:39 */
 
 type _SID_AND_ATTRIBUTES_HASH = struct {
-	FSidCount DWORD
-	_         [4]byte
-	FSidAttr  PSID_AND_ATTRIBUTES
-	FHash     [32]SID_HASH_ENTRY
-} /* winnt.h:2963:13 */
+	FSidCount    DWORD
+	F__ccgo_pad1 [4]byte
+	FSidAttr     PSID_AND_ATTRIBUTES
+	FHash        [32]SID_HASH_ENTRY
+} /* winnt.h:2964:13 */
 
-type SID_AND_ATTRIBUTES_HASH = _SID_AND_ATTRIBUTES_HASH /* winnt.h:2967:7 */
-type PSID_AND_ATTRIBUTES_HASH = uintptr                 /* winnt.h:2967:32 */
+type SID_AND_ATTRIBUTES_HASH = _SID_AND_ATTRIBUTES_HASH /* winnt.h:2968:7 */
+type PSID_AND_ATTRIBUTES_HASH = uintptr                 /* winnt.h:2968:32 */
 
-type WELL_KNOWN_SID_TYPE = uint32 /* winnt.h:3251:3 */
+type WELL_KNOWN_SID_TYPE = uint32 /* winnt.h:3256:3 */
 
 type _ACL = struct {
 	FAclRevision BYTE
@@ -33013,83 +33438,83 @@ type _ACL = struct {
 	FAclSize     WORD
 	FAceCount    WORD
 	FSbz2        WORD
-} /* winnt.h:3281:13 */
+} /* winnt.h:3286:13 */
 
-type ACL = _ACL     /* winnt.h:3287:7 */
-type PACL = uintptr /* winnt.h:3288:17 */
+type ACL = _ACL     /* winnt.h:3292:7 */
+type PACL = uintptr /* winnt.h:3293:17 */
 
 type _ACE_HEADER = struct {
 	FAceType  BYTE
 	FAceFlags BYTE
 	FAceSize  WORD
-} /* winnt.h:3290:13 */
+} /* winnt.h:3295:13 */
 
-type ACE_HEADER = _ACE_HEADER /* winnt.h:3294:7 */
-type PACE_HEADER = uintptr    /* winnt.h:3295:24 */
+type ACE_HEADER = _ACE_HEADER /* winnt.h:3299:7 */
+type PACE_HEADER = uintptr    /* winnt.h:3300:24 */
 
 type _ACCESS_ALLOWED_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3341:13 */
+} /* winnt.h:3346:13 */
 
-type ACCESS_ALLOWED_ACE = _ACCESS_ALLOWED_ACE /* winnt.h:3345:7 */
+type ACCESS_ALLOWED_ACE = _ACCESS_ALLOWED_ACE /* winnt.h:3350:7 */
 
-type PACCESS_ALLOWED_ACE = uintptr /* winnt.h:3347:32 */
+type PACCESS_ALLOWED_ACE = uintptr /* winnt.h:3352:32 */
 
 type _ACCESS_DENIED_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3349:13 */
+} /* winnt.h:3354:13 */
 
-type ACCESS_DENIED_ACE = _ACCESS_DENIED_ACE /* winnt.h:3353:7 */
-type PACCESS_DENIED_ACE = uintptr           /* winnt.h:3354:31 */
+type ACCESS_DENIED_ACE = _ACCESS_DENIED_ACE /* winnt.h:3358:7 */
+type PACCESS_DENIED_ACE = uintptr           /* winnt.h:3359:31 */
 
 type _SYSTEM_AUDIT_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3356:13 */
+} /* winnt.h:3361:13 */
 
-type SYSTEM_AUDIT_ACE = _SYSTEM_AUDIT_ACE /* winnt.h:3360:7 */
-type PSYSTEM_AUDIT_ACE = uintptr          /* winnt.h:3361:30 */
+type SYSTEM_AUDIT_ACE = _SYSTEM_AUDIT_ACE /* winnt.h:3365:7 */
+type PSYSTEM_AUDIT_ACE = uintptr          /* winnt.h:3366:30 */
 
 type _SYSTEM_ALARM_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3363:13 */
+} /* winnt.h:3368:13 */
 
-type SYSTEM_ALARM_ACE = _SYSTEM_ALARM_ACE /* winnt.h:3367:7 */
-type PSYSTEM_ALARM_ACE = uintptr          /* winnt.h:3368:30 */
+type SYSTEM_ALARM_ACE = _SYSTEM_ALARM_ACE /* winnt.h:3372:7 */
+type PSYSTEM_ALARM_ACE = uintptr          /* winnt.h:3373:30 */
 
 type _SYSTEM_RESOURCE_ATTRIBUTE_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3370:13 */
+} /* winnt.h:3375:13 */
 
-type SYSTEM_RESOURCE_ATTRIBUTE_ACE = _SYSTEM_RESOURCE_ATTRIBUTE_ACE /* winnt.h:3374:7 */
-type PSYSTEM_RESOURCE_ATTRIBUTE_ACE = uintptr                       /* winnt.h:3374:37 */
+type SYSTEM_RESOURCE_ATTRIBUTE_ACE = _SYSTEM_RESOURCE_ATTRIBUTE_ACE /* winnt.h:3379:7 */
+type PSYSTEM_RESOURCE_ATTRIBUTE_ACE = uintptr                       /* winnt.h:3379:37 */
 
 type _SYSTEM_SCOPED_POLICY_ID_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3376:13 */
+} /* winnt.h:3381:13 */
 
-type SYSTEM_SCOPED_POLICY_ID_ACE = _SYSTEM_SCOPED_POLICY_ID_ACE /* winnt.h:3380:7 */
-type PSYSTEM_SCOPED_POLICY_ID_ACE = uintptr                     /* winnt.h:3380:35 */
+type SYSTEM_SCOPED_POLICY_ID_ACE = _SYSTEM_SCOPED_POLICY_ID_ACE /* winnt.h:3385:7 */
+type PSYSTEM_SCOPED_POLICY_ID_ACE = uintptr                     /* winnt.h:3385:35 */
 
 type _SYSTEM_MANDATORY_LABEL_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3382:13 */
+} /* winnt.h:3387:13 */
 
-type SYSTEM_MANDATORY_LABEL_ACE = _SYSTEM_MANDATORY_LABEL_ACE /* winnt.h:3386:7 */
-type PSYSTEM_MANDATORY_LABEL_ACE = uintptr                    /* winnt.h:3386:35 */
+type SYSTEM_MANDATORY_LABEL_ACE = _SYSTEM_MANDATORY_LABEL_ACE /* winnt.h:3391:7 */
+type PSYSTEM_MANDATORY_LABEL_ACE = uintptr                    /* winnt.h:3391:35 */
 
 type _ACCESS_ALLOWED_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33098,10 +33523,10 @@ type _ACCESS_ALLOWED_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3394:13 */
+} /* winnt.h:3399:13 */
 
-type ACCESS_ALLOWED_OBJECT_ACE = _ACCESS_ALLOWED_OBJECT_ACE /* winnt.h:3401:7 */
-type PACCESS_ALLOWED_OBJECT_ACE = uintptr                   /* winnt.h:3401:33 */
+type ACCESS_ALLOWED_OBJECT_ACE = _ACCESS_ALLOWED_OBJECT_ACE /* winnt.h:3406:7 */
+type PACCESS_ALLOWED_OBJECT_ACE = uintptr                   /* winnt.h:3406:33 */
 
 type _ACCESS_DENIED_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33110,10 +33535,10 @@ type _ACCESS_DENIED_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3403:13 */
+} /* winnt.h:3408:13 */
 
-type ACCESS_DENIED_OBJECT_ACE = _ACCESS_DENIED_OBJECT_ACE /* winnt.h:3410:7 */
-type PACCESS_DENIED_OBJECT_ACE = uintptr                  /* winnt.h:3410:32 */
+type ACCESS_DENIED_OBJECT_ACE = _ACCESS_DENIED_OBJECT_ACE /* winnt.h:3415:7 */
+type PACCESS_DENIED_OBJECT_ACE = uintptr                  /* winnt.h:3415:32 */
 
 type _SYSTEM_AUDIT_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33122,10 +33547,10 @@ type _SYSTEM_AUDIT_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3412:13 */
+} /* winnt.h:3417:13 */
 
-type SYSTEM_AUDIT_OBJECT_ACE = _SYSTEM_AUDIT_OBJECT_ACE /* winnt.h:3419:7 */
-type PSYSTEM_AUDIT_OBJECT_ACE = uintptr                 /* winnt.h:3419:31 */
+type SYSTEM_AUDIT_OBJECT_ACE = _SYSTEM_AUDIT_OBJECT_ACE /* winnt.h:3424:7 */
+type PSYSTEM_AUDIT_OBJECT_ACE = uintptr                 /* winnt.h:3424:31 */
 
 type _SYSTEM_ALARM_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33134,46 +33559,46 @@ type _SYSTEM_ALARM_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3421:13 */
+} /* winnt.h:3426:13 */
 
-type SYSTEM_ALARM_OBJECT_ACE = _SYSTEM_ALARM_OBJECT_ACE /* winnt.h:3428:7 */
-type PSYSTEM_ALARM_OBJECT_ACE = uintptr                 /* winnt.h:3428:31 */
+type SYSTEM_ALARM_OBJECT_ACE = _SYSTEM_ALARM_OBJECT_ACE /* winnt.h:3433:7 */
+type PSYSTEM_ALARM_OBJECT_ACE = uintptr                 /* winnt.h:3433:31 */
 
 type _ACCESS_ALLOWED_CALLBACK_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3430:13 */
+} /* winnt.h:3435:13 */
 
-type ACCESS_ALLOWED_CALLBACK_ACE = _ACCESS_ALLOWED_CALLBACK_ACE /* winnt.h:3434:7 */
-type PACCESS_ALLOWED_CALLBACK_ACE = uintptr                     /* winnt.h:3434:35 */
+type ACCESS_ALLOWED_CALLBACK_ACE = _ACCESS_ALLOWED_CALLBACK_ACE /* winnt.h:3439:7 */
+type PACCESS_ALLOWED_CALLBACK_ACE = uintptr                     /* winnt.h:3439:35 */
 
 type _ACCESS_DENIED_CALLBACK_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3436:13 */
+} /* winnt.h:3441:13 */
 
-type ACCESS_DENIED_CALLBACK_ACE = _ACCESS_DENIED_CALLBACK_ACE /* winnt.h:3440:7 */
-type PACCESS_DENIED_CALLBACK_ACE = uintptr                    /* winnt.h:3440:34 */
+type ACCESS_DENIED_CALLBACK_ACE = _ACCESS_DENIED_CALLBACK_ACE /* winnt.h:3445:7 */
+type PACCESS_DENIED_CALLBACK_ACE = uintptr                    /* winnt.h:3445:34 */
 
 type _SYSTEM_AUDIT_CALLBACK_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3442:13 */
+} /* winnt.h:3447:13 */
 
-type SYSTEM_AUDIT_CALLBACK_ACE = _SYSTEM_AUDIT_CALLBACK_ACE /* winnt.h:3446:7 */
-type PSYSTEM_AUDIT_CALLBACK_ACE = uintptr                   /* winnt.h:3446:33 */
+type SYSTEM_AUDIT_CALLBACK_ACE = _SYSTEM_AUDIT_CALLBACK_ACE /* winnt.h:3451:7 */
+type PSYSTEM_AUDIT_CALLBACK_ACE = uintptr                   /* winnt.h:3451:33 */
 
 type _SYSTEM_ALARM_CALLBACK_ACE = struct {
 	FHeader   ACE_HEADER
 	FMask     ACCESS_MASK
 	FSidStart DWORD
-} /* winnt.h:3448:13 */
+} /* winnt.h:3453:13 */
 
-type SYSTEM_ALARM_CALLBACK_ACE = _SYSTEM_ALARM_CALLBACK_ACE /* winnt.h:3452:7 */
-type PSYSTEM_ALARM_CALLBACK_ACE = uintptr                   /* winnt.h:3452:33 */
+type SYSTEM_ALARM_CALLBACK_ACE = _SYSTEM_ALARM_CALLBACK_ACE /* winnt.h:3457:7 */
+type PSYSTEM_ALARM_CALLBACK_ACE = uintptr                   /* winnt.h:3457:33 */
 
 type _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33182,10 +33607,10 @@ type _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3454:13 */
+} /* winnt.h:3459:13 */
 
-type ACCESS_ALLOWED_CALLBACK_OBJECT_ACE = _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE /* winnt.h:3462:7 */
-type PACCESS_ALLOWED_CALLBACK_OBJECT_ACE = uintptr                            /* winnt.h:3462:42 */
+type ACCESS_ALLOWED_CALLBACK_OBJECT_ACE = _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE /* winnt.h:3467:7 */
+type PACCESS_ALLOWED_CALLBACK_OBJECT_ACE = uintptr                            /* winnt.h:3467:42 */
 
 type _ACCESS_DENIED_CALLBACK_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33194,10 +33619,10 @@ type _ACCESS_DENIED_CALLBACK_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3464:13 */
+} /* winnt.h:3469:13 */
 
-type ACCESS_DENIED_CALLBACK_OBJECT_ACE = _ACCESS_DENIED_CALLBACK_OBJECT_ACE /* winnt.h:3471:7 */
-type PACCESS_DENIED_CALLBACK_OBJECT_ACE = uintptr                           /* winnt.h:3471:41 */
+type ACCESS_DENIED_CALLBACK_OBJECT_ACE = _ACCESS_DENIED_CALLBACK_OBJECT_ACE /* winnt.h:3476:7 */
+type PACCESS_DENIED_CALLBACK_OBJECT_ACE = uintptr                           /* winnt.h:3476:41 */
 
 type _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33206,10 +33631,10 @@ type _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3473:13 */
+} /* winnt.h:3478:13 */
 
-type SYSTEM_AUDIT_CALLBACK_OBJECT_ACE = _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE /* winnt.h:3480:7 */
-type PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE = uintptr                          /* winnt.h:3480:40 */
+type SYSTEM_AUDIT_CALLBACK_OBJECT_ACE = _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE /* winnt.h:3485:7 */
+type PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE = uintptr                          /* winnt.h:3485:40 */
 
 type _SYSTEM_ALARM_CALLBACK_OBJECT_ACE = struct {
 	FHeader              ACE_HEADER
@@ -33218,29 +33643,29 @@ type _SYSTEM_ALARM_CALLBACK_OBJECT_ACE = struct {
 	FObjectType          GUID
 	FInheritedObjectType GUID
 	FSidStart            DWORD
-} /* winnt.h:3482:13 */
+} /* winnt.h:3487:13 */
 
-type SYSTEM_ALARM_CALLBACK_OBJECT_ACE = _SYSTEM_ALARM_CALLBACK_OBJECT_ACE /* winnt.h:3490:7 */
-type PSYSTEM_ALARM_CALLBACK_OBJECT_ACE = uintptr                          /* winnt.h:3490:40 */
+type SYSTEM_ALARM_CALLBACK_OBJECT_ACE = _SYSTEM_ALARM_CALLBACK_OBJECT_ACE /* winnt.h:3495:7 */
+type PSYSTEM_ALARM_CALLBACK_OBJECT_ACE = uintptr                          /* winnt.h:3495:40 */
 
-type ACL_INFORMATION_CLASS = uint32 /* winnt.h:3497:7 */
+type ACL_INFORMATION_CLASS = uint32 /* winnt.h:3502:7 */
 
-type _ACL_REVISION_INFORMATION = struct{ FAclRevision DWORD } /* winnt.h:3499:13 */
+type _ACL_REVISION_INFORMATION = struct{ FAclRevision DWORD } /* winnt.h:3504:13 */
 
-type ACL_REVISION_INFORMATION = _ACL_REVISION_INFORMATION /* winnt.h:3501:7 */
-type PACL_REVISION_INFORMATION = uintptr                  /* winnt.h:3502:38 */
+type ACL_REVISION_INFORMATION = _ACL_REVISION_INFORMATION /* winnt.h:3506:7 */
+type PACL_REVISION_INFORMATION = uintptr                  /* winnt.h:3507:38 */
 
 type _ACL_SIZE_INFORMATION = struct {
 	FAceCount      DWORD
 	FAclBytesInUse DWORD
 	FAclBytesFree  DWORD
-} /* winnt.h:3504:13 */
+} /* winnt.h:3509:13 */
 
-type ACL_SIZE_INFORMATION = _ACL_SIZE_INFORMATION /* winnt.h:3508:7 */
-type PACL_SIZE_INFORMATION = uintptr              /* winnt.h:3509:34 */
+type ACL_SIZE_INFORMATION = _ACL_SIZE_INFORMATION /* winnt.h:3513:7 */
+type PACL_SIZE_INFORMATION = uintptr              /* winnt.h:3514:34 */
 
-type SECURITY_DESCRIPTOR_CONTROL = WORD     /* winnt.h:3516:18 */
-type PSECURITY_DESCRIPTOR_CONTROL = uintptr /* winnt.h:3516:46 */
+type SECURITY_DESCRIPTOR_CONTROL = WORD     /* winnt.h:3521:18 */
+type PSECURITY_DESCRIPTOR_CONTROL = uintptr /* winnt.h:3521:46 */
 
 type _SECURITY_DESCRIPTOR_RELATIVE = struct {
 	FRevision BYTE
@@ -33250,79 +33675,79 @@ type _SECURITY_DESCRIPTOR_RELATIVE = struct {
 	FGroup    DWORD
 	FSacl     DWORD
 	FDacl     DWORD
-} /* winnt.h:3533:13 */
+} /* winnt.h:3538:13 */
 
-type SECURITY_DESCRIPTOR_RELATIVE = _SECURITY_DESCRIPTOR_RELATIVE /* winnt.h:3541:7 */
-type PISECURITY_DESCRIPTOR_RELATIVE = uintptr                     /* winnt.h:3541:36 */
+type SECURITY_DESCRIPTOR_RELATIVE = _SECURITY_DESCRIPTOR_RELATIVE /* winnt.h:3546:7 */
+type PISECURITY_DESCRIPTOR_RELATIVE = uintptr                     /* winnt.h:3546:36 */
 
 type _SECURITY_DESCRIPTOR = struct {
-	FRevision BYTE
-	FSbz1     BYTE
-	FControl  SECURITY_DESCRIPTOR_CONTROL
-	_         [4]byte
-	FOwner    PSID
-	FGroup    PSID
-	FSacl     PACL
-	FDacl     PACL
-} /* winnt.h:3543:13 */
+	FRevision    BYTE
+	FSbz1        BYTE
+	FControl     SECURITY_DESCRIPTOR_CONTROL
+	F__ccgo_pad1 [4]byte
+	FOwner       PSID
+	FGroup       PSID
+	FSacl        PACL
+	FDacl        PACL
+} /* winnt.h:3548:13 */
 
-type SECURITY_DESCRIPTOR = _SECURITY_DESCRIPTOR /* winnt.h:3551:7 */
-type PISECURITY_DESCRIPTOR = uintptr            /* winnt.h:3551:27 */
+type SECURITY_DESCRIPTOR = _SECURITY_DESCRIPTOR /* winnt.h:3556:7 */
+type PISECURITY_DESCRIPTOR = uintptr            /* winnt.h:3556:27 */
 
 type _OBJECT_TYPE_LIST = struct {
-	FLevel      WORD
-	FSbz        WORD
-	_           [4]byte
-	FObjectType uintptr
-} /* winnt.h:3553:13 */
+	FLevel       WORD
+	FSbz         WORD
+	F__ccgo_pad1 [4]byte
+	FObjectType  uintptr
+} /* winnt.h:3558:13 */
 
-type OBJECT_TYPE_LIST = _OBJECT_TYPE_LIST /* winnt.h:3557:7 */
-type POBJECT_TYPE_LIST = uintptr          /* winnt.h:3557:24 */
+type OBJECT_TYPE_LIST = _OBJECT_TYPE_LIST /* winnt.h:3562:7 */
+type POBJECT_TYPE_LIST = uintptr          /* winnt.h:3562:24 */
 
-type AUDIT_EVENT_TYPE = uint32   /* winnt.h:3567:7 */
-type PAUDIT_EVENT_TYPE = uintptr /* winnt.h:3567:24 */
+type AUDIT_EVENT_TYPE = uint32   /* winnt.h:3572:7 */
+type PAUDIT_EVENT_TYPE = uintptr /* winnt.h:3572:24 */
 
 type _PRIVILEGE_SET = struct {
 	FPrivilegeCount DWORD
 	FControl        DWORD
 	FPrivilege      [1]LUID_AND_ATTRIBUTES
-} /* winnt.h:3585:13 */
+} /* winnt.h:3590:13 */
 
-type PRIVILEGE_SET = _PRIVILEGE_SET /* winnt.h:3589:7 */
-type PPRIVILEGE_SET = uintptr       /* winnt.h:3589:21 */
+type PRIVILEGE_SET = _PRIVILEGE_SET /* winnt.h:3594:7 */
+type PPRIVILEGE_SET = uintptr       /* winnt.h:3594:21 */
 
-type ACCESS_REASON_TYPE = uint32 /* winnt.h:3614:7 */
-type ACCESS_REASON = DWORD       /* winnt.h:3615:19 */
+type ACCESS_REASON_TYPE = uint32 /* winnt.h:3619:7 */
+type ACCESS_REASON = DWORD       /* winnt.h:3620:19 */
 
-type _ACCESS_REASONS = struct{ FData [32]ACCESS_REASON } /* winnt.h:3617:13 */
+type _ACCESS_REASONS = struct{ FData [32]ACCESS_REASON } /* winnt.h:3622:13 */
 
-type ACCESS_REASONS = _ACCESS_REASONS /* winnt.h:3619:7 */
-type PACCESS_REASONS = uintptr        /* winnt.h:3619:22 */
+type ACCESS_REASONS = _ACCESS_REASONS /* winnt.h:3624:7 */
+type PACCESS_REASONS = uintptr        /* winnt.h:3624:22 */
 
 type _SE_SECURITY_DESCRIPTOR = struct {
 	FSize               DWORD
 	FFlags              DWORD
 	FSecurityDescriptor PSECURITY_DESCRIPTOR
-} /* winnt.h:3625:13 */
+} /* winnt.h:3630:13 */
 
-type SE_SECURITY_DESCRIPTOR = _SE_SECURITY_DESCRIPTOR /* winnt.h:3629:7 */
-type PSE_SECURITY_DESCRIPTOR = uintptr                /* winnt.h:3629:30 */
+type SE_SECURITY_DESCRIPTOR = _SE_SECURITY_DESCRIPTOR /* winnt.h:3634:7 */
+type PSE_SECURITY_DESCRIPTOR = uintptr                /* winnt.h:3634:30 */
 
 type _SE_ACCESS_REQUEST = struct {
 	FSize                    DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FSeSecurityDescriptor    PSE_SECURITY_DESCRIPTOR
 	FDesiredAccess           ACCESS_MASK
 	FPreviouslyGrantedAccess ACCESS_MASK
 	FPrincipalSelfSid        PSID
 	FGenericMapping          PGENERIC_MAPPING
 	FObjectTypeListCount     DWORD
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FObjectTypeList          POBJECT_TYPE_LIST
-} /* winnt.h:3631:13 */
+} /* winnt.h:3636:13 */
 
-type SE_ACCESS_REQUEST = _SE_ACCESS_REQUEST /* winnt.h:3640:7 */
-type PSE_ACCESS_REQUEST = uintptr           /* winnt.h:3640:25 */
+type SE_ACCESS_REQUEST = _SE_ACCESS_REQUEST /* winnt.h:3645:7 */
+type PSE_ACCESS_REQUEST = uintptr           /* winnt.h:3645:25 */
 
 type _SE_ACCESS_REPLY = struct {
 	FSize            DWORD
@@ -33331,69 +33756,69 @@ type _SE_ACCESS_REPLY = struct {
 	FAccessStatus    PDWORD
 	FAccessReason    PACCESS_REASONS
 	FPrivileges      uintptr
-} /* winnt.h:3642:13 */
+} /* winnt.h:3647:13 */
 
-type SE_ACCESS_REPLY = _SE_ACCESS_REPLY /* winnt.h:3649:7 */
-type PSE_ACCESS_REPLY = uintptr         /* winnt.h:3649:23 */
+type SE_ACCESS_REPLY = _SE_ACCESS_REPLY /* winnt.h:3654:7 */
+type PSE_ACCESS_REPLY = uintptr         /* winnt.h:3654:23 */
 
-type SECURITY_IMPERSONATION_LEVEL = uint32   /* winnt.h:3689:7 */
-type PSECURITY_IMPERSONATION_LEVEL = uintptr /* winnt.h:3689:36 */
+type SECURITY_IMPERSONATION_LEVEL = uint32   /* winnt.h:3694:7 */
+type PSECURITY_IMPERSONATION_LEVEL = uintptr /* winnt.h:3694:36 */
 
-type TOKEN_TYPE = uint32   /* winnt.h:3716:7 */
-type PTOKEN_TYPE = uintptr /* winnt.h:3717:24 */
+type TOKEN_TYPE = uint32   /* winnt.h:3721:7 */
+type PTOKEN_TYPE = uintptr /* winnt.h:3722:24 */
 
-type TOKEN_ELEVATION_TYPE = uint32   /* winnt.h:3723:7 */
-type PTOKEN_ELEVATION_TYPE = uintptr /* winnt.h:3723:29 */
+type TOKEN_ELEVATION_TYPE = uint32   /* winnt.h:3728:7 */
+type PTOKEN_ELEVATION_TYPE = uintptr /* winnt.h:3728:29 */
 
-type TOKEN_INFORMATION_CLASS = uint32   /* winnt.h:3767:7 */
-type PTOKEN_INFORMATION_CLASS = uintptr /* winnt.h:3767:31 */
+type TOKEN_INFORMATION_CLASS = uint32   /* winnt.h:3772:7 */
+type PTOKEN_INFORMATION_CLASS = uintptr /* winnt.h:3772:31 */
 
-type _TOKEN_USER = struct{ FUser SID_AND_ATTRIBUTES } /* winnt.h:3769:13 */
+type _TOKEN_USER = struct{ FUser SID_AND_ATTRIBUTES } /* winnt.h:3774:13 */
 
-type TOKEN_USER = _TOKEN_USER /* winnt.h:3771:7 */
-type PTOKEN_USER = uintptr    /* winnt.h:3771:18 */
+type TOKEN_USER = _TOKEN_USER /* winnt.h:3776:7 */
+type PTOKEN_USER = uintptr    /* winnt.h:3776:18 */
 
 type _TOKEN_GROUPS = struct {
-	FGroupCount DWORD
-	_           [4]byte
-	FGroups     [1]SID_AND_ATTRIBUTES
-} /* winnt.h:3773:13 */
+	FGroupCount  DWORD
+	F__ccgo_pad1 [4]byte
+	FGroups      [1]SID_AND_ATTRIBUTES
+} /* winnt.h:3778:13 */
 
-type TOKEN_GROUPS = _TOKEN_GROUPS /* winnt.h:3780:7 */
-type PTOKEN_GROUPS = uintptr      /* winnt.h:3780:20 */
+type TOKEN_GROUPS = _TOKEN_GROUPS /* winnt.h:3785:7 */
+type PTOKEN_GROUPS = uintptr      /* winnt.h:3785:20 */
 
 type _TOKEN_PRIVILEGES = struct {
 	FPrivilegeCount DWORD
 	FPrivileges     [1]LUID_AND_ATTRIBUTES
-} /* winnt.h:3782:13 */
+} /* winnt.h:3787:13 */
 
-type TOKEN_PRIVILEGES = _TOKEN_PRIVILEGES /* winnt.h:3785:7 */
-type PTOKEN_PRIVILEGES = uintptr          /* winnt.h:3785:24 */
+type TOKEN_PRIVILEGES = _TOKEN_PRIVILEGES /* winnt.h:3790:7 */
+type PTOKEN_PRIVILEGES = uintptr          /* winnt.h:3790:24 */
 
-type _TOKEN_OWNER = struct{ FOwner PSID } /* winnt.h:3787:13 */
+type _TOKEN_OWNER = struct{ FOwner PSID } /* winnt.h:3792:13 */
 
-type TOKEN_OWNER = _TOKEN_OWNER /* winnt.h:3789:7 */
-type PTOKEN_OWNER = uintptr     /* winnt.h:3789:19 */
+type TOKEN_OWNER = _TOKEN_OWNER /* winnt.h:3794:7 */
+type PTOKEN_OWNER = uintptr     /* winnt.h:3794:19 */
 
-type _TOKEN_PRIMARY_GROUP = struct{ FPrimaryGroup PSID } /* winnt.h:3791:13 */
+type _TOKEN_PRIMARY_GROUP = struct{ FPrimaryGroup PSID } /* winnt.h:3796:13 */
 
-type TOKEN_PRIMARY_GROUP = _TOKEN_PRIMARY_GROUP /* winnt.h:3793:7 */
-type PTOKEN_PRIMARY_GROUP = uintptr             /* winnt.h:3793:27 */
+type TOKEN_PRIMARY_GROUP = _TOKEN_PRIMARY_GROUP /* winnt.h:3798:7 */
+type PTOKEN_PRIMARY_GROUP = uintptr             /* winnt.h:3798:27 */
 
-type _TOKEN_DEFAULT_DACL = struct{ FDefaultDacl PACL } /* winnt.h:3795:13 */
+type _TOKEN_DEFAULT_DACL = struct{ FDefaultDacl PACL } /* winnt.h:3800:13 */
 
-type TOKEN_DEFAULT_DACL = _TOKEN_DEFAULT_DACL /* winnt.h:3797:7 */
-type PTOKEN_DEFAULT_DACL = uintptr            /* winnt.h:3797:26 */
+type TOKEN_DEFAULT_DACL = _TOKEN_DEFAULT_DACL /* winnt.h:3802:7 */
+type PTOKEN_DEFAULT_DACL = uintptr            /* winnt.h:3802:26 */
 
-type _TOKEN_USER_CLAIMS = struct{ FUserClaims PCLAIMS_BLOB } /* winnt.h:3799:13 */
+type _TOKEN_USER_CLAIMS = struct{ FUserClaims PCLAIMS_BLOB } /* winnt.h:3804:13 */
 
-type TOKEN_USER_CLAIMS = _TOKEN_USER_CLAIMS /* winnt.h:3801:7 */
-type PTOKEN_USER_CLAIMS = uintptr           /* winnt.h:3801:25 */
+type TOKEN_USER_CLAIMS = _TOKEN_USER_CLAIMS /* winnt.h:3806:7 */
+type PTOKEN_USER_CLAIMS = uintptr           /* winnt.h:3806:25 */
 
-type _TOKEN_DEVICE_CLAIMS = struct{ FDeviceClaims PCLAIMS_BLOB } /* winnt.h:3803:13 */
+type _TOKEN_DEVICE_CLAIMS = struct{ FDeviceClaims PCLAIMS_BLOB } /* winnt.h:3808:13 */
 
-type TOKEN_DEVICE_CLAIMS = _TOKEN_DEVICE_CLAIMS /* winnt.h:3805:7 */
-type PTOKEN_DEVICE_CLAIMS = uintptr             /* winnt.h:3805:27 */
+type TOKEN_DEVICE_CLAIMS = _TOKEN_DEVICE_CLAIMS /* winnt.h:3810:7 */
+type PTOKEN_DEVICE_CLAIMS = uintptr             /* winnt.h:3810:27 */
 
 type _TOKEN_GROUPS_AND_PRIVILEGES = struct {
 	FSidCount            DWORD
@@ -33406,30 +33831,30 @@ type _TOKEN_GROUPS_AND_PRIVILEGES = struct {
 	FPrivilegeLength     DWORD
 	FPrivileges          PLUID_AND_ATTRIBUTES
 	FAuthenticationId    LUID
-} /* winnt.h:3807:13 */
+} /* winnt.h:3812:13 */
 
-type TOKEN_GROUPS_AND_PRIVILEGES = _TOKEN_GROUPS_AND_PRIVILEGES /* winnt.h:3818:7 */
-type PTOKEN_GROUPS_AND_PRIVILEGES = uintptr                     /* winnt.h:3818:35 */
+type TOKEN_GROUPS_AND_PRIVILEGES = _TOKEN_GROUPS_AND_PRIVILEGES /* winnt.h:3823:7 */
+type PTOKEN_GROUPS_AND_PRIVILEGES = uintptr                     /* winnt.h:3823:35 */
 
-type _TOKEN_LINKED_TOKEN = struct{ FLinkedToken HANDLE } /* winnt.h:3820:13 */
+type _TOKEN_LINKED_TOKEN = struct{ FLinkedToken HANDLE } /* winnt.h:3825:13 */
 
-type TOKEN_LINKED_TOKEN = _TOKEN_LINKED_TOKEN /* winnt.h:3822:7 */
-type PTOKEN_LINKED_TOKEN = uintptr            /* winnt.h:3822:26 */
+type TOKEN_LINKED_TOKEN = _TOKEN_LINKED_TOKEN /* winnt.h:3827:7 */
+type PTOKEN_LINKED_TOKEN = uintptr            /* winnt.h:3827:26 */
 
-type _TOKEN_ELEVATION = struct{ FTokenIsElevated DWORD } /* winnt.h:3824:13 */
+type _TOKEN_ELEVATION = struct{ FTokenIsElevated DWORD } /* winnt.h:3829:13 */
 
-type TOKEN_ELEVATION = _TOKEN_ELEVATION /* winnt.h:3826:7 */
-type PTOKEN_ELEVATION = uintptr         /* winnt.h:3826:23 */
+type TOKEN_ELEVATION = _TOKEN_ELEVATION /* winnt.h:3831:7 */
+type PTOKEN_ELEVATION = uintptr         /* winnt.h:3831:23 */
 
-type _TOKEN_MANDATORY_LABEL = struct{ FLabel SID_AND_ATTRIBUTES } /* winnt.h:3828:13 */
+type _TOKEN_MANDATORY_LABEL = struct{ FLabel SID_AND_ATTRIBUTES } /* winnt.h:3833:13 */
 
-type TOKEN_MANDATORY_LABEL = _TOKEN_MANDATORY_LABEL /* winnt.h:3830:7 */
-type PTOKEN_MANDATORY_LABEL = uintptr               /* winnt.h:3830:29 */
+type TOKEN_MANDATORY_LABEL = _TOKEN_MANDATORY_LABEL /* winnt.h:3835:7 */
+type PTOKEN_MANDATORY_LABEL = uintptr               /* winnt.h:3835:29 */
 
-type _TOKEN_MANDATORY_POLICY = struct{ FPolicy DWORD } /* winnt.h:3838:13 */
+type _TOKEN_MANDATORY_POLICY = struct{ FPolicy DWORD } /* winnt.h:3843:13 */
 
-type TOKEN_MANDATORY_POLICY = _TOKEN_MANDATORY_POLICY /* winnt.h:3840:7 */
-type PTOKEN_MANDATORY_POLICY = uintptr                /* winnt.h:3840:30 */
+type TOKEN_MANDATORY_POLICY = _TOKEN_MANDATORY_POLICY /* winnt.h:3845:7 */
+type PTOKEN_MANDATORY_POLICY = uintptr                /* winnt.h:3845:30 */
 
 type _TOKEN_ACCESS_INFORMATION = struct {
 	FSidHash            PSID_AND_ATTRIBUTES_HASH
@@ -33441,26 +33866,26 @@ type _TOKEN_ACCESS_INFORMATION = struct {
 	FMandatoryPolicy    TOKEN_MANDATORY_POLICY
 	FFlags              DWORD
 	FAppContainerNumber DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FPackageSid         PSID
 	FCapabilitiesHash   PSID_AND_ATTRIBUTES_HASH
-} /* winnt.h:3842:13 */
+} /* winnt.h:3847:13 */
 
-type TOKEN_ACCESS_INFORMATION = _TOKEN_ACCESS_INFORMATION /* winnt.h:3854:7 */
-type PTOKEN_ACCESS_INFORMATION = uintptr                  /* winnt.h:3854:32 */
+type TOKEN_ACCESS_INFORMATION = _TOKEN_ACCESS_INFORMATION /* winnt.h:3859:7 */
+type PTOKEN_ACCESS_INFORMATION = uintptr                  /* winnt.h:3859:32 */
 
-type _TOKEN_AUDIT_POLICY = struct{ FPerUserPolicy [29]UCHAR } /* winnt.h:3858:13 */
+type _TOKEN_AUDIT_POLICY = struct{ FPerUserPolicy [29]UCHAR } /* winnt.h:3863:13 */
 
-type TOKEN_AUDIT_POLICY = _TOKEN_AUDIT_POLICY /* winnt.h:3860:7 */
-type PTOKEN_AUDIT_POLICY = uintptr            /* winnt.h:3860:27 */
+type TOKEN_AUDIT_POLICY = _TOKEN_AUDIT_POLICY /* winnt.h:3865:7 */
+type PTOKEN_AUDIT_POLICY = uintptr            /* winnt.h:3865:27 */
 
 type _TOKEN_SOURCE = struct {
 	FSourceName       [8]CHAR
 	FSourceIdentifier LUID
-} /* winnt.h:3864:13 */
+} /* winnt.h:3869:13 */
 
-type TOKEN_SOURCE = _TOKEN_SOURCE /* winnt.h:3867:7 */
-type PTOKEN_SOURCE = uintptr      /* winnt.h:3867:20 */
+type TOKEN_SOURCE = _TOKEN_SOURCE /* winnt.h:3872:7 */
+type PTOKEN_SOURCE = uintptr      /* winnt.h:3872:20 */
 
 type _TOKEN_STATISTICS = struct {
 	FTokenId            LUID
@@ -33473,63 +33898,63 @@ type _TOKEN_STATISTICS = struct {
 	FGroupCount         DWORD
 	FPrivilegeCount     DWORD
 	FModifiedId         LUID
-} /* winnt.h:3869:13 */
+} /* winnt.h:3874:13 */
 
-type TOKEN_STATISTICS = _TOKEN_STATISTICS /* winnt.h:3880:7 */
-type PTOKEN_STATISTICS = uintptr          /* winnt.h:3880:24 */
+type TOKEN_STATISTICS = _TOKEN_STATISTICS /* winnt.h:3885:7 */
+type PTOKEN_STATISTICS = uintptr          /* winnt.h:3885:24 */
 
 type _TOKEN_CONTROL = struct {
 	FTokenId          LUID
 	FAuthenticationId LUID
 	FModifiedId       LUID
 	FTokenSource      TOKEN_SOURCE
-} /* winnt.h:3882:13 */
+} /* winnt.h:3887:13 */
 
-type TOKEN_CONTROL = _TOKEN_CONTROL /* winnt.h:3887:7 */
-type PTOKEN_CONTROL = uintptr       /* winnt.h:3887:21 */
+type TOKEN_CONTROL = _TOKEN_CONTROL /* winnt.h:3892:7 */
+type PTOKEN_CONTROL = uintptr       /* winnt.h:3892:21 */
 
-type _TOKEN_ORIGIN = struct{ FOriginatingLogonSession LUID } /* winnt.h:3889:13 */
+type _TOKEN_ORIGIN = struct{ FOriginatingLogonSession LUID } /* winnt.h:3894:13 */
 
-type TOKEN_ORIGIN = _TOKEN_ORIGIN /* winnt.h:3891:7 */
-type PTOKEN_ORIGIN = uintptr      /* winnt.h:3891:20 */
+type TOKEN_ORIGIN = _TOKEN_ORIGIN /* winnt.h:3896:7 */
+type PTOKEN_ORIGIN = uintptr      /* winnt.h:3896:20 */
 
-type MANDATORY_LEVEL = uint32   /* winnt.h:3901:7 */
-type PMANDATORY_LEVEL = uintptr /* winnt.h:3901:23 */
+type MANDATORY_LEVEL = uint32   /* winnt.h:3906:7 */
+type PMANDATORY_LEVEL = uintptr /* winnt.h:3906:23 */
 
-type _TOKEN_APPCONTAINER_INFORMATION = struct{ FTokenAppContainer PSID } /* winnt.h:3903:13 */
+type _TOKEN_APPCONTAINER_INFORMATION = struct{ FTokenAppContainer PSID } /* winnt.h:3908:13 */
 
-type TOKEN_APPCONTAINER_INFORMATION = _TOKEN_APPCONTAINER_INFORMATION /* winnt.h:3905:7 */
-type PTOKEN_APPCONTAINER_INFORMATION = uintptr                        /* winnt.h:3905:38 */
+type TOKEN_APPCONTAINER_INFORMATION = _TOKEN_APPCONTAINER_INFORMATION /* winnt.h:3910:7 */
+type PTOKEN_APPCONTAINER_INFORMATION = uintptr                        /* winnt.h:3910:38 */
 
 type _CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = struct {
 	FVersion DWORD64
 	FName    PWSTR
-} /* winnt.h:3915:13 */
+} /* winnt.h:3920:13 */
 
-type CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = _CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE /* winnt.h:3918:7 */
-type PCLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = uintptr                             /* winnt.h:3918:43 */
+type CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = _CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE /* winnt.h:3923:7 */
+type PCLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = uintptr                             /* winnt.h:3923:43 */
 
 type _CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE = struct {
 	FpValue      PVOID
 	FValueLength DWORD
-	_            [4]byte
-} /* winnt.h:3920:13 */
+	F__ccgo_pad1 [4]byte
+} /* winnt.h:3925:13 */
 
-type CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE = _CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE /* winnt.h:3923:7 */
-type PCLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE = uintptr                                     /* winnt.h:3923:52 */
+type CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE = _CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE /* winnt.h:3928:7 */
+type PCLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE = uintptr                                     /* winnt.h:3928:52 */
 
 type _CLAIM_SECURITY_ATTRIBUTE_V1 = struct {
-	FName       PWSTR
-	FValueType  WORD
-	FReserved   WORD
-	FFlags      DWORD
-	FValueCount DWORD
-	_           [4]byte
-	FValues     struct{ FpInt64 PLONG64 }
-} /* winnt.h:3936:13 */
+	FName        PWSTR
+	FValueType   WORD
+	FReserved    WORD
+	FFlags       DWORD
+	FValueCount  DWORD
+	F__ccgo_pad1 [4]byte
+	FValues      struct{ FpInt64 PLONG64 }
+} /* winnt.h:3941:13 */
 
-type CLAIM_SECURITY_ATTRIBUTE_V1 = _CLAIM_SECURITY_ATTRIBUTE_V1 /* winnt.h:3949:7 */
-type PCLAIM_SECURITY_ATTRIBUTE_V1 = uintptr                     /* winnt.h:3949:35 */
+type CLAIM_SECURITY_ATTRIBUTE_V1 = _CLAIM_SECURITY_ATTRIBUTE_V1 /* winnt.h:3954:7 */
+type PCLAIM_SECURITY_ATTRIBUTE_V1 = uintptr                     /* winnt.h:3954:35 */
 
 type _CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = struct {
 	FName       DWORD
@@ -33538,82 +33963,82 @@ type _CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = struct {
 	FFlags      DWORD
 	FValueCount DWORD
 	FValues     struct{ FpInt64 [1]DWORD }
-} /* winnt.h:3951:13 */
+} /* winnt.h:3956:13 */
 
-type CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = _CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 /* winnt.h:3964:7 */
-type PCLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = uintptr                              /* winnt.h:3964:44 */
+type CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = _CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 /* winnt.h:3969:7 */
+type PCLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = uintptr                              /* winnt.h:3969:44 */
 
 type _CLAIM_SECURITY_ATTRIBUTES_INFORMATION = struct {
 	FVersion        WORD
 	FReserved       WORD
 	FAttributeCount DWORD
 	FAttribute      struct{ FpAttributeV1 PCLAIM_SECURITY_ATTRIBUTE_V1 }
-} /* winnt.h:3970:13 */
+} /* winnt.h:3975:13 */
 
-type CLAIM_SECURITY_ATTRIBUTES_INFORMATION = _CLAIM_SECURITY_ATTRIBUTES_INFORMATION /* winnt.h:3977:7 */
-type PCLAIM_SECURITY_ATTRIBUTES_INFORMATION = uintptr                               /* winnt.h:3977:45 */
+type CLAIM_SECURITY_ATTRIBUTES_INFORMATION = _CLAIM_SECURITY_ATTRIBUTES_INFORMATION /* winnt.h:3982:7 */
+type PCLAIM_SECURITY_ATTRIBUTES_INFORMATION = uintptr                               /* winnt.h:3982:45 */
 
-type SECURITY_CONTEXT_TRACKING_MODE = BOOLEAN  /* winnt.h:3982:21 */
-type PSECURITY_CONTEXT_TRACKING_MODE = uintptr /* winnt.h:3982:52 */
+type SECURITY_CONTEXT_TRACKING_MODE = BOOLEAN  /* winnt.h:3987:21 */
+type PSECURITY_CONTEXT_TRACKING_MODE = uintptr /* winnt.h:3987:52 */
 
 type _SECURITY_QUALITY_OF_SERVICE = struct {
 	FLength              DWORD
 	FImpersonationLevel  SECURITY_IMPERSONATION_LEVEL
 	FContextTrackingMode SECURITY_CONTEXT_TRACKING_MODE
 	FEffectiveOnly       BOOLEAN
-	_                    [2]byte
-} /* winnt.h:3984:13 */
+	F__ccgo_pad1         [2]byte
+} /* winnt.h:3989:13 */
 
-type SECURITY_QUALITY_OF_SERVICE = _SECURITY_QUALITY_OF_SERVICE /* winnt.h:3989:7 */
-type PSECURITY_QUALITY_OF_SERVICE = uintptr                     /* winnt.h:3989:35 */
+type SECURITY_QUALITY_OF_SERVICE = _SECURITY_QUALITY_OF_SERVICE /* winnt.h:3994:7 */
+type PSECURITY_QUALITY_OF_SERVICE = uintptr                     /* winnt.h:3994:35 */
 
 type _SE_IMPERSONATION_STATE = struct {
 	FToken         PACCESS_TOKEN
 	FCopyOnOpen    BOOLEAN
 	FEffectiveOnly BOOLEAN
-	_              [2]byte
+	F__ccgo_pad1   [2]byte
 	FLevel         SECURITY_IMPERSONATION_LEVEL
-} /* winnt.h:3991:13 */
+} /* winnt.h:3996:13 */
 
-type SE_IMPERSONATION_STATE = _SE_IMPERSONATION_STATE /* winnt.h:3996:7 */
-type PSE_IMPERSONATION_STATE = uintptr                /* winnt.h:3996:30 */
+type SE_IMPERSONATION_STATE = _SE_IMPERSONATION_STATE /* winnt.h:4001:7 */
+type PSE_IMPERSONATION_STATE = uintptr                /* winnt.h:4001:30 */
 
-type SECURITY_INFORMATION = DWORD    /* winnt.h:4003:19 */
-type PSECURITY_INFORMATION = uintptr /* winnt.h:4003:40 */
+type SECURITY_INFORMATION = DWORD    /* winnt.h:4008:19 */
+type PSECURITY_INFORMATION = uintptr /* winnt.h:4008:40 */
 
-type SE_LEARNING_MODE_DATA_TYPE = uint32 /* winnt.h:4023:7 */
+type SE_LEARNING_MODE_DATA_TYPE = uint32 /* winnt.h:4028:7 */
 
 type _SECURITY_CAPABILITIES = struct {
 	FAppContainerSid PSID
 	FCapabilities    PSID_AND_ATTRIBUTES
 	FCapabilityCount DWORD
 	FReserved        DWORD
-} /* winnt.h:4027:13 */
+} /* winnt.h:4032:13 */
 
-type SECURITY_CAPABILITIES = _SECURITY_CAPABILITIES /* winnt.h:4032:7 */
-type PSECURITY_CAPABILITIES = uintptr               /* winnt.h:4032:29 */
-type LPSECURITY_CAPABILITIES = uintptr              /* winnt.h:4032:53 */
+type SECURITY_CAPABILITIES = _SECURITY_CAPABILITIES /* winnt.h:4037:7 */
+type PSECURITY_CAPABILITIES = uintptr               /* winnt.h:4037:29 */
+type LPSECURITY_CAPABILITIES = uintptr              /* winnt.h:4037:53 */
 
 type _JOB_SET_ARRAY = struct {
 	FJobHandle   HANDLE
 	FMemberLevel DWORD
 	FFlags       DWORD
-} /* winnt.h:4087:13 */
+} /* winnt.h:4092:13 */
 
-type JOB_SET_ARRAY = _JOB_SET_ARRAY /* winnt.h:4091:7 */
-type PJOB_SET_ARRAY = uintptr       /* winnt.h:4091:21 */
+type JOB_SET_ARRAY = _JOB_SET_ARRAY /* winnt.h:4096:7 */
+type PJOB_SET_ARRAY = uintptr       /* winnt.h:4096:21 */
 
 type _EXCEPTION_REGISTRATION_RECORD = struct {
 	F__0 struct{ FNext uintptr }
 	F__8 struct{ FHandler PEXCEPTION_ROUTINE }
-} /* winnt.h:4097:13 */
+} /* winnt.h:4102:13 */
 
-type EXCEPTION_REGISTRATION_RECORD = _EXCEPTION_REGISTRATION_RECORD /* winnt.h:4106:7 */
+type EXCEPTION_REGISTRATION_RECORD = _EXCEPTION_REGISTRATION_RECORD /* winnt.h:4111:7 */
 
-type PEXCEPTION_REGISTRATION_RECORD = uintptr /* winnt.h:4108:43 */
+type PEXCEPTION_REGISTRATION_RECORD = uintptr /* winnt.h:4113:43 */
 
-type EXCEPTION_REGISTRATION = EXCEPTION_REGISTRATION_RECORD   /* winnt.h:4110:43 */
-type PEXCEPTION_REGISTRATION = PEXCEPTION_REGISTRATION_RECORD /* winnt.h:4111:44 */
+type EXCEPTION_REGISTRATION = EXCEPTION_REGISTRATION_RECORD   /* winnt.h:4115:43 */
+type PEXCEPTION_REGISTRATION = PEXCEPTION_REGISTRATION_RECORD /* winnt.h:4116:44 */
 
 type _NT_TIB = struct {
 	FExceptionList        uintptr
@@ -33623,10 +34048,10 @@ type _NT_TIB = struct {
 	F__32                 struct{ FFiberData PVOID }
 	FArbitraryUserPointer PVOID
 	FSelf                 uintptr
-} /* winnt.h:4116:28 */
+} /* winnt.h:4121:28 */
 
-type NT_TIB = _NT_TIB  /* winnt.h:4127:7 */
-type PNT_TIB = uintptr /* winnt.h:4128:20 */
+type NT_TIB = _NT_TIB  /* winnt.h:4132:7 */
+type PNT_TIB = uintptr /* winnt.h:4133:20 */
 
 type _NT_TIB32 = struct {
 	FExceptionList        DWORD
@@ -33636,10 +34061,10 @@ type _NT_TIB32 = struct {
 	F__16                 struct{ FFiberData DWORD }
 	FArbitraryUserPointer DWORD
 	FSelf                 DWORD
-} /* winnt.h:4131:28 */
+} /* winnt.h:4136:28 */
 
-type NT_TIB32 = _NT_TIB32 /* winnt.h:4142:7 */
-type PNT_TIB32 = uintptr  /* winnt.h:4142:16 */
+type NT_TIB32 = _NT_TIB32 /* winnt.h:4147:7 */
+type PNT_TIB32 = uintptr  /* winnt.h:4147:16 */
 
 type _NT_TIB64 = struct {
 	FExceptionList        DWORD64
@@ -33649,20 +34074,20 @@ type _NT_TIB64 = struct {
 	F__32                 struct{ FFiberData DWORD64 }
 	FArbitraryUserPointer DWORD64
 	FSelf                 DWORD64
-} /* winnt.h:4144:28 */
+} /* winnt.h:4149:28 */
 
-type NT_TIB64 = _NT_TIB64 /* winnt.h:4155:7 */
-type PNT_TIB64 = uintptr  /* winnt.h:4155:16 */
+type NT_TIB64 = _NT_TIB64 /* winnt.h:4160:7 */
+type PNT_TIB64 = uintptr  /* winnt.h:4160:16 */
 
 type _UMS_CREATE_THREAD_ATTRIBUTES = struct {
 	FUmsVersion        DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FUmsContext        PVOID
 	FUmsCompletionList PVOID
-} /* winnt.h:4166:13 */
+} /* winnt.h:4171:13 */
 
-type UMS_CREATE_THREAD_ATTRIBUTES = _UMS_CREATE_THREAD_ATTRIBUTES /* winnt.h:4170:7 */
-type PUMS_CREATE_THREAD_ATTRIBUTES = uintptr                      /* winnt.h:4170:36 */
+type UMS_CREATE_THREAD_ATTRIBUTES = _UMS_CREATE_THREAD_ATTRIBUTES /* winnt.h:4175:7 */
+type PUMS_CREATE_THREAD_ATTRIBUTES = uintptr                      /* winnt.h:4175:36 */
 
 type _QUOTA_LIMITS = struct {
 	FPagedPoolLimit        SIZE_T
@@ -33671,15 +34096,15 @@ type _QUOTA_LIMITS = struct {
 	FMaximumWorkingSetSize SIZE_T
 	FPagefileLimit         SIZE_T
 	FTimeLimit             LARGE_INTEGER
-} /* winnt.h:4172:13 */
+} /* winnt.h:4177:13 */
 
-type QUOTA_LIMITS = _QUOTA_LIMITS /* winnt.h:4179:7 */
-type PQUOTA_LIMITS = uintptr      /* winnt.h:4179:20 */
+type QUOTA_LIMITS = _QUOTA_LIMITS /* winnt.h:4184:7 */
+type PQUOTA_LIMITS = uintptr      /* winnt.h:4184:20 */
 
-type _RATE_QUOTA_LIMIT = struct{ FRateData DWORD } /* winnt.h:4187:13 */
+type _RATE_QUOTA_LIMIT = struct{ FRateData DWORD } /* winnt.h:4192:13 */
 
-type RATE_QUOTA_LIMIT = _RATE_QUOTA_LIMIT /* winnt.h:4193:7 */
-type PRATE_QUOTA_LIMIT = uintptr          /* winnt.h:4193:25 */
+type RATE_QUOTA_LIMIT = _RATE_QUOTA_LIMIT /* winnt.h:4198:7 */
+type PRATE_QUOTA_LIMIT = uintptr          /* winnt.h:4198:25 */
 
 type _QUOTA_LIMITS_EX = struct {
 	FPagedPoolLimit        SIZE_T
@@ -33694,10 +34119,10 @@ type _QUOTA_LIMITS_EX = struct {
 	FReserved4             SIZE_T
 	FFlags                 DWORD
 	FCpuRateLimit          RATE_QUOTA_LIMIT
-} /* winnt.h:4195:13 */
+} /* winnt.h:4200:13 */
 
-type QUOTA_LIMITS_EX = _QUOTA_LIMITS_EX /* winnt.h:4208:7 */
-type PQUOTA_LIMITS_EX = uintptr         /* winnt.h:4208:23 */
+type QUOTA_LIMITS_EX = _QUOTA_LIMITS_EX /* winnt.h:4213:7 */
+type PQUOTA_LIMITS_EX = uintptr         /* winnt.h:4213:23 */
 
 type _IO_COUNTERS = struct {
 	FReadOperationCount  ULONGLONG
@@ -33706,75 +34131,75 @@ type _IO_COUNTERS = struct {
 	FReadTransferCount   ULONGLONG
 	FWriteTransferCount  ULONGLONG
 	FOtherTransferCount  ULONGLONG
-} /* winnt.h:4210:13 */
+} /* winnt.h:4215:13 */
 
-type IO_COUNTERS = _IO_COUNTERS /* winnt.h:4217:7 */
-type PIO_COUNTERS = uintptr     /* winnt.h:4218:25 */
+type IO_COUNTERS = _IO_COUNTERS /* winnt.h:4222:7 */
+type PIO_COUNTERS = uintptr     /* winnt.h:4223:25 */
 
-type HARDWARE_COUNTER_TYPE = uint32   /* winnt.h:4226:7 */
-type PHARDWARE_COUNTER_TYPE = uintptr /* winnt.h:4226:30 */
+type HARDWARE_COUNTER_TYPE = uint32   /* winnt.h:4231:7 */
+type PHARDWARE_COUNTER_TYPE = uintptr /* winnt.h:4231:30 */
 
-type PROCESS_MITIGATION_POLICY = uint32   /* winnt.h:4241:7 */
-type PPROCESS_MITIGATION_POLICY = uintptr /* winnt.h:4241:33 */
+type PROCESS_MITIGATION_POLICY = uint32   /* winnt.h:4246:7 */
+type PPROCESS_MITIGATION_POLICY = uintptr /* winnt.h:4246:33 */
 
-type _PROCESS_MITIGATION_ASLR_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4243:13 */
+type _PROCESS_MITIGATION_ASLR_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4248:13 */
 
-type PROCESS_MITIGATION_ASLR_POLICY = _PROCESS_MITIGATION_ASLR_POLICY /* winnt.h:4254:7 */
-type PPROCESS_MITIGATION_ASLR_POLICY = uintptr                        /* winnt.h:4254:38 */
+type PROCESS_MITIGATION_ASLR_POLICY = _PROCESS_MITIGATION_ASLR_POLICY /* winnt.h:4259:7 */
+type PPROCESS_MITIGATION_ASLR_POLICY = uintptr                        /* winnt.h:4259:38 */
 
 type _PROCESS_MITIGATION_DEP_POLICY = struct {
-	F__0       struct{ FFlags DWORD }
-	FPermanent BOOLEAN
-	_          [3]byte
-} /* winnt.h:4256:13 */
+	F__0         struct{ FFlags DWORD }
+	FPermanent   BOOLEAN
+	F__ccgo_pad1 [3]byte
+} /* winnt.h:4261:13 */
 
-type PROCESS_MITIGATION_DEP_POLICY = _PROCESS_MITIGATION_DEP_POLICY /* winnt.h:4266:7 */
-type PPROCESS_MITIGATION_DEP_POLICY = uintptr                       /* winnt.h:4266:37 */
+type PROCESS_MITIGATION_DEP_POLICY = _PROCESS_MITIGATION_DEP_POLICY /* winnt.h:4271:7 */
+type PPROCESS_MITIGATION_DEP_POLICY = uintptr                       /* winnt.h:4271:37 */
 
-type _PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4268:13 */
+type _PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4273:13 */
 
-type PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = _PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY /* winnt.h:4277:7 */
-type PPROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = uintptr                                       /* winnt.h:4277:53 */
+type PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = _PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY /* winnt.h:4282:7 */
+type PPROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY = uintptr                                       /* winnt.h:4282:53 */
 
-type _PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4279:13 */
+type _PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4284:13 */
 
-type PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = _PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY /* winnt.h:4287:7 */
-type PPROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = uintptr                                       /* winnt.h:4287:53 */
+type PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = _PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY /* winnt.h:4292:7 */
+type PPROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY = uintptr                                       /* winnt.h:4292:53 */
 
-type _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4289:13 */
+type _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4294:13 */
 
-type PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY /* winnt.h:4297:7 */
-type PPROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = uintptr                                           /* winnt.h:4297:57 */
+type PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY /* winnt.h:4302:7 */
+type PPROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY = uintptr                                           /* winnt.h:4302:57 */
 
-type _PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4299:13 */
+type _PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4304:13 */
 
-type PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = _PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY /* winnt.h:4309:7 */
-type PPROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = uintptr                                      /* winnt.h:4309:53 */
+type PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = _PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY /* winnt.h:4314:7 */
+type PPROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY = uintptr                                      /* winnt.h:4314:53 */
 
-type _PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4311:13 */
+type _PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4316:13 */
 
-type PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = _PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY /* winnt.h:4321:7 */
-type PPROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = uintptr                                    /* winnt.h:4321:51 */
+type PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = _PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY /* winnt.h:4326:7 */
+type PPROCESS_MITIGATION_BINARY_SIGNATURE_POLICY = uintptr                                    /* winnt.h:4326:51 */
 
 type _PROCESS_MITIGATION_DYNAMIC_CODE_POLICY = struct {
 	F__0 struct {
-		FFlags DWORD
-		_      [4]byte
+		FFlags       DWORD
+		F__ccgo_pad1 [4]byte
 	}
-} /* winnt.h:4323:13 */
+} /* winnt.h:4328:13 */
 
-type PROCESS_MITIGATION_DYNAMIC_CODE_POLICY = _PROCESS_MITIGATION_DYNAMIC_CODE_POLICY /* winnt.h:4333:7 */
-type PPROCESS_MITIGATION_DYNAMIC_CODE_POLICY = uintptr                                /* winnt.h:4333:47 */
+type PROCESS_MITIGATION_DYNAMIC_CODE_POLICY = _PROCESS_MITIGATION_DYNAMIC_CODE_POLICY /* winnt.h:4338:7 */
+type PPROCESS_MITIGATION_DYNAMIC_CODE_POLICY = uintptr                                /* winnt.h:4338:47 */
 
-type _PROCESS_MITIGATION_FONT_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4335:13 */
+type _PROCESS_MITIGATION_FONT_DISABLE_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4340:13 */
 
-type PROCESS_MITIGATION_FONT_DISABLE_POLICY = _PROCESS_MITIGATION_FONT_DISABLE_POLICY /* winnt.h:4344:7 */
-type PPROCESS_MITIGATION_FONT_DISABLE_POLICY = uintptr                                /* winnt.h:4344:47 */
+type PROCESS_MITIGATION_FONT_DISABLE_POLICY = _PROCESS_MITIGATION_FONT_DISABLE_POLICY /* winnt.h:4349:7 */
+type PPROCESS_MITIGATION_FONT_DISABLE_POLICY = uintptr                                /* winnt.h:4349:47 */
 
-type _PROCESS_MITIGATION_IMAGE_LOAD_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4346:13 */
+type _PROCESS_MITIGATION_IMAGE_LOAD_POLICY = struct{ F__0 struct{ FFlags DWORD } } /* winnt.h:4351:13 */
 
-type PROCESS_MITIGATION_IMAGE_LOAD_POLICY = _PROCESS_MITIGATION_IMAGE_LOAD_POLICY /* winnt.h:4356:7 */
-type PPROCESS_MITIGATION_IMAGE_LOAD_POLICY = uintptr                              /* winnt.h:4356:45 */
+type PROCESS_MITIGATION_IMAGE_LOAD_POLICY = _PROCESS_MITIGATION_IMAGE_LOAD_POLICY /* winnt.h:4361:7 */
+type PPROCESS_MITIGATION_IMAGE_LOAD_POLICY = uintptr                              /* winnt.h:4361:45 */
 
 type _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION = struct {
 	FTotalUserTime             LARGE_INTEGER
@@ -33785,27 +34210,27 @@ type _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION = struct {
 	FTotalProcesses            DWORD
 	FActiveProcesses           DWORD
 	FTotalTerminatedProcesses  DWORD
-} /* winnt.h:4358:13 */
+} /* winnt.h:4363:13 */
 
-type JOBOBJECT_BASIC_ACCOUNTING_INFORMATION = _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION /* winnt.h:4367:7 */
-type PJOBOBJECT_BASIC_ACCOUNTING_INFORMATION = uintptr                                /* winnt.h:4367:46 */
+type JOBOBJECT_BASIC_ACCOUNTING_INFORMATION = _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION /* winnt.h:4372:7 */
+type PJOBOBJECT_BASIC_ACCOUNTING_INFORMATION = uintptr                                /* winnt.h:4372:46 */
 
 type _JOBOBJECT_BASIC_LIMIT_INFORMATION = struct {
 	FPerProcessUserTimeLimit LARGE_INTEGER
 	FPerJobUserTimeLimit     LARGE_INTEGER
 	FLimitFlags              DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FMinimumWorkingSetSize   SIZE_T
 	FMaximumWorkingSetSize   SIZE_T
 	FActiveProcessLimit      DWORD
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FAffinity                ULONG_PTR
 	FPriorityClass           DWORD
 	FSchedulingClass         DWORD
-} /* winnt.h:4369:13 */
+} /* winnt.h:4374:13 */
 
-type JOBOBJECT_BASIC_LIMIT_INFORMATION = _JOBOBJECT_BASIC_LIMIT_INFORMATION /* winnt.h:4379:7 */
-type PJOBOBJECT_BASIC_LIMIT_INFORMATION = uintptr                           /* winnt.h:4379:41 */
+type JOBOBJECT_BASIC_LIMIT_INFORMATION = _JOBOBJECT_BASIC_LIMIT_INFORMATION /* winnt.h:4384:7 */
+type PJOBOBJECT_BASIC_LIMIT_INFORMATION = uintptr                           /* winnt.h:4384:41 */
 
 type _JOBOBJECT_EXTENDED_LIMIT_INFORMATION = struct {
 	FBasicLimitInformation JOBOBJECT_BASIC_LIMIT_INFORMATION
@@ -33814,66 +34239,66 @@ type _JOBOBJECT_EXTENDED_LIMIT_INFORMATION = struct {
 	FJobMemoryLimit        SIZE_T
 	FPeakProcessMemoryUsed SIZE_T
 	FPeakJobMemoryUsed     SIZE_T
-} /* winnt.h:4381:13 */
+} /* winnt.h:4386:13 */
 
-type JOBOBJECT_EXTENDED_LIMIT_INFORMATION = _JOBOBJECT_EXTENDED_LIMIT_INFORMATION /* winnt.h:4388:7 */
-type PJOBOBJECT_EXTENDED_LIMIT_INFORMATION = uintptr                              /* winnt.h:4388:44 */
+type JOBOBJECT_EXTENDED_LIMIT_INFORMATION = _JOBOBJECT_EXTENDED_LIMIT_INFORMATION /* winnt.h:4393:7 */
+type PJOBOBJECT_EXTENDED_LIMIT_INFORMATION = uintptr                              /* winnt.h:4393:44 */
 
 type _JOBOBJECT_BASIC_PROCESS_ID_LIST = struct {
 	FNumberOfAssignedProcesses DWORD
 	FNumberOfProcessIdsInList  DWORD
 	FProcessIdList             [1]ULONG_PTR
-} /* winnt.h:4390:13 */
+} /* winnt.h:4395:13 */
 
-type JOBOBJECT_BASIC_PROCESS_ID_LIST = _JOBOBJECT_BASIC_PROCESS_ID_LIST /* winnt.h:4394:7 */
-type PJOBOBJECT_BASIC_PROCESS_ID_LIST = uintptr                         /* winnt.h:4394:39 */
+type JOBOBJECT_BASIC_PROCESS_ID_LIST = _JOBOBJECT_BASIC_PROCESS_ID_LIST /* winnt.h:4399:7 */
+type PJOBOBJECT_BASIC_PROCESS_ID_LIST = uintptr                         /* winnt.h:4399:39 */
 
-type _JOBOBJECT_BASIC_UI_RESTRICTIONS = struct{ FUIRestrictionsClass DWORD } /* winnt.h:4396:13 */
+type _JOBOBJECT_BASIC_UI_RESTRICTIONS = struct{ FUIRestrictionsClass DWORD } /* winnt.h:4401:13 */
 
-type JOBOBJECT_BASIC_UI_RESTRICTIONS = _JOBOBJECT_BASIC_UI_RESTRICTIONS /* winnt.h:4398:7 */
-type PJOBOBJECT_BASIC_UI_RESTRICTIONS = uintptr                         /* winnt.h:4398:39 */
+type JOBOBJECT_BASIC_UI_RESTRICTIONS = _JOBOBJECT_BASIC_UI_RESTRICTIONS /* winnt.h:4403:7 */
+type PJOBOBJECT_BASIC_UI_RESTRICTIONS = uintptr                         /* winnt.h:4403:39 */
 
 type _JOBOBJECT_SECURITY_LIMIT_INFORMATION = struct {
 	FSecurityLimitFlags DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FJobToken           HANDLE
 	FSidsToDisable      PTOKEN_GROUPS
 	FPrivilegesToDelete PTOKEN_PRIVILEGES
 	FRestrictedSids     PTOKEN_GROUPS
-} /* winnt.h:4400:13 */
+} /* winnt.h:4405:13 */
 
-type JOBOBJECT_SECURITY_LIMIT_INFORMATION = _JOBOBJECT_SECURITY_LIMIT_INFORMATION /* winnt.h:4406:7 */
-type PJOBOBJECT_SECURITY_LIMIT_INFORMATION = uintptr                              /* winnt.h:4406:44 */
+type JOBOBJECT_SECURITY_LIMIT_INFORMATION = _JOBOBJECT_SECURITY_LIMIT_INFORMATION /* winnt.h:4411:7 */
+type PJOBOBJECT_SECURITY_LIMIT_INFORMATION = uintptr                              /* winnt.h:4411:44 */
 
-type _JOBOBJECT_END_OF_JOB_TIME_INFORMATION = struct{ FEndOfJobTimeAction DWORD } /* winnt.h:4408:13 */
+type _JOBOBJECT_END_OF_JOB_TIME_INFORMATION = struct{ FEndOfJobTimeAction DWORD } /* winnt.h:4413:13 */
 
-type JOBOBJECT_END_OF_JOB_TIME_INFORMATION = _JOBOBJECT_END_OF_JOB_TIME_INFORMATION /* winnt.h:4410:7 */
-type PJOBOBJECT_END_OF_JOB_TIME_INFORMATION = uintptr                               /* winnt.h:4410:45 */
+type JOBOBJECT_END_OF_JOB_TIME_INFORMATION = _JOBOBJECT_END_OF_JOB_TIME_INFORMATION /* winnt.h:4415:7 */
+type PJOBOBJECT_END_OF_JOB_TIME_INFORMATION = uintptr                               /* winnt.h:4415:45 */
 
 type _JOBOBJECT_ASSOCIATE_COMPLETION_PORT = struct {
 	FCompletionKey  PVOID
 	FCompletionPort HANDLE
-} /* winnt.h:4412:13 */
+} /* winnt.h:4417:13 */
 
-type JOBOBJECT_ASSOCIATE_COMPLETION_PORT = _JOBOBJECT_ASSOCIATE_COMPLETION_PORT /* winnt.h:4415:7 */
-type PJOBOBJECT_ASSOCIATE_COMPLETION_PORT = uintptr                             /* winnt.h:4415:43 */
+type JOBOBJECT_ASSOCIATE_COMPLETION_PORT = _JOBOBJECT_ASSOCIATE_COMPLETION_PORT /* winnt.h:4420:7 */
+type PJOBOBJECT_ASSOCIATE_COMPLETION_PORT = uintptr                             /* winnt.h:4420:43 */
 
 type _JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION = struct {
 	FBasicInfo JOBOBJECT_BASIC_ACCOUNTING_INFORMATION
 	FIoInfo    IO_COUNTERS
-} /* winnt.h:4417:13 */
+} /* winnt.h:4422:13 */
 
-type JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION = _JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION /* winnt.h:4420:7 */
-type PJOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION = uintptr                                       /* winnt.h:4420:53 */
+type JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION = _JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION /* winnt.h:4425:7 */
+type PJOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION = uintptr                                       /* winnt.h:4425:53 */
 
-type _JOBOBJECT_JOBSET_INFORMATION = struct{ FMemberLevel DWORD } /* winnt.h:4422:13 */
+type _JOBOBJECT_JOBSET_INFORMATION = struct{ FMemberLevel DWORD } /* winnt.h:4427:13 */
 
-type JOBOBJECT_JOBSET_INFORMATION = _JOBOBJECT_JOBSET_INFORMATION /* winnt.h:4424:7 */
-type PJOBOBJECT_JOBSET_INFORMATION = uintptr                      /* winnt.h:4424:36 */
+type JOBOBJECT_JOBSET_INFORMATION = _JOBOBJECT_JOBSET_INFORMATION /* winnt.h:4429:7 */
+type PJOBOBJECT_JOBSET_INFORMATION = uintptr                      /* winnt.h:4429:36 */
 
-type JOBOBJECT_RATE_CONTROL_TOLERANCE = uint32 /* winnt.h:4430:7 */
+type JOBOBJECT_RATE_CONTROL_TOLERANCE = uint32 /* winnt.h:4435:7 */
 
-type JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL = uint32 /* winnt.h:4436:7 */
+type JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL = uint32 /* winnt.h:4441:7 */
 
 type _JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = struct {
 	FIoReadBytesLimit             DWORD64
@@ -33883,11 +34308,11 @@ type _JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = struct {
 	FRateControlTolerance         JOBOBJECT_RATE_CONTROL_TOLERANCE
 	FRateControlToleranceInterval JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL
 	FLimitFlags                   DWORD
-	_                             [4]byte
-} /* winnt.h:4438:13 */
+	F__ccgo_pad1                  [4]byte
+} /* winnt.h:4443:13 */
 
-type JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = _JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION /* winnt.h:4446:7 */
-type PJOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = uintptr                                  /* winnt.h:4446:48 */
+type JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = _JOBOBJECT_NOTIFICATION_LIMIT_INFORMATION /* winnt.h:4451:7 */
+type PJOBOBJECT_NOTIFICATION_LIMIT_INFORMATION = uintptr                                  /* winnt.h:4451:48 */
 
 type _JOBOBJECT_LIMIT_VIOLATION_INFORMATION = struct {
 	FLimitFlags                DWORD
@@ -33902,27 +34327,27 @@ type _JOBOBJECT_LIMIT_VIOLATION_INFORMATION = struct {
 	FJobMemoryLimit            DWORD64
 	FRateControlTolerance      JOBOBJECT_RATE_CONTROL_TOLERANCE
 	FRateControlToleranceLimit JOBOBJECT_RATE_CONTROL_TOLERANCE_INTERVAL
-} /* winnt.h:4448:13 */
+} /* winnt.h:4453:13 */
 
-type JOBOBJECT_LIMIT_VIOLATION_INFORMATION = _JOBOBJECT_LIMIT_VIOLATION_INFORMATION /* winnt.h:4461:7 */
-type PJOBOBJECT_LIMIT_VIOLATION_INFORMATION = uintptr                               /* winnt.h:4461:45 */
+type JOBOBJECT_LIMIT_VIOLATION_INFORMATION = _JOBOBJECT_LIMIT_VIOLATION_INFORMATION /* winnt.h:4466:7 */
+type PJOBOBJECT_LIMIT_VIOLATION_INFORMATION = uintptr                               /* winnt.h:4466:45 */
 
 type _JOBOBJECT_CPU_RATE_CONTROL_INFORMATION = struct {
 	FControlFlags DWORD
 	F__4          struct{ FCpuRate DWORD }
-} /* winnt.h:4463:13 */
+} /* winnt.h:4468:13 */
 
-type JOBOBJECT_CPU_RATE_CONTROL_INFORMATION = _JOBOBJECT_CPU_RATE_CONTROL_INFORMATION /* winnt.h:4469:7 */
-type PJOBOBJECT_CPU_RATE_CONTROL_INFORMATION = uintptr                                /* winnt.h:4469:46 */
+type JOBOBJECT_CPU_RATE_CONTROL_INFORMATION = _JOBOBJECT_CPU_RATE_CONTROL_INFORMATION /* winnt.h:4474:7 */
+type PJOBOBJECT_CPU_RATE_CONTROL_INFORMATION = uintptr                                /* winnt.h:4474:46 */
 
-type JOBOBJECTINFOCLASS = uint32 /* winnt.h:4573:7 */
+type JOBOBJECTINFOCLASS = uint32 /* winnt.h:4578:7 */
 
-type FIRMWARE_TYPE = uint32   /* winnt.h:4580:7 */
-type PFIRMWARE_TYPE = uintptr /* winnt.h:4580:21 */
+type FIRMWARE_TYPE = uint32   /* winnt.h:4585:7 */
+type PFIRMWARE_TYPE = uintptr /* winnt.h:4585:21 */
 
-type LOGICAL_PROCESSOR_RELATIONSHIP = uint32 /* winnt.h:4603:7 */
+type LOGICAL_PROCESSOR_RELATIONSHIP = uint32 /* winnt.h:4608:7 */
 
-type PROCESSOR_CACHE_TYPE = uint32 /* winnt.h:4609:7 */
+type PROCESSOR_CACHE_TYPE = uint32 /* winnt.h:4614:7 */
 
 type _CACHE_DESCRIPTOR = struct {
 	FLevel         BYTE
@@ -33930,43 +34355,43 @@ type _CACHE_DESCRIPTOR = struct {
 	FLineSize      WORD
 	FSize          DWORD
 	FType          PROCESSOR_CACHE_TYPE
-} /* winnt.h:4613:13 */
+} /* winnt.h:4618:13 */
 
-type CACHE_DESCRIPTOR = _CACHE_DESCRIPTOR /* winnt.h:4619:7 */
-type PCACHE_DESCRIPTOR = uintptr          /* winnt.h:4619:24 */
+type CACHE_DESCRIPTOR = _CACHE_DESCRIPTOR /* winnt.h:4624:7 */
+type PCACHE_DESCRIPTOR = uintptr          /* winnt.h:4624:24 */
 
 type _SYSTEM_LOGICAL_PROCESSOR_INFORMATION = struct {
 	FProcessorMask ULONG_PTR
 	FRelationship  LOGICAL_PROCESSOR_RELATIONSHIP
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	Fu             struct {
-		_              [0]uint64
+		F__ccgo_pad1   [0]uint64
 		FProcessorCore struct{ FFlags BYTE }
-		_              [15]byte
+		F__ccgo_pad2   [15]byte
 	}
-} /* winnt.h:4621:13 */
+} /* winnt.h:4626:13 */
 
-type SYSTEM_LOGICAL_PROCESSOR_INFORMATION = _SYSTEM_LOGICAL_PROCESSOR_INFORMATION /* winnt.h:4634:7 */
-type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION = uintptr                              /* winnt.h:4634:44 */
+type SYSTEM_LOGICAL_PROCESSOR_INFORMATION = _SYSTEM_LOGICAL_PROCESSOR_INFORMATION /* winnt.h:4639:7 */
+type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION = uintptr                              /* winnt.h:4639:44 */
 
 type _PROCESSOR_RELATIONSHIP = struct {
 	FFlags      BYTE
 	FReserved   [21]BYTE
 	FGroupCount WORD
 	FGroupMask  [1]GROUP_AFFINITY
-} /* winnt.h:4636:13 */
+} /* winnt.h:4641:13 */
 
-type PROCESSOR_RELATIONSHIP = _PROCESSOR_RELATIONSHIP /* winnt.h:4641:7 */
-type PPROCESSOR_RELATIONSHIP = uintptr                /* winnt.h:4641:30 */
+type PROCESSOR_RELATIONSHIP = _PROCESSOR_RELATIONSHIP /* winnt.h:4646:7 */
+type PPROCESSOR_RELATIONSHIP = uintptr                /* winnt.h:4646:30 */
 
 type _NUMA_NODE_RELATIONSHIP = struct {
 	FNodeNumber DWORD
 	FReserved   [20]BYTE
 	FGroupMask  GROUP_AFFINITY
-} /* winnt.h:4643:13 */
+} /* winnt.h:4648:13 */
 
-type NUMA_NODE_RELATIONSHIP = _NUMA_NODE_RELATIONSHIP /* winnt.h:4647:7 */
-type PNUMA_NODE_RELATIONSHIP = uintptr                /* winnt.h:4647:30 */
+type NUMA_NODE_RELATIONSHIP = _NUMA_NODE_RELATIONSHIP /* winnt.h:4652:7 */
+type PNUMA_NODE_RELATIONSHIP = uintptr                /* winnt.h:4652:30 */
 
 type _CACHE_RELATIONSHIP = struct {
 	FLevel         BYTE
@@ -33976,82 +34401,82 @@ type _CACHE_RELATIONSHIP = struct {
 	FType          PROCESSOR_CACHE_TYPE
 	FReserved      [20]BYTE
 	FGroupMask     GROUP_AFFINITY
-} /* winnt.h:4649:13 */
+} /* winnt.h:4654:13 */
 
-type CACHE_RELATIONSHIP = _CACHE_RELATIONSHIP /* winnt.h:4657:7 */
-type PCACHE_RELATIONSHIP = uintptr            /* winnt.h:4657:26 */
+type CACHE_RELATIONSHIP = _CACHE_RELATIONSHIP /* winnt.h:4662:7 */
+type PCACHE_RELATIONSHIP = uintptr            /* winnt.h:4662:26 */
 
 type _PROCESSOR_GROUP_INFO = struct {
 	FMaximumProcessorCount BYTE
 	FActiveProcessorCount  BYTE
 	FReserved              [38]BYTE
 	FActiveProcessorMask   KAFFINITY
-} /* winnt.h:4659:13 */
+} /* winnt.h:4664:13 */
 
-type PROCESSOR_GROUP_INFO = _PROCESSOR_GROUP_INFO /* winnt.h:4664:7 */
-type PPROCESSOR_GROUP_INFO = uintptr              /* winnt.h:4664:28 */
+type PROCESSOR_GROUP_INFO = _PROCESSOR_GROUP_INFO /* winnt.h:4669:7 */
+type PPROCESSOR_GROUP_INFO = uintptr              /* winnt.h:4669:28 */
 
 type _GROUP_RELATIONSHIP = struct {
 	FMaximumGroupCount WORD
 	FActiveGroupCount  WORD
 	FReserved          [20]BYTE
 	FGroupInfo         [1]PROCESSOR_GROUP_INFO
-} /* winnt.h:4666:13 */
+} /* winnt.h:4671:13 */
 
-type GROUP_RELATIONSHIP = _GROUP_RELATIONSHIP /* winnt.h:4671:7 */
-type PGROUP_RELATIONSHIP = uintptr            /* winnt.h:4671:26 */
+type GROUP_RELATIONSHIP = _GROUP_RELATIONSHIP /* winnt.h:4676:7 */
+type PGROUP_RELATIONSHIP = uintptr            /* winnt.h:4676:26 */
 
 type _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX = struct {
 	FRelationship LOGICAL_PROCESSOR_RELATIONSHIP
 	FSize         DWORD
 	Fu            struct {
-		FProcessor PROCESSOR_RELATIONSHIP
-		_          [32]byte
+		FProcessor   PROCESSOR_RELATIONSHIP
+		F__ccgo_pad1 [32]byte
 	}
-} /* winnt.h:4673:5 */
+} /* winnt.h:4678:5 */
 
-type SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX = _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX /* winnt.h:4684:61 */
-type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX = uintptr                                 /* winnt.h:4684:101 */
+type SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX = _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX /* winnt.h:4689:61 */
+type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX = uintptr                                 /* winnt.h:4689:101 */
 
-type _SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = struct{ FCycleTime DWORD64 } /* winnt.h:4686:13 */
+type _SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = struct{ FCycleTime DWORD64 } /* winnt.h:4691:13 */
 
-type SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = _SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION /* winnt.h:4688:7 */
-type PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = uintptr                                 /* winnt.h:4688:47 */
+type SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = _SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION /* winnt.h:4693:7 */
+type PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = uintptr                                 /* winnt.h:4693:47 */
 
 type _XSTATE_FEATURE = struct {
 	FOffset DWORD
 	FSize   DWORD
-} /* winnt.h:4771:13 */
+} /* winnt.h:4785:13 */
 
-type XSTATE_FEATURE = _XSTATE_FEATURE /* winnt.h:4774:7 */
-type PXSTATE_FEATURE = uintptr        /* winnt.h:4774:22 */
+type XSTATE_FEATURE = _XSTATE_FEATURE /* winnt.h:4788:7 */
+type PXSTATE_FEATURE = uintptr        /* winnt.h:4788:22 */
 
 type _XSTATE_CONFIGURATION = struct {
 	FEnabledFeatures         DWORD64
 	FEnabledVolatileFeatures DWORD64
 	FSize                    DWORD
 	FOptimizedSave           uint8 /* DWORD OptimizedSave: 1 */
-	_                        [3]byte
+	F__ccgo_pad1             [3]byte
 	FFeatures                [64]XSTATE_FEATURE
-} /* winnt.h:4776:13 */
+} /* winnt.h:4790:13 */
 
-type XSTATE_CONFIGURATION = _XSTATE_CONFIGURATION /* winnt.h:4782:7 */
-type PXSTATE_CONFIGURATION = uintptr              /* winnt.h:4782:28 */
+type XSTATE_CONFIGURATION = _XSTATE_CONFIGURATION /* winnt.h:4796:7 */
+type PXSTATE_CONFIGURATION = uintptr              /* winnt.h:4796:28 */
 
 type _MEMORY_BASIC_INFORMATION = struct {
 	FBaseAddress       PVOID
 	FAllocationBase    PVOID
 	FAllocationProtect DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FRegionSize        SIZE_T
 	FState             DWORD
 	FProtect           DWORD
 	FType              DWORD
-	_                  [4]byte
-} /* winnt.h:4784:13 */
+	F__ccgo_pad2       [4]byte
+} /* winnt.h:4798:13 */
 
-type MEMORY_BASIC_INFORMATION = _MEMORY_BASIC_INFORMATION /* winnt.h:4792:7 */
-type PMEMORY_BASIC_INFORMATION = uintptr                  /* winnt.h:4792:32 */
+type MEMORY_BASIC_INFORMATION = _MEMORY_BASIC_INFORMATION /* winnt.h:4806:7 */
+type PMEMORY_BASIC_INFORMATION = uintptr                  /* winnt.h:4806:32 */
 
 type _MEMORY_BASIC_INFORMATION32 = struct {
 	FBaseAddress       DWORD
@@ -34061,10 +34486,10 @@ type _MEMORY_BASIC_INFORMATION32 = struct {
 	FState             DWORD
 	FProtect           DWORD
 	FType              DWORD
-} /* winnt.h:4794:13 */
+} /* winnt.h:4808:13 */
 
-type MEMORY_BASIC_INFORMATION32 = _MEMORY_BASIC_INFORMATION32 /* winnt.h:4802:7 */
-type PMEMORY_BASIC_INFORMATION32 = uintptr                    /* winnt.h:4802:34 */
+type MEMORY_BASIC_INFORMATION32 = _MEMORY_BASIC_INFORMATION32 /* winnt.h:4816:7 */
+type PMEMORY_BASIC_INFORMATION32 = uintptr                    /* winnt.h:4816:34 */
 
 type _MEMORY_BASIC_INFORMATION64 = struct {
 	FBaseAddress       ULONGLONG
@@ -34076,34 +34501,65 @@ type _MEMORY_BASIC_INFORMATION64 = struct {
 	FProtect           DWORD
 	FType              DWORD
 	F__alignment2      DWORD
-} /* winnt.h:4804:13 */
+} /* winnt.h:4818:13 */
+
+type MEMORY_BASIC_INFORMATION64 = _MEMORY_BASIC_INFORMATION64 /* winnt.h:4828:7 */
+type PMEMORY_BASIC_INFORMATION64 = uintptr                    /* winnt.h:4828:34 */
+
+type _CFG_CALL_TARGET_INFO = struct {
+	FOffset ULONG_PTR
+	FFlags  ULONG_PTR
+} /* winnt.h:4834:11 */
 
-type MEMORY_BASIC_INFORMATION64 = _MEMORY_BASIC_INFORMATION64 /* winnt.h:4814:7 */
-type PMEMORY_BASIC_INFORMATION64 = uintptr                    /* winnt.h:4814:34 */
+type CFG_CALL_TARGET_INFO = _CFG_CALL_TARGET_INFO /* winnt.h:4837:5 */
+type PCFG_CALL_TARGET_INFO = uintptr              /* winnt.h:4837:27 */
 
-type FILE_ID_1281 = struct {
-	FLowPart  ULONGLONG
-	FHighPart ULONGLONG
-} /* winnt.h:4981:13 */
+type _MEM_ADDRESS_REQUIREMENTS = struct {
+	FLowestStartingAddress PVOID
+	FHighestEndingAddress  PVOID
+	FAlignment             SIZE_T
+} /* winnt.h:4896:11 */
 
-type FILE_ID_128 = FILE_ID_1281 /* winnt.h:4984:7 */
-type PFILE_ID_128 = uintptr     /* winnt.h:4984:20 */
+type MEM_ADDRESS_REQUIREMENTS = _MEM_ADDRESS_REQUIREMENTS /* winnt.h:4900:5 */
+type PMEM_ADDRESS_REQUIREMENTS = uintptr                  /* winnt.h:4900:31 */
+
+type MEM_EXTENDED_PARAMETER_TYPE = uint32   /* winnt.h:4916:5 */
+type PMEM_EXTENDED_PARAMETER_TYPE = uintptr /* winnt.h:4916:34 */
+
+type MEM_EXTENDED_PARAMETER1 = struct {
+	F__0 struct {
+		F__ccgo_pad1 [0]uint64
+		FType        uint64 /* DWORD64 Type: 8, DWORD64 Reserved: 56 */
+	}
+	F__8 struct{ FULong64 DWORD64 }
+} /* winnt.h:4920:11 */
+
+type MEM_EXTENDED_PARAMETER = MEM_EXTENDED_PARAMETER1 /* winnt.h:4932:5 */
+type PMEM_EXTENDED_PARAMETER = uintptr                /* winnt.h:4932:29 */
+
+type MEM_SECTION_EXTENDED_PARAMETER_TYPE = uint32   /* winnt.h:4951:5 */
+type PMEM_SECTION_EXTENDED_PARAMETER_TYPE = uintptr /* winnt.h:4951:42 */
+
+type FILE_ID_1281 = struct{ FIdentifier [16]BYTE } /* winnt.h:5069:13 */
+
+type FILE_ID_128 = FILE_ID_1281 /* winnt.h:5071:7 */
+type PFILE_ID_128 = uintptr     /* winnt.h:5071:20 */
 
 type _FILE_NOTIFY_INFORMATION = struct {
 	FNextEntryOffset DWORD
 	FAction          DWORD
 	FFileNameLength  DWORD
 	FFileName        [1]WCHAR
-	_                [2]byte
-} /* winnt.h:4986:13 */
+	F__ccgo_pad1     [2]byte
+} /* winnt.h:5073:13 */
 
-type FILE_NOTIFY_INFORMATION = _FILE_NOTIFY_INFORMATION /* winnt.h:4991:7 */
-type PFILE_NOTIFY_INFORMATION = uintptr                 /* winnt.h:4991:31 */
+type FILE_NOTIFY_INFORMATION = _FILE_NOTIFY_INFORMATION /* winnt.h:5078:7 */
+type PFILE_NOTIFY_INFORMATION = uintptr                 /* winnt.h:5078:31 */
 
-type _FILE_SEGMENT_ELEMENT = struct{ FBuffer PVOID64 } /* winnt.h:4993:13 */
+type _FILE_SEGMENT_ELEMENT = struct{ FBuffer PVOID64 } /* winnt.h:5080:13 */
 
-type FILE_SEGMENT_ELEMENT = _FILE_SEGMENT_ELEMENT /* winnt.h:4996:7 */
-type PFILE_SEGMENT_ELEMENT = uintptr              /* winnt.h:4996:28 */
+type FILE_SEGMENT_ELEMENT = _FILE_SEGMENT_ELEMENT /* winnt.h:5083:7 */
+type PFILE_SEGMENT_ELEMENT = uintptr              /* winnt.h:5083:28 */
 
 type _REPARSE_GUID_DATA_BUFFER = struct {
 	FReparseTag           DWORD
@@ -34111,34 +34567,34 @@ type _REPARSE_GUID_DATA_BUFFER = struct {
 	FReserved             WORD
 	FReparseGuid          GUID
 	FGenericReparseBuffer struct{ FDataBuffer [1]BYTE }
-	_                     [3]byte
-} /* winnt.h:4998:13 */
+	F__ccgo_pad1          [3]byte
+} /* winnt.h:5085:13 */
 
-type REPARSE_GUID_DATA_BUFFER = _REPARSE_GUID_DATA_BUFFER /* winnt.h:5006:7 */
-type PREPARSE_GUID_DATA_BUFFER = uintptr                  /* winnt.h:5006:32 */
+type REPARSE_GUID_DATA_BUFFER = _REPARSE_GUID_DATA_BUFFER /* winnt.h:5093:7 */
+type PREPARSE_GUID_DATA_BUFFER = uintptr                  /* winnt.h:5093:32 */
 
-type SYSTEM_POWER_STATE = uint32   /* winnt.h:5231:5 */
-type PSYSTEM_POWER_STATE = uintptr /* winnt.h:5231:24 */
+type SYSTEM_POWER_STATE = uint32   /* winnt.h:5348:5 */
+type PSYSTEM_POWER_STATE = uintptr /* winnt.h:5348:24 */
 
-type POWER_ACTION = uint32   /* winnt.h:5239:5 */
-type PPOWER_ACTION = uintptr /* winnt.h:5239:18 */
+type POWER_ACTION = uint32   /* winnt.h:5356:5 */
+type PPOWER_ACTION = uintptr /* winnt.h:5356:18 */
 
-type DEVICE_POWER_STATE = uint32   /* winnt.h:5244:5 */
-type PDEVICE_POWER_STATE = uintptr /* winnt.h:5244:24 */
+type DEVICE_POWER_STATE = uint32   /* winnt.h:5361:5 */
+type PDEVICE_POWER_STATE = uintptr /* winnt.h:5361:24 */
 
-type MONITOR_DISPLAY_STATE = uint32   /* winnt.h:5248:5 */
-type PMONITOR_DISPLAY_STATE = uintptr /* winnt.h:5248:28 */
+type MONITOR_DISPLAY_STATE = uint32   /* winnt.h:5365:5 */
+type PMONITOR_DISPLAY_STATE = uintptr /* winnt.h:5365:28 */
 
-type USER_ACTIVITY_PRESENCE = uint32   /* winnt.h:5256:5 */
-type PUSER_ACTIVITY_PRESENCE = uintptr /* winnt.h:5256:28 */
+type USER_ACTIVITY_PRESENCE = uint32   /* winnt.h:5373:5 */
+type PUSER_ACTIVITY_PRESENCE = uintptr /* winnt.h:5373:28 */
 
-type EXECUTION_STATE = DWORD    /* winnt.h:5264:17 */
-type PEXECUTION_STATE = uintptr /* winnt.h:5264:34 */
+type EXECUTION_STATE = DWORD    /* winnt.h:5381:17 */
+type PEXECUTION_STATE = uintptr /* winnt.h:5381:34 */
 
-type LATENCY_TIME = uint32 /* winnt.h:5268:5 */
+type LATENCY_TIME = uint32 /* winnt.h:5385:5 */
 
-type POWER_REQUEST_TYPE = uint32   /* winnt.h:5286:5 */
-type PPOWER_REQUEST_TYPE = uintptr /* winnt.h:5286:24 */
+type POWER_REQUEST_TYPE = uint32   /* winnt.h:5403:5 */
+type PPOWER_REQUEST_TYPE = uintptr /* winnt.h:5403:24 */
 
 type CM_Power_Data_s = struct {
 	FPD_Size                 DWORD
@@ -34149,87 +34605,87 @@ type CM_Power_Data_s = struct {
 	FPD_D3Latency            DWORD
 	FPD_PowerStateMapping    [7]DEVICE_POWER_STATE
 	FPD_DeepestSystemWake    SYSTEM_POWER_STATE
-} /* winnt.h:5298:13 */
+} /* winnt.h:5415:13 */
 
-type CM_POWER_DATA = CM_Power_Data_s /* winnt.h:5307:7 */
-type PCM_POWER_DATA = uintptr        /* winnt.h:5307:21 */
+type CM_POWER_DATA = CM_Power_Data_s /* winnt.h:5424:7 */
+type PCM_POWER_DATA = uintptr        /* winnt.h:5424:21 */
 
-type POWER_INFORMATION_LEVEL = uint32 /* winnt.h:5391:7 */
+type POWER_INFORMATION_LEVEL = uint32 /* winnt.h:5508:7 */
 
-type POWER_USER_PRESENCE_TYPE = uint32   /* winnt.h:5397:7 */
-type PPOWER_USER_PRESENCE_TYPE = uintptr /* winnt.h:5397:32 */
+type POWER_USER_PRESENCE_TYPE = uint32   /* winnt.h:5514:7 */
+type PPOWER_USER_PRESENCE_TYPE = uintptr /* winnt.h:5514:32 */
 
-type _POWER_USER_PRESENCE = struct{ FUserPresence POWER_USER_PRESENCE_TYPE } /* winnt.h:5399:13 */
+type _POWER_USER_PRESENCE = struct{ FUserPresence POWER_USER_PRESENCE_TYPE } /* winnt.h:5516:13 */
 
-type POWER_USER_PRESENCE = _POWER_USER_PRESENCE /* winnt.h:5401:7 */
-type PPOWER_USER_PRESENCE = uintptr             /* winnt.h:5401:27 */
+type POWER_USER_PRESENCE = _POWER_USER_PRESENCE /* winnt.h:5518:7 */
+type PPOWER_USER_PRESENCE = uintptr             /* winnt.h:5518:27 */
 
 type _POWER_SESSION_CONNECT = struct {
 	FConnected BOOLEAN
 	FConsole   BOOLEAN
-} /* winnt.h:5403:13 */
+} /* winnt.h:5520:13 */
 
-type POWER_SESSION_CONNECT = _POWER_SESSION_CONNECT /* winnt.h:5406:7 */
-type PPOWER_SESSION_CONNECT = uintptr               /* winnt.h:5406:29 */
+type POWER_SESSION_CONNECT = _POWER_SESSION_CONNECT /* winnt.h:5523:7 */
+type PPOWER_SESSION_CONNECT = uintptr               /* winnt.h:5523:29 */
 
 type _POWER_SESSION_TIMEOUTS = struct {
 	FInputTimeout   DWORD
 	FDisplayTimeout DWORD
-} /* winnt.h:5408:13 */
+} /* winnt.h:5525:13 */
 
-type POWER_SESSION_TIMEOUTS = _POWER_SESSION_TIMEOUTS /* winnt.h:5411:7 */
-type PPOWER_SESSION_TIMEOUTS = uintptr                /* winnt.h:5411:30 */
+type POWER_SESSION_TIMEOUTS = _POWER_SESSION_TIMEOUTS /* winnt.h:5528:7 */
+type PPOWER_SESSION_TIMEOUTS = uintptr                /* winnt.h:5528:30 */
 
 type _POWER_SESSION_RIT_STATE = struct {
 	FActive        BOOLEAN
-	_              [3]byte
+	F__ccgo_pad1   [3]byte
 	FLastInputTime DWORD
-} /* winnt.h:5413:13 */
+} /* winnt.h:5530:13 */
 
-type POWER_SESSION_RIT_STATE = _POWER_SESSION_RIT_STATE /* winnt.h:5416:7 */
-type PPOWER_SESSION_RIT_STATE = uintptr                 /* winnt.h:5416:31 */
+type POWER_SESSION_RIT_STATE = _POWER_SESSION_RIT_STATE /* winnt.h:5533:7 */
+type PPOWER_SESSION_RIT_STATE = uintptr                 /* winnt.h:5533:31 */
 
 type _POWER_SESSION_WINLOGON = struct {
-	FSessionId DWORD
-	FConsole   BOOLEAN
-	FLocked    BOOLEAN
-	_          [2]byte
-} /* winnt.h:5418:13 */
+	FSessionId   DWORD
+	FConsole     BOOLEAN
+	FLocked      BOOLEAN
+	F__ccgo_pad1 [2]byte
+} /* winnt.h:5535:13 */
 
-type POWER_SESSION_WINLOGON = _POWER_SESSION_WINLOGON /* winnt.h:5422:7 */
-type PPOWER_SESSION_WINLOGON = uintptr                /* winnt.h:5422:30 */
+type POWER_SESSION_WINLOGON = _POWER_SESSION_WINLOGON /* winnt.h:5539:7 */
+type PPOWER_SESSION_WINLOGON = uintptr                /* winnt.h:5539:30 */
 
 type _POWER_IDLE_RESILIENCY = struct {
 	FCoalescingTimeout    DWORD
 	FIdleResiliencyPeriod DWORD
-} /* winnt.h:5424:13 */
+} /* winnt.h:5541:13 */
 
-type POWER_IDLE_RESILIENCY = _POWER_IDLE_RESILIENCY /* winnt.h:5427:7 */
-type PPOWER_IDLE_RESILIENCY = uintptr               /* winnt.h:5427:29 */
+type POWER_IDLE_RESILIENCY = _POWER_IDLE_RESILIENCY /* winnt.h:5544:7 */
+type PPOWER_IDLE_RESILIENCY = uintptr               /* winnt.h:5544:29 */
 
-type POWER_MONITOR_REQUEST_REASON = uint32 /* winnt.h:5445:7 */
+type POWER_MONITOR_REQUEST_REASON = uint32 /* winnt.h:5562:7 */
 
 type _POWER_MONITOR_INVOCATION = struct {
 	FOn            BOOLEAN
 	FConsole       BOOLEAN
-	_              [2]byte
+	F__ccgo_pad1   [2]byte
 	FRequestReason POWER_MONITOR_REQUEST_REASON
-} /* winnt.h:5447:13 */
+} /* winnt.h:5564:13 */
 
-type POWER_MONITOR_INVOCATION = _POWER_MONITOR_INVOCATION /* winnt.h:5451:7 */
-type PPOWER_MONITOR_INVOCATION = uintptr                  /* winnt.h:5451:32 */
+type POWER_MONITOR_INVOCATION = _POWER_MONITOR_INVOCATION /* winnt.h:5568:7 */
+type PPOWER_MONITOR_INVOCATION = uintptr                  /* winnt.h:5568:32 */
 
 type _RESUME_PERFORMANCE = struct {
 	FPostTimeMs              DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FTotalResumeTimeMs       ULONGLONG
 	FResumeCompleteTimestamp ULONGLONG
-} /* winnt.h:5453:13 */
+} /* winnt.h:5570:13 */
 
-type RESUME_PERFORMANCE = _RESUME_PERFORMANCE /* winnt.h:5457:7 */
-type PRESUME_PERFORMANCE = uintptr            /* winnt.h:5457:26 */
+type RESUME_PERFORMANCE = _RESUME_PERFORMANCE /* winnt.h:5574:7 */
+type PRESUME_PERFORMANCE = uintptr            /* winnt.h:5574:26 */
 
-type SYSTEM_POWER_CONDITION = uint32 /* winnt.h:5464:7 */
+type SYSTEM_POWER_CONDITION = uint32 /* winnt.h:5581:7 */
 
 type SET_POWER_SETTING_VALUE = struct {
 	FVersion        DWORD
@@ -34237,42 +34693,42 @@ type SET_POWER_SETTING_VALUE = struct {
 	FPowerCondition SYSTEM_POWER_CONDITION
 	FDataLength     DWORD
 	FData           [1]BYTE
-	_               [3]byte
-}                                       /* winnt.h:5472:7 */
-type PSET_POWER_SETTING_VALUE = uintptr /* winnt.h:5472:31 */
+	F__ccgo_pad1    [3]byte
+}                                       /* winnt.h:5589:7 */
+type PSET_POWER_SETTING_VALUE = uintptr /* winnt.h:5589:31 */
 
-type NOTIFY_USER_POWER_SETTING = struct{ FGuid GUID } /* winnt.h:5478:7 */
-type PNOTIFY_USER_POWER_SETTING = uintptr             /* winnt.h:5478:33 */
+type NOTIFY_USER_POWER_SETTING = struct{ FGuid GUID } /* winnt.h:5595:7 */
+type PNOTIFY_USER_POWER_SETTING = uintptr             /* winnt.h:5595:33 */
 
 type _APPLICATIONLAUNCH_SETTING_VALUE = struct {
 	FActivationTime   LARGE_INTEGER
 	FFlags            DWORD
 	FButtonInstanceID DWORD
-} /* winnt.h:5480:13 */
+} /* winnt.h:5597:13 */
 
-type APPLICATIONLAUNCH_SETTING_VALUE = _APPLICATIONLAUNCH_SETTING_VALUE /* winnt.h:5484:7 */
-type PAPPLICATIONLAUNCH_SETTING_VALUE = uintptr                         /* winnt.h:5484:39 */
+type APPLICATIONLAUNCH_SETTING_VALUE = _APPLICATIONLAUNCH_SETTING_VALUE /* winnt.h:5601:7 */
+type PAPPLICATIONLAUNCH_SETTING_VALUE = uintptr                         /* winnt.h:5601:39 */
 
-type POWER_PLATFORM_ROLE = uint32   /* winnt.h:5497:7 */
-type PPOWER_PLATFORM_ROLE = uintptr /* winnt.h:5497:27 */
+type POWER_PLATFORM_ROLE = uint32   /* winnt.h:5614:7 */
+type PPOWER_PLATFORM_ROLE = uintptr /* winnt.h:5614:27 */
 
-type _POWER_PLATFORM_INFORMATION = struct{ FAoAc BOOLEAN } /* winnt.h:5499:13 */
+type _POWER_PLATFORM_INFORMATION = struct{ FAoAc BOOLEAN } /* winnt.h:5616:13 */
 
-type POWER_PLATFORM_INFORMATION = _POWER_PLATFORM_INFORMATION /* winnt.h:5501:7 */
-type PPOWER_PLATFORM_INFORMATION = uintptr                    /* winnt.h:5501:34 */
+type POWER_PLATFORM_INFORMATION = _POWER_PLATFORM_INFORMATION /* winnt.h:5618:7 */
+type PPOWER_PLATFORM_INFORMATION = uintptr                    /* winnt.h:5618:34 */
 
 type BATTERY_REPORTING_SCALE = struct {
 	FGranularity DWORD
 	FCapacity    DWORD
-}                                       /* winnt.h:5520:7 */
-type PBATTERY_REPORTING_SCALE = uintptr /* winnt.h:5520:31 */
+}                                       /* winnt.h:5637:7 */
+type PBATTERY_REPORTING_SCALE = uintptr /* winnt.h:5637:31 */
 
 type PPM_WMI_LEGACY_PERFSTATE = struct {
 	FFrequency        DWORD
 	FFlags            DWORD
 	FPercentFrequency DWORD
-}                                        /* winnt.h:5526:7 */
-type PPPM_WMI_LEGACY_PERFSTATE = uintptr /* winnt.h:5526:32 */
+}                                        /* winnt.h:5643:7 */
+type PPPM_WMI_LEGACY_PERFSTATE = uintptr /* winnt.h:5643:32 */
 
 type PPM_WMI_IDLE_STATE = struct {
 	FLatency        DWORD
@@ -34286,8 +34742,8 @@ type PPM_WMI_IDLE_STATE = struct {
 	FContext        DWORD
 	FIdleHandler    DWORD
 	FReserved1      DWORD
-}                                  /* winnt.h:5540:7 */
-type PPPM_WMI_IDLE_STATE = uintptr /* winnt.h:5540:26 */
+}                                  /* winnt.h:5657:7 */
+type PPPM_WMI_IDLE_STATE = uintptr /* winnt.h:5657:26 */
 
 type PPM_WMI_IDLE_STATES = struct {
 	FType             DWORD
@@ -34296,8 +34752,8 @@ type PPM_WMI_IDLE_STATES = struct {
 	FOldState         DWORD
 	FTargetProcessors DWORD64
 	FState            [1]PPM_WMI_IDLE_STATE
-}                                   /* winnt.h:5549:7 */
-type PPPM_WMI_IDLE_STATES = uintptr /* winnt.h:5549:27 */
+}                                   /* winnt.h:5666:7 */
+type PPPM_WMI_IDLE_STATES = uintptr /* winnt.h:5666:27 */
 
 type PPM_WMI_IDLE_STATES_EX = struct {
 	FType             DWORD
@@ -34306,8 +34762,8 @@ type PPM_WMI_IDLE_STATES_EX = struct {
 	FOldState         DWORD
 	FTargetProcessors PVOID
 	FState            [1]PPM_WMI_IDLE_STATE
-}                                      /* winnt.h:5558:7 */
-type PPPM_WMI_IDLE_STATES_EX = uintptr /* winnt.h:5558:30 */
+}                                      /* winnt.h:5675:7 */
+type PPPM_WMI_IDLE_STATES_EX = uintptr /* winnt.h:5675:30 */
 
 type PPM_WMI_PERF_STATE = struct {
 	FFrequency        DWORD
@@ -34318,15 +34774,15 @@ type PPM_WMI_PERF_STATE = struct {
 	FType             BYTE
 	FIncreaseTime     DWORD
 	FDecreaseTime     DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FControl          DWORD64
 	FStatus           DWORD64
 	FHitCount         DWORD
 	FReserved1        DWORD
 	FReserved2        DWORD64
 	FReserved3        DWORD64
-}                                  /* winnt.h:5575:7 */
-type PPPM_WMI_PERF_STATE = uintptr /* winnt.h:5575:26 */
+}                                  /* winnt.h:5692:7 */
+type PPPM_WMI_PERF_STATE = uintptr /* winnt.h:5692:26 */
 
 type PPM_WMI_PERF_STATES = struct {
 	FCount             DWORD
@@ -34341,7 +34797,7 @@ type PPM_WMI_PERF_STATES = struct {
 	FType              BYTE
 	FReserved          BYTE
 	FTimerInterval     DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FTargetProcessors  DWORD64
 	FPStateHandler     DWORD
 	FPStateContext     DWORD
@@ -34351,8 +34807,8 @@ type PPM_WMI_PERF_STATES = struct {
 	FReserved1         DWORD
 	FReserved2         DWORD64
 	FState             [1]PPM_WMI_PERF_STATE
-}                                   /* winnt.h:5599:7 */
-type PPPM_WMI_PERF_STATES = uintptr /* winnt.h:5599:27 */
+}                                   /* winnt.h:5716:7 */
+type PPPM_WMI_PERF_STATES = uintptr /* winnt.h:5716:27 */
 
 type PPM_WMI_PERF_STATES_EX = struct {
 	FCount             DWORD
@@ -34367,7 +34823,7 @@ type PPM_WMI_PERF_STATES_EX = struct {
 	FType              BYTE
 	FReserved          BYTE
 	FTimerInterval     DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FTargetProcessors  PVOID
 	FPStateHandler     DWORD
 	FPStateContext     DWORD
@@ -34377,37 +34833,37 @@ type PPM_WMI_PERF_STATES_EX = struct {
 	FReserved1         DWORD
 	FReserved2         DWORD64
 	FState             [1]PPM_WMI_PERF_STATE
-}                                      /* winnt.h:5623:7 */
-type PPPM_WMI_PERF_STATES_EX = uintptr /* winnt.h:5623:30 */
+}                                      /* winnt.h:5740:7 */
+type PPPM_WMI_PERF_STATES_EX = uintptr /* winnt.h:5740:30 */
 
 type PPM_IDLE_STATE_ACCOUNTING = struct {
 	FIdleTransitions    DWORD
 	FFailedTransitions  DWORD
 	FInvalidBucketIndex DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FTotalTime          DWORD64
 	FIdleTimeBuckets    [6]DWORD
-}                                         /* winnt.h:5634:7 */
-type PPPM_IDLE_STATE_ACCOUNTING = uintptr /* winnt.h:5634:33 */
+}                                         /* winnt.h:5751:7 */
+type PPPM_IDLE_STATE_ACCOUNTING = uintptr /* winnt.h:5751:33 */
 
 type PPM_IDLE_ACCOUNTING = struct {
 	FStateCount       DWORD
 	FTotalTransitions DWORD
 	FResetCount       DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FStartTime        DWORD64
 	FState            [1]PPM_IDLE_STATE_ACCOUNTING
-}                                   /* winnt.h:5642:7 */
-type PPPM_IDLE_ACCOUNTING = uintptr /* winnt.h:5642:27 */
+}                                   /* winnt.h:5759:7 */
+type PPPM_IDLE_ACCOUNTING = uintptr /* winnt.h:5759:27 */
 
 type PPM_IDLE_STATE_BUCKET_EX = struct {
 	FTotalTimeUs DWORD64
 	FMinTimeUs   DWORD
 	FMaxTimeUs   DWORD
 	FCount       DWORD
-	_            [4]byte
-}                                        /* winnt.h:5649:7 */
-type PPPM_IDLE_STATE_BUCKET_EX = uintptr /* winnt.h:5649:32 */
+	F__ccgo_pad1 [4]byte
+}                                        /* winnt.h:5766:7 */
+type PPPM_IDLE_STATE_BUCKET_EX = uintptr /* winnt.h:5766:32 */
 
 type PPM_IDLE_STATE_ACCOUNTING_EX = struct {
 	FTotalTime            DWORD64
@@ -34418,8 +34874,8 @@ type PPM_IDLE_STATE_ACCOUNTING_EX = struct {
 	FMaxTimeUs            DWORD
 	FCancelledTransitions DWORD
 	FIdleTimeBuckets      [16]PPM_IDLE_STATE_BUCKET_EX
-}                                            /* winnt.h:5660:7 */
-type PPPM_IDLE_STATE_ACCOUNTING_EX = uintptr /* winnt.h:5660:36 */
+}                                            /* winnt.h:5777:7 */
+type PPPM_IDLE_STATE_ACCOUNTING_EX = uintptr /* winnt.h:5777:36 */
 
 type PPM_IDLE_ACCOUNTING_EX = struct {
 	FStateCount       DWORD
@@ -34428,8 +34884,8 @@ type PPM_IDLE_ACCOUNTING_EX = struct {
 	FAbortCount       DWORD
 	FStartTime        DWORD64
 	FState            [1]PPM_IDLE_STATE_ACCOUNTING_EX
-}                                      /* winnt.h:5669:7 */
-type PPPM_IDLE_ACCOUNTING_EX = uintptr /* winnt.h:5669:30 */
+}                                      /* winnt.h:5786:7 */
+type PPPM_IDLE_ACCOUNTING_EX = uintptr /* winnt.h:5786:30 */
 
 type PPM_PERFSTATE_EVENT = struct {
 	FState     DWORD
@@ -34437,52 +34893,52 @@ type PPM_PERFSTATE_EVENT = struct {
 	FLatency   DWORD
 	FSpeed     DWORD
 	FProcessor DWORD
-}                                   /* winnt.h:5713:7 */
-type PPPM_PERFSTATE_EVENT = uintptr /* winnt.h:5713:27 */
+}                                   /* winnt.h:5830:7 */
+type PPPM_PERFSTATE_EVENT = uintptr /* winnt.h:5830:27 */
 
 type PPM_PERFSTATE_DOMAIN_EVENT = struct {
-	FState      DWORD
-	FLatency    DWORD
-	FSpeed      DWORD
-	_           [4]byte
-	FProcessors DWORD64
-}                                          /* winnt.h:5720:7 */
-type PPPM_PERFSTATE_DOMAIN_EVENT = uintptr /* winnt.h:5720:34 */
+	FState       DWORD
+	FLatency     DWORD
+	FSpeed       DWORD
+	F__ccgo_pad1 [4]byte
+	FProcessors  DWORD64
+}                                          /* winnt.h:5837:7 */
+type PPPM_PERFSTATE_DOMAIN_EVENT = uintptr /* winnt.h:5837:34 */
 
 type PPM_IDLESTATE_EVENT = struct {
 	FNewState   DWORD
 	FOldState   DWORD
 	FProcessors DWORD64
-}                                   /* winnt.h:5726:7 */
-type PPPM_IDLESTATE_EVENT = uintptr /* winnt.h:5726:27 */
+}                                   /* winnt.h:5843:7 */
+type PPPM_IDLESTATE_EVENT = uintptr /* winnt.h:5843:27 */
 
 type PPM_THERMALCHANGE_EVENT = struct {
 	FThermalConstraint DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FProcessors        DWORD64
-}                                       /* winnt.h:5731:7 */
-type PPPM_THERMALCHANGE_EVENT = uintptr /* winnt.h:5731:31 */
+}                                       /* winnt.h:5848:7 */
+type PPPM_THERMALCHANGE_EVENT = uintptr /* winnt.h:5848:31 */
 type PPM_THERMAL_POLICY_EVENT = struct {
-	FMode       BYTE
-	_           [7]byte
-	FProcessors DWORD64
-}                                        /* winnt.h:5735:7 */
-type PPPM_THERMAL_POLICY_EVENT = uintptr /* winnt.h:5735:32 */
+	FMode        BYTE
+	F__ccgo_pad1 [7]byte
+	FProcessors  DWORD64
+}                                        /* winnt.h:5852:7 */
+type PPPM_THERMAL_POLICY_EVENT = uintptr /* winnt.h:5852:32 */
 
 type POWER_ACTION_POLICY = struct {
 	FAction    POWER_ACTION
 	FFlags     DWORD
 	FEventCode DWORD
-}                                   /* winnt.h:5752:7 */
-type PPOWER_ACTION_POLICY = uintptr /* winnt.h:5752:27 */
+}                                   /* winnt.h:5869:7 */
+type PPOWER_ACTION_POLICY = uintptr /* winnt.h:5869:27 */
 
 type PROCESSOR_IDLESTATE_INFO = struct {
 	FTimeCheck      DWORD
 	FDemotePercent  BYTE
 	FPromotePercent BYTE
 	FSpare          [2]BYTE
-}                                        /* winnt.h:5787:7 */
-type PPROCESSOR_IDLESTATE_INFO = uintptr /* winnt.h:5787:32 */
+}                                        /* winnt.h:5904:7 */
+type PPROCESSOR_IDLESTATE_INFO = uintptr /* winnt.h:5904:32 */
 
 type SYSTEM_POWER_LEVEL = struct {
 	FEnable         BOOLEAN
@@ -34490,8 +34946,8 @@ type SYSTEM_POWER_LEVEL = struct {
 	FBatteryLevel   DWORD
 	FPowerPolicy    POWER_ACTION_POLICY
 	FMinSystemState SYSTEM_POWER_STATE
-}                                  /* winnt.h:5795:7 */
-type PSYSTEM_POWER_LEVEL = uintptr /* winnt.h:5795:26 */
+}                                  /* winnt.h:5912:7 */
+type PSYSTEM_POWER_LEVEL = uintptr /* winnt.h:5912:26 */
 
 type _SYSTEM_POWER_POLICY = struct {
 	FRevision                    DWORD
@@ -34515,7 +34971,7 @@ type _SYSTEM_POWER_POLICY = struct {
 	FDischargePolicy             [4]SYSTEM_POWER_LEVEL
 	FVideoTimeout                DWORD
 	FVideoDimDisplay             BOOLEAN
-	_                            [3]byte
+	F__ccgo_pad1                 [3]byte
 	FVideoReserved               [3]DWORD
 	FSpindownTimeout             DWORD
 	FOptimizeForPower            BOOLEAN
@@ -34523,18 +34979,18 @@ type _SYSTEM_POWER_POLICY = struct {
 	FForcedThrottle              BYTE
 	FMinThrottle                 BYTE
 	FOverThrottled               POWER_ACTION_POLICY
-} /* winnt.h:5797:13 */
+} /* winnt.h:5914:13 */
 
-type SYSTEM_POWER_POLICY = _SYSTEM_POWER_POLICY /* winnt.h:5826:7 */
-type PSYSTEM_POWER_POLICY = uintptr             /* winnt.h:5826:27 */
+type SYSTEM_POWER_POLICY = _SYSTEM_POWER_POLICY /* winnt.h:5943:7 */
+type PSYSTEM_POWER_POLICY = uintptr             /* winnt.h:5943:27 */
 
 type PROCESSOR_IDLESTATE_POLICY = struct {
 	FRevision    WORD
 	FFlags       struct{ FAsWORD WORD }
 	FPolicyCount DWORD
 	FPolicy      [3]PROCESSOR_IDLESTATE_INFO
-}                                          /* winnt.h:5846:7 */
-type PPROCESSOR_IDLESTATE_POLICY = uintptr /* winnt.h:5846:34 */
+}                                          /* winnt.h:5963:7 */
+type PPROCESSOR_IDLESTATE_POLICY = uintptr /* winnt.h:5963:34 */
 
 type _PROCESSOR_POWER_POLICY_INFO = struct {
 	FTimeCheck      DWORD
@@ -34544,23 +35000,23 @@ type _PROCESSOR_POWER_POLICY_INFO = struct {
 	FPromotePercent BYTE
 	FSpare          [2]BYTE
 	FAllowDemotion  uint32 /* DWORD AllowDemotion: 1, DWORD AllowPromotion: 1, DWORD Reserved: 30 */
-} /* winnt.h:5848:13 */
+} /* winnt.h:5965:13 */
 
-type PROCESSOR_POWER_POLICY_INFO = _PROCESSOR_POWER_POLICY_INFO /* winnt.h:5858:7 */
-type PPROCESSOR_POWER_POLICY_INFO = uintptr                     /* winnt.h:5858:35 */
+type PROCESSOR_POWER_POLICY_INFO = _PROCESSOR_POWER_POLICY_INFO /* winnt.h:5975:7 */
+type PPROCESSOR_POWER_POLICY_INFO = uintptr                     /* winnt.h:5975:35 */
 
 type _PROCESSOR_POWER_POLICY = struct {
 	FRevision        DWORD
 	FDynamicThrottle BYTE
 	FSpare           [3]BYTE
 	FDisableCStates  uint32 /* DWORD DisableCStates: 1, DWORD Reserved: 31 */
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FPolicyCount     DWORD
 	FPolicy          [3]PROCESSOR_POWER_POLICY_INFO
-} /* winnt.h:5860:13 */
+} /* winnt.h:5977:13 */
 
-type PROCESSOR_POWER_POLICY = _PROCESSOR_POWER_POLICY /* winnt.h:5868:7 */
-type PPROCESSOR_POWER_POLICY = uintptr                /* winnt.h:5868:30 */
+type PROCESSOR_POWER_POLICY = _PROCESSOR_POWER_POLICY /* winnt.h:5985:7 */
+type PPROCESSOR_POWER_POLICY = uintptr                /* winnt.h:5985:30 */
 
 type PROCESSOR_PERFSTATE_POLICY = struct {
 	FRevision         DWORD
@@ -34573,8 +35029,8 @@ type PROCESSOR_PERFSTATE_POLICY = struct {
 	FDecreaseTime     DWORD
 	FIncreasePercent  DWORD
 	FDecreasePercent  DWORD
-}                                          /* winnt.h:5892:7 */
-type PPROCESSOR_PERFSTATE_POLICY = uintptr /* winnt.h:5892:34 */
+}                                          /* winnt.h:6009:7 */
+type PPROCESSOR_PERFSTATE_POLICY = uintptr /* winnt.h:6009:34 */
 
 type _ADMINISTRATOR_POWER_POLICY = struct {
 	FMinSleep           SYSTEM_POWER_STATE
@@ -34583,10 +35039,10 @@ type _ADMINISTRATOR_POWER_POLICY = struct {
 	FMaxVideoTimeout    DWORD
 	FMinSpindownTimeout DWORD
 	FMaxSpindownTimeout DWORD
-} /* winnt.h:5894:13 */
+} /* winnt.h:6011:13 */
 
-type ADMINISTRATOR_POWER_POLICY = _ADMINISTRATOR_POWER_POLICY /* winnt.h:5901:7 */
-type PADMINISTRATOR_POWER_POLICY = uintptr                    /* winnt.h:5901:34 */
+type ADMINISTRATOR_POWER_POLICY = _ADMINISTRATOR_POWER_POLICY /* winnt.h:6018:7 */
+type PADMINISTRATOR_POWER_POLICY = uintptr                    /* winnt.h:6018:34 */
 
 type SYSTEM_POWER_CAPABILITIES = struct {
 	FPowerButtonPresent     BOOLEAN
@@ -34618,8 +35074,8 @@ type SYSTEM_POWER_CAPABILITIES = struct {
 	FRtcWake                SYSTEM_POWER_STATE
 	FMinDeviceWakeState     SYSTEM_POWER_STATE
 	FDefaultLowLatencyWake  SYSTEM_POWER_STATE
-}                                         /* winnt.h:5933:7 */
-type PSYSTEM_POWER_CAPABILITIES = uintptr /* winnt.h:5933:33 */
+}                                         /* winnt.h:6050:7 */
+type PSYSTEM_POWER_CAPABILITIES = uintptr /* winnt.h:6050:33 */
 
 type SYSTEM_BATTERY_STATE = struct {
 	FAcOnLine          BOOLEAN
@@ -34633,8 +35089,8 @@ type SYSTEM_BATTERY_STATE = struct {
 	FEstimatedTime     DWORD
 	FDefaultAlert1     DWORD
 	FDefaultAlert2     DWORD
-}                                    /* winnt.h:5947:7 */
-type PSYSTEM_BATTERY_STATE = uintptr /* winnt.h:5947:28 */
+}                                    /* winnt.h:6064:7 */
+type PSYSTEM_BATTERY_STATE = uintptr /* winnt.h:6064:28 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -34666,7 +35122,7 @@ type _IMAGE_DOS_HEADER = struct {
 	Fe_oeminfo  WORD
 	Fe_res2     [10]WORD
 	Fe_lfanew   LONG
-} /* winnt.h:5959:13 */
+} /* winnt.h:6076:13 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -34678,8 +35134,8 @@ type _IMAGE_DOS_HEADER = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-type IMAGE_DOS_HEADER = _IMAGE_DOS_HEADER /* winnt.h:5979:7 */
-type PIMAGE_DOS_HEADER = uintptr          /* winnt.h:5979:24 */
+type IMAGE_DOS_HEADER = _IMAGE_DOS_HEADER /* winnt.h:6096:7 */
+type PIMAGE_DOS_HEADER = uintptr          /* winnt.h:6096:24 */
 
 type _IMAGE_OS2_HEADER = struct {
 	Fne_magic        WORD
@@ -34712,10 +35168,10 @@ type _IMAGE_OS2_HEADER = struct {
 	Fne_psegrefbytes WORD
 	Fne_swaparea     WORD
 	Fne_expver       WORD
-} /* winnt.h:5981:13 */
+} /* winnt.h:6098:13 */
 
-type IMAGE_OS2_HEADER = _IMAGE_OS2_HEADER /* winnt.h:6012:7 */
-type PIMAGE_OS2_HEADER = uintptr          /* winnt.h:6012:24 */
+type IMAGE_OS2_HEADER = _IMAGE_OS2_HEADER /* winnt.h:6129:7 */
+type PIMAGE_OS2_HEADER = uintptr          /* winnt.h:6129:24 */
 
 type _IMAGE_VXD_HEADER = struct {
 	Fe32_magic        WORD
@@ -34769,10 +35225,10 @@ type _IMAGE_VXD_HEADER = struct {
 	Fe32_winreslen    DWORD
 	Fe32_devid        WORD
 	Fe32_ddkver       WORD
-} /* winnt.h:6014:13 */
+} /* winnt.h:6131:13 */
 
-type IMAGE_VXD_HEADER = _IMAGE_VXD_HEADER /* winnt.h:6066:7 */
-type PIMAGE_VXD_HEADER = uintptr          /* winnt.h:6066:24 */
+type IMAGE_VXD_HEADER = _IMAGE_VXD_HEADER /* winnt.h:6183:7 */
+type PIMAGE_VXD_HEADER = uintptr          /* winnt.h:6183:24 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -34787,23 +35243,23 @@ type _IMAGE_FILE_HEADER = struct {
 	FNumberOfSymbols      DWORD
 	FSizeOfOptionalHeader WORD
 	FCharacteristics      WORD
-} /* winnt.h:6070:13 */
+} /* winnt.h:6187:13 */
 
 // *
 // 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.
 
-type IMAGE_FILE_HEADER = _IMAGE_FILE_HEADER /* winnt.h:6078:7 */
-type PIMAGE_FILE_HEADER = uintptr           /* winnt.h:6078:25 */
+type IMAGE_FILE_HEADER = _IMAGE_FILE_HEADER /* winnt.h:6195:7 */
+type PIMAGE_FILE_HEADER = uintptr           /* winnt.h:6195:25 */
 
 type _IMAGE_DATA_DIRECTORY = struct {
 	FVirtualAddress DWORD
 	FSize           DWORD
-} /* winnt.h:6131:13 */
+} /* winnt.h:6248:13 */
 
-type IMAGE_DATA_DIRECTORY = _IMAGE_DATA_DIRECTORY /* winnt.h:6134:7 */
-type PIMAGE_DATA_DIRECTORY = uintptr              /* winnt.h:6134:28 */
+type IMAGE_DATA_DIRECTORY = _IMAGE_DATA_DIRECTORY /* winnt.h:6251:7 */
+type PIMAGE_DATA_DIRECTORY = uintptr              /* winnt.h:6251:28 */
 
 type _IMAGE_OPTIONAL_HEADER = struct {
 	FMagic                       WORD
@@ -34837,10 +35293,10 @@ type _IMAGE_OPTIONAL_HEADER = struct {
 	FLoaderFlags                 DWORD
 	FNumberOfRvaAndSizes         DWORD
 	FDataDirectory               [16]IMAGE_DATA_DIRECTORY
-} /* winnt.h:6138:13 */
+} /* winnt.h:6255:13 */
 
-type IMAGE_OPTIONAL_HEADER32 = _IMAGE_OPTIONAL_HEADER /* winnt.h:6171:7 */
-type PIMAGE_OPTIONAL_HEADER32 = uintptr               /* winnt.h:6171:31 */
+type IMAGE_OPTIONAL_HEADER32 = _IMAGE_OPTIONAL_HEADER /* winnt.h:6288:7 */
+type PIMAGE_OPTIONAL_HEADER32 = uintptr               /* winnt.h:6288:31 */
 
 type _IMAGE_ROM_OPTIONAL_HEADER = struct {
 	FMagic                   WORD
@@ -34856,10 +35312,10 @@ type _IMAGE_ROM_OPTIONAL_HEADER = struct {
 	FGprMask                 DWORD
 	FCprMask                 [4]DWORD
 	FGpValue                 DWORD
-} /* winnt.h:6173:13 */
+} /* winnt.h:6290:13 */
 
-type IMAGE_ROM_OPTIONAL_HEADER = _IMAGE_ROM_OPTIONAL_HEADER /* winnt.h:6187:7 */
-type PIMAGE_ROM_OPTIONAL_HEADER = uintptr                   /* winnt.h:6187:33 */
+type IMAGE_ROM_OPTIONAL_HEADER = _IMAGE_ROM_OPTIONAL_HEADER /* winnt.h:6304:7 */
+type PIMAGE_ROM_OPTIONAL_HEADER = uintptr                   /* winnt.h:6304:33 */
 
 type _IMAGE_OPTIONAL_HEADER64 = struct {
 	FMagic                       WORD
@@ -34892,42 +35348,42 @@ type _IMAGE_OPTIONAL_HEADER64 = struct {
 	FLoaderFlags                 DWORD
 	FNumberOfRvaAndSizes         DWORD
 	FDataDirectory               [16]IMAGE_DATA_DIRECTORY
-} /* winnt.h:6189:13 */
+} /* winnt.h:6306:13 */
 
-type IMAGE_OPTIONAL_HEADER64 = _IMAGE_OPTIONAL_HEADER64 /* winnt.h:6220:7 */
-type PIMAGE_OPTIONAL_HEADER64 = uintptr                 /* winnt.h:6220:31 */
+type IMAGE_OPTIONAL_HEADER64 = _IMAGE_OPTIONAL_HEADER64 /* winnt.h:6337:7 */
+type PIMAGE_OPTIONAL_HEADER64 = uintptr                 /* winnt.h:6337:31 */
 
-type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER64   /* winnt.h:6232:37 */
-type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER64 /* winnt.h:6233:38 */
+type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER64   /* winnt.h:6349:37 */
+type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER64 /* winnt.h:6350:38 */
 
 type _IMAGE_NT_HEADERS64 = struct {
 	FSignature      DWORD
 	FFileHeader     IMAGE_FILE_HEADER
 	FOptionalHeader IMAGE_OPTIONAL_HEADER64
-} /* winnt.h:6243:13 */
+} /* winnt.h:6360:13 */
 
-type IMAGE_NT_HEADERS64 = _IMAGE_NT_HEADERS64 /* winnt.h:6247:7 */
-type PIMAGE_NT_HEADERS64 = uintptr            /* winnt.h:6247:26 */
+type IMAGE_NT_HEADERS64 = _IMAGE_NT_HEADERS64 /* winnt.h:6364:7 */
+type PIMAGE_NT_HEADERS64 = uintptr            /* winnt.h:6364:26 */
 
 type _IMAGE_NT_HEADERS = struct {
 	FSignature      DWORD
 	FFileHeader     IMAGE_FILE_HEADER
 	FOptionalHeader IMAGE_OPTIONAL_HEADER32
-} /* winnt.h:6249:13 */
+} /* winnt.h:6366:13 */
 
-type IMAGE_NT_HEADERS32 = _IMAGE_NT_HEADERS /* winnt.h:6253:7 */
-type PIMAGE_NT_HEADERS32 = uintptr          /* winnt.h:6253:26 */
+type IMAGE_NT_HEADERS32 = _IMAGE_NT_HEADERS /* winnt.h:6370:7 */
+type PIMAGE_NT_HEADERS32 = uintptr          /* winnt.h:6370:26 */
 
 type _IMAGE_ROM_HEADERS = struct {
 	FFileHeader     IMAGE_FILE_HEADER
 	FOptionalHeader IMAGE_ROM_OPTIONAL_HEADER
-} /* winnt.h:6255:13 */
+} /* winnt.h:6372:13 */
 
-type IMAGE_ROM_HEADERS = _IMAGE_ROM_HEADERS /* winnt.h:6258:7 */
-type PIMAGE_ROM_HEADERS = uintptr           /* winnt.h:6258:25 */
+type IMAGE_ROM_HEADERS = _IMAGE_ROM_HEADERS /* winnt.h:6375:7 */
+type PIMAGE_ROM_HEADERS = uintptr           /* winnt.h:6375:25 */
 
-type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS64   /* winnt.h:6261:32 */
-type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS64 /* winnt.h:6262:33 */
+type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS64   /* winnt.h:6378:32 */
+type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS64 /* winnt.h:6379:33 */
 
 type ANON_OBJECT_HEADER1 = struct {
 	FSig1          WORD
@@ -34937,9 +35393,9 @@ type ANON_OBJECT_HEADER1 = struct {
 	FTimeDateStamp DWORD
 	FClassID       CLSID
 	FSizeOfData    DWORD
-} /* winnt.h:6313:13 */
+} /* winnt.h:6430:13 */
 
-type ANON_OBJECT_HEADER = ANON_OBJECT_HEADER1 /* winnt.h:6321:7 */
+type ANON_OBJECT_HEADER = ANON_OBJECT_HEADER1 /* winnt.h:6438:7 */
 
 type ANON_OBJECT_HEADER_V21 = struct {
 	FSig1           WORD
@@ -34952,9 +35408,9 @@ type ANON_OBJECT_HEADER_V21 = struct {
 	FFlags          DWORD
 	FMetaDataSize   DWORD
 	FMetaDataOffset DWORD
-} /* winnt.h:6323:13 */
+} /* winnt.h:6440:13 */
 
-type ANON_OBJECT_HEADER_V2 = ANON_OBJECT_HEADER_V21 /* winnt.h:6334:7 */
+type ANON_OBJECT_HEADER_V2 = ANON_OBJECT_HEADER_V21 /* winnt.h:6451:7 */
 
 type ANON_OBJECT_HEADER_BIGOBJ1 = struct {
 	FSig1                 WORD
@@ -34970,9 +35426,9 @@ type ANON_OBJECT_HEADER_BIGOBJ1 = struct {
 	FNumberOfSections     DWORD
 	FPointerToSymbolTable DWORD
 	FNumberOfSymbols      DWORD
-} /* winnt.h:6336:13 */
+} /* winnt.h:6453:13 */
 
-type ANON_OBJECT_HEADER_BIGOBJ = ANON_OBJECT_HEADER_BIGOBJ1 /* winnt.h:6350:7 */
+type ANON_OBJECT_HEADER_BIGOBJ = ANON_OBJECT_HEADER_BIGOBJ1 /* winnt.h:6467:7 */
 
 type _IMAGE_SECTION_HEADER = struct {
 	FName                 [8]BYTE
@@ -34985,10 +35441,10 @@ type _IMAGE_SECTION_HEADER = struct {
 	FNumberOfRelocations  WORD
 	FNumberOfLinenumbers  WORD
 	FCharacteristics      DWORD
-} /* winnt.h:6354:13 */
+} /* winnt.h:6471:13 */
 
-type IMAGE_SECTION_HEADER = _IMAGE_SECTION_HEADER /* winnt.h:6368:7 */
-type PIMAGE_SECTION_HEADER = uintptr              /* winnt.h:6368:28 */
+type IMAGE_SECTION_HEADER = _IMAGE_SECTION_HEADER /* winnt.h:6485:7 */
+type PIMAGE_SECTION_HEADER = uintptr              /* winnt.h:6485:28 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -34996,38 +35452,38 @@ type PIMAGE_SECTION_HEADER = uintptr              /* winnt.h:6368:28 */
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 type _IMAGE_SYMBOL = struct {
 	FN struct {
-		_          [0]uint32
-		FShortName [8]BYTE
+		F__ccgo_pad1 [0]uint32
+		FShortName   [8]BYTE
 	}
 	FValue              DWORD
 	FSectionNumber      SHORT
 	FType               WORD
 	FStorageClass       BYTE
 	FNumberOfAuxSymbols BYTE
-	_                   [2]byte
-} /* winnt.h:6418:13 */
+	F__ccgo_pad1        [2]byte
+} /* winnt.h:6535:13 */
 
 // *
 // 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.
-type IMAGE_SYMBOL = _IMAGE_SYMBOL /* winnt.h:6432:7 */
-type PIMAGE_SYMBOL = uintptr      /* winnt.h:6433:36 */
+type IMAGE_SYMBOL = _IMAGE_SYMBOL /* winnt.h:6549:7 */
+type PIMAGE_SYMBOL = uintptr      /* winnt.h:6550:36 */
 
 type _IMAGE_SYMBOL_EX = struct {
 	FN struct {
-		_          [0]uint32
-		FShortName [8]BYTE
+		F__ccgo_pad1 [0]uint32
+		FShortName   [8]BYTE
 	}
 	FValue              DWORD
 	FSectionNumber      LONG
 	FType               WORD
 	FStorageClass       BYTE
 	FNumberOfAuxSymbols BYTE
-} /* winnt.h:6437:13 */
+} /* winnt.h:6554:13 */
 
-type IMAGE_SYMBOL_EX = _IMAGE_SYMBOL_EX /* winnt.h:6451:7 */
-type PIMAGE_SYMBOL_EX = uintptr         /* winnt.h:6451:33 */
+type IMAGE_SYMBOL_EX = _IMAGE_SYMBOL_EX /* winnt.h:6568:7 */
+type PIMAGE_SYMBOL_EX = uintptr         /* winnt.h:6568:33 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -35036,17 +35492,17 @@ type PIMAGE_SYMBOL_EX = uintptr         /* winnt.h:6451:33 */
 type IMAGE_AUX_SYMBOL_TOKEN_DEF1 = struct {
 	FbAuxType         BYTE
 	FbReserved        BYTE
-	_                 [2]byte
+	F__ccgo_pad1      [2]byte
 	FSymbolTableIndex DWORD
 	FrgbReserved      [12]BYTE
-} /* winnt.h:6544:13 */
+} /* winnt.h:6661:13 */
 
 // *
 // 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.
-type IMAGE_AUX_SYMBOL_TOKEN_DEF = IMAGE_AUX_SYMBOL_TOKEN_DEF1 /* winnt.h:6549:7 */
-type PIMAGE_AUX_SYMBOL_TOKEN_DEF = uintptr                    /* winnt.h:6549:44 */
+type IMAGE_AUX_SYMBOL_TOKEN_DEF = IMAGE_AUX_SYMBOL_TOKEN_DEF1 /* winnt.h:6666:7 */
+type PIMAGE_AUX_SYMBOL_TOKEN_DEF = uintptr                    /* winnt.h:6666:44 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -35056,8 +35512,8 @@ type _IMAGE_AUX_SYMBOL = struct {
 	FSym struct {
 		FTagIndex DWORD
 		FMisc     struct {
-			_     [0]uint32
-			FLnSz struct {
+			F__ccgo_pad1 [0]uint32
+			FLnSz        struct {
 				FLinenumber WORD
 				FSize       WORD
 			}
@@ -35068,18 +35524,18 @@ type _IMAGE_AUX_SYMBOL = struct {
 				FPointerToNextFunction DWORD
 			}
 		}
-		FTvIndex WORD
-		_        [2]byte
+		FTvIndex     WORD
+		F__ccgo_pad1 [2]byte
 	}
-} /* winnt.h:6552:13 */
+} /* winnt.h:6669:13 */
 
 // *
 // 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.
 
-type IMAGE_AUX_SYMBOL = _IMAGE_AUX_SYMBOL /* winnt.h:6589:7 */
-type PIMAGE_AUX_SYMBOL = uintptr          /* winnt.h:6589:34 */
+type IMAGE_AUX_SYMBOL = _IMAGE_AUX_SYMBOL /* winnt.h:6706:7 */
+type PIMAGE_AUX_SYMBOL = uintptr          /* winnt.h:6706:34 */
 
 type _IMAGE_AUX_SYMBOL_EX = struct {
 	FSym struct {
@@ -35087,32 +35543,32 @@ type _IMAGE_AUX_SYMBOL_EX = struct {
 		FWeakSearchType      DWORD
 		FrgbReserved         [12]BYTE
 	}
-	_ [4]byte
-} /* winnt.h:6591:13 */
+	F__ccgo_pad1 [4]byte
+} /* winnt.h:6708:13 */
 
-type IMAGE_AUX_SYMBOL_EX = _IMAGE_AUX_SYMBOL_EX /* winnt.h:6619:7 */
-type PIMAGE_AUX_SYMBOL_EX = uintptr             /* winnt.h:6619:37 */
+type IMAGE_AUX_SYMBOL_EX = _IMAGE_AUX_SYMBOL_EX /* winnt.h:6736:7 */
+type PIMAGE_AUX_SYMBOL_EX = uintptr             /* winnt.h:6736:37 */
 
-type IMAGE_AUX_SYMBOL_TYPE = uint32 /* winnt.h:6625:7 */
+type IMAGE_AUX_SYMBOL_TYPE = uint32 /* winnt.h:6742:7 */
 
 type _IMAGE_RELOCATION = struct {
 	Fu                struct{ FVirtualAddress DWORD }
 	FSymbolTableIndex DWORD
 	FType             WORD
-	_                 [2]byte
-} /* winnt.h:6639:13 */
+	F__ccgo_pad1      [2]byte
+} /* winnt.h:6756:13 */
 
-type IMAGE_RELOCATION = _IMAGE_RELOCATION /* winnt.h:6646:7 */
-type PIMAGE_RELOCATION = uintptr          /* winnt.h:6647:40 */
+type IMAGE_RELOCATION = _IMAGE_RELOCATION /* winnt.h:6763:7 */
+type PIMAGE_RELOCATION = uintptr          /* winnt.h:6764:40 */
 
 type _IMAGE_LINENUMBER = struct {
-	FType       struct{ FSymbolTableIndex DWORD }
-	FLinenumber WORD
-	_           [2]byte
-} /* winnt.h:6977:13 */
+	FType        struct{ FSymbolTableIndex DWORD }
+	FLinenumber  WORD
+	F__ccgo_pad1 [2]byte
+} /* winnt.h:7094:13 */
 
-type IMAGE_LINENUMBER = _IMAGE_LINENUMBER /* winnt.h:6983:7 */
-type PIMAGE_LINENUMBER = uintptr          /* winnt.h:6984:40 */
+type IMAGE_LINENUMBER = _IMAGE_LINENUMBER /* winnt.h:7100:7 */
+type PIMAGE_LINENUMBER = uintptr          /* winnt.h:7101:40 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -35122,15 +35578,15 @@ type PIMAGE_LINENUMBER = uintptr          /* winnt.h:6984:40 */
 type _IMAGE_BASE_RELOCATION = struct {
 	FVirtualAddress DWORD
 	FSizeOfBlock    DWORD
-} /* winnt.h:6990:13 */
+} /* winnt.h:7107:13 */
 
 // *
 // 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.
 
-type IMAGE_BASE_RELOCATION = _IMAGE_BASE_RELOCATION /* winnt.h:6993:7 */
-type PIMAGE_BASE_RELOCATION = uintptr               /* winnt.h:6994:45 */
+type IMAGE_BASE_RELOCATION = _IMAGE_BASE_RELOCATION /* winnt.h:7110:7 */
+type PIMAGE_BASE_RELOCATION = uintptr               /* winnt.h:7111:45 */
 
 type _IMAGE_ARCHIVE_MEMBER_HEADER = struct {
 	FName      [16]BYTE
@@ -35140,10 +35596,10 @@ type _IMAGE_ARCHIVE_MEMBER_HEADER = struct {
 	FMode      [8]BYTE
 	FSize      [10]BYTE
 	FEndHeader [2]BYTE
-} /* winnt.h:7017:13 */
+} /* winnt.h:7134:13 */
 
-type IMAGE_ARCHIVE_MEMBER_HEADER = _IMAGE_ARCHIVE_MEMBER_HEADER /* winnt.h:7025:7 */
-type PIMAGE_ARCHIVE_MEMBER_HEADER = uintptr                     /* winnt.h:7025:35 */
+type IMAGE_ARCHIVE_MEMBER_HEADER = _IMAGE_ARCHIVE_MEMBER_HEADER /* winnt.h:7142:7 */
+type PIMAGE_ARCHIVE_MEMBER_HEADER = uintptr                     /* winnt.h:7142:35 */
 
 type _IMAGE_EXPORT_DIRECTORY = struct {
 	FCharacteristics       DWORD
@@ -35157,19 +35613,19 @@ type _IMAGE_EXPORT_DIRECTORY = struct {
 	FAddressOfFunctions    DWORD
 	FAddressOfNames        DWORD
 	FAddressOfNameOrdinals DWORD
-} /* winnt.h:7029:13 */
+} /* winnt.h:7146:13 */
 
-type IMAGE_EXPORT_DIRECTORY = _IMAGE_EXPORT_DIRECTORY /* winnt.h:7041:7 */
-type PIMAGE_EXPORT_DIRECTORY = uintptr                /* winnt.h:7041:30 */
+type IMAGE_EXPORT_DIRECTORY = _IMAGE_EXPORT_DIRECTORY /* winnt.h:7158:7 */
+type PIMAGE_EXPORT_DIRECTORY = uintptr                /* winnt.h:7158:30 */
 
 type _IMAGE_IMPORT_BY_NAME = struct {
-	FHint WORD
-	FName [1]CHAR
-	_     [1]byte
-} /* winnt.h:7043:13 */
+	FHint        WORD
+	FName        [1]CHAR
+	F__ccgo_pad1 [1]byte
+} /* winnt.h:7160:13 */
 
-type IMAGE_IMPORT_BY_NAME = _IMAGE_IMPORT_BY_NAME /* winnt.h:7046:7 */
-type PIMAGE_IMPORT_BY_NAME = uintptr              /* winnt.h:7046:28 */
+type IMAGE_IMPORT_BY_NAME = _IMAGE_IMPORT_BY_NAME /* winnt.h:7163:7 */
+type PIMAGE_IMPORT_BY_NAME = uintptr              /* winnt.h:7163:28 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -35178,15 +35634,15 @@ type PIMAGE_IMPORT_BY_NAME = uintptr              /* winnt.h:7046:28 */
 
 type _IMAGE_THUNK_DATA64 = struct {
 	Fu1 struct{ FForwarderString ULONGLONG }
-} /* winnt.h:7050:13 */
+} /* winnt.h:7167:13 */
 
 // *
 // 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.
 
-type IMAGE_THUNK_DATA64 = _IMAGE_THUNK_DATA64 /* winnt.h:7057:7 */
-type PIMAGE_THUNK_DATA64 = uintptr            /* winnt.h:7058:32 */
+type IMAGE_THUNK_DATA64 = _IMAGE_THUNK_DATA64 /* winnt.h:7174:7 */
+type PIMAGE_THUNK_DATA64 = uintptr            /* winnt.h:7175:32 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -35195,17 +35651,17 @@ type PIMAGE_THUNK_DATA64 = uintptr            /* winnt.h:7058:32 */
 
 type _IMAGE_THUNK_DATA32 = struct {
 	Fu1 struct{ FForwarderString DWORD }
-} /* winnt.h:7062:13 */
+} /* winnt.h:7179:13 */
 
 // *
 // 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.
 
-type IMAGE_THUNK_DATA32 = _IMAGE_THUNK_DATA32 /* winnt.h:7069:7 */
-type PIMAGE_THUNK_DATA32 = uintptr            /* winnt.h:7070:32 */
+type IMAGE_THUNK_DATA32 = _IMAGE_THUNK_DATA32 /* winnt.h:7186:7 */
+type PIMAGE_THUNK_DATA32 = uintptr            /* winnt.h:7187:32 */
 
-type PIMAGE_TLS_CALLBACK = uintptr /* winnt.h:7079:18 */
+type PIMAGE_TLS_CALLBACK = uintptr /* winnt.h:7196:18 */
 
 type _IMAGE_TLS_DIRECTORY64 = struct {
 	FStartAddressOfRawData ULONGLONG
@@ -35214,10 +35670,10 @@ type _IMAGE_TLS_DIRECTORY64 = struct {
 	FAddressOfCallBacks    ULONGLONG
 	FSizeOfZeroFill        DWORD
 	FCharacteristics       DWORD
-} /* winnt.h:7081:13 */
+} /* winnt.h:7198:13 */
 
-type IMAGE_TLS_DIRECTORY64 = _IMAGE_TLS_DIRECTORY64 /* winnt.h:7088:7 */
-type PIMAGE_TLS_DIRECTORY64 = uintptr               /* winnt.h:7089:35 */
+type IMAGE_TLS_DIRECTORY64 = _IMAGE_TLS_DIRECTORY64 /* winnt.h:7205:7 */
+type PIMAGE_TLS_DIRECTORY64 = uintptr               /* winnt.h:7206:35 */
 
 type _IMAGE_TLS_DIRECTORY32 = struct {
 	FStartAddressOfRawData DWORD
@@ -35226,15 +35682,15 @@ type _IMAGE_TLS_DIRECTORY32 = struct {
 	FAddressOfCallBacks    DWORD
 	FSizeOfZeroFill        DWORD
 	FCharacteristics       DWORD
-} /* winnt.h:7091:13 */
+} /* winnt.h:7208:13 */
 
-type IMAGE_TLS_DIRECTORY32 = _IMAGE_TLS_DIRECTORY32 /* winnt.h:7098:7 */
-type PIMAGE_TLS_DIRECTORY32 = uintptr               /* winnt.h:7099:35 */
+type IMAGE_TLS_DIRECTORY32 = _IMAGE_TLS_DIRECTORY32 /* winnt.h:7215:7 */
+type PIMAGE_TLS_DIRECTORY32 = uintptr               /* winnt.h:7216:35 */
 
-type IMAGE_THUNK_DATA = IMAGE_THUNK_DATA64         /* winnt.h:7104:32 */
-type PIMAGE_THUNK_DATA = PIMAGE_THUNK_DATA64       /* winnt.h:7105:33 */
-type IMAGE_TLS_DIRECTORY = IMAGE_TLS_DIRECTORY64   /* winnt.h:7107:35 */
-type PIMAGE_TLS_DIRECTORY = PIMAGE_TLS_DIRECTORY64 /* winnt.h:7108:36 */
+type IMAGE_THUNK_DATA = IMAGE_THUNK_DATA64         /* winnt.h:7221:32 */
+type PIMAGE_THUNK_DATA = PIMAGE_THUNK_DATA64       /* winnt.h:7222:33 */
+type IMAGE_TLS_DIRECTORY = IMAGE_TLS_DIRECTORY64   /* winnt.h:7224:35 */
+type PIMAGE_TLS_DIRECTORY = PIMAGE_TLS_DIRECTORY64 /* winnt.h:7225:36 */
 
 type _IMAGE_IMPORT_DESCRIPTOR = struct {
 	Fu              struct{ FCharacteristics DWORD }
@@ -35242,28 +35698,28 @@ type _IMAGE_IMPORT_DESCRIPTOR = struct {
 	FForwarderChain DWORD
 	FName           DWORD
 	FFirstThunk     DWORD
-} /* winnt.h:7119:13 */
+} /* winnt.h:7236:13 */
 
-type IMAGE_IMPORT_DESCRIPTOR = _IMAGE_IMPORT_DESCRIPTOR /* winnt.h:7129:7 */
-type PIMAGE_IMPORT_DESCRIPTOR = uintptr                 /* winnt.h:7130:47 */
+type IMAGE_IMPORT_DESCRIPTOR = _IMAGE_IMPORT_DESCRIPTOR /* winnt.h:7246:7 */
+type PIMAGE_IMPORT_DESCRIPTOR = uintptr                 /* winnt.h:7247:47 */
 
 type _IMAGE_BOUND_IMPORT_DESCRIPTOR = struct {
 	FTimeDateStamp               DWORD
 	FOffsetModuleName            WORD
 	FNumberOfModuleForwarderRefs WORD
-} /* winnt.h:7132:13 */
+} /* winnt.h:7249:13 */
 
-type IMAGE_BOUND_IMPORT_DESCRIPTOR = _IMAGE_BOUND_IMPORT_DESCRIPTOR /* winnt.h:7136:7 */
-type PIMAGE_BOUND_IMPORT_DESCRIPTOR = uintptr                       /* winnt.h:7136:37 */
+type IMAGE_BOUND_IMPORT_DESCRIPTOR = _IMAGE_BOUND_IMPORT_DESCRIPTOR /* winnt.h:7253:7 */
+type PIMAGE_BOUND_IMPORT_DESCRIPTOR = uintptr                       /* winnt.h:7253:37 */
 
 type _IMAGE_BOUND_FORWARDER_REF = struct {
 	FTimeDateStamp    DWORD
 	FOffsetModuleName WORD
 	FReserved         WORD
-} /* winnt.h:7138:13 */
+} /* winnt.h:7255:13 */
 
-type IMAGE_BOUND_FORWARDER_REF = _IMAGE_BOUND_FORWARDER_REF /* winnt.h:7142:7 */
-type PIMAGE_BOUND_FORWARDER_REF = uintptr                   /* winnt.h:7142:33 */
+type IMAGE_BOUND_FORWARDER_REF = _IMAGE_BOUND_FORWARDER_REF /* winnt.h:7259:7 */
+type PIMAGE_BOUND_FORWARDER_REF = uintptr                   /* winnt.h:7259:33 */
 
 type _IMAGE_DELAYLOAD_DESCRIPTOR = struct {
 	FAttributes                 struct{ FAllAttributes DWORD }
@@ -35274,11 +35730,11 @@ type _IMAGE_DELAYLOAD_DESCRIPTOR = struct {
 	FBoundImportAddressTableRVA DWORD
 	FUnloadInformationTableRVA  DWORD
 	FTimeDateStamp              DWORD
-} /* winnt.h:7144:13 */
+} /* winnt.h:7261:13 */
 
-type IMAGE_DELAYLOAD_DESCRIPTOR = _IMAGE_DELAYLOAD_DESCRIPTOR /* winnt.h:7159:7 */
-type PIMAGE_DELAYLOAD_DESCRIPTOR = uintptr                    /* winnt.h:7159:34 */
-type PCIMAGE_DELAYLOAD_DESCRIPTOR = uintptr                   /* winnt.h:7160:46 */
+type IMAGE_DELAYLOAD_DESCRIPTOR = _IMAGE_DELAYLOAD_DESCRIPTOR /* winnt.h:7276:7 */
+type PIMAGE_DELAYLOAD_DESCRIPTOR = uintptr                    /* winnt.h:7276:34 */
+type PCIMAGE_DELAYLOAD_DESCRIPTOR = uintptr                   /* winnt.h:7277:46 */
 
 type _IMAGE_RESOURCE_DIRECTORY = struct {
 	FCharacteristics      DWORD
@@ -35287,50 +35743,50 @@ type _IMAGE_RESOURCE_DIRECTORY = struct {
 	FMinorVersion         WORD
 	FNumberOfNamedEntries WORD
 	FNumberOfIdEntries    WORD
-} /* winnt.h:7162:13 */
+} /* winnt.h:7279:13 */
 
-type IMAGE_RESOURCE_DIRECTORY = _IMAGE_RESOURCE_DIRECTORY /* winnt.h:7169:7 */
-type PIMAGE_RESOURCE_DIRECTORY = uintptr                  /* winnt.h:7169:32 */
+type IMAGE_RESOURCE_DIRECTORY = _IMAGE_RESOURCE_DIRECTORY /* winnt.h:7286:7 */
+type PIMAGE_RESOURCE_DIRECTORY = uintptr                  /* winnt.h:7286:32 */
 
 type _IMAGE_RESOURCE_DIRECTORY_ENTRY = struct {
 	Fu struct {
 		Fs struct {
-			_           [0]uint32
-			FNameOffset uint32 /* DWORD NameOffset: 31, DWORD NameIsString: 1 */
+			F__ccgo_pad1 [0]uint32
+			FNameOffset  uint32 /* DWORD NameOffset: 31, DWORD NameIsString: 1 */
 		}
 	}
 	Fu2 struct{ FOffsetToData DWORD }
-} /* winnt.h:7174:13 */
+} /* winnt.h:7291:13 */
 
-type IMAGE_RESOURCE_DIRECTORY_ENTRY = _IMAGE_RESOURCE_DIRECTORY_ENTRY /* winnt.h:7190:7 */
-type PIMAGE_RESOURCE_DIRECTORY_ENTRY = uintptr                        /* winnt.h:7190:38 */
+type IMAGE_RESOURCE_DIRECTORY_ENTRY = _IMAGE_RESOURCE_DIRECTORY_ENTRY /* winnt.h:7307:7 */
+type PIMAGE_RESOURCE_DIRECTORY_ENTRY = uintptr                        /* winnt.h:7307:38 */
 
 type _IMAGE_RESOURCE_DIRECTORY_STRING = struct {
-	FLength     WORD
-	FNameString [1]CHAR
-	_           [1]byte
-} /* winnt.h:7192:13 */
+	FLength      WORD
+	FNameString  [1]CHAR
+	F__ccgo_pad1 [1]byte
+} /* winnt.h:7309:13 */
 
-type IMAGE_RESOURCE_DIRECTORY_STRING = _IMAGE_RESOURCE_DIRECTORY_STRING /* winnt.h:7195:7 */
-type PIMAGE_RESOURCE_DIRECTORY_STRING = uintptr                         /* winnt.h:7195:39 */
+type IMAGE_RESOURCE_DIRECTORY_STRING = _IMAGE_RESOURCE_DIRECTORY_STRING /* winnt.h:7312:7 */
+type PIMAGE_RESOURCE_DIRECTORY_STRING = uintptr                         /* winnt.h:7312:39 */
 
 type _IMAGE_RESOURCE_DIR_STRING_U = struct {
 	FLength     WORD
 	FNameString [1]WCHAR
-} /* winnt.h:7197:13 */
+} /* winnt.h:7314:13 */
 
-type IMAGE_RESOURCE_DIR_STRING_U = _IMAGE_RESOURCE_DIR_STRING_U /* winnt.h:7200:7 */
-type PIMAGE_RESOURCE_DIR_STRING_U = uintptr                     /* winnt.h:7200:35 */
+type IMAGE_RESOURCE_DIR_STRING_U = _IMAGE_RESOURCE_DIR_STRING_U /* winnt.h:7317:7 */
+type PIMAGE_RESOURCE_DIR_STRING_U = uintptr                     /* winnt.h:7317:35 */
 
 type _IMAGE_RESOURCE_DATA_ENTRY = struct {
 	FOffsetToData DWORD
 	FSize         DWORD
 	FCodePage     DWORD
 	FReserved     DWORD
-} /* winnt.h:7202:13 */
+} /* winnt.h:7319:13 */
 
-type IMAGE_RESOURCE_DATA_ENTRY = _IMAGE_RESOURCE_DATA_ENTRY /* winnt.h:7207:7 */
-type PIMAGE_RESOURCE_DATA_ENTRY = uintptr                   /* winnt.h:7207:33 */
+type IMAGE_RESOURCE_DATA_ENTRY = _IMAGE_RESOURCE_DATA_ENTRY /* winnt.h:7324:7 */
+type PIMAGE_RESOURCE_DATA_ENTRY = uintptr                   /* winnt.h:7324:33 */
 
 type IMAGE_LOAD_CONFIG_DIRECTORY32 = struct {
 	FSize                          DWORD
@@ -35353,8 +35809,8 @@ type IMAGE_LOAD_CONFIG_DIRECTORY32 = struct {
 	FSecurityCookie                DWORD
 	FSEHandlerTable                DWORD
 	FSEHandlerCount                DWORD
-}                                             /* winnt.h:7230:7 */
-type PIMAGE_LOAD_CONFIG_DIRECTORY32 = uintptr /* winnt.h:7230:37 */
+}                                             /* winnt.h:7347:7 */
+type PIMAGE_LOAD_CONFIG_DIRECTORY32 = uintptr /* winnt.h:7347:37 */
 
 type IMAGE_LOAD_CONFIG_DIRECTORY64 = struct {
 	FSize                          DWORD
@@ -35377,19 +35833,19 @@ type IMAGE_LOAD_CONFIG_DIRECTORY64 = struct {
 	FSecurityCookie                ULONGLONG
 	FSEHandlerTable                ULONGLONG
 	FSEHandlerCount                ULONGLONG
-}                                             /* winnt.h:7253:7 */
-type PIMAGE_LOAD_CONFIG_DIRECTORY64 = uintptr /* winnt.h:7253:37 */
+}                                             /* winnt.h:7370:7 */
+type PIMAGE_LOAD_CONFIG_DIRECTORY64 = uintptr /* winnt.h:7370:37 */
 
-type IMAGE_LOAD_CONFIG_DIRECTORY = IMAGE_LOAD_CONFIG_DIRECTORY64   /* winnt.h:7256:43 */
-type PIMAGE_LOAD_CONFIG_DIRECTORY = PIMAGE_LOAD_CONFIG_DIRECTORY64 /* winnt.h:7257:44 */
+type IMAGE_LOAD_CONFIG_DIRECTORY = IMAGE_LOAD_CONFIG_DIRECTORY64   /* winnt.h:7373:43 */
+type PIMAGE_LOAD_CONFIG_DIRECTORY = PIMAGE_LOAD_CONFIG_DIRECTORY64 /* winnt.h:7374:44 */
 
 type _IMAGE_CE_RUNTIME_FUNCTION_ENTRY = struct {
 	FFuncStart DWORD
 	FPrologLen uint32 /* DWORD PrologLen: 8, DWORD FuncLen: 22, DWORD ThirtyTwoBit: 1, DWORD ExceptionFlag: 1 */
-} /* winnt.h:7263:13 */
+} /* winnt.h:7380:13 */
 
-type IMAGE_CE_RUNTIME_FUNCTION_ENTRY = _IMAGE_CE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7269:7 */
-type PIMAGE_CE_RUNTIME_FUNCTION_ENTRY = uintptr                         /* winnt.h:7269:39 */
+type IMAGE_CE_RUNTIME_FUNCTION_ENTRY = _IMAGE_CE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7386:7 */
+type PIMAGE_CE_RUNTIME_FUNCTION_ENTRY = uintptr                         /* winnt.h:7386:39 */
 
 type _IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = struct {
 	FBeginAddress     ULONGLONG
@@ -35397,10 +35853,10 @@ type _IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = struct {
 	FExceptionHandler ULONGLONG
 	FHandlerData      ULONGLONG
 	FPrologEndAddress ULONGLONG
-} /* winnt.h:7271:13 */
+} /* winnt.h:7388:13 */
 
-type IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = _IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY /* winnt.h:7277:7 */
-type PIMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = uintptr                              /* winnt.h:7277:44 */
+type IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = _IMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY /* winnt.h:7394:7 */
+type PIMAGE_ALPHA64_RUNTIME_FUNCTION_ENTRY = uintptr                              /* winnt.h:7394:44 */
 
 type _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = struct {
 	FBeginAddress     DWORD
@@ -35408,41 +35864,41 @@ type _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = struct {
 	FExceptionHandler DWORD
 	FHandlerData      DWORD
 	FPrologEndAddress DWORD
-} /* winnt.h:7279:13 */
+} /* winnt.h:7396:13 */
 
-type IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY /* winnt.h:7285:7 */
-type PIMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = uintptr                            /* winnt.h:7285:42 */
+type IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY /* winnt.h:7402:7 */
+type PIMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY = uintptr                            /* winnt.h:7402:42 */
 
 type _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY = struct {
 	FBeginAddress DWORD
 	Fu            struct{ FUnwindData DWORD }
-} /* winnt.h:7287:13 */
+} /* winnt.h:7404:13 */
 
-type IMAGE_ARM_RUNTIME_FUNCTION_ENTRY = _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY /* winnt.h:7303:7 */
-type PIMAGE_ARM_RUNTIME_FUNCTION_ENTRY = uintptr                          /* winnt.h:7303:40 */
+type IMAGE_ARM_RUNTIME_FUNCTION_ENTRY = _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY /* winnt.h:7420:7 */
+type PIMAGE_ARM_RUNTIME_FUNCTION_ENTRY = uintptr                          /* winnt.h:7420:40 */
 
 type _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY = struct {
 	FBeginAddress DWORD
 	Fu            struct{ FUnwindData DWORD }
-} /* winnt.h:7305:13 */
+} /* winnt.h:7422:13 */
 
-type IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY = _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY /* winnt.h:7319:7 */
-type PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY = uintptr                            /* winnt.h:7319:42 */
+type IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY = _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY /* winnt.h:7436:7 */
+type PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY = uintptr                            /* winnt.h:7436:42 */
 
 type _IMAGE_RUNTIME_FUNCTION_ENTRY = struct {
 	FBeginAddress DWORD
 	FEndAddress   DWORD
 	Fu            struct{ FUnwindInfoAddress DWORD }
-} /* winnt.h:7321:13 */
+} /* winnt.h:7438:13 */
 
-type X_IMAGE_RUNTIME_FUNCTION_ENTRY = _IMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7328:7 */
-type X_PIMAGE_RUNTIME_FUNCTION_ENTRY = uintptr                      /* winnt.h:7328:37 */
+type X_IMAGE_RUNTIME_FUNCTION_ENTRY = _IMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7445:7 */
+type X_PIMAGE_RUNTIME_FUNCTION_ENTRY = uintptr                      /* winnt.h:7445:37 */
 
-type IMAGE_IA64_RUNTIME_FUNCTION_ENTRY = X_IMAGE_RUNTIME_FUNCTION_ENTRY   /* winnt.h:7330:43 */
-type PIMAGE_IA64_RUNTIME_FUNCTION_ENTRY = X_PIMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7331:44 */
+type IMAGE_IA64_RUNTIME_FUNCTION_ENTRY = X_IMAGE_RUNTIME_FUNCTION_ENTRY   /* winnt.h:7447:43 */
+type PIMAGE_IA64_RUNTIME_FUNCTION_ENTRY = X_PIMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7448:44 */
 
-type IMAGE_RUNTIME_FUNCTION_ENTRY = X_IMAGE_RUNTIME_FUNCTION_ENTRY   /* winnt.h:7345:43 */
-type PIMAGE_RUNTIME_FUNCTION_ENTRY = X_PIMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7346:44 */
+type IMAGE_RUNTIME_FUNCTION_ENTRY = X_IMAGE_RUNTIME_FUNCTION_ENTRY   /* winnt.h:7462:43 */
+type PIMAGE_RUNTIME_FUNCTION_ENTRY = X_PIMAGE_RUNTIME_FUNCTION_ENTRY /* winnt.h:7463:44 */
 
 type _IMAGE_DEBUG_DIRECTORY = struct {
 	FCharacteristics  DWORD
@@ -35453,10 +35909,10 @@ type _IMAGE_DEBUG_DIRECTORY = struct {
 	FSizeOfData       DWORD
 	FAddressOfRawData DWORD
 	FPointerToRawData DWORD
-} /* winnt.h:7349:13 */
+} /* winnt.h:7466:13 */
 
-type IMAGE_DEBUG_DIRECTORY = _IMAGE_DEBUG_DIRECTORY /* winnt.h:7358:7 */
-type PIMAGE_DEBUG_DIRECTORY = uintptr               /* winnt.h:7358:29 */
+type IMAGE_DEBUG_DIRECTORY = _IMAGE_DEBUG_DIRECTORY /* winnt.h:7475:7 */
+type PIMAGE_DEBUG_DIRECTORY = uintptr               /* winnt.h:7475:29 */
 
 type _IMAGE_COFF_SYMBOLS_HEADER = struct {
 	FNumberOfSymbols      DWORD
@@ -35467,10 +35923,10 @@ type _IMAGE_COFF_SYMBOLS_HEADER = struct {
 	FRvaToLastByteOfCode  DWORD
 	FRvaToFirstByteOfData DWORD
 	FRvaToLastByteOfData  DWORD
-} /* winnt.h:7373:13 */
+} /* winnt.h:7490:13 */
 
-type IMAGE_COFF_SYMBOLS_HEADER = _IMAGE_COFF_SYMBOLS_HEADER /* winnt.h:7382:7 */
-type PIMAGE_COFF_SYMBOLS_HEADER = uintptr                   /* winnt.h:7382:33 */
+type IMAGE_COFF_SYMBOLS_HEADER = _IMAGE_COFF_SYMBOLS_HEADER /* winnt.h:7499:7 */
+type PIMAGE_COFF_SYMBOLS_HEADER = uintptr                   /* winnt.h:7499:33 */
 
 type _FPO_DATA = struct {
 	FulOffStart DWORD
@@ -35478,40 +35934,40 @@ type _FPO_DATA = struct {
 	FcdwLocals  DWORD
 	FcdwParams  WORD
 	FcbProlog   uint16 /* WORD cbProlog: 8, WORD cbRegs: 3, WORD fHasSEH: 1, WORD fUseBP: 1, WORD reserved: 1, WORD cbFrame: 2 */
-} /* winnt.h:7389:13 */
+} /* winnt.h:7506:13 */
 
-type FPO_DATA = _FPO_DATA /* winnt.h:7400:7 */
-type PFPO_DATA = uintptr  /* winnt.h:7400:16 */
+type FPO_DATA = _FPO_DATA /* winnt.h:7517:7 */
+type PFPO_DATA = uintptr  /* winnt.h:7517:16 */
 
 type _IMAGE_DEBUG_MISC = struct {
-	FDataType DWORD
-	FLength   DWORD
-	FUnicode  BOOLEAN
-	FReserved [3]BYTE
-	FData     [1]BYTE
-	_         [3]byte
-} /* winnt.h:7405:13 */
+	FDataType    DWORD
+	FLength      DWORD
+	FUnicode     BOOLEAN
+	FReserved    [3]BYTE
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* winnt.h:7522:13 */
 
-type IMAGE_DEBUG_MISC = _IMAGE_DEBUG_MISC /* winnt.h:7411:7 */
-type PIMAGE_DEBUG_MISC = uintptr          /* winnt.h:7411:24 */
+type IMAGE_DEBUG_MISC = _IMAGE_DEBUG_MISC /* winnt.h:7528:7 */
+type PIMAGE_DEBUG_MISC = uintptr          /* winnt.h:7528:24 */
 
 type _IMAGE_FUNCTION_ENTRY = struct {
 	FStartingAddress DWORD
 	FEndingAddress   DWORD
 	FEndOfPrologue   DWORD
-} /* winnt.h:7413:13 */
+} /* winnt.h:7530:13 */
 
-type IMAGE_FUNCTION_ENTRY = _IMAGE_FUNCTION_ENTRY /* winnt.h:7417:7 */
-type PIMAGE_FUNCTION_ENTRY = uintptr              /* winnt.h:7417:28 */
+type IMAGE_FUNCTION_ENTRY = _IMAGE_FUNCTION_ENTRY /* winnt.h:7534:7 */
+type PIMAGE_FUNCTION_ENTRY = uintptr              /* winnt.h:7534:28 */
 
 type _IMAGE_FUNCTION_ENTRY64 = struct {
 	FStartingAddress ULONGLONG
 	FEndingAddress   ULONGLONG
 	Fu               struct{ FEndOfPrologue ULONGLONG }
-} /* winnt.h:7419:13 */
+} /* winnt.h:7536:13 */
 
-type IMAGE_FUNCTION_ENTRY64 = _IMAGE_FUNCTION_ENTRY64 /* winnt.h:7426:7 */
-type PIMAGE_FUNCTION_ENTRY64 = uintptr                /* winnt.h:7426:30 */
+type IMAGE_FUNCTION_ENTRY64 = _IMAGE_FUNCTION_ENTRY64 /* winnt.h:7543:7 */
+type PIMAGE_FUNCTION_ENTRY64 = uintptr                /* winnt.h:7543:30 */
 
 type _IMAGE_SEPARATE_DEBUG_HEADER = struct {
 	FSignature          WORD
@@ -35527,10 +35983,10 @@ type _IMAGE_SEPARATE_DEBUG_HEADER = struct {
 	FDebugDirectorySize DWORD
 	FSectionAlignment   DWORD
 	FReserved           [2]DWORD
-} /* winnt.h:7428:13 */
+} /* winnt.h:7545:13 */
 
-type IMAGE_SEPARATE_DEBUG_HEADER = _IMAGE_SEPARATE_DEBUG_HEADER /* winnt.h:7442:7 */
-type PIMAGE_SEPARATE_DEBUG_HEADER = uintptr                     /* winnt.h:7442:35 */
+type IMAGE_SEPARATE_DEBUG_HEADER = _IMAGE_SEPARATE_DEBUG_HEADER /* winnt.h:7559:7 */
+type PIMAGE_SEPARATE_DEBUG_HEADER = uintptr                     /* winnt.h:7559:35 */
 
 type _NON_PAGED_DEBUG_INFO = struct {
 	FSignature       WORD
@@ -35542,27 +35998,27 @@ type _NON_PAGED_DEBUG_INFO = struct {
 	FCheckSum        DWORD
 	FSizeOfImage     DWORD
 	FImageBase       ULONGLONG
-} /* winnt.h:7444:13 */
+} /* winnt.h:7561:13 */
 
-type NON_PAGED_DEBUG_INFO = _NON_PAGED_DEBUG_INFO /* winnt.h:7454:7 */
-type PNON_PAGED_DEBUG_INFO = uintptr              /* winnt.h:7454:28 */
+type NON_PAGED_DEBUG_INFO = _NON_PAGED_DEBUG_INFO /* winnt.h:7571:7 */
+type PNON_PAGED_DEBUG_INFO = uintptr              /* winnt.h:7571:28 */
 
 type _ImageArchitectureHeader = struct {
 	FAmaskValue    uint32 /* unsigned AmaskValue: 1, int Adummy1: 7, unsigned AmaskShift: 8, int Adummy2: 16 */
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FFirstEntryRVA DWORD
-} /* winnt.h:7462:13 */
+} /* winnt.h:7579:13 */
 
-type IMAGE_ARCHITECTURE_HEADER = _ImageArchitectureHeader /* winnt.h:7468:7 */
-type PIMAGE_ARCHITECTURE_HEADER = uintptr                 /* winnt.h:7468:33 */
+type IMAGE_ARCHITECTURE_HEADER = _ImageArchitectureHeader /* winnt.h:7585:7 */
+type PIMAGE_ARCHITECTURE_HEADER = uintptr                 /* winnt.h:7585:33 */
 
 type _ImageArchitectureEntry = struct {
 	FFixupInstRVA DWORD
 	FNewInst      DWORD
-} /* winnt.h:7470:13 */
+} /* winnt.h:7587:13 */
 
-type IMAGE_ARCHITECTURE_ENTRY = _ImageArchitectureEntry /* winnt.h:7473:7 */
-type PIMAGE_ARCHITECTURE_ENTRY = uintptr                /* winnt.h:7473:32 */
+type IMAGE_ARCHITECTURE_ENTRY = _ImageArchitectureEntry /* winnt.h:7590:7 */
+type PIMAGE_ARCHITECTURE_ENTRY = uintptr                /* winnt.h:7590:32 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -35577,20 +36033,20 @@ type IMPORT_OBJECT_HEADER1 = struct {
 	FSizeOfData    DWORD
 	F__16          struct{ FOrdinal WORD }
 	FType          uint16 /* WORD Type: 2, WORD NameType: 3, WORD Reserved: 11 */
-} /* winnt.h:7478:13 */
+} /* winnt.h:7595:13 */
 
 // *
 // 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.
 
-type IMPORT_OBJECT_HEADER = IMPORT_OBJECT_HEADER1 /* winnt.h:7492:7 */
+type IMPORT_OBJECT_HEADER = IMPORT_OBJECT_HEADER1 /* winnt.h:7609:7 */
 
-type IMPORT_OBJECT_TYPE = uint32 /* winnt.h:7496:7 */
+type IMPORT_OBJECT_TYPE = uint32 /* winnt.h:7613:7 */
 
-type IMPORT_OBJECT_NAME_TYPE = uint32 /* winnt.h:7500:7 */
+type IMPORT_OBJECT_NAME_TYPE = uint32 /* winnt.h:7617:7 */
 
-type ReplacesCorHdrNumericDefines = uint32 /* winnt.h:7511:7 */
+type ReplacesCorHdrNumericDefines = uint32 /* winnt.h:7628:7 */
 
 type IMAGE_COR20_HEADER1 = struct {
 	Fcb                      DWORD
@@ -35605,41 +36061,41 @@ type IMAGE_COR20_HEADER1 = struct {
 	FVTableFixups            IMAGE_DATA_DIRECTORY
 	FExportAddressTableJumps IMAGE_DATA_DIRECTORY
 	FManagedNativeHeader     IMAGE_DATA_DIRECTORY
-} /* winnt.h:7513:13 */
+} /* winnt.h:7630:13 */
 
-type IMAGE_COR20_HEADER = IMAGE_COR20_HEADER1 /* winnt.h:7529:7 */
-type PIMAGE_COR20_HEADER = uintptr            /* winnt.h:7529:26 */
+type IMAGE_COR20_HEADER = IMAGE_COR20_HEADER1 /* winnt.h:7646:7 */
+type PIMAGE_COR20_HEADER = uintptr            /* winnt.h:7646:26 */
 
 // *
 // 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.
 
-type _SLIST_ENTRY = struct{ FNext uintptr } /* winnt.h:7607:13 */
+type _SLIST_ENTRY = struct{ FNext uintptr } /* winnt.h:7726:13 */
 
 // *
 // 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.
 
-type SLIST_ENTRY = _SLIST_ENTRY /* winnt.h:7609:7 */
-type PSLIST_ENTRY = uintptr     /* winnt.h:7609:19 */
+type SLIST_ENTRY = _SLIST_ENTRY /* winnt.h:7728:7 */
+type PSLIST_ENTRY = uintptr     /* winnt.h:7728:19 */
 
 type _SLIST_HEADER = struct {
 	Fs struct {
 		FAlignment ULONGLONG
 		FRegion    ULONGLONG
 	}
-} /* winnt.h:7611:13 */
+} /* winnt.h:7730:13 */
 
-type SLIST_HEADER = _SLIST_HEADER /* winnt.h:7632:7 */
-type PSLIST_HEADER = uintptr      /* winnt.h:7632:20 */
+type SLIST_HEADER = _SLIST_HEADER /* winnt.h:7751:7 */
+type PSLIST_HEADER = uintptr      /* winnt.h:7751:20 */
 
-type _RTL_RUN_ONCE = struct{ FPtr PVOID } /* winnt.h:7661:9 */
+type _RTL_RUN_ONCE = struct{ FPtr PVOID } /* winnt.h:7780:9 */
 
-type RTL_RUN_ONCE = _RTL_RUN_ONCE    /* winnt.h:7661:45 */
-type PRTL_RUN_ONCE = uintptr         /* winnt.h:7661:59 */
-type PRTL_RUN_ONCE_INIT_FN = uintptr /* winnt.h:7662:15 */
+type RTL_RUN_ONCE = _RTL_RUN_ONCE    /* winnt.h:7780:45 */
+type PRTL_RUN_ONCE = uintptr         /* winnt.h:7780:59 */
+type PRTL_RUN_ONCE_INIT_FN = uintptr /* winnt.h:7781:15 */
 
 type _RTL_BARRIER = struct {
 	FReserved1 DWORD
@@ -35647,37 +36103,37 @@ type _RTL_BARRIER = struct {
 	FReserved3 [2]ULONG_PTR
 	FReserved4 DWORD
 	FReserved5 DWORD
-} /* winnt.h:7671:11 */
+} /* winnt.h:7790:11 */
 
-type RTL_BARRIER = _RTL_BARRIER /* winnt.h:7677:5 */
-type PRTL_BARRIER = uintptr     /* winnt.h:7677:17 */
+type RTL_BARRIER = _RTL_BARRIER /* winnt.h:7796:5 */
+type PRTL_BARRIER = uintptr     /* winnt.h:7796:17 */
 
 type _MESSAGE_RESOURCE_ENTRY = struct {
-	FLength WORD
-	FFlags  WORD
-	FText   [1]BYTE
-	_       [1]byte
-} /* winnt.h:7780:13 */
+	FLength      WORD
+	FFlags       WORD
+	FText        [1]BYTE
+	F__ccgo_pad1 [1]byte
+} /* winnt.h:7899:13 */
 
-type MESSAGE_RESOURCE_ENTRY = _MESSAGE_RESOURCE_ENTRY /* winnt.h:7784:7 */
-type PMESSAGE_RESOURCE_ENTRY = uintptr                /* winnt.h:7784:30 */
+type MESSAGE_RESOURCE_ENTRY = _MESSAGE_RESOURCE_ENTRY /* winnt.h:7903:7 */
+type PMESSAGE_RESOURCE_ENTRY = uintptr                /* winnt.h:7903:30 */
 
 type _MESSAGE_RESOURCE_BLOCK = struct {
 	FLowId           DWORD
 	FHighId          DWORD
 	FOffsetToEntries DWORD
-} /* winnt.h:7802:13 */
+} /* winnt.h:7921:13 */
 
-type MESSAGE_RESOURCE_BLOCK = _MESSAGE_RESOURCE_BLOCK /* winnt.h:7806:7 */
-type PMESSAGE_RESOURCE_BLOCK = uintptr                /* winnt.h:7806:30 */
+type MESSAGE_RESOURCE_BLOCK = _MESSAGE_RESOURCE_BLOCK /* winnt.h:7925:7 */
+type PMESSAGE_RESOURCE_BLOCK = uintptr                /* winnt.h:7925:30 */
 
 type _MESSAGE_RESOURCE_DATA = struct {
 	FNumberOfBlocks DWORD
 	FBlocks         [1]MESSAGE_RESOURCE_BLOCK
-} /* winnt.h:7808:13 */
+} /* winnt.h:7927:13 */
 
-type MESSAGE_RESOURCE_DATA = _MESSAGE_RESOURCE_DATA /* winnt.h:7811:7 */
-type PMESSAGE_RESOURCE_DATA = uintptr               /* winnt.h:7811:29 */
+type MESSAGE_RESOURCE_DATA = _MESSAGE_RESOURCE_DATA /* winnt.h:7930:7 */
+type PMESSAGE_RESOURCE_DATA = uintptr               /* winnt.h:7930:29 */
 
 type _OSVERSIONINFOA = struct {
 	FdwOSVersionInfoSize DWORD
@@ -35686,11 +36142,11 @@ type _OSVERSIONINFOA = struct {
 	FdwBuildNumber       DWORD
 	FdwPlatformId        DWORD
 	FszCSDVersion        [128]CHAR
-} /* winnt.h:7813:13 */
+} /* winnt.h:7932:13 */
 
-type OSVERSIONINFOA = _OSVERSIONINFOA /* winnt.h:7820:7 */
-type POSVERSIONINFOA = uintptr        /* winnt.h:7820:22 */
-type LPOSVERSIONINFOA = uintptr       /* winnt.h:7820:39 */
+type OSVERSIONINFOA = _OSVERSIONINFOA /* winnt.h:7939:7 */
+type POSVERSIONINFOA = uintptr        /* winnt.h:7939:22 */
+type LPOSVERSIONINFOA = uintptr       /* winnt.h:7939:39 */
 
 type _OSVERSIONINFOW = struct {
 	FdwOSVersionInfoSize DWORD
@@ -35699,17 +36155,17 @@ type _OSVERSIONINFOW = struct {
 	FdwBuildNumber       DWORD
 	FdwPlatformId        DWORD
 	FszCSDVersion        [128]WCHAR
-} /* winnt.h:7822:13 */
+} /* winnt.h:7941:13 */
 
-type OSVERSIONINFOW = _OSVERSIONINFOW     /* winnt.h:7829:7 */
-type POSVERSIONINFOW = uintptr            /* winnt.h:7829:22 */
-type LPOSVERSIONINFOW = uintptr           /* winnt.h:7829:39 */
-type RTL_OSVERSIONINFOW = _OSVERSIONINFOW /* winnt.h:7829:57 */
-type PRTL_OSVERSIONINFOW = uintptr        /* winnt.h:7829:76 */
+type OSVERSIONINFOW = _OSVERSIONINFOW     /* winnt.h:7948:7 */
+type POSVERSIONINFOW = uintptr            /* winnt.h:7948:22 */
+type LPOSVERSIONINFOW = uintptr           /* winnt.h:7948:39 */
+type RTL_OSVERSIONINFOW = _OSVERSIONINFOW /* winnt.h:7948:57 */
+type PRTL_OSVERSIONINFOW = uintptr        /* winnt.h:7948:76 */
 
-type OSVERSIONINFO = OSVERSIONINFOA     /* winnt.h:7831:5 */
-type POSVERSIONINFO = POSVERSIONINFOA   /* winnt.h:7832:5 */
-type LPOSVERSIONINFO = LPOSVERSIONINFOA /* winnt.h:7833:5 */
+type OSVERSIONINFO = OSVERSIONINFOA     /* winnt.h:7950:5 */
+type POSVERSIONINFO = POSVERSIONINFOA   /* winnt.h:7951:5 */
+type LPOSVERSIONINFO = LPOSVERSIONINFOA /* winnt.h:7952:5 */
 
 type _OSVERSIONINFOEXA = struct {
 	FdwOSVersionInfoSize DWORD
@@ -35723,11 +36179,11 @@ type _OSVERSIONINFOEXA = struct {
 	FwSuiteMask          WORD
 	FwProductType        BYTE
 	FwReserved           BYTE
-} /* winnt.h:7835:13 */
+} /* winnt.h:7954:13 */
 
-type OSVERSIONINFOEXA = _OSVERSIONINFOEXA /* winnt.h:7847:7 */
-type POSVERSIONINFOEXA = uintptr          /* winnt.h:7847:24 */
-type LPOSVERSIONINFOEXA = uintptr         /* winnt.h:7847:43 */
+type OSVERSIONINFOEXA = _OSVERSIONINFOEXA /* winnt.h:7966:7 */
+type POSVERSIONINFOEXA = uintptr          /* winnt.h:7966:24 */
+type LPOSVERSIONINFOEXA = uintptr         /* winnt.h:7966:43 */
 
 type _OSVERSIONINFOEXW = struct {
 	FdwOSVersionInfoSize DWORD
@@ -35741,29 +36197,29 @@ type _OSVERSIONINFOEXW = struct {
 	FwSuiteMask          WORD
 	FwProductType        BYTE
 	FwReserved           BYTE
-} /* winnt.h:7849:13 */
+} /* winnt.h:7968:13 */
 
-type OSVERSIONINFOEXW = _OSVERSIONINFOEXW     /* winnt.h:7861:7 */
-type POSVERSIONINFOEXW = uintptr              /* winnt.h:7861:24 */
-type LPOSVERSIONINFOEXW = uintptr             /* winnt.h:7861:43 */
-type RTL_OSVERSIONINFOEXW = _OSVERSIONINFOEXW /* winnt.h:7861:63 */
-type PRTL_OSVERSIONINFOEXW = uintptr          /* winnt.h:7861:84 */
+type OSVERSIONINFOEXW = _OSVERSIONINFOEXW     /* winnt.h:7980:7 */
+type POSVERSIONINFOEXW = uintptr              /* winnt.h:7980:24 */
+type LPOSVERSIONINFOEXW = uintptr             /* winnt.h:7980:43 */
+type RTL_OSVERSIONINFOEXW = _OSVERSIONINFOEXW /* winnt.h:7980:63 */
+type PRTL_OSVERSIONINFOEXW = uintptr          /* winnt.h:7980:84 */
 
-type OSVERSIONINFOEX = OSVERSIONINFOEXA     /* winnt.h:7863:5 */
-type POSVERSIONINFOEX = POSVERSIONINFOEXA   /* winnt.h:7864:5 */
-type LPOSVERSIONINFOEX = LPOSVERSIONINFOEXA /* winnt.h:7865:5 */
+type OSVERSIONINFOEX = OSVERSIONINFOEXA     /* winnt.h:7982:5 */
+type POSVERSIONINFOEX = POSVERSIONINFOEXA   /* winnt.h:7983:5 */
+type LPOSVERSIONINFOEX = LPOSVERSIONINFOEXA /* winnt.h:7984:5 */
 
-type RTL_UMS_THREAD_INFO_CLASS = uint32   /* winnt.h:7918:7 */
-type PRTL_UMS_THREAD_INFO_CLASS = uintptr /* winnt.h:7918:33 */
+type RTL_UMS_THREAD_INFO_CLASS = uint32   /* winnt.h:8037:7 */
+type PRTL_UMS_THREAD_INFO_CLASS = uintptr /* winnt.h:8037:33 */
 
-type RTL_UMS_SCHEDULER_REASON = uint32        /* winnt.h:7924:7 */
-type PRTL_UMS_SCHEDULER_REASON = uintptr      /* winnt.h:7924:32 */
-type PRTL_UMS_SCHEDULER_ENTRY_POINT = uintptr /* winnt.h:7927:43 */
+type RTL_UMS_SCHEDULER_REASON = uint32        /* winnt.h:8043:7 */
+type PRTL_UMS_SCHEDULER_REASON = uintptr      /* winnt.h:8043:32 */
+type PRTL_UMS_SCHEDULER_ENTRY_POINT = uintptr /* winnt.h:8046:43 */
 
 type _RTL_CRITICAL_SECTION_DEBUG = struct {
 	FType                      WORD
 	FCreatorBackTraceIndex     WORD
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FCriticalSection           uintptr
 	FProcessLocksList          LIST_ENTRY
 	FEntryCount                DWORD
@@ -35771,7 +36227,7 @@ type _RTL_CRITICAL_SECTION_DEBUG = struct {
 	FFlags                     DWORD
 	FCreatorBackTraceIndexHigh WORD
 	FSpareWORD                 WORD
-} /* winnt.h:7947:13 */
+} /* winnt.h:8066:13 */
 
 type _RTL_CRITICAL_SECTION = struct {
 	FDebugInfo      PRTL_CRITICAL_SECTION_DEBUG
@@ -35780,75 +36236,75 @@ type _RTL_CRITICAL_SECTION = struct {
 	FOwningThread   HANDLE
 	FLockSemaphore  HANDLE
 	FSpinCount      ULONG_PTR
-} /* winnt.h:7947:13 */
+} /* winnt.h:8066:13 */
 
-type RTL_CRITICAL_SECTION_DEBUG = _RTL_CRITICAL_SECTION_DEBUG /* winnt.h:7957:7 */
-type PRTL_CRITICAL_SECTION_DEBUG = uintptr                    /* winnt.h:7957:34 */
-type RTL_RESOURCE_DEBUG = _RTL_CRITICAL_SECTION_DEBUG         /* winnt.h:7957:63 */
-type PRTL_RESOURCE_DEBUG = uintptr                            /* winnt.h:7957:82 */
+type RTL_CRITICAL_SECTION_DEBUG = _RTL_CRITICAL_SECTION_DEBUG /* winnt.h:8076:7 */
+type PRTL_CRITICAL_SECTION_DEBUG = uintptr                    /* winnt.h:8076:34 */
+type RTL_RESOURCE_DEBUG = _RTL_CRITICAL_SECTION_DEBUG         /* winnt.h:8076:63 */
+type PRTL_RESOURCE_DEBUG = uintptr                            /* winnt.h:8076:82 */
 
 // *
 // 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.
-type RTL_CRITICAL_SECTION = _RTL_CRITICAL_SECTION /* winnt.h:7981:7 */
-type PRTL_CRITICAL_SECTION = uintptr              /* winnt.h:7981:28 */
+type RTL_CRITICAL_SECTION = _RTL_CRITICAL_SECTION /* winnt.h:8100:7 */
+type PRTL_CRITICAL_SECTION = uintptr              /* winnt.h:8100:28 */
 // *
 // 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.
 
-type _RTL_SRWLOCK = struct{ FPtr PVOID } /* winnt.h:7984:13 */
+type _RTL_SRWLOCK = struct{ FPtr PVOID } /* winnt.h:8103:13 */
 
 // *
 // 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.
 
-type RTL_SRWLOCK = _RTL_SRWLOCK                     /* winnt.h:7984:48 */
-type PRTL_SRWLOCK = uintptr                         /* winnt.h:7984:60 */
-type _RTL_CONDITION_VARIABLE = struct{ FPtr PVOID } /* winnt.h:7985:13 */
+type RTL_SRWLOCK = _RTL_SRWLOCK                     /* winnt.h:8103:48 */
+type PRTL_SRWLOCK = uintptr                         /* winnt.h:8103:60 */
+type _RTL_CONDITION_VARIABLE = struct{ FPtr PVOID } /* winnt.h:8104:13 */
 
-type RTL_CONDITION_VARIABLE = _RTL_CONDITION_VARIABLE /* winnt.h:7985:59 */
-type PRTL_CONDITION_VARIABLE = uintptr                /* winnt.h:7985:82 */
+type RTL_CONDITION_VARIABLE = _RTL_CONDITION_VARIABLE /* winnt.h:8104:59 */
+type PRTL_CONDITION_VARIABLE = uintptr                /* winnt.h:8104:82 */
 
-type PAPCFUNC = uintptr                    /* winnt.h:7992:18 */
-type PVECTORED_EXCEPTION_HANDLER = uintptr /* winnt.h:7993:18 */
+type PAPCFUNC = uintptr                    /* winnt.h:8111:18 */
+type PVECTORED_EXCEPTION_HANDLER = uintptr /* winnt.h:8112:18 */
 
-type HEAP_INFORMATION_CLASS = uint32 /* winnt.h:7998:7 */
+type HEAP_INFORMATION_CLASS = uint32 /* winnt.h:8117:7 */
 
-type WORKERCALLBACKFUNC = uintptr                  /* winnt.h:8000:18 */
-type APC_CALLBACK_FUNCTION = uintptr               /* winnt.h:8001:18 */
-type WAITORTIMERCALLBACKFUNC = uintptr             /* winnt.h:8002:18 */
-type WAITORTIMERCALLBACK = WAITORTIMERCALLBACKFUNC /* winnt.h:8003:37 */
-type PFLS_CALLBACK_FUNCTION = uintptr              /* winnt.h:8004:18 */
-type PSECURE_MEMORY_CACHE_CALLBACK = uintptr       /* winnt.h:8005:21 */
+type WORKERCALLBACKFUNC = uintptr                  /* winnt.h:8119:18 */
+type APC_CALLBACK_FUNCTION = uintptr               /* winnt.h:8120:18 */
+type WAITORTIMERCALLBACKFUNC = uintptr             /* winnt.h:8121:18 */
+type WAITORTIMERCALLBACK = WAITORTIMERCALLBACKFUNC /* winnt.h:8122:37 */
+type PFLS_CALLBACK_FUNCTION = uintptr              /* winnt.h:8123:18 */
+type PSECURE_MEMORY_CACHE_CALLBACK = uintptr       /* winnt.h:8124:21 */
 
-type ACTIVATION_CONTEXT_INFO_CLASS = uint32 /* winnt.h:8034:7 */
+type ACTIVATION_CONTEXT_INFO_CLASS = uint32 /* winnt.h:8153:7 */
 
-type ACTCTX_REQUESTED_RUN_LEVEL = uint32 /* winnt.h:8042:7 */
+type ACTCTX_REQUESTED_RUN_LEVEL = uint32 /* winnt.h:8161:7 */
 
-type ACTCTX_COMPATIBILITY_ELEMENT_TYPE = uint32 /* winnt.h:8048:7 */
+type ACTCTX_COMPATIBILITY_ELEMENT_TYPE = uint32 /* winnt.h:8167:7 */
 
 type _ACTIVATION_CONTEXT_QUERY_INDEX = struct {
 	FulAssemblyIndex       DWORD
 	FulFileIndexInAssembly DWORD
-} /* winnt.h:8050:13 */
+} /* winnt.h:8169:13 */
 
-type ACTIVATION_CONTEXT_QUERY_INDEX = _ACTIVATION_CONTEXT_QUERY_INDEX /* winnt.h:8053:7 */
-type PACTIVATION_CONTEXT_QUERY_INDEX = uintptr                        /* winnt.h:8053:38 */
+type ACTIVATION_CONTEXT_QUERY_INDEX = _ACTIVATION_CONTEXT_QUERY_INDEX /* winnt.h:8172:7 */
+type PACTIVATION_CONTEXT_QUERY_INDEX = uintptr                        /* winnt.h:8172:38 */
 
 type _ASSEMBLY_FILE_DETAILED_INFORMATION = struct {
 	FulFlags          DWORD
 	FulFilenameLength DWORD
 	FulPathLength     DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpFileName       PCWSTR
 	FlpFilePath       PCWSTR
-} /* winnt.h:8055:13 */
+} /* winnt.h:8174:13 */
 
-type ASSEMBLY_FILE_DETAILED_INFORMATION = _ASSEMBLY_FILE_DETAILED_INFORMATION /* winnt.h:8061:7 */
-type PASSEMBLY_FILE_DETAILED_INFORMATION = uintptr                            /* winnt.h:8061:42 */
+type ASSEMBLY_FILE_DETAILED_INFORMATION = _ASSEMBLY_FILE_DETAILED_INFORMATION /* winnt.h:8180:7 */
+type PASSEMBLY_FILE_DETAILED_INFORMATION = uintptr                            /* winnt.h:8180:42 */
 
 type _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = struct {
 	FulFlags                           DWORD
@@ -35870,49 +36326,49 @@ type _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = struct {
 	FlpAssemblyPolicyPath              PCWSTR
 	FlpAssemblyDirectoryName           PCWSTR
 	FulFileCount                       DWORD
-	_                                  [4]byte
-} /* winnt.h:8063:13 */
+	F__ccgo_pad1                       [4]byte
+} /* winnt.h:8182:13 */
 
-type ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION /* winnt.h:8083:7 */
-type PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = uintptr                                          /* winnt.h:8083:56 */
+type ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION /* winnt.h:8202:7 */
+type PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = uintptr                                          /* winnt.h:8202:56 */
 
 type _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = struct {
 	FulFlags  DWORD
 	FRunLevel ACTCTX_REQUESTED_RUN_LEVEL
 	FUiAccess DWORD
-} /* winnt.h:8085:13 */
+} /* winnt.h:8204:13 */
 
-type ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION /* winnt.h:8089:7 */
-type PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = uintptr                                  /* winnt.h:8089:48 */
+type ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION /* winnt.h:8208:7 */
+type PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = uintptr                                  /* winnt.h:8208:48 */
 
 type _COMPATIBILITY_CONTEXT_ELEMENT = struct {
 	FId   GUID
 	FType ACTCTX_COMPATIBILITY_ELEMENT_TYPE
-} /* winnt.h:8091:13 */
+} /* winnt.h:8210:13 */
 
-type COMPATIBILITY_CONTEXT_ELEMENT = _COMPATIBILITY_CONTEXT_ELEMENT /* winnt.h:8094:7 */
-type PCOMPATIBILITY_CONTEXT_ELEMENT = uintptr                       /* winnt.h:8094:37 */
+type COMPATIBILITY_CONTEXT_ELEMENT = _COMPATIBILITY_CONTEXT_ELEMENT /* winnt.h:8213:7 */
+type PCOMPATIBILITY_CONTEXT_ELEMENT = uintptr                       /* winnt.h:8213:37 */
 
 //Vista: {e2011457-1546-43c5-a5fe-008deee3d3f0}
 //Seven: {35138b9a-5d96-4fbd-8e2d-a2440225f93a}
 type _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = struct {
-	_             [0]uint32
+	F__ccgo_pad1  [0]uint32
 	FElementCount DWORD
-} /* winnt.h:8098:13 */
+} /* winnt.h:8217:13 */
 
 //Vista: {e2011457-1546-43c5-a5fe-008deee3d3f0}
 //Seven: {35138b9a-5d96-4fbd-8e2d-a2440225f93a}
-type ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION /* winnt.h:8101:7 */
-type PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = uintptr                                      /* winnt.h:8101:52 */
+type ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION /* winnt.h:8220:7 */
+type PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = uintptr                                      /* winnt.h:8220:52 */
 
 type _SUPPORTED_OS_INFO = struct {
 	FOsCount         WORD
 	FMitigationExist WORD
 	FOsList          [4]WORD
-} /* winnt.h:8105:13 */
+} /* winnt.h:8224:13 */
 
-type SUPPORTED_OS_INFO = _SUPPORTED_OS_INFO /* winnt.h:8109:7 */
-type PSUPPORTED_OS_INFO = uintptr           /* winnt.h:8109:25 */
+type SUPPORTED_OS_INFO = _SUPPORTED_OS_INFO /* winnt.h:8228:7 */
+type PSUPPORTED_OS_INFO = uintptr           /* winnt.h:8228:25 */
 
 type _ACTIVATION_CONTEXT_DETAILED_INFORMATION = struct {
 	FdwFlags                      DWORD
@@ -35924,50 +36380,50 @@ type _ACTIVATION_CONTEXT_DETAILED_INFORMATION = struct {
 	FulRootConfigurationPathChars DWORD
 	FulAppDirPathType             DWORD
 	FulAppDirPathChars            DWORD
-	_                             [4]byte
+	F__ccgo_pad1                  [4]byte
 	FlpRootManifestPath           PCWSTR
 	FlpRootConfigurationPath      PCWSTR
 	FlpAppDirPath                 PCWSTR
-} /* winnt.h:8111:13 */
+} /* winnt.h:8230:13 */
 
-type ACTIVATION_CONTEXT_DETAILED_INFORMATION = _ACTIVATION_CONTEXT_DETAILED_INFORMATION /* winnt.h:8124:7 */
-type PACTIVATION_CONTEXT_DETAILED_INFORMATION = uintptr                                 /* winnt.h:8124:47 */
+type ACTIVATION_CONTEXT_DETAILED_INFORMATION = _ACTIVATION_CONTEXT_DETAILED_INFORMATION /* winnt.h:8243:7 */
+type PACTIVATION_CONTEXT_DETAILED_INFORMATION = uintptr                                 /* winnt.h:8243:47 */
 
-type PCACTIVATION_CONTEXT_QUERY_INDEX = uintptr                   /* winnt.h:8126:58 */
-type PCASSEMBLY_FILE_DETAILED_INFORMATION = uintptr               /* winnt.h:8127:54 */
-type PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = uintptr /* winnt.h:8128:76 */
-type PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = uintptr         /* winnt.h:8129:68 */
-type PCCOMPATIBILITY_CONTEXT_ELEMENT = uintptr                    /* winnt.h:8130:57 */
-type PCACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = uintptr     /* winnt.h:8131:72 */
-type PCACTIVATION_CONTEXT_DETAILED_INFORMATION = uintptr          /* winnt.h:8132:67 */
+type PCACTIVATION_CONTEXT_QUERY_INDEX = uintptr                   /* winnt.h:8245:58 */
+type PCASSEMBLY_FILE_DETAILED_INFORMATION = uintptr               /* winnt.h:8246:54 */
+type PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION = uintptr /* winnt.h:8247:76 */
+type PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION = uintptr         /* winnt.h:8248:68 */
+type PCCOMPATIBILITY_CONTEXT_ELEMENT = uintptr                    /* winnt.h:8249:57 */
+type PCACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION = uintptr     /* winnt.h:8250:72 */
+type PCACTIVATION_CONTEXT_DETAILED_INFORMATION = uintptr          /* winnt.h:8251:67 */
 
-type RTL_VERIFIER_DLL_LOAD_CALLBACK = uintptr      /* winnt.h:8149:18 */
-type RTL_VERIFIER_DLL_UNLOAD_CALLBACK = uintptr    /* winnt.h:8150:18 */
-type RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK = uintptr /* winnt.h:8151:18 */
+type RTL_VERIFIER_DLL_LOAD_CALLBACK = uintptr      /* winnt.h:8268:18 */
+type RTL_VERIFIER_DLL_UNLOAD_CALLBACK = uintptr    /* winnt.h:8269:18 */
+type RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK = uintptr /* winnt.h:8270:18 */
 
 type _RTL_VERIFIER_THUNK_DESCRIPTOR = struct {
 	FThunkName       PCHAR
 	FThunkOldAddress PVOID
 	FThunkNewAddress PVOID
-} /* winnt.h:8153:13 */
+} /* winnt.h:8272:13 */
 
-type RTL_VERIFIER_THUNK_DESCRIPTOR = _RTL_VERIFIER_THUNK_DESCRIPTOR /* winnt.h:8157:7 */
-type PRTL_VERIFIER_THUNK_DESCRIPTOR = uintptr                       /* winnt.h:8157:37 */
+type RTL_VERIFIER_THUNK_DESCRIPTOR = _RTL_VERIFIER_THUNK_DESCRIPTOR /* winnt.h:8276:7 */
+type PRTL_VERIFIER_THUNK_DESCRIPTOR = uintptr                       /* winnt.h:8276:37 */
 
 type _RTL_VERIFIER_DLL_DESCRIPTOR = struct {
-	FDllName    PWCHAR
-	FDllFlags   DWORD
-	_           [4]byte
-	FDllAddress PVOID
-	FDllThunks  PRTL_VERIFIER_THUNK_DESCRIPTOR
-} /* winnt.h:8159:13 */
+	FDllName     PWCHAR
+	FDllFlags    DWORD
+	F__ccgo_pad1 [4]byte
+	FDllAddress  PVOID
+	FDllThunks   PRTL_VERIFIER_THUNK_DESCRIPTOR
+} /* winnt.h:8278:13 */
 
-type RTL_VERIFIER_DLL_DESCRIPTOR = _RTL_VERIFIER_DLL_DESCRIPTOR /* winnt.h:8164:7 */
-type PRTL_VERIFIER_DLL_DESCRIPTOR = uintptr                     /* winnt.h:8164:35 */
+type RTL_VERIFIER_DLL_DESCRIPTOR = _RTL_VERIFIER_DLL_DESCRIPTOR /* winnt.h:8283:7 */
+type PRTL_VERIFIER_DLL_DESCRIPTOR = uintptr                     /* winnt.h:8283:35 */
 
 type _RTL_VERIFIER_PROVIDER_DESCRIPTOR = struct {
 	FLength                        DWORD
-	_                              [4]byte
+	F__ccgo_pad1                   [4]byte
 	FProviderDlls                  PRTL_VERIFIER_DLL_DESCRIPTOR
 	FProviderDllLoadCallback       RTL_VERIFIER_DLL_LOAD_CALLBACK
 	FProviderDllUnloadCallback     RTL_VERIFIER_DLL_UNLOAD_CALLBACK
@@ -35978,19 +36434,19 @@ type _RTL_VERIFIER_PROVIDER_DESCRIPTOR = struct {
 	FRtlpDebugPageHeapCreate       PVOID
 	FRtlpDebugPageHeapDestroy      PVOID
 	FProviderNtdllHeapFreeCallback RTL_VERIFIER_NTDLLHEAPFREE_CALLBACK
-} /* winnt.h:8166:13 */
+} /* winnt.h:8285:13 */
 
-type RTL_VERIFIER_PROVIDER_DESCRIPTOR = _RTL_VERIFIER_PROVIDER_DESCRIPTOR /* winnt.h:8178:7 */
-type PRTL_VERIFIER_PROVIDER_DESCRIPTOR = uintptr                          /* winnt.h:8178:40 */
+type RTL_VERIFIER_PROVIDER_DESCRIPTOR = _RTL_VERIFIER_PROVIDER_DESCRIPTOR /* winnt.h:8297:7 */
+type PRTL_VERIFIER_PROVIDER_DESCRIPTOR = uintptr                          /* winnt.h:8297:40 */
 
 type _HARDWARE_COUNTER_DATA = struct {
 	FType     HARDWARE_COUNTER_TYPE
 	FReserved DWORD
 	FValue    DWORD64
-} /* winnt.h:8291:13 */
+} /* winnt.h:8410:13 */
 
-type HARDWARE_COUNTER_DATA = _HARDWARE_COUNTER_DATA /* winnt.h:8295:7 */
-type PHARDWARE_COUNTER_DATA = uintptr               /* winnt.h:8295:29 */
+type HARDWARE_COUNTER_DATA = _HARDWARE_COUNTER_DATA /* winnt.h:8414:7 */
+type PHARDWARE_COUNTER_DATA = uintptr               /* winnt.h:8414:29 */
 
 type _PERFORMANCE_DATA = struct {
 	FSize               WORD
@@ -36002,10 +36458,10 @@ type _PERFORMANCE_DATA = struct {
 	FRetryCount         DWORD
 	FReserved           DWORD
 	FHwCounters         [16]HARDWARE_COUNTER_DATA
-} /* winnt.h:8297:13 */
+} /* winnt.h:8416:13 */
 
-type PERFORMANCE_DATA = _PERFORMANCE_DATA /* winnt.h:8307:7 */
-type PPERFORMANCE_DATA = uintptr          /* winnt.h:8307:24 */
+type PERFORMANCE_DATA = _PERFORMANCE_DATA /* winnt.h:8426:7 */
+type PPERFORMANCE_DATA = uintptr          /* winnt.h:8426:24 */
 
 type _EVENTLOGRECORD = struct {
 	FLength              DWORD
@@ -36024,83 +36480,83 @@ type _EVENTLOGRECORD = struct {
 	FUserSidOffset       DWORD
 	FDataLength          DWORD
 	FDataOffset          DWORD
-} /* winnt.h:8338:13 */
+} /* winnt.h:8457:13 */
 
-type EVENTLOGRECORD = _EVENTLOGRECORD /* winnt.h:8355:7 */
-type PEVENTLOGRECORD = uintptr        /* winnt.h:8355:22 */
+type EVENTLOGRECORD = _EVENTLOGRECORD /* winnt.h:8474:7 */
+type PEVENTLOGRECORD = uintptr        /* winnt.h:8474:22 */
 
 type _EVENTSFORLOGFILE = struct {
-	_                 [0]uint32
+	F__ccgo_pad1      [0]uint32
 	FulSize           DWORD
 	FszLogicalLogFile [256]WCHAR
 	FulNumRecords     DWORD
-} /* winnt.h:8359:13 */
+} /* winnt.h:8478:13 */
 
-type EVENTSFORLOGFILE = _EVENTSFORLOGFILE /* winnt.h:8364:7 */
-type PEVENTSFORLOGFILE = uintptr          /* winnt.h:8364:24 */
+type EVENTSFORLOGFILE = _EVENTSFORLOGFILE /* winnt.h:8483:7 */
+type PEVENTSFORLOGFILE = uintptr          /* winnt.h:8483:24 */
 
 type _PACKEDEVENTINFO = struct {
-	_                      [0]uint32
+	F__ccgo_pad1           [0]uint32
 	FulSize                DWORD
 	FulNumEventsForLogFile DWORD
-} /* winnt.h:8366:13 */
+} /* winnt.h:8485:13 */
 
-type PACKEDEVENTINFO = _PACKEDEVENTINFO /* winnt.h:8370:7 */
-type PPACKEDEVENTINFO = uintptr         /* winnt.h:8370:23 */
+type PACKEDEVENTINFO = _PACKEDEVENTINFO /* winnt.h:8489:7 */
+type PPACKEDEVENTINFO = uintptr         /* winnt.h:8489:23 */
 
-type SERVICE_NODE_TYPE = uint32 /* winnt.h:8468:7 */
+type SERVICE_NODE_TYPE = uint32 /* winnt.h:8587:7 */
 
-type SERVICE_LOAD_TYPE = uint32 /* winnt.h:8473:7 */
+type SERVICE_LOAD_TYPE = uint32 /* winnt.h:8592:7 */
 
-type SERVICE_ERROR_TYPE = uint32 /* winnt.h:8477:7 */
+type SERVICE_ERROR_TYPE = uint32 /* winnt.h:8596:7 */
 
 type _TAPE_ERASE = struct {
-	FType      DWORD
-	FImmediate BOOLEAN
-	_          [3]byte
-} /* winnt.h:8496:13 */
+	FType        DWORD
+	FImmediate   BOOLEAN
+	F__ccgo_pad1 [3]byte
+} /* winnt.h:8615:13 */
 
-type TAPE_ERASE = _TAPE_ERASE /* winnt.h:8499:7 */
-type PTAPE_ERASE = uintptr    /* winnt.h:8499:18 */
+type TAPE_ERASE = _TAPE_ERASE /* winnt.h:8618:7 */
+type PTAPE_ERASE = uintptr    /* winnt.h:8618:18 */
 
 type _TAPE_PREPARE = struct {
-	FOperation DWORD
-	FImmediate BOOLEAN
-	_          [3]byte
-} /* winnt.h:8508:13 */
+	FOperation   DWORD
+	FImmediate   BOOLEAN
+	F__ccgo_pad1 [3]byte
+} /* winnt.h:8627:13 */
 
-type TAPE_PREPARE = _TAPE_PREPARE /* winnt.h:8511:7 */
-type PTAPE_PREPARE = uintptr      /* winnt.h:8511:20 */
+type TAPE_PREPARE = _TAPE_PREPARE /* winnt.h:8630:7 */
+type PTAPE_PREPARE = uintptr      /* winnt.h:8630:20 */
 
 type _TAPE_WRITE_MARKS = struct {
-	FType      DWORD
-	FCount     DWORD
-	FImmediate BOOLEAN
-	_          [3]byte
-} /* winnt.h:8518:13 */
+	FType        DWORD
+	FCount       DWORD
+	FImmediate   BOOLEAN
+	F__ccgo_pad1 [3]byte
+} /* winnt.h:8637:13 */
 
-type TAPE_WRITE_MARKS = _TAPE_WRITE_MARKS /* winnt.h:8522:7 */
-type PTAPE_WRITE_MARKS = uintptr          /* winnt.h:8522:24 */
+type TAPE_WRITE_MARKS = _TAPE_WRITE_MARKS /* winnt.h:8641:7 */
+type PTAPE_WRITE_MARKS = uintptr          /* winnt.h:8641:24 */
 
 type _TAPE_GET_POSITION = struct {
 	FType      DWORD
 	FPartition DWORD
 	FOffset    LARGE_INTEGER
-} /* winnt.h:8528:13 */
+} /* winnt.h:8647:13 */
 
-type TAPE_GET_POSITION = _TAPE_GET_POSITION /* winnt.h:8532:7 */
-type PTAPE_GET_POSITION = uintptr           /* winnt.h:8532:25 */
+type TAPE_GET_POSITION = _TAPE_GET_POSITION /* winnt.h:8651:7 */
+type PTAPE_GET_POSITION = uintptr           /* winnt.h:8651:25 */
 
 type _TAPE_SET_POSITION = struct {
-	FMethod    DWORD
-	FPartition DWORD
-	FOffset    LARGE_INTEGER
-	FImmediate BOOLEAN
-	_          [7]byte
-} /* winnt.h:8545:13 */
+	FMethod      DWORD
+	FPartition   DWORD
+	FOffset      LARGE_INTEGER
+	FImmediate   BOOLEAN
+	F__ccgo_pad1 [7]byte
+} /* winnt.h:8664:13 */
 
-type TAPE_SET_POSITION = _TAPE_SET_POSITION /* winnt.h:8550:7 */
-type PTAPE_SET_POSITION = uintptr           /* winnt.h:8550:25 */
+type TAPE_SET_POSITION = _TAPE_SET_POSITION /* winnt.h:8669:7 */
+type PTAPE_SET_POSITION = uintptr           /* winnt.h:8669:25 */
 
 type _TAPE_GET_DRIVE_PARAMETERS = struct {
 	FECC                   BOOLEAN
@@ -36114,10 +36570,10 @@ type _TAPE_GET_DRIVE_PARAMETERS = struct {
 	FFeaturesLow           DWORD
 	FFeaturesHigh          DWORD
 	FEOTWarningZoneSize    DWORD
-} /* winnt.h:8619:13 */
+} /* winnt.h:8738:13 */
 
-type TAPE_GET_DRIVE_PARAMETERS = _TAPE_GET_DRIVE_PARAMETERS /* winnt.h:8631:7 */
-type PTAPE_GET_DRIVE_PARAMETERS = uintptr                   /* winnt.h:8631:33 */
+type TAPE_GET_DRIVE_PARAMETERS = _TAPE_GET_DRIVE_PARAMETERS /* winnt.h:8750:7 */
+type PTAPE_GET_DRIVE_PARAMETERS = uintptr                   /* winnt.h:8750:33 */
 
 type _TAPE_SET_DRIVE_PARAMETERS = struct {
 	FECC                BOOLEAN
@@ -36125,10 +36581,10 @@ type _TAPE_SET_DRIVE_PARAMETERS = struct {
 	FDataPadding        BOOLEAN
 	FReportSetmarks     BOOLEAN
 	FEOTWarningZoneSize DWORD
-} /* winnt.h:8633:13 */
+} /* winnt.h:8752:13 */
 
-type TAPE_SET_DRIVE_PARAMETERS = _TAPE_SET_DRIVE_PARAMETERS /* winnt.h:8639:7 */
-type PTAPE_SET_DRIVE_PARAMETERS = uintptr                   /* winnt.h:8639:33 */
+type TAPE_SET_DRIVE_PARAMETERS = _TAPE_SET_DRIVE_PARAMETERS /* winnt.h:8758:7 */
+type PTAPE_SET_DRIVE_PARAMETERS = uintptr                   /* winnt.h:8758:33 */
 
 type _TAPE_GET_MEDIA_PARAMETERS = struct {
 	FCapacity       LARGE_INTEGER
@@ -36136,58 +36592,58 @@ type _TAPE_GET_MEDIA_PARAMETERS = struct {
 	FBlockSize      DWORD
 	FPartitionCount DWORD
 	FWriteProtected BOOLEAN
-	_               [7]byte
-} /* winnt.h:8641:13 */
+	F__ccgo_pad1    [7]byte
+} /* winnt.h:8760:13 */
 
-type TAPE_GET_MEDIA_PARAMETERS = _TAPE_GET_MEDIA_PARAMETERS /* winnt.h:8647:7 */
-type PTAPE_GET_MEDIA_PARAMETERS = uintptr                   /* winnt.h:8647:33 */
+type TAPE_GET_MEDIA_PARAMETERS = _TAPE_GET_MEDIA_PARAMETERS /* winnt.h:8766:7 */
+type PTAPE_GET_MEDIA_PARAMETERS = uintptr                   /* winnt.h:8766:33 */
 
-type _TAPE_SET_MEDIA_PARAMETERS = struct{ FBlockSize DWORD } /* winnt.h:8649:13 */
+type _TAPE_SET_MEDIA_PARAMETERS = struct{ FBlockSize DWORD } /* winnt.h:8768:13 */
 
-type TAPE_SET_MEDIA_PARAMETERS = _TAPE_SET_MEDIA_PARAMETERS /* winnt.h:8651:7 */
-type PTAPE_SET_MEDIA_PARAMETERS = uintptr                   /* winnt.h:8651:33 */
+type TAPE_SET_MEDIA_PARAMETERS = _TAPE_SET_MEDIA_PARAMETERS /* winnt.h:8770:7 */
+type PTAPE_SET_MEDIA_PARAMETERS = uintptr                   /* winnt.h:8770:33 */
 
 type _TAPE_CREATE_PARTITION = struct {
 	FMethod DWORD
 	FCount  DWORD
 	FSize   DWORD
-} /* winnt.h:8657:13 */
+} /* winnt.h:8776:13 */
 
-type TAPE_CREATE_PARTITION = _TAPE_CREATE_PARTITION /* winnt.h:8661:7 */
-type PTAPE_CREATE_PARTITION = uintptr               /* winnt.h:8661:29 */
+type TAPE_CREATE_PARTITION = _TAPE_CREATE_PARTITION /* winnt.h:8780:7 */
+type PTAPE_CREATE_PARTITION = uintptr               /* winnt.h:8780:29 */
 
 type _TAPE_WMI_OPERATIONS = struct {
 	FMethod         DWORD
 	FDataBufferSize DWORD
 	FDataBuffer     PVOID
-} /* winnt.h:8669:13 */
+} /* winnt.h:8788:13 */
 
-type TAPE_WMI_OPERATIONS = _TAPE_WMI_OPERATIONS /* winnt.h:8673:7 */
-type PTAPE_WMI_OPERATIONS = uintptr             /* winnt.h:8673:27 */
+type TAPE_WMI_OPERATIONS = _TAPE_WMI_OPERATIONS /* winnt.h:8792:7 */
+type PTAPE_WMI_OPERATIONS = uintptr             /* winnt.h:8792:27 */
 
-type TAPE_DRIVE_PROBLEM_TYPE = uint32 /* winnt.h:8677:7 */
+type TAPE_DRIVE_PROBLEM_TYPE = uint32 /* winnt.h:8796:7 */
 
-type TP_VERSION = DWORD              /* winnt.h:8680:17 */
-type PTP_VERSION = uintptr           /* winnt.h:8680:28 */
-type PTP_CALLBACK_INSTANCE = uintptr /* winnt.h:8681:61 */
-type PTP_SIMPLE_CALLBACK = uintptr   /* winnt.h:8682:16 */
-type PTP_POOL = uintptr              /* winnt.h:8683:35 */
+type TP_VERSION = DWORD              /* winnt.h:8799:17 */
+type PTP_VERSION = uintptr           /* winnt.h:8799:28 */
+type PTP_CALLBACK_INSTANCE = uintptr /* winnt.h:8800:61 */
+type PTP_SIMPLE_CALLBACK = uintptr   /* winnt.h:8801:16 */
+type PTP_POOL = uintptr              /* winnt.h:8802:35 */
 
-type TP_CALLBACK_PRIORITY = uint32 /* winnt.h:8691:5 */
+type TP_CALLBACK_PRIORITY = uint32 /* winnt.h:8810:5 */
 
 type _TP_POOL_STACK_INFORMATION = struct {
 	FStackReserve SIZE_T
 	FStackCommit  SIZE_T
-} /* winnt.h:8693:11 */
+} /* winnt.h:8812:11 */
 
-type TP_POOL_STACK_INFORMATION = _TP_POOL_STACK_INFORMATION /* winnt.h:8696:5 */
-type PTP_POOL_STACK_INFORMATION = uintptr                   /* winnt.h:8696:32 */
-type PTP_CLEANUP_GROUP = uintptr                            /* winnt.h:8698:53 */
-type PTP_CLEANUP_GROUP_CANCEL_CALLBACK = uintptr            /* winnt.h:8699:16 */
+type TP_POOL_STACK_INFORMATION = _TP_POOL_STACK_INFORMATION /* winnt.h:8815:5 */
+type PTP_POOL_STACK_INFORMATION = uintptr                   /* winnt.h:8815:32 */
+type PTP_CLEANUP_GROUP = uintptr                            /* winnt.h:8817:53 */
+type PTP_CLEANUP_GROUP_CANCEL_CALLBACK = uintptr            /* winnt.h:8818:16 */
 
 type _TP_CALLBACK_ENVIRON_V1 = struct {
 	FVersion                    TP_VERSION
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FPool                       PTP_POOL
 	FCleanupGroup               PTP_CLEANUP_GROUP
 	FCleanupGroupCancelCallback PTP_CLEANUP_GROUP_CANCEL_CALLBACK
@@ -36195,20 +36651,20 @@ type _TP_CALLBACK_ENVIRON_V1 = struct {
 	FActivationContext          uintptr
 	FFinalizationCallback       PTP_SIMPLE_CALLBACK
 	Fu                          struct{ FFlags DWORD }
-	_                           [4]byte
-} /* winnt.h:8723:11 */
+	F__ccgo_pad2                [4]byte
+} /* winnt.h:8842:11 */
 
-type TP_CALLBACK_ENVIRON_V1 = _TP_CALLBACK_ENVIRON_V1 /* winnt.h:8739:5 */
-type TP_CALLBACK_ENVIRON = TP_CALLBACK_ENVIRON_V1     /* winnt.h:8740:34 */
-type PTP_CALLBACK_ENVIRON = uintptr                   /* winnt.h:8740:54 */
-type PTP_WORK = uintptr                               /* winnt.h:8743:35 */
-type PTP_WORK_CALLBACK = uintptr                      /* winnt.h:8744:16 */
-type PTP_TIMER = uintptr                              /* winnt.h:8745:37 */
-type PTP_TIMER_CALLBACK = uintptr                     /* winnt.h:8746:16 */
-type TP_WAIT_RESULT = DWORD                           /* winnt.h:8747:17 */
-type PTP_WAIT = uintptr                               /* winnt.h:8748:35 */
-type PTP_WAIT_CALLBACK = uintptr                      /* winnt.h:8749:16 */
-type PTP_IO = uintptr                                 /* winnt.h:8750:31 */
+type TP_CALLBACK_ENVIRON_V1 = _TP_CALLBACK_ENVIRON_V1 /* winnt.h:8858:5 */
+type TP_CALLBACK_ENVIRON = TP_CALLBACK_ENVIRON_V1     /* winnt.h:8859:34 */
+type PTP_CALLBACK_ENVIRON = uintptr                   /* winnt.h:8859:54 */
+type PTP_WORK = uintptr                               /* winnt.h:8862:35 */
+type PTP_WORK_CALLBACK = uintptr                      /* winnt.h:8863:16 */
+type PTP_TIMER = uintptr                              /* winnt.h:8864:37 */
+type PTP_TIMER_CALLBACK = uintptr                     /* winnt.h:8865:16 */
+type TP_WAIT_RESULT = DWORD                           /* winnt.h:8866:17 */
+type PTP_WAIT = uintptr                               /* winnt.h:8867:35 */
+type PTP_WAIT_CALLBACK = uintptr                      /* winnt.h:8868:16 */
+type PTP_IO = uintptr                                 /* winnt.h:8869:31 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -36222,10 +36678,10 @@ type NOTIFICATION_MASK = ULONG /* ktmtypes.h:38:17 */
 type _TRANSACTION_NOTIFICATION = struct {
 	FTransactionKey          PVOID
 	FTransactionNotification ULONG
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FTmVirtualClock          LARGE_INTEGER
 	FArgumentLength          ULONG
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 } /* ktmtypes.h:78:11 */
 
 type TRANSACTION_NOTIFICATION = _TRANSACTION_NOTIFICATION /* ktmtypes.h:83:5 */
@@ -36312,50 +36768,50 @@ type KCRM_PROTOCOL_BLOB = _KCRM_PROTOCOL_BLOB /* ktmtypes.h:145:5 */
 type PKCRM_PROTOCOL_BLOB = uintptr            /* ktmtypes.h:145:24 */
 type PRKCRM_PROTOCOL_BLOB = uintptr           /* ktmtypes.h:145:45 */
 
-type TRANSACTION_OUTCOME = uint32 /* winnt.h:8882:9 */
+type TRANSACTION_OUTCOME = uint32 /* winnt.h:9001:9 */
 
-type TRANSACTION_STATE = uint32 /* winnt.h:8888:9 */
+type TRANSACTION_STATE = uint32 /* winnt.h:9007:9 */
 
 type _TRANSACTION_BASIC_INFORMATION = struct {
 	FTransactionId GUID
 	FState         DWORD
 	FOutcome       DWORD
-} /* winnt.h:8890:15 */
+} /* winnt.h:9009:15 */
 
-type TRANSACTION_BASIC_INFORMATION = _TRANSACTION_BASIC_INFORMATION /* winnt.h:8894:9 */
-type PTRANSACTION_BASIC_INFORMATION = uintptr                       /* winnt.h:8894:39 */
+type TRANSACTION_BASIC_INFORMATION = _TRANSACTION_BASIC_INFORMATION /* winnt.h:9013:9 */
+type PTRANSACTION_BASIC_INFORMATION = uintptr                       /* winnt.h:9013:39 */
 
 type _TRANSACTIONMANAGER_BASIC_INFORMATION = struct {
 	FTmIdentity   GUID
 	FVirtualClock LARGE_INTEGER
-} /* winnt.h:8896:15 */
+} /* winnt.h:9015:15 */
 
-type TRANSACTIONMANAGER_BASIC_INFORMATION = _TRANSACTIONMANAGER_BASIC_INFORMATION /* winnt.h:8899:9 */
-type PTRANSACTIONMANAGER_BASIC_INFORMATION = uintptr                              /* winnt.h:8899:46 */
+type TRANSACTIONMANAGER_BASIC_INFORMATION = _TRANSACTIONMANAGER_BASIC_INFORMATION /* winnt.h:9018:9 */
+type PTRANSACTIONMANAGER_BASIC_INFORMATION = uintptr                              /* winnt.h:9018:46 */
 
-type _TRANSACTIONMANAGER_LOG_INFORMATION = struct{ FLogIdentity GUID } /* winnt.h:8901:15 */
+type _TRANSACTIONMANAGER_LOG_INFORMATION = struct{ FLogIdentity GUID } /* winnt.h:9020:15 */
 
-type TRANSACTIONMANAGER_LOG_INFORMATION = _TRANSACTIONMANAGER_LOG_INFORMATION /* winnt.h:8903:9 */
-type PTRANSACTIONMANAGER_LOG_INFORMATION = uintptr                            /* winnt.h:8903:44 */
+type TRANSACTIONMANAGER_LOG_INFORMATION = _TRANSACTIONMANAGER_LOG_INFORMATION /* winnt.h:9022:9 */
+type PTRANSACTIONMANAGER_LOG_INFORMATION = uintptr                            /* winnt.h:9022:44 */
 
 type _TRANSACTIONMANAGER_LOGPATH_INFORMATION = struct {
 	FLogPathLength DWORD
 	FLogPath       [1]WCHAR
-	_              [2]byte
-} /* winnt.h:8905:15 */
+	F__ccgo_pad1   [2]byte
+} /* winnt.h:9024:15 */
 
-type TRANSACTIONMANAGER_LOGPATH_INFORMATION = _TRANSACTIONMANAGER_LOGPATH_INFORMATION /* winnt.h:8908:9 */
-type PTRANSACTIONMANAGER_LOGPATH_INFORMATION = uintptr                                /* winnt.h:8908:48 */
+type TRANSACTIONMANAGER_LOGPATH_INFORMATION = _TRANSACTIONMANAGER_LOGPATH_INFORMATION /* winnt.h:9027:9 */
+type PTRANSACTIONMANAGER_LOGPATH_INFORMATION = uintptr                                /* winnt.h:9027:48 */
 
-type _TRANSACTIONMANAGER_RECOVERY_INFORMATION = struct{ FLastRecoveredLsn ULONGLONG } /* winnt.h:8910:15 */
+type _TRANSACTIONMANAGER_RECOVERY_INFORMATION = struct{ FLastRecoveredLsn ULONGLONG } /* winnt.h:9029:15 */
 
-type TRANSACTIONMANAGER_RECOVERY_INFORMATION = _TRANSACTIONMANAGER_RECOVERY_INFORMATION /* winnt.h:8912:9 */
-type PTRANSACTIONMANAGER_RECOVERY_INFORMATION = uintptr                                 /* winnt.h:8912:49 */
+type TRANSACTIONMANAGER_RECOVERY_INFORMATION = _TRANSACTIONMANAGER_RECOVERY_INFORMATION /* winnt.h:9031:9 */
+type PTRANSACTIONMANAGER_RECOVERY_INFORMATION = uintptr                                 /* winnt.h:9031:49 */
 
-type _TRANSACTIONMANAGER_OLDEST_INFORMATION = struct{ FOldestTransactionGuid GUID } /* winnt.h:8914:15 */
+type _TRANSACTIONMANAGER_OLDEST_INFORMATION = struct{ FOldestTransactionGuid GUID } /* winnt.h:9033:15 */
 
-type TRANSACTIONMANAGER_OLDEST_INFORMATION = _TRANSACTIONMANAGER_OLDEST_INFORMATION /* winnt.h:8916:9 */
-type PTRANSACTIONMANAGER_OLDEST_INFORMATION = uintptr                               /* winnt.h:8916:47 */
+type TRANSACTIONMANAGER_OLDEST_INFORMATION = _TRANSACTIONMANAGER_OLDEST_INFORMATION /* winnt.h:9035:9 */
+type PTRANSACTIONMANAGER_OLDEST_INFORMATION = uintptr                               /* winnt.h:9035:47 */
 
 type _TRANSACTION_PROPERTIES_INFORMATION = struct {
 	FIsolationLevel    DWORD
@@ -36364,106 +36820,106 @@ type _TRANSACTION_PROPERTIES_INFORMATION = struct {
 	FOutcome           DWORD
 	FDescriptionLength DWORD
 	FDescription       [1]WCHAR
-	_                  [6]byte
-} /* winnt.h:8918:15 */
+	F__ccgo_pad1       [6]byte
+} /* winnt.h:9037:15 */
 
-type TRANSACTION_PROPERTIES_INFORMATION = _TRANSACTION_PROPERTIES_INFORMATION /* winnt.h:8925:9 */
-type PTRANSACTION_PROPERTIES_INFORMATION = uintptr                            /* winnt.h:8925:44 */
+type TRANSACTION_PROPERTIES_INFORMATION = _TRANSACTION_PROPERTIES_INFORMATION /* winnt.h:9044:9 */
+type PTRANSACTION_PROPERTIES_INFORMATION = uintptr                            /* winnt.h:9044:44 */
 
-type _TRANSACTION_BIND_INFORMATION = struct{ FTmHandle HANDLE } /* winnt.h:8927:15 */
+type _TRANSACTION_BIND_INFORMATION = struct{ FTmHandle HANDLE } /* winnt.h:9046:15 */
 
-type TRANSACTION_BIND_INFORMATION = _TRANSACTION_BIND_INFORMATION /* winnt.h:8929:9 */
-type PTRANSACTION_BIND_INFORMATION = uintptr                      /* winnt.h:8929:38 */
+type TRANSACTION_BIND_INFORMATION = _TRANSACTION_BIND_INFORMATION /* winnt.h:9048:9 */
+type PTRANSACTION_BIND_INFORMATION = uintptr                      /* winnt.h:9048:38 */
 
 type _TRANSACTION_ENLISTMENT_PAIR = struct {
 	FEnlistmentId      GUID
 	FResourceManagerId GUID
-} /* winnt.h:8931:15 */
+} /* winnt.h:9050:15 */
 
-type TRANSACTION_ENLISTMENT_PAIR = _TRANSACTION_ENLISTMENT_PAIR /* winnt.h:8934:9 */
-type PTRANSACTION_ENLISTMENT_PAIR = uintptr                     /* winnt.h:8934:37 */
+type TRANSACTION_ENLISTMENT_PAIR = _TRANSACTION_ENLISTMENT_PAIR /* winnt.h:9053:9 */
+type PTRANSACTION_ENLISTMENT_PAIR = uintptr                     /* winnt.h:9053:37 */
 
 type _TRANSACTION_ENLISTMENTS_INFORMATION = struct {
 	FNumberOfEnlistments DWORD
 	FEnlistmentPair      [1]TRANSACTION_ENLISTMENT_PAIR
-} /* winnt.h:8936:15 */
+} /* winnt.h:9055:15 */
 
-type TRANSACTION_ENLISTMENTS_INFORMATION = _TRANSACTION_ENLISTMENTS_INFORMATION /* winnt.h:8939:9 */
-type PTRANSACTION_ENLISTMENTS_INFORMATION = uintptr                             /* winnt.h:8939:45 */
+type TRANSACTION_ENLISTMENTS_INFORMATION = _TRANSACTION_ENLISTMENTS_INFORMATION /* winnt.h:9058:9 */
+type PTRANSACTION_ENLISTMENTS_INFORMATION = uintptr                             /* winnt.h:9058:45 */
 
-type _TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = struct{ FSuperiorEnlistmentPair TRANSACTION_ENLISTMENT_PAIR } /* winnt.h:8941:15 */
+type _TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = struct{ FSuperiorEnlistmentPair TRANSACTION_ENLISTMENT_PAIR } /* winnt.h:9060:15 */
 
-type TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = _TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION /* winnt.h:8943:9 */
-type PTRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = uintptr                                     /* winnt.h:8943:53 */
+type TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = _TRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION /* winnt.h:9062:9 */
+type PTRANSACTION_SUPERIOR_ENLISTMENT_INFORMATION = uintptr                                     /* winnt.h:9062:53 */
 
 type _RESOURCEMANAGER_BASIC_INFORMATION = struct {
 	FResourceManagerId GUID
 	FDescriptionLength DWORD
 	FDescription       [1]WCHAR
-	_                  [2]byte
-} /* winnt.h:8945:15 */
+	F__ccgo_pad1       [2]byte
+} /* winnt.h:9064:15 */
 
-type RESOURCEMANAGER_BASIC_INFORMATION = _RESOURCEMANAGER_BASIC_INFORMATION /* winnt.h:8949:9 */
-type PRESOURCEMANAGER_BASIC_INFORMATION = uintptr                           /* winnt.h:8949:43 */
+type RESOURCEMANAGER_BASIC_INFORMATION = _RESOURCEMANAGER_BASIC_INFORMATION /* winnt.h:9068:9 */
+type PRESOURCEMANAGER_BASIC_INFORMATION = uintptr                           /* winnt.h:9068:43 */
 
 type _RESOURCEMANAGER_COMPLETION_INFORMATION = struct {
 	FIoCompletionPortHandle HANDLE
 	FCompletionKey          ULONG_PTR
-} /* winnt.h:8951:15 */
+} /* winnt.h:9070:15 */
 
-type RESOURCEMANAGER_COMPLETION_INFORMATION = _RESOURCEMANAGER_COMPLETION_INFORMATION /* winnt.h:8954:9 */
-type PRESOURCEMANAGER_COMPLETION_INFORMATION = uintptr                                /* winnt.h:8954:48 */
+type RESOURCEMANAGER_COMPLETION_INFORMATION = _RESOURCEMANAGER_COMPLETION_INFORMATION /* winnt.h:9073:9 */
+type PRESOURCEMANAGER_COMPLETION_INFORMATION = uintptr                                /* winnt.h:9073:48 */
 
-type TRANSACTION_INFORMATION_CLASS = uint32 /* winnt.h:8963:9 */
+type TRANSACTION_INFORMATION_CLASS = uint32 /* winnt.h:9082:9 */
 
-type TRANSACTIONMANAGER_INFORMATION_CLASS = uint32 /* winnt.h:8972:9 */
+type TRANSACTIONMANAGER_INFORMATION_CLASS = uint32 /* winnt.h:9091:9 */
 
-type RESOURCEMANAGER_INFORMATION_CLASS = uint32 /* winnt.h:8977:9 */
+type RESOURCEMANAGER_INFORMATION_CLASS = uint32 /* winnt.h:9096:9 */
 
 type _ENLISTMENT_BASIC_INFORMATION = struct {
 	FEnlistmentId      GUID
 	FTransactionId     GUID
 	FResourceManagerId GUID
-} /* winnt.h:8979:15 */
+} /* winnt.h:9098:15 */
 
-type ENLISTMENT_BASIC_INFORMATION = _ENLISTMENT_BASIC_INFORMATION /* winnt.h:8983:9 */
-type PENLISTMENT_BASIC_INFORMATION = uintptr                      /* winnt.h:8983:38 */
+type ENLISTMENT_BASIC_INFORMATION = _ENLISTMENT_BASIC_INFORMATION /* winnt.h:9102:9 */
+type PENLISTMENT_BASIC_INFORMATION = uintptr                      /* winnt.h:9102:38 */
 
 type _ENLISTMENT_CRM_INFORMATION = struct {
 	FCrmTransactionManagerId GUID
 	FCrmResourceManagerId    GUID
 	FCrmEnlistmentId         GUID
-} /* winnt.h:8985:15 */
+} /* winnt.h:9104:15 */
 
-type ENLISTMENT_CRM_INFORMATION = _ENLISTMENT_CRM_INFORMATION /* winnt.h:8989:9 */
-type PENLISTMENT_CRM_INFORMATION = uintptr                    /* winnt.h:8989:36 */
+type ENLISTMENT_CRM_INFORMATION = _ENLISTMENT_CRM_INFORMATION /* winnt.h:9108:9 */
+type PENLISTMENT_CRM_INFORMATION = uintptr                    /* winnt.h:9108:36 */
 
-type ENLISTMENT_INFORMATION_CLASS = uint32 /* winnt.h:8995:9 */
+type ENLISTMENT_INFORMATION_CLASS = uint32 /* winnt.h:9114:9 */
 
-type _TRANSACTION_LIST_ENTRY = struct{ FUOW GUID } /* winnt.h:8997:15 */
+type _TRANSACTION_LIST_ENTRY = struct{ FUOW GUID } /* winnt.h:9116:15 */
 
-type TRANSACTION_LIST_ENTRY = _TRANSACTION_LIST_ENTRY /* winnt.h:8999:9 */
-type PTRANSACTION_LIST_ENTRY = uintptr                /* winnt.h:8999:32 */
+type TRANSACTION_LIST_ENTRY = _TRANSACTION_LIST_ENTRY /* winnt.h:9118:9 */
+type PTRANSACTION_LIST_ENTRY = uintptr                /* winnt.h:9118:32 */
 
 type _TRANSACTION_LIST_INFORMATION = struct {
 	FNumberOfTransactions   DWORD
 	FTransactionInformation [1]TRANSACTION_LIST_ENTRY
-} /* winnt.h:9001:15 */
+} /* winnt.h:9120:15 */
 
-type TRANSACTION_LIST_INFORMATION = _TRANSACTION_LIST_INFORMATION /* winnt.h:9004:9 */
-type PTRANSACTION_LIST_INFORMATION = uintptr                      /* winnt.h:9004:38 */
+type TRANSACTION_LIST_INFORMATION = _TRANSACTION_LIST_INFORMATION /* winnt.h:9123:9 */
+type PTRANSACTION_LIST_INFORMATION = uintptr                      /* winnt.h:9123:38 */
 
-type KTMOBJECT_TYPE = uint32   /* winnt.h:9012:9 */
-type PKTMOBJECT_TYPE = uintptr /* winnt.h:9012:24 */
+type KTMOBJECT_TYPE = uint32   /* winnt.h:9131:9 */
+type PKTMOBJECT_TYPE = uintptr /* winnt.h:9131:24 */
 
 type _KTMOBJECT_CURSOR = struct {
 	FLastQuery     GUID
 	FObjectIdCount DWORD
 	FObjectIds     [1]GUID
-} /* winnt.h:9014:15 */
+} /* winnt.h:9133:15 */
 
-type KTMOBJECT_CURSOR = _KTMOBJECT_CURSOR /* winnt.h:9018:9 */
-type PKTMOBJECT_CURSOR = uintptr          /* winnt.h:9018:26 */
+type KTMOBJECT_CURSOR = _KTMOBJECT_CURSOR /* winnt.h:9137:9 */
+type PKTMOBJECT_CURSOR = uintptr          /* winnt.h:9137:26 */
 
 // Field Names From (See _fields_ section)
 // FIXME: Verify these against documentation
@@ -36482,7 +36938,7 @@ type _WOW64_FLOATING_SAVE_AREA = struct {
 	FDataSelector  DWORD
 	FRegisterArea  [80]BYTE
 	FCr0NpxState   DWORD
-} /* winnt.h:9055:9 */
+} /* winnt.h:9174:9 */
 
 // Field Names From (See _fields_ section)
 // FIXME: Verify these against documentation
@@ -36491,8 +36947,8 @@ type _WOW64_FLOATING_SAVE_AREA = struct {
 // WOW64_FLOATING_SAVE_AREA - http://packages.python.org/winappdbg/winappdbg.win32.context_amd64.WOW64_FLOATING_SAVE_AREA-class.html
 // WOW64_CONTEXT - http://packages.python.org/winappdbg/winappdbg.win32.context_amd64.WOW64_CONTEXT-class.html
 
-type WOW64_FLOATING_SAVE_AREA = _WOW64_FLOATING_SAVE_AREA /* winnt.h:9065:3 */
-type PWOW64_FLOATING_SAVE_AREA = uintptr                  /* winnt.h:9065:29 */
+type WOW64_FLOATING_SAVE_AREA = _WOW64_FLOATING_SAVE_AREA /* winnt.h:9184:3 */
+type PWOW64_FLOATING_SAVE_AREA = uintptr                  /* winnt.h:9184:29 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -36524,14 +36980,14 @@ type _WOW64_CONTEXT = struct {
 	FEsp               DWORD
 	FSegSs             DWORD
 	FExtendedRegisters [512]BYTE
-} /* winnt.h:9068:9 */
+} /* winnt.h:9187:9 */
 
 // *
 // 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.
-type WOW64_CONTEXT = _WOW64_CONTEXT /* winnt.h:9094:3 */
-type PWOW64_CONTEXT = uintptr       /* winnt.h:9094:18 */
+type WOW64_CONTEXT = _WOW64_CONTEXT /* winnt.h:9213:3 */
+type PWOW64_CONTEXT = uintptr       /* winnt.h:9213:18 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -36541,31 +36997,31 @@ type _WOW64_LDT_ENTRY = struct {
 	FLimitLow WORD
 	FBaseLow  WORD
 	FHighWord struct {
-		_      [0]uint32
-		FBytes struct {
+		F__ccgo_pad1 [0]uint32
+		FBytes       struct {
 			FBaseMid BYTE
 			FFlags1  BYTE
 			FFlags2  BYTE
 			FBaseHi  BYTE
 		}
 	}
-} /* winnt.h:9097:9 */
+} /* winnt.h:9216:9 */
 
 // *
 // 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.
 
-type WOW64_LDT_ENTRY = _WOW64_LDT_ENTRY /* winnt.h:9120:3 */
-type PWOW64_LDT_ENTRY = uintptr         /* winnt.h:9120:20 */
+type WOW64_LDT_ENTRY = _WOW64_LDT_ENTRY /* winnt.h:9239:3 */
+type PWOW64_LDT_ENTRY = uintptr         /* winnt.h:9239:20 */
 
 type _WOW64_DESCRIPTOR_TABLE_ENTRY = struct {
 	FSelector   DWORD
 	FDescriptor WOW64_LDT_ENTRY
-} /* winnt.h:9122:13 */
+} /* winnt.h:9241:13 */
 
-type WOW64_DESCRIPTOR_TABLE_ENTRY = _WOW64_DESCRIPTOR_TABLE_ENTRY /* winnt.h:9125:7 */
-type PWOW64_DESCRIPTOR_TABLE_ENTRY = uintptr                      /* winnt.h:9125:36 */
+type WOW64_DESCRIPTOR_TABLE_ENTRY = _WOW64_DESCRIPTOR_TABLE_ENTRY /* winnt.h:9244:7 */
+type PWOW64_DESCRIPTOR_TABLE_ENTRY = uintptr                      /* winnt.h:9244:36 */
 
 type WPARAM = UINT_PTR  /* minwindef.h:166:20 */
 type LPARAM = LONG_PTR  /* minwindef.h:167:20 */
@@ -36634,136 +37090,148 @@ type LPFILETIME = uintptr /* minwindef.h:225:25 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type HWND__ = struct{ Funused int32 } /* windef.h:25:1 */
+type HWND__ = struct{ Funused int32 } /* windef.h:26:1 */
 
-type HWND = uintptr                    /* windef.h:25:1 */
-type HHOOK__ = struct{ Funused int32 } /* windef.h:26:1 */
+type HWND = uintptr                    /* windef.h:26:1 */
+type HHOOK__ = struct{ Funused int32 } /* windef.h:27:1 */
 
-type HHOOK = uintptr /* windef.h:26:1 */
+type HHOOK = uintptr /* windef.h:27:1 */
 
-type HGDIOBJ = uintptr /* windef.h:37:16 */
+type HGDIOBJ = uintptr /* windef.h:38:16 */
 
-type HACCEL__ = struct{ Funused int32 } /* windef.h:42:1 */
+type HACCEL__ = struct{ Funused int32 } /* windef.h:43:1 */
 
-type HACCEL = uintptr                    /* windef.h:42:1 */
-type HBITMAP__ = struct{ Funused int32 } /* windef.h:43:1 */
+type HACCEL = uintptr                    /* windef.h:43:1 */
+type HBITMAP__ = struct{ Funused int32 } /* windef.h:44:1 */
 
-type HBITMAP = uintptr                  /* windef.h:43:1 */
-type HBRUSH__ = struct{ Funused int32 } /* windef.h:44:1 */
+type HBITMAP = uintptr                  /* windef.h:44:1 */
+type HBRUSH__ = struct{ Funused int32 } /* windef.h:45:1 */
 
-type HBRUSH = uintptr                        /* windef.h:44:1 */
-type HCOLORSPACE__ = struct{ Funused int32 } /* windef.h:45:1 */
+type HBRUSH = uintptr                        /* windef.h:45:1 */
+type HCOLORSPACE__ = struct{ Funused int32 } /* windef.h:46:1 */
 
-type HCOLORSPACE = uintptr           /* windef.h:45:1 */
-type HDC__ = struct{ Funused int32 } /* windef.h:46:1 */
+type HCOLORSPACE = uintptr           /* windef.h:46:1 */
+type HDC__ = struct{ Funused int32 } /* windef.h:47:1 */
 
-type HDC = uintptr                     /* windef.h:46:1 */
-type HGLRC__ = struct{ Funused int32 } /* windef.h:47:1 */
+type HDC = uintptr                     /* windef.h:47:1 */
+type HGLRC__ = struct{ Funused int32 } /* windef.h:48:1 */
 
-type HGLRC = uintptr                   /* windef.h:47:1 */
-type HDESK__ = struct{ Funused int32 } /* windef.h:48:1 */
+type HGLRC = uintptr                   /* windef.h:48:1 */
+type HDESK__ = struct{ Funused int32 } /* windef.h:49:1 */
 
-type HDESK = uintptr                          /* windef.h:48:1 */
-type HENHMETAFILE__ = struct{ Funused int32 } /* windef.h:49:1 */
+type HDESK = uintptr                          /* windef.h:49:1 */
+type HENHMETAFILE__ = struct{ Funused int32 } /* windef.h:50:1 */
 
-type HENHMETAFILE = uintptr            /* windef.h:49:1 */
-type HFONT__ = struct{ Funused int32 } /* windef.h:50:1 */
+type HENHMETAFILE = uintptr            /* windef.h:50:1 */
+type HFONT__ = struct{ Funused int32 } /* windef.h:51:1 */
 
-type HFONT = uintptr                   /* windef.h:50:1 */
-type HICON__ = struct{ Funused int32 } /* windef.h:51:1 */
+type HFONT = uintptr                   /* windef.h:51:1 */
+type HICON__ = struct{ Funused int32 } /* windef.h:52:1 */
 
-type HICON = uintptr                   /* windef.h:51:1 */
-type HMENU__ = struct{ Funused int32 } /* windef.h:52:1 */
+type HICON = uintptr                   /* windef.h:52:1 */
+type HMENU__ = struct{ Funused int32 } /* windef.h:53:1 */
 
-type HMENU = uintptr                      /* windef.h:52:1 */
-type HPALETTE__ = struct{ Funused int32 } /* windef.h:53:1 */
+type HMENU = uintptr                      /* windef.h:53:1 */
+type HPALETTE__ = struct{ Funused int32 } /* windef.h:54:1 */
 
-type HPALETTE = uintptr               /* windef.h:53:1 */
-type HPEN__ = struct{ Funused int32 } /* windef.h:54:1 */
+type HPALETTE = uintptr               /* windef.h:54:1 */
+type HPEN__ = struct{ Funused int32 } /* windef.h:55:1 */
 
-type HPEN = uintptr                       /* windef.h:54:1 */
-type HMONITOR__ = struct{ Funused int32 } /* windef.h:55:1 */
+type HPEN = uintptr                       /* windef.h:55:1 */
+type HMONITOR__ = struct{ Funused int32 } /* windef.h:56:1 */
 
-type HMONITOR = uintptr                        /* windef.h:55:1 */
-type HWINEVENTHOOK__ = struct{ Funused int32 } /* windef.h:57:1 */
+type HMONITOR = uintptr                        /* windef.h:56:1 */
+type HWINEVENTHOOK__ = struct{ Funused int32 } /* windef.h:58:1 */
 
-type HWINEVENTHOOK = uintptr /* windef.h:57:1 */
+type HWINEVENTHOOK = uintptr /* windef.h:58:1 */
 
-type HCURSOR = HICON  /* windef.h:59:15 */
-type COLORREF = DWORD /* windef.h:60:15 */
+type HCURSOR = HICON  /* windef.h:60:15 */
+type COLORREF = DWORD /* windef.h:61:15 */
 
-type HUMPD__ = struct{ Funused int32 } /* windef.h:64:1 */
+type HUMPD__ = struct{ Funused int32 } /* windef.h:65:1 */
 
-type HUMPD = uintptr /* windef.h:64:1 */
+type HUMPD = uintptr /* windef.h:65:1 */
 
-type LPCOLORREF = uintptr /* windef.h:66:15 */
+type LPCOLORREF = uintptr /* windef.h:67:15 */
 
 type tagRECT = struct {
 	Fleft   LONG
 	Ftop    LONG
 	Fright  LONG
 	Fbottom LONG
-} /* windef.h:72:9 */
+} /* windef.h:73:9 */
 
-type RECT = tagRECT   /* windef.h:77:3 */
-type PRECT = uintptr  /* windef.h:77:8 */
-type NPRECT = uintptr /* windef.h:77:15 */
-type LPRECT = uintptr /* windef.h:77:23 */
+type RECT = tagRECT   /* windef.h:78:3 */
+type PRECT = uintptr  /* windef.h:78:8 */
+type NPRECT = uintptr /* windef.h:78:15 */
+type LPRECT = uintptr /* windef.h:78:23 */
 
-type LPCRECT = uintptr /* windef.h:79:20 */
+type LPCRECT = uintptr /* windef.h:80:20 */
 
 type _RECTL = struct {
 	Fleft   LONG
 	Ftop    LONG
 	Fright  LONG
 	Fbottom LONG
-} /* windef.h:81:9 */
+} /* windef.h:82:9 */
 
-type RECTL = _RECTL    /* windef.h:86:3 */
-type PRECTL = uintptr  /* windef.h:86:9 */
-type LPRECTL = uintptr /* windef.h:86:17 */
+type RECTL = _RECTL    /* windef.h:87:3 */
+type PRECTL = uintptr  /* windef.h:87:9 */
+type LPRECTL = uintptr /* windef.h:87:17 */
 
-type LPCRECTL = uintptr /* windef.h:88:21 */
+type LPCRECTL = uintptr /* windef.h:89:21 */
 
 type tagPOINT = struct {
 	Fx LONG
 	Fy LONG
-} /* windef.h:90:9 */
+} /* windef.h:91:9 */
 
-type POINT = tagPOINT  /* windef.h:93:3 */
-type PPOINT = uintptr  /* windef.h:93:9 */
-type NPPOINT = uintptr /* windef.h:93:17 */
-type LPPOINT = uintptr /* windef.h:93:26 */
+type POINT = tagPOINT  /* windef.h:94:3 */
+type PPOINT = uintptr  /* windef.h:94:9 */
+type NPPOINT = uintptr /* windef.h:94:17 */
+type LPPOINT = uintptr /* windef.h:94:26 */
 
 type _POINTL = struct {
 	Fx LONG
 	Fy LONG
-} /* windef.h:95:9 */
+} /* windef.h:96:9 */
 
-type POINTL = _POINTL  /* windef.h:98:3 */
-type PPOINTL = uintptr /* windef.h:98:10 */
+type POINTL = _POINTL  /* windef.h:99:3 */
+type PPOINTL = uintptr /* windef.h:99:10 */
 
 type tagSIZE = struct {
 	Fcx LONG
 	Fcy LONG
-} /* windef.h:100:9 */
+} /* windef.h:101:9 */
 
-type SIZE = tagSIZE   /* windef.h:103:3 */
-type PSIZE = uintptr  /* windef.h:103:8 */
-type LPSIZE = uintptr /* windef.h:103:15 */
+type SIZE = tagSIZE   /* windef.h:104:3 */
+type PSIZE = uintptr  /* windef.h:104:8 */
+type LPSIZE = uintptr /* windef.h:104:15 */
 
-type SIZEL = SIZE      /* windef.h:105:14 */
-type PSIZEL = uintptr  /* windef.h:106:14 */
-type LPSIZEL = uintptr /* windef.h:106:22 */
+type SIZEL = SIZE      /* windef.h:106:14 */
+type PSIZEL = uintptr  /* windef.h:107:14 */
+type LPSIZEL = uintptr /* windef.h:107:22 */
 
 type tagPOINTS = struct {
 	Fx SHORT
 	Fy SHORT
-} /* windef.h:108:9 */
+} /* windef.h:109:9 */
+
+type POINTS = tagPOINTS /* windef.h:112:3 */
+type PPOINTS = uintptr  /* windef.h:112:10 */
+type LPPOINTS = uintptr /* windef.h:112:19 */
+
+type APP_LOCAL_DEVICE_ID1 = struct{ Fvalue [32]BYTE } /* windef.h:116:9 */
+
+type APP_LOCAL_DEVICE_ID = APP_LOCAL_DEVICE_ID1 /* windef.h:118:3 */
+
+type DPI_AWARENESS_CONTEXT__ = struct{ Funused int32 } /* windef.h:155:1 */
 
-type POINTS = tagPOINTS /* windef.h:111:3 */
-type PPOINTS = uintptr  /* windef.h:111:10 */
-type LPPOINTS = uintptr /* windef.h:111:19 */
+type DPI_AWARENESS_CONTEXT = uintptr /* windef.h:155:1 */
+
+type DPI_AWARENESS = int32 /* windef.h:162:3 */
+
+type DPI_HOSTING_BEHAVIOR = int32 /* windef.h:174:3 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -36784,10 +37252,10 @@ type LPPOINTS = uintptr /* windef.h:111:19 */
 
 type _SECURITY_ATTRIBUTES = struct {
 	FnLength              DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FlpSecurityDescriptor LPVOID
 	FbInheritHandle       WINBOOL
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 } /* minwinbase.h:13:11 */
 
 // *
@@ -36815,8 +37283,8 @@ type _OVERLAPPED = struct {
 	FInternal     ULONG_PTR
 	FInternalHigh ULONG_PTR
 	Fu            struct {
-		_  [0]uint64
-		Fs struct {
+		F__ccgo_pad1 [0]uint64
+		Fs           struct {
 			FOffset     DWORD
 			FOffsetHigh DWORD
 		}
@@ -36832,7 +37300,7 @@ type _OVERLAPPED_ENTRY = struct {
 	FlpOverlapped               LPOVERLAPPED
 	FInternal                   ULONG_PTR
 	FdwNumberOfBytesTransferred DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 } /* minwinbase.h:32:11 */
 
 type OVERLAPPED_ENTRY = _OVERLAPPED_ENTRY /* minwinbase.h:37:5 */
@@ -36864,12 +37332,12 @@ type _WIN32_FIND_DATAA = struct {
 	FdwReserved1        DWORD
 	FcFileName          [260]CHAR
 	FcAlternateFileName [14]CHAR
-	_                   [2]byte
+	F__ccgo_pad1        [2]byte
 } /* minwinbase.h:61:11 */
 
-type WIN32_FIND_DATAA = _WIN32_FIND_DATAA /* minwinbase.h:72:5 */
-type PWIN32_FIND_DATAA = uintptr          /* minwinbase.h:72:23 */
-type LPWIN32_FIND_DATAA = uintptr         /* minwinbase.h:72:43 */
+type WIN32_FIND_DATAA = _WIN32_FIND_DATAA /* minwinbase.h:77:5 */
+type PWIN32_FIND_DATAA = uintptr          /* minwinbase.h:77:23 */
+type LPWIN32_FIND_DATAA = uintptr         /* minwinbase.h:77:43 */
 
 type _WIN32_FIND_DATAW = struct {
 	FdwFileAttributes   DWORD
@@ -36882,30 +37350,30 @@ type _WIN32_FIND_DATAW = struct {
 	FdwReserved1        DWORD
 	FcFileName          [260]WCHAR
 	FcAlternateFileName [14]WCHAR
-} /* minwinbase.h:74:11 */
+} /* minwinbase.h:79:11 */
 
-type WIN32_FIND_DATAW = _WIN32_FIND_DATAW /* minwinbase.h:85:5 */
-type PWIN32_FIND_DATAW = uintptr          /* minwinbase.h:85:23 */
-type LPWIN32_FIND_DATAW = uintptr         /* minwinbase.h:85:43 */
+type WIN32_FIND_DATAW = _WIN32_FIND_DATAW /* minwinbase.h:95:5 */
+type PWIN32_FIND_DATAW = uintptr          /* minwinbase.h:95:23 */
+type LPWIN32_FIND_DATAW = uintptr         /* minwinbase.h:95:43 */
 
-type WIN32_FIND_DATA = WIN32_FIND_DATAA     /* minwinbase.h:87:3 */
-type PWIN32_FIND_DATA = PWIN32_FIND_DATAA   /* minwinbase.h:88:3 */
-type LPWIN32_FIND_DATA = LPWIN32_FIND_DATAA /* minwinbase.h:89:3 */
+type WIN32_FIND_DATA = WIN32_FIND_DATAA     /* minwinbase.h:97:3 */
+type PWIN32_FIND_DATA = PWIN32_FIND_DATAA   /* minwinbase.h:98:3 */
+type LPWIN32_FIND_DATA = LPWIN32_FIND_DATAA /* minwinbase.h:99:3 */
 
-type FINDEX_INFO_LEVELS = uint32 /* minwinbase.h:95:5 */
+type FINDEX_INFO_LEVELS = uint32 /* minwinbase.h:106:5 */
 
-type FINDEX_SEARCH_OPS = uint32 /* minwinbase.h:105:5 */
+type FINDEX_SEARCH_OPS = uint32 /* minwinbase.h:119:5 */
 
-type GET_FILEEX_INFO_LEVELS = uint32 /* minwinbase.h:110:5 */
+type GET_FILEEX_INFO_LEVELS = uint32 /* minwinbase.h:134:5 */
 
-type CRITICAL_SECTION = RTL_CRITICAL_SECTION                /* minwinbase.h:141:32 */
-type PCRITICAL_SECTION = PRTL_CRITICAL_SECTION              /* minwinbase.h:142:33 */
-type LPCRITICAL_SECTION = PRTL_CRITICAL_SECTION             /* minwinbase.h:143:33 */
-type CRITICAL_SECTION_DEBUG = RTL_CRITICAL_SECTION_DEBUG    /* minwinbase.h:144:38 */
-type PCRITICAL_SECTION_DEBUG = PRTL_CRITICAL_SECTION_DEBUG  /* minwinbase.h:145:39 */
-type LPCRITICAL_SECTION_DEBUG = PRTL_CRITICAL_SECTION_DEBUG /* minwinbase.h:146:39 */
+type CRITICAL_SECTION = RTL_CRITICAL_SECTION                /* minwinbase.h:171:32 */
+type PCRITICAL_SECTION = PRTL_CRITICAL_SECTION              /* minwinbase.h:172:33 */
+type LPCRITICAL_SECTION = PRTL_CRITICAL_SECTION             /* minwinbase.h:173:33 */
+type CRITICAL_SECTION_DEBUG = RTL_CRITICAL_SECTION_DEBUG    /* minwinbase.h:174:38 */
+type PCRITICAL_SECTION_DEBUG = PRTL_CRITICAL_SECTION_DEBUG  /* minwinbase.h:175:39 */
+type LPCRITICAL_SECTION_DEBUG = PRTL_CRITICAL_SECTION_DEBUG /* minwinbase.h:176:39 */
 
-type LPOVERLAPPED_COMPLETION_ROUTINE = uintptr /* minwinbase.h:148:16 */
+type LPOVERLAPPED_COMPLETION_ROUTINE = uintptr /* minwinbase.h:178:16 */
 
 type _PROCESS_HEAP_ENTRY = struct {
 	FlpData       PVOID
@@ -36915,16 +37383,16 @@ type _PROCESS_HEAP_ENTRY = struct {
 	FwFlags       WORD
 	Fu            struct {
 		FBlock struct {
-			FhMem       HANDLE
-			FdwReserved [3]DWORD
-			_           [4]byte
+			FhMem        HANDLE
+			FdwReserved  [3]DWORD
+			F__ccgo_pad1 [4]byte
 		}
 	}
-} /* minwinbase.h:153:11 */
+} /* minwinbase.h:183:11 */
 
-type PROCESS_HEAP_ENTRY = _PROCESS_HEAP_ENTRY /* minwinbase.h:171:5 */
-type LPPROCESS_HEAP_ENTRY = uintptr           /* minwinbase.h:171:24 */
-type PPROCESS_HEAP_ENTRY = uintptr            /* minwinbase.h:171:46 */
+type PROCESS_HEAP_ENTRY = _PROCESS_HEAP_ENTRY /* minwinbase.h:201:5 */
+type LPPROCESS_HEAP_ENTRY = uintptr           /* minwinbase.h:201:24 */
+type PPROCESS_HEAP_ENTRY = uintptr            /* minwinbase.h:201:46 */
 
 type _REASON_CONTEXT = struct {
 	FVersion ULONG
@@ -36937,31 +37405,34 @@ type _REASON_CONTEXT = struct {
 			FReasonStrings         uintptr
 		}
 	}
-} /* minwinbase.h:179:11 */
+} /* minwinbase.h:210:11 */
 
-type REASON_CONTEXT = _REASON_CONTEXT /* minwinbase.h:191:5 */
-type PREASON_CONTEXT = uintptr        /* minwinbase.h:191:21 */
+type REASON_CONTEXT = _REASON_CONTEXT /* minwinbase.h:222:5 */
+type PREASON_CONTEXT = uintptr        /* minwinbase.h:222:21 */
 
-type PTHREAD_START_ROUTINE = uintptr                /* minwinbase.h:203:17 */
-type LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE /* minwinbase.h:204:33 */
+type PTHREAD_START_ROUTINE = uintptr                /* minwinbase.h:234:17 */
+type LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE /* minwinbase.h:235:33 */
+
+type PENCLAVE_ROUTINE = uintptr           /* minwinbase.h:237:18 */
+type LPENCLAVE_ROUTINE = PENCLAVE_ROUTINE /* minwinbase.h:238:28 */
 
 type _EXCEPTION_DEBUG_INFO = struct {
 	FExceptionRecord EXCEPTION_RECORD
 	FdwFirstChance   DWORD
-	_                [4]byte
-} /* minwinbase.h:206:11 */
+	F__ccgo_pad1     [4]byte
+} /* minwinbase.h:240:11 */
 
-type EXCEPTION_DEBUG_INFO = _EXCEPTION_DEBUG_INFO /* minwinbase.h:209:5 */
-type LPEXCEPTION_DEBUG_INFO = uintptr             /* minwinbase.h:209:27 */
+type EXCEPTION_DEBUG_INFO = _EXCEPTION_DEBUG_INFO /* minwinbase.h:243:5 */
+type LPEXCEPTION_DEBUG_INFO = uintptr             /* minwinbase.h:243:27 */
 
 type _CREATE_THREAD_DEBUG_INFO = struct {
 	FhThread           HANDLE
 	FlpThreadLocalBase LPVOID
 	FlpStartAddress    LPTHREAD_START_ROUTINE
-} /* minwinbase.h:211:11 */
+} /* minwinbase.h:245:11 */
 
-type CREATE_THREAD_DEBUG_INFO = _CREATE_THREAD_DEBUG_INFO /* minwinbase.h:215:5 */
-type LPCREATE_THREAD_DEBUG_INFO = uintptr                 /* minwinbase.h:215:31 */
+type CREATE_THREAD_DEBUG_INFO = _CREATE_THREAD_DEBUG_INFO /* minwinbase.h:249:5 */
+type LPCREATE_THREAD_DEBUG_INFO = uintptr                 /* minwinbase.h:249:31 */
 
 type _CREATE_PROCESS_DEBUG_INFO = struct {
 	FhFile                 HANDLE
@@ -36974,21 +37445,21 @@ type _CREATE_PROCESS_DEBUG_INFO = struct {
 	FlpStartAddress        LPTHREAD_START_ROUTINE
 	FlpImageName           LPVOID
 	FfUnicode              WORD
-	_                      [6]byte
-} /* minwinbase.h:217:11 */
+	F__ccgo_pad1           [6]byte
+} /* minwinbase.h:251:11 */
 
-type CREATE_PROCESS_DEBUG_INFO = _CREATE_PROCESS_DEBUG_INFO /* minwinbase.h:228:5 */
-type LPCREATE_PROCESS_DEBUG_INFO = uintptr                  /* minwinbase.h:228:32 */
+type CREATE_PROCESS_DEBUG_INFO = _CREATE_PROCESS_DEBUG_INFO /* minwinbase.h:262:5 */
+type LPCREATE_PROCESS_DEBUG_INFO = uintptr                  /* minwinbase.h:262:32 */
 
-type _EXIT_THREAD_DEBUG_INFO = struct{ FdwExitCode DWORD } /* minwinbase.h:230:11 */
+type _EXIT_THREAD_DEBUG_INFO = struct{ FdwExitCode DWORD } /* minwinbase.h:264:11 */
 
-type EXIT_THREAD_DEBUG_INFO = _EXIT_THREAD_DEBUG_INFO /* minwinbase.h:232:5 */
-type LPEXIT_THREAD_DEBUG_INFO = uintptr               /* minwinbase.h:232:29 */
+type EXIT_THREAD_DEBUG_INFO = _EXIT_THREAD_DEBUG_INFO /* minwinbase.h:266:5 */
+type LPEXIT_THREAD_DEBUG_INFO = uintptr               /* minwinbase.h:266:29 */
 
-type _EXIT_PROCESS_DEBUG_INFO = struct{ FdwExitCode DWORD } /* minwinbase.h:234:11 */
+type _EXIT_PROCESS_DEBUG_INFO = struct{ FdwExitCode DWORD } /* minwinbase.h:268:11 */
 
-type EXIT_PROCESS_DEBUG_INFO = _EXIT_PROCESS_DEBUG_INFO /* minwinbase.h:236:5 */
-type LPEXIT_PROCESS_DEBUG_INFO = uintptr                /* minwinbase.h:236:30 */
+type EXIT_PROCESS_DEBUG_INFO = _EXIT_PROCESS_DEBUG_INFO /* minwinbase.h:270:5 */
+type LPEXIT_PROCESS_DEBUG_INFO = uintptr                /* minwinbase.h:270:30 */
 
 type _LOAD_DLL_DEBUG_INFO = struct {
 	FhFile                 HANDLE
@@ -36997,47 +37468,47 @@ type _LOAD_DLL_DEBUG_INFO = struct {
 	FnDebugInfoSize        DWORD
 	FlpImageName           LPVOID
 	FfUnicode              WORD
-	_                      [6]byte
-} /* minwinbase.h:238:11 */
+	F__ccgo_pad1           [6]byte
+} /* minwinbase.h:272:11 */
 
-type LOAD_DLL_DEBUG_INFO = _LOAD_DLL_DEBUG_INFO /* minwinbase.h:245:5 */
-type LPLOAD_DLL_DEBUG_INFO = uintptr            /* minwinbase.h:245:26 */
+type LOAD_DLL_DEBUG_INFO = _LOAD_DLL_DEBUG_INFO /* minwinbase.h:279:5 */
+type LPLOAD_DLL_DEBUG_INFO = uintptr            /* minwinbase.h:279:26 */
 
-type _UNLOAD_DLL_DEBUG_INFO = struct{ FlpBaseOfDll LPVOID } /* minwinbase.h:247:11 */
+type _UNLOAD_DLL_DEBUG_INFO = struct{ FlpBaseOfDll LPVOID } /* minwinbase.h:281:11 */
 
-type UNLOAD_DLL_DEBUG_INFO = _UNLOAD_DLL_DEBUG_INFO /* minwinbase.h:249:5 */
-type LPUNLOAD_DLL_DEBUG_INFO = uintptr              /* minwinbase.h:249:28 */
+type UNLOAD_DLL_DEBUG_INFO = _UNLOAD_DLL_DEBUG_INFO /* minwinbase.h:283:5 */
+type LPUNLOAD_DLL_DEBUG_INFO = uintptr              /* minwinbase.h:283:28 */
 
 type _OUTPUT_DEBUG_STRING_INFO = struct {
 	FlpDebugStringData  LPSTR
 	FfUnicode           WORD
 	FnDebugStringLength WORD
-	_                   [4]byte
-} /* minwinbase.h:251:11 */
+	F__ccgo_pad1        [4]byte
+} /* minwinbase.h:285:11 */
 
-type OUTPUT_DEBUG_STRING_INFO = _OUTPUT_DEBUG_STRING_INFO /* minwinbase.h:255:5 */
-type LPOUTPUT_DEBUG_STRING_INFO = uintptr                 /* minwinbase.h:255:31 */
+type OUTPUT_DEBUG_STRING_INFO = _OUTPUT_DEBUG_STRING_INFO /* minwinbase.h:289:5 */
+type LPOUTPUT_DEBUG_STRING_INFO = uintptr                 /* minwinbase.h:289:31 */
 
 type _RIP_INFO = struct {
 	FdwError DWORD
 	FdwType  DWORD
-} /* minwinbase.h:257:11 */
+} /* minwinbase.h:291:11 */
 
-type RIP_INFO = _RIP_INFO /* minwinbase.h:260:5 */
-type LPRIP_INFO = uintptr /* minwinbase.h:260:15 */
+type RIP_INFO = _RIP_INFO /* minwinbase.h:294:5 */
+type LPRIP_INFO = uintptr /* minwinbase.h:294:15 */
 
 type _DEBUG_EVENT = struct {
 	FdwDebugEventCode DWORD
 	FdwProcessId      DWORD
 	FdwThreadId       DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	Fu                struct{ FException EXCEPTION_DEBUG_INFO }
-} /* minwinbase.h:262:11 */
+} /* minwinbase.h:296:11 */
 
-type DEBUG_EVENT = _DEBUG_EVENT /* minwinbase.h:277:5 */
-type LPDEBUG_EVENT = uintptr    /* minwinbase.h:277:18 */
+type DEBUG_EVENT = _DEBUG_EVENT /* minwinbase.h:311:5 */
+type LPDEBUG_EVENT = uintptr    /* minwinbase.h:311:18 */
 
-type LPCONTEXT = PCONTEXT                  /* minwinbase.h:280:20 */
+type LPCONTEXT = PCONTEXT                  /* minwinbase.h:314:20 */
 type BEM_FREE_INTERFACE_CALLBACK = uintptr /* bemapiset.h:21:16 */
 
 // *
@@ -37065,11 +37536,11 @@ type _BY_HANDLE_FILE_INFORMATION = struct {
 	FnNumberOfLinks       DWORD
 	FnFileIndexHigh       DWORD
 	FnFileIndexLow        DWORD
-} /* fileapi.h:38:11 */
+} /* fileapi.h:36:11 */
 
-type BY_HANDLE_FILE_INFORMATION = _BY_HANDLE_FILE_INFORMATION /* fileapi.h:49:5 */
-type PBY_HANDLE_FILE_INFORMATION = uintptr                    /* fileapi.h:49:33 */
-type LPBY_HANDLE_FILE_INFORMATION = uintptr                   /* fileapi.h:50:5 */
+type BY_HANDLE_FILE_INFORMATION = _BY_HANDLE_FILE_INFORMATION /* fileapi.h:47:5 */
+type PBY_HANDLE_FILE_INFORMATION = uintptr                    /* fileapi.h:47:33 */
+type LPBY_HANDLE_FILE_INFORMATION = uintptr                   /* fileapi.h:48:5 */
 
 type _WIN32_FILE_ATTRIBUTE_DATA = struct {
 	FdwFileAttributes DWORD
@@ -37078,10 +37549,10 @@ type _WIN32_FILE_ATTRIBUTE_DATA = struct {
 	FftLastWriteTime  FILETIME
 	FnFileSizeHigh    DWORD
 	FnFileSizeLow     DWORD
-} /* fileapi.h:129:11 */
+} /* fileapi.h:142:11 */
 
-type WIN32_FILE_ATTRIBUTE_DATA = _WIN32_FILE_ATTRIBUTE_DATA /* fileapi.h:136:5 */
-type LPWIN32_FILE_ATTRIBUTE_DATA = uintptr                  /* fileapi.h:136:32 */
+type WIN32_FILE_ATTRIBUTE_DATA = _WIN32_FILE_ATTRIBUTE_DATA /* fileapi.h:149:5 */
+type LPWIN32_FILE_ATTRIBUTE_DATA = uintptr                  /* fileapi.h:149:32 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -37097,7 +37568,7 @@ type LPWIN32_FILE_ATTRIBUTE_DATA = uintptr                  /* fileapi.h:136:32
 
 type _HEAP_SUMMARY = struct {
 	Fcb           DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FcbAllocated  SIZE_T
 	FcbCommitted  SIZE_T
 	FcbReserved   SIZE_T
@@ -37167,6 +37638,28 @@ type PGET_MODULE_HANDLE_EXW = uintptr /* libloaderapi.h:42:19 */
 type DLL_DIRECTORY_COOKIE = PVOID    /* libloaderapi.h:45:17 */
 type PDLL_DIRECTORY_COOKIE = uintptr /* libloaderapi.h:45:39 */
 
+type _REDIRECTION_FUNCTION_DESCRIPTOR = struct {
+	FDllName           PCSTR
+	FFunctionName      PCSTR
+	FRedirectionTarget PVOID
+} /* libloaderapi.h:158:9 */
+
+type REDIRECTION_FUNCTION_DESCRIPTOR = _REDIRECTION_FUNCTION_DESCRIPTOR /* libloaderapi.h:162:3 */
+type PREDIRECTION_FUNCTION_DESCRIPTOR = uintptr                         /* libloaderapi.h:162:36 */
+
+type PCREDIRECTION_FUNCTION_DESCRIPTOR = uintptr /* libloaderapi.h:164:47 */
+
+type _REDIRECTION_DESCRIPTOR = struct {
+	FVersion       ULONG
+	FFunctionCount ULONG
+	FRedirections  PCREDIRECTION_FUNCTION_DESCRIPTOR
+} /* libloaderapi.h:166:9 */
+
+type REDIRECTION_DESCRIPTOR = _REDIRECTION_DESCRIPTOR /* libloaderapi.h:170:3 */
+type PREDIRECTION_DESCRIPTOR = uintptr                /* libloaderapi.h:170:27 */
+
+type PCREDIRECTION_DESCRIPTOR = uintptr /* libloaderapi.h:172:38 */
+
 // *
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
@@ -37181,20 +37674,9 @@ type PDLL_DIRECTORY_COOKIE = uintptr /* libloaderapi.h:45:39 */
 
 type MEMORY_RESOURCE_NOTIFICATION_TYPE = uint32 /* memoryapi.h:21:5 */
 
-type _PROCESS_INFORMATION = struct {
-	FhProcess    HANDLE
-	FhThread     HANDLE
-	FdwProcessId DWORD
-	FdwThreadId  DWORD
-} /* processthreadsapi.h:28:11 */
-
-type PROCESS_INFORMATION = _PROCESS_INFORMATION /* processthreadsapi.h:33:5 */
-type PPROCESS_INFORMATION = uintptr             /* processthreadsapi.h:33:26 */
-type LPPROCESS_INFORMATION = uintptr            /* processthreadsapi.h:33:49 */
-
 type _STARTUPINFOA = struct {
 	Fcb              DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FlpReserved      LPSTR
 	FlpDesktop       LPSTR
 	FlpTitle         LPSTR
@@ -37208,19 +37690,19 @@ type _STARTUPINFOA = struct {
 	FdwFlags         DWORD
 	FwShowWindow     WORD
 	FcbReserved2     WORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FlpReserved2     LPBYTE
 	FhStdInput       HANDLE
 	FhStdOutput      HANDLE
 	FhStdError       HANDLE
-} /* processthreadsapi.h:35:11 */
+} /* processthreadsapi.h:51:11 */
 
-type STARTUPINFOA = _STARTUPINFOA /* processthreadsapi.h:54:5 */
-type LPSTARTUPINFOA = uintptr     /* processthreadsapi.h:54:19 */
+type STARTUPINFOA = _STARTUPINFOA /* processthreadsapi.h:70:5 */
+type LPSTARTUPINFOA = uintptr     /* processthreadsapi.h:70:19 */
 
 type _STARTUPINFOW = struct {
 	Fcb              DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FlpReserved      LPWSTR
 	FlpDesktop       LPWSTR
 	FlpTitle         LPWSTR
@@ -37234,21 +37716,32 @@ type _STARTUPINFOW = struct {
 	FdwFlags         DWORD
 	FwShowWindow     WORD
 	FcbReserved2     WORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FlpReserved2     LPBYTE
 	FhStdInput       HANDLE
 	FhStdOutput      HANDLE
 	FhStdError       HANDLE
-} /* processthreadsapi.h:56:11 */
+} /* processthreadsapi.h:72:11 */
 
-type STARTUPINFOW = _STARTUPINFOW /* processthreadsapi.h:75:5 */
-type LPSTARTUPINFOW = uintptr     /* processthreadsapi.h:75:19 */
+type STARTUPINFOW = _STARTUPINFOW /* processthreadsapi.h:91:5 */
+type LPSTARTUPINFOW = uintptr     /* processthreadsapi.h:91:19 */
 
-type STARTUPINFO = STARTUPINFOA     /* processthreadsapi.h:77:3 */
-type LPSTARTUPINFO = LPSTARTUPINFOA /* processthreadsapi.h:78:3 */
+type STARTUPINFO = STARTUPINFOA     /* processthreadsapi.h:93:3 */
+type LPSTARTUPINFO = LPSTARTUPINFOA /* processthreadsapi.h:94:3 */
 
-type PPROC_THREAD_ATTRIBUTE_LIST = uintptr  /* processthreadsapi.h:80:46 */
-type LPPROC_THREAD_ATTRIBUTE_LIST = uintptr /* processthreadsapi.h:80:76 */
+type _PROCESS_INFORMATION = struct {
+	FhProcess    HANDLE
+	FhThread     HANDLE
+	FdwProcessId DWORD
+	FdwThreadId  DWORD
+} /* processthreadsapi.h:96:11 */
+
+type PROCESS_INFORMATION = _PROCESS_INFORMATION /* processthreadsapi.h:101:5 */
+type PPROCESS_INFORMATION = uintptr             /* processthreadsapi.h:101:26 */
+type LPPROCESS_INFORMATION = uintptr            /* processthreadsapi.h:101:49 */
+
+type PPROC_THREAD_ATTRIBUTE_LIST = uintptr  /* processthreadsapi.h:106:46 */
+type LPPROC_THREAD_ATTRIBUTE_LIST = uintptr /* processthreadsapi.h:106:76 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -37451,6 +37944,9 @@ type PTP_WIN32_IO_CALLBACK = uintptr /* threadpoolapiset.h:18:16 */
 
 // *****************************************************
 
+// GCC 8 has already defined _xgetbv, Clang 9 has _xgetbv defined as a macro
+// redirecting to the __builtin_ia32_xgetbv builtin.
+
 // *****************************************************
 
 type PFIBER_START_ROUTINE = uintptr               /* winbase.h:160:16 */
@@ -37477,40 +37973,40 @@ type _COMMPROP = struct {
 	FdwProvSpec1         DWORD
 	FdwProvSpec2         DWORD
 	FwcProvChar          [1]WCHAR
-	_                    [2]byte
+	F__ccgo_pad1         [2]byte
 } /* winbase.h:240:11 */
 
 type COMMPROP = _COMMPROP /* winbase.h:259:5 */
 type LPCOMMPROP = uintptr /* winbase.h:259:14 */
 
 type _COMSTAT = struct {
-	FfCtsHold uint32 /* DWORD fCtsHold: 1, DWORD fDsrHold: 1, DWORD fRlsdHold: 1, DWORD fXoffHold: 1, DWORD fXoffSent: 1, DWORD fEof: 1, DWORD fTxim: 1, DWORD fReserved: 25 */
-	_         [4]byte
-	FcbInQue  DWORD
-	FcbOutQue DWORD
+	FfCtsHold    uint32 /* DWORD fCtsHold: 1, DWORD fDsrHold: 1, DWORD fRlsdHold: 1, DWORD fXoffHold: 1, DWORD fXoffSent: 1, DWORD fEof: 1, DWORD fTxim: 1, DWORD fReserved: 25 */
+	F__ccgo_pad1 [4]byte
+	FcbInQue     DWORD
+	FcbOutQue    DWORD
 } /* winbase.h:263:11 */
 
 type COMSTAT = _COMSTAT  /* winbase.h:274:5 */
 type LPCOMSTAT = uintptr /* winbase.h:274:13 */
 
 type _DCB = struct {
-	FDCBlength  DWORD
-	FBaudRate   DWORD
-	FfBinary    uint32 /* DWORD fBinary: 1, DWORD fParity: 1, DWORD fOutxCtsFlow: 1, DWORD fOutxDsrFlow: 1, DWORD fDtrControl: 2, DWORD fDsrSensitivity: 1, DWORD fTXContinueOnXoff: 1, DWORD fOutX: 1, DWORD fInX: 1, DWORD fErrorChar: 1, DWORD fNull: 1, DWORD fRtsControl: 2, DWORD fAbortOnError: 1, DWORD fDummy2: 17 */
-	_           [2]byte
-	FwReserved  WORD
-	FXonLim     WORD
-	FXoffLim    WORD
-	FByteSize   BYTE
-	FParity     BYTE
-	FStopBits   BYTE
-	FXonChar    int8
-	FXoffChar   int8
-	FErrorChar  int8
-	FEofChar    int8
-	FEvtChar    int8
-	FwReserved1 WORD
-	_           [2]byte
+	FDCBlength   DWORD
+	FBaudRate    DWORD
+	FfBinary     uint32 /* DWORD fBinary: 1, DWORD fParity: 1, DWORD fOutxCtsFlow: 1, DWORD fOutxDsrFlow: 1, DWORD fDtrControl: 2, DWORD fDsrSensitivity: 1, DWORD fTXContinueOnXoff: 1, DWORD fOutX: 1, DWORD fInX: 1, DWORD fErrorChar: 1, DWORD fNull: 1, DWORD fRtsControl: 2, DWORD fAbortOnError: 1, DWORD fDummy2: 17 */
+	F__ccgo_pad1 [2]byte
+	FwReserved   WORD
+	FXonLim      WORD
+	FXoffLim     WORD
+	FByteSize    BYTE
+	FParity      BYTE
+	FStopBits    BYTE
+	FXonChar     int8
+	FXoffChar    int8
+	FErrorChar   int8
+	FEofChar     int8
+	FEvtChar     int8
+	FwReserved1  WORD
+	F__ccgo_pad2 [2]byte
 } /* winbase.h:285:11 */
 
 type DCB = _DCB      /* winbase.h:314:5 */
@@ -37536,7 +38032,7 @@ type _COMMCONFIG = struct {
 	FdwProviderOffset  DWORD
 	FdwProviderSize    DWORD
 	FwcProviderData    [1]WCHAR
-	_                  [2]byte
+	F__ccgo_pad1       [2]byte
 } /* winbase.h:324:11 */
 
 type COMMCONFIG = _COMMCONFIG /* winbase.h:333:5 */
@@ -37590,16 +38086,12 @@ type OFSTRUCT = _OFSTRUCT /* winbase.h:627:5 */
 type LPOFSTRUCT = uintptr /* winbase.h:627:15 */
 type POFSTRUCT = uintptr  /* winbase.h:627:27 */
 
-// TODO: Add RTL_UMS... to winnt.h header and add UMS-base API.
-
-type THREAD_INFORMATION_CLASS = uint32 /* winbase.h:1195:5 */
+type THREAD_INFORMATION_CLASS = uint32 /* winbase.h:1188:5 */
 
-type PROCESS_INFORMATION_CLASS = uint32 /* winbase.h:1200:5 */
+type DEP_SYSTEM_POLICY_TYPE = uint32 /* winbase.h:1285:5 */
 
-type DEP_SYSTEM_POLICY_TYPE = uint32 /* winbase.h:1304:5 */
-
-type PFE_EXPORT_FUNC = uintptr /* winbase.h:1387:17 */
-type PFE_IMPORT_FUNC = uintptr /* winbase.h:1388:17 */
+type PFE_EXPORT_FUNC = uintptr /* winbase.h:1378:17 */
+type PFE_IMPORT_FUNC = uintptr /* winbase.h:1379:17 */
 
 type _WIN32_STREAM_ID = struct {
 	FdwStreamId         DWORD
@@ -37607,54 +38099,56 @@ type _WIN32_STREAM_ID = struct {
 	FSize               LARGE_INTEGER
 	FdwStreamNameSize   DWORD
 	FcStreamName        [1]WCHAR
-	_                   [2]byte
-} /* winbase.h:1465:11 */
+	F__ccgo_pad1        [2]byte
+} /* winbase.h:1456:11 */
+
+type WIN32_STREAM_ID = _WIN32_STREAM_ID /* winbase.h:1462:5 */
+type LPWIN32_STREAM_ID = uintptr        /* winbase.h:1462:21 */
 
-type WIN32_STREAM_ID = _WIN32_STREAM_ID /* winbase.h:1471:5 */
-type LPWIN32_STREAM_ID = uintptr        /* winbase.h:1471:21 */
+type PROCESS_INFORMATION_CLASS = uint32 /* winbase.h:1573:5 */
 
-type PGET_SYSTEM_WOW64_DIRECTORY_A = uintptr /* winbase.h:1856:16 */
-type PGET_SYSTEM_WOW64_DIRECTORY_W = uintptr /* winbase.h:1857:16 */
+type PGET_SYSTEM_WOW64_DIRECTORY_A = uintptr /* winbase.h:1887:16 */
+type PGET_SYSTEM_WOW64_DIRECTORY_W = uintptr /* winbase.h:1888:16 */
 
-type LPPROGRESS_ROUTINE = uintptr /* winbase.h:1960:17 */
+type LPPROGRESS_ROUTINE = uintptr /* winbase.h:2005:17 */
 
-type STREAM_INFO_LEVELS = uint32 /* winbase.h:2150:5 */
+type STREAM_INFO_LEVELS = uint32 /* winbase.h:2219:5 */
 
 type _WIN32_FIND_STREAM_DATA = struct {
 	FStreamSize  LARGE_INTEGER
 	FcStreamName [296]WCHAR
-} /* winbase.h:2152:11 */
+} /* winbase.h:2221:11 */
 
-type WIN32_FIND_STREAM_DATA = _WIN32_FIND_STREAM_DATA /* winbase.h:2155:5 */
-type PWIN32_FIND_STREAM_DATA = uintptr                /* winbase.h:2155:28 */
+type WIN32_FIND_STREAM_DATA = _WIN32_FIND_STREAM_DATA /* winbase.h:2224:5 */
+type PWIN32_FIND_STREAM_DATA = uintptr                /* winbase.h:2224:28 */
 
-type _EVENTLOG_FULL_INFORMATION = struct{ FdwFull DWORD } /* winbase.h:2227:11 */
+type _EVENTLOG_FULL_INFORMATION = struct{ FdwFull DWORD } /* winbase.h:2282:11 */
 
-type EVENTLOG_FULL_INFORMATION = _EVENTLOG_FULL_INFORMATION /* winbase.h:2229:5 */
-type LPEVENTLOG_FULL_INFORMATION = uintptr                  /* winbase.h:2229:31 */
+type EVENTLOG_FULL_INFORMATION = _EVENTLOG_FULL_INFORMATION /* winbase.h:2284:5 */
+type LPEVENTLOG_FULL_INFORMATION = uintptr                  /* winbase.h:2284:31 */
 
 type tagHW_PROFILE_INFOA = struct {
 	FdwDockInfo      DWORD
 	FszHwProfileGuid [39]CHAR
 	FszHwProfileName [80]CHAR
-	_                [1]byte
-} /* winbase.h:2444:11 */
+	F__ccgo_pad1     [1]byte
+} /* winbase.h:2478:11 */
 
-type HW_PROFILE_INFOA = tagHW_PROFILE_INFOA /* winbase.h:2448:5 */
-type LPHW_PROFILE_INFOA = uintptr           /* winbase.h:2448:22 */
+type HW_PROFILE_INFOA = tagHW_PROFILE_INFOA /* winbase.h:2482:5 */
+type LPHW_PROFILE_INFOA = uintptr           /* winbase.h:2482:22 */
 
 type tagHW_PROFILE_INFOW = struct {
 	FdwDockInfo      DWORD
 	FszHwProfileGuid [39]WCHAR
 	FszHwProfileName [80]WCHAR
-	_                [2]byte
-} /* winbase.h:2450:11 */
+	F__ccgo_pad1     [2]byte
+} /* winbase.h:2484:11 */
 
-type HW_PROFILE_INFOW = tagHW_PROFILE_INFOW /* winbase.h:2454:5 */
-type LPHW_PROFILE_INFOW = uintptr           /* winbase.h:2454:22 */
+type HW_PROFILE_INFOW = tagHW_PROFILE_INFOW /* winbase.h:2488:5 */
+type LPHW_PROFILE_INFOW = uintptr           /* winbase.h:2488:22 */
 
-type HW_PROFILE_INFO = HW_PROFILE_INFOA     /* winbase.h:2456:3 */
-type LPHW_PROFILE_INFO = LPHW_PROFILE_INFOA /* winbase.h:2457:3 */
+type HW_PROFILE_INFO = HW_PROFILE_INFOA     /* winbase.h:2490:3 */
+type LPHW_PROFILE_INFO = LPHW_PROFILE_INFOA /* winbase.h:2491:3 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -37744,7 +38238,7 @@ type _TIME_DYNAMIC_ZONE_INFORMATION = struct {
 	FDaylightBias                LONG
 	FTimeZoneKeyName             [128]WCHAR
 	FDynamicDaylightTimeDisabled BOOLEAN
-	_                            [3]byte
+	F__ccgo_pad1                 [3]byte
 } /* timezoneapi.h:31:11 */
 
 type DYNAMIC_TIME_ZONE_INFORMATION = _TIME_DYNAMIC_ZONE_INFORMATION /* timezoneapi.h:41:5 */
@@ -37757,10 +38251,10 @@ type _SYSTEM_POWER_STATUS = struct {
 	FReserved1           BYTE
 	FBatteryLifeTime     DWORD
 	FBatteryFullLifeTime DWORD
-} /* winbase.h:2495:11 */
+} /* winbase.h:2571:11 */
 
-type SYSTEM_POWER_STATUS = _SYSTEM_POWER_STATUS /* winbase.h:2502:5 */
-type LPSYSTEM_POWER_STATUS = uintptr            /* winbase.h:2502:25 */
+type SYSTEM_POWER_STATUS = _SYSTEM_POWER_STATUS /* winbase.h:2578:5 */
+type LPSYSTEM_POWER_STATUS = uintptr            /* winbase.h:2578:25 */
 
 type tagACTCTXA = struct {
 	FcbSize                 ULONG
@@ -37768,15 +38262,15 @@ type tagACTCTXA = struct {
 	FlpSource               LPCSTR
 	FwProcessorArchitecture USHORT
 	FwLangId                LANGID
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FlpAssemblyDirectory    LPCSTR
 	FlpResourceName         LPCSTR
 	FlpApplicationName      LPCSTR
 	FhModule                HMODULE
-} /* winbase.h:2573:11 */
+} /* winbase.h:2649:11 */
 
-type ACTCTXA = tagACTCTXA /* winbase.h:2583:5 */
-type PACTCTXA = uintptr   /* winbase.h:2583:13 */
+type ACTCTXA = tagACTCTXA /* winbase.h:2659:5 */
+type PACTCTXA = uintptr   /* winbase.h:2659:13 */
 
 type tagACTCTXW = struct {
 	FcbSize                 ULONG
@@ -37784,98 +38278,98 @@ type tagACTCTXW = struct {
 	FlpSource               LPCWSTR
 	FwProcessorArchitecture USHORT
 	FwLangId                LANGID
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FlpAssemblyDirectory    LPCWSTR
 	FlpResourceName         LPCWSTR
 	FlpApplicationName      LPCWSTR
 	FhModule                HMODULE
-} /* winbase.h:2585:11 */
+} /* winbase.h:2661:11 */
 
-type ACTCTXW = tagACTCTXW /* winbase.h:2595:5 */
-type PACTCTXW = uintptr   /* winbase.h:2595:13 */
+type ACTCTXW = tagACTCTXW /* winbase.h:2671:5 */
+type PACTCTXW = uintptr   /* winbase.h:2671:13 */
 
-type ACTCTX = ACTCTXA   /* winbase.h:2597:3 */
-type PACTCTX = PACTCTXA /* winbase.h:2598:3 */
+type ACTCTX = ACTCTXA   /* winbase.h:2673:3 */
+type PACTCTX = PACTCTXA /* winbase.h:2674:3 */
 
-type PCACTCTXA = uintptr /* winbase.h:2600:25 */
-type PCACTCTXW = uintptr /* winbase.h:2601:25 */
+type PCACTCTXA = uintptr /* winbase.h:2676:25 */
+type PCACTCTXW = uintptr /* winbase.h:2677:25 */
 
-type PCACTCTX = PCACTCTXA /* winbase.h:2603:3 */
+type PCACTCTX = PCACTCTXA /* winbase.h:2679:3 */
 
 type tagACTCTX_SECTION_KEYED_DATA_2600 = struct {
 	FcbSize                    ULONG
 	FulDataFormatVersion       ULONG
 	FlpData                    PVOID
 	FulLength                  ULONG
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FlpSectionGlobalData       PVOID
 	FulSectionGlobalDataLength ULONG
-	_                          [4]byte
+	F__ccgo_pad2               [4]byte
 	FlpSectionBase             PVOID
 	FulSectionTotalLength      ULONG
-	_                          [4]byte
+	F__ccgo_pad3               [4]byte
 	FhActCtx                   HANDLE
 	FulAssemblyRosterIndex     ULONG
-	_                          [4]byte
-} /* winbase.h:2617:11 */
+	F__ccgo_pad4               [4]byte
+} /* winbase.h:2693:11 */
 
-type ACTCTX_SECTION_KEYED_DATA_2600 = tagACTCTX_SECTION_KEYED_DATA_2600 /* winbase.h:2628:5 */
-type PACTCTX_SECTION_KEYED_DATA_2600 = uintptr                          /* winbase.h:2628:36 */
+type ACTCTX_SECTION_KEYED_DATA_2600 = tagACTCTX_SECTION_KEYED_DATA_2600 /* winbase.h:2704:5 */
+type PACTCTX_SECTION_KEYED_DATA_2600 = uintptr                          /* winbase.h:2704:36 */
 
-type PCACTCTX_SECTION_KEYED_DATA_2600 = uintptr /* winbase.h:2630:48 */
+type PCACTCTX_SECTION_KEYED_DATA_2600 = uintptr /* winbase.h:2706:48 */
 
 type tagACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = struct {
 	FlpInformation             PVOID
 	FlpSectionBase             PVOID
 	FulSectionLength           ULONG
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FlpSectionGlobalDataBase   PVOID
 	FulSectionGlobalDataLength ULONG
-	_                          [4]byte
-} /* winbase.h:2632:11 */
+	F__ccgo_pad2               [4]byte
+} /* winbase.h:2708:11 */
 
-type ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = tagACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA /* winbase.h:2638:5 */
-type PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = uintptr                                       /* winbase.h:2638:49 */
+type ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = tagACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA /* winbase.h:2714:5 */
+type PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = uintptr                                       /* winbase.h:2714:49 */
 
-type PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = uintptr /* winbase.h:2640:61 */
+type PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA = uintptr /* winbase.h:2716:61 */
 
 type tagACTCTX_SECTION_KEYED_DATA = struct {
 	FcbSize                    ULONG
 	FulDataFormatVersion       ULONG
 	FlpData                    PVOID
 	FulLength                  ULONG
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FlpSectionGlobalData       PVOID
 	FulSectionGlobalDataLength ULONG
-	_                          [4]byte
+	F__ccgo_pad2               [4]byte
 	FlpSectionBase             PVOID
 	FulSectionTotalLength      ULONG
-	_                          [4]byte
+	F__ccgo_pad3               [4]byte
 	FhActCtx                   HANDLE
 	FulAssemblyRosterIndex     ULONG
 	FulFlags                   ULONG
 	FAssemblyMetadata          ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA
-} /* winbase.h:2642:11 */
+} /* winbase.h:2718:11 */
 
-type ACTCTX_SECTION_KEYED_DATA = tagACTCTX_SECTION_KEYED_DATA /* winbase.h:2655:5 */
-type PACTCTX_SECTION_KEYED_DATA = uintptr                     /* winbase.h:2655:31 */
+type ACTCTX_SECTION_KEYED_DATA = tagACTCTX_SECTION_KEYED_DATA /* winbase.h:2731:5 */
+type PACTCTX_SECTION_KEYED_DATA = uintptr                     /* winbase.h:2731:31 */
 
-type PCACTCTX_SECTION_KEYED_DATA = uintptr /* winbase.h:2657:43 */
+type PCACTCTX_SECTION_KEYED_DATA = uintptr /* winbase.h:2733:43 */
 
 type _ACTIVATION_CONTEXT_BASIC_INFORMATION = struct {
-	FhActCtx HANDLE
-	FdwFlags DWORD
-	_        [4]byte
-} /* winbase.h:2670:11 */
+	FhActCtx     HANDLE
+	FdwFlags     DWORD
+	F__ccgo_pad1 [4]byte
+} /* winbase.h:2746:11 */
 
-type ACTIVATION_CONTEXT_BASIC_INFORMATION = _ACTIVATION_CONTEXT_BASIC_INFORMATION /* winbase.h:2673:5 */
-type PACTIVATION_CONTEXT_BASIC_INFORMATION = uintptr                              /* winbase.h:2673:42 */
+type ACTIVATION_CONTEXT_BASIC_INFORMATION = _ACTIVATION_CONTEXT_BASIC_INFORMATION /* winbase.h:2749:5 */
+type PACTIVATION_CONTEXT_BASIC_INFORMATION = uintptr                              /* winbase.h:2749:42 */
 
-type PCACTIVATION_CONTEXT_BASIC_INFORMATION = uintptr /* winbase.h:2675:62 */
+type PCACTIVATION_CONTEXT_BASIC_INFORMATION = uintptr /* winbase.h:2751:62 */
 
-type PQUERYACTCTXW_FUNC = uintptr /* winbase.h:2687:19 */
+type PQUERYACTCTXW_FUNC = uintptr /* winbase.h:2763:19 */
 
-type APPLICATION_RECOVERY_CALLBACK = uintptr /* winbase.h:2707:17 */
+type APPLICATION_RECOVERY_CALLBACK = uintptr /* winbase.h:2783:17 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -37927,10 +38421,10 @@ type PPSINJECTDATA = uintptr      /* wingdi.h:339:18 */
 type _PSFEATURE_OUTPUT = struct {
 	FbPageIndependent WINBOOL
 	FbSetPageDevice   WINBOOL
-} /* wingdi.h:391:11 */
+} /* wingdi.h:393:11 */
 
-type PSFEATURE_OUTPUT = _PSFEATURE_OUTPUT /* wingdi.h:394:5 */
-type PPSFEATURE_OUTPUT = uintptr          /* wingdi.h:394:22 */
+type PSFEATURE_OUTPUT = _PSFEATURE_OUTPUT /* wingdi.h:396:5 */
+type PPSFEATURE_OUTPUT = uintptr          /* wingdi.h:396:22 */
 
 type _PSFEATURE_CUSTPAPER = struct {
 	FlOrientation  LONG
@@ -37938,10 +38432,10 @@ type _PSFEATURE_CUSTPAPER = struct {
 	FlHeight       LONG
 	FlWidthOffset  LONG
 	FlHeightOffset LONG
-} /* wingdi.h:396:11 */
+} /* wingdi.h:398:11 */
 
-type PSFEATURE_CUSTPAPER = _PSFEATURE_CUSTPAPER /* wingdi.h:402:5 */
-type PPSFEATURE_CUSTPAPER = uintptr             /* wingdi.h:402:25 */
+type PSFEATURE_CUSTPAPER = _PSFEATURE_CUSTPAPER /* wingdi.h:404:5 */
+type PPSFEATURE_CUSTPAPER = uintptr             /* wingdi.h:404:25 */
 
 type tagXFORM = struct {
 	FeM11 FLOAT
@@ -37950,11 +38444,11 @@ type tagXFORM = struct {
 	FeM22 FLOAT
 	FeDx  FLOAT
 	FeDy  FLOAT
-} /* wingdi.h:450:11 */
+} /* wingdi.h:452:11 */
 
-type XFORM = tagXFORM  /* wingdi.h:457:5 */
-type PXFORM = uintptr  /* wingdi.h:457:11 */
-type LPXFORM = uintptr /* wingdi.h:457:19 */
+type XFORM = tagXFORM  /* wingdi.h:459:5 */
+type PXFORM = uintptr  /* wingdi.h:459:11 */
+type LPXFORM = uintptr /* wingdi.h:459:19 */
 
 type tagBITMAP = struct {
 	FbmType       LONG
@@ -37963,14 +38457,14 @@ type tagBITMAP = struct {
 	FbmWidthBytes LONG
 	FbmPlanes     WORD
 	FbmBitsPixel  WORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FbmBits       LPVOID
-} /* wingdi.h:459:11 */
+} /* wingdi.h:461:11 */
 
-type BITMAP = tagBITMAP /* wingdi.h:467:5 */
-type PBITMAP = uintptr  /* wingdi.h:467:12 */
-type NPBITMAP = uintptr /* wingdi.h:467:21 */
-type LPBITMAP = uintptr /* wingdi.h:467:31 */
+type BITMAP = tagBITMAP /* wingdi.h:469:5 */
+type PBITMAP = uintptr  /* wingdi.h:469:12 */
+type NPBITMAP = uintptr /* wingdi.h:469:21 */
+type LPBITMAP = uintptr /* wingdi.h:469:31 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -37980,13 +38474,16 @@ type tagRGBTRIPLE = struct {
 	FrgbtBlue  BYTE
 	FrgbtGreen BYTE
 	FrgbtRed   BYTE
-} /* wingdi.h:470:11 */
+} /* wingdi.h:472:11 */
 
 // *
 // 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.
-type RGBTRIPLE = tagRGBTRIPLE /* wingdi.h:474:5 */
+type RGBTRIPLE = tagRGBTRIPLE /* wingdi.h:476:5 */
+type PRGBTRIPLE = uintptr     /* wingdi.h:476:15 */
+type NPRGBTRIPLE = uintptr    /* wingdi.h:476:27 */
+type LPRGBTRIPLE = uintptr    /* wingdi.h:476:40 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -37997,42 +38494,42 @@ type tagRGBQUAD = struct {
 	FrgbGreen    BYTE
 	FrgbRed      BYTE
 	FrgbReserved BYTE
-} /* wingdi.h:477:11 */
+} /* wingdi.h:479:11 */
 
 // *
 // 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.
 
-type RGBQUAD = tagRGBQUAD /* wingdi.h:482:5 */
+type RGBQUAD = tagRGBQUAD /* wingdi.h:484:5 */
 
-type LPRGBQUAD = uintptr /* wingdi.h:486:19 */
+type LPRGBQUAD = uintptr /* wingdi.h:488:19 */
 
-type LCSCSTYPE = LONG /* wingdi.h:499:16 */
+type LCSCSTYPE = LONG /* wingdi.h:501:16 */
 
-type LCSGAMUTMATCH = LONG /* wingdi.h:502:16 */
+type LCSGAMUTMATCH = LONG /* wingdi.h:504:16 */
 
-type FXPT16DOT16 = int32     /* wingdi.h:526:20 */
-type LPFXPT16DOT16 = uintptr /* wingdi.h:526:32 */
-type FXPT2DOT30 = int32      /* wingdi.h:527:20 */
-type LPFXPT2DOT30 = uintptr  /* wingdi.h:527:31 */
+type FXPT16DOT16 = int32     /* wingdi.h:528:20 */
+type LPFXPT16DOT16 = uintptr /* wingdi.h:528:32 */
+type FXPT2DOT30 = int32      /* wingdi.h:529:20 */
+type LPFXPT2DOT30 = uintptr  /* wingdi.h:529:31 */
 
 type tagCIEXYZ = struct {
 	FciexyzX FXPT2DOT30
 	FciexyzY FXPT2DOT30
 	FciexyzZ FXPT2DOT30
-} /* wingdi.h:529:11 */
+} /* wingdi.h:531:11 */
 
-type CIEXYZ = tagCIEXYZ /* wingdi.h:533:5 */
-type LPCIEXYZ = uintptr /* wingdi.h:536:18 */
+type CIEXYZ = tagCIEXYZ /* wingdi.h:535:5 */
+type LPCIEXYZ = uintptr /* wingdi.h:538:18 */
 type tagICEXYZTRIPLE = struct {
 	FciexyzRed   CIEXYZ
 	FciexyzGreen CIEXYZ
 	FciexyzBlue  CIEXYZ
-} /* wingdi.h:539:11 */
+} /* wingdi.h:541:11 */
 
-type CIEXYZTRIPLE = tagICEXYZTRIPLE /* wingdi.h:543:5 */
-type LPCIEXYZTRIPLE = uintptr       /* wingdi.h:546:24 */
+type CIEXYZTRIPLE = tagICEXYZTRIPLE /* wingdi.h:545:5 */
+type LPCIEXYZTRIPLE = uintptr       /* wingdi.h:548:24 */
 
 type tagLOGCOLORSPACEA = struct {
 	FlcsSignature  DWORD
@@ -38045,10 +38542,10 @@ type tagLOGCOLORSPACEA = struct {
 	FlcsGammaGreen DWORD
 	FlcsGammaBlue  DWORD
 	FlcsFilename   [260]CHAR
-} /* wingdi.h:550:11 */
+} /* wingdi.h:552:11 */
 
-type LOGCOLORSPACEA = tagLOGCOLORSPACEA /* wingdi.h:561:5 */
-type LPLOGCOLORSPACEA = uintptr         /* wingdi.h:561:20 */
+type LOGCOLORSPACEA = tagLOGCOLORSPACEA /* wingdi.h:563:5 */
+type LPLOGCOLORSPACEA = uintptr         /* wingdi.h:563:20 */
 
 type tagLOGCOLORSPACEW = struct {
 	FlcsSignature  DWORD
@@ -38061,13 +38558,13 @@ type tagLOGCOLORSPACEW = struct {
 	FlcsGammaGreen DWORD
 	FlcsGammaBlue  DWORD
 	FlcsFilename   [260]WCHAR
-} /* wingdi.h:563:11 */
+} /* wingdi.h:565:11 */
 
-type LOGCOLORSPACEW = tagLOGCOLORSPACEW /* wingdi.h:574:5 */
-type LPLOGCOLORSPACEW = uintptr         /* wingdi.h:574:20 */
+type LOGCOLORSPACEW = tagLOGCOLORSPACEW /* wingdi.h:576:5 */
+type LPLOGCOLORSPACEW = uintptr         /* wingdi.h:576:20 */
 
-type LOGCOLORSPACE = LOGCOLORSPACEA     /* wingdi.h:576:3 */
-type LPLOGCOLORSPACE = LPLOGCOLORSPACEA /* wingdi.h:577:3 */
+type LOGCOLORSPACE = LOGCOLORSPACEA     /* wingdi.h:578:3 */
+type LPLOGCOLORSPACE = LPLOGCOLORSPACEA /* wingdi.h:579:3 */
 
 type tagBITMAPCOREHEADER = struct {
 	FbcSize     DWORD
@@ -38075,11 +38572,11 @@ type tagBITMAPCOREHEADER = struct {
 	FbcHeight   WORD
 	FbcPlanes   WORD
 	FbcBitCount WORD
-} /* wingdi.h:581:11 */
+} /* wingdi.h:583:11 */
 
-type BITMAPCOREHEADER = tagBITMAPCOREHEADER /* wingdi.h:587:5 */
-type LPBITMAPCOREHEADER = uintptr           /* wingdi.h:587:22 */
-type PBITMAPCOREHEADER = uintptr            /* wingdi.h:587:42 */
+type BITMAPCOREHEADER = tagBITMAPCOREHEADER /* wingdi.h:589:5 */
+type LPBITMAPCOREHEADER = uintptr           /* wingdi.h:589:22 */
+type PBITMAPCOREHEADER = uintptr            /* wingdi.h:589:42 */
 
 type tagBITMAPINFOHEADER = struct {
 	FbiSize          DWORD
@@ -38093,11 +38590,11 @@ type tagBITMAPINFOHEADER = struct {
 	FbiYPelsPerMeter LONG
 	FbiClrUsed       DWORD
 	FbiClrImportant  DWORD
-} /* wingdi.h:591:11 */
+} /* wingdi.h:593:11 */
 
-type BITMAPINFOHEADER = tagBITMAPINFOHEADER /* wingdi.h:603:5 */
-type LPBITMAPINFOHEADER = uintptr           /* wingdi.h:603:22 */
-type PBITMAPINFOHEADER = uintptr            /* wingdi.h:603:42 */
+type BITMAPINFOHEADER = tagBITMAPINFOHEADER /* wingdi.h:605:5 */
+type LPBITMAPINFOHEADER = uintptr           /* wingdi.h:605:22 */
+type PBITMAPINFOHEADER = uintptr            /* wingdi.h:605:42 */
 
 type BITMAPV4HEADER = struct {
 	FbV4Size          DWORD
@@ -38120,9 +38617,9 @@ type BITMAPV4HEADER = struct {
 	FbV4GammaRed      DWORD
 	FbV4GammaGreen    DWORD
 	FbV4GammaBlue     DWORD
-}                               /* wingdi.h:628:5 */
-type LPBITMAPV4HEADER = uintptr /* wingdi.h:628:20 */
-type PBITMAPV4HEADER = uintptr  /* wingdi.h:628:38 */
+}                               /* wingdi.h:630:5 */
+type LPBITMAPV4HEADER = uintptr /* wingdi.h:630:20 */
+type PBITMAPV4HEADER = uintptr  /* wingdi.h:630:38 */
 
 type BITMAPV5HEADER = struct {
 	FbV5Size          DWORD
@@ -38149,28 +38646,28 @@ type BITMAPV5HEADER = struct {
 	FbV5ProfileData   DWORD
 	FbV5ProfileSize   DWORD
 	FbV5Reserved      DWORD
-}                               /* wingdi.h:655:5 */
-type LPBITMAPV5HEADER = uintptr /* wingdi.h:655:20 */
-type PBITMAPV5HEADER = uintptr  /* wingdi.h:655:38 */
+}                               /* wingdi.h:657:5 */
+type LPBITMAPV5HEADER = uintptr /* wingdi.h:657:20 */
+type PBITMAPV5HEADER = uintptr  /* wingdi.h:657:38 */
 
 type tagBITMAPINFO = struct {
 	FbmiHeader BITMAPINFOHEADER
 	FbmiColors [1]RGBQUAD
-} /* wingdi.h:669:11 */
+} /* wingdi.h:671:11 */
 
-type BITMAPINFO = tagBITMAPINFO /* wingdi.h:672:5 */
-type LPBITMAPINFO = uintptr     /* wingdi.h:672:16 */
-type PBITMAPINFO = uintptr      /* wingdi.h:672:30 */
+type BITMAPINFO = tagBITMAPINFO /* wingdi.h:674:5 */
+type LPBITMAPINFO = uintptr     /* wingdi.h:674:16 */
+type PBITMAPINFO = uintptr      /* wingdi.h:674:30 */
 
 type tagBITMAPCOREINFO = struct {
-	FbmciHeader BITMAPCOREHEADER
-	FbmciColors [1]RGBTRIPLE
-	_           [1]byte
-} /* wingdi.h:676:11 */
+	FbmciHeader  BITMAPCOREHEADER
+	FbmciColors  [1]RGBTRIPLE
+	F__ccgo_pad1 [1]byte
+} /* wingdi.h:678:11 */
 
-type BITMAPCOREINFO = tagBITMAPCOREINFO /* wingdi.h:679:5 */
-type LPBITMAPCOREINFO = uintptr         /* wingdi.h:679:20 */
-type PBITMAPCOREINFO = uintptr          /* wingdi.h:679:38 */
+type BITMAPCOREINFO = tagBITMAPCOREINFO /* wingdi.h:681:5 */
+type LPBITMAPCOREINFO = uintptr         /* wingdi.h:681:20 */
+type PBITMAPCOREINFO = uintptr          /* wingdi.h:681:38 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38178,20 +38675,20 @@ type PBITMAPCOREINFO = uintptr          /* wingdi.h:679:38 */
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 type tagBITMAPFILEHEADER = struct {
 	FbfType      WORD
-	_            [2]byte
+	F__ccgo_pad1 [2]byte
 	FbfSize      DWORD
 	FbfReserved1 WORD
 	FbfReserved2 WORD
 	FbfOffBits   DWORD
-} /* wingdi.h:682:11 */
+} /* wingdi.h:684:11 */
 
 // *
 // 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.
-type BITMAPFILEHEADER = tagBITMAPFILEHEADER /* wingdi.h:688:5 */
-type LPBITMAPFILEHEADER = uintptr           /* wingdi.h:688:22 */
-type PBITMAPFILEHEADER = uintptr            /* wingdi.h:688:42 */
+type BITMAPFILEHEADER = tagBITMAPFILEHEADER /* wingdi.h:690:5 */
+type LPBITMAPFILEHEADER = uintptr           /* wingdi.h:690:22 */
+type PBITMAPFILEHEADER = uintptr            /* wingdi.h:690:42 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -38200,64 +38697,64 @@ type PBITMAPFILEHEADER = uintptr            /* wingdi.h:688:42 */
 type tagFONTSIGNATURE = struct {
 	FfsUsb [4]DWORD
 	FfsCsb [2]DWORD
-} /* wingdi.h:697:11 */
+} /* wingdi.h:699:11 */
 
 // *
 // 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.
 
-type FONTSIGNATURE = tagFONTSIGNATURE /* wingdi.h:700:5 */
-type PFONTSIGNATURE = uintptr         /* wingdi.h:700:19 */
-type LPFONTSIGNATURE = uintptr        /* wingdi.h:700:35 */
+type FONTSIGNATURE = tagFONTSIGNATURE /* wingdi.h:702:5 */
+type PFONTSIGNATURE = uintptr         /* wingdi.h:702:19 */
+type LPFONTSIGNATURE = uintptr        /* wingdi.h:702:35 */
 
 type tagCHARSETINFO = struct {
 	FciCharset UINT
 	FciACP     UINT
 	Ffs        FONTSIGNATURE
-} /* wingdi.h:702:11 */
+} /* wingdi.h:704:11 */
 
-type CHARSETINFO = tagCHARSETINFO /* wingdi.h:706:5 */
-type PCHARSETINFO = uintptr       /* wingdi.h:706:17 */
-type NPCHARSETINFO = uintptr      /* wingdi.h:706:31 */
-type LPCHARSETINFO = uintptr      /* wingdi.h:706:46 */
+type CHARSETINFO = tagCHARSETINFO /* wingdi.h:708:5 */
+type PCHARSETINFO = uintptr       /* wingdi.h:708:17 */
+type NPCHARSETINFO = uintptr      /* wingdi.h:708:31 */
+type LPCHARSETINFO = uintptr      /* wingdi.h:708:46 */
 
 type tagLOCALESIGNATURE = struct {
 	FlsUsb          [4]DWORD
 	FlsCsbDefault   [2]DWORD
 	FlsCsbSupported [2]DWORD
-} /* wingdi.h:715:11 */
+} /* wingdi.h:717:11 */
 
-type LOCALESIGNATURE = tagLOCALESIGNATURE /* wingdi.h:719:5 */
-type PLOCALESIGNATURE = uintptr           /* wingdi.h:719:21 */
-type LPLOCALESIGNATURE = uintptr          /* wingdi.h:719:39 */
+type LOCALESIGNATURE = tagLOCALESIGNATURE /* wingdi.h:721:5 */
+type PLOCALESIGNATURE = uintptr           /* wingdi.h:721:21 */
+type LPLOCALESIGNATURE = uintptr          /* wingdi.h:721:39 */
 
-type tagHANDLETABLE = struct{ FobjectHandle [1]HGDIOBJ } /* wingdi.h:725:11 */
+type tagHANDLETABLE = struct{ FobjectHandle [1]HGDIOBJ } /* wingdi.h:727:11 */
 
-type HANDLETABLE = tagHANDLETABLE /* wingdi.h:727:5 */
-type PHANDLETABLE = uintptr       /* wingdi.h:727:17 */
-type LPHANDLETABLE = uintptr      /* wingdi.h:727:31 */
+type HANDLETABLE = tagHANDLETABLE /* wingdi.h:729:5 */
+type PHANDLETABLE = uintptr       /* wingdi.h:729:17 */
+type LPHANDLETABLE = uintptr      /* wingdi.h:729:31 */
 
 type tagMETARECORD = struct {
 	FrdSize     DWORD
 	FrdFunction WORD
 	FrdParm     [1]WORD
-} /* wingdi.h:729:11 */
+} /* wingdi.h:731:11 */
 
-type METARECORD = tagMETARECORD /* wingdi.h:733:5 */
-type PMETARECORD = uintptr      /* wingdi.h:736:42 */
-type LPMETARECORD = uintptr     /* wingdi.h:739:42 */
+type METARECORD = tagMETARECORD /* wingdi.h:735:5 */
+type PMETARECORD = uintptr      /* wingdi.h:738:42 */
+type LPMETARECORD = uintptr     /* wingdi.h:741:42 */
 
 type tagMETAFILEPICT = struct {
-	Fmm   LONG
-	FxExt LONG
-	FyExt LONG
-	_     [4]byte
-	FhMF  HMETAFILE
-} /* wingdi.h:741:11 */
+	Fmm          LONG
+	FxExt        LONG
+	FyExt        LONG
+	F__ccgo_pad1 [4]byte
+	FhMF         HMETAFILE
+} /* wingdi.h:743:11 */
 
-type METAFILEPICT = tagMETAFILEPICT /* wingdi.h:746:5 */
-type LPMETAFILEPICT = uintptr       /* wingdi.h:746:18 */
+type METAFILEPICT = tagMETAFILEPICT /* wingdi.h:748:5 */
+type LPMETAFILEPICT = uintptr       /* wingdi.h:748:18 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38267,22 +38764,22 @@ type tagMETAHEADER = struct {
 	FmtType         WORD
 	FmtHeaderSize   WORD
 	FmtVersion      WORD
-	_               [2]byte
+	F__ccgo_pad1    [2]byte
 	FmtSize         DWORD
 	FmtNoObjects    WORD
-	_               [2]byte
+	F__ccgo_pad2    [2]byte
 	FmtMaxRecord    DWORD
 	FmtNoParameters WORD
-	_               [2]byte
-} /* wingdi.h:751:11 */
+	F__ccgo_pad3    [2]byte
+} /* wingdi.h:753:11 */
 
 // *
 // 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.
-type METAHEADER = tagMETAHEADER /* wingdi.h:759:5 */
-type PMETAHEADER = uintptr      /* wingdi.h:760:42 */
-type LPMETAHEADER = uintptr     /* wingdi.h:761:42 */
+type METAHEADER = tagMETAHEADER /* wingdi.h:761:5 */
+type PMETAHEADER = uintptr      /* wingdi.h:762:42 */
+type LPMETAHEADER = uintptr     /* wingdi.h:763:42 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38293,16 +38790,16 @@ type tagENHMETARECORD = struct {
 	FiType DWORD
 	FnSize DWORD
 	FdParm [1]DWORD
-} /* wingdi.h:767:11 */
+} /* wingdi.h:769:11 */
 
 // *
 // 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.
 
-type ENHMETARECORD = tagENHMETARECORD /* wingdi.h:771:5 */
-type PENHMETARECORD = uintptr         /* wingdi.h:771:19 */
-type LPENHMETARECORD = uintptr        /* wingdi.h:771:35 */
+type ENHMETARECORD = tagENHMETARECORD /* wingdi.h:773:5 */
+type PENHMETARECORD = uintptr         /* wingdi.h:773:19 */
+type LPENHMETARECORD = uintptr        /* wingdi.h:773:35 */
 
 type tagENHMETAHEADER = struct {
 	FiType          DWORD
@@ -38324,13 +38821,13 @@ type tagENHMETAHEADER = struct {
 	FoffPixelFormat DWORD
 	FbOpenGL        DWORD
 	FszlMicrometers SIZEL
-} /* wingdi.h:773:11 */
+} /* wingdi.h:775:11 */
 
-type ENHMETAHEADER = tagENHMETAHEADER /* wingdi.h:793:5 */
-type PENHMETAHEADER = uintptr         /* wingdi.h:793:19 */
-type LPENHMETAHEADER = uintptr        /* wingdi.h:793:35 */
+type ENHMETAHEADER = tagENHMETAHEADER /* wingdi.h:795:5 */
+type PENHMETAHEADER = uintptr         /* wingdi.h:795:19 */
+type LPENHMETAHEADER = uintptr        /* wingdi.h:795:35 */
 
-type BCHAR = BYTE /* wingdi.h:807:16 */
+type BCHAR = BYTE /* wingdi.h:809:16 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38358,18 +38855,18 @@ type tagTEXTMETRICA = struct {
 	FtmStruckOut        BYTE
 	FtmPitchAndFamily   BYTE
 	FtmCharSet          BYTE
-	_                   [3]byte
-} /* wingdi.h:816:11 */
+	F__ccgo_pad1        [3]byte
+} /* wingdi.h:818:11 */
 
 // *
 // 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.
 
-type TEXTMETRICA = tagTEXTMETRICA /* wingdi.h:837:5 */
-type PTEXTMETRICA = uintptr       /* wingdi.h:837:17 */
-type NPTEXTMETRICA = uintptr      /* wingdi.h:837:31 */
-type LPTEXTMETRICA = uintptr      /* wingdi.h:837:46 */
+type TEXTMETRICA = tagTEXTMETRICA /* wingdi.h:839:5 */
+type PTEXTMETRICA = uintptr       /* wingdi.h:839:17 */
+type NPTEXTMETRICA = uintptr      /* wingdi.h:839:31 */
+type LPTEXTMETRICA = uintptr      /* wingdi.h:839:46 */
 
 type tagTEXTMETRICW = struct {
 	FtmHeight           LONG
@@ -38392,18 +38889,18 @@ type tagTEXTMETRICW = struct {
 	FtmStruckOut        BYTE
 	FtmPitchAndFamily   BYTE
 	FtmCharSet          BYTE
-	_                   [3]byte
-} /* wingdi.h:839:11 */
+	F__ccgo_pad1        [3]byte
+} /* wingdi.h:841:11 */
 
-type TEXTMETRICW = tagTEXTMETRICW /* wingdi.h:860:5 */
-type PTEXTMETRICW = uintptr       /* wingdi.h:860:17 */
-type NPTEXTMETRICW = uintptr      /* wingdi.h:860:31 */
-type LPTEXTMETRICW = uintptr      /* wingdi.h:860:46 */
+type TEXTMETRICW = tagTEXTMETRICW /* wingdi.h:862:5 */
+type PTEXTMETRICW = uintptr       /* wingdi.h:862:17 */
+type NPTEXTMETRICW = uintptr      /* wingdi.h:862:31 */
+type LPTEXTMETRICW = uintptr      /* wingdi.h:862:46 */
 
-type TEXTMETRIC = TEXTMETRICA     /* wingdi.h:862:3 */
-type PTEXTMETRIC = PTEXTMETRICA   /* wingdi.h:863:3 */
-type NPTEXTMETRIC = NPTEXTMETRICA /* wingdi.h:864:3 */
-type LPTEXTMETRIC = LPTEXTMETRICA /* wingdi.h:865:3 */
+type TEXTMETRIC = TEXTMETRICA     /* wingdi.h:864:3 */
+type PTEXTMETRIC = PTEXTMETRICA   /* wingdi.h:865:3 */
+type NPTEXTMETRIC = NPTEXTMETRICA /* wingdi.h:866:3 */
+type LPTEXTMETRIC = LPTEXTMETRICA /* wingdi.h:867:3 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -38434,12 +38931,12 @@ type tagNEWTEXTMETRICA = struct {
 	FtmStruckOut        BYTE
 	FtmPitchAndFamily   BYTE
 	FtmCharSet          BYTE
-	_                   [3]byte
+	F__ccgo_pad1        [3]byte
 	FntmFlags           DWORD
 	FntmSizeEM          UINT
 	FntmCellHeight      UINT
 	FntmAvgWidth        UINT
-} /* wingdi.h:883:11 */
+} /* wingdi.h:885:11 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38450,10 +38947,10 @@ type tagNEWTEXTMETRICA = struct {
 // 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.
-type NEWTEXTMETRICA = tagNEWTEXTMETRICA /* wingdi.h:908:5 */
-type PNEWTEXTMETRICA = uintptr          /* wingdi.h:908:20 */
-type NPNEWTEXTMETRICA = uintptr         /* wingdi.h:908:37 */
-type LPNEWTEXTMETRICA = uintptr         /* wingdi.h:908:55 */
+type NEWTEXTMETRICA = tagNEWTEXTMETRICA /* wingdi.h:910:5 */
+type PNEWTEXTMETRICA = uintptr          /* wingdi.h:910:20 */
+type NPNEWTEXTMETRICA = uintptr         /* wingdi.h:910:37 */
+type LPNEWTEXTMETRICA = uintptr         /* wingdi.h:910:55 */
 
 type tagNEWTEXTMETRICW = struct {
 	FtmHeight           LONG
@@ -38476,22 +38973,22 @@ type tagNEWTEXTMETRICW = struct {
 	FtmStruckOut        BYTE
 	FtmPitchAndFamily   BYTE
 	FtmCharSet          BYTE
-	_                   [3]byte
+	F__ccgo_pad1        [3]byte
 	FntmFlags           DWORD
 	FntmSizeEM          UINT
 	FntmCellHeight      UINT
 	FntmAvgWidth        UINT
-} /* wingdi.h:910:11 */
+} /* wingdi.h:912:11 */
 
-type NEWTEXTMETRICW = tagNEWTEXTMETRICW /* wingdi.h:935:5 */
-type PNEWTEXTMETRICW = uintptr          /* wingdi.h:935:20 */
-type NPNEWTEXTMETRICW = uintptr         /* wingdi.h:935:37 */
-type LPNEWTEXTMETRICW = uintptr         /* wingdi.h:935:55 */
+type NEWTEXTMETRICW = tagNEWTEXTMETRICW /* wingdi.h:937:5 */
+type PNEWTEXTMETRICW = uintptr          /* wingdi.h:937:20 */
+type NPNEWTEXTMETRICW = uintptr         /* wingdi.h:937:37 */
+type LPNEWTEXTMETRICW = uintptr         /* wingdi.h:937:55 */
 
-type NEWTEXTMETRIC = NEWTEXTMETRICA     /* wingdi.h:937:3 */
-type PNEWTEXTMETRIC = PNEWTEXTMETRICA   /* wingdi.h:938:3 */
-type NPNEWTEXTMETRIC = NPNEWTEXTMETRICA /* wingdi.h:939:3 */
-type LPNEWTEXTMETRIC = LPNEWTEXTMETRICA /* wingdi.h:940:3 */
+type NEWTEXTMETRIC = NEWTEXTMETRICA     /* wingdi.h:939:3 */
+type PNEWTEXTMETRIC = PNEWTEXTMETRICA   /* wingdi.h:940:3 */
+type NPNEWTEXTMETRIC = NPNEWTEXTMETRICA /* wingdi.h:941:3 */
+type LPNEWTEXTMETRIC = LPNEWTEXTMETRICA /* wingdi.h:942:3 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -38501,73 +38998,73 @@ type LPNEWTEXTMETRIC = LPNEWTEXTMETRICA /* wingdi.h:940:3 */
 type tagNEWTEXTMETRICEXA = struct {
 	FntmTm      NEWTEXTMETRICA
 	FntmFontSig FONTSIGNATURE
-} /* wingdi.h:944:11 */
+} /* wingdi.h:946:11 */
 
 // *
 // 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.
 
-type NEWTEXTMETRICEXA = tagNEWTEXTMETRICEXA /* wingdi.h:947:5 */
+type NEWTEXTMETRICEXA = tagNEWTEXTMETRICEXA /* wingdi.h:949:5 */
 
 type tagNEWTEXTMETRICEXW = struct {
 	FntmTm      NEWTEXTMETRICW
 	FntmFontSig FONTSIGNATURE
-} /* wingdi.h:949:11 */
+} /* wingdi.h:951:11 */
 
-type NEWTEXTMETRICEXW = tagNEWTEXTMETRICEXW /* wingdi.h:952:5 */
+type NEWTEXTMETRICEXW = tagNEWTEXTMETRICEXW /* wingdi.h:954:5 */
 
-type NEWTEXTMETRICEX = NEWTEXTMETRICEXA /* wingdi.h:954:3 */
+type NEWTEXTMETRICEX = NEWTEXTMETRICEXA /* wingdi.h:956:3 */
 
 type tagPELARRAY = struct {
-	FpaXCount LONG
-	FpaYCount LONG
-	FpaXExt   LONG
-	FpaYExt   LONG
-	FpaRGBs   BYTE
-	_         [3]byte
-} /* wingdi.h:959:11 */
-
-type PELARRAY = tagPELARRAY /* wingdi.h:965:5 */
-type PPELARRAY = uintptr    /* wingdi.h:965:14 */
-type NPPELARRAY = uintptr   /* wingdi.h:965:25 */
-type LPPELARRAY = uintptr   /* wingdi.h:965:37 */
+	FpaXCount    LONG
+	FpaYCount    LONG
+	FpaXExt      LONG
+	FpaYExt      LONG
+	FpaRGBs      BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:961:11 */
+
+type PELARRAY = tagPELARRAY /* wingdi.h:967:5 */
+type PPELARRAY = uintptr    /* wingdi.h:967:14 */
+type NPPELARRAY = uintptr   /* wingdi.h:967:25 */
+type LPPELARRAY = uintptr   /* wingdi.h:967:37 */
 type tagLOGBRUSH = struct {
 	FlbStyle UINT
 	FlbColor COLORREF
 	FlbHatch ULONG_PTR
-} /* wingdi.h:968:11 */
+} /* wingdi.h:970:11 */
 
-type LOGBRUSH = tagLOGBRUSH /* wingdi.h:972:5 */
-type PLOGBRUSH = uintptr    /* wingdi.h:972:14 */
-type NPLOGBRUSH = uintptr   /* wingdi.h:972:25 */
-type LPLOGBRUSH = uintptr   /* wingdi.h:972:37 */
+type LOGBRUSH = tagLOGBRUSH /* wingdi.h:974:5 */
+type PLOGBRUSH = uintptr    /* wingdi.h:974:14 */
+type NPLOGBRUSH = uintptr   /* wingdi.h:974:25 */
+type LPLOGBRUSH = uintptr   /* wingdi.h:974:37 */
 
 type tagLOGBRUSH32 = struct {
 	FlbStyle UINT
 	FlbColor COLORREF
 	FlbHatch ULONG
-} /* wingdi.h:974:11 */
+} /* wingdi.h:976:11 */
 
-type LOGBRUSH32 = tagLOGBRUSH32 /* wingdi.h:978:5 */
-type PLOGBRUSH32 = uintptr      /* wingdi.h:978:16 */
-type NPLOGBRUSH32 = uintptr     /* wingdi.h:978:29 */
-type LPLOGBRUSH32 = uintptr     /* wingdi.h:978:43 */
-type PATTERN = LOGBRUSH         /* wingdi.h:981:20 */
-type PPATTERN = uintptr         /* wingdi.h:982:19 */
-type NPPATTERN = uintptr        /* wingdi.h:983:19 */
-type LPPATTERN = uintptr        /* wingdi.h:984:19 */
+type LOGBRUSH32 = tagLOGBRUSH32 /* wingdi.h:980:5 */
+type PLOGBRUSH32 = uintptr      /* wingdi.h:980:16 */
+type NPLOGBRUSH32 = uintptr     /* wingdi.h:980:29 */
+type LPLOGBRUSH32 = uintptr     /* wingdi.h:980:43 */
+type PATTERN = LOGBRUSH         /* wingdi.h:983:20 */
+type PPATTERN = uintptr         /* wingdi.h:984:19 */
+type NPPATTERN = uintptr        /* wingdi.h:985:19 */
+type LPPATTERN = uintptr        /* wingdi.h:986:19 */
 
 type tagLOGPEN = struct {
 	FlopnStyle UINT
 	FlopnWidth POINT
 	FlopnColor COLORREF
-} /* wingdi.h:988:11 */
+} /* wingdi.h:990:11 */
 
-type LOGPEN = tagLOGPEN /* wingdi.h:992:5 */
-type PLOGPEN = uintptr  /* wingdi.h:992:12 */
-type NPLOGPEN = uintptr /* wingdi.h:992:21 */
-type LPLOGPEN = uintptr /* wingdi.h:992:31 */
+type LOGPEN = tagLOGPEN /* wingdi.h:994:5 */
+type PLOGPEN = uintptr  /* wingdi.h:994:12 */
+type NPLOGPEN = uintptr /* wingdi.h:994:21 */
+type LPLOGPEN = uintptr /* wingdi.h:994:31 */
 
 type tagEXTLOGPEN = struct {
 	FelpPenStyle   DWORD
@@ -38577,12 +39074,12 @@ type tagEXTLOGPEN = struct {
 	FelpHatch      ULONG_PTR
 	FelpNumEntries DWORD
 	FelpStyleEntry [1]DWORD
-} /* wingdi.h:996:11 */
+} /* wingdi.h:998:11 */
 
-type EXTLOGPEN = tagEXTLOGPEN /* wingdi.h:1004:5 */
-type PEXTLOGPEN = uintptr     /* wingdi.h:1004:15 */
-type NPEXTLOGPEN = uintptr    /* wingdi.h:1004:27 */
-type LPEXTLOGPEN = uintptr    /* wingdi.h:1004:40 */
+type EXTLOGPEN = tagEXTLOGPEN /* wingdi.h:1006:5 */
+type PEXTLOGPEN = uintptr     /* wingdi.h:1006:15 */
+type NPEXTLOGPEN = uintptr    /* wingdi.h:1006:27 */
+type LPEXTLOGPEN = uintptr    /* wingdi.h:1006:40 */
 
 type tagEXTLOGPEN32 = struct {
 	FelpPenStyle   DWORD
@@ -38592,34 +39089,34 @@ type tagEXTLOGPEN32 = struct {
 	FelpHatch      ULONG
 	FelpNumEntries DWORD
 	FelpStyleEntry [1]DWORD
-} /* wingdi.h:1008:11 */
+} /* wingdi.h:1010:11 */
 
-type EXTLOGPEN32 = tagEXTLOGPEN32 /* wingdi.h:1016:5 */
-type PEXTLOGPEN32 = uintptr       /* wingdi.h:1016:18 */
-type NPEXTLOGPEN32 = uintptr      /* wingdi.h:1016:33 */
-type LPEXTLOGPEN32 = uintptr      /* wingdi.h:1016:49 */
+type EXTLOGPEN32 = tagEXTLOGPEN32 /* wingdi.h:1018:5 */
+type PEXTLOGPEN32 = uintptr       /* wingdi.h:1018:18 */
+type NPEXTLOGPEN32 = uintptr      /* wingdi.h:1018:33 */
+type LPEXTLOGPEN32 = uintptr      /* wingdi.h:1018:49 */
 
 type tagPALETTEENTRY = struct {
 	FpeRed   BYTE
 	FpeGreen BYTE
 	FpeBlue  BYTE
 	FpeFlags BYTE
-} /* wingdi.h:1020:11 */
+} /* wingdi.h:1022:11 */
 
-type PALETTEENTRY = tagPALETTEENTRY /* wingdi.h:1025:5 */
-type PPALETTEENTRY = uintptr        /* wingdi.h:1025:18 */
-type LPPALETTEENTRY = uintptr       /* wingdi.h:1025:33 */
+type PALETTEENTRY = tagPALETTEENTRY /* wingdi.h:1027:5 */
+type PPALETTEENTRY = uintptr        /* wingdi.h:1027:18 */
+type LPPALETTEENTRY = uintptr       /* wingdi.h:1027:33 */
 
 type tagLOGPALETTE = struct {
 	FpalVersion    WORD
 	FpalNumEntries WORD
 	FpalPalEntry   [1]PALETTEENTRY
-} /* wingdi.h:1030:11 */
+} /* wingdi.h:1032:11 */
 
-type LOGPALETTE = tagLOGPALETTE /* wingdi.h:1034:5 */
-type PLOGPALETTE = uintptr      /* wingdi.h:1034:16 */
-type NPLOGPALETTE = uintptr     /* wingdi.h:1034:29 */
-type LPLOGPALETTE = uintptr     /* wingdi.h:1034:43 */
+type LOGPALETTE = tagLOGPALETTE /* wingdi.h:1036:5 */
+type PLOGPALETTE = uintptr      /* wingdi.h:1036:16 */
+type NPLOGPALETTE = uintptr     /* wingdi.h:1036:29 */
+type LPLOGPALETTE = uintptr     /* wingdi.h:1036:43 */
 
 type tagLOGFONTA = struct {
 	FlfHeight         LONG
@@ -38636,12 +39133,12 @@ type tagLOGFONTA = struct {
 	FlfQuality        BYTE
 	FlfPitchAndFamily BYTE
 	FlfFaceName       [32]CHAR
-} /* wingdi.h:1041:11 */
+} /* wingdi.h:1043:11 */
 
-type LOGFONTA = tagLOGFONTA /* wingdi.h:1056:5 */
-type PLOGFONTA = uintptr    /* wingdi.h:1056:14 */
-type NPLOGFONTA = uintptr   /* wingdi.h:1056:25 */
-type LPLOGFONTA = uintptr   /* wingdi.h:1056:37 */
+type LOGFONTA = tagLOGFONTA /* wingdi.h:1058:5 */
+type PLOGFONTA = uintptr    /* wingdi.h:1058:14 */
+type NPLOGFONTA = uintptr   /* wingdi.h:1058:25 */
+type LPLOGFONTA = uintptr   /* wingdi.h:1058:37 */
 
 type tagLOGFONTW = struct {
 	FlfHeight         LONG
@@ -38658,61 +39155,61 @@ type tagLOGFONTW = struct {
 	FlfQuality        BYTE
 	FlfPitchAndFamily BYTE
 	FlfFaceName       [32]WCHAR
-} /* wingdi.h:1058:11 */
+} /* wingdi.h:1060:11 */
 
-type LOGFONTW = tagLOGFONTW /* wingdi.h:1073:5 */
-type PLOGFONTW = uintptr    /* wingdi.h:1073:14 */
-type NPLOGFONTW = uintptr   /* wingdi.h:1073:25 */
-type LPLOGFONTW = uintptr   /* wingdi.h:1073:37 */
+type LOGFONTW = tagLOGFONTW /* wingdi.h:1075:5 */
+type PLOGFONTW = uintptr    /* wingdi.h:1075:14 */
+type NPLOGFONTW = uintptr   /* wingdi.h:1075:25 */
+type LPLOGFONTW = uintptr   /* wingdi.h:1075:37 */
 
-type LOGFONT = LOGFONTA     /* wingdi.h:1075:3 */
-type PLOGFONT = PLOGFONTA   /* wingdi.h:1076:3 */
-type NPLOGFONT = NPLOGFONTA /* wingdi.h:1077:3 */
-type LPLOGFONT = LPLOGFONTA /* wingdi.h:1078:3 */
+type LOGFONT = LOGFONTA     /* wingdi.h:1077:3 */
+type PLOGFONT = PLOGFONTA   /* wingdi.h:1078:3 */
+type NPLOGFONT = NPLOGFONTA /* wingdi.h:1079:3 */
+type LPLOGFONT = LPLOGFONTA /* wingdi.h:1080:3 */
 
 type tagENUMLOGFONTA = struct {
 	FelfLogFont  LOGFONTA
 	FelfFullName [64]BYTE
 	FelfStyle    [32]BYTE
-} /* wingdi.h:1084:11 */
+} /* wingdi.h:1086:11 */
 
-type ENUMLOGFONTA = tagENUMLOGFONTA /* wingdi.h:1088:5 */
-type LPENUMLOGFONTA = uintptr       /* wingdi.h:1088:18 */
+type ENUMLOGFONTA = tagENUMLOGFONTA /* wingdi.h:1090:5 */
+type LPENUMLOGFONTA = uintptr       /* wingdi.h:1090:18 */
 
 type tagENUMLOGFONTW = struct {
 	FelfLogFont  LOGFONTW
 	FelfFullName [64]WCHAR
 	FelfStyle    [32]WCHAR
-} /* wingdi.h:1090:11 */
+} /* wingdi.h:1092:11 */
 
-type ENUMLOGFONTW = tagENUMLOGFONTW /* wingdi.h:1094:5 */
-type LPENUMLOGFONTW = uintptr       /* wingdi.h:1094:18 */
+type ENUMLOGFONTW = tagENUMLOGFONTW /* wingdi.h:1096:5 */
+type LPENUMLOGFONTW = uintptr       /* wingdi.h:1096:18 */
 
-type ENUMLOGFONT = ENUMLOGFONTA     /* wingdi.h:1096:3 */
-type LPENUMLOGFONT = LPENUMLOGFONTA /* wingdi.h:1097:3 */
+type ENUMLOGFONT = ENUMLOGFONTA     /* wingdi.h:1098:3 */
+type LPENUMLOGFONT = LPENUMLOGFONTA /* wingdi.h:1099:3 */
 
 type tagENUMLOGFONTEXA = struct {
 	FelfLogFont  LOGFONTA
 	FelfFullName [64]BYTE
 	FelfStyle    [32]BYTE
 	FelfScript   [32]BYTE
-} /* wingdi.h:1099:11 */
+} /* wingdi.h:1101:11 */
 
-type ENUMLOGFONTEXA = tagENUMLOGFONTEXA /* wingdi.h:1104:5 */
-type LPENUMLOGFONTEXA = uintptr         /* wingdi.h:1104:20 */
+type ENUMLOGFONTEXA = tagENUMLOGFONTEXA /* wingdi.h:1106:5 */
+type LPENUMLOGFONTEXA = uintptr         /* wingdi.h:1106:20 */
 
 type tagENUMLOGFONTEXW = struct {
 	FelfLogFont  LOGFONTW
 	FelfFullName [64]WCHAR
 	FelfStyle    [32]WCHAR
 	FelfScript   [32]WCHAR
-} /* wingdi.h:1106:11 */
+} /* wingdi.h:1108:11 */
 
-type ENUMLOGFONTEXW = tagENUMLOGFONTEXW /* wingdi.h:1111:5 */
-type LPENUMLOGFONTEXW = uintptr         /* wingdi.h:1111:20 */
+type ENUMLOGFONTEXW = tagENUMLOGFONTEXW /* wingdi.h:1113:5 */
+type LPENUMLOGFONTEXW = uintptr         /* wingdi.h:1113:20 */
 
-type ENUMLOGFONTEX = ENUMLOGFONTEXA     /* wingdi.h:1113:3 */
-type LPENUMLOGFONTEX = LPENUMLOGFONTEXA /* wingdi.h:1114:3 */
+type ENUMLOGFONTEX = ENUMLOGFONTEXA     /* wingdi.h:1115:3 */
+type LPENUMLOGFONTEX = LPENUMLOGFONTEXA /* wingdi.h:1116:3 */
 
 type tagPANOSE = struct {
 	FbFamilyType      BYTE
@@ -38725,10 +39222,10 @@ type tagPANOSE = struct {
 	FbLetterform      BYTE
 	FbMidline         BYTE
 	FbXHeight         BYTE
-} /* wingdi.h:1235:11 */
+} /* wingdi.h:1237:11 */
 
-type PANOSE = tagPANOSE /* wingdi.h:1246:5 */
-type LPPANOSE = uintptr /* wingdi.h:1246:12 */
+type PANOSE = tagPANOSE /* wingdi.h:1248:5 */
+type LPPANOSE = uintptr /* wingdi.h:1248:12 */
 
 type tagEXTLOGFONTA = struct {
 	FelfLogFont   LOGFONTA
@@ -38741,13 +39238,13 @@ type tagEXTLOGFONTA = struct {
 	FelfVendorId  [4]BYTE
 	FelfCulture   DWORD
 	FelfPanose    PANOSE
-	_             [2]byte
-} /* wingdi.h:1356:11 */
+	F__ccgo_pad1  [2]byte
+} /* wingdi.h:1358:11 */
 
-type EXTLOGFONTA = tagEXTLOGFONTA /* wingdi.h:1367:5 */
-type PEXTLOGFONTA = uintptr       /* wingdi.h:1367:17 */
-type NPEXTLOGFONTA = uintptr      /* wingdi.h:1367:31 */
-type LPEXTLOGFONTA = uintptr      /* wingdi.h:1367:46 */
+type EXTLOGFONTA = tagEXTLOGFONTA /* wingdi.h:1369:5 */
+type PEXTLOGFONTA = uintptr       /* wingdi.h:1369:17 */
+type NPEXTLOGFONTA = uintptr      /* wingdi.h:1369:31 */
+type LPEXTLOGFONTA = uintptr      /* wingdi.h:1369:46 */
 
 type tagEXTLOGFONTW = struct {
 	FelfLogFont   LOGFONTW
@@ -38760,18 +39257,18 @@ type tagEXTLOGFONTW = struct {
 	FelfVendorId  [4]BYTE
 	FelfCulture   DWORD
 	FelfPanose    PANOSE
-	_             [2]byte
-} /* wingdi.h:1369:11 */
+	F__ccgo_pad1  [2]byte
+} /* wingdi.h:1371:11 */
 
-type EXTLOGFONTW = tagEXTLOGFONTW /* wingdi.h:1380:5 */
-type PEXTLOGFONTW = uintptr       /* wingdi.h:1380:17 */
-type NPEXTLOGFONTW = uintptr      /* wingdi.h:1380:31 */
-type LPEXTLOGFONTW = uintptr      /* wingdi.h:1380:46 */
+type EXTLOGFONTW = tagEXTLOGFONTW /* wingdi.h:1382:5 */
+type PEXTLOGFONTW = uintptr       /* wingdi.h:1382:17 */
+type NPEXTLOGFONTW = uintptr      /* wingdi.h:1382:31 */
+type LPEXTLOGFONTW = uintptr      /* wingdi.h:1382:46 */
 
-type EXTLOGFONT = EXTLOGFONTA     /* wingdi.h:1382:3 */
-type PEXTLOGFONT = PEXTLOGFONTA   /* wingdi.h:1383:3 */
-type NPEXTLOGFONT = NPEXTLOGFONTA /* wingdi.h:1384:3 */
-type LPEXTLOGFONT = LPEXTLOGFONTA /* wingdi.h:1385:3 */
+type EXTLOGFONT = EXTLOGFONTA     /* wingdi.h:1384:3 */
+type PEXTLOGFONT = PEXTLOGFONTA   /* wingdi.h:1385:3 */
+type NPEXTLOGFONT = NPEXTLOGFONTA /* wingdi.h:1386:3 */
+type LPEXTLOGFONT = LPEXTLOGFONTA /* wingdi.h:1387:3 */
 
 type _devicemodeA = struct {
 	FdmDeviceName    [32]BYTE
@@ -38781,8 +39278,8 @@ type _devicemodeA = struct {
 	FdmDriverExtra   WORD
 	FdmFields        DWORD
 	F__44            struct {
-		_    [0]uint32
-		F__0 struct {
+		F__ccgo_pad1 [0]uint32
+		F__0         struct {
 			FdmOrientation   int16
 			FdmPaperSize     int16
 			FdmPaperLength   int16
@@ -38813,12 +39310,12 @@ type _devicemodeA = struct {
 	FdmReserved2        DWORD
 	FdmPanningWidth     DWORD
 	FdmPanningHeight    DWORD
-} /* wingdi.h:1669:11 */
+} /* wingdi.h:1671:11 */
 
-type DEVMODEA = _devicemodeA /* wingdi.h:1716:5 */
-type PDEVMODEA = uintptr     /* wingdi.h:1716:14 */
-type NPDEVMODEA = uintptr    /* wingdi.h:1716:25 */
-type LPDEVMODEA = uintptr    /* wingdi.h:1716:37 */
+type DEVMODEA = _devicemodeA /* wingdi.h:1718:5 */
+type PDEVMODEA = uintptr     /* wingdi.h:1718:14 */
+type NPDEVMODEA = uintptr    /* wingdi.h:1718:25 */
+type LPDEVMODEA = uintptr    /* wingdi.h:1718:37 */
 
 type _devicemodeW = struct {
 	FdmDeviceName    [32]WCHAR
@@ -38828,8 +39325,8 @@ type _devicemodeW = struct {
 	FdmDriverExtra   WORD
 	FdmFields        DWORD
 	F__76            struct {
-		_    [0]uint32
-		F__0 struct {
+		F__ccgo_pad1 [0]uint32
+		F__0         struct {
 			FdmOrientation   int16
 			FdmPaperSize     int16
 			FdmPaperLength   int16
@@ -38860,17 +39357,17 @@ type _devicemodeW = struct {
 	FdmReserved2        DWORD
 	FdmPanningWidth     DWORD
 	FdmPanningHeight    DWORD
-} /* wingdi.h:1718:11 */
+} /* wingdi.h:1720:11 */
 
-type DEVMODEW = _devicemodeW /* wingdi.h:1765:5 */
-type PDEVMODEW = uintptr     /* wingdi.h:1765:14 */
-type NPDEVMODEW = uintptr    /* wingdi.h:1765:25 */
-type LPDEVMODEW = uintptr    /* wingdi.h:1765:37 */
+type DEVMODEW = _devicemodeW /* wingdi.h:1767:5 */
+type PDEVMODEW = uintptr     /* wingdi.h:1767:14 */
+type NPDEVMODEW = uintptr    /* wingdi.h:1767:25 */
+type LPDEVMODEW = uintptr    /* wingdi.h:1767:37 */
 
-type DEVMODE = DEVMODEA     /* wingdi.h:1767:3 */
-type PDEVMODE = PDEVMODEA   /* wingdi.h:1768:3 */
-type NPDEVMODE = NPDEVMODEA /* wingdi.h:1769:3 */
-type LPDEVMODE = LPDEVMODEA /* wingdi.h:1770:3 */
+type DEVMODE = DEVMODEA     /* wingdi.h:1769:3 */
+type PDEVMODE = PDEVMODEA   /* wingdi.h:1770:3 */
+type NPDEVMODE = NPDEVMODEA /* wingdi.h:1771:3 */
+type LPDEVMODE = LPDEVMODEA /* wingdi.h:1772:3 */
 
 type _DISPLAY_DEVICEA = struct {
 	Fcb           DWORD
@@ -38879,11 +39376,11 @@ type _DISPLAY_DEVICEA = struct {
 	FStateFlags   DWORD
 	FDeviceID     [128]CHAR
 	FDeviceKey    [128]CHAR
-} /* wingdi.h:2021:11 */
+} /* wingdi.h:2023:11 */
 
-type DISPLAY_DEVICEA = _DISPLAY_DEVICEA /* wingdi.h:2028:5 */
-type PDISPLAY_DEVICEA = uintptr         /* wingdi.h:2028:21 */
-type LPDISPLAY_DEVICEA = uintptr        /* wingdi.h:2028:39 */
+type DISPLAY_DEVICEA = _DISPLAY_DEVICEA /* wingdi.h:2030:5 */
+type PDISPLAY_DEVICEA = uintptr         /* wingdi.h:2030:21 */
+type LPDISPLAY_DEVICEA = uintptr        /* wingdi.h:2030:39 */
 
 type _DISPLAY_DEVICEW = struct {
 	Fcb           DWORD
@@ -38892,15 +39389,15 @@ type _DISPLAY_DEVICEW = struct {
 	FStateFlags   DWORD
 	FDeviceID     [128]WCHAR
 	FDeviceKey    [128]WCHAR
-} /* wingdi.h:2030:11 */
+} /* wingdi.h:2032:11 */
 
-type DISPLAY_DEVICEW = _DISPLAY_DEVICEW /* wingdi.h:2037:5 */
-type PDISPLAY_DEVICEW = uintptr         /* wingdi.h:2037:21 */
-type LPDISPLAY_DEVICEW = uintptr        /* wingdi.h:2037:39 */
+type DISPLAY_DEVICEW = _DISPLAY_DEVICEW /* wingdi.h:2039:5 */
+type PDISPLAY_DEVICEW = uintptr         /* wingdi.h:2039:21 */
+type LPDISPLAY_DEVICEW = uintptr        /* wingdi.h:2039:39 */
 
-type DISPLAY_DEVICE = DISPLAY_DEVICEA     /* wingdi.h:2039:3 */
-type PDISPLAY_DEVICE = PDISPLAY_DEVICEA   /* wingdi.h:2040:3 */
-type LPDISPLAY_DEVICE = LPDISPLAY_DEVICEA /* wingdi.h:2041:3 */
+type DISPLAY_DEVICE = DISPLAY_DEVICEA     /* wingdi.h:2041:3 */
+type PDISPLAY_DEVICE = PDISPLAY_DEVICEA   /* wingdi.h:2042:3 */
+type LPDISPLAY_DEVICE = LPDISPLAY_DEVICEA /* wingdi.h:2043:3 */
 
 type _RGNDATAHEADER = struct {
 	FdwSize   DWORD
@@ -38908,50 +39405,50 @@ type _RGNDATAHEADER = struct {
 	FnCount   DWORD
 	FnRgnSize DWORD
 	FrcBound  RECT
-} /* wingdi.h:2315:11 */
+} /* wingdi.h:2422:11 */
 
-type RGNDATAHEADER = _RGNDATAHEADER /* wingdi.h:2321:5 */
-type PRGNDATAHEADER = uintptr       /* wingdi.h:2321:19 */
+type RGNDATAHEADER = _RGNDATAHEADER /* wingdi.h:2428:5 */
+type PRGNDATAHEADER = uintptr       /* wingdi.h:2428:19 */
 
 type _RGNDATA = struct {
-	Frdh    RGNDATAHEADER
-	FBuffer [1]int8
-	_       [3]byte
-} /* wingdi.h:2323:11 */
+	Frdh         RGNDATAHEADER
+	FBuffer      [1]int8
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:2430:11 */
 
-type RGNDATA = _RGNDATA  /* wingdi.h:2326:5 */
-type PRGNDATA = uintptr  /* wingdi.h:2326:13 */
-type NPRGNDATA = uintptr /* wingdi.h:2326:23 */
-type LPRGNDATA = uintptr /* wingdi.h:2326:34 */
+type RGNDATA = _RGNDATA  /* wingdi.h:2433:5 */
+type PRGNDATA = uintptr  /* wingdi.h:2433:13 */
+type NPRGNDATA = uintptr /* wingdi.h:2433:23 */
+type LPRGNDATA = uintptr /* wingdi.h:2433:34 */
 
 type _ABC = struct {
 	FabcA int32
 	FabcB UINT
 	FabcC int32
-} /* wingdi.h:2332:11 */
+} /* wingdi.h:2439:11 */
 
-type ABC = _ABC      /* wingdi.h:2336:5 */
-type PABC = uintptr  /* wingdi.h:2336:9 */
-type NPABC = uintptr /* wingdi.h:2336:15 */
-type LPABC = uintptr /* wingdi.h:2336:22 */
+type ABC = _ABC      /* wingdi.h:2443:5 */
+type PABC = uintptr  /* wingdi.h:2443:9 */
+type NPABC = uintptr /* wingdi.h:2443:15 */
+type LPABC = uintptr /* wingdi.h:2443:22 */
 
 type _ABCFLOAT = struct {
 	FabcfA FLOAT
 	FabcfB FLOAT
 	FabcfC FLOAT
-} /* wingdi.h:2338:11 */
+} /* wingdi.h:2445:11 */
 
-type ABCFLOAT = _ABCFLOAT /* wingdi.h:2342:5 */
-type PABCFLOAT = uintptr  /* wingdi.h:2342:14 */
-type NPABCFLOAT = uintptr /* wingdi.h:2342:25 */
-type LPABCFLOAT = uintptr /* wingdi.h:2342:37 */
+type ABCFLOAT = _ABCFLOAT /* wingdi.h:2449:5 */
+type PABCFLOAT = uintptr  /* wingdi.h:2449:14 */
+type NPABCFLOAT = uintptr /* wingdi.h:2449:25 */
+type LPABCFLOAT = uintptr /* wingdi.h:2449:37 */
 
 type _OUTLINETEXTMETRICA = struct {
 	FotmSize                UINT
 	FotmTextMetrics         TEXTMETRICA
 	FotmFiller              BYTE
 	FotmPanoseNumber        PANOSE
-	_                       [1]byte
+	F__ccgo_pad1            [1]byte
 	FotmfsSelection         UINT
 	FotmfsType              UINT
 	FotmsCharSlopeRise      int32
@@ -38976,24 +39473,24 @@ type _OUTLINETEXTMETRICA = struct {
 	FotmsStrikeoutPosition  int32
 	FotmsUnderscoreSize     int32
 	FotmsUnderscorePosition int32
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	FotmpFamilyName         PSTR
 	FotmpFaceName           PSTR
 	FotmpStyleName          PSTR
 	FotmpFullName           PSTR
-} /* wingdi.h:2348:11 */
+} /* wingdi.h:2455:11 */
 
-type OUTLINETEXTMETRICA = _OUTLINETEXTMETRICA /* wingdi.h:2381:5 */
-type POUTLINETEXTMETRICA = uintptr            /* wingdi.h:2381:24 */
-type NPOUTLINETEXTMETRICA = uintptr           /* wingdi.h:2381:45 */
-type LPOUTLINETEXTMETRICA = uintptr           /* wingdi.h:2381:67 */
+type OUTLINETEXTMETRICA = _OUTLINETEXTMETRICA /* wingdi.h:2488:5 */
+type POUTLINETEXTMETRICA = uintptr            /* wingdi.h:2488:24 */
+type NPOUTLINETEXTMETRICA = uintptr           /* wingdi.h:2488:45 */
+type LPOUTLINETEXTMETRICA = uintptr           /* wingdi.h:2488:67 */
 
 type _OUTLINETEXTMETRICW = struct {
 	FotmSize                UINT
 	FotmTextMetrics         TEXTMETRICW
 	FotmFiller              BYTE
 	FotmPanoseNumber        PANOSE
-	_                       [1]byte
+	F__ccgo_pad1            [1]byte
 	FotmfsSelection         UINT
 	FotmfsType              UINT
 	FotmsCharSlopeRise      int32
@@ -39022,73 +39519,73 @@ type _OUTLINETEXTMETRICW = struct {
 	FotmpFaceName           PSTR
 	FotmpStyleName          PSTR
 	FotmpFullName           PSTR
-} /* wingdi.h:2383:11 */
+} /* wingdi.h:2490:11 */
 
-type OUTLINETEXTMETRICW = _OUTLINETEXTMETRICW /* wingdi.h:2416:5 */
-type POUTLINETEXTMETRICW = uintptr            /* wingdi.h:2416:24 */
-type NPOUTLINETEXTMETRICW = uintptr           /* wingdi.h:2416:45 */
-type LPOUTLINETEXTMETRICW = uintptr           /* wingdi.h:2416:67 */
+type OUTLINETEXTMETRICW = _OUTLINETEXTMETRICW /* wingdi.h:2523:5 */
+type POUTLINETEXTMETRICW = uintptr            /* wingdi.h:2523:24 */
+type NPOUTLINETEXTMETRICW = uintptr           /* wingdi.h:2523:45 */
+type LPOUTLINETEXTMETRICW = uintptr           /* wingdi.h:2523:67 */
 
-type OUTLINETEXTMETRIC = OUTLINETEXTMETRICA     /* wingdi.h:2418:3 */
-type POUTLINETEXTMETRIC = POUTLINETEXTMETRICA   /* wingdi.h:2419:3 */
-type NPOUTLINETEXTMETRIC = NPOUTLINETEXTMETRICA /* wingdi.h:2420:3 */
-type LPOUTLINETEXTMETRIC = LPOUTLINETEXTMETRICA /* wingdi.h:2421:3 */
+type OUTLINETEXTMETRIC = OUTLINETEXTMETRICA     /* wingdi.h:2525:3 */
+type POUTLINETEXTMETRIC = POUTLINETEXTMETRICA   /* wingdi.h:2526:3 */
+type NPOUTLINETEXTMETRIC = NPOUTLINETEXTMETRICA /* wingdi.h:2527:3 */
+type LPOUTLINETEXTMETRIC = LPOUTLINETEXTMETRICA /* wingdi.h:2528:3 */
 
 type tagPOLYTEXTA = struct {
-	Fx       int32
-	Fy       int32
-	Fn       UINT
-	_        [4]byte
-	Flpstr   LPCSTR
-	FuiFlags UINT
-	Frcl     RECT
-	_        [4]byte
-	Fpdx     uintptr
-} /* wingdi.h:2426:11 */
-
-type POLYTEXTA = tagPOLYTEXTA /* wingdi.h:2434:5 */
-type PPOLYTEXTA = uintptr     /* wingdi.h:2434:15 */
-type NPPOLYTEXTA = uintptr    /* wingdi.h:2434:27 */
-type LPPOLYTEXTA = uintptr    /* wingdi.h:2434:40 */
+	Fx           int32
+	Fy           int32
+	Fn           UINT
+	F__ccgo_pad1 [4]byte
+	Flpstr       LPCSTR
+	FuiFlags     UINT
+	Frcl         RECT
+	F__ccgo_pad2 [4]byte
+	Fpdx         uintptr
+} /* wingdi.h:2533:11 */
+
+type POLYTEXTA = tagPOLYTEXTA /* wingdi.h:2541:5 */
+type PPOLYTEXTA = uintptr     /* wingdi.h:2541:15 */
+type NPPOLYTEXTA = uintptr    /* wingdi.h:2541:27 */
+type LPPOLYTEXTA = uintptr    /* wingdi.h:2541:40 */
 
 type tagPOLYTEXTW = struct {
-	Fx       int32
-	Fy       int32
-	Fn       UINT
-	_        [4]byte
-	Flpstr   LPCWSTR
-	FuiFlags UINT
-	Frcl     RECT
-	_        [4]byte
-	Fpdx     uintptr
-} /* wingdi.h:2436:11 */
-
-type POLYTEXTW = tagPOLYTEXTW /* wingdi.h:2444:5 */
-type PPOLYTEXTW = uintptr     /* wingdi.h:2444:15 */
-type NPPOLYTEXTW = uintptr    /* wingdi.h:2444:27 */
-type LPPOLYTEXTW = uintptr    /* wingdi.h:2444:40 */
-
-type POLYTEXT = POLYTEXTA     /* wingdi.h:2446:3 */
-type PPOLYTEXT = PPOLYTEXTA   /* wingdi.h:2447:3 */
-type NPPOLYTEXT = NPPOLYTEXTA /* wingdi.h:2448:3 */
-type LPPOLYTEXT = LPPOLYTEXTA /* wingdi.h:2449:3 */
+	Fx           int32
+	Fy           int32
+	Fn           UINT
+	F__ccgo_pad1 [4]byte
+	Flpstr       LPCWSTR
+	FuiFlags     UINT
+	Frcl         RECT
+	F__ccgo_pad2 [4]byte
+	Fpdx         uintptr
+} /* wingdi.h:2543:11 */
+
+type POLYTEXTW = tagPOLYTEXTW /* wingdi.h:2551:5 */
+type PPOLYTEXTW = uintptr     /* wingdi.h:2551:15 */
+type NPPOLYTEXTW = uintptr    /* wingdi.h:2551:27 */
+type LPPOLYTEXTW = uintptr    /* wingdi.h:2551:40 */
+
+type POLYTEXT = POLYTEXTA     /* wingdi.h:2553:3 */
+type PPOLYTEXT = PPOLYTEXTA   /* wingdi.h:2554:3 */
+type NPPOLYTEXT = NPPOLYTEXTA /* wingdi.h:2555:3 */
+type LPPOLYTEXT = LPPOLYTEXTA /* wingdi.h:2556:3 */
 
 type _FIXED = struct {
 	Ffract WORD
 	Fvalue int16
-} /* wingdi.h:2453:11 */
+} /* wingdi.h:2560:11 */
 
-type FIXED = _FIXED /* wingdi.h:2456:5 */
+type FIXED = _FIXED /* wingdi.h:2563:5 */
 
 type _MAT2 = struct {
 	FeM11 FIXED
 	FeM12 FIXED
 	FeM21 FIXED
 	FeM22 FIXED
-} /* wingdi.h:2458:11 */
+} /* wingdi.h:2565:11 */
 
-type MAT2 = _MAT2     /* wingdi.h:2463:5 */
-type LPMAT2 = uintptr /* wingdi.h:2463:10 */
+type MAT2 = _MAT2     /* wingdi.h:2570:5 */
+type LPMAT2 = uintptr /* wingdi.h:2570:10 */
 
 type _GLYPHMETRICS = struct {
 	FgmBlackBoxX     UINT
@@ -39096,40 +39593,40 @@ type _GLYPHMETRICS = struct {
 	FgmptGlyphOrigin POINT
 	FgmCellIncX      int16
 	FgmCellIncY      int16
-} /* wingdi.h:2465:11 */
+} /* wingdi.h:2572:11 */
 
-type GLYPHMETRICS = _GLYPHMETRICS /* wingdi.h:2471:5 */
-type LPGLYPHMETRICS = uintptr     /* wingdi.h:2471:18 */
+type GLYPHMETRICS = _GLYPHMETRICS /* wingdi.h:2578:5 */
+type LPGLYPHMETRICS = uintptr     /* wingdi.h:2578:18 */
 
 type tagPOINTFX = struct {
 	Fx FIXED
 	Fy FIXED
-} /* wingdi.h:2491:11 */
+} /* wingdi.h:2598:11 */
 
-type POINTFX = tagPOINTFX /* wingdi.h:2494:5 */
-type LPPOINTFX = uintptr  /* wingdi.h:2494:13 */
+type POINTFX = tagPOINTFX /* wingdi.h:2601:5 */
+type LPPOINTFX = uintptr  /* wingdi.h:2601:13 */
 
 type tagTTPOLYCURVE = struct {
 	FwType WORD
 	Fcpfx  WORD
 	Fapfx  [1]POINTFX
-} /* wingdi.h:2496:11 */
+} /* wingdi.h:2603:11 */
 
-type TTPOLYCURVE = tagTTPOLYCURVE /* wingdi.h:2500:5 */
-type LPTTPOLYCURVE = uintptr      /* wingdi.h:2500:17 */
+type TTPOLYCURVE = tagTTPOLYCURVE /* wingdi.h:2607:5 */
+type LPTTPOLYCURVE = uintptr      /* wingdi.h:2607:17 */
 
 type tagTTPOLYGONHEADER = struct {
 	Fcb       DWORD
 	FdwType   DWORD
 	FpfxStart POINTFX
-} /* wingdi.h:2502:11 */
+} /* wingdi.h:2609:11 */
 
-type TTPOLYGONHEADER = tagTTPOLYGONHEADER /* wingdi.h:2506:5 */
-type LPTTPOLYGONHEADER = uintptr          /* wingdi.h:2506:21 */
+type TTPOLYGONHEADER = tagTTPOLYGONHEADER /* wingdi.h:2613:5 */
+type LPTTPOLYGONHEADER = uintptr          /* wingdi.h:2613:21 */
 
 type tagGCP_RESULTSA = struct {
 	FlStructSize DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FlpOutString LPSTR
 	FlpOrder     uintptr
 	FlpDx        uintptr
@@ -39138,13 +39635,13 @@ type tagGCP_RESULTSA = struct {
 	FlpGlyphs    LPWSTR
 	FnGlyphs     UINT
 	FnMaxFit     int32
-} /* wingdi.h:2549:11 */
+} /* wingdi.h:2656:11 */
 
-type GCP_RESULTSA = tagGCP_RESULTSA /* wingdi.h:2559:5 */
-type LPGCP_RESULTSA = uintptr       /* wingdi.h:2559:18 */
+type GCP_RESULTSA = tagGCP_RESULTSA /* wingdi.h:2666:5 */
+type LPGCP_RESULTSA = uintptr       /* wingdi.h:2666:18 */
 type tagGCP_RESULTSW = struct {
 	FlStructSize DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FlpOutString LPWSTR
 	FlpOrder     uintptr
 	FlpDx        uintptr
@@ -39153,22 +39650,22 @@ type tagGCP_RESULTSW = struct {
 	FlpGlyphs    LPWSTR
 	FnGlyphs     UINT
 	FnMaxFit     int32
-} /* wingdi.h:2560:11 */
+} /* wingdi.h:2667:11 */
 
-type GCP_RESULTSW = tagGCP_RESULTSW /* wingdi.h:2570:5 */
-type LPGCP_RESULTSW = uintptr       /* wingdi.h:2570:18 */
+type GCP_RESULTSW = tagGCP_RESULTSW /* wingdi.h:2677:5 */
+type LPGCP_RESULTSW = uintptr       /* wingdi.h:2677:18 */
 
-type GCP_RESULTS = GCP_RESULTSA     /* wingdi.h:2572:3 */
-type LPGCP_RESULTS = LPGCP_RESULTSA /* wingdi.h:2573:3 */
+type GCP_RESULTS = GCP_RESULTSA     /* wingdi.h:2679:3 */
+type LPGCP_RESULTS = LPGCP_RESULTSA /* wingdi.h:2680:3 */
 
 type _RASTERIZER_STATUS = struct {
 	FnSize       int16
 	FwFlags      int16
 	FnLanguageID int16
-} /* wingdi.h:2575:11 */
+} /* wingdi.h:2682:11 */
 
-type RASTERIZER_STATUS = _RASTERIZER_STATUS /* wingdi.h:2579:5 */
-type LPRASTERIZER_STATUS = uintptr          /* wingdi.h:2579:23 */
+type RASTERIZER_STATUS = _RASTERIZER_STATUS /* wingdi.h:2686:5 */
+type LPRASTERIZER_STATUS = uintptr          /* wingdi.h:2686:23 */
 
 type tagPIXELFORMATDESCRIPTOR = struct {
 	FnSize           WORD
@@ -39197,34 +39694,34 @@ type tagPIXELFORMATDESCRIPTOR = struct {
 	FdwLayerMask     DWORD
 	FdwVisibleMask   DWORD
 	FdwDamageMask    DWORD
-} /* wingdi.h:2586:11 */
+} /* wingdi.h:2693:11 */
 
-type PIXELFORMATDESCRIPTOR = tagPIXELFORMATDESCRIPTOR /* wingdi.h:2613:5 */
-type PPIXELFORMATDESCRIPTOR = uintptr                 /* wingdi.h:2613:27 */
-type LPPIXELFORMATDESCRIPTOR = uintptr                /* wingdi.h:2613:51 */
+type PIXELFORMATDESCRIPTOR = tagPIXELFORMATDESCRIPTOR /* wingdi.h:2720:5 */
+type PPIXELFORMATDESCRIPTOR = uintptr                 /* wingdi.h:2720:27 */
+type LPPIXELFORMATDESCRIPTOR = uintptr                /* wingdi.h:2720:51 */
 
-type OLDFONTENUMPROCA = uintptr /* wingdi.h:2646:15 */
-type OLDFONTENUMPROCW = uintptr /* wingdi.h:2647:15 */
+type OLDFONTENUMPROCA = uintptr /* wingdi.h:2753:15 */
+type OLDFONTENUMPROCW = uintptr /* wingdi.h:2754:15 */
 
-type FONTENUMPROCA = OLDFONTENUMPROCA /* wingdi.h:2657:28 */
-type FONTENUMPROCW = OLDFONTENUMPROCW /* wingdi.h:2658:28 */
+type FONTENUMPROCA = OLDFONTENUMPROCA /* wingdi.h:2764:28 */
+type FONTENUMPROCW = OLDFONTENUMPROCW /* wingdi.h:2765:28 */
 
-type FONTENUMPROC = FONTENUMPROCA /* wingdi.h:2660:3 */
+type FONTENUMPROC = FONTENUMPROCA /* wingdi.h:2767:3 */
 
-type GOBJENUMPROC = uintptr /* wingdi.h:2662:15 */
-type LINEDDAPROC = uintptr  /* wingdi.h:2663:16 */
+type GOBJENUMPROC = uintptr /* wingdi.h:2769:15 */
+type LINEDDAPROC = uintptr  /* wingdi.h:2770:16 */
 
-type LPFNDEVMODE = uintptr /* wingdi.h:2725:16 */
-type LPFNDEVCAPS = uintptr /* wingdi.h:2726:17 */
+type LPFNDEVMODE = uintptr /* wingdi.h:2832:16 */
+type LPFNDEVCAPS = uintptr /* wingdi.h:2833:17 */
 
 type tagWCRANGE = struct {
 	FwcLow   WCHAR
 	FcGlyphs USHORT
-} /* wingdi.h:2906:11 */
+} /* wingdi.h:3013:11 */
 
-type WCRANGE = tagWCRANGE /* wingdi.h:2909:5 */
-type PWCRANGE = uintptr   /* wingdi.h:2909:13 */
-type LPWCRANGE = uintptr  /* wingdi.h:2909:23 */
+type WCRANGE = tagWCRANGE /* wingdi.h:3016:5 */
+type PWCRANGE = uintptr   /* wingdi.h:3016:13 */
+type LPWCRANGE = uintptr  /* wingdi.h:3016:23 */
 
 type tagGLYPHSET = struct {
 	FcbThis           DWORD
@@ -39232,114 +39729,114 @@ type tagGLYPHSET = struct {
 	FcGlyphsSupported DWORD
 	FcRanges          DWORD
 	Franges           [1]WCRANGE
-} /* wingdi.h:2911:11 */
+} /* wingdi.h:3018:11 */
 
-type GLYPHSET = tagGLYPHSET /* wingdi.h:2917:5 */
-type PGLYPHSET = uintptr    /* wingdi.h:2917:14 */
-type LPGLYPHSET = uintptr   /* wingdi.h:2917:25 */
+type GLYPHSET = tagGLYPHSET /* wingdi.h:3024:5 */
+type PGLYPHSET = uintptr    /* wingdi.h:3024:14 */
+type LPGLYPHSET = uintptr   /* wingdi.h:3024:25 */
 
 type tagDESIGNVECTOR = struct {
 	FdvReserved DWORD
 	FdvNumAxes  DWORD
 	FdvValues   [16]LONG
-} /* wingdi.h:2937:11 */
+} /* wingdi.h:3046:11 */
 
-type DESIGNVECTOR = tagDESIGNVECTOR /* wingdi.h:2941:5 */
-type PDESIGNVECTOR = uintptr        /* wingdi.h:2941:18 */
-type LPDESIGNVECTOR = uintptr       /* wingdi.h:2941:33 */
+type DESIGNVECTOR = tagDESIGNVECTOR /* wingdi.h:3050:5 */
+type PDESIGNVECTOR = uintptr        /* wingdi.h:3050:18 */
+type LPDESIGNVECTOR = uintptr       /* wingdi.h:3050:33 */
 
 type tagAXISINFOA = struct {
 	FaxMinValue LONG
 	FaxMaxValue LONG
 	FaxAxisName [16]BYTE
-} /* wingdi.h:2958:11 */
+} /* wingdi.h:3067:11 */
 
-type AXISINFOA = tagAXISINFOA /* wingdi.h:2962:5 */
-type PAXISINFOA = uintptr     /* wingdi.h:2962:15 */
-type LPAXISINFOA = uintptr    /* wingdi.h:2962:27 */
+type AXISINFOA = tagAXISINFOA /* wingdi.h:3071:5 */
+type PAXISINFOA = uintptr     /* wingdi.h:3071:15 */
+type LPAXISINFOA = uintptr    /* wingdi.h:3071:27 */
 
 type tagAXISINFOW = struct {
 	FaxMinValue LONG
 	FaxMaxValue LONG
 	FaxAxisName [16]WCHAR
-} /* wingdi.h:2964:11 */
+} /* wingdi.h:3073:11 */
 
-type AXISINFOW = tagAXISINFOW /* wingdi.h:2968:5 */
-type PAXISINFOW = uintptr     /* wingdi.h:2968:15 */
-type LPAXISINFOW = uintptr    /* wingdi.h:2968:27 */
+type AXISINFOW = tagAXISINFOW /* wingdi.h:3077:5 */
+type PAXISINFOW = uintptr     /* wingdi.h:3077:15 */
+type LPAXISINFOW = uintptr    /* wingdi.h:3077:27 */
 
-type AXISINFO = AXISINFOA     /* wingdi.h:2970:3 */
-type PAXISINFO = PAXISINFOA   /* wingdi.h:2971:3 */
-type LPAXISINFO = LPAXISINFOA /* wingdi.h:2972:3 */
+type AXISINFO = AXISINFOA     /* wingdi.h:3079:3 */
+type PAXISINFO = PAXISINFOA   /* wingdi.h:3080:3 */
+type LPAXISINFO = LPAXISINFOA /* wingdi.h:3081:3 */
 
 type tagAXESLISTA = struct {
 	FaxlReserved DWORD
 	FaxlNumAxes  DWORD
 	FaxlAxisInfo [16]AXISINFOA
-} /* wingdi.h:2974:11 */
+} /* wingdi.h:3083:11 */
 
-type AXESLISTA = tagAXESLISTA /* wingdi.h:2978:5 */
-type PAXESLISTA = uintptr     /* wingdi.h:2978:15 */
-type LPAXESLISTA = uintptr    /* wingdi.h:2978:27 */
+type AXESLISTA = tagAXESLISTA /* wingdi.h:3087:5 */
+type PAXESLISTA = uintptr     /* wingdi.h:3087:15 */
+type LPAXESLISTA = uintptr    /* wingdi.h:3087:27 */
 
 type tagAXESLISTW = struct {
 	FaxlReserved DWORD
 	FaxlNumAxes  DWORD
 	FaxlAxisInfo [16]AXISINFOW
-} /* wingdi.h:2980:11 */
+} /* wingdi.h:3089:11 */
 
-type AXESLISTW = tagAXESLISTW /* wingdi.h:2984:5 */
-type PAXESLISTW = uintptr     /* wingdi.h:2984:15 */
-type LPAXESLISTW = uintptr    /* wingdi.h:2984:27 */
+type AXESLISTW = tagAXESLISTW /* wingdi.h:3093:5 */
+type PAXESLISTW = uintptr     /* wingdi.h:3093:15 */
+type LPAXESLISTW = uintptr    /* wingdi.h:3093:27 */
 
-type AXESLIST = AXESLISTA     /* wingdi.h:2986:3 */
-type PAXESLIST = PAXESLISTA   /* wingdi.h:2987:3 */
-type LPAXESLIST = LPAXESLISTA /* wingdi.h:2988:3 */
+type AXESLIST = AXESLISTA     /* wingdi.h:3095:3 */
+type PAXESLIST = PAXESLISTA   /* wingdi.h:3096:3 */
+type LPAXESLIST = LPAXESLISTA /* wingdi.h:3097:3 */
 
 type tagENUMLOGFONTEXDVA = struct {
 	FelfEnumLogfontEx ENUMLOGFONTEXA
 	FelfDesignVector  DESIGNVECTOR
-} /* wingdi.h:2990:11 */
+} /* wingdi.h:3099:11 */
 
-type ENUMLOGFONTEXDVA = tagENUMLOGFONTEXDVA /* wingdi.h:2993:5 */
-type PENUMLOGFONTEXDVA = uintptr            /* wingdi.h:2993:22 */
-type LPENUMLOGFONTEXDVA = uintptr           /* wingdi.h:2993:41 */
+type ENUMLOGFONTEXDVA = tagENUMLOGFONTEXDVA /* wingdi.h:3102:5 */
+type PENUMLOGFONTEXDVA = uintptr            /* wingdi.h:3102:22 */
+type LPENUMLOGFONTEXDVA = uintptr           /* wingdi.h:3102:41 */
 
 type tagENUMLOGFONTEXDVW = struct {
 	FelfEnumLogfontEx ENUMLOGFONTEXW
 	FelfDesignVector  DESIGNVECTOR
-} /* wingdi.h:2995:11 */
+} /* wingdi.h:3104:11 */
 
-type ENUMLOGFONTEXDVW = tagENUMLOGFONTEXDVW /* wingdi.h:2998:5 */
-type PENUMLOGFONTEXDVW = uintptr            /* wingdi.h:2998:22 */
-type LPENUMLOGFONTEXDVW = uintptr           /* wingdi.h:2998:41 */
+type ENUMLOGFONTEXDVW = tagENUMLOGFONTEXDVW /* wingdi.h:3107:5 */
+type PENUMLOGFONTEXDVW = uintptr            /* wingdi.h:3107:22 */
+type LPENUMLOGFONTEXDVW = uintptr           /* wingdi.h:3107:41 */
 
-type ENUMLOGFONTEXDV = ENUMLOGFONTEXDVA     /* wingdi.h:3000:3 */
-type PENUMLOGFONTEXDV = PENUMLOGFONTEXDVA   /* wingdi.h:3001:3 */
-type LPENUMLOGFONTEXDV = LPENUMLOGFONTEXDVA /* wingdi.h:3002:3 */
+type ENUMLOGFONTEXDV = ENUMLOGFONTEXDVA     /* wingdi.h:3109:3 */
+type PENUMLOGFONTEXDV = PENUMLOGFONTEXDVA   /* wingdi.h:3110:3 */
+type LPENUMLOGFONTEXDV = LPENUMLOGFONTEXDVA /* wingdi.h:3111:3 */
 
 type tagENUMTEXTMETRICA = struct {
 	FetmNewTextMetricEx NEWTEXTMETRICEXA
 	FetmAxesList        AXESLISTA
-} /* wingdi.h:3010:11 */
+} /* wingdi.h:3119:11 */
 
-type ENUMTEXTMETRICA = tagENUMTEXTMETRICA /* wingdi.h:3013:5 */
-type PENUMTEXTMETRICA = uintptr           /* wingdi.h:3013:21 */
-type LPENUMTEXTMETRICA = uintptr          /* wingdi.h:3013:39 */
+type ENUMTEXTMETRICA = tagENUMTEXTMETRICA /* wingdi.h:3122:5 */
+type PENUMTEXTMETRICA = uintptr           /* wingdi.h:3122:21 */
+type LPENUMTEXTMETRICA = uintptr          /* wingdi.h:3122:39 */
 type tagENUMTEXTMETRICW = struct {
 	FetmNewTextMetricEx NEWTEXTMETRICEXW
 	FetmAxesList        AXESLISTW
-} /* wingdi.h:3014:11 */
+} /* wingdi.h:3123:11 */
 
-type ENUMTEXTMETRICW = tagENUMTEXTMETRICW /* wingdi.h:3018:5 */
-type PENUMTEXTMETRICW = uintptr           /* wingdi.h:3018:21 */
-type LPENUMTEXTMETRICW = uintptr          /* wingdi.h:3018:39 */
+type ENUMTEXTMETRICW = tagENUMTEXTMETRICW /* wingdi.h:3127:5 */
+type PENUMTEXTMETRICW = uintptr           /* wingdi.h:3127:21 */
+type LPENUMTEXTMETRICW = uintptr          /* wingdi.h:3127:39 */
 
-type ENUMTEXTMETRIC = ENUMTEXTMETRICA     /* wingdi.h:3020:3 */
-type PENUMTEXTMETRIC = PENUMTEXTMETRICA   /* wingdi.h:3021:3 */
-type LPENUMTEXTMETRIC = LPENUMTEXTMETRICA /* wingdi.h:3022:3 */
+type ENUMTEXTMETRIC = ENUMTEXTMETRICA     /* wingdi.h:3129:3 */
+type PENUMTEXTMETRIC = PENUMTEXTMETRICA   /* wingdi.h:3130:3 */
+type LPENUMTEXTMETRIC = LPENUMTEXTMETRICA /* wingdi.h:3131:3 */
 
-type COLOR16 = USHORT /* wingdi.h:3124:18 */
+type COLOR16 = USHORT /* wingdi.h:3233:18 */
 
 type _TRIVERTEX = struct {
 	Fx     LONG
@@ -39348,56 +39845,56 @@ type _TRIVERTEX = struct {
 	FGreen COLOR16
 	FBlue  COLOR16
 	FAlpha COLOR16
-} /* wingdi.h:3126:11 */
+} /* wingdi.h:3235:11 */
 
-type TRIVERTEX = _TRIVERTEX /* wingdi.h:3133:5 */
-type PTRIVERTEX = uintptr   /* wingdi.h:3133:15 */
-type LPTRIVERTEX = uintptr  /* wingdi.h:3133:27 */
+type TRIVERTEX = _TRIVERTEX /* wingdi.h:3242:5 */
+type PTRIVERTEX = uintptr   /* wingdi.h:3242:15 */
+type LPTRIVERTEX = uintptr  /* wingdi.h:3242:27 */
 type _GRADIENT_TRIANGLE = struct {
 	FVertex1 ULONG
 	FVertex2 ULONG
 	FVertex3 ULONG
-} /* wingdi.h:3136:11 */
+} /* wingdi.h:3245:11 */
 
-type GRADIENT_TRIANGLE = _GRADIENT_TRIANGLE /* wingdi.h:3140:5 */
-type PGRADIENT_TRIANGLE = uintptr           /* wingdi.h:3140:23 */
-type LPGRADIENT_TRIANGLE = uintptr          /* wingdi.h:3140:43 */
+type GRADIENT_TRIANGLE = _GRADIENT_TRIANGLE /* wingdi.h:3249:5 */
+type PGRADIENT_TRIANGLE = uintptr           /* wingdi.h:3249:23 */
+type LPGRADIENT_TRIANGLE = uintptr          /* wingdi.h:3249:43 */
 
 type _GRADIENT_RECT = struct {
 	FUpperLeft  ULONG
 	FLowerRight ULONG
-} /* wingdi.h:3142:11 */
+} /* wingdi.h:3251:11 */
 
-type GRADIENT_RECT = _GRADIENT_RECT /* wingdi.h:3145:5 */
-type PGRADIENT_RECT = uintptr       /* wingdi.h:3145:19 */
-type LPGRADIENT_RECT = uintptr      /* wingdi.h:3145:35 */
+type GRADIENT_RECT = _GRADIENT_RECT /* wingdi.h:3254:5 */
+type PGRADIENT_RECT = uintptr       /* wingdi.h:3254:19 */
+type LPGRADIENT_RECT = uintptr      /* wingdi.h:3254:35 */
 type _BLENDFUNCTION = struct {
 	FBlendOp             BYTE
 	FBlendFlags          BYTE
 	FSourceConstantAlpha BYTE
 	FAlphaFormat         BYTE
-} /* wingdi.h:3148:11 */
+} /* wingdi.h:3257:11 */
 
-type BLENDFUNCTION = _BLENDFUNCTION /* wingdi.h:3153:5 */
-type PBLENDFUNCTION = uintptr       /* wingdi.h:3153:19 */
+type BLENDFUNCTION = _BLENDFUNCTION /* wingdi.h:3262:5 */
+type PBLENDFUNCTION = uintptr       /* wingdi.h:3262:19 */
 
-type MFENUMPROC = uintptr /* wingdi.h:3181:15 */
+type MFENUMPROC = uintptr /* wingdi.h:3290:15 */
 
-type ENHMFENUMPROC = uintptr /* wingdi.h:3185:15 */
+type ENHMFENUMPROC = uintptr /* wingdi.h:3294:15 */
 
 type tagDIBSECTION = struct {
 	FdsBm        BITMAP
 	FdsBmih      BITMAPINFOHEADER
 	FdsBitfields [3]DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FdshSection  HANDLE
 	FdsOffset    DWORD
-	_            [4]byte
-} /* wingdi.h:3217:11 */
+	F__ccgo_pad2 [4]byte
+} /* wingdi.h:3326:11 */
 
-type DIBSECTION = tagDIBSECTION /* wingdi.h:3223:5 */
-type LPDIBSECTION = uintptr     /* wingdi.h:3223:16 */
-type PDIBSECTION = uintptr      /* wingdi.h:3223:30 */
+type DIBSECTION = tagDIBSECTION /* wingdi.h:3332:5 */
+type LPDIBSECTION = uintptr     /* wingdi.h:3332:16 */
+type PDIBSECTION = uintptr      /* wingdi.h:3332:30 */
 
 type tagCOLORADJUSTMENT = struct {
 	FcaSize            WORD
@@ -39412,62 +39909,62 @@ type tagCOLORADJUSTMENT = struct {
 	FcaBrightness      SHORT
 	FcaColorfulness    SHORT
 	FcaRedGreenTint    SHORT
-} /* wingdi.h:3265:11 */
+} /* wingdi.h:3379:11 */
 
-type COLORADJUSTMENT = tagCOLORADJUSTMENT /* wingdi.h:3278:5 */
-type PCOLORADJUSTMENT = uintptr           /* wingdi.h:3278:21 */
-type LPCOLORADJUSTMENT = uintptr          /* wingdi.h:3278:39 */
+type COLORADJUSTMENT = tagCOLORADJUSTMENT /* wingdi.h:3392:5 */
+type PCOLORADJUSTMENT = uintptr           /* wingdi.h:3392:21 */
+type LPCOLORADJUSTMENT = uintptr          /* wingdi.h:3392:39 */
 
-type ABORTPROC = uintptr /* wingdi.h:3284:19 */
+type ABORTPROC = uintptr /* wingdi.h:3398:19 */
 
 type _DOCINFOA = struct {
 	FcbSize       int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FlpszDocName  LPCSTR
 	FlpszOutput   LPCSTR
 	FlpszDatatype LPCSTR
 	FfwType       DWORD
-	_             [4]byte
-} /* wingdi.h:3286:11 */
+	F__ccgo_pad2  [4]byte
+} /* wingdi.h:3400:11 */
 
-type DOCINFOA = _DOCINFOA /* wingdi.h:3292:5 */
-type LPDOCINFOA = uintptr /* wingdi.h:3292:14 */
+type DOCINFOA = _DOCINFOA /* wingdi.h:3406:5 */
+type LPDOCINFOA = uintptr /* wingdi.h:3406:14 */
 
 type _DOCINFOW = struct {
 	FcbSize       int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FlpszDocName  LPCWSTR
 	FlpszOutput   LPCWSTR
 	FlpszDatatype LPCWSTR
 	FfwType       DWORD
-	_             [4]byte
-} /* wingdi.h:3294:11 */
+	F__ccgo_pad2  [4]byte
+} /* wingdi.h:3408:11 */
 
-type DOCINFOW = _DOCINFOW /* wingdi.h:3300:5 */
-type LPDOCINFOW = uintptr /* wingdi.h:3300:14 */
+type DOCINFOW = _DOCINFOW /* wingdi.h:3414:5 */
+type LPDOCINFOW = uintptr /* wingdi.h:3414:14 */
 
-type DOCINFO = DOCINFOA     /* wingdi.h:3302:3 */
-type LPDOCINFO = LPDOCINFOA /* wingdi.h:3303:3 */
+type DOCINFO = DOCINFOA     /* wingdi.h:3416:3 */
+type LPDOCINFO = LPDOCINFOA /* wingdi.h:3417:3 */
 
 type tagKERNINGPAIR = struct {
 	FwFirst      WORD
 	FwSecond     WORD
 	FiKernAmount int32
-} /* wingdi.h:3373:11 */
+} /* wingdi.h:3487:11 */
 
-type KERNINGPAIR = tagKERNINGPAIR /* wingdi.h:3377:5 */
-type LPKERNINGPAIR = uintptr      /* wingdi.h:3377:17 */
+type KERNINGPAIR = tagKERNINGPAIR /* wingdi.h:3491:5 */
+type LPKERNINGPAIR = uintptr      /* wingdi.h:3491:17 */
 
-type ICMENUMPROCA = uintptr /* wingdi.h:3395:15 */
-type ICMENUMPROCW = uintptr /* wingdi.h:3396:15 */
+type ICMENUMPROCA = uintptr /* wingdi.h:3509:15 */
+type ICMENUMPROCW = uintptr /* wingdi.h:3510:15 */
 
 type tagEMR = struct {
 	FiType DWORD
 	FnSize DWORD
-} /* wingdi.h:3561:11 */
+} /* wingdi.h:3675:11 */
 
-type EMR = tagEMR   /* wingdi.h:3564:5 */
-type PEMR = uintptr /* wingdi.h:3564:9 */
+type EMR = tagEMR   /* wingdi.h:3678:5 */
+type PEMR = uintptr /* wingdi.h:3678:9 */
 
 type tagEMRTEXT = struct {
 	FptlReference POINTL
@@ -39476,124 +39973,124 @@ type tagEMRTEXT = struct {
 	FfOptions     DWORD
 	Frcl          RECTL
 	FoffDx        DWORD
-} /* wingdi.h:3566:11 */
-
-type EMRTEXT = tagEMRTEXT /* wingdi.h:3573:5 */
-type PEMRTEXT = uintptr   /* wingdi.h:3573:13 */
-
-type tagABORTPATH = struct{ Femr EMR } /* wingdi.h:3575:11 */
-
-type EMRABORTPATH = tagABORTPATH      /* wingdi.h:3577:5 */
-type PEMRABORTPATH = uintptr          /* wingdi.h:3577:18 */
-type EMRBEGINPATH = tagABORTPATH      /* wingdi.h:3577:33 */
-type PEMRBEGINPATH = uintptr          /* wingdi.h:3577:46 */
-type EMRENDPATH = tagABORTPATH        /* wingdi.h:3577:61 */
-type PEMRENDPATH = uintptr            /* wingdi.h:3577:72 */
-type EMRCLOSEFIGURE = tagABORTPATH    /* wingdi.h:3577:85 */
-type PEMRCLOSEFIGURE = uintptr        /* wingdi.h:3577:100 */
-type EMRFLATTENPATH = tagABORTPATH    /* wingdi.h:3577:117 */
-type PEMRFLATTENPATH = uintptr        /* wingdi.h:3577:132 */
-type EMRWIDENPATH = tagABORTPATH      /* wingdi.h:3577:149 */
-type PEMRWIDENPATH = uintptr          /* wingdi.h:3577:162 */
-type EMRSETMETARGN = tagABORTPATH     /* wingdi.h:3577:177 */
-type PEMRSETMETARGN = uintptr         /* wingdi.h:3577:191 */
-type EMRSAVEDC = tagABORTPATH         /* wingdi.h:3577:207 */
-type PEMRSAVEDC = uintptr             /* wingdi.h:3577:217 */
-type EMRREALIZEPALETTE = tagABORTPATH /* wingdi.h:3577:229 */
-type PEMRREALIZEPALETTE = uintptr     /* wingdi.h:3577:247 */
+} /* wingdi.h:3680:11 */
+
+type EMRTEXT = tagEMRTEXT /* wingdi.h:3687:5 */
+type PEMRTEXT = uintptr   /* wingdi.h:3687:13 */
+
+type tagABORTPATH = struct{ Femr EMR } /* wingdi.h:3689:11 */
+
+type EMRABORTPATH = tagABORTPATH      /* wingdi.h:3691:5 */
+type PEMRABORTPATH = uintptr          /* wingdi.h:3691:18 */
+type EMRBEGINPATH = tagABORTPATH      /* wingdi.h:3691:33 */
+type PEMRBEGINPATH = uintptr          /* wingdi.h:3691:46 */
+type EMRENDPATH = tagABORTPATH        /* wingdi.h:3691:61 */
+type PEMRENDPATH = uintptr            /* wingdi.h:3691:72 */
+type EMRCLOSEFIGURE = tagABORTPATH    /* wingdi.h:3691:85 */
+type PEMRCLOSEFIGURE = uintptr        /* wingdi.h:3691:100 */
+type EMRFLATTENPATH = tagABORTPATH    /* wingdi.h:3691:117 */
+type PEMRFLATTENPATH = uintptr        /* wingdi.h:3691:132 */
+type EMRWIDENPATH = tagABORTPATH      /* wingdi.h:3691:149 */
+type PEMRWIDENPATH = uintptr          /* wingdi.h:3691:162 */
+type EMRSETMETARGN = tagABORTPATH     /* wingdi.h:3691:177 */
+type PEMRSETMETARGN = uintptr         /* wingdi.h:3691:191 */
+type EMRSAVEDC = tagABORTPATH         /* wingdi.h:3691:207 */
+type PEMRSAVEDC = uintptr             /* wingdi.h:3691:217 */
+type EMRREALIZEPALETTE = tagABORTPATH /* wingdi.h:3691:229 */
+type PEMRREALIZEPALETTE = uintptr     /* wingdi.h:3691:247 */
 
 type tagEMRSELECTCLIPPATH = struct {
 	Femr   EMR
 	FiMode DWORD
-} /* wingdi.h:3579:11 */
-
-type EMRSELECTCLIPPATH = tagEMRSELECTCLIPPATH    /* wingdi.h:3582:5 */
-type PEMRSELECTCLIPPATH = uintptr                /* wingdi.h:3582:23 */
-type EMRSETBKMODE = tagEMRSELECTCLIPPATH         /* wingdi.h:3582:43 */
-type PEMRSETBKMODE = uintptr                     /* wingdi.h:3582:56 */
-type EMRSETMAPMODE = tagEMRSELECTCLIPPATH        /* wingdi.h:3582:71 */
-type PEMRSETMAPMODE = uintptr                    /* wingdi.h:3582:85 */
-type EMRSETLAYOUT = tagEMRSELECTCLIPPATH         /* wingdi.h:3582:101 */
-type PEMRSETLAYOUT = uintptr                     /* wingdi.h:3582:114 */
-type EMRSETPOLYFILLMODE = tagEMRSELECTCLIPPATH   /* wingdi.h:3583:5 */
-type PEMRSETPOLYFILLMODE = uintptr               /* wingdi.h:3583:24 */
-type EMRSETROP2 = tagEMRSELECTCLIPPATH           /* wingdi.h:3583:45 */
-type PEMRSETROP2 = uintptr                       /* wingdi.h:3583:56 */
-type EMRSETSTRETCHBLTMODE = tagEMRSELECTCLIPPATH /* wingdi.h:3583:69 */
-type PEMRSETSTRETCHBLTMODE = uintptr             /* wingdi.h:3583:90 */
-type EMRSETICMMODE = tagEMRSELECTCLIPPATH        /* wingdi.h:3583:113 */
-type PEMRSETICMMODE = uintptr                    /* wingdi.h:3584:5 */
-type EMRSETTEXTALIGN = tagEMRSELECTCLIPPATH      /* wingdi.h:3584:21 */
-type PEMRSETTEXTALIGN = uintptr                  /* wingdi.h:3584:37 */
+} /* wingdi.h:3693:11 */
+
+type EMRSELECTCLIPPATH = tagEMRSELECTCLIPPATH    /* wingdi.h:3696:5 */
+type PEMRSELECTCLIPPATH = uintptr                /* wingdi.h:3696:23 */
+type EMRSETBKMODE = tagEMRSELECTCLIPPATH         /* wingdi.h:3696:43 */
+type PEMRSETBKMODE = uintptr                     /* wingdi.h:3696:56 */
+type EMRSETMAPMODE = tagEMRSELECTCLIPPATH        /* wingdi.h:3696:71 */
+type PEMRSETMAPMODE = uintptr                    /* wingdi.h:3696:85 */
+type EMRSETLAYOUT = tagEMRSELECTCLIPPATH         /* wingdi.h:3696:101 */
+type PEMRSETLAYOUT = uintptr                     /* wingdi.h:3696:114 */
+type EMRSETPOLYFILLMODE = tagEMRSELECTCLIPPATH   /* wingdi.h:3697:5 */
+type PEMRSETPOLYFILLMODE = uintptr               /* wingdi.h:3697:24 */
+type EMRSETROP2 = tagEMRSELECTCLIPPATH           /* wingdi.h:3697:45 */
+type PEMRSETROP2 = uintptr                       /* wingdi.h:3697:56 */
+type EMRSETSTRETCHBLTMODE = tagEMRSELECTCLIPPATH /* wingdi.h:3697:69 */
+type PEMRSETSTRETCHBLTMODE = uintptr             /* wingdi.h:3697:90 */
+type EMRSETICMMODE = tagEMRSELECTCLIPPATH        /* wingdi.h:3697:113 */
+type PEMRSETICMMODE = uintptr                    /* wingdi.h:3698:5 */
+type EMRSETTEXTALIGN = tagEMRSELECTCLIPPATH      /* wingdi.h:3698:21 */
+type PEMRSETTEXTALIGN = uintptr                  /* wingdi.h:3698:37 */
 
 type tagEMRSETMITERLIMIT = struct {
 	Femr         EMR
 	FeMiterLimit FLOAT
-} /* wingdi.h:3586:11 */
+} /* wingdi.h:3700:11 */
 
-type EMRSETMITERLIMIT = tagEMRSETMITERLIMIT /* wingdi.h:3589:5 */
-type PEMRSETMITERLIMIT = uintptr            /* wingdi.h:3589:22 */
+type EMRSETMITERLIMIT = tagEMRSETMITERLIMIT /* wingdi.h:3703:5 */
+type PEMRSETMITERLIMIT = uintptr            /* wingdi.h:3703:22 */
 
 type tagEMRRESTOREDC = struct {
 	Femr       EMR
 	FiRelative LONG
-} /* wingdi.h:3591:11 */
+} /* wingdi.h:3705:11 */
 
-type EMRRESTOREDC = tagEMRRESTOREDC /* wingdi.h:3594:5 */
-type PEMRRESTOREDC = uintptr        /* wingdi.h:3594:18 */
+type EMRRESTOREDC = tagEMRRESTOREDC /* wingdi.h:3708:5 */
+type PEMRRESTOREDC = uintptr        /* wingdi.h:3708:18 */
 
 type tagEMRSETARCDIRECTION = struct {
 	Femr           EMR
 	FiArcDirection DWORD
-} /* wingdi.h:3596:11 */
+} /* wingdi.h:3710:11 */
 
-type EMRSETARCDIRECTION = tagEMRSETARCDIRECTION /* wingdi.h:3600:5 */
-type PEMRSETARCDIRECTION = uintptr              /* wingdi.h:3600:24 */
+type EMRSETARCDIRECTION = tagEMRSETARCDIRECTION /* wingdi.h:3714:5 */
+type PEMRSETARCDIRECTION = uintptr              /* wingdi.h:3714:24 */
 
 type tagEMRSETMAPPERFLAGS = struct {
 	Femr     EMR
 	FdwFlags DWORD
-} /* wingdi.h:3602:11 */
+} /* wingdi.h:3716:11 */
 
-type EMRSETMAPPERFLAGS = tagEMRSETMAPPERFLAGS /* wingdi.h:3605:5 */
-type PEMRSETMAPPERFLAGS = uintptr             /* wingdi.h:3605:23 */
+type EMRSETMAPPERFLAGS = tagEMRSETMAPPERFLAGS /* wingdi.h:3719:5 */
+type PEMRSETMAPPERFLAGS = uintptr             /* wingdi.h:3719:23 */
 
 type tagEMRSETTEXTCOLOR = struct {
 	Femr     EMR
 	FcrColor COLORREF
-} /* wingdi.h:3607:11 */
+} /* wingdi.h:3721:11 */
 
-type EMRSETBKCOLOR = tagEMRSETTEXTCOLOR   /* wingdi.h:3610:5 */
-type PEMRSETBKCOLOR = uintptr             /* wingdi.h:3610:19 */
-type EMRSETTEXTCOLOR = tagEMRSETTEXTCOLOR /* wingdi.h:3610:35 */
-type PEMRSETTEXTCOLOR = uintptr           /* wingdi.h:3610:51 */
+type EMRSETBKCOLOR = tagEMRSETTEXTCOLOR   /* wingdi.h:3724:5 */
+type PEMRSETBKCOLOR = uintptr             /* wingdi.h:3724:19 */
+type EMRSETTEXTCOLOR = tagEMRSETTEXTCOLOR /* wingdi.h:3724:35 */
+type PEMRSETTEXTCOLOR = uintptr           /* wingdi.h:3724:51 */
 
 type tagEMRSELECTOBJECT = struct {
 	Femr      EMR
 	FihObject DWORD
-} /* wingdi.h:3612:11 */
+} /* wingdi.h:3726:11 */
 
-type EMRSELECTOBJECT = tagEMRSELECTOBJECT /* wingdi.h:3615:5 */
-type PEMRSELECTOBJECT = uintptr           /* wingdi.h:3615:21 */
-type EMRDELETEOBJECT = tagEMRSELECTOBJECT /* wingdi.h:3615:39 */
-type PEMRDELETEOBJECT = uintptr           /* wingdi.h:3615:55 */
+type EMRSELECTOBJECT = tagEMRSELECTOBJECT /* wingdi.h:3729:5 */
+type PEMRSELECTOBJECT = uintptr           /* wingdi.h:3729:21 */
+type EMRDELETEOBJECT = tagEMRSELECTOBJECT /* wingdi.h:3729:39 */
+type PEMRDELETEOBJECT = uintptr           /* wingdi.h:3729:55 */
 
 type tagEMRSELECTPALETTE = struct {
 	Femr   EMR
 	FihPal DWORD
-} /* wingdi.h:3617:11 */
+} /* wingdi.h:3731:11 */
 
-type EMRSELECTPALETTE = tagEMRSELECTPALETTE /* wingdi.h:3620:5 */
-type PEMRSELECTPALETTE = uintptr            /* wingdi.h:3620:22 */
+type EMRSELECTPALETTE = tagEMRSELECTPALETTE /* wingdi.h:3734:5 */
+type PEMRSELECTPALETTE = uintptr            /* wingdi.h:3734:22 */
 
 type tagEMRRESIZEPALETTE = struct {
 	Femr      EMR
 	FihPal    DWORD
 	FcEntries DWORD
-} /* wingdi.h:3622:11 */
+} /* wingdi.h:3736:11 */
 
-type EMRRESIZEPALETTE = tagEMRRESIZEPALETTE /* wingdi.h:3626:5 */
-type PEMRRESIZEPALETTE = uintptr            /* wingdi.h:3626:22 */
+type EMRRESIZEPALETTE = tagEMRRESIZEPALETTE /* wingdi.h:3740:5 */
+type PEMRRESIZEPALETTE = uintptr            /* wingdi.h:3740:22 */
 
 type tagEMRSETPALETTEENTRIES = struct {
 	Femr         EMR
@@ -39601,100 +40098,100 @@ type tagEMRSETPALETTEENTRIES = struct {
 	FiStart      DWORD
 	FcEntries    DWORD
 	FaPalEntries [1]PALETTEENTRY
-} /* wingdi.h:3628:11 */
+} /* wingdi.h:3742:11 */
 
-type EMRSETPALETTEENTRIES = tagEMRSETPALETTEENTRIES /* wingdi.h:3634:5 */
-type PEMRSETPALETTEENTRIES = uintptr                /* wingdi.h:3634:26 */
+type EMRSETPALETTEENTRIES = tagEMRSETPALETTEENTRIES /* wingdi.h:3748:5 */
+type PEMRSETPALETTEENTRIES = uintptr                /* wingdi.h:3748:26 */
 
 type tagEMRSETCOLORADJUSTMENT = struct {
 	Femr             EMR
 	FColorAdjustment COLORADJUSTMENT
-} /* wingdi.h:3636:11 */
+} /* wingdi.h:3750:11 */
 
-type EMRSETCOLORADJUSTMENT = tagEMRSETCOLORADJUSTMENT /* wingdi.h:3639:5 */
-type PEMRSETCOLORADJUSTMENT = uintptr                 /* wingdi.h:3639:27 */
+type EMRSETCOLORADJUSTMENT = tagEMRSETCOLORADJUSTMENT /* wingdi.h:3753:5 */
+type PEMRSETCOLORADJUSTMENT = uintptr                 /* wingdi.h:3753:27 */
 
 type tagEMRGDICOMMENT = struct {
-	Femr    EMR
-	FcbData DWORD
-	FData   [1]BYTE
-	_       [3]byte
-} /* wingdi.h:3641:11 */
+	Femr         EMR
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3755:11 */
 
-type EMRGDICOMMENT = tagEMRGDICOMMENT /* wingdi.h:3645:5 */
-type PEMRGDICOMMENT = uintptr         /* wingdi.h:3645:19 */
+type EMRGDICOMMENT = tagEMRGDICOMMENT /* wingdi.h:3759:5 */
+type PEMRGDICOMMENT = uintptr         /* wingdi.h:3759:19 */
 
 type tagEMREOF = struct {
 	Femr           EMR
 	FnPalEntries   DWORD
 	FoffPalEntries DWORD
 	FnSizeLast     DWORD
-} /* wingdi.h:3647:11 */
+} /* wingdi.h:3761:11 */
 
-type EMREOF = tagEMREOF /* wingdi.h:3652:5 */
-type PEMREOF = uintptr  /* wingdi.h:3652:12 */
+type EMREOF = tagEMREOF /* wingdi.h:3766:5 */
+type PEMREOF = uintptr  /* wingdi.h:3766:12 */
 
 type tagEMRLINETO = struct {
 	Femr EMR
 	Fptl POINTL
-} /* wingdi.h:3654:11 */
+} /* wingdi.h:3768:11 */
 
-type EMRLINETO = tagEMRLINETO   /* wingdi.h:3657:5 */
-type PEMRLINETO = uintptr       /* wingdi.h:3657:15 */
-type EMRMOVETOEX = tagEMRLINETO /* wingdi.h:3657:27 */
-type PEMRMOVETOEX = uintptr     /* wingdi.h:3657:39 */
+type EMRLINETO = tagEMRLINETO   /* wingdi.h:3771:5 */
+type PEMRLINETO = uintptr       /* wingdi.h:3771:15 */
+type EMRMOVETOEX = tagEMRLINETO /* wingdi.h:3771:27 */
+type PEMRMOVETOEX = uintptr     /* wingdi.h:3771:39 */
 
 type tagEMROFFSETCLIPRGN = struct {
 	Femr       EMR
 	FptlOffset POINTL
-} /* wingdi.h:3659:11 */
+} /* wingdi.h:3773:11 */
 
-type EMROFFSETCLIPRGN = tagEMROFFSETCLIPRGN /* wingdi.h:3662:5 */
-type PEMROFFSETCLIPRGN = uintptr            /* wingdi.h:3662:22 */
+type EMROFFSETCLIPRGN = tagEMROFFSETCLIPRGN /* wingdi.h:3776:5 */
+type PEMROFFSETCLIPRGN = uintptr            /* wingdi.h:3776:22 */
 
 type tagEMRFILLPATH = struct {
 	Femr       EMR
 	FrclBounds RECTL
-} /* wingdi.h:3664:11 */
+} /* wingdi.h:3778:11 */
 
-type EMRFILLPATH = tagEMRFILLPATH          /* wingdi.h:3667:5 */
-type PEMRFILLPATH = uintptr                /* wingdi.h:3667:17 */
-type EMRSTROKEANDFILLPATH = tagEMRFILLPATH /* wingdi.h:3667:31 */
-type PEMRSTROKEANDFILLPATH = uintptr       /* wingdi.h:3667:52 */
-type EMRSTROKEPATH = tagEMRFILLPATH        /* wingdi.h:3667:75 */
-type PEMRSTROKEPATH = uintptr              /* wingdi.h:3667:89 */
+type EMRFILLPATH = tagEMRFILLPATH          /* wingdi.h:3781:5 */
+type PEMRFILLPATH = uintptr                /* wingdi.h:3781:17 */
+type EMRSTROKEANDFILLPATH = tagEMRFILLPATH /* wingdi.h:3781:31 */
+type PEMRSTROKEANDFILLPATH = uintptr       /* wingdi.h:3781:52 */
+type EMRSTROKEPATH = tagEMRFILLPATH        /* wingdi.h:3781:75 */
+type PEMRSTROKEPATH = uintptr              /* wingdi.h:3781:89 */
 
 type tagEMREXCLUDECLIPRECT = struct {
 	Femr     EMR
 	FrclClip RECTL
-} /* wingdi.h:3669:11 */
+} /* wingdi.h:3783:11 */
 
-type EMREXCLUDECLIPRECT = tagEMREXCLUDECLIPRECT   /* wingdi.h:3672:5 */
-type PEMREXCLUDECLIPRECT = uintptr                /* wingdi.h:3672:24 */
-type EMRINTERSECTCLIPRECT = tagEMREXCLUDECLIPRECT /* wingdi.h:3672:45 */
-type PEMRINTERSECTCLIPRECT = uintptr              /* wingdi.h:3672:66 */
+type EMREXCLUDECLIPRECT = tagEMREXCLUDECLIPRECT   /* wingdi.h:3786:5 */
+type PEMREXCLUDECLIPRECT = uintptr                /* wingdi.h:3786:24 */
+type EMRINTERSECTCLIPRECT = tagEMREXCLUDECLIPRECT /* wingdi.h:3786:45 */
+type PEMRINTERSECTCLIPRECT = uintptr              /* wingdi.h:3786:66 */
 
 type tagEMRSETVIEWPORTORGEX = struct {
 	Femr       EMR
 	FptlOrigin POINTL
-} /* wingdi.h:3674:11 */
+} /* wingdi.h:3788:11 */
 
-type EMRSETVIEWPORTORGEX = tagEMRSETVIEWPORTORGEX /* wingdi.h:3677:5 */
-type PEMRSETVIEWPORTORGEX = uintptr               /* wingdi.h:3677:25 */
-type EMRSETWINDOWORGEX = tagEMRSETVIEWPORTORGEX   /* wingdi.h:3677:47 */
-type PEMRSETWINDOWORGEX = uintptr                 /* wingdi.h:3677:65 */
-type EMRSETBRUSHORGEX = tagEMRSETVIEWPORTORGEX    /* wingdi.h:3677:85 */
-type PEMRSETBRUSHORGEX = uintptr                  /* wingdi.h:3677:102 */
+type EMRSETVIEWPORTORGEX = tagEMRSETVIEWPORTORGEX /* wingdi.h:3791:5 */
+type PEMRSETVIEWPORTORGEX = uintptr               /* wingdi.h:3791:25 */
+type EMRSETWINDOWORGEX = tagEMRSETVIEWPORTORGEX   /* wingdi.h:3791:47 */
+type PEMRSETWINDOWORGEX = uintptr                 /* wingdi.h:3791:65 */
+type EMRSETBRUSHORGEX = tagEMRSETVIEWPORTORGEX    /* wingdi.h:3791:85 */
+type PEMRSETBRUSHORGEX = uintptr                  /* wingdi.h:3791:102 */
 
 type tagEMRSETVIEWPORTEXTEX = struct {
 	Femr       EMR
 	FszlExtent SIZEL
-} /* wingdi.h:3679:11 */
+} /* wingdi.h:3793:11 */
 
-type EMRSETVIEWPORTEXTEX = tagEMRSETVIEWPORTEXTEX /* wingdi.h:3682:5 */
-type PEMRSETVIEWPORTEXTEX = uintptr               /* wingdi.h:3682:25 */
-type EMRSETWINDOWEXTEX = tagEMRSETVIEWPORTEXTEX   /* wingdi.h:3682:47 */
-type PEMRSETWINDOWEXTEX = uintptr                 /* wingdi.h:3682:65 */
+type EMRSETVIEWPORTEXTEX = tagEMRSETVIEWPORTEXTEX /* wingdi.h:3796:5 */
+type PEMRSETVIEWPORTEXTEX = uintptr               /* wingdi.h:3796:25 */
+type EMRSETWINDOWEXTEX = tagEMRSETVIEWPORTEXTEX   /* wingdi.h:3796:47 */
+type PEMRSETWINDOWEXTEX = uintptr                 /* wingdi.h:3796:65 */
 
 type tagEMRSCALEVIEWPORTEXTEX = struct {
 	Femr    EMR
@@ -39702,83 +40199,83 @@ type tagEMRSCALEVIEWPORTEXTEX = struct {
 	FxDenom LONG
 	FyNum   LONG
 	FyDenom LONG
-} /* wingdi.h:3684:11 */
+} /* wingdi.h:3798:11 */
 
-type EMRSCALEVIEWPORTEXTEX = tagEMRSCALEVIEWPORTEXTEX /* wingdi.h:3690:5 */
-type PEMRSCALEVIEWPORTEXTEX = uintptr                 /* wingdi.h:3690:27 */
-type EMRSCALEWINDOWEXTEX = tagEMRSCALEVIEWPORTEXTEX   /* wingdi.h:3690:51 */
-type PEMRSCALEWINDOWEXTEX = uintptr                   /* wingdi.h:3690:71 */
+type EMRSCALEVIEWPORTEXTEX = tagEMRSCALEVIEWPORTEXTEX /* wingdi.h:3804:5 */
+type PEMRSCALEVIEWPORTEXTEX = uintptr                 /* wingdi.h:3804:27 */
+type EMRSCALEWINDOWEXTEX = tagEMRSCALEVIEWPORTEXTEX   /* wingdi.h:3804:51 */
+type PEMRSCALEWINDOWEXTEX = uintptr                   /* wingdi.h:3804:71 */
 
 type tagEMRSETWORLDTRANSFORM = struct {
 	Femr   EMR
 	Fxform XFORM
-} /* wingdi.h:3692:11 */
+} /* wingdi.h:3806:11 */
 
-type EMRSETWORLDTRANSFORM = tagEMRSETWORLDTRANSFORM /* wingdi.h:3695:5 */
-type PEMRSETWORLDTRANSFORM = uintptr                /* wingdi.h:3695:26 */
+type EMRSETWORLDTRANSFORM = tagEMRSETWORLDTRANSFORM /* wingdi.h:3809:5 */
+type PEMRSETWORLDTRANSFORM = uintptr                /* wingdi.h:3809:26 */
 
 type tagEMRMODIFYWORLDTRANSFORM = struct {
 	Femr   EMR
 	Fxform XFORM
 	FiMode DWORD
-} /* wingdi.h:3697:11 */
+} /* wingdi.h:3811:11 */
 
-type EMRMODIFYWORLDTRANSFORM = tagEMRMODIFYWORLDTRANSFORM /* wingdi.h:3701:5 */
-type PEMRMODIFYWORLDTRANSFORM = uintptr                   /* wingdi.h:3701:29 */
+type EMRMODIFYWORLDTRANSFORM = tagEMRMODIFYWORLDTRANSFORM /* wingdi.h:3815:5 */
+type PEMRMODIFYWORLDTRANSFORM = uintptr                   /* wingdi.h:3815:29 */
 
 type tagEMRSETPIXELV = struct {
 	Femr      EMR
 	FptlPixel POINTL
 	FcrColor  COLORREF
-} /* wingdi.h:3703:11 */
+} /* wingdi.h:3817:11 */
 
-type EMRSETPIXELV = tagEMRSETPIXELV /* wingdi.h:3707:5 */
-type PEMRSETPIXELV = uintptr        /* wingdi.h:3707:18 */
+type EMRSETPIXELV = tagEMRSETPIXELV /* wingdi.h:3821:5 */
+type PEMRSETPIXELV = uintptr        /* wingdi.h:3821:18 */
 
 type tagEMREXTFLOODFILL = struct {
 	Femr      EMR
 	FptlStart POINTL
 	FcrColor  COLORREF
 	FiMode    DWORD
-} /* wingdi.h:3709:11 */
+} /* wingdi.h:3823:11 */
 
-type EMREXTFLOODFILL = tagEMREXTFLOODFILL /* wingdi.h:3714:5 */
-type PEMREXTFLOODFILL = uintptr           /* wingdi.h:3714:21 */
+type EMREXTFLOODFILL = tagEMREXTFLOODFILL /* wingdi.h:3828:5 */
+type PEMREXTFLOODFILL = uintptr           /* wingdi.h:3828:21 */
 
 type tagEMRELLIPSE = struct {
 	Femr    EMR
 	FrclBox RECTL
-} /* wingdi.h:3716:11 */
+} /* wingdi.h:3830:11 */
 
-type EMRELLIPSE = tagEMRELLIPSE   /* wingdi.h:3719:5 */
-type PEMRELLIPSE = uintptr        /* wingdi.h:3719:16 */
-type EMRRECTANGLE = tagEMRELLIPSE /* wingdi.h:3719:29 */
-type PEMRRECTANGLE = uintptr      /* wingdi.h:3719:42 */
+type EMRELLIPSE = tagEMRELLIPSE   /* wingdi.h:3833:5 */
+type PEMRELLIPSE = uintptr        /* wingdi.h:3833:16 */
+type EMRRECTANGLE = tagEMRELLIPSE /* wingdi.h:3833:29 */
+type PEMRRECTANGLE = uintptr      /* wingdi.h:3833:42 */
 
 type tagEMRROUNDRECT = struct {
 	Femr       EMR
 	FrclBox    RECTL
 	FszlCorner SIZEL
-} /* wingdi.h:3721:11 */
+} /* wingdi.h:3835:11 */
 
-type EMRROUNDRECT = tagEMRROUNDRECT /* wingdi.h:3725:5 */
-type PEMRROUNDRECT = uintptr        /* wingdi.h:3725:18 */
+type EMRROUNDRECT = tagEMRROUNDRECT /* wingdi.h:3839:5 */
+type PEMRROUNDRECT = uintptr        /* wingdi.h:3839:18 */
 
 type tagEMRARC = struct {
 	Femr      EMR
 	FrclBox   RECTL
 	FptlStart POINTL
 	FptlEnd   POINTL
-} /* wingdi.h:3727:11 */
+} /* wingdi.h:3841:11 */
 
-type EMRARC = tagEMRARC   /* wingdi.h:3732:5 */
-type PEMRARC = uintptr    /* wingdi.h:3732:12 */
-type EMRARCTO = tagEMRARC /* wingdi.h:3732:21 */
-type PEMRARCTO = uintptr  /* wingdi.h:3732:30 */
-type EMRCHORD = tagEMRARC /* wingdi.h:3732:41 */
-type PEMRCHORD = uintptr  /* wingdi.h:3732:50 */
-type EMRPIE = tagEMRARC   /* wingdi.h:3732:61 */
-type PEMRPIE = uintptr    /* wingdi.h:3732:68 */
+type EMRARC = tagEMRARC   /* wingdi.h:3846:5 */
+type PEMRARC = uintptr    /* wingdi.h:3846:12 */
+type EMRARCTO = tagEMRARC /* wingdi.h:3846:21 */
+type PEMRARCTO = uintptr  /* wingdi.h:3846:30 */
+type EMRCHORD = tagEMRARC /* wingdi.h:3846:41 */
+type PEMRCHORD = uintptr  /* wingdi.h:3846:50 */
+type EMRPIE = tagEMRARC   /* wingdi.h:3846:61 */
+type PEMRPIE = uintptr    /* wingdi.h:3846:68 */
 
 type tagEMRANGLEARC = struct {
 	Femr         EMR
@@ -39786,70 +40283,70 @@ type tagEMRANGLEARC = struct {
 	FnRadius     DWORD
 	FeStartAngle FLOAT
 	FeSweepAngle FLOAT
-} /* wingdi.h:3734:11 */
+} /* wingdi.h:3848:11 */
 
-type EMRANGLEARC = tagEMRANGLEARC /* wingdi.h:3740:5 */
-type PEMRANGLEARC = uintptr       /* wingdi.h:3740:17 */
+type EMRANGLEARC = tagEMRANGLEARC /* wingdi.h:3854:5 */
+type PEMRANGLEARC = uintptr       /* wingdi.h:3854:17 */
 
 type tagEMRPOLYLINE = struct {
 	Femr       EMR
 	FrclBounds RECTL
 	Fcptl      DWORD
 	Faptl      [1]POINTL
-} /* wingdi.h:3742:11 */
-
-type EMRPOLYLINE = tagEMRPOLYLINE     /* wingdi.h:3747:5 */
-type PEMRPOLYLINE = uintptr           /* wingdi.h:3747:17 */
-type EMRPOLYBEZIER = tagEMRPOLYLINE   /* wingdi.h:3747:31 */
-type PEMRPOLYBEZIER = uintptr         /* wingdi.h:3747:45 */
-type EMRPOLYGON = tagEMRPOLYLINE      /* wingdi.h:3747:61 */
-type PEMRPOLYGON = uintptr            /* wingdi.h:3747:72 */
-type EMRPOLYBEZIERTO = tagEMRPOLYLINE /* wingdi.h:3747:85 */
-type PEMRPOLYBEZIERTO = uintptr       /* wingdi.h:3747:101 */
-type EMRPOLYLINETO = tagEMRPOLYLINE   /* wingdi.h:3747:119 */
-type PEMRPOLYLINETO = uintptr         /* wingdi.h:3747:133 */
+} /* wingdi.h:3856:11 */
+
+type EMRPOLYLINE = tagEMRPOLYLINE     /* wingdi.h:3861:5 */
+type PEMRPOLYLINE = uintptr           /* wingdi.h:3861:17 */
+type EMRPOLYBEZIER = tagEMRPOLYLINE   /* wingdi.h:3861:31 */
+type PEMRPOLYBEZIER = uintptr         /* wingdi.h:3861:45 */
+type EMRPOLYGON = tagEMRPOLYLINE      /* wingdi.h:3861:61 */
+type PEMRPOLYGON = uintptr            /* wingdi.h:3861:72 */
+type EMRPOLYBEZIERTO = tagEMRPOLYLINE /* wingdi.h:3861:85 */
+type PEMRPOLYBEZIERTO = uintptr       /* wingdi.h:3861:101 */
+type EMRPOLYLINETO = tagEMRPOLYLINE   /* wingdi.h:3861:119 */
+type PEMRPOLYLINETO = uintptr         /* wingdi.h:3861:133 */
 
 type tagEMRPOLYLINE16 = struct {
 	Femr       EMR
 	FrclBounds RECTL
 	Fcpts      DWORD
 	Fapts      [1]POINTS
-} /* wingdi.h:3749:11 */
-
-type EMRPOLYLINE16 = tagEMRPOLYLINE16     /* wingdi.h:3754:5 */
-type PEMRPOLYLINE16 = uintptr             /* wingdi.h:3754:19 */
-type EMRPOLYBEZIER16 = tagEMRPOLYLINE16   /* wingdi.h:3754:35 */
-type PEMRPOLYBEZIER16 = uintptr           /* wingdi.h:3754:51 */
-type EMRPOLYGON16 = tagEMRPOLYLINE16      /* wingdi.h:3754:69 */
-type PEMRPOLYGON16 = uintptr              /* wingdi.h:3754:82 */
-type EMRPOLYBEZIERTO16 = tagEMRPOLYLINE16 /* wingdi.h:3754:97 */
-type PEMRPOLYBEZIERTO16 = uintptr         /* wingdi.h:3754:115 */
-type EMRPOLYLINETO16 = tagEMRPOLYLINE16   /* wingdi.h:3754:135 */
-type PEMRPOLYLINETO16 = uintptr           /* wingdi.h:3754:151 */
+} /* wingdi.h:3863:11 */
+
+type EMRPOLYLINE16 = tagEMRPOLYLINE16     /* wingdi.h:3868:5 */
+type PEMRPOLYLINE16 = uintptr             /* wingdi.h:3868:19 */
+type EMRPOLYBEZIER16 = tagEMRPOLYLINE16   /* wingdi.h:3868:35 */
+type PEMRPOLYBEZIER16 = uintptr           /* wingdi.h:3868:51 */
+type EMRPOLYGON16 = tagEMRPOLYLINE16      /* wingdi.h:3868:69 */
+type PEMRPOLYGON16 = uintptr              /* wingdi.h:3868:82 */
+type EMRPOLYBEZIERTO16 = tagEMRPOLYLINE16 /* wingdi.h:3868:97 */
+type PEMRPOLYBEZIERTO16 = uintptr         /* wingdi.h:3868:115 */
+type EMRPOLYLINETO16 = tagEMRPOLYLINE16   /* wingdi.h:3868:135 */
+type PEMRPOLYLINETO16 = uintptr           /* wingdi.h:3868:151 */
 
 type tagEMRPOLYDRAW = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	Fcptl      DWORD
-	Faptl      [1]POINTL
-	FabTypes   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3756:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	Fcptl        DWORD
+	Faptl        [1]POINTL
+	FabTypes     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3870:11 */
 
-type EMRPOLYDRAW = tagEMRPOLYDRAW /* wingdi.h:3762:5 */
-type PEMRPOLYDRAW = uintptr       /* wingdi.h:3762:17 */
+type EMRPOLYDRAW = tagEMRPOLYDRAW /* wingdi.h:3876:5 */
+type PEMRPOLYDRAW = uintptr       /* wingdi.h:3876:17 */
 
 type tagEMRPOLYDRAW16 = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	Fcpts      DWORD
-	Fapts      [1]POINTS
-	FabTypes   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3764:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	Fcpts        DWORD
+	Fapts        [1]POINTS
+	FabTypes     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3878:11 */
 
-type EMRPOLYDRAW16 = tagEMRPOLYDRAW16 /* wingdi.h:3770:5 */
-type PEMRPOLYDRAW16 = uintptr         /* wingdi.h:3770:19 */
+type EMRPOLYDRAW16 = tagEMRPOLYDRAW16 /* wingdi.h:3884:5 */
+type PEMRPOLYDRAW16 = uintptr         /* wingdi.h:3884:19 */
 
 type tagEMRPOLYPOLYLINE = struct {
 	Femr         EMR
@@ -39858,12 +40355,12 @@ type tagEMRPOLYPOLYLINE = struct {
 	Fcptl        DWORD
 	FaPolyCounts [1]DWORD
 	Faptl        [1]POINTL
-} /* wingdi.h:3772:11 */
+} /* wingdi.h:3886:11 */
 
-type EMRPOLYPOLYLINE = tagEMRPOLYPOLYLINE /* wingdi.h:3779:5 */
-type PEMRPOLYPOLYLINE = uintptr           /* wingdi.h:3779:21 */
-type EMRPOLYPOLYGON = tagEMRPOLYPOLYLINE  /* wingdi.h:3779:39 */
-type PEMRPOLYPOLYGON = uintptr            /* wingdi.h:3779:54 */
+type EMRPOLYPOLYLINE = tagEMRPOLYPOLYLINE /* wingdi.h:3893:5 */
+type PEMRPOLYPOLYLINE = uintptr           /* wingdi.h:3893:21 */
+type EMRPOLYPOLYGON = tagEMRPOLYPOLYLINE  /* wingdi.h:3893:39 */
+type PEMRPOLYPOLYGON = uintptr            /* wingdi.h:3893:54 */
 
 type tagEMRPOLYPOLYLINE16 = struct {
 	Femr         EMR
@@ -39872,61 +40369,61 @@ type tagEMRPOLYPOLYLINE16 = struct {
 	Fcpts        DWORD
 	FaPolyCounts [1]DWORD
 	Fapts        [1]POINTS
-} /* wingdi.h:3781:11 */
+} /* wingdi.h:3895:11 */
 
-type EMRPOLYPOLYLINE16 = tagEMRPOLYPOLYLINE16 /* wingdi.h:3788:5 */
-type PEMRPOLYPOLYLINE16 = uintptr             /* wingdi.h:3788:23 */
-type EMRPOLYPOLYGON16 = tagEMRPOLYPOLYLINE16  /* wingdi.h:3788:43 */
-type PEMRPOLYPOLYGON16 = uintptr              /* wingdi.h:3788:60 */
+type EMRPOLYPOLYLINE16 = tagEMRPOLYPOLYLINE16 /* wingdi.h:3902:5 */
+type PEMRPOLYPOLYLINE16 = uintptr             /* wingdi.h:3902:23 */
+type EMRPOLYPOLYGON16 = tagEMRPOLYPOLYLINE16  /* wingdi.h:3902:43 */
+type PEMRPOLYPOLYGON16 = uintptr              /* wingdi.h:3902:60 */
 
 type tagEMRINVERTRGN = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	FcbRgnData DWORD
-	FRgnData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3790:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	FcbRgnData   DWORD
+	FRgnData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3904:11 */
 
-type EMRINVERTRGN = tagEMRINVERTRGN /* wingdi.h:3795:5 */
-type PEMRINVERTRGN = uintptr        /* wingdi.h:3795:18 */
-type EMRPAINTRGN = tagEMRINVERTRGN  /* wingdi.h:3795:33 */
-type PEMRPAINTRGN = uintptr         /* wingdi.h:3795:45 */
+type EMRINVERTRGN = tagEMRINVERTRGN /* wingdi.h:3909:5 */
+type PEMRINVERTRGN = uintptr        /* wingdi.h:3909:18 */
+type EMRPAINTRGN = tagEMRINVERTRGN  /* wingdi.h:3909:33 */
+type PEMRPAINTRGN = uintptr         /* wingdi.h:3909:45 */
 
 type tagEMRFILLRGN = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	FcbRgnData DWORD
-	FihBrush   DWORD
-	FRgnData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3797:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	FcbRgnData   DWORD
+	FihBrush     DWORD
+	FRgnData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3911:11 */
 
-type EMRFILLRGN = tagEMRFILLRGN /* wingdi.h:3803:5 */
-type PEMRFILLRGN = uintptr      /* wingdi.h:3803:16 */
+type EMRFILLRGN = tagEMRFILLRGN /* wingdi.h:3917:5 */
+type PEMRFILLRGN = uintptr      /* wingdi.h:3917:16 */
 
 type tagEMRFRAMERGN = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	FcbRgnData DWORD
-	FihBrush   DWORD
-	FszlStroke SIZEL
-	FRgnData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3805:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	FcbRgnData   DWORD
+	FihBrush     DWORD
+	FszlStroke   SIZEL
+	FRgnData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3919:11 */
 
-type EMRFRAMERGN = tagEMRFRAMERGN /* wingdi.h:3812:5 */
-type PEMRFRAMERGN = uintptr       /* wingdi.h:3812:17 */
+type EMRFRAMERGN = tagEMRFRAMERGN /* wingdi.h:3926:5 */
+type PEMRFRAMERGN = uintptr       /* wingdi.h:3926:17 */
 
 type tagEMREXTSELECTCLIPRGN = struct {
-	Femr       EMR
-	FcbRgnData DWORD
-	FiMode     DWORD
-	FRgnData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:3814:11 */
+	Femr         EMR
+	FcbRgnData   DWORD
+	FiMode       DWORD
+	FRgnData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:3928:11 */
 
-type EMREXTSELECTCLIPRGN = tagEMREXTSELECTCLIPRGN /* wingdi.h:3819:5 */
-type PEMREXTSELECTCLIPRGN = uintptr               /* wingdi.h:3819:25 */
+type EMREXTSELECTCLIPRGN = tagEMREXTSELECTCLIPRGN /* wingdi.h:3933:5 */
+type PEMREXTSELECTCLIPRGN = uintptr               /* wingdi.h:3933:25 */
 
 type tagEMREXTTEXTOUTA = struct {
 	Femr           EMR
@@ -39935,12 +40432,12 @@ type tagEMREXTTEXTOUTA = struct {
 	FexScale       FLOAT
 	FeyScale       FLOAT
 	Femrtext       EMRTEXT
-} /* wingdi.h:3821:11 */
+} /* wingdi.h:3935:11 */
 
-type EMREXTTEXTOUTA = tagEMREXTTEXTOUTA /* wingdi.h:3828:5 */
-type PEMREXTTEXTOUTA = uintptr          /* wingdi.h:3828:20 */
-type EMREXTTEXTOUTW = tagEMREXTTEXTOUTA /* wingdi.h:3828:37 */
-type PEMREXTTEXTOUTW = uintptr          /* wingdi.h:3828:52 */
+type EMREXTTEXTOUTA = tagEMREXTTEXTOUTA /* wingdi.h:3942:5 */
+type PEMREXTTEXTOUTA = uintptr          /* wingdi.h:3942:20 */
+type EMREXTTEXTOUTW = tagEMREXTTEXTOUTA /* wingdi.h:3942:37 */
+type PEMREXTTEXTOUTW = uintptr          /* wingdi.h:3942:52 */
 
 type tagEMRPOLYTEXTOUTA = struct {
 	Femr           EMR
@@ -39950,12 +40447,12 @@ type tagEMRPOLYTEXTOUTA = struct {
 	FeyScale       FLOAT
 	FcStrings      LONG
 	Faemrtext      [1]EMRTEXT
-} /* wingdi.h:3830:11 */
+} /* wingdi.h:3944:11 */
 
-type EMRPOLYTEXTOUTA = tagEMRPOLYTEXTOUTA /* wingdi.h:3838:5 */
-type PEMRPOLYTEXTOUTA = uintptr           /* wingdi.h:3838:21 */
-type EMRPOLYTEXTOUTW = tagEMRPOLYTEXTOUTA /* wingdi.h:3838:39 */
-type PEMRPOLYTEXTOUTW = uintptr           /* wingdi.h:3838:55 */
+type EMRPOLYTEXTOUTA = tagEMRPOLYTEXTOUTA /* wingdi.h:3952:5 */
+type PEMRPOLYTEXTOUTA = uintptr           /* wingdi.h:3952:21 */
+type EMRPOLYTEXTOUTW = tagEMRPOLYTEXTOUTA /* wingdi.h:3952:39 */
+type PEMRPOLYTEXTOUTW = uintptr           /* wingdi.h:3952:55 */
 
 type tagEMRBITBLT = struct {
 	Femr          EMR
@@ -39974,10 +40471,10 @@ type tagEMRBITBLT = struct {
 	FcbBmiSrc     DWORD
 	FoffBitsSrc   DWORD
 	FcbBitsSrc    DWORD
-} /* wingdi.h:3840:11 */
+} /* wingdi.h:3954:11 */
 
-type EMRBITBLT = tagEMRBITBLT /* wingdi.h:3857:5 */
-type PEMRBITBLT = uintptr     /* wingdi.h:3857:15 */
+type EMRBITBLT = tagEMRBITBLT /* wingdi.h:3971:5 */
+type PEMRBITBLT = uintptr     /* wingdi.h:3971:15 */
 
 type tagEMRSTRETCHBLT = struct {
 	Femr          EMR
@@ -39998,10 +40495,10 @@ type tagEMRSTRETCHBLT = struct {
 	FcbBitsSrc    DWORD
 	FcxSrc        LONG
 	FcySrc        LONG
-} /* wingdi.h:3859:11 */
+} /* wingdi.h:3973:11 */
 
-type EMRSTRETCHBLT = tagEMRSTRETCHBLT /* wingdi.h:3878:5 */
-type PEMRSTRETCHBLT = uintptr         /* wingdi.h:3878:19 */
+type EMRSTRETCHBLT = tagEMRSTRETCHBLT /* wingdi.h:3992:5 */
+type PEMRSTRETCHBLT = uintptr         /* wingdi.h:3992:19 */
 
 type tagEMRMASKBLT = struct {
 	Femr          EMR
@@ -40027,10 +40524,10 @@ type tagEMRMASKBLT = struct {
 	FcbBmiMask    DWORD
 	FoffBitsMask  DWORD
 	FcbBitsMask   DWORD
-} /* wingdi.h:3880:11 */
+} /* wingdi.h:3994:11 */
 
-type EMRMASKBLT = tagEMRMASKBLT /* wingdi.h:3904:5 */
-type PEMRMASKBLT = uintptr      /* wingdi.h:3904:16 */
+type EMRMASKBLT = tagEMRMASKBLT /* wingdi.h:4018:5 */
+type PEMRMASKBLT = uintptr      /* wingdi.h:4018:16 */
 
 type tagEMRPLGBLT = struct {
 	Femr          EMR
@@ -40054,10 +40551,10 @@ type tagEMRPLGBLT = struct {
 	FcbBmiMask    DWORD
 	FoffBitsMask  DWORD
 	FcbBitsMask   DWORD
-} /* wingdi.h:3906:11 */
+} /* wingdi.h:4020:11 */
 
-type EMRPLGBLT = tagEMRPLGBLT /* wingdi.h:3928:5 */
-type PEMRPLGBLT = uintptr     /* wingdi.h:3928:15 */
+type EMRPLGBLT = tagEMRPLGBLT /* wingdi.h:4042:5 */
+type PEMRPLGBLT = uintptr     /* wingdi.h:4042:15 */
 
 type tagEMRSETDIBITSTODEVICE = struct {
 	Femr        EMR
@@ -40075,10 +40572,10 @@ type tagEMRSETDIBITSTODEVICE = struct {
 	FiUsageSrc  DWORD
 	FiStartScan DWORD
 	FcScans     DWORD
-} /* wingdi.h:3930:11 */
+} /* wingdi.h:4044:11 */
 
-type EMRSETDIBITSTODEVICE = tagEMRSETDIBITSTODEVICE /* wingdi.h:3946:5 */
-type PEMRSETDIBITSTODEVICE = uintptr                /* wingdi.h:3946:26 */
+type EMRSETDIBITSTODEVICE = tagEMRSETDIBITSTODEVICE /* wingdi.h:4060:5 */
+type PEMRSETDIBITSTODEVICE = uintptr                /* wingdi.h:4060:26 */
 
 type tagEMRSTRETCHDIBITS = struct {
 	Femr        EMR
@@ -40097,60 +40594,60 @@ type tagEMRSTRETCHDIBITS = struct {
 	FdwRop      DWORD
 	FcxDest     LONG
 	FcyDest     LONG
-} /* wingdi.h:3948:11 */
+} /* wingdi.h:4062:11 */
 
-type EMRSTRETCHDIBITS = tagEMRSTRETCHDIBITS /* wingdi.h:3965:5 */
-type PEMRSTRETCHDIBITS = uintptr            /* wingdi.h:3965:22 */
+type EMRSTRETCHDIBITS = tagEMRSTRETCHDIBITS /* wingdi.h:4079:5 */
+type PEMRSTRETCHDIBITS = uintptr            /* wingdi.h:4079:22 */
 
 type tagEMREXTCREATEFONTINDIRECTW = struct {
 	Femr    EMR
 	FihFont DWORD
 	Felfw   EXTLOGFONTW
-} /* wingdi.h:3967:11 */
+} /* wingdi.h:4081:11 */
 
-type EMREXTCREATEFONTINDIRECTW = tagEMREXTCREATEFONTINDIRECTW /* wingdi.h:3971:5 */
-type PEMREXTCREATEFONTINDIRECTW = uintptr                     /* wingdi.h:3971:31 */
+type EMREXTCREATEFONTINDIRECTW = tagEMREXTCREATEFONTINDIRECTW /* wingdi.h:4085:5 */
+type PEMREXTCREATEFONTINDIRECTW = uintptr                     /* wingdi.h:4085:31 */
 
 type tagEMRCREATEPALETTE = struct {
 	Femr   EMR
 	FihPal DWORD
 	Flgpl  LOGPALETTE
-} /* wingdi.h:3973:11 */
+} /* wingdi.h:4087:11 */
 
-type EMRCREATEPALETTE = tagEMRCREATEPALETTE /* wingdi.h:3977:5 */
-type PEMRCREATEPALETTE = uintptr            /* wingdi.h:3977:22 */
+type EMRCREATEPALETTE = tagEMRCREATEPALETTE /* wingdi.h:4091:5 */
+type PEMRCREATEPALETTE = uintptr            /* wingdi.h:4091:22 */
 
 type tagEMRCREATEPEN = struct {
 	Femr   EMR
 	FihPen DWORD
 	Flopn  LOGPEN
-} /* wingdi.h:3979:11 */
+} /* wingdi.h:4093:11 */
 
-type EMRCREATEPEN = tagEMRCREATEPEN /* wingdi.h:3983:5 */
-type PEMRCREATEPEN = uintptr        /* wingdi.h:3983:18 */
+type EMRCREATEPEN = tagEMRCREATEPEN /* wingdi.h:4097:5 */
+type PEMRCREATEPEN = uintptr        /* wingdi.h:4097:18 */
 
 type tagEMREXTCREATEPEN = struct {
-	Femr     EMR
-	FihPen   DWORD
-	FoffBmi  DWORD
-	FcbBmi   DWORD
-	FoffBits DWORD
-	FcbBits  DWORD
-	_        [4]byte
-	Felp     EXTLOGPEN
-} /* wingdi.h:3985:11 */
-
-type EMREXTCREATEPEN = tagEMREXTCREATEPEN /* wingdi.h:3993:5 */
-type PEMREXTCREATEPEN = uintptr           /* wingdi.h:3993:21 */
+	Femr         EMR
+	FihPen       DWORD
+	FoffBmi      DWORD
+	FcbBmi       DWORD
+	FoffBits     DWORD
+	FcbBits      DWORD
+	F__ccgo_pad1 [4]byte
+	Felp         EXTLOGPEN
+} /* wingdi.h:4099:11 */
+
+type EMREXTCREATEPEN = tagEMREXTCREATEPEN /* wingdi.h:4107:5 */
+type PEMREXTCREATEPEN = uintptr           /* wingdi.h:4107:21 */
 
 type tagEMRCREATEBRUSHINDIRECT = struct {
 	Femr     EMR
 	FihBrush DWORD
 	Flb      LOGBRUSH32
-} /* wingdi.h:3995:11 */
+} /* wingdi.h:4109:11 */
 
-type EMRCREATEBRUSHINDIRECT = tagEMRCREATEBRUSHINDIRECT /* wingdi.h:3999:5 */
-type PEMRCREATEBRUSHINDIRECT = uintptr                  /* wingdi.h:3999:28 */
+type EMRCREATEBRUSHINDIRECT = tagEMRCREATEBRUSHINDIRECT /* wingdi.h:4113:5 */
+type PEMRCREATEBRUSHINDIRECT = uintptr                  /* wingdi.h:4113:28 */
 
 type tagEMRCREATEMONOBRUSH = struct {
 	Femr     EMR
@@ -40160,10 +40657,10 @@ type tagEMRCREATEMONOBRUSH = struct {
 	FcbBmi   DWORD
 	FoffBits DWORD
 	FcbBits  DWORD
-} /* wingdi.h:4001:11 */
+} /* wingdi.h:4115:11 */
 
-type EMRCREATEMONOBRUSH = tagEMRCREATEMONOBRUSH /* wingdi.h:4009:5 */
-type PEMRCREATEMONOBRUSH = uintptr              /* wingdi.h:4009:24 */
+type EMRCREATEMONOBRUSH = tagEMRCREATEMONOBRUSH /* wingdi.h:4123:5 */
+type PEMRCREATEMONOBRUSH = uintptr              /* wingdi.h:4123:24 */
 
 type tagEMRCREATEDIBPATTERNBRUSHPT = struct {
 	Femr     EMR
@@ -40173,137 +40670,137 @@ type tagEMRCREATEDIBPATTERNBRUSHPT = struct {
 	FcbBmi   DWORD
 	FoffBits DWORD
 	FcbBits  DWORD
-} /* wingdi.h:4011:11 */
+} /* wingdi.h:4125:11 */
 
-type EMRCREATEDIBPATTERNBRUSHPT = tagEMRCREATEDIBPATTERNBRUSHPT /* wingdi.h:4019:5 */
-type PEMRCREATEDIBPATTERNBRUSHPT = uintptr                      /* wingdi.h:4019:32 */
+type EMRCREATEDIBPATTERNBRUSHPT = tagEMRCREATEDIBPATTERNBRUSHPT /* wingdi.h:4133:5 */
+type PEMRCREATEDIBPATTERNBRUSHPT = uintptr                      /* wingdi.h:4133:32 */
 
 type tagEMRFORMAT = struct {
 	FdSignature DWORD
 	FnVersion   DWORD
 	FcbData     DWORD
 	FoffData    DWORD
-} /* wingdi.h:4021:11 */
+} /* wingdi.h:4135:11 */
 
-type EMRFORMAT = tagEMRFORMAT /* wingdi.h:4026:5 */
-type PEMRFORMAT = uintptr     /* wingdi.h:4026:15 */
+type EMRFORMAT = tagEMRFORMAT /* wingdi.h:4140:5 */
+type PEMRFORMAT = uintptr     /* wingdi.h:4140:15 */
 
 type tagEMRGLSRECORD = struct {
-	Femr    EMR
-	FcbData DWORD
-	FData   [1]BYTE
-	_       [3]byte
-} /* wingdi.h:4028:11 */
+	Femr         EMR
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4142:11 */
 
-type EMRGLSRECORD = tagEMRGLSRECORD /* wingdi.h:4032:5 */
-type PEMRGLSRECORD = uintptr        /* wingdi.h:4032:18 */
+type EMRGLSRECORD = tagEMRGLSRECORD /* wingdi.h:4146:5 */
+type PEMRGLSRECORD = uintptr        /* wingdi.h:4146:18 */
 
 type tagEMRGLSBOUNDEDRECORD = struct {
-	Femr       EMR
-	FrclBounds RECTL
-	FcbData    DWORD
-	FData      [1]BYTE
-	_          [3]byte
-} /* wingdi.h:4034:11 */
+	Femr         EMR
+	FrclBounds   RECTL
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4148:11 */
 
-type EMRGLSBOUNDEDRECORD = tagEMRGLSBOUNDEDRECORD /* wingdi.h:4039:5 */
-type PEMRGLSBOUNDEDRECORD = uintptr               /* wingdi.h:4039:25 */
+type EMRGLSBOUNDEDRECORD = tagEMRGLSBOUNDEDRECORD /* wingdi.h:4153:5 */
+type PEMRGLSBOUNDEDRECORD = uintptr               /* wingdi.h:4153:25 */
 
 type tagEMRPIXELFORMAT = struct {
 	Femr EMR
 	Fpfd PIXELFORMATDESCRIPTOR
-} /* wingdi.h:4041:11 */
+} /* wingdi.h:4155:11 */
 
-type EMRPIXELFORMAT = tagEMRPIXELFORMAT /* wingdi.h:4044:5 */
-type PEMRPIXELFORMAT = uintptr          /* wingdi.h:4044:20 */
+type EMRPIXELFORMAT = tagEMRPIXELFORMAT /* wingdi.h:4158:5 */
+type PEMRPIXELFORMAT = uintptr          /* wingdi.h:4158:20 */
 
 type tagEMRCREATECOLORSPACE = struct {
 	Femr  EMR
 	FihCS DWORD
 	Flcs  LOGCOLORSPACEA
-} /* wingdi.h:4046:11 */
+} /* wingdi.h:4160:11 */
 
-type EMRCREATECOLORSPACE = tagEMRCREATECOLORSPACE /* wingdi.h:4050:5 */
-type PEMRCREATECOLORSPACE = uintptr               /* wingdi.h:4050:25 */
+type EMRCREATECOLORSPACE = tagEMRCREATECOLORSPACE /* wingdi.h:4164:5 */
+type PEMRCREATECOLORSPACE = uintptr               /* wingdi.h:4164:25 */
 
 type tagEMRSETCOLORSPACE = struct {
 	Femr  EMR
 	FihCS DWORD
-} /* wingdi.h:4052:11 */
+} /* wingdi.h:4166:11 */
 
-type EMRSETCOLORSPACE = tagEMRSETCOLORSPACE    /* wingdi.h:4055:5 */
-type PEMRSETCOLORSPACE = uintptr               /* wingdi.h:4055:22 */
-type EMRSELECTCOLORSPACE = tagEMRSETCOLORSPACE /* wingdi.h:4055:41 */
-type PEMRSELECTCOLORSPACE = uintptr            /* wingdi.h:4055:61 */
-type EMRDELETECOLORSPACE = tagEMRSETCOLORSPACE /* wingdi.h:4055:83 */
-type PEMRDELETECOLORSPACE = uintptr            /* wingdi.h:4055:103 */
+type EMRSETCOLORSPACE = tagEMRSETCOLORSPACE    /* wingdi.h:4169:5 */
+type PEMRSETCOLORSPACE = uintptr               /* wingdi.h:4169:22 */
+type EMRSELECTCOLORSPACE = tagEMRSETCOLORSPACE /* wingdi.h:4169:41 */
+type PEMRSELECTCOLORSPACE = uintptr            /* wingdi.h:4169:61 */
+type EMRDELETECOLORSPACE = tagEMRSETCOLORSPACE /* wingdi.h:4169:83 */
+type PEMRDELETECOLORSPACE = uintptr            /* wingdi.h:4169:103 */
 
 type tagEMREXTESCAPE = struct {
-	Femr       EMR
-	FiEscape   INT
-	FcbEscData INT
-	FEscData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:4057:11 */
+	Femr         EMR
+	FiEscape     INT
+	FcbEscData   INT
+	FEscData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4171:11 */
 
-type EMREXTESCAPE = tagEMREXTESCAPE  /* wingdi.h:4062:5 */
-type PEMREXTESCAPE = uintptr         /* wingdi.h:4062:18 */
-type EMRDRAWESCAPE = tagEMREXTESCAPE /* wingdi.h:4062:33 */
-type PEMRDRAWESCAPE = uintptr        /* wingdi.h:4062:47 */
+type EMREXTESCAPE = tagEMREXTESCAPE  /* wingdi.h:4176:5 */
+type PEMREXTESCAPE = uintptr         /* wingdi.h:4176:18 */
+type EMRDRAWESCAPE = tagEMREXTESCAPE /* wingdi.h:4176:33 */
+type PEMRDRAWESCAPE = uintptr        /* wingdi.h:4176:47 */
 
 type tagEMRNAMEDESCAPE = struct {
-	Femr       EMR
-	FiEscape   INT
-	FcbDriver  INT
-	FcbEscData INT
-	FEscData   [1]BYTE
-	_          [3]byte
-} /* wingdi.h:4064:11 */
+	Femr         EMR
+	FiEscape     INT
+	FcbDriver    INT
+	FcbEscData   INT
+	FEscData     [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4178:11 */
 
-type EMRNAMEDESCAPE = tagEMRNAMEDESCAPE /* wingdi.h:4070:5 */
-type PEMRNAMEDESCAPE = uintptr          /* wingdi.h:4070:20 */
+type EMRNAMEDESCAPE = tagEMRNAMEDESCAPE /* wingdi.h:4184:5 */
+type PEMRNAMEDESCAPE = uintptr          /* wingdi.h:4184:20 */
 
 type tagEMRSETICMPROFILE = struct {
-	Femr     EMR
-	FdwFlags DWORD
-	FcbName  DWORD
-	FcbData  DWORD
-	FData    [1]BYTE
-	_        [3]byte
-} /* wingdi.h:4074:11 */
-
-type EMRSETICMPROFILE = tagEMRSETICMPROFILE  /* wingdi.h:4080:5 */
-type PEMRSETICMPROFILE = uintptr             /* wingdi.h:4080:22 */
-type EMRSETICMPROFILEA = tagEMRSETICMPROFILE /* wingdi.h:4080:41 */
-type PEMRSETICMPROFILEA = uintptr            /* wingdi.h:4080:59 */
-type EMRSETICMPROFILEW = tagEMRSETICMPROFILE /* wingdi.h:4080:79 */
-type PEMRSETICMPROFILEW = uintptr            /* wingdi.h:4080:97 */
+	Femr         EMR
+	FdwFlags     DWORD
+	FcbName      DWORD
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4188:11 */
+
+type EMRSETICMPROFILE = tagEMRSETICMPROFILE  /* wingdi.h:4194:5 */
+type PEMRSETICMPROFILE = uintptr             /* wingdi.h:4194:22 */
+type EMRSETICMPROFILEA = tagEMRSETICMPROFILE /* wingdi.h:4194:41 */
+type PEMRSETICMPROFILEA = uintptr            /* wingdi.h:4194:59 */
+type EMRSETICMPROFILEW = tagEMRSETICMPROFILE /* wingdi.h:4194:79 */
+type PEMRSETICMPROFILEW = uintptr            /* wingdi.h:4194:97 */
 
 type tagEMRCREATECOLORSPACEW = struct {
-	Femr     EMR
-	FihCS    DWORD
-	Flcs     LOGCOLORSPACEW
-	FdwFlags DWORD
-	FcbData  DWORD
-	FData    [1]BYTE
-	_        [3]byte
-} /* wingdi.h:4084:11 */
+	Femr         EMR
+	FihCS        DWORD
+	Flcs         LOGCOLORSPACEW
+	FdwFlags     DWORD
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4198:11 */
 
-type EMRCREATECOLORSPACEW = tagEMRCREATECOLORSPACEW /* wingdi.h:4091:5 */
-type PEMRCREATECOLORSPACEW = uintptr                /* wingdi.h:4091:26 */
+type EMRCREATECOLORSPACEW = tagEMRCREATECOLORSPACEW /* wingdi.h:4205:5 */
+type PEMRCREATECOLORSPACEW = uintptr                /* wingdi.h:4205:26 */
 
 type tagCOLORMATCHTOTARGET = struct {
-	Femr      EMR
-	FdwAction DWORD
-	FdwFlags  DWORD
-	FcbName   DWORD
-	FcbData   DWORD
-	FData     [1]BYTE
-	_         [3]byte
-} /* wingdi.h:4095:11 */
+	Femr         EMR
+	FdwAction    DWORD
+	FdwFlags     DWORD
+	FcbName      DWORD
+	FcbData      DWORD
+	FData        [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* wingdi.h:4209:11 */
 
-type EMRCOLORMATCHTOTARGET = tagCOLORMATCHTOTARGET /* wingdi.h:4102:5 */
-type PEMRCOLORMATCHTOTARGET = uintptr              /* wingdi.h:4102:27 */
+type EMRCOLORMATCHTOTARGET = tagCOLORMATCHTOTARGET /* wingdi.h:4216:5 */
+type PEMRCOLORMATCHTOTARGET = uintptr              /* wingdi.h:4216:27 */
 
 type tagCOLORCORRECTPALETTE = struct {
 	Femr         EMR
@@ -40311,10 +40808,10 @@ type tagCOLORCORRECTPALETTE = struct {
 	FnFirstEntry DWORD
 	FnPalEntries DWORD
 	FnReserved   DWORD
-} /* wingdi.h:4104:11 */
+} /* wingdi.h:4218:11 */
 
-type EMRCOLORCORRECTPALETTE = tagCOLORCORRECTPALETTE /* wingdi.h:4110:5 */
-type PEMRCOLORCORRECTPALETTE = uintptr               /* wingdi.h:4110:28 */
+type EMRCOLORCORRECTPALETTE = tagCOLORCORRECTPALETTE /* wingdi.h:4224:5 */
+type PEMRCOLORCORRECTPALETTE = uintptr               /* wingdi.h:4224:28 */
 
 type tagEMRALPHABLEND = struct {
 	Femr          EMR
@@ -40335,10 +40832,10 @@ type tagEMRALPHABLEND = struct {
 	FcbBitsSrc    DWORD
 	FcxSrc        LONG
 	FcySrc        LONG
-} /* wingdi.h:4112:11 */
+} /* wingdi.h:4226:11 */
 
-type EMRALPHABLEND = tagEMRALPHABLEND /* wingdi.h:4131:5 */
-type PEMRALPHABLEND = uintptr         /* wingdi.h:4131:19 */
+type EMRALPHABLEND = tagEMRALPHABLEND /* wingdi.h:4245:5 */
+type PEMRALPHABLEND = uintptr         /* wingdi.h:4245:19 */
 
 type tagEMRGRADIENTFILL = struct {
 	Femr       EMR
@@ -40347,10 +40844,10 @@ type tagEMRGRADIENTFILL = struct {
 	FnTri      DWORD
 	FulMode    ULONG
 	FVer       [1]TRIVERTEX
-} /* wingdi.h:4133:11 */
+} /* wingdi.h:4247:11 */
 
-type EMRGRADIENTFILL = tagEMRGRADIENTFILL /* wingdi.h:4140:5 */
-type PEMRGRADIENTFILL = uintptr           /* wingdi.h:4140:21 */
+type EMRGRADIENTFILL = tagEMRGRADIENTFILL /* wingdi.h:4254:5 */
+type PEMRGRADIENTFILL = uintptr           /* wingdi.h:4254:21 */
 
 type tagEMRTRANSPARENTBLT = struct {
 	Femr          EMR
@@ -40371,18 +40868,18 @@ type tagEMRTRANSPARENTBLT = struct {
 	FcbBitsSrc    DWORD
 	FcxSrc        LONG
 	FcySrc        LONG
-} /* wingdi.h:4142:11 */
+} /* wingdi.h:4256:11 */
 
-type EMRTRANSPARENTBLT = tagEMRTRANSPARENTBLT /* wingdi.h:4161:5 */
-type PEMRTRANSPARENTBLT = uintptr             /* wingdi.h:4161:23 */
+type EMRTRANSPARENTBLT = tagEMRTRANSPARENTBLT /* wingdi.h:4275:5 */
+type PEMRTRANSPARENTBLT = uintptr             /* wingdi.h:4275:23 */
 
 type _POINTFLOAT = struct {
 	Fx FLOAT
 	Fy FLOAT
-} /* wingdi.h:4188:11 */
+} /* wingdi.h:4302:11 */
 
-type POINTFLOAT = _POINTFLOAT /* wingdi.h:4191:5 */
-type PPOINTFLOAT = uintptr    /* wingdi.h:4191:16 */
+type POINTFLOAT = _POINTFLOAT /* wingdi.h:4305:5 */
+type PPOINTFLOAT = uintptr    /* wingdi.h:4305:16 */
 
 type _GLYPHMETRICSFLOAT = struct {
 	FgmfBlackBoxX     FLOAT
@@ -40390,11 +40887,11 @@ type _GLYPHMETRICSFLOAT = struct {
 	FgmfptGlyphOrigin POINTFLOAT
 	FgmfCellIncX      FLOAT
 	FgmfCellIncY      FLOAT
-} /* wingdi.h:4193:11 */
+} /* wingdi.h:4307:11 */
 
-type GLYPHMETRICSFLOAT = _GLYPHMETRICSFLOAT /* wingdi.h:4199:5 */
-type PGLYPHMETRICSFLOAT = uintptr           /* wingdi.h:4199:23 */
-type LPGLYPHMETRICSFLOAT = uintptr          /* wingdi.h:4199:43 */
+type GLYPHMETRICSFLOAT = _GLYPHMETRICSFLOAT /* wingdi.h:4313:5 */
+type PGLYPHMETRICSFLOAT = uintptr           /* wingdi.h:4313:23 */
+type LPGLYPHMETRICSFLOAT = uintptr          /* wingdi.h:4313:43 */
 
 type tagLAYERPLANEDESCRIPTOR = struct {
 	FnSize           WORD
@@ -40421,21 +40918,21 @@ type tagLAYERPLANEDESCRIPTOR = struct {
 	FiLayerPlane     BYTE
 	FbReserved       BYTE
 	FcrTransparent   COLORREF
-} /* wingdi.h:4209:11 */
+} /* wingdi.h:4323:11 */
 
-type LAYERPLANEDESCRIPTOR = tagLAYERPLANEDESCRIPTOR /* wingdi.h:4234:5 */
-type PLAYERPLANEDESCRIPTOR = uintptr                /* wingdi.h:4234:26 */
-type LPLAYERPLANEDESCRIPTOR = uintptr               /* wingdi.h:4234:49 */
+type LAYERPLANEDESCRIPTOR = tagLAYERPLANEDESCRIPTOR /* wingdi.h:4348:5 */
+type PLAYERPLANEDESCRIPTOR = uintptr                /* wingdi.h:4348:26 */
+type LPLAYERPLANEDESCRIPTOR = uintptr               /* wingdi.h:4348:49 */
 
 type _WGLSWAP = struct {
-	Fhdc     HDC
-	FuiFlags UINT
-	_        [4]byte
-} /* wingdi.h:4288:11 */
+	Fhdc         HDC
+	FuiFlags     UINT
+	F__ccgo_pad1 [4]byte
+} /* wingdi.h:4402:11 */
 
-type WGLSWAP = _WGLSWAP  /* wingdi.h:4291:5 */
-type PWGLSWAP = uintptr  /* wingdi.h:4291:13 */
-type LPWGLSWAP = uintptr /* wingdi.h:4291:23 */
+type WGLSWAP = _WGLSWAP  /* wingdi.h:4405:5 */
+type PWGLSWAP = uintptr  /* wingdi.h:4405:13 */
+type LPWGLSWAP = uintptr /* wingdi.h:4405:23 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -40493,7 +40990,7 @@ type LPWGLSWAP = uintptr /* wingdi.h:4291:23 */
 // 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) 1989-2018 Free Software Foundation, Inc.
+// Copyright (C) 1989-2020 Free Software Foundation, Inc.
 //
 // This file is part of GCC.
 //
@@ -40571,7 +41068,7 @@ type DESKTOPENUMPROC = DESKTOPENUMPROCA /* winuser.h:114:3 */
 type tagCBT_CREATEWNDA = struct {
 	Flpcs            uintptr
 	FhwndInsertAfter HWND
-} /* winuser.h:456:11 */
+} /* winuser.h:494:11 */
 
 type tagCREATESTRUCTA = struct {
 	FlpCreateParams LPVOID
@@ -40583,20 +41080,20 @@ type tagCREATESTRUCTA = struct {
 	Fy              int32
 	Fx              int32
 	Fstyle          LONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FlpszName       LPCSTR
 	FlpszClass      LPCSTR
 	FdwExStyle      DWORD
-	_               [4]byte
-} /* winuser.h:456:11 */
+	F__ccgo_pad2    [4]byte
+} /* winuser.h:494:11 */
 
-type CBT_CREATEWNDA = tagCBT_CREATEWNDA /* winuser.h:459:5 */
-type LPCBT_CREATEWNDA = uintptr         /* winuser.h:459:20 */
+type CBT_CREATEWNDA = tagCBT_CREATEWNDA /* winuser.h:497:5 */
+type LPCBT_CREATEWNDA = uintptr         /* winuser.h:497:20 */
 
 type tagCBT_CREATEWNDW = struct {
 	Flpcs            uintptr
 	FhwndInsertAfter HWND
-} /* winuser.h:461:11 */
+} /* winuser.h:499:11 */
 
 type tagCREATESTRUCTW = struct {
 	FlpCreateParams LPVOID
@@ -40608,41 +41105,41 @@ type tagCREATESTRUCTW = struct {
 	Fy              int32
 	Fx              int32
 	Fstyle          LONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FlpszName       LPCWSTR
 	FlpszClass      LPCWSTR
 	FdwExStyle      DWORD
-	_               [4]byte
-} /* winuser.h:461:11 */
+	F__ccgo_pad2    [4]byte
+} /* winuser.h:499:11 */
 
-type CBT_CREATEWNDW = tagCBT_CREATEWNDW /* winuser.h:464:5 */
-type LPCBT_CREATEWNDW = uintptr         /* winuser.h:464:20 */
+type CBT_CREATEWNDW = tagCBT_CREATEWNDW /* winuser.h:502:5 */
+type LPCBT_CREATEWNDW = uintptr         /* winuser.h:502:20 */
 
-type CBT_CREATEWND = CBT_CREATEWNDA     /* winuser.h:466:3 */
-type LPCBT_CREATEWND = LPCBT_CREATEWNDA /* winuser.h:467:3 */
+type CBT_CREATEWND = CBT_CREATEWNDA     /* winuser.h:504:3 */
+type LPCBT_CREATEWND = LPCBT_CREATEWNDA /* winuser.h:505:3 */
 
 type tagCBTACTIVATESTRUCT = struct {
-	FfMouse     WINBOOL
-	_           [4]byte
-	FhWndActive HWND
-} /* winuser.h:469:11 */
+	FfMouse      WINBOOL
+	F__ccgo_pad1 [4]byte
+	FhWndActive  HWND
+} /* winuser.h:507:11 */
 
-type CBTACTIVATESTRUCT = tagCBTACTIVATESTRUCT /* winuser.h:472:5 */
-type LPCBTACTIVATESTRUCT = uintptr            /* winuser.h:472:23 */
+type CBTACTIVATESTRUCT = tagCBTACTIVATESTRUCT /* winuser.h:510:5 */
+type LPCBTACTIVATESTRUCT = uintptr            /* winuser.h:510:23 */
 
 type tagWTSSESSION_NOTIFICATION = struct {
 	FcbSize      DWORD
 	FdwSessionId DWORD
-} /* winuser.h:476:11 */
+} /* winuser.h:514:11 */
 
-type WTSSESSION_NOTIFICATION = tagWTSSESSION_NOTIFICATION /* winuser.h:479:5 */
-type PWTSSESSION_NOTIFICATION = uintptr                   /* winuser.h:479:29 */
+type WTSSESSION_NOTIFICATION = tagWTSSESSION_NOTIFICATION /* winuser.h:517:5 */
+type PWTSSESSION_NOTIFICATION = uintptr                   /* winuser.h:517:29 */
 
 type SHELLHOOKINFO = struct {
 	Fhwnd HWND
 	Frc   RECT
-}                              /* winuser.h:600:5 */
-type LPSHELLHOOKINFO = uintptr /* winuser.h:600:19 */
+}                              /* winuser.h:638:5 */
+type LPSHELLHOOKINFO = uintptr /* winuser.h:638:19 */
 
 type tagEVENTMSG = struct {
 	Fmessage UINT
@@ -40650,43 +41147,43 @@ type tagEVENTMSG = struct {
 	FparamH  UINT
 	Ftime    DWORD
 	Fhwnd    HWND
-} /* winuser.h:602:11 */
+} /* winuser.h:640:11 */
 
-type EVENTMSG = tagEVENTMSG  /* winuser.h:608:5 */
-type PEVENTMSGMSG = uintptr  /* winuser.h:608:14 */
-type NPEVENTMSGMSG = uintptr /* winuser.h:608:28 */
-type LPEVENTMSGMSG = uintptr /* winuser.h:608:43 */
+type EVENTMSG = tagEVENTMSG  /* winuser.h:646:5 */
+type PEVENTMSGMSG = uintptr  /* winuser.h:646:14 */
+type NPEVENTMSGMSG = uintptr /* winuser.h:646:28 */
+type LPEVENTMSGMSG = uintptr /* winuser.h:646:43 */
 
-type PEVENTMSG = uintptr  /* winuser.h:610:30 */
-type NPEVENTMSG = uintptr /* winuser.h:610:41 */
-type LPEVENTMSG = uintptr /* winuser.h:610:53 */
+type PEVENTMSG = uintptr  /* winuser.h:648:30 */
+type NPEVENTMSG = uintptr /* winuser.h:648:41 */
+type LPEVENTMSG = uintptr /* winuser.h:648:53 */
 
 type tagCWPSTRUCT = struct {
-	FlParam  LPARAM
-	FwParam  WPARAM
-	Fmessage UINT
-	_        [4]byte
-	Fhwnd    HWND
-} /* winuser.h:612:11 */
+	FlParam      LPARAM
+	FwParam      WPARAM
+	Fmessage     UINT
+	F__ccgo_pad1 [4]byte
+	Fhwnd        HWND
+} /* winuser.h:650:11 */
 
-type CWPSTRUCT = tagCWPSTRUCT /* winuser.h:617:5 */
-type PCWPSTRUCT = uintptr     /* winuser.h:617:15 */
-type NPCWPSTRUCT = uintptr    /* winuser.h:617:27 */
-type LPCWPSTRUCT = uintptr    /* winuser.h:617:40 */
+type CWPSTRUCT = tagCWPSTRUCT /* winuser.h:655:5 */
+type PCWPSTRUCT = uintptr     /* winuser.h:655:15 */
+type NPCWPSTRUCT = uintptr    /* winuser.h:655:27 */
+type LPCWPSTRUCT = uintptr    /* winuser.h:655:40 */
 
 type tagCWPRETSTRUCT = struct {
-	FlResult LRESULT
-	FlParam  LPARAM
-	FwParam  WPARAM
-	Fmessage UINT
-	_        [4]byte
-	Fhwnd    HWND
-} /* winuser.h:619:11 */
+	FlResult     LRESULT
+	FlParam      LPARAM
+	FwParam      WPARAM
+	Fmessage     UINT
+	F__ccgo_pad1 [4]byte
+	Fhwnd        HWND
+} /* winuser.h:657:11 */
 
-type CWPRETSTRUCT = tagCWPRETSTRUCT /* winuser.h:625:5 */
-type PCWPRETSTRUCT = uintptr        /* winuser.h:625:18 */
-type NPCWPRETSTRUCT = uintptr       /* winuser.h:625:33 */
-type LPCWPRETSTRUCT = uintptr       /* winuser.h:625:49 */
+type CWPRETSTRUCT = tagCWPRETSTRUCT /* winuser.h:663:5 */
+type PCWPRETSTRUCT = uintptr        /* winuser.h:663:18 */
+type NPCWPRETSTRUCT = uintptr       /* winuser.h:663:33 */
+type LPCWPRETSTRUCT = uintptr       /* winuser.h:663:49 */
 
 type tagKBDLLHOOKSTRUCT = struct {
 	FvkCode      DWORD
@@ -40694,24 +41191,24 @@ type tagKBDLLHOOKSTRUCT = struct {
 	Fflags       DWORD
 	Ftime        DWORD
 	FdwExtraInfo ULONG_PTR
-} /* winuser.h:636:11 */
+} /* winuser.h:676:11 */
 
-type KBDLLHOOKSTRUCT = tagKBDLLHOOKSTRUCT /* winuser.h:642:5 */
-type LPKBDLLHOOKSTRUCT = uintptr          /* winuser.h:642:21 */
-type PKBDLLHOOKSTRUCT = uintptr           /* winuser.h:642:40 */
+type KBDLLHOOKSTRUCT = tagKBDLLHOOKSTRUCT /* winuser.h:682:5 */
+type LPKBDLLHOOKSTRUCT = uintptr          /* winuser.h:682:21 */
+type PKBDLLHOOKSTRUCT = uintptr           /* winuser.h:682:40 */
 
 type tagMSLLHOOKSTRUCT = struct {
 	Fpt          POINT
 	FmouseData   DWORD
 	Fflags       DWORD
 	Ftime        DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FdwExtraInfo ULONG_PTR
-} /* winuser.h:644:11 */
+} /* winuser.h:684:11 */
 
-type MSLLHOOKSTRUCT = tagMSLLHOOKSTRUCT /* winuser.h:650:5 */
-type LPMSLLHOOKSTRUCT = uintptr         /* winuser.h:650:20 */
-type PMSLLHOOKSTRUCT = uintptr          /* winuser.h:650:38 */
+type MSLLHOOKSTRUCT = tagMSLLHOOKSTRUCT /* winuser.h:690:5 */
+type LPMSLLHOOKSTRUCT = uintptr         /* winuser.h:690:20 */
+type PMSLLHOOKSTRUCT = uintptr          /* winuser.h:690:38 */
 
 type tagDEBUGHOOKINFO = struct {
 	FidThread          DWORD
@@ -40719,68 +41216,68 @@ type tagDEBUGHOOKINFO = struct {
 	FlParam            LPARAM
 	FwParam            WPARAM
 	Fcode              int32
-	_                  [4]byte
-} /* winuser.h:652:11 */
+	F__ccgo_pad1       [4]byte
+} /* winuser.h:692:11 */
 
-type DEBUGHOOKINFO = tagDEBUGHOOKINFO /* winuser.h:658:5 */
-type PDEBUGHOOKINFO = uintptr         /* winuser.h:658:19 */
-type NPDEBUGHOOKINFO = uintptr        /* winuser.h:658:35 */
-type LPDEBUGHOOKINFO = uintptr        /* winuser.h:658:52 */
+type DEBUGHOOKINFO = tagDEBUGHOOKINFO /* winuser.h:698:5 */
+type PDEBUGHOOKINFO = uintptr         /* winuser.h:698:19 */
+type NPDEBUGHOOKINFO = uintptr        /* winuser.h:698:35 */
+type LPDEBUGHOOKINFO = uintptr        /* winuser.h:698:52 */
 
 type tagMOUSEHOOKSTRUCT = struct {
 	Fpt           POINT
 	Fhwnd         HWND
 	FwHitTestCode UINT
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FdwExtraInfo  ULONG_PTR
-} /* winuser.h:660:11 */
+} /* winuser.h:700:11 */
 
-type MOUSEHOOKSTRUCT = tagMOUSEHOOKSTRUCT /* winuser.h:665:5 */
-type LPMOUSEHOOKSTRUCT = uintptr          /* winuser.h:665:21 */
-type PMOUSEHOOKSTRUCT = uintptr           /* winuser.h:665:40 */
+type MOUSEHOOKSTRUCT = tagMOUSEHOOKSTRUCT /* winuser.h:705:5 */
+type LPMOUSEHOOKSTRUCT = uintptr          /* winuser.h:705:21 */
+type PMOUSEHOOKSTRUCT = uintptr           /* winuser.h:705:40 */
 
 type tagMOUSEHOOKSTRUCTEX = struct {
-	F__unnamed MOUSEHOOKSTRUCT
-	FmouseData DWORD
-	_          [4]byte
-} /* winuser.h:672:11 */
+	F__unnamed   MOUSEHOOKSTRUCT
+	FmouseData   DWORD
+	F__ccgo_pad1 [4]byte
+} /* winuser.h:712:11 */
 
-type MOUSEHOOKSTRUCTEX = tagMOUSEHOOKSTRUCTEX /* winuser.h:675:5 */
-type LPMOUSEHOOKSTRUCTEX = uintptr            /* winuser.h:675:23 */
-type PMOUSEHOOKSTRUCTEX = uintptr             /* winuser.h:675:44 */
+type MOUSEHOOKSTRUCTEX = tagMOUSEHOOKSTRUCTEX /* winuser.h:715:5 */
+type LPMOUSEHOOKSTRUCTEX = uintptr            /* winuser.h:715:23 */
+type PMOUSEHOOKSTRUCTEX = uintptr             /* winuser.h:715:44 */
 
 type tagHARDWAREHOOKSTRUCT = struct {
-	Fhwnd    HWND
-	Fmessage UINT
-	_        [4]byte
-	FwParam  WPARAM
-	FlParam  LPARAM
-} /* winuser.h:678:11 */
+	Fhwnd        HWND
+	Fmessage     UINT
+	F__ccgo_pad1 [4]byte
+	FwParam      WPARAM
+	FlParam      LPARAM
+} /* winuser.h:718:11 */
 
-type HARDWAREHOOKSTRUCT = tagHARDWAREHOOKSTRUCT /* winuser.h:683:5 */
-type LPHARDWAREHOOKSTRUCT = uintptr             /* winuser.h:683:24 */
-type PHARDWAREHOOKSTRUCT = uintptr              /* winuser.h:683:46 */
+type HARDWAREHOOKSTRUCT = tagHARDWAREHOOKSTRUCT /* winuser.h:723:5 */
+type LPHARDWAREHOOKSTRUCT = uintptr             /* winuser.h:723:24 */
+type PHARDWAREHOOKSTRUCT = uintptr              /* winuser.h:723:46 */
 
 type tagMOUSEMOVEPOINT = struct {
 	Fx           int32
 	Fy           int32
 	Ftime        DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FdwExtraInfo ULONG_PTR
-} /* winuser.h:719:11 */
+} /* winuser.h:759:11 */
 
-type MOUSEMOVEPOINT = tagMOUSEMOVEPOINT /* winuser.h:724:5 */
-type PMOUSEMOVEPOINT = uintptr          /* winuser.h:724:20 */
-type LPMOUSEMOVEPOINT = uintptr         /* winuser.h:724:37 */
+type MOUSEMOVEPOINT = tagMOUSEMOVEPOINT /* winuser.h:764:5 */
+type PMOUSEMOVEPOINT = uintptr          /* winuser.h:764:20 */
+type LPMOUSEMOVEPOINT = uintptr         /* winuser.h:764:37 */
 
 type tagUSEROBJECTFLAGS = struct {
 	FfInherit  WINBOOL
 	FfReserved WINBOOL
 	FdwFlags   DWORD
-} /* winuser.h:825:11 */
+} /* winuser.h:866:11 */
 
-type USEROBJECTFLAGS = tagUSEROBJECTFLAGS /* winuser.h:829:5 */
-type PUSEROBJECTFLAGS = uintptr           /* winuser.h:829:21 */
+type USEROBJECTFLAGS = tagUSEROBJECTFLAGS /* winuser.h:870:5 */
+type PUSEROBJECTFLAGS = uintptr           /* winuser.h:870:21 */
 
 type tagWNDCLASSEXA = struct {
 	FcbSize        UINT
@@ -40795,12 +41292,12 @@ type tagWNDCLASSEXA = struct {
 	FlpszMenuName  LPCSTR
 	FlpszClassName LPCSTR
 	FhIconSm       HICON
-} /* winuser.h:842:11 */
+} /* winuser.h:883:11 */
 
-type WNDCLASSEXA = tagWNDCLASSEXA /* winuser.h:855:5 */
-type PWNDCLASSEXA = uintptr       /* winuser.h:855:17 */
-type NPWNDCLASSEXA = uintptr      /* winuser.h:855:31 */
-type LPWNDCLASSEXA = uintptr      /* winuser.h:855:46 */
+type WNDCLASSEXA = tagWNDCLASSEXA /* winuser.h:896:5 */
+type PWNDCLASSEXA = uintptr       /* winuser.h:896:17 */
+type NPWNDCLASSEXA = uintptr      /* winuser.h:896:31 */
+type LPWNDCLASSEXA = uintptr      /* winuser.h:896:46 */
 
 type tagWNDCLASSEXW = struct {
 	FcbSize        UINT
@@ -40815,21 +41312,21 @@ type tagWNDCLASSEXW = struct {
 	FlpszMenuName  LPCWSTR
 	FlpszClassName LPCWSTR
 	FhIconSm       HICON
-} /* winuser.h:857:11 */
+} /* winuser.h:898:11 */
 
-type WNDCLASSEXW = tagWNDCLASSEXW /* winuser.h:870:5 */
-type PWNDCLASSEXW = uintptr       /* winuser.h:870:17 */
-type NPWNDCLASSEXW = uintptr      /* winuser.h:870:31 */
-type LPWNDCLASSEXW = uintptr      /* winuser.h:870:46 */
+type WNDCLASSEXW = tagWNDCLASSEXW /* winuser.h:911:5 */
+type PWNDCLASSEXW = uintptr       /* winuser.h:911:17 */
+type NPWNDCLASSEXW = uintptr      /* winuser.h:911:31 */
+type LPWNDCLASSEXW = uintptr      /* winuser.h:911:46 */
 
-type WNDCLASSEX = WNDCLASSEXA     /* winuser.h:872:3 */
-type PWNDCLASSEX = PWNDCLASSEXA   /* winuser.h:873:3 */
-type NPWNDCLASSEX = NPWNDCLASSEXA /* winuser.h:874:3 */
-type LPWNDCLASSEX = LPWNDCLASSEXA /* winuser.h:875:3 */
+type WNDCLASSEX = WNDCLASSEXA     /* winuser.h:913:3 */
+type PWNDCLASSEX = PWNDCLASSEXA   /* winuser.h:914:3 */
+type NPWNDCLASSEX = NPWNDCLASSEXA /* winuser.h:915:3 */
+type LPWNDCLASSEX = LPWNDCLASSEXA /* winuser.h:916:3 */
 
 type tagWNDCLASSA = struct {
 	Fstyle         UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpfnWndProc   WNDPROC
 	FcbClsExtra    int32
 	FcbWndExtra    int32
@@ -40839,16 +41336,16 @@ type tagWNDCLASSA = struct {
 	FhbrBackground HBRUSH
 	FlpszMenuName  LPCSTR
 	FlpszClassName LPCSTR
-} /* winuser.h:877:11 */
+} /* winuser.h:918:11 */
 
-type WNDCLASSA = tagWNDCLASSA /* winuser.h:888:5 */
-type PWNDCLASSA = uintptr     /* winuser.h:888:15 */
-type NPWNDCLASSA = uintptr    /* winuser.h:888:27 */
-type LPWNDCLASSA = uintptr    /* winuser.h:888:40 */
+type WNDCLASSA = tagWNDCLASSA /* winuser.h:929:5 */
+type PWNDCLASSA = uintptr     /* winuser.h:929:15 */
+type NPWNDCLASSA = uintptr    /* winuser.h:929:27 */
+type LPWNDCLASSA = uintptr    /* winuser.h:929:40 */
 
 type tagWNDCLASSW = struct {
 	Fstyle         UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpfnWndProc   WNDPROC
 	FcbClsExtra    int32
 	FcbWndExtra    int32
@@ -40858,33 +41355,33 @@ type tagWNDCLASSW = struct {
 	FhbrBackground HBRUSH
 	FlpszMenuName  LPCWSTR
 	FlpszClassName LPCWSTR
-} /* winuser.h:890:11 */
+} /* winuser.h:931:11 */
 
-type WNDCLASSW = tagWNDCLASSW /* winuser.h:901:5 */
-type PWNDCLASSW = uintptr     /* winuser.h:901:15 */
-type NPWNDCLASSW = uintptr    /* winuser.h:901:27 */
-type LPWNDCLASSW = uintptr    /* winuser.h:901:40 */
+type WNDCLASSW = tagWNDCLASSW /* winuser.h:942:5 */
+type PWNDCLASSW = uintptr     /* winuser.h:942:15 */
+type NPWNDCLASSW = uintptr    /* winuser.h:942:27 */
+type LPWNDCLASSW = uintptr    /* winuser.h:942:40 */
 
-type WNDCLASS = WNDCLASSA     /* winuser.h:903:3 */
-type PWNDCLASS = PWNDCLASSA   /* winuser.h:904:3 */
-type NPWNDCLASS = NPWNDCLASSA /* winuser.h:905:3 */
-type LPWNDCLASS = LPWNDCLASSA /* winuser.h:906:3 */
+type WNDCLASS = WNDCLASSA     /* winuser.h:944:3 */
+type PWNDCLASS = PWNDCLASSA   /* winuser.h:945:3 */
+type NPWNDCLASS = NPWNDCLASSA /* winuser.h:946:3 */
+type LPWNDCLASS = LPWNDCLASSA /* winuser.h:947:3 */
 
 type tagMSG = struct {
-	Fhwnd    HWND
-	Fmessage UINT
-	_        [4]byte
-	FwParam  WPARAM
-	FlParam  LPARAM
-	Ftime    DWORD
-	Fpt      POINT
-	_        [4]byte
-} /* winuser.h:914:11 */
+	Fhwnd        HWND
+	Fmessage     UINT
+	F__ccgo_pad1 [4]byte
+	FwParam      WPARAM
+	FlParam      LPARAM
+	Ftime        DWORD
+	Fpt          POINT
+	F__ccgo_pad2 [4]byte
+} /* winuser.h:955:11 */
 
-type MSG = tagMSG    /* winuser.h:921:5 */
-type PMSG = uintptr  /* winuser.h:921:9 */
-type NPMSG = uintptr /* winuser.h:921:15 */
-type LPMSG = uintptr /* winuser.h:921:22 */
+type MSG = tagMSG    /* winuser.h:962:5 */
+type PMSG = uintptr  /* winuser.h:962:9 */
+type NPMSG = uintptr /* winuser.h:962:15 */
+type LPMSG = uintptr /* winuser.h:962:22 */
 
 type tagMINMAXINFO = struct {
 	FptReserved     POINT
@@ -40892,39 +41389,39 @@ type tagMINMAXINFO = struct {
 	FptMaxPosition  POINT
 	FptMinTrackSize POINT
 	FptMaxTrackSize POINT
-} /* winuser.h:1031:11 */
+} /* winuser.h:1072:11 */
 
-type MINMAXINFO = tagMINMAXINFO /* winuser.h:1037:5 */
-type PMINMAXINFO = uintptr      /* winuser.h:1037:16 */
-type LPMINMAXINFO = uintptr     /* winuser.h:1037:29 */
+type MINMAXINFO = tagMINMAXINFO /* winuser.h:1078:5 */
+type PMINMAXINFO = uintptr      /* winuser.h:1078:16 */
+type LPMINMAXINFO = uintptr     /* winuser.h:1078:29 */
 
 type tagCOPYDATASTRUCT = struct {
-	FdwData ULONG_PTR
-	FcbData DWORD
-	_       [4]byte
-	FlpData PVOID
-} /* winuser.h:1074:11 */
+	FdwData      ULONG_PTR
+	FcbData      DWORD
+	F__ccgo_pad1 [4]byte
+	FlpData      PVOID
+} /* winuser.h:1115:11 */
 
-type COPYDATASTRUCT = tagCOPYDATASTRUCT /* winuser.h:1078:5 */
-type PCOPYDATASTRUCT = uintptr          /* winuser.h:1078:20 */
+type COPYDATASTRUCT = tagCOPYDATASTRUCT /* winuser.h:1119:5 */
+type PCOPYDATASTRUCT = uintptr          /* winuser.h:1119:20 */
 
 type tagMDINEXTMENU = struct {
 	FhmenuIn   HMENU
 	FhmenuNext HMENU
 	FhwndNext  HWND
-} /* winuser.h:1080:11 */
+} /* winuser.h:1121:11 */
 
-type MDINEXTMENU = tagMDINEXTMENU /* winuser.h:1084:5 */
-type PMDINEXTMENU = uintptr       /* winuser.h:1084:17 */
-type LPMDINEXTMENU = uintptr      /* winuser.h:1084:31 */
+type MDINEXTMENU = tagMDINEXTMENU /* winuser.h:1125:5 */
+type PMDINEXTMENU = uintptr       /* winuser.h:1125:17 */
+type LPMDINEXTMENU = uintptr      /* winuser.h:1125:31 */
 
 type POWERBROADCAST_SETTING = struct {
 	FPowerSetting GUID
 	FDataLength   DWORD
 	FData         [1]UCHAR
-	_             [3]byte
-}                                      /* winuser.h:1268:5 */
-type PPOWERBROADCAST_SETTING = uintptr /* winuser.h:1268:28 */
+	F__ccgo_pad1  [3]byte
+}                                      /* winuser.h:1317:5 */
+type PPOWERBROADCAST_SETTING = uintptr /* winuser.h:1317:28 */
 
 type tagWINDOWPOS = struct {
 	Fhwnd            HWND
@@ -40934,41 +41431,41 @@ type tagWINDOWPOS = struct {
 	Fcx              int32
 	Fcy              int32
 	Fflags           UINT
-	_                [4]byte
-} /* winuser.h:1462:11 */
+	F__ccgo_pad1     [4]byte
+} /* winuser.h:1520:11 */
 
-type WINDOWPOS = tagWINDOWPOS /* winuser.h:1470:5 */
-type LPWINDOWPOS = uintptr    /* winuser.h:1470:15 */
-type PWINDOWPOS = uintptr     /* winuser.h:1470:28 */
+type WINDOWPOS = tagWINDOWPOS /* winuser.h:1528:5 */
+type LPWINDOWPOS = uintptr    /* winuser.h:1528:15 */
+type PWINDOWPOS = uintptr     /* winuser.h:1528:28 */
 
 type tagNCCALCSIZE_PARAMS = struct {
 	Frgrc  [3]RECT
 	Flppos PWINDOWPOS
-} /* winuser.h:1472:11 */
+} /* winuser.h:1530:11 */
 
-type NCCALCSIZE_PARAMS = tagNCCALCSIZE_PARAMS /* winuser.h:1475:5 */
-type LPNCCALCSIZE_PARAMS = uintptr            /* winuser.h:1475:23 */
+type NCCALCSIZE_PARAMS = tagNCCALCSIZE_PARAMS /* winuser.h:1533:5 */
+type LPNCCALCSIZE_PARAMS = uintptr            /* winuser.h:1533:23 */
 
 type tagTRACKMOUSEEVENT = struct {
 	FcbSize      DWORD
 	FdwFlags     DWORD
 	FhwndTrack   HWND
 	FdwHoverTime DWORD
-	_            [4]byte
-} /* winuser.h:1509:11 */
+	F__ccgo_pad1 [4]byte
+} /* winuser.h:1567:11 */
 
-type TRACKMOUSEEVENT = tagTRACKMOUSEEVENT /* winuser.h:1514:5 */
-type LPTRACKMOUSEEVENT = uintptr          /* winuser.h:1514:21 */
+type TRACKMOUSEEVENT = tagTRACKMOUSEEVENT /* winuser.h:1572:5 */
+type LPTRACKMOUSEEVENT = uintptr          /* winuser.h:1572:21 */
 
 type tagACCEL = struct {
-	FfVirt BYTE
-	_      [1]byte
-	Fkey   WORD
-	Fcmd   WORD
-} /* winuser.h:1753:11 */
+	FfVirt       BYTE
+	F__ccgo_pad1 [1]byte
+	Fkey         WORD
+	Fcmd         WORD
+} /* winuser.h:1817:11 */
 
-type ACCEL = tagACCEL  /* winuser.h:1757:5 */
-type LPACCEL = uintptr /* winuser.h:1757:11 */
+type ACCEL = tagACCEL  /* winuser.h:1821:5 */
+type LPACCEL = uintptr /* winuser.h:1821:11 */
 
 type tagPAINTSTRUCT = struct {
 	Fhdc         HDC
@@ -40977,22 +41474,22 @@ type tagPAINTSTRUCT = struct {
 	FfRestore    WINBOOL
 	FfIncUpdate  WINBOOL
 	FrgbReserved [32]BYTE
-	_            [4]byte
-} /* winuser.h:1759:11 */
+	F__ccgo_pad1 [4]byte
+} /* winuser.h:1823:11 */
 
-type PAINTSTRUCT = tagPAINTSTRUCT /* winuser.h:1766:5 */
-type PPAINTSTRUCT = uintptr       /* winuser.h:1766:17 */
-type NPPAINTSTRUCT = uintptr      /* winuser.h:1766:31 */
-type LPPAINTSTRUCT = uintptr      /* winuser.h:1766:46 */
+type PAINTSTRUCT = tagPAINTSTRUCT /* winuser.h:1830:5 */
+type PPAINTSTRUCT = uintptr       /* winuser.h:1830:17 */
+type NPPAINTSTRUCT = uintptr      /* winuser.h:1830:31 */
+type LPPAINTSTRUCT = uintptr      /* winuser.h:1830:46 */
 
-type CREATESTRUCTA = tagCREATESTRUCTA /* winuser.h:1781:5 */
-type LPCREATESTRUCTA = uintptr        /* winuser.h:1781:19 */
+type CREATESTRUCTA = tagCREATESTRUCTA /* winuser.h:1845:5 */
+type LPCREATESTRUCTA = uintptr        /* winuser.h:1845:19 */
 
-type CREATESTRUCTW = tagCREATESTRUCTW /* winuser.h:1796:5 */
-type LPCREATESTRUCTW = uintptr        /* winuser.h:1796:19 */
+type CREATESTRUCTW = tagCREATESTRUCTW /* winuser.h:1860:5 */
+type LPCREATESTRUCTW = uintptr        /* winuser.h:1860:19 */
 
-type CREATESTRUCT = CREATESTRUCTA     /* winuser.h:1798:3 */
-type LPCREATESTRUCT = LPCREATESTRUCTA /* winuser.h:1799:3 */
+type CREATESTRUCT = CREATESTRUCTA     /* winuser.h:1862:3 */
+type LPCREATESTRUCT = LPCREATESTRUCTA /* winuser.h:1863:3 */
 
 type tagWINDOWPLACEMENT = struct {
 	Flength           UINT
@@ -41001,139 +41498,139 @@ type tagWINDOWPLACEMENT = struct {
 	FptMinPosition    POINT
 	FptMaxPosition    POINT
 	FrcNormalPosition RECT
-} /* winuser.h:1801:11 */
+} /* winuser.h:1865:11 */
 
-type WINDOWPLACEMENT = tagWINDOWPLACEMENT /* winuser.h:1808:5 */
-type PWINDOWPLACEMENT = uintptr           /* winuser.h:1809:27 */
-type LPWINDOWPLACEMENT = uintptr          /* winuser.h:1809:45 */
+type WINDOWPLACEMENT = tagWINDOWPLACEMENT /* winuser.h:1872:5 */
+type PWINDOWPLACEMENT = uintptr           /* winuser.h:1873:27 */
+type LPWINDOWPLACEMENT = uintptr          /* winuser.h:1873:45 */
 
 type tagNMHDR = struct {
-	FhwndFrom HWND
-	FidFrom   UINT_PTR
-	Fcode     UINT
-	_         [4]byte
-} /* winuser.h:1817:11 */
+	FhwndFrom    HWND
+	FidFrom      UINT_PTR
+	Fcode        UINT
+	F__ccgo_pad1 [4]byte
+} /* winuser.h:1881:11 */
 
-type NMHDR = tagNMHDR /* winuser.h:1821:5 */
+type NMHDR = tagNMHDR /* winuser.h:1885:5 */
 
-type LPNMHDR = uintptr /* winuser.h:1825:17 */
+type LPNMHDR = uintptr /* winuser.h:1889:17 */
 
 type tagSTYLESTRUCT = struct {
 	FstyleOld DWORD
 	FstyleNew DWORD
-} /* winuser.h:1827:11 */
+} /* winuser.h:1891:11 */
 
-type STYLESTRUCT = tagSTYLESTRUCT /* winuser.h:1830:5 */
-type LPSTYLESTRUCT = uintptr      /* winuser.h:1830:17 */
+type STYLESTRUCT = tagSTYLESTRUCT /* winuser.h:1894:5 */
+type LPSTYLESTRUCT = uintptr      /* winuser.h:1894:17 */
 
 type tagMEASUREITEMSTRUCT = struct {
-	FCtlType    UINT
-	FCtlID      UINT
-	FitemID     UINT
-	FitemWidth  UINT
-	FitemHeight UINT
-	_           [4]byte
-	FitemData   ULONG_PTR
-} /* winuser.h:1856:11 */
-
-type MEASUREITEMSTRUCT = tagMEASUREITEMSTRUCT /* winuser.h:1863:5 */
-type PMEASUREITEMSTRUCT = uintptr             /* winuser.h:1863:23 */
-type LPMEASUREITEMSTRUCT = uintptr            /* winuser.h:1863:43 */
+	FCtlType     UINT
+	FCtlID       UINT
+	FitemID      UINT
+	FitemWidth   UINT
+	FitemHeight  UINT
+	F__ccgo_pad1 [4]byte
+	FitemData    ULONG_PTR
+} /* winuser.h:1920:11 */
+
+type MEASUREITEMSTRUCT = tagMEASUREITEMSTRUCT /* winuser.h:1927:5 */
+type PMEASUREITEMSTRUCT = uintptr             /* winuser.h:1927:23 */
+type LPMEASUREITEMSTRUCT = uintptr            /* winuser.h:1927:43 */
 
 type tagDRAWITEMSTRUCT = struct {
-	FCtlType    UINT
-	FCtlID      UINT
-	FitemID     UINT
-	FitemAction UINT
-	FitemState  UINT
-	_           [4]byte
-	FhwndItem   HWND
-	FhDC        HDC
-	FrcItem     RECT
-	FitemData   ULONG_PTR
-} /* winuser.h:1865:11 */
+	FCtlType     UINT
+	FCtlID       UINT
+	FitemID      UINT
+	FitemAction  UINT
+	FitemState   UINT
+	F__ccgo_pad1 [4]byte
+	FhwndItem    HWND
+	FhDC         HDC
+	FrcItem      RECT
+	FitemData    ULONG_PTR
+} /* winuser.h:1929:11 */
 
-type DRAWITEMSTRUCT = tagDRAWITEMSTRUCT /* winuser.h:1875:5 */
-type PDRAWITEMSTRUCT = uintptr          /* winuser.h:1875:20 */
-type LPDRAWITEMSTRUCT = uintptr         /* winuser.h:1875:37 */
+type DRAWITEMSTRUCT = tagDRAWITEMSTRUCT /* winuser.h:1939:5 */
+type PDRAWITEMSTRUCT = uintptr          /* winuser.h:1939:20 */
+type LPDRAWITEMSTRUCT = uintptr         /* winuser.h:1939:37 */
 
 type tagDELETEITEMSTRUCT = struct {
-	FCtlType  UINT
-	FCtlID    UINT
-	FitemID   UINT
-	_         [4]byte
-	FhwndItem HWND
-	FitemData ULONG_PTR
-} /* winuser.h:1877:11 */
-
-type DELETEITEMSTRUCT = tagDELETEITEMSTRUCT /* winuser.h:1883:5 */
-type PDELETEITEMSTRUCT = uintptr            /* winuser.h:1883:22 */
-type LPDELETEITEMSTRUCT = uintptr           /* winuser.h:1883:41 */
+	FCtlType     UINT
+	FCtlID       UINT
+	FitemID      UINT
+	F__ccgo_pad1 [4]byte
+	FhwndItem    HWND
+	FitemData    ULONG_PTR
+} /* winuser.h:1941:11 */
+
+type DELETEITEMSTRUCT = tagDELETEITEMSTRUCT /* winuser.h:1947:5 */
+type PDELETEITEMSTRUCT = uintptr            /* winuser.h:1947:22 */
+type LPDELETEITEMSTRUCT = uintptr           /* winuser.h:1947:41 */
 
 type tagCOMPAREITEMSTRUCT = struct {
-	FCtlType    UINT
-	FCtlID      UINT
-	FhwndItem   HWND
-	FitemID1    UINT
-	_           [4]byte
-	FitemData1  ULONG_PTR
-	FitemID2    UINT
-	_           [4]byte
-	FitemData2  ULONG_PTR
-	FdwLocaleId DWORD
-	_           [4]byte
-} /* winuser.h:1885:11 */
-
-type COMPAREITEMSTRUCT = tagCOMPAREITEMSTRUCT /* winuser.h:1894:5 */
-type PCOMPAREITEMSTRUCT = uintptr             /* winuser.h:1894:23 */
-type LPCOMPAREITEMSTRUCT = uintptr            /* winuser.h:1894:43 */
+	FCtlType     UINT
+	FCtlID       UINT
+	FhwndItem    HWND
+	FitemID1     UINT
+	F__ccgo_pad1 [4]byte
+	FitemData1   ULONG_PTR
+	FitemID2     UINT
+	F__ccgo_pad2 [4]byte
+	FitemData2   ULONG_PTR
+	FdwLocaleId  DWORD
+	F__ccgo_pad3 [4]byte
+} /* winuser.h:1949:11 */
+
+type COMPAREITEMSTRUCT = tagCOMPAREITEMSTRUCT /* winuser.h:1958:5 */
+type PCOMPAREITEMSTRUCT = uintptr             /* winuser.h:1958:23 */
+type LPCOMPAREITEMSTRUCT = uintptr            /* winuser.h:1958:43 */
 
 type BSMINFO = struct {
-	FcbSize UINT
-	_       [4]byte
-	Fhdesk  HDESK
-	Fhwnd   HWND
-	Fluid   LUID
-}                       /* winuser.h:1997:5 */
-type PBSMINFO = uintptr /* winuser.h:1997:13 */
+	FcbSize      UINT
+	F__ccgo_pad1 [4]byte
+	Fhdesk       HDESK
+	Fhwnd        HWND
+	Fluid        LUID
+}                       /* winuser.h:2063:5 */
+type PBSMINFO = uintptr /* winuser.h:2063:13 */
 
-type HDEVNOTIFY = PVOID    /* winuser.h:2030:17 */
-type PHDEVNOTIFY = uintptr /* winuser.h:2031:22 */
+type HDEVNOTIFY = PVOID    /* winuser.h:2096:17 */
+type PHDEVNOTIFY = uintptr /* winuser.h:2097:22 */
 
-type HPOWERNOTIFY = HANDLE   /* winuser.h:2054:18 */
-type PHPOWERNOTIFY = uintptr /* winuser.h:2055:24 */
+type HPOWERNOTIFY = HANDLE   /* winuser.h:2120:18 */
+type PHPOWERNOTIFY = uintptr /* winuser.h:2121:24 */
 
-type PREGISTERCLASSNAMEW = uintptr /* winuser.h:2132:19 */
+type PREGISTERCLASSNAMEW = uintptr /* winuser.h:2198:19 */
 
 type tagUPDATELAYEREDWINDOWINFO = struct {
-	FcbSize   DWORD
-	_         [4]byte
-	FhdcDst   HDC
-	FpptDst   uintptr
-	Fpsize    uintptr
-	FhdcSrc   HDC
-	FpptSrc   uintptr
-	FcrKey    COLORREF
-	_         [4]byte
-	Fpblend   uintptr
-	FdwFlags  DWORD
-	_         [4]byte
-	FprcDirty uintptr
-} /* winuser.h:2155:11 */
-
-type UPDATELAYEREDWINDOWINFO = tagUPDATELAYEREDWINDOWINFO /* winuser.h:2166:5 */
-type PUPDATELAYEREDWINDOWINFO = uintptr                   /* winuser.h:2166:29 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FhdcDst      HDC
+	FpptDst      uintptr
+	Fpsize       uintptr
+	FhdcSrc      HDC
+	FpptSrc      uintptr
+	FcrKey       COLORREF
+	F__ccgo_pad2 [4]byte
+	Fpblend      uintptr
+	FdwFlags     DWORD
+	F__ccgo_pad3 [4]byte
+	FprcDirty    uintptr
+} /* winuser.h:2221:11 */
+
+type UPDATELAYEREDWINDOWINFO = tagUPDATELAYEREDWINDOWINFO /* winuser.h:2232:5 */
+type PUPDATELAYEREDWINDOWINFO = uintptr                   /* winuser.h:2232:29 */
 
 type FLASHWINFO = struct {
-	FcbSize    UINT
-	_          [4]byte
-	Fhwnd      HWND
-	FdwFlags   DWORD
-	FuCount    UINT
-	FdwTimeout DWORD
-	_          [4]byte
-}                          /* winuser.h:2206:5 */
-type PFLASHWINFO = uintptr /* winuser.h:2206:16 */
+	FcbSize      UINT
+	F__ccgo_pad1 [4]byte
+	Fhwnd        HWND
+	FdwFlags     DWORD
+	FuCount      UINT
+	FdwTimeout   DWORD
+	F__ccgo_pad2 [4]byte
+}                          /* winuser.h:2272:5 */
+type PFLASHWINFO = uintptr /* winuser.h:2272:16 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -41148,18 +41645,18 @@ type DLGTEMPLATE = struct {
 	Fy               int16
 	Fcx              int16
 	Fcy              int16
-	_                [2]byte
-} /* winuser.h:2279:5 */
+	F__ccgo_pad1     [2]byte
+} /* winuser.h:2346:5 */
 
-type LPDLGTEMPLATEA = uintptr /* winuser.h:2283:23 */
-type LPDLGTEMPLATEW = uintptr /* winuser.h:2284:23 */
+type LPDLGTEMPLATEA = uintptr /* winuser.h:2350:23 */
+type LPDLGTEMPLATEW = uintptr /* winuser.h:2351:23 */
 
-type LPDLGTEMPLATE = LPDLGTEMPLATEA /* winuser.h:2286:3 */
+type LPDLGTEMPLATE = LPDLGTEMPLATEA /* winuser.h:2353:3 */
 
-type LPCDLGTEMPLATEA = uintptr /* winuser.h:2290:29 */
-type LPCDLGTEMPLATEW = uintptr /* winuser.h:2291:29 */
+type LPCDLGTEMPLATEA = uintptr /* winuser.h:2357:29 */
+type LPCDLGTEMPLATEW = uintptr /* winuser.h:2358:29 */
 
-type LPCDLGTEMPLATE = LPCDLGTEMPLATEA /* winuser.h:2293:3 */
+type LPCDLGTEMPLATE = LPCDLGTEMPLATEA /* winuser.h:2360:3 */
 
 type DLGITEMTEMPLATE = struct {
 	Fstyle           DWORD
@@ -41169,18 +41666,22 @@ type DLGITEMTEMPLATE = struct {
 	Fcx              int16
 	Fcy              int16
 	Fid              WORD
-	_                [2]byte
-} /* winuser.h:2305:5 */
+	F__ccgo_pad1     [2]byte
+} /* winuser.h:2372:5 */
+
+type PDLGITEMTEMPLATEA = uintptr /* winuser.h:2374:27 */
+type PDLGITEMTEMPLATEW = uintptr /* winuser.h:2375:27 */
+
+type PDLGITEMTEMPLATE = PDLGITEMTEMPLATEA /* winuser.h:2377:3 */
 
-type PDLGITEMTEMPLATEA = uintptr /* winuser.h:2307:27 */
-type PDLGITEMTEMPLATEW = uintptr /* winuser.h:2308:27 */
+type LPDLGITEMTEMPLATEA = uintptr /* winuser.h:2379:27 */
+type LPDLGITEMTEMPLATEW = uintptr /* winuser.h:2380:27 */
 
-type PDLGITEMTEMPLATE = PDLGITEMTEMPLATEA /* winuser.h:2310:3 */
+type LPDLGITEMTEMPLATE = LPDLGITEMTEMPLATEA /* winuser.h:2382:3 */
 
-type LPDLGITEMTEMPLATEA = uintptr /* winuser.h:2312:27 */
-type LPDLGITEMTEMPLATEW = uintptr /* winuser.h:2313:27 */
+type DIALOG_CONTROL_DPI_CHANGE_BEHAVIORS = uint32 /* winuser.h:2444:5 */
 
-type LPDLGITEMTEMPLATE = LPDLGITEMTEMPLATEA /* winuser.h:2315:3 */
+type DIALOG_DPI_CHANGE_BEHAVIORS = uint32 /* winuser.h:2454:5 */
 
 type tagMOUSEINPUT = struct {
 	Fdx          LONG
@@ -41188,61 +41689,61 @@ type tagMOUSEINPUT = struct {
 	FmouseData   DWORD
 	FdwFlags     DWORD
 	Ftime        DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FdwExtraInfo ULONG_PTR
-} /* winuser.h:2646:11 */
+} /* winuser.h:2733:11 */
 
-type MOUSEINPUT = tagMOUSEINPUT /* winuser.h:2653:5 */
-type PMOUSEINPUT = uintptr      /* winuser.h:2653:16 */
-type LPMOUSEINPUT = uintptr     /* winuser.h:2653:29 */
+type MOUSEINPUT = tagMOUSEINPUT /* winuser.h:2740:5 */
+type PMOUSEINPUT = uintptr      /* winuser.h:2740:16 */
+type LPMOUSEINPUT = uintptr     /* winuser.h:2740:29 */
 
 type tagKEYBDINPUT = struct {
 	FwVk         WORD
 	FwScan       WORD
 	FdwFlags     DWORD
 	Ftime        DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FdwExtraInfo ULONG_PTR
-} /* winuser.h:2655:11 */
+} /* winuser.h:2742:11 */
 
-type KEYBDINPUT = tagKEYBDINPUT /* winuser.h:2661:5 */
-type PKEYBDINPUT = uintptr      /* winuser.h:2661:16 */
-type LPKEYBDINPUT = uintptr     /* winuser.h:2661:29 */
+type KEYBDINPUT = tagKEYBDINPUT /* winuser.h:2748:5 */
+type PKEYBDINPUT = uintptr      /* winuser.h:2748:16 */
+type LPKEYBDINPUT = uintptr     /* winuser.h:2748:29 */
 
 type tagHARDWAREINPUT = struct {
 	FuMsg    DWORD
 	FwParamL WORD
 	FwParamH WORD
-} /* winuser.h:2663:11 */
+} /* winuser.h:2750:11 */
 
-type HARDWAREINPUT = tagHARDWAREINPUT /* winuser.h:2667:5 */
-type PHARDWAREINPUT = uintptr         /* winuser.h:2667:19 */
-type LPHARDWAREINPUT = uintptr        /* winuser.h:2667:35 */
+type HARDWAREINPUT = tagHARDWAREINPUT /* winuser.h:2754:5 */
+type PHARDWAREINPUT = uintptr         /* winuser.h:2754:19 */
+type LPHARDWAREINPUT = uintptr        /* winuser.h:2754:35 */
 
 type tagINPUT = struct {
-	Ftype DWORD
-	_     [4]byte
-	Fu    struct{ Fmi MOUSEINPUT }
-} /* winuser.h:2669:11 */
+	Ftype        DWORD
+	F__ccgo_pad1 [4]byte
+	Fu           struct{ Fmi MOUSEINPUT }
+} /* winuser.h:2756:11 */
 
-type INPUT = tagINPUT  /* winuser.h:2676:5 */
-type PINPUT = uintptr  /* winuser.h:2676:11 */
-type LPINPUT = uintptr /* winuser.h:2676:19 */
+type INPUT = tagINPUT  /* winuser.h:2763:5 */
+type PINPUT = uintptr  /* winuser.h:2763:11 */
+type LPINPUT = uintptr /* winuser.h:2763:19 */
 
 type tagLASTINPUTINFO = struct {
 	FcbSize UINT
 	FdwTime DWORD
-} /* winuser.h:2830:11 */
+} /* winuser.h:2967:11 */
 
-type LASTINPUTINFO = tagLASTINPUTINFO /* winuser.h:2833:5 */
-type PLASTINPUTINFO = uintptr         /* winuser.h:2833:19 */
+type LASTINPUTINFO = tagLASTINPUTINFO /* winuser.h:2970:5 */
+type PLASTINPUTINFO = uintptr         /* winuser.h:2970:19 */
 
 type tagTPMPARAMS = struct {
 	FcbSize    UINT
 	FrcExclude RECT
-} /* winuser.h:3152:11 */
+} /* winuser.h:3293:11 */
 
-type TPMPARAMS = tagTPMPARAMS /* winuser.h:3155:5 */
+type TPMPARAMS = tagTPMPARAMS /* winuser.h:3296:5 */
 
 type tagMENUINFO = struct {
 	FcbSize          DWORD
@@ -41251,15 +41752,15 @@ type tagMENUINFO = struct {
 	FcyMax           UINT
 	FhbrBack         HBRUSH
 	FdwContextHelpID DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FdwMenuData      ULONG_PTR
-} /* winuser.h:3157:11 */
+} /* winuser.h:3298:11 */
 
-type MENUINFO = tagMENUINFO /* winuser.h:3165:5 */
-type LPMENUINFO = uintptr   /* winuser.h:3165:14 */
+type MENUINFO = tagMENUINFO /* winuser.h:3306:5 */
+type LPMENUINFO = uintptr   /* winuser.h:3306:14 */
 
-type LPTPMPARAMS = uintptr /* winuser.h:3167:21 */
-type LPCMENUINFO = uintptr /* winuser.h:3168:26 */
+type LPTPMPARAMS = uintptr /* winuser.h:3308:21 */
+type LPCMENUINFO = uintptr /* winuser.h:3309:26 */
 
 type tagMENUGETOBJECTINFO = struct {
 	FdwFlags DWORD
@@ -41267,10 +41768,10 @@ type tagMENUGETOBJECTINFO = struct {
 	Fhmenu   HMENU
 	Friid    PVOID
 	FpvObj   PVOID
-} /* winuser.h:3178:11 */
+} /* winuser.h:3319:11 */
 
-type MENUGETOBJECTINFO = tagMENUGETOBJECTINFO /* winuser.h:3184:5 */
-type PMENUGETOBJECTINFO = uintptr             /* winuser.h:3184:23 */
+type MENUGETOBJECTINFO = tagMENUGETOBJECTINFO /* winuser.h:3325:5 */
+type PMENUGETOBJECTINFO = uintptr             /* winuser.h:3325:23 */
 
 type tagMENUITEMINFOA = struct {
 	FcbSize        UINT
@@ -41278,19 +41779,19 @@ type tagMENUITEMINFOA = struct {
 	FfType         UINT
 	FfState        UINT
 	FwID           UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhSubMenu      HMENU
 	FhbmpChecked   HBITMAP
 	FhbmpUnchecked HBITMAP
 	FdwItemData    ULONG_PTR
 	FdwTypeData    LPSTR
 	Fcch           UINT
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FhbmpItem      HBITMAP
-} /* winuser.h:3186:11 */
+} /* winuser.h:3327:11 */
 
-type MENUITEMINFOA = tagMENUITEMINFOA /* winuser.h:3199:5 */
-type LPMENUITEMINFOA = uintptr        /* winuser.h:3199:19 */
+type MENUITEMINFOA = tagMENUITEMINFOA /* winuser.h:3340:5 */
+type LPMENUITEMINFOA = uintptr        /* winuser.h:3340:19 */
 
 type tagMENUITEMINFOW = struct {
 	FcbSize        UINT
@@ -41298,42 +41799,42 @@ type tagMENUITEMINFOW = struct {
 	FfType         UINT
 	FfState        UINT
 	FwID           UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhSubMenu      HMENU
 	FhbmpChecked   HBITMAP
 	FhbmpUnchecked HBITMAP
 	FdwItemData    ULONG_PTR
 	FdwTypeData    LPWSTR
 	Fcch           UINT
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FhbmpItem      HBITMAP
-} /* winuser.h:3201:11 */
+} /* winuser.h:3342:11 */
 
-type MENUITEMINFOW = tagMENUITEMINFOW /* winuser.h:3214:5 */
-type LPMENUITEMINFOW = uintptr        /* winuser.h:3214:19 */
+type MENUITEMINFOW = tagMENUITEMINFOW /* winuser.h:3355:5 */
+type LPMENUITEMINFOW = uintptr        /* winuser.h:3355:19 */
 
-type MENUITEMINFO = MENUITEMINFOA     /* winuser.h:3216:3 */
-type LPMENUITEMINFO = LPMENUITEMINFOA /* winuser.h:3217:3 */
+type MENUITEMINFO = MENUITEMINFOA     /* winuser.h:3357:3 */
+type LPMENUITEMINFO = LPMENUITEMINFOA /* winuser.h:3358:3 */
 
-type LPCMENUITEMINFOA = uintptr /* winuser.h:3219:31 */
-type LPCMENUITEMINFOW = uintptr /* winuser.h:3220:31 */
+type LPCMENUITEMINFOA = uintptr /* winuser.h:3360:31 */
+type LPCMENUITEMINFOW = uintptr /* winuser.h:3361:31 */
 
-type LPCMENUITEMINFO = LPCMENUITEMINFOA /* winuser.h:3222:3 */
+type LPCMENUITEMINFO = LPCMENUITEMINFOA /* winuser.h:3363:3 */
 
 type tagDROPSTRUCT = struct {
 	FhwndSource    HWND
 	FhwndSink      HWND
 	FwFmt          DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FdwData        ULONG_PTR
 	FptDrop        POINT
 	FdwControlData DWORD
-	_              [4]byte
-} /* winuser.h:3270:11 */
+	F__ccgo_pad2   [4]byte
+} /* winuser.h:3411:11 */
 
-type DROPSTRUCT = tagDROPSTRUCT /* winuser.h:3277:5 */
-type PDROPSTRUCT = uintptr      /* winuser.h:3277:16 */
-type LPDROPSTRUCT = uintptr     /* winuser.h:3277:29 */
+type DROPSTRUCT = tagDROPSTRUCT /* winuser.h:3418:5 */
+type PDROPSTRUCT = uintptr      /* winuser.h:3418:16 */
+type LPDROPSTRUCT = uintptr     /* winuser.h:3418:29 */
 
 type tagDRAWTEXTPARAMS = struct {
 	FcbSize        UINT
@@ -41341,108 +41842,108 @@ type tagDRAWTEXTPARAMS = struct {
 	FiLeftMargin   int32
 	FiRightMargin  int32
 	FuiLengthDrawn UINT
-} /* winuser.h:3324:11 */
+} /* winuser.h:3465:11 */
 
-type DRAWTEXTPARAMS = tagDRAWTEXTPARAMS /* winuser.h:3330:5 */
-type LPDRAWTEXTPARAMS = uintptr         /* winuser.h:3330:20 */
+type DRAWTEXTPARAMS = tagDRAWTEXTPARAMS /* winuser.h:3471:5 */
+type LPDRAWTEXTPARAMS = uintptr         /* winuser.h:3471:20 */
 
 type tagHELPINFO = struct {
 	FcbSize       UINT
 	FiContextType int32
 	FiCtrlId      int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FhItemHandle  HANDLE
 	FdwContextId  DWORD_PTR
 	FMousePos     POINT
-} /* winuser.h:3507:11 */
+} /* winuser.h:3652:11 */
 
-type HELPINFO = tagHELPINFO /* winuser.h:3514:5 */
-type LPHELPINFO = uintptr   /* winuser.h:3514:14 */
+type HELPINFO = tagHELPINFO /* winuser.h:3659:5 */
+type LPHELPINFO = uintptr   /* winuser.h:3659:14 */
 
-type MSGBOXCALLBACK = uintptr /* winuser.h:3571:16 */
+type MSGBOXCALLBACK = uintptr /* winuser.h:3716:16 */
 
 type tagMSGBOXPARAMSA = struct {
 	FcbSize             UINT
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FhwndOwner          HWND
 	FhInstance          HINSTANCE
 	FlpszText           LPCSTR
 	FlpszCaption        LPCSTR
 	FdwStyle            DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FlpszIcon           LPCSTR
 	FdwContextHelpId    DWORD_PTR
 	FlpfnMsgBoxCallback MSGBOXCALLBACK
 	FdwLanguageId       DWORD
-	_                   [4]byte
-} /* winuser.h:3573:11 */
+	F__ccgo_pad3        [4]byte
+} /* winuser.h:3718:11 */
 
-type MSGBOXPARAMSA = tagMSGBOXPARAMSA /* winuser.h:3584:5 */
-type PMSGBOXPARAMSA = uintptr         /* winuser.h:3584:19 */
-type LPMSGBOXPARAMSA = uintptr        /* winuser.h:3584:35 */
+type MSGBOXPARAMSA = tagMSGBOXPARAMSA /* winuser.h:3729:5 */
+type PMSGBOXPARAMSA = uintptr         /* winuser.h:3729:19 */
+type LPMSGBOXPARAMSA = uintptr        /* winuser.h:3729:35 */
 
 type tagMSGBOXPARAMSW = struct {
 	FcbSize             UINT
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FhwndOwner          HWND
 	FhInstance          HINSTANCE
 	FlpszText           LPCWSTR
 	FlpszCaption        LPCWSTR
 	FdwStyle            DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FlpszIcon           LPCWSTR
 	FdwContextHelpId    DWORD_PTR
 	FlpfnMsgBoxCallback MSGBOXCALLBACK
 	FdwLanguageId       DWORD
-	_                   [4]byte
-} /* winuser.h:3586:11 */
+	F__ccgo_pad3        [4]byte
+} /* winuser.h:3731:11 */
 
-type MSGBOXPARAMSW = tagMSGBOXPARAMSW /* winuser.h:3597:5 */
-type PMSGBOXPARAMSW = uintptr         /* winuser.h:3597:19 */
-type LPMSGBOXPARAMSW = uintptr        /* winuser.h:3597:35 */
+type MSGBOXPARAMSW = tagMSGBOXPARAMSW /* winuser.h:3742:5 */
+type PMSGBOXPARAMSW = uintptr         /* winuser.h:3742:19 */
+type LPMSGBOXPARAMSW = uintptr        /* winuser.h:3742:35 */
 
-type MSGBOXPARAMS = MSGBOXPARAMSA     /* winuser.h:3599:3 */
-type PMSGBOXPARAMS = PMSGBOXPARAMSA   /* winuser.h:3600:3 */
-type LPMSGBOXPARAMS = LPMSGBOXPARAMSA /* winuser.h:3601:3 */
+type MSGBOXPARAMS = MSGBOXPARAMSA     /* winuser.h:3744:3 */
+type PMSGBOXPARAMS = PMSGBOXPARAMSA   /* winuser.h:3745:3 */
+type LPMSGBOXPARAMS = LPMSGBOXPARAMSA /* winuser.h:3746:3 */
 
 type MENUITEMTEMPLATEHEADER = struct {
 	FversionNumber WORD
 	Foffset        WORD
-}                                      /* winuser.h:3910:5 */
-type PMENUITEMTEMPLATEHEADER = uintptr /* winuser.h:3910:28 */
+}                                      /* winuser.h:4059:5 */
+type PMENUITEMTEMPLATEHEADER = uintptr /* winuser.h:4059:28 */
 
 type MENUITEMTEMPLATE = struct {
 	FmtOption WORD
 	FmtID     WORD
 	FmtString [1]WCHAR
-}                                /* winuser.h:3916:5 */
-type PMENUITEMTEMPLATE = uintptr /* winuser.h:3916:22 */
+}                                /* winuser.h:4065:5 */
+type PMENUITEMTEMPLATE = uintptr /* winuser.h:4065:22 */
 
 type _ICONINFO = struct {
-	FfIcon    WINBOOL
-	FxHotspot DWORD
-	FyHotspot DWORD
-	_         [4]byte
-	FhbmMask  HBITMAP
-	FhbmColor HBITMAP
-} /* winuser.h:3989:11 */
+	FfIcon       WINBOOL
+	FxHotspot    DWORD
+	FyHotspot    DWORD
+	F__ccgo_pad1 [4]byte
+	FhbmMask     HBITMAP
+	FhbmColor    HBITMAP
+} /* winuser.h:4142:11 */
 
-type ICONINFO = _ICONINFO /* winuser.h:3995:5 */
-type PICONINFO = uintptr  /* winuser.h:3996:20 */
+type ICONINFO = _ICONINFO /* winuser.h:4148:5 */
+type PICONINFO = uintptr  /* winuser.h:4149:20 */
 
 type tagCURSORSHAPE = struct {
-	FxHotSpot  int32
-	FyHotSpot  int32
-	Fcx        int32
-	Fcy        int32
-	FcbWidth   int32
-	FPlanes    BYTE
-	FBitsPixel BYTE
-	_          [2]byte
-} /* winuser.h:4013:11 */
-
-type CURSORSHAPE = tagCURSORSHAPE /* winuser.h:4021:5 */
-type LPCURSORSHAPE = uintptr      /* winuser.h:4021:17 */
+	FxHotSpot    int32
+	FyHotSpot    int32
+	Fcx          int32
+	Fcy          int32
+	FcbWidth     int32
+	FPlanes      BYTE
+	FBitsPixel   BYTE
+	F__ccgo_pad1 [2]byte
+} /* winuser.h:4166:11 */
+
+type CURSORSHAPE = tagCURSORSHAPE /* winuser.h:4174:5 */
+type LPCURSORSHAPE = uintptr      /* winuser.h:4174:17 */
 
 type tagSCROLLINFO = struct {
 	FcbSize    UINT
@@ -41452,82 +41953,82 @@ type tagSCROLLINFO = struct {
 	FnPage     UINT
 	FnPos      int32
 	FnTrackPos int32
-} /* winuser.h:4701:11 */
+} /* winuser.h:4882:11 */
 
-type SCROLLINFO = tagSCROLLINFO /* winuser.h:4709:5 */
-type LPSCROLLINFO = uintptr     /* winuser.h:4709:16 */
-type LPCSCROLLINFO = uintptr    /* winuser.h:4710:28 */
+type SCROLLINFO = tagSCROLLINFO /* winuser.h:4890:5 */
+type LPSCROLLINFO = uintptr     /* winuser.h:4890:16 */
+type LPCSCROLLINFO = uintptr    /* winuser.h:4891:28 */
 
 type tagMDICREATESTRUCTA = struct {
-	FszClass LPCSTR
-	FszTitle LPCSTR
-	FhOwner  HANDLE
-	Fx       int32
-	Fy       int32
-	Fcx      int32
-	Fcy      int32
-	Fstyle   DWORD
-	_        [4]byte
-	FlParam  LPARAM
-} /* winuser.h:4728:11 */
-
-type MDICREATESTRUCTA = tagMDICREATESTRUCTA /* winuser.h:4738:5 */
-type LPMDICREATESTRUCTA = uintptr           /* winuser.h:4738:22 */
+	FszClass     LPCSTR
+	FszTitle     LPCSTR
+	FhOwner      HANDLE
+	Fx           int32
+	Fy           int32
+	Fcx          int32
+	Fcy          int32
+	Fstyle       DWORD
+	F__ccgo_pad1 [4]byte
+	FlParam      LPARAM
+} /* winuser.h:4909:11 */
+
+type MDICREATESTRUCTA = tagMDICREATESTRUCTA /* winuser.h:4919:5 */
+type LPMDICREATESTRUCTA = uintptr           /* winuser.h:4919:22 */
 
 type tagMDICREATESTRUCTW = struct {
-	FszClass LPCWSTR
-	FszTitle LPCWSTR
-	FhOwner  HANDLE
-	Fx       int32
-	Fy       int32
-	Fcx      int32
-	Fcy      int32
-	Fstyle   DWORD
-	_        [4]byte
-	FlParam  LPARAM
-} /* winuser.h:4740:11 */
-
-type MDICREATESTRUCTW = tagMDICREATESTRUCTW /* winuser.h:4750:5 */
-type LPMDICREATESTRUCTW = uintptr           /* winuser.h:4750:22 */
-
-type MDICREATESTRUCT = MDICREATESTRUCTA     /* winuser.h:4752:3 */
-type LPMDICREATESTRUCT = LPMDICREATESTRUCTA /* winuser.h:4753:3 */
+	FszClass     LPCWSTR
+	FszTitle     LPCWSTR
+	FhOwner      HANDLE
+	Fx           int32
+	Fy           int32
+	Fcx          int32
+	Fcy          int32
+	Fstyle       DWORD
+	F__ccgo_pad1 [4]byte
+	FlParam      LPARAM
+} /* winuser.h:4921:11 */
+
+type MDICREATESTRUCTW = tagMDICREATESTRUCTW /* winuser.h:4931:5 */
+type LPMDICREATESTRUCTW = uintptr           /* winuser.h:4931:22 */
+
+type MDICREATESTRUCT = MDICREATESTRUCTA     /* winuser.h:4933:3 */
+type LPMDICREATESTRUCT = LPMDICREATESTRUCTA /* winuser.h:4934:3 */
 
 type tagCLIENTCREATESTRUCT = struct {
 	FhWindowMenu  HANDLE
 	FidFirstChild UINT
-	_             [4]byte
-} /* winuser.h:4755:11 */
+	F__ccgo_pad1  [4]byte
+} /* winuser.h:4936:11 */
 
-type CLIENTCREATESTRUCT = tagCLIENTCREATESTRUCT /* winuser.h:4758:5 */
-type LPCLIENTCREATESTRUCT = uintptr             /* winuser.h:4758:24 */
+type CLIENTCREATESTRUCT = tagCLIENTCREATESTRUCT /* winuser.h:4939:5 */
+type LPCLIENTCREATESTRUCT = uintptr             /* winuser.h:4939:24 */
 
-type HELPPOLY = DWORD /* winuser.h:4784:17 */
+type HELPPOLY = DWORD /* winuser.h:4965:17 */
 
 type tagMULTIKEYHELPA = struct {
 	FmkSize      DWORD
 	FmkKeylist   CHAR
 	FszKeyphrase [1]CHAR
-	_            [2]byte
-} /* winuser.h:4786:11 */
+	F__ccgo_pad1 [2]byte
+} /* winuser.h:4967:11 */
 
-type MULTIKEYHELPA = tagMULTIKEYHELPA /* winuser.h:4790:5 */
-type PMULTIKEYHELPA = uintptr         /* winuser.h:4790:19 */
-type LPMULTIKEYHELPA = uintptr        /* winuser.h:4790:35 */
+type MULTIKEYHELPA = tagMULTIKEYHELPA /* winuser.h:4971:5 */
+type PMULTIKEYHELPA = uintptr         /* winuser.h:4971:19 */
+type LPMULTIKEYHELPA = uintptr        /* winuser.h:4971:35 */
 
 type tagMULTIKEYHELPW = struct {
 	FmkSize      DWORD
 	FmkKeylist   WCHAR
 	FszKeyphrase [1]WCHAR
-} /* winuser.h:4792:11 */
+} /* winuser.h:4973:11 */
 
-type MULTIKEYHELPW = tagMULTIKEYHELPW /* winuser.h:4796:5 */
-type PMULTIKEYHELPW = uintptr         /* winuser.h:4796:19 */
-type LPMULTIKEYHELPW = uintptr        /* winuser.h:4796:35 */
+type MULTIKEYHELPW = tagMULTIKEYHELPW /* winuser.h:4977:5 */
+type PMULTIKEYHELPW = uintptr         /* winuser.h:4977:19 */
+type LPMULTIKEYHELPW = uintptr        /* winuser.h:4977:35 */
 
-type MULTIKEYHELP = MULTIKEYHELPA     /* winuser.h:4798:3 */
-type PMULTIKEYHELP = PMULTIKEYHELPA   /* winuser.h:4799:3 */
-type LPMULTIKEYHELP = LPMULTIKEYHELPA /* winuser.h:4800:3 */
+type MULTIKEYHELP = MULTIKEYHELPA     /* winuser.h:4979:3 */
+type PMULTIKEYHELP = PMULTIKEYHELPA   /* winuser.h:4980:3 */
+type LPMULTIKEYHELP = LPMULTIKEYHELPA /* winuser.h:4981:3 */
 
 type tagHELPWININFOA = struct {
 	FwStructSize int32
@@ -41537,12 +42038,12 @@ type tagHELPWININFOA = struct {
 	Fdy          int32
 	FwMax        int32
 	FrgchMember  [2]CHAR
-	_            [2]byte
-} /* winuser.h:4802:11 */
+	F__ccgo_pad1 [2]byte
+} /* winuser.h:4983:11 */
 
-type HELPWININFOA = tagHELPWININFOA /* winuser.h:4810:5 */
-type PHELPWININFOA = uintptr        /* winuser.h:4810:18 */
-type LPHELPWININFOA = uintptr       /* winuser.h:4810:33 */
+type HELPWININFOA = tagHELPWININFOA /* winuser.h:4991:5 */
+type PHELPWININFOA = uintptr        /* winuser.h:4991:18 */
+type LPHELPWININFOA = uintptr       /* winuser.h:4991:33 */
 
 type tagHELPWININFOW = struct {
 	FwStructSize int32
@@ -41552,15 +42053,15 @@ type tagHELPWININFOW = struct {
 	Fdy          int32
 	FwMax        int32
 	FrgchMember  [2]WCHAR
-} /* winuser.h:4812:11 */
+} /* winuser.h:4993:11 */
 
-type HELPWININFOW = tagHELPWININFOW /* winuser.h:4820:5 */
-type PHELPWININFOW = uintptr        /* winuser.h:4820:18 */
-type LPHELPWININFOW = uintptr       /* winuser.h:4820:33 */
+type HELPWININFOW = tagHELPWININFOW /* winuser.h:5001:5 */
+type PHELPWININFOW = uintptr        /* winuser.h:5001:18 */
+type LPHELPWININFOW = uintptr       /* winuser.h:5001:33 */
 
-type HELPWININFO = HELPWININFOA     /* winuser.h:4822:3 */
-type PHELPWININFO = PHELPWININFOA   /* winuser.h:4823:3 */
-type LPHELPWININFO = LPHELPWININFOA /* winuser.h:4824:3 */
+type HELPWININFO = HELPWININFOA     /* winuser.h:5003:3 */
+type PHELPWININFO = PHELPWININFOA   /* winuser.h:5004:3 */
+type LPHELPWININFO = LPHELPWININFOA /* winuser.h:5005:3 */
 
 type tagNONCLIENTMETRICSA = struct {
 	FcbSize           UINT
@@ -41578,11 +42079,11 @@ type tagNONCLIENTMETRICSA = struct {
 	FlfMenuFont       LOGFONTA
 	FlfStatusFont     LOGFONTA
 	FlfMessageFont    LOGFONTA
-} /* winuser.h:5183:11 */
+} /* winuser.h:5408:11 */
 
-type NONCLIENTMETRICSA = tagNONCLIENTMETRICSA /* winuser.h:5202:5 */
-type PNONCLIENTMETRICSA = uintptr             /* winuser.h:5202:23 */
-type LPNONCLIENTMETRICSA = uintptr            /* winuser.h:5202:43 */
+type NONCLIENTMETRICSA = tagNONCLIENTMETRICSA /* winuser.h:5427:5 */
+type PNONCLIENTMETRICSA = uintptr             /* winuser.h:5427:23 */
+type LPNONCLIENTMETRICSA = uintptr            /* winuser.h:5427:43 */
 
 type tagNONCLIENTMETRICSW = struct {
 	FcbSize           UINT
@@ -41600,15 +42101,15 @@ type tagNONCLIENTMETRICSW = struct {
 	FlfMenuFont       LOGFONTW
 	FlfStatusFont     LOGFONTW
 	FlfMessageFont    LOGFONTW
-} /* winuser.h:5204:11 */
+} /* winuser.h:5429:11 */
 
-type NONCLIENTMETRICSW = tagNONCLIENTMETRICSW /* winuser.h:5223:5 */
-type PNONCLIENTMETRICSW = uintptr             /* winuser.h:5223:23 */
-type LPNONCLIENTMETRICSW = uintptr            /* winuser.h:5223:43 */
+type NONCLIENTMETRICSW = tagNONCLIENTMETRICSW /* winuser.h:5448:5 */
+type PNONCLIENTMETRICSW = uintptr             /* winuser.h:5448:23 */
+type LPNONCLIENTMETRICSW = uintptr            /* winuser.h:5448:43 */
 
-type NONCLIENTMETRICS = NONCLIENTMETRICSA     /* winuser.h:5225:3 */
-type PNONCLIENTMETRICS = PNONCLIENTMETRICSA   /* winuser.h:5226:3 */
-type LPNONCLIENTMETRICS = LPNONCLIENTMETRICSA /* winuser.h:5227:3 */
+type NONCLIENTMETRICS = NONCLIENTMETRICSA     /* winuser.h:5450:3 */
+type PNONCLIENTMETRICS = PNONCLIENTMETRICSA   /* winuser.h:5451:3 */
+type LPNONCLIENTMETRICS = LPNONCLIENTMETRICSA /* winuser.h:5452:3 */
 
 type tagMINIMIZEDMETRICS = struct {
 	FcbSize   UINT
@@ -41616,11 +42117,11 @@ type tagMINIMIZEDMETRICS = struct {
 	FiHorzGap int32
 	FiVertGap int32
 	FiArrange int32
-} /* winuser.h:5247:11 */
+} /* winuser.h:5472:11 */
 
-type MINIMIZEDMETRICS = tagMINIMIZEDMETRICS /* winuser.h:5253:5 */
-type PMINIMIZEDMETRICS = uintptr            /* winuser.h:5253:22 */
-type LPMINIMIZEDMETRICS = uintptr           /* winuser.h:5253:41 */
+type MINIMIZEDMETRICS = tagMINIMIZEDMETRICS /* winuser.h:5478:5 */
+type PMINIMIZEDMETRICS = uintptr            /* winuser.h:5478:22 */
+type LPMINIMIZEDMETRICS = uintptr           /* winuser.h:5478:41 */
 
 type tagICONMETRICSA = struct {
 	FcbSize       UINT
@@ -41628,11 +42129,11 @@ type tagICONMETRICSA = struct {
 	FiVertSpacing int32
 	FiTitleWrap   int32
 	FlfFont       LOGFONTA
-} /* winuser.h:5257:11 */
+} /* winuser.h:5482:11 */
 
-type ICONMETRICSA = tagICONMETRICSA /* winuser.h:5263:5 */
-type PICONMETRICSA = uintptr        /* winuser.h:5263:18 */
-type LPICONMETRICSA = uintptr       /* winuser.h:5263:33 */
+type ICONMETRICSA = tagICONMETRICSA /* winuser.h:5488:5 */
+type PICONMETRICSA = uintptr        /* winuser.h:5488:18 */
+type LPICONMETRICSA = uintptr       /* winuser.h:5488:33 */
 
 type tagICONMETRICSW = struct {
 	FcbSize       UINT
@@ -41640,23 +42141,23 @@ type tagICONMETRICSW = struct {
 	FiVertSpacing int32
 	FiTitleWrap   int32
 	FlfFont       LOGFONTW
-} /* winuser.h:5265:11 */
+} /* winuser.h:5490:11 */
 
-type ICONMETRICSW = tagICONMETRICSW /* winuser.h:5271:5 */
-type PICONMETRICSW = uintptr        /* winuser.h:5271:18 */
-type LPICONMETRICSW = uintptr       /* winuser.h:5271:33 */
+type ICONMETRICSW = tagICONMETRICSW /* winuser.h:5496:5 */
+type PICONMETRICSW = uintptr        /* winuser.h:5496:18 */
+type LPICONMETRICSW = uintptr       /* winuser.h:5496:33 */
 
-type ICONMETRICS = ICONMETRICSA     /* winuser.h:5273:3 */
-type PICONMETRICS = PICONMETRICSA   /* winuser.h:5274:3 */
-type LPICONMETRICS = LPICONMETRICSA /* winuser.h:5275:3 */
+type ICONMETRICS = ICONMETRICSA     /* winuser.h:5498:3 */
+type PICONMETRICS = PICONMETRICSA   /* winuser.h:5499:3 */
+type LPICONMETRICS = LPICONMETRICSA /* winuser.h:5500:3 */
 
 type tagANIMATIONINFO = struct {
 	FcbSize      UINT
 	FiMinAnimate int32
-} /* winuser.h:5279:11 */
+} /* winuser.h:5504:11 */
 
-type ANIMATIONINFO = tagANIMATIONINFO /* winuser.h:5282:5 */
-type LPANIMATIONINFO = uintptr        /* winuser.h:5282:19 */
+type ANIMATIONINFO = tagANIMATIONINFO /* winuser.h:5507:5 */
+type LPANIMATIONINFO = uintptr        /* winuser.h:5507:19 */
 
 type tagSERIALKEYSA = struct {
 	FcbSize         UINT
@@ -41666,11 +42167,11 @@ type tagSERIALKEYSA = struct {
 	FiBaudRate      UINT
 	FiPortState     UINT
 	FiActive        UINT
-	_               [4]byte
-} /* winuser.h:5284:11 */
+	F__ccgo_pad1    [4]byte
+} /* winuser.h:5509:11 */
 
-type SERIALKEYSA = tagSERIALKEYSA /* winuser.h:5292:5 */
-type LPSERIALKEYSA = uintptr      /* winuser.h:5292:17 */
+type SERIALKEYSA = tagSERIALKEYSA /* winuser.h:5517:5 */
+type LPSERIALKEYSA = uintptr      /* winuser.h:5517:17 */
 
 type tagSERIALKEYSW = struct {
 	FcbSize         UINT
@@ -41680,35 +42181,35 @@ type tagSERIALKEYSW = struct {
 	FiBaudRate      UINT
 	FiPortState     UINT
 	FiActive        UINT
-	_               [4]byte
-} /* winuser.h:5294:11 */
+	F__ccgo_pad1    [4]byte
+} /* winuser.h:5519:11 */
 
-type SERIALKEYSW = tagSERIALKEYSW /* winuser.h:5302:5 */
-type LPSERIALKEYSW = uintptr      /* winuser.h:5302:17 */
+type SERIALKEYSW = tagSERIALKEYSW /* winuser.h:5527:5 */
+type LPSERIALKEYSW = uintptr      /* winuser.h:5527:17 */
 
-type SERIALKEYS = SERIALKEYSA     /* winuser.h:5304:3 */
-type LPSERIALKEYS = LPSERIALKEYSA /* winuser.h:5305:3 */
+type SERIALKEYS = SERIALKEYSA     /* winuser.h:5529:3 */
+type LPSERIALKEYS = LPSERIALKEYSA /* winuser.h:5530:3 */
 
 type tagHIGHCONTRASTA = struct {
 	FcbSize            UINT
 	FdwFlags           DWORD
 	FlpszDefaultScheme LPSTR
-} /* winuser.h:5307:11 */
+} /* winuser.h:5532:11 */
 
-type HIGHCONTRASTA = tagHIGHCONTRASTA /* winuser.h:5311:5 */
-type LPHIGHCONTRASTA = uintptr        /* winuser.h:5311:19 */
+type HIGHCONTRASTA = tagHIGHCONTRASTA /* winuser.h:5536:5 */
+type LPHIGHCONTRASTA = uintptr        /* winuser.h:5536:19 */
 
 type tagHIGHCONTRASTW = struct {
 	FcbSize            UINT
 	FdwFlags           DWORD
 	FlpszDefaultScheme LPWSTR
-} /* winuser.h:5313:11 */
+} /* winuser.h:5538:11 */
 
-type HIGHCONTRASTW = tagHIGHCONTRASTW /* winuser.h:5317:5 */
-type LPHIGHCONTRASTW = uintptr        /* winuser.h:5317:19 */
+type HIGHCONTRASTW = tagHIGHCONTRASTW /* winuser.h:5542:5 */
+type LPHIGHCONTRASTW = uintptr        /* winuser.h:5542:19 */
 
-type HIGHCONTRAST = HIGHCONTRASTA     /* winuser.h:5319:3 */
-type LPHIGHCONTRAST = LPHIGHCONTRASTA /* winuser.h:5320:3 */
+type HIGHCONTRAST = HIGHCONTRASTA     /* winuser.h:5544:3 */
+type LPHIGHCONTRAST = LPHIGHCONTRASTA /* winuser.h:5545:3 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -41769,18 +42270,18 @@ type tagFILTERKEYS = struct {
 	FiDelayMSec  DWORD
 	FiRepeatMSec DWORD
 	FiBounceMSec DWORD
-} /* winuser.h:5409:11 */
+} /* winuser.h:5641:11 */
 
-type FILTERKEYS = tagFILTERKEYS /* winuser.h:5416:5 */
-type LPFILTERKEYS = uintptr     /* winuser.h:5416:16 */
+type FILTERKEYS = tagFILTERKEYS /* winuser.h:5648:5 */
+type LPFILTERKEYS = uintptr     /* winuser.h:5648:16 */
 
 type tagSTICKYKEYS = struct {
 	FcbSize  UINT
 	FdwFlags DWORD
-} /* winuser.h:5428:11 */
+} /* winuser.h:5660:11 */
 
-type STICKYKEYS = tagSTICKYKEYS /* winuser.h:5431:5 */
-type LPSTICKYKEYS = uintptr     /* winuser.h:5431:16 */
+type STICKYKEYS = tagSTICKYKEYS /* winuser.h:5663:5 */
+type LPSTICKYKEYS = uintptr     /* winuser.h:5663:16 */
 
 type tagMOUSEKEYS = struct {
 	FcbSize          UINT
@@ -41790,19 +42291,19 @@ type tagMOUSEKEYS = struct {
 	FiCtrlSpeed      DWORD
 	FdwReserved1     DWORD
 	FdwReserved2     DWORD
-} /* winuser.h:5461:11 */
+} /* winuser.h:5693:11 */
 
-type MOUSEKEYS = tagMOUSEKEYS /* winuser.h:5469:5 */
-type LPMOUSEKEYS = uintptr    /* winuser.h:5469:15 */
+type MOUSEKEYS = tagMOUSEKEYS /* winuser.h:5701:5 */
+type LPMOUSEKEYS = uintptr    /* winuser.h:5701:15 */
 
 type tagACCESSTIMEOUT = struct {
 	FcbSize       UINT
 	FdwFlags      DWORD
 	FiTimeOutMSec DWORD
-} /* winuser.h:5487:11 */
+} /* winuser.h:5719:11 */
 
-type ACCESSTIMEOUT = tagACCESSTIMEOUT /* winuser.h:5491:5 */
-type LPACCESSTIMEOUT = uintptr        /* winuser.h:5491:19 */
+type ACCESSTIMEOUT = tagACCESSTIMEOUT /* winuser.h:5723:5 */
+type LPACCESSTIMEOUT = uintptr        /* winuser.h:5723:19 */
 
 type tagSOUNDSENTRYA = struct {
 	FcbSize                 UINT
@@ -41817,11 +42318,11 @@ type tagSOUNDSENTRYA = struct {
 	FiWindowsEffectMSec     DWORD
 	FlpszWindowsEffectDLL   LPSTR
 	FiWindowsEffectOrdinal  DWORD
-	_                       [4]byte
-} /* winuser.h:5512:11 */
+	F__ccgo_pad1            [4]byte
+} /* winuser.h:5744:11 */
 
-type SOUNDSENTRYA = tagSOUNDSENTRYA /* winuser.h:5525:5 */
-type LPSOUNDSENTRYA = uintptr       /* winuser.h:5525:18 */
+type SOUNDSENTRYA = tagSOUNDSENTRYA /* winuser.h:5757:5 */
+type LPSOUNDSENTRYA = uintptr       /* winuser.h:5757:18 */
 
 type tagSOUNDSENTRYW = struct {
 	FcbSize                 UINT
@@ -41836,32 +42337,32 @@ type tagSOUNDSENTRYW = struct {
 	FiWindowsEffectMSec     DWORD
 	FlpszWindowsEffectDLL   LPWSTR
 	FiWindowsEffectOrdinal  DWORD
-	_                       [4]byte
-} /* winuser.h:5527:11 */
+	F__ccgo_pad1            [4]byte
+} /* winuser.h:5759:11 */
 
-type SOUNDSENTRYW = tagSOUNDSENTRYW /* winuser.h:5540:5 */
-type LPSOUNDSENTRYW = uintptr       /* winuser.h:5540:18 */
+type SOUNDSENTRYW = tagSOUNDSENTRYW /* winuser.h:5772:5 */
+type LPSOUNDSENTRYW = uintptr       /* winuser.h:5772:18 */
 
-type SOUNDSENTRY = SOUNDSENTRYA     /* winuser.h:5542:3 */
-type LPSOUNDSENTRY = LPSOUNDSENTRYA /* winuser.h:5543:3 */
+type SOUNDSENTRY = SOUNDSENTRYA     /* winuser.h:5774:3 */
+type LPSOUNDSENTRY = LPSOUNDSENTRYA /* winuser.h:5775:3 */
 
 type tagTOGGLEKEYS = struct {
 	FcbSize  UINT
 	FdwFlags DWORD
-} /* winuser.h:5555:11 */
+} /* winuser.h:5787:11 */
 
-type TOGGLEKEYS = tagTOGGLEKEYS /* winuser.h:5558:5 */
-type LPTOGGLEKEYS = uintptr     /* winuser.h:5558:16 */
+type TOGGLEKEYS = tagTOGGLEKEYS /* winuser.h:5790:5 */
+type LPTOGGLEKEYS = uintptr     /* winuser.h:5790:16 */
 
 type tagMONITORINFO = struct {
 	FcbSize    DWORD
 	FrcMonitor RECT
 	FrcWork    RECT
 	FdwFlags   DWORD
-} /* winuser.h:5560:11 */
+} /* winuser.h:5792:11 */
 
-type MONITORINFO = tagMONITORINFO /* winuser.h:5565:5 */
-type LPMONITORINFO = uintptr      /* winuser.h:5565:17 */
+type MONITORINFO = tagMONITORINFO /* winuser.h:5797:5 */
+type LPMONITORINFO = uintptr      /* winuser.h:5797:17 */
 
 type tagMONITORINFOEXA = struct {
 	F__0 struct {
@@ -41871,10 +42372,10 @@ type tagMONITORINFOEXA = struct {
 		FdwFlags   DWORD
 	}
 	FszDevice [32]CHAR
-} /* winuser.h:5587:11 */
+} /* winuser.h:5819:11 */
 
-type MONITORINFOEXA = tagMONITORINFOEXA /* winuser.h:5595:5 */
-type LPMONITORINFOEXA = uintptr         /* winuser.h:5595:20 */
+type MONITORINFOEXA = tagMONITORINFOEXA /* winuser.h:5827:5 */
+type LPMONITORINFOEXA = uintptr         /* winuser.h:5827:20 */
 
 type tagMONITORINFOEXW = struct {
 	F__0 struct {
@@ -41884,17 +42385,17 @@ type tagMONITORINFOEXW = struct {
 		FdwFlags   DWORD
 	}
 	FszDevice [32]WCHAR
-} /* winuser.h:5597:11 */
+} /* winuser.h:5829:11 */
 
-type MONITORINFOEXW = tagMONITORINFOEXW /* winuser.h:5605:5 */
-type LPMONITORINFOEXW = uintptr         /* winuser.h:5605:20 */
+type MONITORINFOEXW = tagMONITORINFOEXW /* winuser.h:5837:5 */
+type LPMONITORINFOEXW = uintptr         /* winuser.h:5837:20 */
 
-type MONITORINFOEX = MONITORINFOEXA     /* winuser.h:5607:3 */
-type LPMONITORINFOEX = LPMONITORINFOEXA /* winuser.h:5608:3 */
+type MONITORINFOEX = MONITORINFOEXA     /* winuser.h:5839:3 */
+type LPMONITORINFOEX = LPMONITORINFOEXA /* winuser.h:5840:3 */
 
-type MONITORENUMPROC = uintptr /* winuser.h:5611:19 */
+type MONITORENUMPROC = uintptr /* winuser.h:5843:19 */
 
-type WINEVENTPROC = uintptr /* winuser.h:5653:16 */
+type WINEVENTPROC = uintptr /* winuser.h:5885:16 */
 
 type tagGUITHREADINFO = struct {
 	FcbSize        DWORD
@@ -41906,22 +42407,22 @@ type tagGUITHREADINFO = struct {
 	FhwndMoveSize  HWND
 	FhwndCaret     HWND
 	FrcCaret       RECT
-} /* winuser.h:5830:11 */
+} /* winuser.h:6062:11 */
 
-type GUITHREADINFO = tagGUITHREADINFO /* winuser.h:5840:5 */
-type PGUITHREADINFO = uintptr         /* winuser.h:5840:19 */
-type LPGUITHREADINFO = uintptr        /* winuser.h:5840:35 */
+type GUITHREADINFO = tagGUITHREADINFO /* winuser.h:6072:5 */
+type PGUITHREADINFO = uintptr         /* winuser.h:6072:19 */
+type LPGUITHREADINFO = uintptr        /* winuser.h:6072:35 */
 
 type tagCURSORINFO = struct {
 	FcbSize      DWORD
 	Fflags       DWORD
 	FhCursor     HCURSOR
 	FptScreenPos POINT
-} /* winuser.h:5908:11 */
+} /* winuser.h:6167:11 */
 
-type CURSORINFO = tagCURSORINFO /* winuser.h:5913:5 */
-type PCURSORINFO = uintptr      /* winuser.h:5913:16 */
-type LPCURSORINFO = uintptr     /* winuser.h:5913:29 */
+type CURSORINFO = tagCURSORINFO /* winuser.h:6172:5 */
+type PCURSORINFO = uintptr      /* winuser.h:6172:16 */
+type LPCURSORINFO = uintptr     /* winuser.h:6172:29 */
 
 type tagWINDOWINFO = struct {
 	FcbSize          DWORD
@@ -41934,35 +42435,35 @@ type tagWINDOWINFO = struct {
 	FcyWindowBorders UINT
 	FatomWindowType  ATOM
 	FwCreatorVersion WORD
-} /* winuser.h:5922:11 */
+} /* winuser.h:6181:11 */
 
-type WINDOWINFO = tagWINDOWINFO /* winuser.h:5933:5 */
-type PWINDOWINFO = uintptr      /* winuser.h:5933:16 */
-type LPWINDOWINFO = uintptr     /* winuser.h:5933:29 */
+type WINDOWINFO = tagWINDOWINFO /* winuser.h:6192:5 */
+type PWINDOWINFO = uintptr      /* winuser.h:6192:16 */
+type LPWINDOWINFO = uintptr     /* winuser.h:6192:29 */
 
 type tagTITLEBARINFO = struct {
 	FcbSize     DWORD
 	FrcTitleBar RECT
 	Frgstate    [6]DWORD
-} /* winuser.h:5939:11 */
+} /* winuser.h:6198:11 */
 
-type TITLEBARINFO = tagTITLEBARINFO /* winuser.h:5943:5 */
-type PTITLEBARINFO = uintptr        /* winuser.h:5943:18 */
-type LPTITLEBARINFO = uintptr       /* winuser.h:5943:33 */
+type TITLEBARINFO = tagTITLEBARINFO /* winuser.h:6202:5 */
+type PTITLEBARINFO = uintptr        /* winuser.h:6202:18 */
+type LPTITLEBARINFO = uintptr       /* winuser.h:6202:33 */
 
 type tagMENUBARINFO = struct {
 	FcbSize      DWORD
 	FrcBar       RECT
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FhMenu       HMENU
 	FhwndMenu    HWND
 	FfBarFocused uint8 /* WINBOOL fBarFocused: 1, WINBOOL fFocused: 1 */
-	_            [7]byte
-} /* winuser.h:5956:11 */
+	F__ccgo_pad2 [7]byte
+} /* winuser.h:6215:11 */
 
-type MENUBARINFO = tagMENUBARINFO /* winuser.h:5963:5 */
-type PMENUBARINFO = uintptr       /* winuser.h:5963:17 */
-type LPMENUBARINFO = uintptr      /* winuser.h:5963:31 */
+type MENUBARINFO = tagMENUBARINFO /* winuser.h:6222:5 */
+type PMENUBARINFO = uintptr       /* winuser.h:6222:17 */
+type LPMENUBARINFO = uintptr      /* winuser.h:6222:31 */
 
 type tagSCROLLBARINFO = struct {
 	FcbSize        DWORD
@@ -41972,11 +42473,11 @@ type tagSCROLLBARINFO = struct {
 	FxyThumbBottom int32
 	Freserved      int32
 	Frgstate       [6]DWORD
-} /* winuser.h:5967:11 */
+} /* winuser.h:6226:11 */
 
-type SCROLLBARINFO = tagSCROLLBARINFO /* winuser.h:5975:5 */
-type PSCROLLBARINFO = uintptr         /* winuser.h:5975:19 */
-type LPSCROLLBARINFO = uintptr        /* winuser.h:5975:35 */
+type SCROLLBARINFO = tagSCROLLBARINFO /* winuser.h:6234:5 */
+type PSCROLLBARINFO = uintptr         /* winuser.h:6234:19 */
+type LPSCROLLBARINFO = uintptr        /* winuser.h:6234:35 */
 
 type tagCOMBOBOXINFO = struct {
 	FcbSize      DWORD
@@ -41986,11 +42487,11 @@ type tagCOMBOBOXINFO = struct {
 	FhwndCombo   HWND
 	FhwndItem    HWND
 	FhwndList    HWND
-} /* winuser.h:5979:11 */
+} /* winuser.h:6238:11 */
 
-type COMBOBOXINFO = tagCOMBOBOXINFO /* winuser.h:5987:5 */
-type PCOMBOBOXINFO = uintptr        /* winuser.h:5987:18 */
-type LPCOMBOBOXINFO = uintptr       /* winuser.h:5987:33 */
+type COMBOBOXINFO = tagCOMBOBOXINFO /* winuser.h:6246:5 */
+type PCOMBOBOXINFO = uintptr        /* winuser.h:6246:18 */
+type LPCOMBOBOXINFO = uintptr       /* winuser.h:6246:33 */
 
 type tagALTTABINFO = struct {
 	FcbSize    DWORD
@@ -42002,40 +42503,40 @@ type tagALTTABINFO = struct {
 	FcxItem    int32
 	FcyItem    int32
 	FptStart   POINT
-} /* winuser.h:6004:11 */
+} /* winuser.h:6263:11 */
 
-type ALTTABINFO = tagALTTABINFO /* winuser.h:6014:5 */
-type PALTTABINFO = uintptr      /* winuser.h:6014:16 */
-type LPALTTABINFO = uintptr     /* winuser.h:6014:29 */
+type ALTTABINFO = tagALTTABINFO /* winuser.h:6273:5 */
+type PALTTABINFO = uintptr      /* winuser.h:6273:16 */
+type LPALTTABINFO = uintptr     /* winuser.h:6273:29 */
 
-type HRAWINPUT__ = struct{ Funused int32 } /* winuser.h:6028:3 */
+type HRAWINPUT__ = struct{ Funused int32 } /* winuser.h:6287:3 */
 
-type HRAWINPUT = uintptr /* winuser.h:6028:3 */
+type HRAWINPUT = uintptr /* winuser.h:6287:3 */
 
 type tagRAWINPUTHEADER = struct {
 	FdwType  DWORD
 	FdwSize  DWORD
 	FhDevice HANDLE
 	FwParam  WPARAM
-} /* winuser.h:6037:11 */
+} /* winuser.h:6296:11 */
 
-type RAWINPUTHEADER = tagRAWINPUTHEADER /* winuser.h:6042:5 */
-type PRAWINPUTHEADER = uintptr          /* winuser.h:6042:20 */
-type LPRAWINPUTHEADER = uintptr         /* winuser.h:6042:37 */
+type RAWINPUTHEADER = tagRAWINPUTHEADER /* winuser.h:6301:5 */
+type PRAWINPUTHEADER = uintptr          /* winuser.h:6301:20 */
+type LPRAWINPUTHEADER = uintptr         /* winuser.h:6301:37 */
 
 type tagRAWMOUSE = struct {
 	FusFlags            USHORT
-	_                   [2]byte
+	F__ccgo_pad1        [2]byte
 	F__4                struct{ FulButtons ULONG }
 	FulRawButtons       ULONG
 	FlLastX             LONG
 	FlLastY             LONG
 	FulExtraInformation ULONG
-} /* winuser.h:6050:11 */
+} /* winuser.h:6310:11 */
 
-type RAWMOUSE = tagRAWMOUSE /* winuser.h:6063:5 */
-type PRAWMOUSE = uintptr    /* winuser.h:6063:14 */
-type LPRAWMOUSE = uintptr   /* winuser.h:6063:25 */
+type RAWMOUSE = tagRAWMOUSE /* winuser.h:6323:5 */
+type PRAWMOUSE = uintptr    /* winuser.h:6323:14 */
+type LPRAWMOUSE = uintptr   /* winuser.h:6323:25 */
 
 type tagRAWKEYBOARD = struct {
 	FMakeCode         USHORT
@@ -42044,41 +42545,41 @@ type tagRAWKEYBOARD = struct {
 	FVKey             USHORT
 	FMessage          UINT
 	FExtraInformation ULONG
-} /* winuser.h:6094:11 */
+} /* winuser.h:6357:11 */
 
-type RAWKEYBOARD = tagRAWKEYBOARD /* winuser.h:6101:5 */
-type PRAWKEYBOARD = uintptr       /* winuser.h:6101:17 */
-type LPRAWKEYBOARD = uintptr      /* winuser.h:6101:31 */
+type RAWKEYBOARD = tagRAWKEYBOARD /* winuser.h:6364:5 */
+type PRAWKEYBOARD = uintptr       /* winuser.h:6364:17 */
+type LPRAWKEYBOARD = uintptr      /* winuser.h:6364:31 */
 
 type tagRAWHID = struct {
-	FdwSizeHid DWORD
-	FdwCount   DWORD
-	FbRawData  [1]BYTE
-	_          [3]byte
-} /* winuser.h:6114:11 */
+	FdwSizeHid   DWORD
+	FdwCount     DWORD
+	FbRawData    [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* winuser.h:6377:11 */
 
-type RAWHID = tagRAWHID /* winuser.h:6118:5 */
-type PRAWHID = uintptr  /* winuser.h:6118:12 */
-type LPRAWHID = uintptr /* winuser.h:6118:21 */
+type RAWHID = tagRAWHID /* winuser.h:6381:5 */
+type PRAWHID = uintptr  /* winuser.h:6381:12 */
+type LPRAWHID = uintptr /* winuser.h:6381:21 */
 
 type tagRAWINPUT = struct {
 	Fheader RAWINPUTHEADER
 	Fdata   struct{ Fmouse RAWMOUSE }
-} /* winuser.h:6120:11 */
+} /* winuser.h:6383:11 */
 
-type RAWINPUT = tagRAWINPUT /* winuser.h:6127:5 */
-type PRAWINPUT = uintptr    /* winuser.h:6127:14 */
-type LPRAWINPUT = uintptr   /* winuser.h:6127:25 */
+type RAWINPUT = tagRAWINPUT /* winuser.h:6390:5 */
+type PRAWINPUT = uintptr    /* winuser.h:6390:14 */
+type LPRAWINPUT = uintptr   /* winuser.h:6390:25 */
 
 type tagRID_DEVICE_INFO_MOUSE = struct {
 	FdwId                DWORD
 	FdwNumberOfButtons   DWORD
 	FdwSampleRate        DWORD
 	FfHasHorizontalWheel WINBOOL
-} /* winuser.h:6150:11 */
+} /* winuser.h:6413:11 */
 
-type RID_DEVICE_INFO_MOUSE = tagRID_DEVICE_INFO_MOUSE /* winuser.h:6155:5 */
-type PRID_DEVICE_INFO_MOUSE = uintptr                 /* winuser.h:6155:27 */
+type RID_DEVICE_INFO_MOUSE = tagRID_DEVICE_INFO_MOUSE /* winuser.h:6418:5 */
+type PRID_DEVICE_INFO_MOUSE = uintptr                 /* winuser.h:6418:27 */
 
 type tagRID_DEVICE_INFO_KEYBOARD = struct {
 	FdwType                 DWORD
@@ -42087,10 +42588,10 @@ type tagRID_DEVICE_INFO_KEYBOARD = struct {
 	FdwNumberOfFunctionKeys DWORD
 	FdwNumberOfIndicators   DWORD
 	FdwNumberOfKeysTotal    DWORD
-} /* winuser.h:6157:11 */
+} /* winuser.h:6420:11 */
 
-type RID_DEVICE_INFO_KEYBOARD = tagRID_DEVICE_INFO_KEYBOARD /* winuser.h:6164:5 */
-type PRID_DEVICE_INFO_KEYBOARD = uintptr                    /* winuser.h:6164:30 */
+type RID_DEVICE_INFO_KEYBOARD = tagRID_DEVICE_INFO_KEYBOARD /* winuser.h:6427:5 */
+type PRID_DEVICE_INFO_KEYBOARD = uintptr                    /* winuser.h:6427:30 */
 
 type tagRID_DEVICE_INFO_HID = struct {
 	FdwVendorId      DWORD
@@ -42098,45 +42599,45 @@ type tagRID_DEVICE_INFO_HID = struct {
 	FdwVersionNumber DWORD
 	FusUsagePage     USHORT
 	FusUsage         USHORT
-} /* winuser.h:6166:11 */
+} /* winuser.h:6429:11 */
 
-type RID_DEVICE_INFO_HID = tagRID_DEVICE_INFO_HID /* winuser.h:6172:5 */
-type PRID_DEVICE_INFO_HID = uintptr               /* winuser.h:6172:25 */
+type RID_DEVICE_INFO_HID = tagRID_DEVICE_INFO_HID /* winuser.h:6435:5 */
+type PRID_DEVICE_INFO_HID = uintptr               /* winuser.h:6435:25 */
 
 type tagRID_DEVICE_INFO = struct {
 	FcbSize DWORD
 	FdwType DWORD
 	Fu      struct {
-		Fmouse RID_DEVICE_INFO_MOUSE
-		_      [8]byte
+		Fmouse       RID_DEVICE_INFO_MOUSE
+		F__ccgo_pad1 [8]byte
 	}
-} /* winuser.h:6174:11 */
+} /* winuser.h:6437:11 */
 
-type RID_DEVICE_INFO = tagRID_DEVICE_INFO /* winuser.h:6182:5 */
-type PRID_DEVICE_INFO = uintptr           /* winuser.h:6182:21 */
-type LPRID_DEVICE_INFO = uintptr          /* winuser.h:6182:39 */
+type RID_DEVICE_INFO = tagRID_DEVICE_INFO /* winuser.h:6445:5 */
+type PRID_DEVICE_INFO = uintptr           /* winuser.h:6445:21 */
+type LPRID_DEVICE_INFO = uintptr          /* winuser.h:6445:39 */
 
 type tagRAWINPUTDEVICE = struct {
 	FusUsagePage USHORT
 	FusUsage     USHORT
 	FdwFlags     DWORD
 	FhwndTarget  HWND
-} /* winuser.h:6190:11 */
+} /* winuser.h:6453:11 */
 
-type RAWINPUTDEVICE = tagRAWINPUTDEVICE /* winuser.h:6195:5 */
-type PRAWINPUTDEVICE = uintptr          /* winuser.h:6195:20 */
-type LPRAWINPUTDEVICE = uintptr         /* winuser.h:6195:37 */
+type RAWINPUTDEVICE = tagRAWINPUTDEVICE /* winuser.h:6458:5 */
+type PRAWINPUTDEVICE = uintptr          /* winuser.h:6458:20 */
+type LPRAWINPUTDEVICE = uintptr         /* winuser.h:6458:37 */
 
-type PCRAWINPUTDEVICE = uintptr /* winuser.h:6197:32 */
+type PCRAWINPUTDEVICE = uintptr /* winuser.h:6460:32 */
 
 type tagRAWINPUTDEVICELIST = struct {
-	FhDevice HANDLE
-	FdwType  DWORD
-	_        [4]byte
-} /* winuser.h:6224:11 */
+	FhDevice     HANDLE
+	FdwType      DWORD
+	F__ccgo_pad1 [4]byte
+} /* winuser.h:6487:11 */
 
-type RAWINPUTDEVICELIST = tagRAWINPUTDEVICELIST /* winuser.h:6227:5 */
-type PRAWINPUTDEVICELIST = uintptr              /* winuser.h:6227:24 */
+type RAWINPUTDEVICELIST = tagRAWINPUTDEVICELIST /* winuser.h:6490:5 */
+type PRAWINPUTDEVICELIST = uintptr              /* winuser.h:6490:24 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -42151,7 +42652,7 @@ type _cpinfo = struct {
 	FMaxCharSize UINT
 	FDefaultChar [2]BYTE
 	FLeadByte    [12]BYTE
-	_            [2]byte
+	F__ccgo_pad1 [2]byte
 } /* winnls.h:649:11 */
 
 type CPINFO = _cpinfo   /* winnls.h:653:5 */
@@ -42187,11 +42688,11 @@ type _numberfmtA = struct {
 	FNumDigits     UINT
 	FLeadingZero   UINT
 	FGrouping      UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpDecimalSep  LPSTR
 	FlpThousandSep LPSTR
 	FNegativeOrder UINT
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 } /* winnls.h:675:11 */
 
 type NUMBERFMTA = _numberfmtA /* winnls.h:682:5 */
@@ -42200,11 +42701,11 @@ type _numberfmtW = struct {
 	FNumDigits     UINT
 	FLeadingZero   UINT
 	FGrouping      UINT
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpDecimalSep  LPWSTR
 	FlpThousandSep LPWSTR
 	FNegativeOrder UINT
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 } /* winnls.h:683:11 */
 
 type NUMBERFMTW = _numberfmtW /* winnls.h:690:5 */
@@ -42217,7 +42718,7 @@ type _currencyfmtA = struct {
 	FNumDigits        UINT
 	FLeadingZero      UINT
 	FGrouping         UINT
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpDecimalSep     LPSTR
 	FlpThousandSep    LPSTR
 	FNegativeOrder    UINT
@@ -42232,7 +42733,7 @@ type _currencyfmtW = struct {
 	FNumDigits        UINT
 	FLeadingZero      UINT
 	FGrouping         UINT
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpDecimalSep     LPWSTR
 	FlpThousandSep    LPWSTR
 	FNegativeOrder    UINT
@@ -42330,7 +42831,7 @@ type PFILEMUIINFO = uintptr     /* winnls.h:883:17 */
 type _COORD = struct {
 	FX SHORT
 	FY SHORT
-} /* wincon.h:17:11 */
+} /* wincon.h:20:11 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -42346,18 +42847,18 @@ type _COORD = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type COORD = _COORD   /* wincon.h:20:5 */
-type PCOORD = uintptr /* wincon.h:20:11 */
+type COORD = _COORD   /* wincon.h:23:5 */
+type PCOORD = uintptr /* wincon.h:23:11 */
 
 type _SMALL_RECT = struct {
 	FLeft   SHORT
 	FTop    SHORT
 	FRight  SHORT
 	FBottom SHORT
-} /* wincon.h:22:11 */
+} /* wincon.h:25:11 */
 
-type SMALL_RECT = _SMALL_RECT /* wincon.h:27:5 */
-type PSMALL_RECT = uintptr    /* wincon.h:27:16 */
+type SMALL_RECT = _SMALL_RECT /* wincon.h:30:5 */
+type PSMALL_RECT = uintptr    /* wincon.h:30:16 */
 
 type _KEY_EVENT_RECORD = struct {
 	FbKeyDown          WINBOOL
@@ -42366,52 +42867,52 @@ type _KEY_EVENT_RECORD = struct {
 	FwVirtualScanCode  WORD
 	FuChar             struct{ FUnicodeChar WCHAR }
 	FdwControlKeyState DWORD
-} /* wincon.h:29:11 */
+} /* wincon.h:32:11 */
 
-type KEY_EVENT_RECORD = _KEY_EVENT_RECORD /* wincon.h:39:5 */
-type PKEY_EVENT_RECORD = uintptr          /* wincon.h:39:22 */
+type KEY_EVENT_RECORD = _KEY_EVENT_RECORD /* wincon.h:42:5 */
+type PKEY_EVENT_RECORD = uintptr          /* wincon.h:42:22 */
 
 type _MOUSE_EVENT_RECORD = struct {
 	FdwMousePosition   COORD
 	FdwButtonState     DWORD
 	FdwControlKeyState DWORD
 	FdwEventFlags      DWORD
-} /* wincon.h:58:11 */
+} /* wincon.h:62:11 */
 
-type MOUSE_EVENT_RECORD = _MOUSE_EVENT_RECORD /* wincon.h:63:5 */
-type PMOUSE_EVENT_RECORD = uintptr            /* wincon.h:63:24 */
+type MOUSE_EVENT_RECORD = _MOUSE_EVENT_RECORD /* wincon.h:67:5 */
+type PMOUSE_EVENT_RECORD = uintptr            /* wincon.h:67:24 */
 
-type _WINDOW_BUFFER_SIZE_RECORD = struct{ FdwSize COORD } /* wincon.h:78:11 */
+type _WINDOW_BUFFER_SIZE_RECORD = struct{ FdwSize COORD } /* wincon.h:82:11 */
 
-type WINDOW_BUFFER_SIZE_RECORD = _WINDOW_BUFFER_SIZE_RECORD /* wincon.h:80:5 */
-type PWINDOW_BUFFER_SIZE_RECORD = uintptr                   /* wincon.h:80:31 */
+type WINDOW_BUFFER_SIZE_RECORD = _WINDOW_BUFFER_SIZE_RECORD /* wincon.h:84:5 */
+type PWINDOW_BUFFER_SIZE_RECORD = uintptr                   /* wincon.h:84:31 */
 
-type _MENU_EVENT_RECORD = struct{ FdwCommandId UINT } /* wincon.h:82:11 */
+type _MENU_EVENT_RECORD = struct{ FdwCommandId UINT } /* wincon.h:86:11 */
 
-type MENU_EVENT_RECORD = _MENU_EVENT_RECORD /* wincon.h:84:5 */
-type PMENU_EVENT_RECORD = uintptr           /* wincon.h:84:23 */
+type MENU_EVENT_RECORD = _MENU_EVENT_RECORD /* wincon.h:88:5 */
+type PMENU_EVENT_RECORD = uintptr           /* wincon.h:88:23 */
 
-type _FOCUS_EVENT_RECORD = struct{ FbSetFocus WINBOOL } /* wincon.h:86:11 */
+type _FOCUS_EVENT_RECORD = struct{ FbSetFocus WINBOOL } /* wincon.h:90:11 */
 
-type FOCUS_EVENT_RECORD = _FOCUS_EVENT_RECORD /* wincon.h:88:5 */
-type PFOCUS_EVENT_RECORD = uintptr            /* wincon.h:88:24 */
+type FOCUS_EVENT_RECORD = _FOCUS_EVENT_RECORD /* wincon.h:92:5 */
+type PFOCUS_EVENT_RECORD = uintptr            /* wincon.h:92:24 */
 
 type _INPUT_RECORD = struct {
-	FEventType WORD
-	_          [2]byte
-	FEvent     struct{ FKeyEvent KEY_EVENT_RECORD }
-} /* wincon.h:90:11 */
+	FEventType   WORD
+	F__ccgo_pad1 [2]byte
+	FEvent       struct{ FKeyEvent KEY_EVENT_RECORD }
+} /* wincon.h:94:11 */
 
-type INPUT_RECORD = _INPUT_RECORD /* wincon.h:99:5 */
-type PINPUT_RECORD = uintptr      /* wincon.h:99:18 */
+type INPUT_RECORD = _INPUT_RECORD /* wincon.h:103:5 */
+type PINPUT_RECORD = uintptr      /* wincon.h:103:18 */
 
 type _CHAR_INFO = struct {
 	FChar       struct{ FUnicodeChar WCHAR }
 	FAttributes WORD
-} /* wincon.h:107:11 */
+} /* wincon.h:111:11 */
 
-type CHAR_INFO = _CHAR_INFO /* wincon.h:113:5 */
-type PCHAR_INFO = uintptr   /* wincon.h:113:15 */
+type CHAR_INFO = _CHAR_INFO /* wincon.h:117:5 */
+type PCHAR_INFO = uintptr   /* wincon.h:117:15 */
 
 type _CONSOLE_SCREEN_BUFFER_INFO = struct {
 	FdwSize              COORD
@@ -42419,37 +42920,37 @@ type _CONSOLE_SCREEN_BUFFER_INFO = struct {
 	FwAttributes         WORD
 	FsrWindow            SMALL_RECT
 	FdwMaximumWindowSize COORD
-} /* wincon.h:133:11 */
+} /* wincon.h:137:11 */
 
-type CONSOLE_SCREEN_BUFFER_INFO = _CONSOLE_SCREEN_BUFFER_INFO /* wincon.h:139:5 */
-type PCONSOLE_SCREEN_BUFFER_INFO = uintptr                    /* wincon.h:139:32 */
+type CONSOLE_SCREEN_BUFFER_INFO = _CONSOLE_SCREEN_BUFFER_INFO /* wincon.h:143:5 */
+type PCONSOLE_SCREEN_BUFFER_INFO = uintptr                    /* wincon.h:143:32 */
 
 type _CONSOLE_CURSOR_INFO = struct {
 	FdwSize   DWORD
 	FbVisible WINBOOL
-} /* wincon.h:141:11 */
+} /* wincon.h:145:11 */
 
-type CONSOLE_CURSOR_INFO = _CONSOLE_CURSOR_INFO /* wincon.h:144:5 */
-type PCONSOLE_CURSOR_INFO = uintptr             /* wincon.h:144:25 */
+type CONSOLE_CURSOR_INFO = _CONSOLE_CURSOR_INFO /* wincon.h:148:5 */
+type PCONSOLE_CURSOR_INFO = uintptr             /* wincon.h:148:25 */
 
 type _CONSOLE_FONT_INFO = struct {
 	FnFont      DWORD
 	FdwFontSize COORD
-} /* wincon.h:146:11 */
+} /* wincon.h:150:11 */
 
-type CONSOLE_FONT_INFO = _CONSOLE_FONT_INFO /* wincon.h:149:5 */
-type PCONSOLE_FONT_INFO = uintptr           /* wincon.h:149:23 */
+type CONSOLE_FONT_INFO = _CONSOLE_FONT_INFO /* wincon.h:153:5 */
+type PCONSOLE_FONT_INFO = uintptr           /* wincon.h:153:23 */
 
 type _CONSOLE_SELECTION_INFO = struct {
 	FdwFlags           DWORD
 	FdwSelectionAnchor COORD
 	FsrSelection       SMALL_RECT
-} /* wincon.h:151:11 */
+} /* wincon.h:155:11 */
 
-type CONSOLE_SELECTION_INFO = _CONSOLE_SELECTION_INFO /* wincon.h:155:5 */
-type PCONSOLE_SELECTION_INFO = uintptr                /* wincon.h:155:28 */
+type CONSOLE_SELECTION_INFO = _CONSOLE_SELECTION_INFO /* wincon.h:159:5 */
+type PCONSOLE_SELECTION_INFO = uintptr                /* wincon.h:159:28 */
 
-type PHANDLER_ROUTINE = uintptr /* wincon.h:163:19 */
+type PHANDLER_ROUTINE = uintptr /* wincon.h:167:19 */
 
 type _CONSOLE_FONT_INFOEX = struct {
 	FcbSize     ULONG
@@ -42458,30 +42959,30 @@ type _CONSOLE_FONT_INFOEX = struct {
 	FFontFamily UINT
 	FFontWeight UINT
 	FFaceName   [32]WCHAR
-} /* wincon.h:297:9 */
+} /* wincon.h:321:9 */
 
-type CONSOLE_FONT_INFOEX = _CONSOLE_FONT_INFOEX /* wincon.h:304:3 */
-type PCONSOLE_FONT_INFOEX = uintptr             /* wincon.h:304:24 */
+type CONSOLE_FONT_INFOEX = _CONSOLE_FONT_INFOEX /* wincon.h:328:3 */
+type PCONSOLE_FONT_INFOEX = uintptr             /* wincon.h:328:24 */
 
 type _CONSOLE_HISTORY_INFO = struct {
 	FcbSize                 UINT
 	FHistoryBufferSize      UINT
 	FNumberOfHistoryBuffers UINT
 	FdwFlags                DWORD
-} /* wincon.h:306:9 */
+} /* wincon.h:332:9 */
 
-type CONSOLE_HISTORY_INFO = _CONSOLE_HISTORY_INFO /* wincon.h:311:3 */
-type PCONSOLE_HISTORY_INFO = uintptr              /* wincon.h:311:25 */
+type CONSOLE_HISTORY_INFO = _CONSOLE_HISTORY_INFO /* wincon.h:337:3 */
+type PCONSOLE_HISTORY_INFO = uintptr              /* wincon.h:337:25 */
 
 type _CONSOLE_READCONSOLE_CONTROL = struct {
 	FnLength           ULONG
 	FnInitialChars     ULONG
 	FdwCtrlWakeupMask  ULONG
 	FdwControlKeyState ULONG
-} /* wincon.h:313:9 */
+} /* wincon.h:339:9 */
 
-type CONSOLE_READCONSOLE_CONTROL = _CONSOLE_READCONSOLE_CONTROL /* wincon.h:318:3 */
-type PCONSOLE_READCONSOLE_CONTROL = uintptr                     /* wincon.h:318:32 */
+type CONSOLE_READCONSOLE_CONTROL = _CONSOLE_READCONSOLE_CONTROL /* wincon.h:344:3 */
+type PCONSOLE_READCONSOLE_CONTROL = uintptr                     /* wincon.h:344:32 */
 
 type _CONSOLE_SCREEN_BUFFER_INFOEX = struct {
 	FcbSize               ULONG
@@ -42493,10 +42994,10 @@ type _CONSOLE_SCREEN_BUFFER_INFOEX = struct {
 	FwPopupAttributes     WORD
 	FbFullscreenSupported WINBOOL
 	FColorTable           [16]COLORREF
-} /* wincon.h:320:9 */
+} /* wincon.h:346:9 */
 
-type CONSOLE_SCREEN_BUFFER_INFOEX = _CONSOLE_SCREEN_BUFFER_INFOEX /* wincon.h:330:3 */
-type PCONSOLE_SCREEN_BUFFER_INFOEX = uintptr                      /* wincon.h:330:33 */
+type CONSOLE_SCREEN_BUFFER_INFOEX = _CONSOLE_SCREEN_BUFFER_INFOEX /* wincon.h:356:3 */
+type PCONSOLE_SCREEN_BUFFER_INFOEX = uintptr                      /* wincon.h:356:33 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -42513,6 +43014,8 @@ type PCONSOLE_SCREEN_BUFFER_INFOEX = uintptr                      /* wincon.h:33
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
+// defines from verrsrc.h file
+
 type tagVS_FIXEDFILEINFO = struct {
 	FdwSignature        DWORD
 	FdwStrucVersion     DWORD
@@ -42527,7 +43030,7 @@ type tagVS_FIXEDFILEINFO = struct {
 	FdwFileSubtype      DWORD
 	FdwFileDateMS       DWORD
 	FdwFileDateLS       DWORD
-} /* winver.h:113:11 */
+} /* winver.h:118:11 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -42544,7 +43047,9 @@ type tagVS_FIXEDFILEINFO = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
-type VS_FIXEDFILEINFO = tagVS_FIXEDFILEINFO /* winver.h:128:5 */
+// defines from verrsrc.h file
+
+type VS_FIXEDFILEINFO = tagVS_FIXEDFILEINFO /* winver.h:133:5 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -42560,46 +43065,46 @@ type VS_FIXEDFILEINFO = tagVS_FIXEDFILEINFO /* winver.h:128:5 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type REGSAM = ACCESS_MASK /* winreg.h:35:23 */
-type LSTATUS = LONG       /* winreg.h:36:16 */
+type REGSAM = ACCESS_MASK /* winreg.h:43:23 */
+type LSTATUS = LONG       /* winreg.h:44:16 */
 
 type val_context = struct {
 	Fvaluelen      int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	Fvalue_context LPVOID
 	Fval_buff_ptr  LPVOID
-} /* winreg.h:54:3 */
+} /* winreg.h:62:3 */
 
-type PVALCONTEXT = uintptr /* winreg.h:60:30 */
+type PVALCONTEXT = uintptr /* winreg.h:68:30 */
 
 type pvalueA = struct {
 	Fpv_valuename     LPSTR
 	Fpv_valuelen      int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	Fpv_value_context LPVOID
 	Fpv_type          DWORD
-	_                 [4]byte
-} /* winreg.h:62:11 */
+	F__ccgo_pad2      [4]byte
+} /* winreg.h:70:11 */
 
-type PVALUEA = pvalueA  /* winreg.h:67:4 */
-type PPVALUEA = uintptr /* winreg.h:67:12 */
+type PVALUEA = pvalueA  /* winreg.h:75:4 */
+type PPVALUEA = uintptr /* winreg.h:75:12 */
 
 type pvalueW = struct {
 	Fpv_valuename     LPWSTR
 	Fpv_valuelen      int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	Fpv_value_context LPVOID
 	Fpv_type          DWORD
-	_                 [4]byte
-} /* winreg.h:69:11 */
+	F__ccgo_pad2      [4]byte
+} /* winreg.h:77:11 */
 
-type PVALUEW = pvalueW  /* winreg.h:74:4 */
-type PPVALUEW = uintptr /* winreg.h:74:12 */
+type PVALUEW = pvalueW  /* winreg.h:82:4 */
+type PPVALUEW = uintptr /* winreg.h:82:12 */
 
-type PVALUE = PVALUEA   /* winreg.h:76:3 */
-type PPVALUE = PPVALUEA /* winreg.h:77:3 */
+type PVALUE = PVALUEA   /* winreg.h:84:3 */
+type PPVALUE = PPVALUEA /* winreg.h:85:3 */
 
-type PQUERYHANDLER = uintptr /* winreg.h:81:24 */
+type PQUERYHANDLER = uintptr /* winreg.h:89:24 */
 
 type provider_info = struct {
 	Fpi_R0_1val     PQUERYHANDLER
@@ -42607,40 +43112,40 @@ type provider_info = struct {
 	Fpi_R3_1val     PQUERYHANDLER
 	Fpi_R3_allvals  PQUERYHANDLER
 	Fpi_flags       DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	Fpi_key_context LPVOID
-} /* winreg.h:83:11 */
+} /* winreg.h:91:11 */
 
-type REG_PROVIDER = provider_info /* winreg.h:90:5 */
+type REG_PROVIDER = provider_info /* winreg.h:98:5 */
 
-type PPROVIDER = uintptr /* winreg.h:92:32 */
+type PPROVIDER = uintptr /* winreg.h:100:32 */
 
 type value_entA = struct {
 	Fve_valuename LPSTR
 	Fve_valuelen  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	Fve_valueptr  DWORD_PTR
 	Fve_type      DWORD
-	_             [4]byte
-} /* winreg.h:94:11 */
+	F__ccgo_pad2  [4]byte
+} /* winreg.h:102:11 */
 
-type VALENTA = value_entA /* winreg.h:99:5 */
-type PVALENTA = uintptr   /* winreg.h:99:13 */
+type VALENTA = value_entA /* winreg.h:107:5 */
+type PVALENTA = uintptr   /* winreg.h:107:13 */
 
 type value_entW = struct {
 	Fve_valuename LPWSTR
 	Fve_valuelen  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	Fve_valueptr  DWORD_PTR
 	Fve_type      DWORD
-	_             [4]byte
-} /* winreg.h:101:11 */
+	F__ccgo_pad2  [4]byte
+} /* winreg.h:109:11 */
 
-type VALENTW = value_entW /* winreg.h:106:5 */
-type PVALENTW = uintptr   /* winreg.h:106:13 */
+type VALENTW = value_entW /* winreg.h:114:5 */
+type PVALENTW = uintptr   /* winreg.h:114:13 */
 
-type VALENT = VALENTA   /* winreg.h:108:3 */
-type PVALENT = PVALENTA /* winreg.h:109:3 */
+type VALENT = VALENTA   /* winreg.h:116:3 */
+type PVALENT = PVALENTA /* winreg.h:117:3 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -42716,7 +43221,7 @@ type LPNETRESOURCE = LPNETRESOURCEA /* winnetwk.h:75:3 */
 
 type _CONNECTDLGSTRUCTA = struct {
 	FcbStructure DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FhwndOwner   HWND
 	FlpConnRes   LPNETRESOURCEA
 	FdwFlags     DWORD
@@ -42728,7 +43233,7 @@ type LPCONNECTDLGSTRUCTA = uintptr          /* winnetwk.h:135:23 */
 
 type _CONNECTDLGSTRUCTW = struct {
 	FcbStructure DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FhwndOwner   HWND
 	FlpConnRes   LPNETRESOURCEW
 	FdwFlags     DWORD
@@ -42743,12 +43248,12 @@ type LPCONNECTDLGSTRUCT = LPCONNECTDLGSTRUCTA /* winnetwk.h:146:3 */
 
 type _DISCDLGSTRUCTA = struct {
 	FcbStructure  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FhwndOwner    HWND
 	FlpLocalName  LPSTR
 	FlpRemoteName LPSTR
 	FdwFlags      DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 } /* winnetwk.h:161:11 */
 
 type DISCDLGSTRUCTA = _DISCDLGSTRUCTA /* winnetwk.h:167:5 */
@@ -42756,12 +43261,12 @@ type LPDISCDLGSTRUCTA = uintptr       /* winnetwk.h:167:20 */
 
 type _DISCDLGSTRUCTW = struct {
 	FcbStructure  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FhwndOwner    HWND
 	FlpLocalName  LPWSTR
 	FlpRemoteName LPWSTR
 	FdwFlags      DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 } /* winnetwk.h:169:11 */
 
 type DISCDLGSTRUCTW = _DISCDLGSTRUCTW /* winnetwk.h:175:5 */
@@ -42811,10 +43316,10 @@ type _NETINFOSTRUCT = struct {
 	FdwCharacteristics DWORD
 	FdwHandle          ULONG_PTR
 	FwNetType          WORD
-	_                  [2]byte
+	F__ccgo_pad1       [2]byte
 	FdwPrinters        DWORD
 	FdwDrives          DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 } /* winnetwk.h:247:11 */
 
 type NETINFOSTRUCT = _NETINFOSTRUCT /* winnetwk.h:256:5 */
@@ -42860,44 +43365,44 @@ type LPNETCONNECTINFOSTRUCT = uintptr             /* winnetwk.h:341:26 */
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
 type DDEACK = struct {
-	_               [0]uint16
+	F__ccgo_pad1    [0]uint16
 	FbAppReturnCode uint16 /* unsigned short bAppReturnCode: 8, unsigned short reserved: 6, unsigned short fBusy: 1, unsigned short fAck: 1 */
 } /* dde.h:29:5 */
 
 type DDEADVISE = struct {
-	Freserved uint16 /* unsigned short reserved: 14, unsigned short fDeferUpd: 1, unsigned short fAckReq: 1 */
-	_         [2]byte
-	FcfFormat int16
+	Freserved    uint16 /* unsigned short reserved: 14, unsigned short fDeferUpd: 1, unsigned short fAckReq: 1 */
+	F__ccgo_pad1 [2]byte
+	FcfFormat    int16
 } /* dde.h:34:5 */
 
 type DDEDATA = struct {
-	Funused   uint16 /* unsigned short unused: 12, unsigned short fResponse: 1, unsigned short fRelease: 1, unsigned short reserved: 1, unsigned short fAckReq: 1 */
-	_         [2]byte
-	FcfFormat int16
-	FValue    [1]BYTE
-	_         [1]byte
+	Funused      uint16 /* unsigned short unused: 12, unsigned short fResponse: 1, unsigned short fRelease: 1, unsigned short reserved: 1, unsigned short fAckReq: 1 */
+	F__ccgo_pad1 [2]byte
+	FcfFormat    int16
+	FValue       [1]BYTE
+	F__ccgo_pad2 [1]byte
 } /* dde.h:40:5 */
 
 type DDEPOKE = struct {
-	Funused   uint16 /* unsigned short unused: 13, unsigned short fRelease: 1, unsigned short fReserved: 2 */
-	_         [2]byte
-	FcfFormat int16
-	FValue    [1]BYTE
-	_         [1]byte
+	Funused      uint16 /* unsigned short unused: 13, unsigned short fRelease: 1, unsigned short fReserved: 2 */
+	F__ccgo_pad1 [2]byte
+	FcfFormat    int16
+	FValue       [1]BYTE
+	F__ccgo_pad2 [1]byte
 } /* dde.h:47:5 */
 
 type DDELN = struct {
-	Funused   uint16 /* unsigned short unused: 13, unsigned short fRelease: 1, unsigned short fDeferUpd: 1, unsigned short fAckReq: 1 */
-	_         [2]byte
-	FcfFormat int16
+	Funused      uint16 /* unsigned short unused: 13, unsigned short fRelease: 1, unsigned short fDeferUpd: 1, unsigned short fAckReq: 1 */
+	F__ccgo_pad1 [2]byte
+	FcfFormat    int16
 } /* dde.h:52:5 */
 
 type DDEUP = struct {
-	Funused   uint16 /* unsigned short unused: 12, unsigned short fAck: 1, unsigned short fRelease: 1, unsigned short fReserved: 1, unsigned short fAckReq: 1 */
-	_         [2]byte
-	FcfFormat int16
-	Frgb      [1]BYTE
-	_         [1]byte
+	Funused      uint16 /* unsigned short unused: 12, unsigned short fAck: 1, unsigned short fRelease: 1, unsigned short fReserved: 1, unsigned short fAckReq: 1 */
+	F__ccgo_pad1 [2]byte
+	FcfFormat    int16
+	Frgb         [1]BYTE
+	F__ccgo_pad2 [1]byte
 } /* dde.h:58:5 */
 
 // *
@@ -42946,7 +43451,7 @@ type PCONVCONTEXT = uintptr       /* ddeml.h:34:18 */
 
 type tagCONVINFO = struct {
 	Fcb            DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhUser         DWORD_PTR
 	FhConvPartner  HCONV
 	FhszSvcPartner HSZ
@@ -42958,10 +43463,10 @@ type tagCONVINFO = struct {
 	FwStatus       UINT
 	FwConvst       UINT
 	FwLastError    UINT
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FhConvList     HCONVLIST
 	FConvCtxt      CONVCONTEXT
-	_              [4]byte
+	F__ccgo_pad3   [4]byte
 	Fhwnd          HWND
 	FhwndPartner   HWND
 } /* ddeml.h:36:11 */
@@ -42971,78 +43476,78 @@ type PCONVINFO = uintptr    /* ddeml.h:53:15 */
 type PFNCALLBACK = uintptr  /* ddeml.h:155:20 */
 
 type tagDDEML_MSG_HOOK_DATA = struct {
-	FuiLo   UINT_PTR
-	FuiHi   UINT_PTR
-	FcbData DWORD
-	FData   [8]DWORD
-	_       [4]byte
+	FuiLo        UINT_PTR
+	FuiHi        UINT_PTR
+	FcbData      DWORD
+	FData        [8]DWORD
+	F__ccgo_pad1 [4]byte
 } /* ddeml.h:256:11 */
 
 type DDEML_MSG_HOOK_DATA = tagDDEML_MSG_HOOK_DATA /* ddeml.h:261:5 */
 type PDDEML_MSG_HOOK_DATA = uintptr               /* ddeml.h:261:25 */
 
 type tagMONMSGSTRUCT = struct {
-	Fcb     UINT
-	_       [4]byte
-	FhwndTo HWND
-	FdwTime DWORD
-	_       [4]byte
-	FhTask  HANDLE
-	FwMsg   UINT
-	_       [4]byte
-	FwParam WPARAM
-	FlParam LPARAM
-	Fdmhd   DDEML_MSG_HOOK_DATA
+	Fcb          UINT
+	F__ccgo_pad1 [4]byte
+	FhwndTo      HWND
+	FdwTime      DWORD
+	F__ccgo_pad2 [4]byte
+	FhTask       HANDLE
+	FwMsg        UINT
+	F__ccgo_pad3 [4]byte
+	FwParam      WPARAM
+	FlParam      LPARAM
+	Fdmhd        DDEML_MSG_HOOK_DATA
 } /* ddeml.h:263:11 */
 
 type MONMSGSTRUCT = tagMONMSGSTRUCT /* ddeml.h:272:5 */
 type PMONMSGSTRUCT = uintptr        /* ddeml.h:272:18 */
 
 type tagMONCBSTRUCT = struct {
-	Fcb      UINT
-	FdwTime  DWORD
-	FhTask   HANDLE
-	FdwRet   DWORD
-	FwType   UINT
-	FwFmt    UINT
-	_        [4]byte
-	FhConv   HCONV
-	Fhsz1    HSZ
-	Fhsz2    HSZ
-	FhData   HDDEDATA
-	FdwData1 ULONG_PTR
-	FdwData2 ULONG_PTR
-	Fcc      CONVCONTEXT
-	FcbData  DWORD
-	FData    [8]DWORD
+	Fcb          UINT
+	FdwTime      DWORD
+	FhTask       HANDLE
+	FdwRet       DWORD
+	FwType       UINT
+	FwFmt        UINT
+	F__ccgo_pad1 [4]byte
+	FhConv       HCONV
+	Fhsz1        HSZ
+	Fhsz2        HSZ
+	FhData       HDDEDATA
+	FdwData1     ULONG_PTR
+	FdwData2     ULONG_PTR
+	Fcc          CONVCONTEXT
+	FcbData      DWORD
+	FData        [8]DWORD
 } /* ddeml.h:274:11 */
 
 type MONCBSTRUCT = tagMONCBSTRUCT /* ddeml.h:290:5 */
 type PMONCBSTRUCT = uintptr       /* ddeml.h:290:17 */
 
 type tagMONHSZSTRUCTA = struct {
-	Fcb       UINT
-	FfsAction WINBOOL
-	FdwTime   DWORD
-	_         [4]byte
-	Fhsz      HSZ
-	FhTask    HANDLE
-	Fstr      [1]CHAR
-	_         [7]byte
+	Fcb          UINT
+	FfsAction    WINBOOL
+	FdwTime      DWORD
+	F__ccgo_pad1 [4]byte
+	Fhsz         HSZ
+	FhTask       HANDLE
+	Fstr         [1]CHAR
+	F__ccgo_pad2 [7]byte
 } /* ddeml.h:292:11 */
 
 type MONHSZSTRUCTA = tagMONHSZSTRUCTA /* ddeml.h:299:5 */
 type PMONHSZSTRUCTA = uintptr         /* ddeml.h:299:19 */
 
 type tagMONHSZSTRUCTW = struct {
-	Fcb       UINT
-	FfsAction WINBOOL
-	FdwTime   DWORD
-	_         [4]byte
-	Fhsz      HSZ
-	FhTask    HANDLE
-	Fstr      [1]WCHAR
-	_         [6]byte
+	Fcb          UINT
+	FfsAction    WINBOOL
+	FdwTime      DWORD
+	F__ccgo_pad1 [4]byte
+	Fhsz         HSZ
+	FhTask       HANDLE
+	Fstr         [1]WCHAR
+	F__ccgo_pad2 [6]byte
 } /* ddeml.h:301:11 */
 
 type MONHSZSTRUCTW = tagMONHSZSTRUCTW /* ddeml.h:308:5 */
@@ -43052,11 +43557,11 @@ type MONHSZSTRUCT = MONHSZSTRUCTA   /* ddeml.h:310:3 */
 type PMONHSZSTRUCT = PMONHSZSTRUCTA /* ddeml.h:311:3 */
 
 type tagMONERRSTRUCT = struct {
-	Fcb         UINT
-	FwLastError UINT
-	FdwTime     DWORD
-	_           [4]byte
-	FhTask      HANDLE
+	Fcb          UINT
+	FwLastError  UINT
+	FdwTime      DWORD
+	F__ccgo_pad1 [4]byte
+	FhTask       HANDLE
 } /* ddeml.h:318:11 */
 
 type MONERRSTRUCT = tagMONERRSTRUCT /* ddeml.h:323:5 */
@@ -43084,7 +43589,7 @@ type tagMONCONVSTRUCT = struct {
 	Fcb          UINT
 	FfConnect    WINBOOL
 	FdwTime      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FhTask       HANDLE
 	FhszSvc      HSZ
 	FhszTopic    HSZ
@@ -43137,8 +43642,8 @@ type LPUINT = uintptr /* mmsystem.h:35:16 */
 type mmtime_tag = struct {
 	FwType UINT
 	Fu     struct {
-		Fms DWORD
-		_   [4]byte
+		Fms          DWORD
+		F__ccgo_pad1 [4]byte
 	}
 } /* mmsystem.h:38:11 */
 
@@ -43153,11 +43658,11 @@ type HDRVR = uintptr /* mmsystem.h:165:3 */
 
 type DRVCONFIGINFOEX1 = struct {
 	FdwDCISize          DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FlpszDCISectionName LPCWSTR
 	FlpszDCIAliasName   LPCWSTR
 	FdnDevNode          DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 } /* mmsystem.h:169:11 */
 
 type DRVCONFIGINFOEX = DRVCONFIGINFOEX1 /* mmsystem.h:174:5 */
@@ -43167,7 +43672,7 @@ type LPDRVCONFIGINFOEX = uintptr        /* mmsystem.h:174:63 */
 
 type tagDRVCONFIGINFO = struct {
 	FdwDCISize          DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FlpszDCISectionName LPCWSTR
 	FlpszDCIAliasName   LPCWSTR
 } /* mmsystem.h:192:11 */
@@ -43373,7 +43878,7 @@ type waveformat_tag = struct {
 	FnSamplesPerSec  DWORD
 	FnAvgBytesPerSec DWORD
 	FnBlockAlign     WORD
-	_                [2]byte
+	F__ccgo_pad1     [2]byte
 } /* mmsystem.h:474:11 */
 
 type WAVEFORMAT = waveformat_tag /* mmsystem.h:480:5 */
@@ -43384,7 +43889,7 @@ type LPWAVEFORMAT = uintptr      /* mmsystem.h:480:48 */
 type pcmwaveformat_tag = struct {
 	Fwf             WAVEFORMAT
 	FwBitsPerSample WORD
-	_               [2]byte
+	F__ccgo_pad1    [2]byte
 } /* mmsystem.h:484:11 */
 
 type PCMWAVEFORMAT = pcmwaveformat_tag /* mmsystem.h:487:5 */
@@ -43400,7 +43905,7 @@ type tWAVEFORMATEX = struct {
 	FnBlockAlign     WORD
 	FwBitsPerSample  WORD
 	FcbSize          WORD
-	_                [2]byte
+	F__ccgo_pad1     [2]byte
 } /* mmsystem.h:493:11 */
 
 type WAVEFORMATEX = tWAVEFORMATEX /* mmsystem.h:501:5 */
@@ -43589,11 +44094,11 @@ type midihdr_tag = struct {
 	FdwBytesRecorded DWORD
 	FdwUser          DWORD_PTR
 	FdwFlags         DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FlpNext          uintptr
 	Freserved        DWORD_PTR
 	FdwOffset        DWORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FdwReserved      [8]DWORD_PTR
 } /* mmsystem.h:734:11 */
 
@@ -43793,7 +44298,7 @@ type tagMIXERLINEA = struct {
 	FdwSource        DWORD
 	FdwLineID        DWORD
 	FfdwLine         DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FdwUser          DWORD_PTR
 	FdwComponentType DWORD
 	FcChannels       DWORD
@@ -43821,7 +44326,7 @@ type tagMIXERLINEW = struct {
 	FdwSource        DWORD
 	FdwLineID        DWORD
 	FfdwLine         DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FdwUser          DWORD_PTR
 	FdwComponentType DWORD
 	FcChannels       DWORD
@@ -43860,11 +44365,11 @@ type tagMIXERCONTROLA = struct {
 			FlMinimum LONG
 			FlMaximum LONG
 		}
-		_ [16]byte
+		F__ccgo_pad1 [16]byte
 	}
 	FMetrics struct {
-		FcSteps DWORD
-		_       [20]byte
+		FcSteps      DWORD
+		F__ccgo_pad1 [20]byte
 	}
 } /* mmsystem.h:1122:11 */
 
@@ -43885,11 +44390,11 @@ type tagMIXERCONTROLW = struct {
 			FlMinimum LONG
 			FlMaximum LONG
 		}
-		_ [16]byte
+		F__ccgo_pad1 [16]byte
 	}
 	FMetrics struct {
-		FcSteps DWORD
-		_       [20]byte
+		FcSteps      DWORD
+		F__ccgo_pad1 [20]byte
 	}
 } /* mmsystem.h:1148:11 */
 
@@ -43902,13 +44407,13 @@ type PMIXERCONTROL = PMIXERCONTROLA   /* mmsystem.h:1175:3 */
 type LPMIXERCONTROL = LPMIXERCONTROLA /* mmsystem.h:1176:3 */
 
 type tagMIXERLINECONTROLSA = struct {
-	FcbStruct  DWORD
-	FdwLineID  DWORD
-	Fu         struct{ FdwControlID DWORD }
-	FcControls DWORD
-	Fcbmxctrl  DWORD
-	_          [4]byte
-	Fpamxctrl  LPMIXERCONTROLA
+	FcbStruct    DWORD
+	FdwLineID    DWORD
+	Fu           struct{ FdwControlID DWORD }
+	FcControls   DWORD
+	Fcbmxctrl    DWORD
+	F__ccgo_pad1 [4]byte
+	Fpamxctrl    LPMIXERCONTROLA
 } /* mmsystem.h:1245:11 */
 
 type MIXERLINECONTROLSA = tagMIXERLINECONTROLSA /* mmsystem.h:1255:5 */
@@ -43916,13 +44421,13 @@ type PMIXERLINECONTROLSA = uintptr              /* mmsystem.h:1255:24 */
 type LPMIXERLINECONTROLSA = uintptr             /* mmsystem.h:1255:45 */
 
 type tagMIXERLINECONTROLSW = struct {
-	FcbStruct  DWORD
-	FdwLineID  DWORD
-	Fu         struct{ FdwControlID DWORD }
-	FcControls DWORD
-	Fcbmxctrl  DWORD
-	_          [4]byte
-	Fpamxctrl  LPMIXERCONTROLW
+	FcbStruct    DWORD
+	FdwLineID    DWORD
+	Fu           struct{ FdwControlID DWORD }
+	FcControls   DWORD
+	Fcbmxctrl    DWORD
+	F__ccgo_pad1 [4]byte
+	Fpamxctrl    LPMIXERCONTROLW
 } /* mmsystem.h:1257:11 */
 
 type MIXERLINECONTROLSW = tagMIXERLINECONTROLSW /* mmsystem.h:1267:5 */
@@ -43937,10 +44442,10 @@ type tMIXERCONTROLDETAILS = struct {
 	FcbStruct    DWORD
 	FdwControlID DWORD
 	FcChannels   DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	Fu           struct{ FhwndOwner HWND }
 	FcbDetails   DWORD
-	_            [4]byte
+	F__ccgo_pad2 [4]byte
 	FpaDetails   LPVOID
 } /* mmsystem.h:1284:11 */
 
@@ -44189,10 +44694,10 @@ type _MMIOINFO = struct {
 	FfccIOProc   FOURCC
 	FpIOProc     LPMMIOPROC
 	FwErrorRet   UINT
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	Fhtask       HTASK
 	FcchBuffer   LONG
-	_            [4]byte
+	F__ccgo_pad2 [4]byte
 	FpchBuffer   HPSTR
 	FpchNext     HPSTR
 	FpchEndRead  HPSTR
@@ -44202,7 +44707,7 @@ type _MMIOINFO = struct {
 	FadwInfo     [3]DWORD
 	FdwReserved1 DWORD
 	FdwReserved2 DWORD
-	_            [4]byte
+	F__ccgo_pad3 [4]byte
 	Fhmmio       HMMIO
 } /* mmsystem.h:1649:11 */
 
@@ -44243,7 +44748,7 @@ type LPMCI_GENERIC_PARMS = uintptr            /* mmsystem.h:2074:43 */
 type tagMCI_OPEN_PARMSA = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCSTR
 	FlpstrElementName LPCSTR
 	FlpstrAlias       LPCSTR
@@ -44256,7 +44761,7 @@ type LPMCI_OPEN_PARMSA = uintptr          /* mmsystem.h:2082:39 */
 type tagMCI_OPEN_PARMSW = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCWSTR
 	FlpstrElementName LPCWSTR
 	FlpstrAlias       LPCWSTR
@@ -44281,9 +44786,9 @@ type PMCI_PLAY_PARMS = uintptr          /* mmsystem.h:2100:20 */
 type LPMCI_PLAY_PARMS = uintptr         /* mmsystem.h:2100:37 */
 
 type tagMCI_SEEK_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FdwTo       DWORD
-	_           [4]byte
+	FdwCallback  DWORD_PTR
+	FdwTo        DWORD
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2102:11 */
 
 type MCI_SEEK_PARMS = tagMCI_SEEK_PARMS /* mmsystem.h:2105:5 */
@@ -44305,7 +44810,7 @@ type tagMCI_INFO_PARMSA = struct {
 	FdwCallback  DWORD_PTR
 	FlpstrReturn LPSTR
 	FdwRetSize   DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2114:11 */
 
 type MCI_INFO_PARMSA = tagMCI_INFO_PARMSA /* mmsystem.h:2118:5 */
@@ -44314,7 +44819,7 @@ type tagMCI_INFO_PARMSW = struct {
 	FdwCallback  DWORD_PTR
 	FlpstrReturn LPWSTR
 	FdwRetSize   DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2119:11 */
 
 type MCI_INFO_PARMSW = tagMCI_INFO_PARMSW /* mmsystem.h:2123:5 */
@@ -44339,7 +44844,7 @@ type tagMCI_SYSINFO_PARMSA = struct {
 	FdwRetSize   DWORD
 	FdwNumber    DWORD
 	FwDeviceType UINT
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2134:11 */
 
 type MCI_SYSINFO_PARMSA = tagMCI_SYSINFO_PARMSA /* mmsystem.h:2140:5 */
@@ -44352,7 +44857,7 @@ type tagMCI_SYSINFO_PARMSW = struct {
 	FdwRetSize   DWORD
 	FdwNumber    DWORD
 	FwDeviceType UINT
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2142:11 */
 
 type MCI_SYSINFO_PARMSW = tagMCI_SYSINFO_PARMSW /* mmsystem.h:2148:5 */
@@ -44374,10 +44879,10 @@ type PMCI_SET_PARMS = uintptr         /* mmsystem.h:2158:19 */
 type LPMCI_SET_PARMS = uintptr        /* mmsystem.h:2158:35 */
 
 type tagMCI_BREAK_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FnVirtKey   int32
-	_           [4]byte
-	FhwndBreak  HWND
+	FdwCallback  DWORD_PTR
+	FnVirtKey    int32
+	F__ccgo_pad1 [4]byte
+	FhwndBreak   HWND
 } /* mmsystem.h:2160:11 */
 
 type MCI_BREAK_PARMS = tagMCI_BREAK_PARMS /* mmsystem.h:2164:5 */
@@ -44438,11 +44943,11 @@ type MCI_RECORD_PARMS = tagMCI_RECORD_PARMS /* mmsystem.h:2198:5 */
 type LPMCI_RECORD_PARMS = uintptr           /* mmsystem.h:2198:22 */
 
 type tagMCI_VD_PLAY_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FdwFrom     DWORD
-	FdwTo       DWORD
-	FdwSpeed    DWORD
-	_           [4]byte
+	FdwCallback  DWORD_PTR
+	FdwFrom      DWORD
+	FdwTo        DWORD
+	FdwSpeed     DWORD
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2238:11 */
 
 type MCI_VD_PLAY_PARMS = tagMCI_VD_PLAY_PARMS /* mmsystem.h:2243:5 */
@@ -44450,9 +44955,9 @@ type PMCI_VD_PLAY_PARMS = uintptr             /* mmsystem.h:2243:23 */
 type LPMCI_VD_PLAY_PARMS = uintptr            /* mmsystem.h:2243:43 */
 
 type tagMCI_VD_STEP_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FdwFrames   DWORD
-	_           [4]byte
+	FdwCallback  DWORD_PTR
+	FdwFrames    DWORD
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2245:11 */
 
 type MCI_VD_STEP_PARMS = tagMCI_VD_STEP_PARMS /* mmsystem.h:2248:5 */
@@ -44484,12 +44989,12 @@ type LPMCI_VD_ESCAPE_PARMS = LPMCI_VD_ESCAPE_PARMSA /* mmsystem.h:2262:3 */
 type tagMCI_WAVE_OPEN_PARMSA = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCSTR
 	FlpstrElementName LPCSTR
 	FlpstrAlias       LPCSTR
 	FdwBufferSeconds  DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 } /* mmsystem.h:2297:11 */
 
 type MCI_WAVE_OPEN_PARMSA = tagMCI_WAVE_OPEN_PARMSA /* mmsystem.h:2304:5 */
@@ -44499,12 +45004,12 @@ type LPMCI_WAVE_OPEN_PARMSA = uintptr               /* mmsystem.h:2304:49 */
 type tagMCI_WAVE_OPEN_PARMSW = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCWSTR
 	FlpstrElementName LPCWSTR
 	FlpstrAlias       LPCWSTR
 	FdwBufferSeconds  DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 } /* mmsystem.h:2306:11 */
 
 type MCI_WAVE_OPEN_PARMSW = tagMCI_WAVE_OPEN_PARMSW /* mmsystem.h:2313:5 */
@@ -44556,7 +45061,7 @@ type tagMCI_SEQ_SET_PARMS = struct {
 	FdwSlave      DWORD
 	FdwMaster     DWORD
 	FdwOffset     DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 } /* mmsystem.h:2371:11 */
 
 type MCI_SEQ_SET_PARMS = tagMCI_SEQ_SET_PARMS /* mmsystem.h:2380:5 */
@@ -44566,12 +45071,12 @@ type LPMCI_SEQ_SET_PARMS = uintptr            /* mmsystem.h:2380:43 */
 type tagMCI_ANIM_OPEN_PARMSA = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCSTR
 	FlpstrElementName LPCSTR
 	FlpstrAlias       LPCSTR
 	FdwStyle          DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhWndParent       HWND
 } /* mmsystem.h:2431:11 */
 
@@ -44582,12 +45087,12 @@ type LPMCI_ANIM_OPEN_PARMSA = uintptr               /* mmsystem.h:2439:49 */
 type tagMCI_ANIM_OPEN_PARMSW = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCWSTR
 	FlpstrElementName LPCWSTR
 	FlpstrAlias       LPCWSTR
 	FdwStyle          DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhWndParent       HWND
 } /* mmsystem.h:2441:11 */
 
@@ -44600,11 +45105,11 @@ type PMCI_ANIM_OPEN_PARMS = PMCI_ANIM_OPEN_PARMSA   /* mmsystem.h:2452:3 */
 type LPMCI_ANIM_OPEN_PARMS = LPMCI_ANIM_OPEN_PARMSA /* mmsystem.h:2453:3 */
 
 type tagMCI_ANIM_PLAY_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FdwFrom     DWORD
-	FdwTo       DWORD
-	FdwSpeed    DWORD
-	_           [4]byte
+	FdwCallback  DWORD_PTR
+	FdwFrom      DWORD
+	FdwTo        DWORD
+	FdwSpeed     DWORD
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2455:11 */
 
 type MCI_ANIM_PLAY_PARMS = tagMCI_ANIM_PLAY_PARMS /* mmsystem.h:2460:5 */
@@ -44612,9 +45117,9 @@ type PMCI_ANIM_PLAY_PARMS = uintptr               /* mmsystem.h:2460:25 */
 type LPMCI_ANIM_PLAY_PARMS = uintptr              /* mmsystem.h:2460:47 */
 
 type tagMCI_ANIM_STEP_PARMS = struct {
-	FdwCallback DWORD_PTR
-	FdwFrames   DWORD
-	_           [4]byte
+	FdwCallback  DWORD_PTR
+	FdwFrames    DWORD
+	F__ccgo_pad1 [4]byte
 } /* mmsystem.h:2462:11 */
 
 type MCI_ANIM_STEP_PARMS = tagMCI_ANIM_STEP_PARMS /* mmsystem.h:2465:5 */
@@ -44622,11 +45127,11 @@ type PMCI_ANIM_STEP_PARMS = uintptr               /* mmsystem.h:2465:25 */
 type LPMCI_ANIM_STEP_PARMS = uintptr              /* mmsystem.h:2465:47 */
 
 type tagMCI_ANIM_WINDOW_PARMSA = struct {
-	FdwCallback DWORD_PTR
-	FhWnd       HWND
-	FnCmdShow   UINT
-	_           [4]byte
-	FlpstrText  LPCSTR
+	FdwCallback  DWORD_PTR
+	FhWnd        HWND
+	FnCmdShow    UINT
+	F__ccgo_pad1 [4]byte
+	FlpstrText   LPCSTR
 } /* mmsystem.h:2467:11 */
 
 type MCI_ANIM_WINDOW_PARMSA = tagMCI_ANIM_WINDOW_PARMSA /* mmsystem.h:2472:5 */
@@ -44634,11 +45139,11 @@ type PMCI_ANIM_WINDOW_PARMSA = uintptr                  /* mmsystem.h:2472:28 */
 type LPMCI_ANIM_WINDOW_PARMSA = uintptr                 /* mmsystem.h:2472:53 */
 
 type tagMCI_ANIM_WINDOW_PARMSW = struct {
-	FdwCallback DWORD_PTR
-	FhWnd       HWND
-	FnCmdShow   UINT
-	_           [4]byte
-	FlpstrText  LPCWSTR
+	FdwCallback  DWORD_PTR
+	FhWnd        HWND
+	FnCmdShow    UINT
+	F__ccgo_pad1 [4]byte
+	FlpstrText   LPCWSTR
 } /* mmsystem.h:2474:11 */
 
 type MCI_ANIM_WINDOW_PARMSW = tagMCI_ANIM_WINDOW_PARMSW /* mmsystem.h:2479:5 */
@@ -44672,12 +45177,12 @@ type LPMCI_ANIM_UPDATE_PARMS = uintptr                /* mmsystem.h:2502:51 */
 type tagMCI_OVLY_OPEN_PARMSA = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCSTR
 	FlpstrElementName LPCSTR
 	FlpstrAlias       LPCSTR
 	FdwStyle          DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhWndParent       HWND
 } /* mmsystem.h:2535:11 */
 
@@ -44688,12 +45193,12 @@ type LPMCI_OVLY_OPEN_PARMSA = uintptr               /* mmsystem.h:2543:49 */
 type tagMCI_OVLY_OPEN_PARMSW = struct {
 	FdwCallback       DWORD_PTR
 	FwDeviceID        MCIDEVICEID
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FlpstrDeviceType  LPCWSTR
 	FlpstrElementName LPCWSTR
 	FlpstrAlias       LPCWSTR
 	FdwStyle          DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhWndParent       HWND
 } /* mmsystem.h:2545:11 */
 
@@ -44706,11 +45211,11 @@ type PMCI_OVLY_OPEN_PARMS = PMCI_OVLY_OPEN_PARMSA   /* mmsystem.h:2556:3 */
 type LPMCI_OVLY_OPEN_PARMS = LPMCI_OVLY_OPEN_PARMSA /* mmsystem.h:2557:3 */
 
 type tagMCI_OVLY_WINDOW_PARMSA = struct {
-	FdwCallback DWORD_PTR
-	FhWnd       HWND
-	FnCmdShow   UINT
-	_           [4]byte
-	FlpstrText  LPCSTR
+	FdwCallback  DWORD_PTR
+	FhWnd        HWND
+	FnCmdShow    UINT
+	F__ccgo_pad1 [4]byte
+	FlpstrText   LPCSTR
 } /* mmsystem.h:2559:11 */
 
 type MCI_OVLY_WINDOW_PARMSA = tagMCI_OVLY_WINDOW_PARMSA /* mmsystem.h:2564:5 */
@@ -44718,11 +45223,11 @@ type PMCI_OVLY_WINDOW_PARMSA = uintptr                  /* mmsystem.h:2564:28 */
 type LPMCI_OVLY_WINDOW_PARMSA = uintptr                 /* mmsystem.h:2564:53 */
 
 type tagMCI_OVLY_WINDOW_PARMSW = struct {
-	FdwCallback DWORD_PTR
-	FhWnd       HWND
-	FnCmdShow   UINT
-	_           [4]byte
-	FlpstrText  LPCWSTR
+	FdwCallback  DWORD_PTR
+	FhWnd        HWND
+	FnCmdShow    UINT
+	F__ccgo_pad1 [4]byte
+	FlpstrText   LPCWSTR
 } /* mmsystem.h:2566:11 */
 
 type MCI_OVLY_WINDOW_PARMSW = tagMCI_OVLY_WINDOW_PARMSW /* mmsystem.h:2571:5 */
@@ -44804,19 +45309,19 @@ type _NCB = struct {
 	Fncb_retcode  UCHAR
 	Fncb_lsn      UCHAR
 	Fncb_num      UCHAR
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	Fncb_buffer   PUCHAR
 	Fncb_length   WORD
 	Fncb_callname [16]UCHAR
 	Fncb_name     [16]UCHAR
 	Fncb_rto      UCHAR
 	Fncb_sto      UCHAR
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	Fncb_post     uintptr
 	Fncb_lana_num UCHAR
 	Fncb_cmd_cplt UCHAR
 	Fncb_reserve  [18]UCHAR
-	_             [4]byte
+	F__ccgo_pad3  [4]byte
 	Fncb_event    HANDLE
 } /* nb30.h:16:11 */
 
@@ -44995,17 +45500,17 @@ type Handle_t = RPC_BINDING_HANDLE     /* rpcdce.h:36:30 */
 type UUID = GUID /* rpcdce.h:44:16 */
 
 type _RPC_BINDING_VECTOR = struct {
-	FCount    uint32
-	_         [4]byte
-	FBindingH [1]RPC_BINDING_HANDLE
+	FCount       uint32
+	F__ccgo_pad1 [4]byte
+	FBindingH    [1]RPC_BINDING_HANDLE
 } /* rpcdce.h:50:11 */
 
 type RPC_BINDING_VECTOR = _RPC_BINDING_VECTOR /* rpcdce.h:53:5 */
 
 type _UUID_VECTOR = struct {
-	FCount uint32
-	_      [4]byte
-	FUuid  [1]uintptr
+	FCount       uint32
+	F__ccgo_pad1 [4]byte
+	FUuid        [1]uintptr
 } /* rpcdce.h:58:11 */
 
 type UUID_VECTOR = _UUID_VECTOR /* rpcdce.h:61:5 */
@@ -45021,17 +45526,17 @@ type _RPC_IF_ID = struct {
 type RPC_IF_ID = _RPC_IF_ID /* rpcdce.h:74:5 */
 
 type _RPC_PROTSEQ_VECTORA = struct {
-	FCount   uint32
-	_        [4]byte
-	FProtseq [1]uintptr
+	FCount       uint32
+	F__ccgo_pad1 [4]byte
+	FProtseq     [1]uintptr
 } /* rpcdce.h:124:11 */
 
 type RPC_PROTSEQ_VECTORA = _RPC_PROTSEQ_VECTORA /* rpcdce.h:127:5 */
 
 type _RPC_PROTSEQ_VECTORW = struct {
-	FCount   uint32
-	_        [4]byte
-	FProtseq [1]uintptr
+	FCount       uint32
+	F__ccgo_pad1 [4]byte
+	FProtseq     [1]uintptr
 } /* rpcdce.h:129:11 */
 
 type RPC_PROTSEQ_VECTORW = _RPC_PROTSEQ_VECTORW /* rpcdce.h:132:5 */
@@ -45051,9 +45556,9 @@ type RPC_STATS_VECTOR = struct {
 } /* rpcdce.h:151:5 */
 
 type RPC_IF_ID_VECTOR = struct {
-	FCount uint32
-	_      [4]byte
-	FIfId  [1]uintptr
+	FCount       uint32
+	F__ccgo_pad1 [4]byte
+	FIfId        [1]uintptr
 } /* rpcdce.h:161:5 */
 
 type RPC_AUTH_IDENTITY_HANDLE = uintptr /* rpcdce.h:257:16 */
@@ -45072,10 +45577,10 @@ type PRPC_SECURITY_QOS = uintptr          /* rpcdce.h:316:22 */
 type _SEC_WINNT_AUTH_IDENTITY_W = struct {
 	FUser           uintptr
 	FUserLength     uint32
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FDomain         uintptr
 	FDomainLength   uint32
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FPassword       uintptr
 	FPasswordLength uint32
 	FFlags          uint32
@@ -45087,10 +45592,10 @@ type PSEC_WINNT_AUTH_IDENTITY_W = uintptr                   /* rpcdce.h:332:31 *
 type _SEC_WINNT_AUTH_IDENTITY_A = struct {
 	FUser           uintptr
 	FUserLength     uint32
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FDomain         uintptr
 	FDomainLength   uint32
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FPassword       uintptr
 	FPasswordLength uint32
 	FFlags          uint32
@@ -45104,7 +45609,7 @@ type _RPC_HTTP_TRANSPORT_CREDENTIALS_W = struct {
 	FFlags                    uint32
 	FAuthenticationTarget     uint32
 	FNumberOfAuthnSchemes     uint32
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FAuthnSchemes             uintptr
 	FServerCertificateSubject uintptr
 } /* rpcdce.h:366:11 */
@@ -45117,7 +45622,7 @@ type _RPC_HTTP_TRANSPORT_CREDENTIALS_A = struct {
 	FFlags                    uint32
 	FAuthenticationTarget     uint32
 	FNumberOfAuthnSchemes     uint32
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FAuthnSchemes             uintptr
 	FServerCertificateSubject uintptr
 } /* rpcdce.h:375:11 */
@@ -45131,7 +45636,7 @@ type _RPC_SECURITY_QOS_V2_W = struct {
 	FIdentityTracking           uint32
 	FImpersonationType          uint32
 	FAdditionalSecurityInfoType uint32
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	Fu                          struct{ FHttpCredentials uintptr }
 } /* rpcdce.h:384:11 */
 
@@ -45144,7 +45649,7 @@ type _RPC_SECURITY_QOS_V2_A = struct {
 	FIdentityTracking           uint32
 	FImpersonationType          uint32
 	FAdditionalSecurityInfoType uint32
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	Fu                          struct{ FHttpCredentials uintptr }
 } /* rpcdce.h:395:11 */
 
@@ -45157,7 +45662,7 @@ type _RPC_SECURITY_QOS_V3_W = struct {
 	FIdentityTracking           uint32
 	FImpersonationType          uint32
 	FAdditionalSecurityInfoType uint32
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	Fu                          struct{ FHttpCredentials uintptr }
 	FSid                        uintptr
 } /* rpcdce.h:408:11 */
@@ -45171,7 +45676,7 @@ type _RPC_SECURITY_QOS_V3_A = struct {
 	FIdentityTracking           uint32
 	FImpersonationType          uint32
 	FAdditionalSecurityInfoType uint32
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	Fu                          struct{ FHttpCredentials uintptr }
 	FSid                        uintptr
 } /* rpcdce.h:420:11 */
@@ -45190,7 +45695,7 @@ type RPC_CLIENT_INFORMATION1 = struct {
 	FUserName     uintptr
 	FComputerName uintptr
 	FPrivilege    uint16
-	_             [2]byte
+	F__ccgo_pad1  [2]byte
 	FAuthFlags    uint32
 }                                       /* rpcdce.h:490:5 */
 type PRPC_CLIENT_INFORMATION1 = uintptr /* rpcdce.h:490:29 */
@@ -45237,7 +45742,7 @@ type PRPC_SYNTAX_IDENTIFIER = uintptr               /* rpcdcep.h:23:27 */
 type _RPC_MESSAGE = struct {
 	FHandle                  RPC_BINDING_HANDLE
 	FDataRepresentation      uint32
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FBuffer                  uintptr
 	FBufferLength            uint32
 	FProcNum                 uint32
@@ -45247,7 +45752,7 @@ type _RPC_MESSAGE = struct {
 	FManagerEpv              uintptr
 	FImportContext           uintptr
 	FRpcFlags                uint32
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 } /* rpcdcep.h:25:11 */
 
 type RPC_MESSAGE = _RPC_MESSAGE /* rpcdcep.h:37:5 */
@@ -45257,7 +45762,7 @@ type RPC_DISPATCH_FUNCTION = uintptr /* rpcdcep.h:77:16 */
 
 type RPC_DISPATCH_TABLE = struct {
 	FDispatchTableCount uint32
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FDispatchTable      uintptr
 	FReserved           LONG_PTR
 }                                  /* rpcdcep.h:83:5 */
@@ -45275,15 +45780,15 @@ type _RPC_SERVER_INTERFACE = struct {
 	FLength                  uint32
 	FInterfaceId             RPC_SYNTAX_IDENTIFIER
 	FTransferSyntax          RPC_SYNTAX_IDENTIFIER
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FDispatchTable           PRPC_DISPATCH_TABLE
 	FRpcProtseqEndpointCount uint32
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FRpcProtseqEndpoint      PRPC_PROTSEQ_ENDPOINT
 	FDefaultManagerEpv       uintptr
 	FInterpreterInfo         uintptr
 	FFlags                   uint32
-	_                        [4]byte
+	F__ccgo_pad3             [4]byte
 } /* rpcdcep.h:93:11 */
 
 type RPC_SERVER_INTERFACE = _RPC_SERVER_INTERFACE /* rpcdcep.h:103:5 */
@@ -45293,15 +45798,15 @@ type _RPC_CLIENT_INTERFACE = struct {
 	FLength                  uint32
 	FInterfaceId             RPC_SYNTAX_IDENTIFIER
 	FTransferSyntax          RPC_SYNTAX_IDENTIFIER
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FDispatchTable           PRPC_DISPATCH_TABLE
 	FRpcProtseqEndpointCount uint32
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FRpcProtseqEndpoint      PRPC_PROTSEQ_ENDPOINT
 	FReserved                ULONG_PTR
 	FInterpreterInfo         uintptr
 	FFlags                   uint32
-	_                        [4]byte
+	F__ccgo_pad3             [4]byte
 } /* rpcdcep.h:105:11 */
 
 type RPC_CLIENT_INTERFACE = _RPC_CLIENT_INTERFACE /* rpcdcep.h:115:5 */
@@ -45323,19 +45828,19 @@ type RPCLT_PDU_FILTER_FUNC = uintptr /* rpcdcep.h:201:16 */
 type RPC_SETFILTER_FUNC = uintptr    /* rpcdcep.h:202:16 */
 
 type _RPC_C_OPT_METADATA_DESCRIPTOR = struct {
-	FBufferSize uint32
-	_           [4]byte
-	FBuffer     uintptr
+	FBufferSize  uint32
+	F__ccgo_pad1 [4]byte
+	FBuffer      uintptr
 } /* rpcdcep.h:222:11 */
 
 type RPC_C_OPT_METADATA_DESCRIPTOR = _RPC_C_OPT_METADATA_DESCRIPTOR /* rpcdcep.h:225:5 */
 
 type _RDR_CALLOUT_STATE = struct {
 	FLastError           RPC_STATUS
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FLastEEInfo          uintptr
 	FLastCalledStage     RPC_HTTP_REDIRECTOR_STAGE
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FServerName          uintptr
 	FServerPort          uintptr
 	FRemoteUser          uintptr
@@ -45345,11 +45850,11 @@ type _RDR_CALLOUT_STATE = struct {
 	FSessionIdPresent    uint8
 	FInterfacePresent    uint8
 	FResourceType        UUID
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FMetadata            RPC_C_OPT_METADATA_DESCRIPTOR
 	FSessionId           UUID
 	FInterface           RPC_SYNTAX_IDENTIFIER
-	_                    [4]byte
+	F__ccgo_pad4         [4]byte
 	FCertContext         uintptr
 } /* rpcdcep.h:227:11 */
 
@@ -45435,7 +45940,7 @@ type _RPC_ASYNC_STATE = struct {
 			FNotificationRoutine PFN_RPCNOTIFICATION_ROUTINE
 			FhThread             HANDLE
 		}
-		_ [16]byte
+		F__ccgo_pad1 [16]byte
 	}
 	FReserved [4]LONG_PTR
 } /* rpcasync.h:29:3 */
@@ -45448,19 +45953,19 @@ type PRPC_ASYNC_STATE = uintptr         /* rpcasync.h:63:21 */
 type ExtendedErrorParamTypes = uint32 /* rpcasync.h:80:5 */
 
 type tagBinaryParam = struct {
-	FBuffer uintptr
-	FSize   int16
-	_       [6]byte
+	FBuffer      uintptr
+	FSize        int16
+	F__ccgo_pad1 [6]byte
 } /* rpcasync.h:85:11 */
 
 type BinaryParam = tagBinaryParam /* rpcasync.h:88:5 */
 
 type tagRPC_EE_INFO_PARAM = struct {
 	FParameterType ExtendedErrorParamTypes
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	Fu             struct {
-		FAnsiString LPSTR
-		_           [8]byte
+		FAnsiString  LPSTR
+		F__ccgo_pad1 [8]byte
 	}
 } /* rpcasync.h:90:11 */
 
@@ -45468,29 +45973,29 @@ type RPC_EE_INFO_PARAM = tagRPC_EE_INFO_PARAM /* rpcasync.h:100:5 */
 
 type tagRPC_EXTENDED_ERROR_INFO = struct {
 	FVersion      ULONG
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FComputerName LPWSTR
 	FProcessID    ULONG
 	Fu            struct {
-		_           [0]uint32
-		FSystemTime SYSTEMTIME
+		F__ccgo_pad1 [0]uint32
+		FSystemTime  SYSTEMTIME
 	}
 	FGeneratingComponent ULONG
 	FStatus              ULONG
 	FDetectionLocation   USHORT
 	FFlags               USHORT
 	FNumberOfParameters  int32
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FParameters          [4]RPC_EE_INFO_PARAM
 } /* rpcasync.h:109:11 */
 
 type RPC_EXTENDED_ERROR_INFO = tagRPC_EXTENDED_ERROR_INFO /* rpcasync.h:123:5 */
 
 type tagRPC_ERROR_ENUM_HANDLE = struct {
-	FSignature  ULONG
-	_           [4]byte
-	FCurrentPos uintptr
-	FHead       uintptr
+	FSignature   ULONG
+	F__ccgo_pad1 [4]byte
+	FCurrentPos  uintptr
+	FHead        uintptr
 } /* rpcasync.h:125:11 */
 
 type RPC_ERROR_ENUM_HANDLE = tagRPC_ERROR_ENUM_HANDLE /* rpcasync.h:129:5 */
@@ -45499,15 +46004,15 @@ type tagRPC_CALL_ATTRIBUTES_V1_W = struct {
 	FVersion                         uint32
 	FFlags                           uint32
 	FServerPrincipalNameBufferLength uint32
-	_                                [4]byte
+	F__ccgo_pad1                     [4]byte
 	FServerPrincipalName             uintptr
 	FClientPrincipalNameBufferLength uint32
-	_                                [4]byte
+	F__ccgo_pad2                     [4]byte
 	FClientPrincipalName             uintptr
 	FAuthenticationLevel             uint32
 	FAuthenticationService           uint32
 	FNullSession                     WINBOOL
-	_                                [4]byte
+	F__ccgo_pad3                     [4]byte
 } /* rpcasync.h:149:11 */
 
 type RPC_CALL_ATTRIBUTES_V1_W = tagRPC_CALL_ATTRIBUTES_V1_W /* rpcasync.h:159:5 */
@@ -45516,15 +46021,15 @@ type tagRPC_CALL_ATTRIBUTES_V1_A = struct {
 	FVersion                         uint32
 	FFlags                           uint32
 	FServerPrincipalNameBufferLength uint32
-	_                                [4]byte
+	F__ccgo_pad1                     [4]byte
 	FServerPrincipalName             uintptr
 	FClientPrincipalNameBufferLength uint32
-	_                                [4]byte
+	F__ccgo_pad2                     [4]byte
 	FClientPrincipalName             uintptr
 	FAuthenticationLevel             uint32
 	FAuthenticationService           uint32
 	FNullSession                     WINBOOL
-	_                                [4]byte
+	F__ccgo_pad3                     [4]byte
 } /* rpcasync.h:161:11 */
 
 type RPC_CALL_ATTRIBUTES_V1_A = tagRPC_CALL_ATTRIBUTES_V1_A /* rpcasync.h:171:5 */
@@ -45536,7 +46041,7 @@ type _RPC_ASYNC_NOTIFICATION_INFO = struct {
 		FNotificationRoutine PFN_RPCNOTIFICATION_ROUTINE
 		FhThread             HANDLE
 	}
-	_ [16]byte
+	F__ccgo_pad1 [16]byte
 } /* rpcasync.h:185:9 */
 
 type RPC_ASYNC_NOTIFICATION_INFO = _RPC_ASYNC_NOTIFICATION_INFO /* rpcasync.h:202:3 */
@@ -45587,11 +46092,11 @@ type _DRAGINFOA = struct {
 	FfNC         WINBOOL
 	FlpFileList  LPSTR
 	FgrfKeyState DWORD
-	_            [4]byte
-} /* shellapi.h:90:11 */
+	F__ccgo_pad1 [4]byte
+} /* shellapi.h:89:11 */
 
-type DRAGINFOA = _DRAGINFOA /* shellapi.h:96:5 */
-type LPDRAGINFOA = uintptr  /* shellapi.h:96:15 */
+type DRAGINFOA = _DRAGINFOA /* shellapi.h:95:5 */
+type LPDRAGINFOA = uintptr  /* shellapi.h:95:15 */
 
 type _DRAGINFOW = struct {
 	FuSize       UINT
@@ -45599,89 +46104,89 @@ type _DRAGINFOW = struct {
 	FfNC         WINBOOL
 	FlpFileList  LPWSTR
 	FgrfKeyState DWORD
-	_            [4]byte
-} /* shellapi.h:98:11 */
+	F__ccgo_pad1 [4]byte
+} /* shellapi.h:97:11 */
 
-type DRAGINFOW = _DRAGINFOW /* shellapi.h:104:5 */
-type LPDRAGINFOW = uintptr  /* shellapi.h:104:15 */
+type DRAGINFOW = _DRAGINFOW /* shellapi.h:103:5 */
+type LPDRAGINFOW = uintptr  /* shellapi.h:103:15 */
 
-type DRAGINFO = DRAGINFOA     /* shellapi.h:106:3 */
-type LPDRAGINFO = LPDRAGINFOA /* shellapi.h:107:3 */
+type DRAGINFO = DRAGINFOA     /* shellapi.h:105:3 */
+type LPDRAGINFO = LPDRAGINFOA /* shellapi.h:106:3 */
 
 type _AppBarData = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhWnd             HWND
 	FuCallbackMessage UINT
 	FuEdge            UINT
 	Frc               RECT
 	FlParam           LPARAM
-} /* shellapi.h:139:11 */
+} /* shellapi.h:138:11 */
 
-type APPBARDATA = _AppBarData /* shellapi.h:146:5 */
-type PAPPBARDATA = uintptr    /* shellapi.h:146:16 */
+type APPBARDATA = _AppBarData /* shellapi.h:145:5 */
+type PAPPBARDATA = uintptr    /* shellapi.h:145:16 */
 
-type FILEOP_FLAGS = WORD /* shellapi.h:183:16 */
+type FILEOP_FLAGS = WORD /* shellapi.h:182:16 */
 
-type PRINTEROP_FLAGS = WORD /* shellapi.h:191:16 */
+type PRINTEROP_FLAGS = WORD /* shellapi.h:190:16 */
 
 type _SHFILEOPSTRUCTA = struct {
 	Fhwnd                  HWND
 	FwFunc                 UINT
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FpFrom                 LPCSTR
 	FpTo                   LPCSTR
 	FfFlags                FILEOP_FLAGS
-	_                      [2]byte
+	F__ccgo_pad2           [2]byte
 	FfAnyOperationsAborted WINBOOL
 	FhNameMappings         LPVOID
 	FlpszProgressTitle     PCSTR
-} /* shellapi.h:193:11 */
+} /* shellapi.h:192:11 */
 
-type SHFILEOPSTRUCTA = _SHFILEOPSTRUCTA /* shellapi.h:202:5 */
-type LPSHFILEOPSTRUCTA = uintptr        /* shellapi.h:202:21 */
+type SHFILEOPSTRUCTA = _SHFILEOPSTRUCTA /* shellapi.h:201:5 */
+type LPSHFILEOPSTRUCTA = uintptr        /* shellapi.h:201:21 */
 
 type _SHFILEOPSTRUCTW = struct {
 	Fhwnd                  HWND
 	FwFunc                 UINT
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FpFrom                 LPCWSTR
 	FpTo                   LPCWSTR
 	FfFlags                FILEOP_FLAGS
-	_                      [2]byte
+	F__ccgo_pad2           [2]byte
 	FfAnyOperationsAborted WINBOOL
 	FhNameMappings         LPVOID
 	FlpszProgressTitle     PCWSTR
-} /* shellapi.h:204:11 */
+} /* shellapi.h:203:11 */
 
-type SHFILEOPSTRUCTW = _SHFILEOPSTRUCTW /* shellapi.h:213:5 */
-type LPSHFILEOPSTRUCTW = uintptr        /* shellapi.h:213:21 */
+type SHFILEOPSTRUCTW = _SHFILEOPSTRUCTW /* shellapi.h:212:5 */
+type LPSHFILEOPSTRUCTW = uintptr        /* shellapi.h:212:21 */
 
-type SHFILEOPSTRUCT = SHFILEOPSTRUCTA     /* shellapi.h:215:3 */
-type LPSHFILEOPSTRUCT = LPSHFILEOPSTRUCTA /* shellapi.h:216:3 */
+type SHFILEOPSTRUCT = SHFILEOPSTRUCTA     /* shellapi.h:214:3 */
+type LPSHFILEOPSTRUCT = LPSHFILEOPSTRUCTA /* shellapi.h:215:3 */
 
 type _SHNAMEMAPPINGA = struct {
 	FpszOldPath LPSTR
 	FpszNewPath LPSTR
 	FcchOldPath int32
 	FcchNewPath int32
-} /* shellapi.h:225:11 */
+} /* shellapi.h:224:11 */
 
-type SHNAMEMAPPINGA = _SHNAMEMAPPINGA /* shellapi.h:230:5 */
-type LPSHNAMEMAPPINGA = uintptr       /* shellapi.h:230:20 */
+type SHNAMEMAPPINGA = _SHNAMEMAPPINGA /* shellapi.h:229:5 */
+type LPSHNAMEMAPPINGA = uintptr       /* shellapi.h:229:20 */
 
 type _SHNAMEMAPPINGW = struct {
 	FpszOldPath LPWSTR
 	FpszNewPath LPWSTR
 	FcchOldPath int32
 	FcchNewPath int32
-} /* shellapi.h:232:11 */
+} /* shellapi.h:231:11 */
 
-type SHNAMEMAPPINGW = _SHNAMEMAPPINGW /* shellapi.h:237:5 */
-type LPSHNAMEMAPPINGW = uintptr       /* shellapi.h:237:20 */
+type SHNAMEMAPPINGW = _SHNAMEMAPPINGW /* shellapi.h:236:5 */
+type LPSHNAMEMAPPINGW = uintptr       /* shellapi.h:236:20 */
 
-type SHNAMEMAPPING = SHNAMEMAPPINGA     /* shellapi.h:240:3 */
-type LPSHNAMEMAPPING = LPSHNAMEMAPPINGA /* shellapi.h:241:3 */
+type SHNAMEMAPPING = SHNAMEMAPPINGA     /* shellapi.h:239:3 */
+type LPSHNAMEMAPPING = LPSHNAMEMAPPINGA /* shellapi.h:240:3 */
 
 type _SHELLEXECUTEINFOA = struct {
 	FcbSize       DWORD
@@ -45692,19 +46197,19 @@ type _SHELLEXECUTEINFOA = struct {
 	FlpParameters LPCSTR
 	FlpDirectory  LPCSTR
 	FnShow        int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FhInstApp     HINSTANCE
 	FlpIDList     uintptr
 	FlpClass      LPCSTR
 	FhkeyClass    HKEY
 	FdwHotKey     DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	Fu            struct{ FhIcon HANDLE }
 	FhProcess     HANDLE
-} /* shellapi.h:302:11 */
+} /* shellapi.h:301:11 */
 
-type SHELLEXECUTEINFOA = _SHELLEXECUTEINFOA /* shellapi.h:321:5 */
-type LPSHELLEXECUTEINFOA = uintptr          /* shellapi.h:321:23 */
+type SHELLEXECUTEINFOA = _SHELLEXECUTEINFOA /* shellapi.h:320:5 */
+type LPSHELLEXECUTEINFOA = uintptr          /* shellapi.h:320:23 */
 
 type _SHELLEXECUTEINFOW = struct {
 	FcbSize       DWORD
@@ -45715,22 +46220,22 @@ type _SHELLEXECUTEINFOW = struct {
 	FlpParameters LPCWSTR
 	FlpDirectory  LPCWSTR
 	FnShow        int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FhInstApp     HINSTANCE
 	FlpIDList     uintptr
 	FlpClass      LPCWSTR
 	FhkeyClass    HKEY
 	FdwHotKey     DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	Fu            struct{ FhIcon HANDLE }
 	FhProcess     HANDLE
-} /* shellapi.h:323:11 */
+} /* shellapi.h:322:11 */
 
-type SHELLEXECUTEINFOW = _SHELLEXECUTEINFOW /* shellapi.h:342:5 */
-type LPSHELLEXECUTEINFOW = uintptr          /* shellapi.h:342:23 */
+type SHELLEXECUTEINFOW = _SHELLEXECUTEINFOW /* shellapi.h:341:5 */
+type LPSHELLEXECUTEINFOW = uintptr          /* shellapi.h:341:23 */
 
-type SHELLEXECUTEINFO = SHELLEXECUTEINFOA     /* shellapi.h:344:3 */
-type LPSHELLEXECUTEINFO = LPSHELLEXECUTEINFOA /* shellapi.h:345:3 */
+type SHELLEXECUTEINFO = SHELLEXECUTEINFOA     /* shellapi.h:343:3 */
+type LPSHELLEXECUTEINFO = LPSHELLEXECUTEINFOA /* shellapi.h:344:3 */
 
 type _SHCREATEPROCESSINFOW = struct {
 	FcbSize               DWORD
@@ -45746,29 +46251,29 @@ type _SHCREATEPROCESSINFOW = struct {
 	FdwCreationFlags      DWORD
 	FlpStartupInfo        LPSTARTUPINFOW
 	FlpProcessInformation LPPROCESS_INFORMATION
-} /* shellapi.h:352:11 */
+} /* shellapi.h:351:11 */
 
-type SHCREATEPROCESSINFOW = _SHCREATEPROCESSINFOW /* shellapi.h:366:5 */
-type PSHCREATEPROCESSINFOW = uintptr              /* shellapi.h:366:26 */
+type SHCREATEPROCESSINFOW = _SHCREATEPROCESSINFOW /* shellapi.h:365:5 */
+type PSHCREATEPROCESSINFOW = uintptr              /* shellapi.h:365:26 */
 
 type _SHQUERYRBINFO = struct {
 	FcbSize      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	Fi64Size     int64
 	Fi64NumItems int64
-} /* shellapi.h:399:11 */
+} /* shellapi.h:398:11 */
 
-type SHQUERYRBINFO = _SHQUERYRBINFO /* shellapi.h:403:5 */
-type LPSHQUERYRBINFO = uintptr      /* shellapi.h:403:19 */
+type SHQUERYRBINFO = _SHQUERYRBINFO /* shellapi.h:402:5 */
+type LPSHQUERYRBINFO = uintptr      /* shellapi.h:402:19 */
 
 type _NOTIFYICONDATAA = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhWnd             HWND
 	FuID              UINT
 	FuFlags           UINT
 	FuCallbackMessage UINT
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhIcon            HICON
 	FszTip            [128]CHAR
 	FdwState          DWORD
@@ -45778,19 +46283,19 @@ type _NOTIFYICONDATAA = struct {
 	FszInfoTitle      [64]CHAR
 	FdwInfoFlags      DWORD
 	FguidItem         GUID
-} /* shellapi.h:443:11 */
+} /* shellapi.h:442:11 */
 
-type NOTIFYICONDATAA = _NOTIFYICONDATAA /* shellapi.h:464:5 */
-type PNOTIFYICONDATAA = uintptr         /* shellapi.h:464:21 */
+type NOTIFYICONDATAA = _NOTIFYICONDATAA /* shellapi.h:463:5 */
+type PNOTIFYICONDATAA = uintptr         /* shellapi.h:463:21 */
 
 type _NOTIFYICONDATAW = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhWnd             HWND
 	FuID              UINT
 	FuFlags           UINT
 	FuCallbackMessage UINT
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FhIcon            HICON
 	FszTip            [128]WCHAR
 	FdwState          DWORD
@@ -45800,25 +46305,25 @@ type _NOTIFYICONDATAW = struct {
 	FszInfoTitle      [64]WCHAR
 	FdwInfoFlags      DWORD
 	FguidItem         GUID
-} /* shellapi.h:466:11 */
+} /* shellapi.h:465:11 */
 
-type NOTIFYICONDATAW = _NOTIFYICONDATAW /* shellapi.h:487:5 */
-type PNOTIFYICONDATAW = uintptr         /* shellapi.h:487:21 */
+type NOTIFYICONDATAW = _NOTIFYICONDATAW /* shellapi.h:486:5 */
+type PNOTIFYICONDATAW = uintptr         /* shellapi.h:486:21 */
 
-type NOTIFYICONDATA = NOTIFYICONDATAA   /* shellapi.h:489:3 */
-type PNOTIFYICONDATA = PNOTIFYICONDATAA /* shellapi.h:490:3 */
+type NOTIFYICONDATA = NOTIFYICONDATAA   /* shellapi.h:488:3 */
+type PNOTIFYICONDATA = PNOTIFYICONDATAA /* shellapi.h:489:3 */
 
 type _NOTIFYICONIDENTIFIER = struct {
-	FcbSize   DWORD
-	_         [4]byte
-	FhWnd     HWND
-	FuID      UINT
-	FguidItem GUID
-	_         [4]byte
-} /* shellapi.h:557:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FhWnd        HWND
+	FuID         UINT
+	FguidItem    GUID
+	F__ccgo_pad2 [4]byte
+} /* shellapi.h:556:11 */
 
-type NOTIFYICONIDENTIFIER = _NOTIFYICONIDENTIFIER /* shellapi.h:562:5 */
-type PNOTIFYICONIDENTIFIER = uintptr              /* shellapi.h:562:26 */
+type NOTIFYICONIDENTIFIER = _NOTIFYICONIDENTIFIER /* shellapi.h:561:5 */
+type PNOTIFYICONIDENTIFIER = uintptr              /* shellapi.h:561:26 */
 
 type _SHFILEINFOA = struct {
 	FhIcon         HICON
@@ -45826,10 +46331,10 @@ type _SHFILEINFOA = struct {
 	FdwAttributes  DWORD
 	FszDisplayName [260]CHAR
 	FszTypeName    [80]CHAR
-	_              [4]byte
-} /* shellapi.h:576:11 */
+	F__ccgo_pad1   [4]byte
+} /* shellapi.h:575:11 */
 
-type SHFILEINFOA = _SHFILEINFOA /* shellapi.h:582:5 */
+type SHFILEINFOA = _SHFILEINFOA /* shellapi.h:581:5 */
 
 type _SHFILEINFOW = struct {
 	FhIcon         HICON
@@ -45837,14 +46342,14 @@ type _SHFILEINFOW = struct {
 	FdwAttributes  DWORD
 	FszDisplayName [260]WCHAR
 	FszTypeName    [80]WCHAR
-} /* shellapi.h:584:11 */
+} /* shellapi.h:583:11 */
 
-type SHFILEINFOW = _SHFILEINFOW /* shellapi.h:590:5 */
+type SHFILEINFOW = _SHFILEINFOW /* shellapi.h:589:5 */
 
-type SHFILEINFO = SHFILEINFOA /* shellapi.h:592:3 */
+type SHFILEINFO = SHFILEINFOA /* shellapi.h:591:3 */
 
-type PFNCANSHAREFOLDERW = uintptr    /* shellapi.h:861:19 */
-type PFNSHOWSHAREFOLDERUIW = uintptr /* shellapi.h:862:19 */
+type PFNCANSHAREFOLDERW = uintptr    /* shellapi.h:860:19 */
+type PFNSHOWSHAREFOLDERUIW = uintptr /* shellapi.h:861:19 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -45866,7 +46371,7 @@ type _PERF_DATA_BLOCK = struct {
 	FNumObjectTypes   DWORD
 	FDefaultObject    LONG
 	FSystemTime       SYSTEMTIME
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FPerfTime         LARGE_INTEGER
 	FPerfFreq         LARGE_INTEGER
 	FPerfTime100nSec  LARGE_INTEGER
@@ -45988,8 +46493,8 @@ type U_int64 = uint64 /* _bsd_types.h:25:28 */
 
 type in_addr = struct {
 	FS_un struct {
-		_       [0]uint32
-		FS_un_b struct {
+		F__ccgo_pad1 [0]uint32
+		FS_un_b      struct {
 			Fs_b1 U_char
 			Fs_b2 U_char
 			Fs_b3 U_char
@@ -46033,9 +46538,9 @@ type SOCKET = UINT_PTR /* _socket_types.h:11:18 */
 // if  __USE_W32_SOCKETS not defined.
 
 type fd_set = struct {
-	Ffd_count U_int
-	_         [4]byte
-	Ffd_array [64]SOCKET
+	Ffd_count    U_int
+	F__ccgo_pad1 [4]byte
+	Ffd_array    [64]SOCKET
 } /* _fd_types.h:21:9 */
 
 // *
@@ -46087,31 +46592,31 @@ type hostent = struct {
 	Fh_aliases   uintptr
 	Fh_addrtype  int16
 	Fh_length    int16
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	Fh_addr_list uintptr
 } /* _ip_types.h:25:1 */
 
 type netent = struct {
-	Fn_name     uintptr
-	Fn_aliases  uintptr
-	Fn_addrtype int16
-	_           [2]byte
-	Fn_net      U_long
+	Fn_name      uintptr
+	Fn_aliases   uintptr
+	Fn_addrtype  int16
+	F__ccgo_pad1 [2]byte
+	Fn_net       U_long
 } /* _ip_types.h:33:1 */
 
 type servent = struct {
-	Fs_name    uintptr
-	Fs_aliases uintptr
-	Fs_proto   uintptr
-	Fs_port    int16
-	_          [6]byte
+	Fs_name      uintptr
+	Fs_aliases   uintptr
+	Fs_proto     uintptr
+	Fs_port      int16
+	F__ccgo_pad1 [6]byte
 } /* _ip_types.h:40:1 */
 
 type protoent = struct {
-	Fp_name    uintptr
-	Fp_aliases uintptr
-	Fp_proto   int16
-	_          [6]byte
+	Fp_name      uintptr
+	Fp_aliases   uintptr
+	Fp_proto     int16
+	F__ccgo_pad1 [6]byte
 } /* _ip_types.h:52:1 */
 
 type sockproto = struct {
@@ -46134,8 +46639,8 @@ type sockaddr_in = struct {
 	Fsin_port   U_short
 	Fsin_addr   struct {
 		FS_un struct {
-			_       [0]uint32
-			FS_un_b struct {
+			F__ccgo_pad1 [0]uint32
+			FS_un_b      struct {
 				Fs_b1 U_char
 				Fs_b2 U_char
 				Fs_b3 U_char
@@ -46187,8 +46692,8 @@ type LPTIMEVAL = uintptr /* _ip_types.h:117:25 */
 type ip_mreq = struct {
 	Fimr_multiaddr struct {
 		FS_un struct {
-			_       [0]uint32
-			FS_un_b struct {
+			F__ccgo_pad1 [0]uint32
+			FS_un_b      struct {
 				Fs_b1 U_char
 				Fs_b2 U_char
 				Fs_b3 U_char
@@ -46198,8 +46703,8 @@ type ip_mreq = struct {
 	}
 	Fimr_interface struct {
 		FS_un struct {
-			_       [0]uint32
-			FS_un_b struct {
+			F__ccgo_pad1 [0]uint32
+			FS_un_b      struct {
 				Fs_b1 U_char
 				Fs_b2 U_char
 				Fs_b3 U_char
@@ -46222,7 +46727,7 @@ type WSAData = struct {
 	FlpVendorInfo   uintptr
 	FszDescription  [257]int8
 	FszSystemStatus [129]int8
-	_               [6]byte
+	F__ccgo_pad1    [6]byte
 } /* _wsadata.h:13:9 */
 
 // *
@@ -46239,12 +46744,12 @@ type LPWSADATA = uintptr /* _wsadata.h:29:12 */
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
 type _TRANSMIT_FILE_BUFFERS = struct {
-	FHead       LPVOID
-	FHeadLength DWORD
-	_           [4]byte
-	FTail       LPVOID
-	FTailLength DWORD
-	_           [4]byte
+	FHead        LPVOID
+	FHeadLength  DWORD
+	F__ccgo_pad1 [4]byte
+	FTail        LPVOID
+	FTailLength  DWORD
+	F__ccgo_pad2 [4]byte
 } /* _xmitfile.h:10:9 */
 
 // *
@@ -46285,37 +46790,37 @@ type LPTRANSMIT_FILE_BUFFERS = uintptr              /* _xmitfile.h:15:51 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type ALG_ID = uint32 /* wincrypt.h:182:24 */
+type ALG_ID = uint32 /* wincrypt.h:199:24 */
 
 // In ncrypt.h too
-type HCRYPTHASH = ULONG_PTR /* wincrypt.h:238:21 */
-type HCRYPTKEY = ULONG_PTR  /* wincrypt.h:239:21 */
-type HCRYPTPROV = ULONG_PTR /* wincrypt.h:240:21 */
+type HCRYPTHASH = ULONG_PTR /* wincrypt.h:283:21 */
+type HCRYPTKEY = ULONG_PTR  /* wincrypt.h:284:21 */
+type HCRYPTPROV = ULONG_PTR /* wincrypt.h:285:21 */
 
 type _CMS_KEY_INFO = struct {
-	FdwVersion DWORD
-	FAlgid     ALG_ID
-	FpbOID     uintptr
-	FcbOID     DWORD
-	_          [4]byte
-} /* wincrypt.h:553:11 */
+	FdwVersion   DWORD
+	FAlgid       ALG_ID
+	FpbOID       uintptr
+	FcbOID       DWORD
+	F__ccgo_pad1 [4]byte
+} /* wincrypt.h:627:11 */
 
-type CMS_KEY_INFO = _CMS_KEY_INFO /* wincrypt.h:558:5 */
-type PCMS_KEY_INFO = uintptr      /* wincrypt.h:558:18 */
+type CMS_KEY_INFO = _CMS_KEY_INFO /* wincrypt.h:632:5 */
+type PCMS_KEY_INFO = uintptr      /* wincrypt.h:632:18 */
 
 type _HMAC_Info = struct {
 	FHashAlgid     ALG_ID
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpbInnerString uintptr
 	FcbInnerString DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FpbOuterString uintptr
 	FcbOuterString DWORD
-	_              [4]byte
-} /* wincrypt.h:560:11 */
+	F__ccgo_pad3   [4]byte
+} /* wincrypt.h:634:11 */
 
-type HMAC_INFO = _HMAC_Info /* wincrypt.h:566:5 */
-type PHMAC_INFO = uintptr   /* wincrypt.h:566:15 */
+type HMAC_INFO = _HMAC_Info /* wincrypt.h:640:5 */
+type PHMAC_INFO = uintptr   /* wincrypt.h:640:15 */
 
 type _SCHANNEL_ALG = struct {
 	FdwUse      DWORD
@@ -46323,19 +46828,19 @@ type _SCHANNEL_ALG = struct {
 	FcBits      DWORD
 	FdwFlags    DWORD
 	FdwReserved DWORD
-} /* wincrypt.h:568:11 */
+} /* wincrypt.h:642:11 */
 
-type SCHANNEL_ALG = _SCHANNEL_ALG /* wincrypt.h:574:5 */
-type PSCHANNEL_ALG = uintptr      /* wincrypt.h:574:18 */
+type SCHANNEL_ALG = _SCHANNEL_ALG /* wincrypt.h:648:5 */
+type PSCHANNEL_ALG = uintptr      /* wincrypt.h:648:18 */
 
 type _PROV_ENUMALGS = struct {
 	FaiAlgid   ALG_ID
 	FdwBitLen  DWORD
 	FdwNameLen DWORD
 	FszName    [20]CHAR
-} /* wincrypt.h:580:11 */
+} /* wincrypt.h:654:11 */
 
-type PROV_ENUMALGS = _PROV_ENUMALGS /* wincrypt.h:585:5 */
+type PROV_ENUMALGS = _PROV_ENUMALGS /* wincrypt.h:659:5 */
 
 type _PROV_ENUMALGS_EX = struct {
 	FaiAlgid       ALG_ID
@@ -46347,44 +46852,44 @@ type _PROV_ENUMALGS_EX = struct {
 	FszName        [20]CHAR
 	FdwLongNameLen DWORD
 	FszLongName    [40]CHAR
-} /* wincrypt.h:587:11 */
+} /* wincrypt.h:661:11 */
 
-type PROV_ENUMALGS_EX = _PROV_ENUMALGS_EX /* wincrypt.h:597:5 */
+type PROV_ENUMALGS_EX = _PROV_ENUMALGS_EX /* wincrypt.h:671:5 */
 
 type _PUBLICKEYSTRUC = struct {
 	FbType    BYTE
 	FbVersion BYTE
 	Freserved WORD
 	FaiKeyAlg ALG_ID
-} /* wincrypt.h:599:11 */
+} /* wincrypt.h:673:11 */
 
-type BLOBHEADER = _PUBLICKEYSTRUC     /* wincrypt.h:604:5 */
-type PUBLICKEYSTRUC = _PUBLICKEYSTRUC /* wincrypt.h:604:16 */
+type BLOBHEADER = _PUBLICKEYSTRUC     /* wincrypt.h:678:5 */
+type PUBLICKEYSTRUC = _PUBLICKEYSTRUC /* wincrypt.h:678:16 */
 
 type _RSAPUBKEY = struct {
 	Fmagic  DWORD
 	Fbitlen DWORD
 	Fpubexp DWORD
-} /* wincrypt.h:606:11 */
+} /* wincrypt.h:680:11 */
 
-type RSAPUBKEY = _RSAPUBKEY /* wincrypt.h:610:5 */
+type RSAPUBKEY = _RSAPUBKEY /* wincrypt.h:684:5 */
 
 type _PUBKEY = struct {
 	Fmagic  DWORD
 	Fbitlen DWORD
-} /* wincrypt.h:612:11 */
+} /* wincrypt.h:686:11 */
 
-type DHPUBKEY = _PUBKEY  /* wincrypt.h:615:5 */
-type DSSPUBKEY = _PUBKEY /* wincrypt.h:615:14 */
-type KEAPUBKEY = _PUBKEY /* wincrypt.h:615:24 */
-type TEKPUBKEY = _PUBKEY /* wincrypt.h:615:34 */
+type DHPUBKEY = _PUBKEY  /* wincrypt.h:689:5 */
+type DSSPUBKEY = _PUBKEY /* wincrypt.h:689:14 */
+type KEAPUBKEY = _PUBKEY /* wincrypt.h:689:24 */
+type TEKPUBKEY = _PUBKEY /* wincrypt.h:689:34 */
 
 type _DSSSEED = struct {
 	Fcounter DWORD
 	Fseed    [20]BYTE
-} /* wincrypt.h:617:11 */
+} /* wincrypt.h:691:11 */
 
-type DSSSEED = _DSSSEED /* wincrypt.h:620:5 */
+type DSSSEED = _DSSSEED /* wincrypt.h:694:5 */
 
 type _PUBKEYVER3 = struct {
 	Fmagic   DWORD
@@ -46392,10 +46897,10 @@ type _PUBKEYVER3 = struct {
 	FbitlenQ DWORD
 	FbitlenJ DWORD
 	FDSSSeed DSSSEED
-} /* wincrypt.h:622:11 */
+} /* wincrypt.h:696:11 */
 
-type DHPUBKEY_VER3 = _PUBKEYVER3  /* wincrypt.h:628:5 */
-type DSSPUBKEY_VER3 = _PUBKEYVER3 /* wincrypt.h:628:20 */
+type DHPUBKEY_VER3 = _PUBKEYVER3  /* wincrypt.h:702:5 */
+type DSSPUBKEY_VER3 = _PUBKEYVER3 /* wincrypt.h:702:20 */
 
 type _PRIVKEYVER3 = struct {
 	Fmagic   DWORD
@@ -46404,101 +46909,101 @@ type _PRIVKEYVER3 = struct {
 	FbitlenJ DWORD
 	FbitlenX DWORD
 	FDSSSeed DSSSEED
-} /* wincrypt.h:630:11 */
+} /* wincrypt.h:704:11 */
 
-type DHPRIVKEY_VER3 = _PRIVKEYVER3  /* wincrypt.h:637:5 */
-type DSSPRIVKEY_VER3 = _PRIVKEYVER3 /* wincrypt.h:637:20 */
+type DHPRIVKEY_VER3 = _PRIVKEYVER3  /* wincrypt.h:711:5 */
+type DSSPRIVKEY_VER3 = _PRIVKEYVER3 /* wincrypt.h:711:20 */
 
 type _KEY_TYPE_SUBTYPE = struct {
 	FdwKeySpec DWORD
 	FType      GUID
 	FSubtype   GUID
-} /* wincrypt.h:639:11 */
+} /* wincrypt.h:713:11 */
 
-type KEY_TYPE_SUBTYPE = _KEY_TYPE_SUBTYPE /* wincrypt.h:643:5 */
-type PKEY_TYPE_SUBTYPE = uintptr          /* wincrypt.h:643:22 */
+type KEY_TYPE_SUBTYPE = _KEY_TYPE_SUBTYPE /* wincrypt.h:717:5 */
+type PKEY_TYPE_SUBTYPE = uintptr          /* wincrypt.h:717:22 */
 
 type _CERT_FORTEZZA_DATA_PROP = struct {
 	FSerialNumber [8]uint8
 	FCertIndex    int32
 	FCertLabel    [36]uint8
-} /* wincrypt.h:645:11 */
+} /* wincrypt.h:719:11 */
 
-type CERT_FORTEZZA_DATA_PROP = _CERT_FORTEZZA_DATA_PROP /* wincrypt.h:649:5 */
+type CERT_FORTEZZA_DATA_PROP = _CERT_FORTEZZA_DATA_PROP /* wincrypt.h:723:5 */
 
 type _CRYPT_RC4_KEY_STATE = struct {
 	FKey  [16]uint8
 	FSBox [256]uint8
 	Fi    uint8
 	Fj    uint8
-} /* wincrypt.h:651:11 */
+} /* wincrypt.h:726:11 */
 
-type CRYPT_RC4_KEY_STATE = _CRYPT_RC4_KEY_STATE /* wincrypt.h:656:5 */
-type PCRYPT_RC4_KEY_STATE = uintptr             /* wincrypt.h:656:25 */
+type CRYPT_RC4_KEY_STATE = _CRYPT_RC4_KEY_STATE /* wincrypt.h:731:5 */
+type PCRYPT_RC4_KEY_STATE = uintptr             /* wincrypt.h:731:25 */
 
 type _CRYPT_DES_KEY_STATE = struct {
 	FKey      [8]uint8
 	FIV       [8]uint8
 	FFeedback [8]uint8
-} /* wincrypt.h:658:11 */
+} /* wincrypt.h:733:11 */
 
-type CRYPT_DES_KEY_STATE = _CRYPT_DES_KEY_STATE /* wincrypt.h:662:5 */
-type PCRYPT_DES_KEY_STATE = uintptr             /* wincrypt.h:662:25 */
+type CRYPT_DES_KEY_STATE = _CRYPT_DES_KEY_STATE /* wincrypt.h:737:5 */
+type PCRYPT_DES_KEY_STATE = uintptr             /* wincrypt.h:737:25 */
 
 type _CRYPT_3DES_KEY_STATE = struct {
 	FKey      [24]uint8
 	FIV       [8]uint8
 	FFeedback [8]uint8
-} /* wincrypt.h:664:11 */
+} /* wincrypt.h:739:11 */
 
-type CRYPT_3DES_KEY_STATE = _CRYPT_3DES_KEY_STATE /* wincrypt.h:668:5 */
-type PCRYPT_3DES_KEY_STATE = uintptr              /* wincrypt.h:668:26 */
+type CRYPT_3DES_KEY_STATE = _CRYPT_3DES_KEY_STATE /* wincrypt.h:743:5 */
+type PCRYPT_3DES_KEY_STATE = uintptr              /* wincrypt.h:743:26 */
 
 type _CRYPTOAPI_BLOB = struct {
-	FcbData DWORD
-	_       [4]byte
-	FpbData uintptr
-} /* wincrypt.h:693:11 */
-
-type CRYPT_INTEGER_BLOB = _CRYPTOAPI_BLOB  /* wincrypt.h:696:5 */
-type PCRYPT_INTEGER_BLOB = uintptr         /* wincrypt.h:696:24 */
-type CRYPT_UINT_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:696:45 */
-type PCRYPT_UINT_BLOB = uintptr            /* wincrypt.h:696:61 */
-type CRYPT_OBJID_BLOB = _CRYPTOAPI_BLOB    /* wincrypt.h:696:79 */
-type PCRYPT_OBJID_BLOB = uintptr           /* wincrypt.h:696:96 */
-type CERT_NAME_BLOB = _CRYPTOAPI_BLOB      /* wincrypt.h:696:115 */
-type PCERT_NAME_BLOB = uintptr             /* wincrypt.h:696:130 */
-type CERT_RDN_VALUE_BLOB = _CRYPTOAPI_BLOB /* wincrypt.h:696:147 */
-type PCERT_RDN_VALUE_BLOB = uintptr        /* wincrypt.h:696:167 */
-type CERT_BLOB = _CRYPTOAPI_BLOB           /* wincrypt.h:696:189 */
-type PCERT_BLOB = uintptr                  /* wincrypt.h:696:199 */
-type CRL_BLOB = _CRYPTOAPI_BLOB            /* wincrypt.h:696:211 */
-type PCRL_BLOB = uintptr                   /* wincrypt.h:696:220 */
-type DATA_BLOB = _CRYPTOAPI_BLOB           /* wincrypt.h:696:231 */
-type PDATA_BLOB = uintptr                  /* wincrypt.h:696:241 */
-type CRYPT_DATA_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:696:253 */
-type PCRYPT_DATA_BLOB = uintptr            /* wincrypt.h:696:269 */
-type CRYPT_HASH_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:696:287 */
-type PCRYPT_HASH_BLOB = uintptr            /* wincrypt.h:696:303 */
-type CRYPT_DIGEST_BLOB = _CRYPTOAPI_BLOB   /* wincrypt.h:696:321 */
-type PCRYPT_DIGEST_BLOB = uintptr          /* wincrypt.h:696:339 */
-type CRYPT_DER_BLOB = _CRYPTOAPI_BLOB      /* wincrypt.h:696:359 */
-type PCRYPT_DER_BLOB = uintptr             /* wincrypt.h:696:374 */
-type CRYPT_ATTR_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:696:391 */
-type PCRYPT_ATTR_BLOB = uintptr            /* wincrypt.h:696:407 */
+	FcbData      DWORD
+	F__ccgo_pad1 [4]byte
+	FpbData      uintptr
+} /* wincrypt.h:769:11 */
+
+type CRYPT_INTEGER_BLOB = _CRYPTOAPI_BLOB  /* wincrypt.h:772:5 */
+type PCRYPT_INTEGER_BLOB = uintptr         /* wincrypt.h:772:24 */
+type CRYPT_UINT_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:772:45 */
+type PCRYPT_UINT_BLOB = uintptr            /* wincrypt.h:772:61 */
+type CRYPT_OBJID_BLOB = _CRYPTOAPI_BLOB    /* wincrypt.h:772:79 */
+type PCRYPT_OBJID_BLOB = uintptr           /* wincrypt.h:772:96 */
+type CERT_NAME_BLOB = _CRYPTOAPI_BLOB      /* wincrypt.h:772:115 */
+type PCERT_NAME_BLOB = uintptr             /* wincrypt.h:772:130 */
+type CERT_RDN_VALUE_BLOB = _CRYPTOAPI_BLOB /* wincrypt.h:772:147 */
+type PCERT_RDN_VALUE_BLOB = uintptr        /* wincrypt.h:772:167 */
+type CERT_BLOB = _CRYPTOAPI_BLOB           /* wincrypt.h:772:189 */
+type PCERT_BLOB = uintptr                  /* wincrypt.h:772:199 */
+type CRL_BLOB = _CRYPTOAPI_BLOB            /* wincrypt.h:772:211 */
+type PCRL_BLOB = uintptr                   /* wincrypt.h:772:220 */
+type DATA_BLOB = _CRYPTOAPI_BLOB           /* wincrypt.h:772:231 */
+type PDATA_BLOB = uintptr                  /* wincrypt.h:772:241 */
+type CRYPT_DATA_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:772:253 */
+type PCRYPT_DATA_BLOB = uintptr            /* wincrypt.h:772:269 */
+type CRYPT_HASH_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:772:287 */
+type PCRYPT_HASH_BLOB = uintptr            /* wincrypt.h:772:303 */
+type CRYPT_DIGEST_BLOB = _CRYPTOAPI_BLOB   /* wincrypt.h:772:321 */
+type PCRYPT_DIGEST_BLOB = uintptr          /* wincrypt.h:772:339 */
+type CRYPT_DER_BLOB = _CRYPTOAPI_BLOB      /* wincrypt.h:772:359 */
+type PCRYPT_DER_BLOB = uintptr             /* wincrypt.h:772:374 */
+type CRYPT_ATTR_BLOB = _CRYPTOAPI_BLOB     /* wincrypt.h:772:391 */
+type PCRYPT_ATTR_BLOB = uintptr            /* wincrypt.h:772:407 */
 type _CMS_DH_KEY_INFO = struct {
 	FdwVersion          DWORD
 	FAlgid              ALG_ID
 	FpszContentEncObjId LPSTR
 	FPubInfo            CRYPT_DATA_BLOB
 	FpReserved          uintptr
-} /* wincrypt.h:708:11 */
+} /* wincrypt.h:786:11 */
 
-type CMS_DH_KEY_INFO = _CMS_DH_KEY_INFO /* wincrypt.h:714:5 */
-type PCMS_DH_KEY_INFO = uintptr         /* wincrypt.h:714:21 */
+type CMS_DH_KEY_INFO = _CMS_DH_KEY_INFO /* wincrypt.h:792:5 */
+type PCMS_DH_KEY_INFO = uintptr         /* wincrypt.h:792:21 */
 
-type HCRYPTPROV_OR_NCRYPT_KEY_HANDLE = ULONG_PTR /* wincrypt.h:763:21 */
-type HCRYPTPROV_LEGACY = ULONG_PTR               /* wincrypt.h:764:21 */
+type HCRYPTPROV_OR_NCRYPT_KEY_HANDLE = ULONG_PTR /* wincrypt.h:843:21 */
+type HCRYPTPROV_LEGACY = ULONG_PTR               /* wincrypt.h:844:21 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -46522,17 +47027,17 @@ type BCRYPT_KEY_LENGTHS_STRUCT = __BCRYPT_KEY_LENGTHS_STRUCT /* bcrypt.h:146:5 *
 type BCRYPT_AUTH_TAG_LENGTHS_STRUCT = BCRYPT_KEY_LENGTHS_STRUCT /* bcrypt.h:148:37 */
 
 type _BCRYPT_OID = struct {
-	FcbOID ULONG
-	_      [4]byte
-	FpbOID PUCHAR
+	FcbOID       ULONG
+	F__ccgo_pad1 [4]byte
+	FpbOID       PUCHAR
 } /* bcrypt.h:150:11 */
 
 type BCRYPT_OID = _BCRYPT_OID /* bcrypt.h:153:5 */
 
 type _BCRYPT_OID_LIST = struct {
-	FdwOIDCount ULONG
-	_           [4]byte
-	FpOIDs      uintptr
+	FdwOIDCount  ULONG
+	F__ccgo_pad1 [4]byte
+	FpOIDs       uintptr
 } /* bcrypt.h:155:11 */
 
 type BCRYPT_OID_LIST = _BCRYPT_OID_LIST /* bcrypt.h:158:5 */
@@ -46542,18 +47047,18 @@ type _BCRYPT_PKCS1_PADDING_INFO = struct{ FpszAlgId LPCWSTR } /* bcrypt.h:160:11
 type BCRYPT_PKCS1_PADDING_INFO = _BCRYPT_PKCS1_PADDING_INFO /* bcrypt.h:162:5 */
 
 type _BCRYPT_PSS_PADDING_INFO = struct {
-	FpszAlgId LPCWSTR
-	FcbSalt   ULONG
-	_         [4]byte
+	FpszAlgId    LPCWSTR
+	FcbSalt      ULONG
+	F__ccgo_pad1 [4]byte
 } /* bcrypt.h:164:11 */
 
 type BCRYPT_PSS_PADDING_INFO = _BCRYPT_PSS_PADDING_INFO /* bcrypt.h:167:5 */
 
 type _BCRYPT_OAEP_PADDING_INFO = struct {
-	FpszAlgId LPCWSTR
-	FpbLabel  PUCHAR
-	FcbLabel  ULONG
-	_         [4]byte
+	FpszAlgId    LPCWSTR
+	FpbLabel     PUCHAR
+	FcbLabel     ULONG
+	F__ccgo_pad1 [4]byte
 } /* bcrypt.h:169:11 */
 
 type BCRYPT_OAEP_PADDING_INFO = _BCRYPT_OAEP_PADDING_INFO /* bcrypt.h:173:5 */
@@ -46563,19 +47068,19 @@ type _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO = struct {
 	FdwInfoVersion ULONG
 	FpbNonce       PUCHAR
 	FcbNonce       ULONG
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpbAuthData    PUCHAR
 	FcbAuthData    ULONG
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FpbTag         PUCHAR
 	FcbTag         ULONG
-	_              [4]byte
+	F__ccgo_pad3   [4]byte
 	FpbMacContext  PUCHAR
 	FcbMacContext  ULONG
 	FcbAAD         ULONG
 	FcbData        ULONGLONG
 	FdwFlags       ULONG
-	_              [4]byte
+	F__ccgo_pad4   [4]byte
 } /* bcrypt.h:175:11 */
 
 type BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO = _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO /* bcrypt.h:189:5 */
@@ -46728,7 +47233,7 @@ type _CRYPT_INTERFACE_REG = struct {
 	FdwInterface    ULONG
 	FdwFlags        ULONG
 	FcFunctions     ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FrgpszFunctions uintptr
 } /* bcrypt.h:478:11 */
 
@@ -46738,7 +47243,7 @@ type PCRYPT_INTERFACE_REG = uintptr             /* bcrypt.h:483:25 */
 type _CRYPT_IMAGE_REG = struct {
 	FpszImage      PWSTR
 	FcInterfaces   ULONG
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FrgpInterfaces uintptr
 } /* bcrypt.h:485:11 */
 
@@ -46747,7 +47252,7 @@ type PCRYPT_IMAGE_REG = uintptr         /* bcrypt.h:489:21 */
 
 type _CRYPT_PROVIDER_REG = struct {
 	FcAliases     ULONG
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FrgpszAliases uintptr
 	FpUM          PCRYPT_IMAGE_REG
 	FpKM          PCRYPT_IMAGE_REG
@@ -46758,7 +47263,7 @@ type PCRYPT_PROVIDER_REG = uintptr            /* bcrypt.h:496:24 */
 
 type _CRYPT_PROVIDERS = struct {
 	FcProviders     ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FrgpszProviders uintptr
 } /* bcrypt.h:498:11 */
 
@@ -46783,7 +47288,7 @@ type PCRYPT_CONTEXT_FUNCTION_CONFIG = uintptr                       /* bcrypt.h:
 
 type _CRYPT_CONTEXTS = struct {
 	FcContexts     ULONG
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FrgpszContexts uintptr
 } /* bcrypt.h:513:11 */
 
@@ -46792,7 +47297,7 @@ type PCRYPT_CONTEXTS = uintptr        /* bcrypt.h:516:20 */
 
 type _CRYPT_CONTEXT_FUNCTIONS = struct {
 	FcFunctions     ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FrgpszFunctions uintptr
 } /* bcrypt.h:518:11 */
 
@@ -46801,7 +47306,7 @@ type PCRYPT_CONTEXT_FUNCTIONS = uintptr                 /* bcrypt.h:521:29 */
 
 type _CRYPT_CONTEXT_FUNCTION_PROVIDERS = struct {
 	FcProviders     ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FrgpszProviders uintptr
 } /* bcrypt.h:523:11 */
 
@@ -46811,7 +47316,7 @@ type PCRYPT_CONTEXT_FUNCTION_PROVIDERS = uintptr                          /* bcr
 type _CRYPT_PROPERTY_REF = struct {
 	FpszProperty PWSTR
 	FcbValue     ULONG
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpbValue     PUCHAR
 } /* bcrypt.h:528:11 */
 
@@ -46819,9 +47324,9 @@ type CRYPT_PROPERTY_REF = _CRYPT_PROPERTY_REF /* bcrypt.h:532:5 */
 type PCRYPT_PROPERTY_REF = uintptr            /* bcrypt.h:532:24 */
 
 type _CRYPT_IMAGE_REF = struct {
-	FpszImage PWSTR
-	FdwFlags  ULONG
-	_         [4]byte
+	FpszImage    PWSTR
+	FdwFlags     ULONG
+	F__ccgo_pad1 [4]byte
 } /* bcrypt.h:534:11 */
 
 type CRYPT_IMAGE_REF = _CRYPT_IMAGE_REF /* bcrypt.h:537:5 */
@@ -46829,11 +47334,11 @@ type PCRYPT_IMAGE_REF = uintptr         /* bcrypt.h:537:21 */
 
 type _CRYPT_PROVIDER_REF = struct {
 	FdwInterface   ULONG
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpszFunction   PWSTR
 	FpszProvider   PWSTR
 	FcProperties   ULONG
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FrgpProperties uintptr
 	FpUM           PCRYPT_IMAGE_REF
 	FpKM           PCRYPT_IMAGE_REF
@@ -46844,7 +47349,7 @@ type PCRYPT_PROVIDER_REF = uintptr            /* bcrypt.h:547:24 */
 
 type _CRYPT_PROVIDER_REFS = struct {
 	FcProviders   ULONG
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FrgpProviders uintptr
 } /* bcrypt.h:549:11 */
 
@@ -46872,10 +47377,10 @@ type PFN_NCRYPT_ALLOC = uintptr /* ncrypt.h:138:18 */
 type PFN_NCRYPT_FREE = uintptr  /* ncrypt.h:139:16 */
 
 type NCRYPT_ALLOC_PARA1 = struct {
-	FcbSize   DWORD
-	_         [4]byte
-	FpfnAlloc PFN_NCRYPT_ALLOC
-	FpfnFree  PFN_NCRYPT_FREE
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FpfnAlloc    PFN_NCRYPT_ALLOC
+	FpfnFree     PFN_NCRYPT_FREE
 } /* ncrypt.h:141:11 */
 
 type NCRYPT_ALLOC_PARA = NCRYPT_ALLOC_PARA1 /* ncrypt.h:145:5 */
@@ -46896,7 +47401,7 @@ type _NCryptAlgorithmName = struct {
 	FdwClass         DWORD
 	FdwAlgOperations DWORD
 	FdwFlags         DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 } /* ncrypt.h:202:11 */
 
 type NCryptAlgorithmName = _NCryptAlgorithmName /* ncrypt.h:207:5 */
@@ -46938,157 +47443,157 @@ type NCRYPT_SUPPORTED_LENGTHS = __NCRYPT_SUPPORTED_LENGTHS /* ncrypt.h:348:5 */
 
 type _CRYPT_BIT_BLOB = struct {
 	FcbData      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpbData      uintptr
 	FcUnusedBits DWORD
-	_            [4]byte
-} /* wincrypt.h:771:11 */
+	F__ccgo_pad2 [4]byte
+} /* wincrypt.h:851:11 */
 
-type CRYPT_BIT_BLOB = _CRYPT_BIT_BLOB /* wincrypt.h:775:5 */
-type PCRYPT_BIT_BLOB = uintptr        /* wincrypt.h:775:20 */
+type CRYPT_BIT_BLOB = _CRYPT_BIT_BLOB /* wincrypt.h:855:5 */
+type PCRYPT_BIT_BLOB = uintptr        /* wincrypt.h:855:20 */
 
 type _CRYPT_ALGORITHM_IDENTIFIER = struct {
 	FpszObjId   LPSTR
 	FParameters CRYPT_OBJID_BLOB
-} /* wincrypt.h:777:11 */
+} /* wincrypt.h:857:11 */
 
-type CRYPT_ALGORITHM_IDENTIFIER = _CRYPT_ALGORITHM_IDENTIFIER /* wincrypt.h:780:5 */
-type PCRYPT_ALGORITHM_IDENTIFIER = uintptr                    /* wincrypt.h:780:32 */
+type CRYPT_ALGORITHM_IDENTIFIER = _CRYPT_ALGORITHM_IDENTIFIER /* wincrypt.h:860:5 */
+type PCRYPT_ALGORITHM_IDENTIFIER = uintptr                    /* wincrypt.h:860:32 */
 
 type _CRYPT_OBJID_TABLE = struct {
-	FdwAlgId  DWORD
-	_         [4]byte
-	FpszObjId LPCSTR
-} /* wincrypt.h:957:11 */
+	FdwAlgId     DWORD
+	F__ccgo_pad1 [4]byte
+	FpszObjId    LPCSTR
+} /* wincrypt.h:1086:11 */
 
-type CRYPT_OBJID_TABLE = _CRYPT_OBJID_TABLE /* wincrypt.h:960:5 */
-type PCRYPT_OBJID_TABLE = uintptr           /* wincrypt.h:960:23 */
+type CRYPT_OBJID_TABLE = _CRYPT_OBJID_TABLE /* wincrypt.h:1089:5 */
+type PCRYPT_OBJID_TABLE = uintptr           /* wincrypt.h:1089:23 */
 
 type _CRYPT_HASH_INFO = struct {
 	FHashAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FHash          CRYPT_HASH_BLOB
-} /* wincrypt.h:962:11 */
+} /* wincrypt.h:1091:11 */
 
-type CRYPT_HASH_INFO = _CRYPT_HASH_INFO /* wincrypt.h:965:5 */
-type PCRYPT_HASH_INFO = uintptr         /* wincrypt.h:965:21 */
+type CRYPT_HASH_INFO = _CRYPT_HASH_INFO /* wincrypt.h:1094:5 */
+type PCRYPT_HASH_INFO = uintptr         /* wincrypt.h:1094:21 */
 
 type _CERT_EXTENSION = struct {
-	FpszObjId  LPSTR
-	FfCritical WINBOOL
-	_          [4]byte
-	FValue     CRYPT_OBJID_BLOB
-} /* wincrypt.h:969:11 */
+	FpszObjId    LPSTR
+	FfCritical   WINBOOL
+	F__ccgo_pad1 [4]byte
+	FValue       CRYPT_OBJID_BLOB
+} /* wincrypt.h:1098:11 */
 
-type CERT_EXTENSION = _CERT_EXTENSION /* wincrypt.h:973:5 */
-type PCERT_EXTENSION = uintptr        /* wincrypt.h:973:20 */
+type CERT_EXTENSION = _CERT_EXTENSION /* wincrypt.h:1102:5 */
+type PCERT_EXTENSION = uintptr        /* wincrypt.h:1102:20 */
 
-type PCCERT_EXTENSION = uintptr /* wincrypt.h:975:32 */
+type PCCERT_EXTENSION = uintptr /* wincrypt.h:1104:32 */
 
 type _CRYPT_ATTRIBUTE_TYPE_VALUE = struct {
 	FpszObjId LPSTR
 	FValue    CRYPT_OBJID_BLOB
-} /* wincrypt.h:978:11 */
+} /* wincrypt.h:1107:11 */
 
-type CRYPT_ATTRIBUTE_TYPE_VALUE = _CRYPT_ATTRIBUTE_TYPE_VALUE /* wincrypt.h:981:5 */
-type PCRYPT_ATTRIBUTE_TYPE_VALUE = uintptr                    /* wincrypt.h:981:32 */
+type CRYPT_ATTRIBUTE_TYPE_VALUE = _CRYPT_ATTRIBUTE_TYPE_VALUE /* wincrypt.h:1110:5 */
+type PCRYPT_ATTRIBUTE_TYPE_VALUE = uintptr                    /* wincrypt.h:1110:32 */
 
 type _CRYPT_ATTRIBUTE = struct {
-	FpszObjId LPSTR
-	FcValue   DWORD
-	_         [4]byte
-	FrgValue  PCRYPT_ATTR_BLOB
-} /* wincrypt.h:983:11 */
+	FpszObjId    LPSTR
+	FcValue      DWORD
+	F__ccgo_pad1 [4]byte
+	FrgValue     PCRYPT_ATTR_BLOB
+} /* wincrypt.h:1112:11 */
 
-type CRYPT_ATTRIBUTE = _CRYPT_ATTRIBUTE /* wincrypt.h:987:5 */
-type PCRYPT_ATTRIBUTE = uintptr         /* wincrypt.h:987:21 */
+type CRYPT_ATTRIBUTE = _CRYPT_ATTRIBUTE /* wincrypt.h:1116:5 */
+type PCRYPT_ATTRIBUTE = uintptr         /* wincrypt.h:1116:21 */
 
 type _CRYPT_ATTRIBUTES = struct {
-	FcAttr  DWORD
-	_       [4]byte
-	FrgAttr PCRYPT_ATTRIBUTE
-} /* wincrypt.h:989:11 */
+	FcAttr       DWORD
+	F__ccgo_pad1 [4]byte
+	FrgAttr      PCRYPT_ATTRIBUTE
+} /* wincrypt.h:1118:11 */
 
-type CRYPT_ATTRIBUTES = _CRYPT_ATTRIBUTES /* wincrypt.h:992:5 */
-type PCRYPT_ATTRIBUTES = uintptr          /* wincrypt.h:992:22 */
+type CRYPT_ATTRIBUTES = _CRYPT_ATTRIBUTES /* wincrypt.h:1121:5 */
+type PCRYPT_ATTRIBUTES = uintptr          /* wincrypt.h:1121:22 */
 
 type _CERT_RDN_ATTR = struct {
 	FpszObjId    LPSTR
 	FdwValueType DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FValue       CERT_RDN_VALUE_BLOB
-} /* wincrypt.h:994:11 */
+} /* wincrypt.h:1123:11 */
 
-type CERT_RDN_ATTR = _CERT_RDN_ATTR /* wincrypt.h:998:5 */
-type PCERT_RDN_ATTR = uintptr       /* wincrypt.h:998:19 */
+type CERT_RDN_ATTR = _CERT_RDN_ATTR /* wincrypt.h:1127:5 */
+type PCERT_RDN_ATTR = uintptr       /* wincrypt.h:1127:19 */
 
 type _CERT_RDN = struct {
-	FcRDNAttr  DWORD
-	_          [4]byte
-	FrgRDNAttr PCERT_RDN_ATTR
-} /* wincrypt.h:1088:11 */
+	FcRDNAttr    DWORD
+	F__ccgo_pad1 [4]byte
+	FrgRDNAttr   PCERT_RDN_ATTR
+} /* wincrypt.h:1217:11 */
 
-type CERT_RDN = _CERT_RDN /* wincrypt.h:1091:5 */
-type PCERT_RDN = uintptr  /* wincrypt.h:1091:14 */
+type CERT_RDN = _CERT_RDN /* wincrypt.h:1220:5 */
+type PCERT_RDN = uintptr  /* wincrypt.h:1220:14 */
 
 type _CERT_NAME_INFO = struct {
-	FcRDN  DWORD
-	_      [4]byte
-	FrgRDN PCERT_RDN
-} /* wincrypt.h:1093:11 */
+	FcRDN        DWORD
+	F__ccgo_pad1 [4]byte
+	FrgRDN       PCERT_RDN
+} /* wincrypt.h:1222:11 */
 
-type CERT_NAME_INFO = _CERT_NAME_INFO /* wincrypt.h:1096:5 */
-type PCERT_NAME_INFO = uintptr        /* wincrypt.h:1096:20 */
+type CERT_NAME_INFO = _CERT_NAME_INFO /* wincrypt.h:1225:5 */
+type PCERT_NAME_INFO = uintptr        /* wincrypt.h:1225:20 */
 
 type _CERT_NAME_VALUE = struct {
 	FdwValueType DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FValue       CERT_RDN_VALUE_BLOB
-} /* wincrypt.h:1098:11 */
+} /* wincrypt.h:1227:11 */
 
-type CERT_NAME_VALUE = _CERT_NAME_VALUE /* wincrypt.h:1101:5 */
-type PCERT_NAME_VALUE = uintptr         /* wincrypt.h:1101:21 */
+type CERT_NAME_VALUE = _CERT_NAME_VALUE /* wincrypt.h:1230:5 */
+type PCERT_NAME_VALUE = uintptr         /* wincrypt.h:1230:21 */
 
 type _CERT_PUBLIC_KEY_INFO = struct {
 	FAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FPublicKey CRYPT_BIT_BLOB
-} /* wincrypt.h:1104:11 */
+} /* wincrypt.h:1233:11 */
 
-type CERT_PUBLIC_KEY_INFO = _CERT_PUBLIC_KEY_INFO /* wincrypt.h:1107:5 */
-type PCERT_PUBLIC_KEY_INFO = uintptr              /* wincrypt.h:1107:26 */
+type CERT_PUBLIC_KEY_INFO = _CERT_PUBLIC_KEY_INFO /* wincrypt.h:1236:5 */
+type PCERT_PUBLIC_KEY_INFO = uintptr              /* wincrypt.h:1236:26 */
 
 type _CRYPT_ECC_PRIVATE_KEY_INFO = struct {
-	FdwVersion  DWORD
-	_           [4]byte
-	FPrivateKey CRYPT_DER_BLOB
-	FszCurveOid LPSTR
-	FPublicKey  CRYPT_BIT_BLOB
-} /* wincrypt.h:1115:11 */
+	FdwVersion   DWORD
+	F__ccgo_pad1 [4]byte
+	FPrivateKey  CRYPT_DER_BLOB
+	FszCurveOid  LPSTR
+	FPublicKey   CRYPT_BIT_BLOB
+} /* wincrypt.h:1244:11 */
 
-type CRYPT_ECC_PRIVATE_KEY_INFO = _CRYPT_ECC_PRIVATE_KEY_INFO /* wincrypt.h:1120:5 */
-type PCRYPT_ECC_PRIVATE_KEY_INFO = uintptr                    /* wincrypt.h:1120:32 */
+type CRYPT_ECC_PRIVATE_KEY_INFO = _CRYPT_ECC_PRIVATE_KEY_INFO /* wincrypt.h:1249:5 */
+type PCRYPT_ECC_PRIVATE_KEY_INFO = uintptr                    /* wincrypt.h:1249:32 */
 
 type _CRYPT_PRIVATE_KEY_INFO = struct {
 	FVersion     DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FAlgorithm   CRYPT_ALGORITHM_IDENTIFIER
 	FPrivateKey  CRYPT_DER_BLOB
 	FpAttributes PCRYPT_ATTRIBUTES
-} /* wincrypt.h:1124:11 */
+} /* wincrypt.h:1253:11 */
 
-type CRYPT_PRIVATE_KEY_INFO = _CRYPT_PRIVATE_KEY_INFO /* wincrypt.h:1129:5 */
-type PCRYPT_PRIVATE_KEY_INFO = uintptr                /* wincrypt.h:1129:28 */
+type CRYPT_PRIVATE_KEY_INFO = _CRYPT_PRIVATE_KEY_INFO /* wincrypt.h:1258:5 */
+type PCRYPT_PRIVATE_KEY_INFO = uintptr                /* wincrypt.h:1258:28 */
 
 type _CRYPT_ENCRYPTED_PRIVATE_KEY_INFO = struct {
 	FEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedPrivateKey CRYPT_DATA_BLOB
-} /* wincrypt.h:1131:11 */
+} /* wincrypt.h:1260:11 */
 
-type CRYPT_ENCRYPTED_PRIVATE_KEY_INFO = _CRYPT_ENCRYPTED_PRIVATE_KEY_INFO /* wincrypt.h:1134:5 */
-type PCRYPT_ENCRYPTED_PRIVATE_KEY_INFO = uintptr                          /* wincrypt.h:1134:38 */
+type CRYPT_ENCRYPTED_PRIVATE_KEY_INFO = _CRYPT_ENCRYPTED_PRIVATE_KEY_INFO /* wincrypt.h:1263:5 */
+type PCRYPT_ENCRYPTED_PRIVATE_KEY_INFO = uintptr                          /* wincrypt.h:1263:38 */
 
-type PCRYPT_DECRYPT_PRIVATE_KEY_FUNC = uintptr /* wincrypt.h:1136:19 */
-type PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC = uintptr /* wincrypt.h:1137:19 */
-type PCRYPT_RESOLVE_HCRYPTPROV_FUNC = uintptr  /* wincrypt.h:1138:19 */
+type PCRYPT_DECRYPT_PRIVATE_KEY_FUNC = uintptr /* wincrypt.h:1265:19 */
+type PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC = uintptr /* wincrypt.h:1266:19 */
+type PCRYPT_RESOLVE_HCRYPTPROV_FUNC = uintptr  /* wincrypt.h:1267:19 */
 
 type _CRYPT_PKCS8_IMPORT_PARAMS = struct {
 	FPrivateKey             CRYPT_DIGEST_BLOB
@@ -47096,28 +47601,28 @@ type _CRYPT_PKCS8_IMPORT_PARAMS = struct {
 	FpVoidResolveFunc       LPVOID
 	FpDecryptPrivateKeyFunc PCRYPT_DECRYPT_PRIVATE_KEY_FUNC
 	FpVoidDecryptFunc       LPVOID
-} /* wincrypt.h:1140:11 */
+} /* wincrypt.h:1269:11 */
 
-type CRYPT_PKCS8_IMPORT_PARAMS = _CRYPT_PKCS8_IMPORT_PARAMS         /* wincrypt.h:1146:5 */
-type PCRYPT_PKCS8_IMPORT_PARAMS = uintptr                           /* wincrypt.h:1146:31 */
-type CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = _CRYPT_PKCS8_IMPORT_PARAMS /* wincrypt.h:1146:60 */
-type PCRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = uintptr                   /* wincrypt.h:1146:94 */
+type CRYPT_PKCS8_IMPORT_PARAMS = _CRYPT_PKCS8_IMPORT_PARAMS         /* wincrypt.h:1275:5 */
+type PCRYPT_PKCS8_IMPORT_PARAMS = uintptr                           /* wincrypt.h:1275:31 */
+type CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = _CRYPT_PKCS8_IMPORT_PARAMS /* wincrypt.h:1275:60 */
+type PCRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = uintptr                   /* wincrypt.h:1275:94 */
 
 type _CRYPT_PKCS8_EXPORT_PARAMS = struct {
 	FhCryptProv             HCRYPTPROV
 	FdwKeySpec              DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FpszPrivateKeyObjId     LPSTR
 	FpEncryptPrivateKeyFunc PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC
 	FpVoidEncryptFunc       LPVOID
-} /* wincrypt.h:1148:11 */
+} /* wincrypt.h:1277:11 */
 
-type CRYPT_PKCS8_EXPORT_PARAMS = _CRYPT_PKCS8_EXPORT_PARAMS /* wincrypt.h:1154:5 */
-type PCRYPT_PKCS8_EXPORT_PARAMS = uintptr                   /* wincrypt.h:1154:31 */
+type CRYPT_PKCS8_EXPORT_PARAMS = _CRYPT_PKCS8_EXPORT_PARAMS /* wincrypt.h:1283:5 */
+type PCRYPT_PKCS8_EXPORT_PARAMS = uintptr                   /* wincrypt.h:1283:31 */
 
 type _CERT_INFO = struct {
 	FdwVersion            DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FSerialNumber         CRYPT_INTEGER_BLOB
 	FSignatureAlgorithm   CRYPT_ALGORITHM_IDENTIFIER
 	FIssuer               CERT_NAME_BLOB
@@ -47128,119 +47633,119 @@ type _CERT_INFO = struct {
 	FIssuerUniqueId       CRYPT_BIT_BLOB
 	FSubjectUniqueId      CRYPT_BIT_BLOB
 	FcExtension           DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FrgExtension          PCERT_EXTENSION
-} /* wincrypt.h:1158:11 */
+} /* wincrypt.h:1287:11 */
 
-type CERT_INFO = _CERT_INFO /* wincrypt.h:1171:5 */
-type PCERT_INFO = uintptr   /* wincrypt.h:1171:15 */
+type CERT_INFO = _CERT_INFO /* wincrypt.h:1300:5 */
+type PCERT_INFO = uintptr   /* wincrypt.h:1300:15 */
 
 type _CRL_ENTRY = struct {
 	FSerialNumber   CRYPT_INTEGER_BLOB
 	FRevocationDate FILETIME
 	FcExtension     DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FrgExtension    PCERT_EXTENSION
-} /* wincrypt.h:1190:11 */
+} /* wincrypt.h:1319:11 */
 
-type CRL_ENTRY = _CRL_ENTRY /* wincrypt.h:1195:5 */
-type PCRL_ENTRY = uintptr   /* wincrypt.h:1195:15 */
+type CRL_ENTRY = _CRL_ENTRY /* wincrypt.h:1324:5 */
+type PCRL_ENTRY = uintptr   /* wincrypt.h:1324:15 */
 
 type _CRL_INFO = struct {
 	FdwVersion          DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FSignatureAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FIssuer             CERT_NAME_BLOB
 	FThisUpdate         FILETIME
 	FNextUpdate         FILETIME
 	FcCRLEntry          DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FrgCRLEntry         PCRL_ENTRY
 	FcExtension         DWORD
-	_                   [4]byte
+	F__ccgo_pad3        [4]byte
 	FrgExtension        PCERT_EXTENSION
-} /* wincrypt.h:1197:11 */
+} /* wincrypt.h:1326:11 */
 
-type CRL_INFO = _CRL_INFO /* wincrypt.h:1207:5 */
-type PCRL_INFO = uintptr  /* wincrypt.h:1207:14 */
+type CRL_INFO = _CRL_INFO /* wincrypt.h:1336:5 */
+type PCRL_INFO = uintptr  /* wincrypt.h:1336:14 */
 
 type _CERT_OR_CRL_BLOB = struct {
 	FdwChoice  DWORD
 	FcbEncoded DWORD
 	FpbEncoded uintptr
-} /* wincrypt.h:1215:11 */
+} /* wincrypt.h:1344:11 */
 
-type CERT_OR_CRL_BLOB = _CERT_OR_CRL_BLOB /* wincrypt.h:1219:5 */
-type PCERT_OR_CRL_BLOB = uintptr          /* wincrypt.h:1219:22 */
+type CERT_OR_CRL_BLOB = _CERT_OR_CRL_BLOB /* wincrypt.h:1348:5 */
+type PCERT_OR_CRL_BLOB = uintptr          /* wincrypt.h:1348:22 */
 
 type _CERT_OR_CRL_BUNDLE = struct {
-	FcItem  DWORD
-	_       [4]byte
-	FrgItem PCERT_OR_CRL_BLOB
-} /* wincrypt.h:1221:11 */
+	FcItem       DWORD
+	F__ccgo_pad1 [4]byte
+	FrgItem      PCERT_OR_CRL_BLOB
+} /* wincrypt.h:1350:11 */
 
-type CERT_OR_CRL_BUNDLE = _CERT_OR_CRL_BUNDLE /* wincrypt.h:1224:5 */
-type PCERT_OR_CRL_BUNDLE = uintptr            /* wincrypt.h:1224:24 */
+type CERT_OR_CRL_BUNDLE = _CERT_OR_CRL_BUNDLE /* wincrypt.h:1353:5 */
+type PCERT_OR_CRL_BUNDLE = uintptr            /* wincrypt.h:1353:24 */
 
 type _CERT_REQUEST_INFO = struct {
 	FdwVersion            DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FSubject              CERT_NAME_BLOB
 	FSubjectPublicKeyInfo CERT_PUBLIC_KEY_INFO
 	FcAttribute           DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FrgAttribute          PCRYPT_ATTRIBUTE
-} /* wincrypt.h:1226:11 */
+} /* wincrypt.h:1355:11 */
 
-type CERT_REQUEST_INFO = _CERT_REQUEST_INFO /* wincrypt.h:1232:5 */
-type PCERT_REQUEST_INFO = uintptr           /* wincrypt.h:1232:23 */
+type CERT_REQUEST_INFO = _CERT_REQUEST_INFO /* wincrypt.h:1361:5 */
+type PCERT_REQUEST_INFO = uintptr           /* wincrypt.h:1361:23 */
 
 type _CERT_KEYGEN_REQUEST_INFO = struct {
 	FdwVersion            DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FSubjectPublicKeyInfo CERT_PUBLIC_KEY_INFO
 	FpwszChallengeString  LPWSTR
-} /* wincrypt.h:1236:11 */
+} /* wincrypt.h:1365:11 */
 
-type CERT_KEYGEN_REQUEST_INFO = _CERT_KEYGEN_REQUEST_INFO /* wincrypt.h:1240:5 */
-type PCERT_KEYGEN_REQUEST_INFO = uintptr                  /* wincrypt.h:1240:30 */
+type CERT_KEYGEN_REQUEST_INFO = _CERT_KEYGEN_REQUEST_INFO /* wincrypt.h:1369:5 */
+type PCERT_KEYGEN_REQUEST_INFO = uintptr                  /* wincrypt.h:1369:30 */
 
 type _CERT_SIGNED_CONTENT_INFO = struct {
 	FToBeSigned         CRYPT_DER_BLOB
 	FSignatureAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FSignature          CRYPT_BIT_BLOB
-} /* wincrypt.h:1244:11 */
+} /* wincrypt.h:1373:11 */
 
-type CERT_SIGNED_CONTENT_INFO = _CERT_SIGNED_CONTENT_INFO /* wincrypt.h:1248:5 */
-type PCERT_SIGNED_CONTENT_INFO = uintptr                  /* wincrypt.h:1248:30 */
+type CERT_SIGNED_CONTENT_INFO = _CERT_SIGNED_CONTENT_INFO /* wincrypt.h:1377:5 */
+type PCERT_SIGNED_CONTENT_INFO = uintptr                  /* wincrypt.h:1377:30 */
 
 type _CTL_USAGE = struct {
 	FcUsageIdentifier     DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FrgpszUsageIdentifier uintptr
-} /* wincrypt.h:1250:11 */
+} /* wincrypt.h:1379:11 */
 
-type CTL_USAGE = _CTL_USAGE         /* wincrypt.h:1253:5 */
-type PCTL_USAGE = uintptr           /* wincrypt.h:1253:15 */
-type CERT_ENHKEY_USAGE = _CTL_USAGE /* wincrypt.h:1253:27 */
-type PCERT_ENHKEY_USAGE = uintptr   /* wincrypt.h:1253:45 */
+type CTL_USAGE = _CTL_USAGE         /* wincrypt.h:1382:5 */
+type PCTL_USAGE = uintptr           /* wincrypt.h:1382:15 */
+type CERT_ENHKEY_USAGE = _CTL_USAGE /* wincrypt.h:1382:27 */
+type PCERT_ENHKEY_USAGE = uintptr   /* wincrypt.h:1382:45 */
 
-type PCCTL_USAGE = uintptr         /* wincrypt.h:1255:27 */
-type PCCERT_ENHKEY_USAGE = uintptr /* wincrypt.h:1256:35 */
+type PCCTL_USAGE = uintptr         /* wincrypt.h:1384:27 */
+type PCCERT_ENHKEY_USAGE = uintptr /* wincrypt.h:1385:35 */
 
 type _CTL_ENTRY = struct {
 	FSubjectIdentifier CRYPT_DATA_BLOB
 	FcAttribute        DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FrgAttribute       PCRYPT_ATTRIBUTE
-} /* wincrypt.h:1258:11 */
+} /* wincrypt.h:1387:11 */
 
-type CTL_ENTRY = _CTL_ENTRY /* wincrypt.h:1262:5 */
-type PCTL_ENTRY = uintptr   /* wincrypt.h:1262:15 */
+type CTL_ENTRY = _CTL_ENTRY /* wincrypt.h:1391:5 */
+type PCTL_ENTRY = uintptr   /* wincrypt.h:1391:15 */
 
 type _CTL_INFO = struct {
 	FdwVersion        DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FSubjectUsage     CTL_USAGE
 	FListIdentifier   CRYPT_DATA_BLOB
 	FSequenceNumber   CRYPT_INTEGER_BLOB
@@ -47248,371 +47753,371 @@ type _CTL_INFO = struct {
 	FNextUpdate       FILETIME
 	FSubjectAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FcCTLEntry        DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FrgCTLEntry       PCTL_ENTRY
 	FcExtension       DWORD
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FrgExtension      PCERT_EXTENSION
-} /* wincrypt.h:1264:11 */
+} /* wincrypt.h:1393:11 */
 
-type CTL_INFO = _CTL_INFO /* wincrypt.h:1276:5 */
-type PCTL_INFO = uintptr  /* wincrypt.h:1276:14 */
+type CTL_INFO = _CTL_INFO /* wincrypt.h:1405:5 */
+type PCTL_INFO = uintptr  /* wincrypt.h:1405:14 */
 
 type _CRYPT_TIME_STAMP_REQUEST_INFO = struct {
 	FpszTimeStampAlgorithm LPSTR
 	FpszContentType        LPSTR
 	FContent               CRYPT_OBJID_BLOB
 	FcAttribute            DWORD
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FrgAttribute           PCRYPT_ATTRIBUTE
-} /* wincrypt.h:1280:11 */
+} /* wincrypt.h:1409:11 */
 
-type CRYPT_TIME_STAMP_REQUEST_INFO = _CRYPT_TIME_STAMP_REQUEST_INFO /* wincrypt.h:1286:5 */
-type PCRYPT_TIME_STAMP_REQUEST_INFO = uintptr                       /* wincrypt.h:1286:35 */
+type CRYPT_TIME_STAMP_REQUEST_INFO = _CRYPT_TIME_STAMP_REQUEST_INFO /* wincrypt.h:1415:5 */
+type PCRYPT_TIME_STAMP_REQUEST_INFO = uintptr                       /* wincrypt.h:1415:35 */
 
 type _CRYPT_ENROLLMENT_NAME_VALUE_PAIR = struct {
 	FpwszName  LPWSTR
 	FpwszValue LPWSTR
-} /* wincrypt.h:1288:11 */
+} /* wincrypt.h:1417:11 */
 
-type CRYPT_ENROLLMENT_NAME_VALUE_PAIR = _CRYPT_ENROLLMENT_NAME_VALUE_PAIR /* wincrypt.h:1291:5 */
-type PCRYPT_ENROLLMENT_NAME_VALUE_PAIR = uintptr                          /* wincrypt.h:1291:38 */
+type CRYPT_ENROLLMENT_NAME_VALUE_PAIR = _CRYPT_ENROLLMENT_NAME_VALUE_PAIR /* wincrypt.h:1420:5 */
+type PCRYPT_ENROLLMENT_NAME_VALUE_PAIR = uintptr                          /* wincrypt.h:1420:38 */
 
 type _CRYPT_CSP_PROVIDER = struct {
 	FdwKeySpec        DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FpwszProviderName LPWSTR
 	FSignature        CRYPT_BIT_BLOB
-} /* wincrypt.h:1293:11 */
+} /* wincrypt.h:1422:11 */
 
-type CRYPT_CSP_PROVIDER = _CRYPT_CSP_PROVIDER /* wincrypt.h:1297:5 */
-type PCRYPT_CSP_PROVIDER = uintptr            /* wincrypt.h:1297:24 */
+type CRYPT_CSP_PROVIDER = _CRYPT_CSP_PROVIDER /* wincrypt.h:1426:5 */
+type PCRYPT_CSP_PROVIDER = uintptr            /* wincrypt.h:1426:24 */
 
-type PFN_CRYPT_ALLOC = uintptr /* wincrypt.h:1327:18 */
-type PFN_CRYPT_FREE = uintptr  /* wincrypt.h:1328:16 */
+type PFN_CRYPT_ALLOC = uintptr /* wincrypt.h:1456:18 */
+type PFN_CRYPT_FREE = uintptr  /* wincrypt.h:1457:16 */
 
 type _CRYPT_ENCODE_PARA = struct {
-	FcbSize   DWORD
-	_         [4]byte
-	FpfnAlloc PFN_CRYPT_ALLOC
-	FpfnFree  PFN_CRYPT_FREE
-} /* wincrypt.h:1330:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FpfnAlloc    PFN_CRYPT_ALLOC
+	FpfnFree     PFN_CRYPT_FREE
+} /* wincrypt.h:1459:11 */
 
-type CRYPT_ENCODE_PARA = _CRYPT_ENCODE_PARA /* wincrypt.h:1334:5 */
-type PCRYPT_ENCODE_PARA = uintptr           /* wincrypt.h:1334:23 */
+type CRYPT_ENCODE_PARA = _CRYPT_ENCODE_PARA /* wincrypt.h:1463:5 */
+type PCRYPT_ENCODE_PARA = uintptr           /* wincrypt.h:1463:23 */
 
 type _CRYPT_DECODE_PARA = struct {
-	FcbSize   DWORD
-	_         [4]byte
-	FpfnAlloc PFN_CRYPT_ALLOC
-	FpfnFree  PFN_CRYPT_FREE
-} /* wincrypt.h:1350:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FpfnAlloc    PFN_CRYPT_ALLOC
+	FpfnFree     PFN_CRYPT_FREE
+} /* wincrypt.h:1479:11 */
 
-type CRYPT_DECODE_PARA = _CRYPT_DECODE_PARA /* wincrypt.h:1354:5 */
-type PCRYPT_DECODE_PARA = uintptr           /* wincrypt.h:1354:23 */
+type CRYPT_DECODE_PARA = _CRYPT_DECODE_PARA /* wincrypt.h:1483:5 */
+type PCRYPT_DECODE_PARA = uintptr           /* wincrypt.h:1483:23 */
 
 // szOID_KEY_USAGE is defined incorrectly in msdn as 2.5.29.4 --
 //    http://www.oid-info.com/get/2.5.29.15 RFC3280
 
 type _CERT_EXTENSIONS = struct {
 	FcExtension  DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FrgExtension PCERT_EXTENSION
-} /* wincrypt.h:1667:11 */
+} /* wincrypt.h:1876:11 */
 
 // szOID_KEY_USAGE is defined incorrectly in msdn as 2.5.29.4 --
 //    http://www.oid-info.com/get/2.5.29.15 RFC3280
 
-type CERT_EXTENSIONS = _CERT_EXTENSIONS /* wincrypt.h:1670:5 */
-type PCERT_EXTENSIONS = uintptr         /* wincrypt.h:1670:21 */
+type CERT_EXTENSIONS = _CERT_EXTENSIONS /* wincrypt.h:1879:5 */
+type PCERT_EXTENSIONS = uintptr         /* wincrypt.h:1879:21 */
 
 type _CERT_AUTHORITY_KEY_ID_INFO = struct {
 	FKeyId            CRYPT_DATA_BLOB
 	FCertIssuer       CERT_NAME_BLOB
 	FCertSerialNumber CRYPT_INTEGER_BLOB
-} /* wincrypt.h:1683:11 */
+} /* wincrypt.h:1892:11 */
 
-type CERT_AUTHORITY_KEY_ID_INFO = _CERT_AUTHORITY_KEY_ID_INFO /* wincrypt.h:1687:5 */
-type PCERT_AUTHORITY_KEY_ID_INFO = uintptr                    /* wincrypt.h:1687:32 */
+type CERT_AUTHORITY_KEY_ID_INFO = _CERT_AUTHORITY_KEY_ID_INFO /* wincrypt.h:1896:5 */
+type PCERT_AUTHORITY_KEY_ID_INFO = uintptr                    /* wincrypt.h:1896:32 */
 
 type _CERT_PRIVATE_KEY_VALIDITY = struct {
 	FNotBefore FILETIME
 	FNotAfter  FILETIME
-} /* wincrypt.h:1689:11 */
+} /* wincrypt.h:1898:11 */
 
-type CERT_PRIVATE_KEY_VALIDITY = _CERT_PRIVATE_KEY_VALIDITY /* wincrypt.h:1692:5 */
-type PCERT_PRIVATE_KEY_VALIDITY = uintptr                   /* wincrypt.h:1692:31 */
+type CERT_PRIVATE_KEY_VALIDITY = _CERT_PRIVATE_KEY_VALIDITY /* wincrypt.h:1901:5 */
+type PCERT_PRIVATE_KEY_VALIDITY = uintptr                   /* wincrypt.h:1901:31 */
 
 type _CERT_KEY_ATTRIBUTES_INFO = struct {
 	FKeyId                  CRYPT_DATA_BLOB
 	FIntendedKeyUsage       CRYPT_BIT_BLOB
 	FpPrivateKeyUsagePeriod PCERT_PRIVATE_KEY_VALIDITY
-} /* wincrypt.h:1694:11 */
+} /* wincrypt.h:1903:11 */
 
-type CERT_KEY_ATTRIBUTES_INFO = _CERT_KEY_ATTRIBUTES_INFO /* wincrypt.h:1698:5 */
-type PCERT_KEY_ATTRIBUTES_INFO = uintptr                  /* wincrypt.h:1698:30 */
+type CERT_KEY_ATTRIBUTES_INFO = _CERT_KEY_ATTRIBUTES_INFO /* wincrypt.h:1907:5 */
+type PCERT_KEY_ATTRIBUTES_INFO = uintptr                  /* wincrypt.h:1907:30 */
 
 type _CERT_POLICY_ID = struct {
 	FcCertPolicyElementId     DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FrgpszCertPolicyElementId uintptr
-} /* wincrypt.h:1711:11 */
+} /* wincrypt.h:1921:11 */
 
-type CERT_POLICY_ID = _CERT_POLICY_ID /* wincrypt.h:1714:5 */
-type PCERT_POLICY_ID = uintptr        /* wincrypt.h:1714:20 */
+type CERT_POLICY_ID = _CERT_POLICY_ID /* wincrypt.h:1924:5 */
+type PCERT_POLICY_ID = uintptr        /* wincrypt.h:1924:20 */
 
 type _CERT_KEY_USAGE_RESTRICTION_INFO = struct {
 	FcCertPolicyId      DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgCertPolicyId     PCERT_POLICY_ID
 	FRestrictedKeyUsage CRYPT_BIT_BLOB
-} /* wincrypt.h:1716:11 */
+} /* wincrypt.h:1926:11 */
 
-type CERT_KEY_USAGE_RESTRICTION_INFO = _CERT_KEY_USAGE_RESTRICTION_INFO /* wincrypt.h:1720:5 */
-type PCERT_KEY_USAGE_RESTRICTION_INFO = uintptr                         /* wincrypt.h:1720:37 */
+type CERT_KEY_USAGE_RESTRICTION_INFO = _CERT_KEY_USAGE_RESTRICTION_INFO /* wincrypt.h:1930:5 */
+type PCERT_KEY_USAGE_RESTRICTION_INFO = uintptr                         /* wincrypt.h:1930:37 */
 
 type _CERT_OTHER_NAME = struct {
 	FpszObjId LPSTR
 	FValue    CRYPT_OBJID_BLOB
-} /* wincrypt.h:1722:11 */
+} /* wincrypt.h:1932:11 */
 
-type CERT_OTHER_NAME = _CERT_OTHER_NAME /* wincrypt.h:1725:5 */
-type PCERT_OTHER_NAME = uintptr         /* wincrypt.h:1725:21 */
+type CERT_OTHER_NAME = _CERT_OTHER_NAME /* wincrypt.h:1935:5 */
+type PCERT_OTHER_NAME = uintptr         /* wincrypt.h:1935:21 */
 
 type _CERT_ALT_NAME_ENTRY = struct {
 	FdwAltNameChoice DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	F__8             struct {
-		FpOtherName PCERT_OTHER_NAME
-		_           [8]byte
+		FpOtherName  PCERT_OTHER_NAME
+		F__ccgo_pad1 [8]byte
 	}
-} /* wincrypt.h:1727:11 */
+} /* wincrypt.h:1937:11 */
 
-type CERT_ALT_NAME_ENTRY = _CERT_ALT_NAME_ENTRY /* wincrypt.h:1749:5 */
-type PCERT_ALT_NAME_ENTRY = uintptr             /* wincrypt.h:1749:25 */
+type CERT_ALT_NAME_ENTRY = _CERT_ALT_NAME_ENTRY /* wincrypt.h:1959:5 */
+type PCERT_ALT_NAME_ENTRY = uintptr             /* wincrypt.h:1959:25 */
 
 type _CERT_ALT_NAME_INFO = struct {
-	FcAltEntry  DWORD
-	_           [4]byte
-	FrgAltEntry PCERT_ALT_NAME_ENTRY
-} /* wincrypt.h:1761:11 */
+	FcAltEntry   DWORD
+	F__ccgo_pad1 [4]byte
+	FrgAltEntry  PCERT_ALT_NAME_ENTRY
+} /* wincrypt.h:1971:11 */
 
-type CERT_ALT_NAME_INFO = _CERT_ALT_NAME_INFO /* wincrypt.h:1764:5 */
-type PCERT_ALT_NAME_INFO = uintptr            /* wincrypt.h:1764:24 */
+type CERT_ALT_NAME_INFO = _CERT_ALT_NAME_INFO /* wincrypt.h:1974:5 */
+type PCERT_ALT_NAME_INFO = uintptr            /* wincrypt.h:1974:24 */
 
 type _CERT_BASIC_CONSTRAINTS_INFO = struct {
 	FSubjectType          CRYPT_BIT_BLOB
 	FfPathLenConstraint   WINBOOL
 	FdwPathLenConstraint  DWORD
 	FcSubtreesConstraint  DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FrgSubtreesConstraint uintptr
-} /* wincrypt.h:1773:11 */
+} /* wincrypt.h:1983:11 */
 
-type CERT_BASIC_CONSTRAINTS_INFO = _CERT_BASIC_CONSTRAINTS_INFO /* wincrypt.h:1779:5 */
-type PCERT_BASIC_CONSTRAINTS_INFO = uintptr                     /* wincrypt.h:1779:34 */
+type CERT_BASIC_CONSTRAINTS_INFO = _CERT_BASIC_CONSTRAINTS_INFO /* wincrypt.h:1989:5 */
+type PCERT_BASIC_CONSTRAINTS_INFO = uintptr                     /* wincrypt.h:1989:34 */
 
 type _CERT_BASIC_CONSTRAINTS2_INFO = struct {
 	FfCA                 WINBOOL
 	FfPathLenConstraint  WINBOOL
 	FdwPathLenConstraint DWORD
-} /* wincrypt.h:1784:11 */
+} /* wincrypt.h:1994:11 */
 
-type CERT_BASIC_CONSTRAINTS2_INFO = _CERT_BASIC_CONSTRAINTS2_INFO /* wincrypt.h:1788:5 */
-type PCERT_BASIC_CONSTRAINTS2_INFO = uintptr                      /* wincrypt.h:1788:34 */
+type CERT_BASIC_CONSTRAINTS2_INFO = _CERT_BASIC_CONSTRAINTS2_INFO /* wincrypt.h:1998:5 */
+type PCERT_BASIC_CONSTRAINTS2_INFO = uintptr                      /* wincrypt.h:1998:34 */
 
 type _CERT_POLICY_QUALIFIER_INFO = struct {
 	FpszPolicyQualifierId LPSTR
 	FQualifier            CRYPT_OBJID_BLOB
-} /* wincrypt.h:1790:11 */
+} /* wincrypt.h:2000:11 */
 
-type CERT_POLICY_QUALIFIER_INFO = _CERT_POLICY_QUALIFIER_INFO /* wincrypt.h:1793:5 */
-type PCERT_POLICY_QUALIFIER_INFO = uintptr                    /* wincrypt.h:1793:32 */
+type CERT_POLICY_QUALIFIER_INFO = _CERT_POLICY_QUALIFIER_INFO /* wincrypt.h:2003:5 */
+type PCERT_POLICY_QUALIFIER_INFO = uintptr                    /* wincrypt.h:2003:32 */
 
 type _CERT_POLICY_INFO = struct {
 	FpszPolicyIdentifier LPSTR
 	FcPolicyQualifier    DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FrgPolicyQualifier   uintptr
-} /* wincrypt.h:1795:11 */
+} /* wincrypt.h:2005:11 */
 
-type CERT_POLICY_INFO = _CERT_POLICY_INFO /* wincrypt.h:1799:5 */
-type PCERT_POLICY_INFO = uintptr          /* wincrypt.h:1799:22 */
+type CERT_POLICY_INFO = _CERT_POLICY_INFO /* wincrypt.h:2009:5 */
+type PCERT_POLICY_INFO = uintptr          /* wincrypt.h:2009:22 */
 
 type _CERT_POLICIES_INFO = struct {
 	FcPolicyInfo  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FrgPolicyInfo uintptr
-} /* wincrypt.h:1801:11 */
+} /* wincrypt.h:2011:11 */
 
-type CERT_POLICIES_INFO = _CERT_POLICIES_INFO /* wincrypt.h:1804:5 */
-type PCERT_POLICIES_INFO = uintptr            /* wincrypt.h:1804:24 */
+type CERT_POLICIES_INFO = _CERT_POLICIES_INFO /* wincrypt.h:2014:5 */
+type PCERT_POLICIES_INFO = uintptr            /* wincrypt.h:2014:24 */
 
 type _CERT_POLICY_QUALIFIER_NOTICE_REFERENCE = struct {
 	FpszOrganization LPSTR
 	FcNoticeNumbers  DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgNoticeNumbers uintptr
-} /* wincrypt.h:1806:11 */
+} /* wincrypt.h:2016:11 */
 
-type CERT_POLICY_QUALIFIER_NOTICE_REFERENCE = _CERT_POLICY_QUALIFIER_NOTICE_REFERENCE /* wincrypt.h:1810:5 */
-type PCERT_POLICY_QUALIFIER_NOTICE_REFERENCE = uintptr                                /* wincrypt.h:1810:44 */
+type CERT_POLICY_QUALIFIER_NOTICE_REFERENCE = _CERT_POLICY_QUALIFIER_NOTICE_REFERENCE /* wincrypt.h:2020:5 */
+type PCERT_POLICY_QUALIFIER_NOTICE_REFERENCE = uintptr                                /* wincrypt.h:2020:44 */
 
 type _CERT_POLICY_QUALIFIER_USER_NOTICE = struct {
 	FpNoticeReference uintptr
 	FpszDisplayText   LPWSTR
-} /* wincrypt.h:1812:11 */
+} /* wincrypt.h:2022:11 */
 
-type CERT_POLICY_QUALIFIER_USER_NOTICE = _CERT_POLICY_QUALIFIER_USER_NOTICE /* wincrypt.h:1815:5 */
-type PCERT_POLICY_QUALIFIER_USER_NOTICE = uintptr                           /* wincrypt.h:1815:39 */
+type CERT_POLICY_QUALIFIER_USER_NOTICE = _CERT_POLICY_QUALIFIER_USER_NOTICE /* wincrypt.h:2025:5 */
+type PCERT_POLICY_QUALIFIER_USER_NOTICE = uintptr                           /* wincrypt.h:2025:39 */
 
 type _CPS_URLS = struct {
 	FpszURL     LPWSTR
 	FpAlgorithm uintptr
 	FpDigest    uintptr
-} /* wincrypt.h:1817:11 */
+} /* wincrypt.h:2027:11 */
 
-type CPS_URLS = _CPS_URLS /* wincrypt.h:1821:5 */
-type PCPS_URLS = uintptr  /* wincrypt.h:1821:14 */
+type CPS_URLS = _CPS_URLS /* wincrypt.h:2031:5 */
+type PCPS_URLS = uintptr  /* wincrypt.h:2031:14 */
 
 type _CERT_POLICY95_QUALIFIER1 = struct {
 	FpszPracticesReference  LPWSTR
 	FpszNoticeIdentifier    LPSTR
 	FpszNSINoticeIdentifier LPSTR
 	FcCPSURLs               DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FrgCPSURLs              uintptr
-} /* wincrypt.h:1823:11 */
+} /* wincrypt.h:2033:11 */
 
-type CERT_POLICY95_QUALIFIER1 = _CERT_POLICY95_QUALIFIER1 /* wincrypt.h:1829:5 */
-type PCERT_POLICY95_QUALIFIER1 = uintptr                  /* wincrypt.h:1829:30 */
+type CERT_POLICY95_QUALIFIER1 = _CERT_POLICY95_QUALIFIER1 /* wincrypt.h:2039:5 */
+type PCERT_POLICY95_QUALIFIER1 = uintptr                  /* wincrypt.h:2039:30 */
 
 type _CERT_POLICY_MAPPING = struct {
 	FpszIssuerDomainPolicy  LPSTR
 	FpszSubjectDomainPolicy LPSTR
-} /* wincrypt.h:1831:11 */
+} /* wincrypt.h:2041:11 */
 
-type CERT_POLICY_MAPPING = _CERT_POLICY_MAPPING /* wincrypt.h:1834:5 */
-type PCERT_POLICY_MAPPING = uintptr             /* wincrypt.h:1834:25 */
+type CERT_POLICY_MAPPING = _CERT_POLICY_MAPPING /* wincrypt.h:2044:5 */
+type PCERT_POLICY_MAPPING = uintptr             /* wincrypt.h:2044:25 */
 
 type _CERT_POLICY_MAPPINGS_INFO = struct {
 	FcPolicyMapping  DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgPolicyMapping PCERT_POLICY_MAPPING
-} /* wincrypt.h:1836:11 */
+} /* wincrypt.h:2046:11 */
 
-type CERT_POLICY_MAPPINGS_INFO = _CERT_POLICY_MAPPINGS_INFO /* wincrypt.h:1839:5 */
-type PCERT_POLICY_MAPPINGS_INFO = uintptr                   /* wincrypt.h:1839:31 */
+type CERT_POLICY_MAPPINGS_INFO = _CERT_POLICY_MAPPINGS_INFO /* wincrypt.h:2049:5 */
+type PCERT_POLICY_MAPPINGS_INFO = uintptr                   /* wincrypt.h:2049:31 */
 
 type _CERT_POLICY_CONSTRAINTS_INFO = struct {
 	FfRequireExplicitPolicy           WINBOOL
 	FdwRequireExplicitPolicySkipCerts DWORD
 	FfInhibitPolicyMapping            WINBOOL
 	FdwInhibitPolicyMappingSkipCerts  DWORD
-} /* wincrypt.h:1841:11 */
+} /* wincrypt.h:2051:11 */
 
-type CERT_POLICY_CONSTRAINTS_INFO = _CERT_POLICY_CONSTRAINTS_INFO /* wincrypt.h:1846:5 */
-type PCERT_POLICY_CONSTRAINTS_INFO = uintptr                      /* wincrypt.h:1846:34 */
+type CERT_POLICY_CONSTRAINTS_INFO = _CERT_POLICY_CONSTRAINTS_INFO /* wincrypt.h:2056:5 */
+type PCERT_POLICY_CONSTRAINTS_INFO = uintptr                      /* wincrypt.h:2056:34 */
 
 type _CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY = struct {
-	FpszObjId LPSTR
-	FcValue   DWORD
-	_         [4]byte
-	FrgValue  PCRYPT_DER_BLOB
-} /* wincrypt.h:1848:11 */
+	FpszObjId    LPSTR
+	FcValue      DWORD
+	F__ccgo_pad1 [4]byte
+	FrgValue     PCRYPT_DER_BLOB
+} /* wincrypt.h:2058:11 */
 
-type CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY = _CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY /* wincrypt.h:1852:5 */
-type PCRYPT_CONTENT_INFO_SEQUENCE_OF_ANY = uintptr                            /* wincrypt.h:1852:40 */
+type CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY = _CRYPT_CONTENT_INFO_SEQUENCE_OF_ANY /* wincrypt.h:2062:5 */
+type PCRYPT_CONTENT_INFO_SEQUENCE_OF_ANY = uintptr                            /* wincrypt.h:2062:40 */
 
 type _CRYPT_CONTENT_INFO = struct {
 	FpszObjId LPSTR
 	FContent  CRYPT_DER_BLOB
-} /* wincrypt.h:1854:11 */
+} /* wincrypt.h:2064:11 */
 
-type CRYPT_CONTENT_INFO = _CRYPT_CONTENT_INFO /* wincrypt.h:1857:5 */
-type PCRYPT_CONTENT_INFO = uintptr            /* wincrypt.h:1857:24 */
+type CRYPT_CONTENT_INFO = _CRYPT_CONTENT_INFO /* wincrypt.h:2067:5 */
+type PCRYPT_CONTENT_INFO = uintptr            /* wincrypt.h:2067:24 */
 
 type _CRYPT_SEQUENCE_OF_ANY = struct {
-	FcValue  DWORD
-	_        [4]byte
-	FrgValue PCRYPT_DER_BLOB
-} /* wincrypt.h:1859:11 */
+	FcValue      DWORD
+	F__ccgo_pad1 [4]byte
+	FrgValue     PCRYPT_DER_BLOB
+} /* wincrypt.h:2069:11 */
 
-type CRYPT_SEQUENCE_OF_ANY = _CRYPT_SEQUENCE_OF_ANY /* wincrypt.h:1862:5 */
-type PCRYPT_SEQUENCE_OF_ANY = uintptr               /* wincrypt.h:1862:27 */
+type CRYPT_SEQUENCE_OF_ANY = _CRYPT_SEQUENCE_OF_ANY /* wincrypt.h:2072:5 */
+type PCRYPT_SEQUENCE_OF_ANY = uintptr               /* wincrypt.h:2072:27 */
 
 type _CERT_AUTHORITY_KEY_ID2_INFO = struct {
 	FKeyId                     CRYPT_DATA_BLOB
 	FAuthorityCertIssuer       CERT_ALT_NAME_INFO
 	FAuthorityCertSerialNumber CRYPT_INTEGER_BLOB
-} /* wincrypt.h:1864:11 */
+} /* wincrypt.h:2074:11 */
 
-type CERT_AUTHORITY_KEY_ID2_INFO = _CERT_AUTHORITY_KEY_ID2_INFO /* wincrypt.h:1868:5 */
-type PCERT_AUTHORITY_KEY_ID2_INFO = uintptr                     /* wincrypt.h:1868:33 */
+type CERT_AUTHORITY_KEY_ID2_INFO = _CERT_AUTHORITY_KEY_ID2_INFO /* wincrypt.h:2078:5 */
+type PCERT_AUTHORITY_KEY_ID2_INFO = uintptr                     /* wincrypt.h:2078:33 */
 
 type _CERT_ACCESS_DESCRIPTION = struct {
 	FpszAccessMethod LPSTR
 	FAccessLocation  CERT_ALT_NAME_ENTRY
-} /* wincrypt.h:1870:11 */
+} /* wincrypt.h:2080:11 */
 
-type CERT_ACCESS_DESCRIPTION = _CERT_ACCESS_DESCRIPTION /* wincrypt.h:1873:5 */
-type PCERT_ACCESS_DESCRIPTION = uintptr                 /* wincrypt.h:1873:29 */
+type CERT_ACCESS_DESCRIPTION = _CERT_ACCESS_DESCRIPTION /* wincrypt.h:2083:5 */
+type PCERT_ACCESS_DESCRIPTION = uintptr                 /* wincrypt.h:2083:29 */
 
 type _CERT_AUTHORITY_INFO_ACCESS = struct {
-	FcAccDescr  DWORD
-	_           [4]byte
-	FrgAccDescr PCERT_ACCESS_DESCRIPTION
-} /* wincrypt.h:1875:11 */
+	FcAccDescr   DWORD
+	F__ccgo_pad1 [4]byte
+	FrgAccDescr  PCERT_ACCESS_DESCRIPTION
+} /* wincrypt.h:2085:11 */
 
-type CERT_AUTHORITY_INFO_ACCESS = _CERT_AUTHORITY_INFO_ACCESS /* wincrypt.h:1878:5 */
-type PCERT_AUTHORITY_INFO_ACCESS = uintptr                    /* wincrypt.h:1878:32 */
+type CERT_AUTHORITY_INFO_ACCESS = _CERT_AUTHORITY_INFO_ACCESS /* wincrypt.h:2088:5 */
+type PCERT_AUTHORITY_INFO_ACCESS = uintptr                    /* wincrypt.h:2088:32 */
 
-type CERT_SUBJECT_INFO_ACCESS = CERT_AUTHORITY_INFO_ACCESS /* wincrypt.h:1880:38 */
-type PCERT_SUBJECT_INFO_ACCESS = uintptr                   /* wincrypt.h:1880:63 */
+type CERT_SUBJECT_INFO_ACCESS = CERT_AUTHORITY_INFO_ACCESS /* wincrypt.h:2090:38 */
+type PCERT_SUBJECT_INFO_ACCESS = uintptr                   /* wincrypt.h:2090:63 */
 
 type _CRL_DIST_POINT_NAME = struct {
 	FdwDistPointNameChoice DWORD
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	F__8                   struct{ FFullName CERT_ALT_NAME_INFO }
-} /* wincrypt.h:1897:11 */
+} /* wincrypt.h:2109:11 */
 
-type CRL_DIST_POINT_NAME = _CRL_DIST_POINT_NAME /* wincrypt.h:1902:5 */
-type PCRL_DIST_POINT_NAME = uintptr             /* wincrypt.h:1902:25 */
+type CRL_DIST_POINT_NAME = _CRL_DIST_POINT_NAME /* wincrypt.h:2114:5 */
+type PCRL_DIST_POINT_NAME = uintptr             /* wincrypt.h:2114:25 */
 
 type _CRL_DIST_POINT = struct {
 	FDistPointName CRL_DIST_POINT_NAME
 	FReasonFlags   CRYPT_BIT_BLOB
 	FCRLIssuer     CERT_ALT_NAME_INFO
-} /* wincrypt.h:1908:11 */
+} /* wincrypt.h:2120:11 */
 
-type CRL_DIST_POINT = _CRL_DIST_POINT /* wincrypt.h:1912:5 */
-type PCRL_DIST_POINT = uintptr        /* wincrypt.h:1912:20 */
+type CRL_DIST_POINT = _CRL_DIST_POINT /* wincrypt.h:2124:5 */
+type PCRL_DIST_POINT = uintptr        /* wincrypt.h:2124:20 */
 
 type _CRL_DIST_POINTS_INFO = struct {
 	FcDistPoint  DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FrgDistPoint PCRL_DIST_POINT
-} /* wincrypt.h:1922:11 */
+} /* wincrypt.h:2136:11 */
 
-type CRL_DIST_POINTS_INFO = _CRL_DIST_POINTS_INFO /* wincrypt.h:1925:5 */
-type PCRL_DIST_POINTS_INFO = uintptr              /* wincrypt.h:1925:26 */
+type CRL_DIST_POINTS_INFO = _CRL_DIST_POINTS_INFO /* wincrypt.h:2139:5 */
+type PCRL_DIST_POINTS_INFO = uintptr              /* wincrypt.h:2139:26 */
 
 type _CROSS_CERT_DIST_POINTS_INFO = struct {
 	FdwSyncDeltaTime DWORD
 	FcDistPoint      DWORD
 	FrgDistPoint     PCERT_ALT_NAME_INFO
-} /* wincrypt.h:1934:11 */
+} /* wincrypt.h:2148:11 */
 
-type CROSS_CERT_DIST_POINTS_INFO = _CROSS_CERT_DIST_POINTS_INFO /* wincrypt.h:1938:5 */
-type PCROSS_CERT_DIST_POINTS_INFO = uintptr                     /* wincrypt.h:1938:33 */
+type CROSS_CERT_DIST_POINTS_INFO = _CROSS_CERT_DIST_POINTS_INFO /* wincrypt.h:2152:5 */
+type PCROSS_CERT_DIST_POINTS_INFO = uintptr                     /* wincrypt.h:2152:33 */
 
 type _CERT_PAIR = struct {
 	FForward CERT_BLOB
 	FReverse CERT_BLOB
-} /* wincrypt.h:1944:11 */
+} /* wincrypt.h:2158:11 */
 
-type CERT_PAIR = _CERT_PAIR /* wincrypt.h:1947:5 */
-type PCERT_PAIR = uintptr   /* wincrypt.h:1947:15 */
+type CERT_PAIR = _CERT_PAIR /* wincrypt.h:2161:5 */
+type PCERT_PAIR = uintptr   /* wincrypt.h:2161:15 */
 
 type _CRL_ISSUING_DIST_POINT = struct {
 	FDistPointName          CRL_DIST_POINT_NAME
@@ -47620,68 +48125,68 @@ type _CRL_ISSUING_DIST_POINT = struct {
 	FfOnlyContainsCACerts   WINBOOL
 	FOnlySomeReasonFlags    CRYPT_BIT_BLOB
 	FfIndirectCRL           WINBOOL
-	_                       [4]byte
-} /* wincrypt.h:1949:11 */
+	F__ccgo_pad1            [4]byte
+} /* wincrypt.h:2163:11 */
 
-type CRL_ISSUING_DIST_POINT = _CRL_ISSUING_DIST_POINT /* wincrypt.h:1955:5 */
-type PCRL_ISSUING_DIST_POINT = uintptr                /* wincrypt.h:1955:28 */
+type CRL_ISSUING_DIST_POINT = _CRL_ISSUING_DIST_POINT /* wincrypt.h:2169:5 */
+type PCRL_ISSUING_DIST_POINT = uintptr                /* wincrypt.h:2169:28 */
 
 type _CERT_GENERAL_SUBTREE = struct {
-	FBase      CERT_ALT_NAME_ENTRY
-	FdwMinimum DWORD
-	FfMaximum  WINBOOL
-	FdwMaximum DWORD
-	_          [4]byte
-} /* wincrypt.h:1957:11 */
+	FBase        CERT_ALT_NAME_ENTRY
+	FdwMinimum   DWORD
+	FfMaximum    WINBOOL
+	FdwMaximum   DWORD
+	F__ccgo_pad1 [4]byte
+} /* wincrypt.h:2171:11 */
 
-type CERT_GENERAL_SUBTREE = _CERT_GENERAL_SUBTREE /* wincrypt.h:1962:5 */
-type PCERT_GENERAL_SUBTREE = uintptr              /* wincrypt.h:1962:26 */
+type CERT_GENERAL_SUBTREE = _CERT_GENERAL_SUBTREE /* wincrypt.h:2176:5 */
+type PCERT_GENERAL_SUBTREE = uintptr              /* wincrypt.h:2176:26 */
 
 type _CERT_NAME_CONSTRAINTS_INFO = struct {
 	FcPermittedSubtree  DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgPermittedSubtree PCERT_GENERAL_SUBTREE
 	FcExcludedSubtree   DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FrgExcludedSubtree  PCERT_GENERAL_SUBTREE
-} /* wincrypt.h:1964:11 */
+} /* wincrypt.h:2178:11 */
 
-type CERT_NAME_CONSTRAINTS_INFO = _CERT_NAME_CONSTRAINTS_INFO /* wincrypt.h:1969:5 */
-type PCERT_NAME_CONSTRAINTS_INFO = uintptr                    /* wincrypt.h:1969:32 */
+type CERT_NAME_CONSTRAINTS_INFO = _CERT_NAME_CONSTRAINTS_INFO /* wincrypt.h:2183:5 */
+type PCERT_NAME_CONSTRAINTS_INFO = uintptr                    /* wincrypt.h:2183:32 */
 
 type _CERT_DSS_PARAMETERS = struct {
 	Fp CRYPT_UINT_BLOB
 	Fq CRYPT_UINT_BLOB
 	Fg CRYPT_UINT_BLOB
-} /* wincrypt.h:1981:11 */
+} /* wincrypt.h:2195:11 */
 
-type CERT_DSS_PARAMETERS = _CERT_DSS_PARAMETERS /* wincrypt.h:1985:5 */
-type PCERT_DSS_PARAMETERS = uintptr             /* wincrypt.h:1985:25 */
+type CERT_DSS_PARAMETERS = _CERT_DSS_PARAMETERS /* wincrypt.h:2199:5 */
+type PCERT_DSS_PARAMETERS = uintptr             /* wincrypt.h:2199:25 */
 
 type _CERT_DH_PARAMETERS = struct {
 	Fp CRYPT_UINT_BLOB
 	Fg CRYPT_UINT_BLOB
-} /* wincrypt.h:1993:11 */
+} /* wincrypt.h:2207:11 */
 
-type CERT_DH_PARAMETERS = _CERT_DH_PARAMETERS /* wincrypt.h:1996:5 */
-type PCERT_DH_PARAMETERS = uintptr            /* wincrypt.h:1996:24 */
+type CERT_DH_PARAMETERS = _CERT_DH_PARAMETERS /* wincrypt.h:2210:5 */
+type PCERT_DH_PARAMETERS = uintptr            /* wincrypt.h:2210:24 */
 
 type _CERT_ECC_SIGNATURE = struct {
 	Fr CRYPT_UINT_BLOB
 	Fs CRYPT_UINT_BLOB
-} /* wincrypt.h:1998:11 */
+} /* wincrypt.h:2212:11 */
 
-type CERT_ECC_SIGNATURE = _CERT_ECC_SIGNATURE /* wincrypt.h:2001:5 */
-type PCERT_ECC_SIGNATURE = uintptr            /* wincrypt.h:2001:24 */
+type CERT_ECC_SIGNATURE = _CERT_ECC_SIGNATURE /* wincrypt.h:2215:5 */
+type PCERT_ECC_SIGNATURE = uintptr            /* wincrypt.h:2215:24 */
 
 type _CERT_X942_DH_VALIDATION_PARAMS = struct {
 	Fseed        CRYPT_BIT_BLOB
 	FpgenCounter DWORD
-	_            [4]byte
-} /* wincrypt.h:2003:11 */
+	F__ccgo_pad1 [4]byte
+} /* wincrypt.h:2217:11 */
 
-type CERT_X942_DH_VALIDATION_PARAMS = _CERT_X942_DH_VALIDATION_PARAMS /* wincrypt.h:2006:5 */
-type PCERT_X942_DH_VALIDATION_PARAMS = uintptr                        /* wincrypt.h:2006:36 */
+type CERT_X942_DH_VALIDATION_PARAMS = _CERT_X942_DH_VALIDATION_PARAMS /* wincrypt.h:2220:5 */
+type PCERT_X942_DH_VALIDATION_PARAMS = uintptr                        /* wincrypt.h:2220:36 */
 
 type _CERT_X942_DH_PARAMETERS = struct {
 	Fp                 CRYPT_UINT_BLOB
@@ -47689,195 +48194,195 @@ type _CERT_X942_DH_PARAMETERS = struct {
 	Fq                 CRYPT_UINT_BLOB
 	Fj                 CRYPT_UINT_BLOB
 	FpValidationParams PCERT_X942_DH_VALIDATION_PARAMS
-} /* wincrypt.h:2008:11 */
+} /* wincrypt.h:2222:11 */
 
-type CERT_X942_DH_PARAMETERS = _CERT_X942_DH_PARAMETERS /* wincrypt.h:2014:5 */
-type PCERT_X942_DH_PARAMETERS = uintptr                 /* wincrypt.h:2014:29 */
+type CERT_X942_DH_PARAMETERS = _CERT_X942_DH_PARAMETERS /* wincrypt.h:2228:5 */
+type PCERT_X942_DH_PARAMETERS = uintptr                 /* wincrypt.h:2228:29 */
 
 type _CRYPT_X942_OTHER_INFO = struct {
 	FpszContentEncryptionObjId LPSTR
 	FrgbCounter                [4]BYTE
 	FrgbKeyLength              [4]BYTE
 	FPubInfo                   CRYPT_DATA_BLOB
-} /* wincrypt.h:2020:11 */
+} /* wincrypt.h:2234:11 */
 
-type CRYPT_X942_OTHER_INFO = _CRYPT_X942_OTHER_INFO /* wincrypt.h:2025:5 */
-type PCRYPT_X942_OTHER_INFO = uintptr               /* wincrypt.h:2025:27 */
+type CRYPT_X942_OTHER_INFO = _CRYPT_X942_OTHER_INFO /* wincrypt.h:2239:5 */
+type PCRYPT_X942_OTHER_INFO = uintptr               /* wincrypt.h:2239:27 */
 
 type _CRYPT_ECC_CMS_SHARED_INFO = struct {
 	FAlgorithm      CRYPT_ALGORITHM_IDENTIFIER
 	FEntityUInfo    CRYPT_DATA_BLOB
 	FrgbSuppPubInfo [4]BYTE
-	_               [4]byte
-} /* wincrypt.h:2029:11 */
+	F__ccgo_pad1    [4]byte
+} /* wincrypt.h:2243:11 */
 
-type CRYPT_ECC_CMS_SHARED_INFO = _CRYPT_ECC_CMS_SHARED_INFO /* wincrypt.h:2033:5 */
-type PCRYPT_ECC_CMS_SHARED_INFO = uintptr                   /* wincrypt.h:2033:31 */
+type CRYPT_ECC_CMS_SHARED_INFO = _CRYPT_ECC_CMS_SHARED_INFO /* wincrypt.h:2247:5 */
+type PCRYPT_ECC_CMS_SHARED_INFO = uintptr                   /* wincrypt.h:2247:31 */
 
 type _CRYPT_RC2_CBC_PARAMETERS = struct {
 	FdwVersion DWORD
 	FfIV       WINBOOL
 	FrgbIV     [8]BYTE
-} /* wincrypt.h:2035:11 */
+} /* wincrypt.h:2249:11 */
 
-type CRYPT_RC2_CBC_PARAMETERS = _CRYPT_RC2_CBC_PARAMETERS /* wincrypt.h:2039:5 */
-type PCRYPT_RC2_CBC_PARAMETERS = uintptr                  /* wincrypt.h:2039:30 */
+type CRYPT_RC2_CBC_PARAMETERS = _CRYPT_RC2_CBC_PARAMETERS /* wincrypt.h:2253:5 */
+type PCRYPT_RC2_CBC_PARAMETERS = uintptr                  /* wincrypt.h:2253:30 */
 
 type _CRYPT_SMIME_CAPABILITY = struct {
 	FpszObjId   LPSTR
 	FParameters CRYPT_OBJID_BLOB
-} /* wincrypt.h:2046:11 */
+} /* wincrypt.h:2260:11 */
 
-type CRYPT_SMIME_CAPABILITY = _CRYPT_SMIME_CAPABILITY /* wincrypt.h:2049:5 */
-type PCRYPT_SMIME_CAPABILITY = uintptr                /* wincrypt.h:2049:28 */
+type CRYPT_SMIME_CAPABILITY = _CRYPT_SMIME_CAPABILITY /* wincrypt.h:2263:5 */
+type PCRYPT_SMIME_CAPABILITY = uintptr                /* wincrypt.h:2263:28 */
 
 type _CRYPT_SMIME_CAPABILITIES = struct {
 	FcCapability  DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FrgCapability PCRYPT_SMIME_CAPABILITY
-} /* wincrypt.h:2051:11 */
+} /* wincrypt.h:2265:11 */
 
-type CRYPT_SMIME_CAPABILITIES = _CRYPT_SMIME_CAPABILITIES /* wincrypt.h:2054:5 */
-type PCRYPT_SMIME_CAPABILITIES = uintptr                  /* wincrypt.h:2054:30 */
+type CRYPT_SMIME_CAPABILITIES = _CRYPT_SMIME_CAPABILITIES /* wincrypt.h:2268:5 */
+type PCRYPT_SMIME_CAPABILITIES = uintptr                  /* wincrypt.h:2268:30 */
 
 type _CERT_QC_STATEMENT = struct {
 	FpszStatementId LPSTR
 	FStatementInfo  CRYPT_OBJID_BLOB
-} /* wincrypt.h:2056:11 */
+} /* wincrypt.h:2270:11 */
 
-type CERT_QC_STATEMENT = _CERT_QC_STATEMENT /* wincrypt.h:2059:5 */
-type PCERT_QC_STATEMENT = uintptr           /* wincrypt.h:2059:23 */
+type CERT_QC_STATEMENT = _CERT_QC_STATEMENT /* wincrypt.h:2273:5 */
+type PCERT_QC_STATEMENT = uintptr           /* wincrypt.h:2273:23 */
 
 type _CERT_QC_STATEMENTS_EXT_INFO = struct {
 	FcStatement  DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FrgStatement PCERT_QC_STATEMENT
-} /* wincrypt.h:2061:11 */
+} /* wincrypt.h:2275:11 */
 
-type CERT_QC_STATEMENTS_EXT_INFO = _CERT_QC_STATEMENTS_EXT_INFO /* wincrypt.h:2064:5 */
-type PCERT_QC_STATEMENTS_EXT_INFO = uintptr                     /* wincrypt.h:2064:33 */
+type CERT_QC_STATEMENTS_EXT_INFO = _CERT_QC_STATEMENTS_EXT_INFO /* wincrypt.h:2278:5 */
+type PCERT_QC_STATEMENTS_EXT_INFO = uintptr                     /* wincrypt.h:2278:33 */
 
 type _CRYPT_MASK_GEN_ALGORITHM = struct {
 	FpszObjId      LPSTR
 	FHashAlgorithm CRYPT_ALGORITHM_IDENTIFIER
-} /* wincrypt.h:2069:11 */
+} /* wincrypt.h:2283:11 */
 
-type CRYPT_MASK_GEN_ALGORITHM = _CRYPT_MASK_GEN_ALGORITHM /* wincrypt.h:2072:5 */
-type PCRYPT_MASK_GEN_ALGORITHM = uintptr                  /* wincrypt.h:2072:30 */
+type CRYPT_MASK_GEN_ALGORITHM = _CRYPT_MASK_GEN_ALGORITHM /* wincrypt.h:2286:5 */
+type PCRYPT_MASK_GEN_ALGORITHM = uintptr                  /* wincrypt.h:2286:30 */
 
 type _CRYPT_RSA_SSA_PSS_PARAMETERS = struct {
 	FHashAlgorithm    CRYPT_ALGORITHM_IDENTIFIER
 	FMaskGenAlgorithm CRYPT_MASK_GEN_ALGORITHM
 	FdwSaltLength     DWORD
 	FdwTrailerField   DWORD
-} /* wincrypt.h:2074:11 */
+} /* wincrypt.h:2288:11 */
 
-type CRYPT_RSA_SSA_PSS_PARAMETERS = _CRYPT_RSA_SSA_PSS_PARAMETERS /* wincrypt.h:2079:5 */
-type PCRYPT_RSA_SSA_PSS_PARAMETERS = uintptr                      /* wincrypt.h:2079:34 */
+type CRYPT_RSA_SSA_PSS_PARAMETERS = _CRYPT_RSA_SSA_PSS_PARAMETERS /* wincrypt.h:2293:5 */
+type PCRYPT_RSA_SSA_PSS_PARAMETERS = uintptr                      /* wincrypt.h:2293:34 */
 
 type _CRYPT_PSOURCE_ALGORITHM = struct {
 	FpszObjId           LPSTR
 	FEncodingParameters CRYPT_DATA_BLOB
-} /* wincrypt.h:2083:11 */
+} /* wincrypt.h:2297:11 */
 
-type CRYPT_PSOURCE_ALGORITHM = _CRYPT_PSOURCE_ALGORITHM /* wincrypt.h:2086:5 */
-type PCRYPT_PSOURCE_ALGORITHM = uintptr                 /* wincrypt.h:2086:29 */
+type CRYPT_PSOURCE_ALGORITHM = _CRYPT_PSOURCE_ALGORITHM /* wincrypt.h:2300:5 */
+type PCRYPT_PSOURCE_ALGORITHM = uintptr                 /* wincrypt.h:2300:29 */
 
 type _CRYPT_RSAES_OAEP_PARAMETERS = struct {
 	FHashAlgorithm    CRYPT_ALGORITHM_IDENTIFIER
 	FMaskGenAlgorithm CRYPT_MASK_GEN_ALGORITHM
 	FPSourceAlgorithm CRYPT_PSOURCE_ALGORITHM
-} /* wincrypt.h:2088:11 */
+} /* wincrypt.h:2302:11 */
 
-type CRYPT_RSAES_OAEP_PARAMETERS = _CRYPT_RSAES_OAEP_PARAMETERS /* wincrypt.h:2092:5 */
-type PCRYPT_RSAES_OAEP_PARAMETERS = uintptr                     /* wincrypt.h:2092:33 */
+type CRYPT_RSAES_OAEP_PARAMETERS = _CRYPT_RSAES_OAEP_PARAMETERS /* wincrypt.h:2306:5 */
+type PCRYPT_RSAES_OAEP_PARAMETERS = uintptr                     /* wincrypt.h:2306:33 */
 
 type _CMC_TAGGED_ATTRIBUTE = struct {
 	FdwBodyPartID DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FAttribute    CRYPT_ATTRIBUTE
-} /* wincrypt.h:2151:11 */
+} /* wincrypt.h:2374:11 */
 
-type CMC_TAGGED_ATTRIBUTE = _CMC_TAGGED_ATTRIBUTE /* wincrypt.h:2154:5 */
-type PCMC_TAGGED_ATTRIBUTE = uintptr              /* wincrypt.h:2154:26 */
+type CMC_TAGGED_ATTRIBUTE = _CMC_TAGGED_ATTRIBUTE /* wincrypt.h:2377:5 */
+type PCMC_TAGGED_ATTRIBUTE = uintptr              /* wincrypt.h:2377:26 */
 
 type _CMC_TAGGED_CERT_REQUEST = struct {
 	FdwBodyPartID      DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FSignedCertRequest CRYPT_DER_BLOB
-} /* wincrypt.h:2156:11 */
+} /* wincrypt.h:2379:11 */
 
-type CMC_TAGGED_CERT_REQUEST = _CMC_TAGGED_CERT_REQUEST /* wincrypt.h:2159:5 */
-type PCMC_TAGGED_CERT_REQUEST = uintptr                 /* wincrypt.h:2159:29 */
+type CMC_TAGGED_CERT_REQUEST = _CMC_TAGGED_CERT_REQUEST /* wincrypt.h:2382:5 */
+type PCMC_TAGGED_CERT_REQUEST = uintptr                 /* wincrypt.h:2382:29 */
 
 type _CMC_TAGGED_REQUEST = struct {
 	FdwTaggedRequestChoice DWORD
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	F__8                   struct{ FpTaggedCertRequest PCMC_TAGGED_CERT_REQUEST }
-} /* wincrypt.h:2161:11 */
+} /* wincrypt.h:2384:11 */
 
-type CMC_TAGGED_REQUEST = _CMC_TAGGED_REQUEST /* wincrypt.h:2166:5 */
-type PCMC_TAGGED_REQUEST = uintptr            /* wincrypt.h:2166:24 */
+type CMC_TAGGED_REQUEST = _CMC_TAGGED_REQUEST /* wincrypt.h:2389:5 */
+type PCMC_TAGGED_REQUEST = uintptr            /* wincrypt.h:2389:24 */
 
 type _CMC_TAGGED_CONTENT_INFO = struct {
 	FdwBodyPartID       DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FEncodedContentInfo CRYPT_DER_BLOB
-} /* wincrypt.h:2170:11 */
+} /* wincrypt.h:2393:11 */
 
-type CMC_TAGGED_CONTENT_INFO = _CMC_TAGGED_CONTENT_INFO /* wincrypt.h:2173:5 */
-type PCMC_TAGGED_CONTENT_INFO = uintptr                 /* wincrypt.h:2173:29 */
+type CMC_TAGGED_CONTENT_INFO = _CMC_TAGGED_CONTENT_INFO /* wincrypt.h:2396:5 */
+type PCMC_TAGGED_CONTENT_INFO = uintptr                 /* wincrypt.h:2396:29 */
 
 type _CMC_TAGGED_OTHER_MSG = struct {
 	FdwBodyPartID DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpszObjId     LPSTR
 	FValue        CRYPT_OBJID_BLOB
-} /* wincrypt.h:2175:11 */
+} /* wincrypt.h:2398:11 */
 
-type CMC_TAGGED_OTHER_MSG = _CMC_TAGGED_OTHER_MSG /* wincrypt.h:2179:5 */
-type PCMC_TAGGED_OTHER_MSG = uintptr              /* wincrypt.h:2179:26 */
+type CMC_TAGGED_OTHER_MSG = _CMC_TAGGED_OTHER_MSG /* wincrypt.h:2402:5 */
+type PCMC_TAGGED_OTHER_MSG = uintptr              /* wincrypt.h:2402:26 */
 
 type _CMC_DATA_INFO = struct {
 	FcTaggedAttribute    DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FrgTaggedAttribute   PCMC_TAGGED_ATTRIBUTE
 	FcTaggedRequest      DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FrgTaggedRequest     PCMC_TAGGED_REQUEST
 	FcTaggedContentInfo  DWORD
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FrgTaggedContentInfo PCMC_TAGGED_CONTENT_INFO
 	FcTaggedOtherMsg     DWORD
-	_                    [4]byte
+	F__ccgo_pad4         [4]byte
 	FrgTaggedOtherMsg    PCMC_TAGGED_OTHER_MSG
-} /* wincrypt.h:2181:11 */
+} /* wincrypt.h:2404:11 */
 
-type CMC_DATA_INFO = _CMC_DATA_INFO /* wincrypt.h:2190:5 */
-type PCMC_DATA_INFO = uintptr       /* wincrypt.h:2190:19 */
+type CMC_DATA_INFO = _CMC_DATA_INFO /* wincrypt.h:2413:5 */
+type PCMC_DATA_INFO = uintptr       /* wincrypt.h:2413:19 */
 
 type _CMC_RESPONSE_INFO = struct {
 	FcTaggedAttribute    DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FrgTaggedAttribute   PCMC_TAGGED_ATTRIBUTE
 	FcTaggedContentInfo  DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FrgTaggedContentInfo PCMC_TAGGED_CONTENT_INFO
 	FcTaggedOtherMsg     DWORD
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FrgTaggedOtherMsg    PCMC_TAGGED_OTHER_MSG
-} /* wincrypt.h:2192:11 */
+} /* wincrypt.h:2415:11 */
 
-type CMC_RESPONSE_INFO = _CMC_RESPONSE_INFO /* wincrypt.h:2199:5 */
-type PCMC_RESPONSE_INFO = uintptr           /* wincrypt.h:2199:23 */
+type CMC_RESPONSE_INFO = _CMC_RESPONSE_INFO /* wincrypt.h:2422:5 */
+type PCMC_RESPONSE_INFO = uintptr           /* wincrypt.h:2422:23 */
 
 type _CMC_PEND_INFO = struct {
 	FPendToken CRYPT_DATA_BLOB
 	FPendTime  FILETIME
-} /* wincrypt.h:2201:11 */
+} /* wincrypt.h:2424:11 */
 
-type CMC_PEND_INFO = _CMC_PEND_INFO /* wincrypt.h:2204:5 */
-type PCMC_PEND_INFO = uintptr       /* wincrypt.h:2204:19 */
+type CMC_PEND_INFO = _CMC_PEND_INFO /* wincrypt.h:2427:5 */
+type PCMC_PEND_INFO = uintptr       /* wincrypt.h:2427:19 */
 
 type _CMC_STATUS_INFO = struct {
 	FdwStatus          DWORD
@@ -47885,79 +48390,79 @@ type _CMC_STATUS_INFO = struct {
 	FrgdwBodyList      uintptr
 	FpwszStatusString  LPWSTR
 	FdwOtherInfoChoice DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	F__32              struct {
-		_           [0]uint64
-		FdwFailInfo DWORD
-		_           [4]byte
+		F__ccgo_pad1 [0]uint64
+		FdwFailInfo  DWORD
+		F__ccgo_pad2 [4]byte
 	}
-} /* wincrypt.h:2206:11 */
+} /* wincrypt.h:2429:11 */
 
-type CMC_STATUS_INFO = _CMC_STATUS_INFO /* wincrypt.h:2216:5 */
-type PCMC_STATUS_INFO = uintptr         /* wincrypt.h:2216:21 */
+type CMC_STATUS_INFO = _CMC_STATUS_INFO /* wincrypt.h:2439:5 */
+type PCMC_STATUS_INFO = uintptr         /* wincrypt.h:2439:21 */
 
 type _CMC_ADD_EXTENSIONS_INFO = struct {
 	FdwCmcDataReference DWORD
 	FcCertReference     DWORD
 	FrgdwCertReference  uintptr
 	FcExtension         DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgExtension        PCERT_EXTENSION
-} /* wincrypt.h:2242:11 */
+} /* wincrypt.h:2465:11 */
 
-type CMC_ADD_EXTENSIONS_INFO = _CMC_ADD_EXTENSIONS_INFO /* wincrypt.h:2248:5 */
-type PCMC_ADD_EXTENSIONS_INFO = uintptr                 /* wincrypt.h:2248:29 */
+type CMC_ADD_EXTENSIONS_INFO = _CMC_ADD_EXTENSIONS_INFO /* wincrypt.h:2471:5 */
+type PCMC_ADD_EXTENSIONS_INFO = uintptr                 /* wincrypt.h:2471:29 */
 
 type _CMC_ADD_ATTRIBUTES_INFO = struct {
 	FdwCmcDataReference DWORD
 	FcCertReference     DWORD
 	FrgdwCertReference  uintptr
 	FcAttribute         DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgAttribute        PCRYPT_ATTRIBUTE
-} /* wincrypt.h:2250:11 */
+} /* wincrypt.h:2473:11 */
 
-type CMC_ADD_ATTRIBUTES_INFO = _CMC_ADD_ATTRIBUTES_INFO /* wincrypt.h:2256:5 */
-type PCMC_ADD_ATTRIBUTES_INFO = uintptr                 /* wincrypt.h:2256:29 */
+type CMC_ADD_ATTRIBUTES_INFO = _CMC_ADD_ATTRIBUTES_INFO /* wincrypt.h:2479:5 */
+type PCMC_ADD_ATTRIBUTES_INFO = uintptr                 /* wincrypt.h:2479:29 */
 
 type _CERT_TEMPLATE_EXT = struct {
 	FpszObjId       LPSTR
 	FdwMajorVersion DWORD
 	FfMinorVersion  WINBOOL
 	FdwMinorVersion DWORD
-	_               [4]byte
-} /* wincrypt.h:2258:11 */
+	F__ccgo_pad1    [4]byte
+} /* wincrypt.h:2481:11 */
 
-type CERT_TEMPLATE_EXT = _CERT_TEMPLATE_EXT /* wincrypt.h:2263:5 */
-type PCERT_TEMPLATE_EXT = uintptr           /* wincrypt.h:2263:23 */
+type CERT_TEMPLATE_EXT = _CERT_TEMPLATE_EXT /* wincrypt.h:2486:5 */
+type PCERT_TEMPLATE_EXT = uintptr           /* wincrypt.h:2486:23 */
 
 type _CERT_HASHED_URL = struct {
 	FHashAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FHash          CRYPT_HASH_BLOB
 	FpwszUrl       LPWSTR
-} /* wincrypt.h:2265:11 */
+} /* wincrypt.h:2488:11 */
 
-type CERT_HASHED_URL = _CERT_HASHED_URL /* wincrypt.h:2269:5 */
-type PCERT_HASHED_URL = uintptr         /* wincrypt.h:2269:21 */
+type CERT_HASHED_URL = _CERT_HASHED_URL /* wincrypt.h:2492:5 */
+type PCERT_HASHED_URL = uintptr         /* wincrypt.h:2492:21 */
 
 type _CERT_LOGOTYPE_DETAILS = struct {
 	FpwszMimeType LPWSTR
 	FcHashedUrl   DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FrgHashedUrl  PCERT_HASHED_URL
-} /* wincrypt.h:2271:11 */
+} /* wincrypt.h:2494:11 */
 
-type CERT_LOGOTYPE_DETAILS = _CERT_LOGOTYPE_DETAILS /* wincrypt.h:2275:5 */
-type PCERT_LOGOTYPE_DETAILS = uintptr               /* wincrypt.h:2275:27 */
+type CERT_LOGOTYPE_DETAILS = _CERT_LOGOTYPE_DETAILS /* wincrypt.h:2498:5 */
+type PCERT_LOGOTYPE_DETAILS = uintptr               /* wincrypt.h:2498:27 */
 
 type _CERT_LOGOTYPE_REFERENCE = struct {
 	FcHashedUrl  DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FrgHashedUrl PCERT_HASHED_URL
-} /* wincrypt.h:2277:11 */
+} /* wincrypt.h:2500:11 */
 
-type CERT_LOGOTYPE_REFERENCE = _CERT_LOGOTYPE_REFERENCE /* wincrypt.h:2280:5 */
-type PCERT_LOGOTYPE_REFERENCE = uintptr                 /* wincrypt.h:2280:29 */
+type CERT_LOGOTYPE_REFERENCE = _CERT_LOGOTYPE_REFERENCE /* wincrypt.h:2503:5 */
+type PCERT_LOGOTYPE_REFERENCE = uintptr                 /* wincrypt.h:2503:29 */
 
 type _CERT_LOGOTYPE_IMAGE_INFO = struct {
 	FdwLogotypeImageInfoChoice       DWORD
@@ -47967,18 +48472,18 @@ type _CERT_LOGOTYPE_IMAGE_INFO = struct {
 	FdwLogotypeImageResolutionChoice DWORD
 	F__20                            struct{ FdwNumBits DWORD }
 	FpwszLanguage                    LPWSTR
-} /* wincrypt.h:2282:11 */
+} /* wincrypt.h:2505:11 */
 
-type CERT_LOGOTYPE_IMAGE_INFO = _CERT_LOGOTYPE_IMAGE_INFO /* wincrypt.h:2293:5 */
-type PCERT_LOGOTYPE_IMAGE_INFO = uintptr                  /* wincrypt.h:2293:30 */
+type CERT_LOGOTYPE_IMAGE_INFO = _CERT_LOGOTYPE_IMAGE_INFO /* wincrypt.h:2516:5 */
+type PCERT_LOGOTYPE_IMAGE_INFO = uintptr                  /* wincrypt.h:2516:30 */
 
 type _CERT_LOGOTYPE_IMAGE = struct {
 	FLogotypeDetails    CERT_LOGOTYPE_DETAILS
 	FpLogotypeImageInfo PCERT_LOGOTYPE_IMAGE_INFO
-} /* wincrypt.h:2302:11 */
+} /* wincrypt.h:2525:11 */
 
-type CERT_LOGOTYPE_IMAGE = _CERT_LOGOTYPE_IMAGE /* wincrypt.h:2305:5 */
-type PCERT_LOGOTYPE_IMAGE = uintptr             /* wincrypt.h:2305:25 */
+type CERT_LOGOTYPE_IMAGE = _CERT_LOGOTYPE_IMAGE /* wincrypt.h:2528:5 */
+type PCERT_LOGOTYPE_IMAGE = uintptr             /* wincrypt.h:2528:25 */
 
 type _CERT_LOGOTYPE_AUDIO_INFO = struct {
 	FdwFileSize   DWORD
@@ -47986,179 +48491,179 @@ type _CERT_LOGOTYPE_AUDIO_INFO = struct {
 	FdwChannels   DWORD
 	FdwSampleRate DWORD
 	FpwszLanguage LPWSTR
-} /* wincrypt.h:2307:11 */
+} /* wincrypt.h:2530:11 */
 
-type CERT_LOGOTYPE_AUDIO_INFO = _CERT_LOGOTYPE_AUDIO_INFO /* wincrypt.h:2313:5 */
-type PCERT_LOGOTYPE_AUDIO_INFO = uintptr                  /* wincrypt.h:2313:30 */
+type CERT_LOGOTYPE_AUDIO_INFO = _CERT_LOGOTYPE_AUDIO_INFO /* wincrypt.h:2536:5 */
+type PCERT_LOGOTYPE_AUDIO_INFO = uintptr                  /* wincrypt.h:2536:30 */
 
 type _CERT_LOGOTYPE_AUDIO = struct {
 	FLogotypeDetails    CERT_LOGOTYPE_DETAILS
 	FpLogotypeAudioInfo PCERT_LOGOTYPE_AUDIO_INFO
-} /* wincrypt.h:2315:11 */
+} /* wincrypt.h:2538:11 */
 
-type CERT_LOGOTYPE_AUDIO = _CERT_LOGOTYPE_AUDIO /* wincrypt.h:2318:5 */
-type PCERT_LOGOTYPE_AUDIO = uintptr             /* wincrypt.h:2318:25 */
+type CERT_LOGOTYPE_AUDIO = _CERT_LOGOTYPE_AUDIO /* wincrypt.h:2541:5 */
+type PCERT_LOGOTYPE_AUDIO = uintptr             /* wincrypt.h:2541:25 */
 
 type _CERT_LOGOTYPE_DATA = struct {
 	FcLogotypeImage  DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgLogotypeImage PCERT_LOGOTYPE_IMAGE
 	FcLogotypeAudio  DWORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FrgLogotypeAudio PCERT_LOGOTYPE_AUDIO
-} /* wincrypt.h:2320:11 */
+} /* wincrypt.h:2543:11 */
 
-type CERT_LOGOTYPE_DATA = _CERT_LOGOTYPE_DATA /* wincrypt.h:2325:5 */
-type PCERT_LOGOTYPE_DATA = uintptr            /* wincrypt.h:2325:24 */
+type CERT_LOGOTYPE_DATA = _CERT_LOGOTYPE_DATA /* wincrypt.h:2548:5 */
+type PCERT_LOGOTYPE_DATA = uintptr            /* wincrypt.h:2548:24 */
 
 type _CERT_LOGOTYPE_INFO = struct {
 	FdwLogotypeInfoChoice DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	F__8                  struct{ FpLogotypeDirectInfo PCERT_LOGOTYPE_DATA }
-} /* wincrypt.h:2327:11 */
+} /* wincrypt.h:2550:11 */
 
-type CERT_LOGOTYPE_INFO = _CERT_LOGOTYPE_INFO /* wincrypt.h:2333:5 */
-type PCERT_LOGOTYPE_INFO = uintptr            /* wincrypt.h:2333:24 */
+type CERT_LOGOTYPE_INFO = _CERT_LOGOTYPE_INFO /* wincrypt.h:2556:5 */
+type PCERT_LOGOTYPE_INFO = uintptr            /* wincrypt.h:2556:24 */
 
 type _CERT_OTHER_LOGOTYPE_INFO = struct {
 	FpszObjId     LPSTR
 	FLogotypeInfo CERT_LOGOTYPE_INFO
-} /* wincrypt.h:2338:11 */
+} /* wincrypt.h:2561:11 */
 
-type CERT_OTHER_LOGOTYPE_INFO = _CERT_OTHER_LOGOTYPE_INFO /* wincrypt.h:2341:5 */
-type PCERT_OTHER_LOGOTYPE_INFO = uintptr                  /* wincrypt.h:2341:30 */
+type CERT_OTHER_LOGOTYPE_INFO = _CERT_OTHER_LOGOTYPE_INFO /* wincrypt.h:2564:5 */
+type PCERT_OTHER_LOGOTYPE_INFO = uintptr                  /* wincrypt.h:2564:30 */
 
 type _CERT_LOGOTYPE_EXT_INFO = struct {
 	FcCommunityLogo  DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgCommunityLogo PCERT_LOGOTYPE_INFO
 	FpIssuerLogo     PCERT_LOGOTYPE_INFO
 	FpSubjectLogo    PCERT_LOGOTYPE_INFO
 	FcOtherLogo      DWORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FrgOtherLogo     PCERT_OTHER_LOGOTYPE_INFO
-} /* wincrypt.h:2346:11 */
+} /* wincrypt.h:2569:11 */
 
-type CERT_LOGOTYPE_EXT_INFO = _CERT_LOGOTYPE_EXT_INFO /* wincrypt.h:2353:5 */
-type PCERT_LOGOTYPE_EXT_INFO = uintptr                /* wincrypt.h:2353:28 */
+type CERT_LOGOTYPE_EXT_INFO = _CERT_LOGOTYPE_EXT_INFO /* wincrypt.h:2576:5 */
+type PCERT_LOGOTYPE_EXT_INFO = uintptr                /* wincrypt.h:2576:28 */
 
 type _CERT_BIOMETRIC_DATA = struct {
 	FdwTypeOfBiometricDataChoice DWORD
-	_                            [4]byte
+	F__ccgo_pad1                 [4]byte
 	F__8                         struct {
-		_             [0]uint64
+		F__ccgo_pad1  [0]uint64
 		FdwPredefined DWORD
-		_             [4]byte
+		F__ccgo_pad2  [4]byte
 	}
 	FHashedUrl CERT_HASHED_URL
-} /* wincrypt.h:2355:11 */
+} /* wincrypt.h:2578:11 */
 
-type CERT_BIOMETRIC_DATA = _CERT_BIOMETRIC_DATA /* wincrypt.h:2362:5 */
-type PCERT_BIOMETRIC_DATA = uintptr             /* wincrypt.h:2362:25 */
+type CERT_BIOMETRIC_DATA = _CERT_BIOMETRIC_DATA /* wincrypt.h:2585:5 */
+type PCERT_BIOMETRIC_DATA = uintptr             /* wincrypt.h:2585:25 */
 
 type _CERT_BIOMETRIC_EXT_INFO = struct {
 	FcBiometricData  DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgBiometricData PCERT_BIOMETRIC_DATA
-} /* wincrypt.h:2370:11 */
+} /* wincrypt.h:2593:11 */
 
-type CERT_BIOMETRIC_EXT_INFO = _CERT_BIOMETRIC_EXT_INFO /* wincrypt.h:2373:5 */
-type PCERT_BIOMETRIC_EXT_INFO = uintptr                 /* wincrypt.h:2373:29 */
+type CERT_BIOMETRIC_EXT_INFO = _CERT_BIOMETRIC_EXT_INFO /* wincrypt.h:2596:5 */
+type PCERT_BIOMETRIC_EXT_INFO = uintptr                 /* wincrypt.h:2596:29 */
 
 type _OCSP_SIGNATURE_INFO = struct {
 	FSignatureAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FSignature          CRYPT_BIT_BLOB
 	FcCertEncoded       DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgCertEncoded      PCERT_BLOB
-} /* wincrypt.h:2375:11 */
+} /* wincrypt.h:2598:11 */
 
-type OCSP_SIGNATURE_INFO = _OCSP_SIGNATURE_INFO /* wincrypt.h:2380:5 */
-type POCSP_SIGNATURE_INFO = uintptr             /* wincrypt.h:2380:25 */
+type OCSP_SIGNATURE_INFO = _OCSP_SIGNATURE_INFO /* wincrypt.h:2603:5 */
+type POCSP_SIGNATURE_INFO = uintptr             /* wincrypt.h:2603:25 */
 
 type _OCSP_SIGNED_REQUEST_INFO = struct {
 	FToBeSigned             CRYPT_DER_BLOB
 	FpOptionalSignatureInfo POCSP_SIGNATURE_INFO
-} /* wincrypt.h:2382:11 */
+} /* wincrypt.h:2605:11 */
 
-type OCSP_SIGNED_REQUEST_INFO = _OCSP_SIGNED_REQUEST_INFO /* wincrypt.h:2385:5 */
-type POCSP_SIGNED_REQUEST_INFO = uintptr                  /* wincrypt.h:2385:30 */
+type OCSP_SIGNED_REQUEST_INFO = _OCSP_SIGNED_REQUEST_INFO /* wincrypt.h:2608:5 */
+type POCSP_SIGNED_REQUEST_INFO = uintptr                  /* wincrypt.h:2608:30 */
 
 type _OCSP_CERT_ID = struct {
 	FHashAlgorithm  CRYPT_ALGORITHM_IDENTIFIER
 	FIssuerNameHash CRYPT_HASH_BLOB
 	FIssuerKeyHash  CRYPT_HASH_BLOB
 	FSerialNumber   CRYPT_INTEGER_BLOB
-} /* wincrypt.h:2387:11 */
+} /* wincrypt.h:2610:11 */
 
-type OCSP_CERT_ID = _OCSP_CERT_ID /* wincrypt.h:2392:5 */
-type POCSP_CERT_ID = uintptr      /* wincrypt.h:2392:18 */
+type OCSP_CERT_ID = _OCSP_CERT_ID /* wincrypt.h:2615:5 */
+type POCSP_CERT_ID = uintptr      /* wincrypt.h:2615:18 */
 
 type _OCSP_REQUEST_ENTRY = struct {
 	FCertId      OCSP_CERT_ID
 	FcExtension  DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FrgExtension PCERT_EXTENSION
-} /* wincrypt.h:2394:11 */
+} /* wincrypt.h:2617:11 */
 
-type OCSP_REQUEST_ENTRY = _OCSP_REQUEST_ENTRY /* wincrypt.h:2398:5 */
-type POCSP_REQUEST_ENTRY = uintptr            /* wincrypt.h:2398:24 */
+type OCSP_REQUEST_ENTRY = _OCSP_REQUEST_ENTRY /* wincrypt.h:2621:5 */
+type POCSP_REQUEST_ENTRY = uintptr            /* wincrypt.h:2621:24 */
 
 type _OCSP_REQUEST_INFO = struct {
 	FdwVersion      DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FpRequestorName PCERT_ALT_NAME_ENTRY
 	FcRequestEntry  DWORD
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FrgRequestEntry POCSP_REQUEST_ENTRY
 	FcExtension     DWORD
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FrgExtension    PCERT_EXTENSION
-} /* wincrypt.h:2400:11 */
+} /* wincrypt.h:2623:11 */
 
-type OCSP_REQUEST_INFO = _OCSP_REQUEST_INFO /* wincrypt.h:2407:5 */
-type POCSP_REQUEST_INFO = uintptr           /* wincrypt.h:2407:23 */
+type OCSP_REQUEST_INFO = _OCSP_REQUEST_INFO /* wincrypt.h:2630:5 */
+type POCSP_REQUEST_INFO = uintptr           /* wincrypt.h:2630:23 */
 
 type _OCSP_RESPONSE_INFO = struct {
-	FdwStatus DWORD
-	_         [4]byte
-	FpszObjId LPSTR
-	FValue    CRYPT_OBJID_BLOB
-} /* wincrypt.h:2411:11 */
+	FdwStatus    DWORD
+	F__ccgo_pad1 [4]byte
+	FpszObjId    LPSTR
+	FValue       CRYPT_OBJID_BLOB
+} /* wincrypt.h:2634:11 */
 
-type OCSP_RESPONSE_INFO = _OCSP_RESPONSE_INFO /* wincrypt.h:2415:5 */
-type POCSP_RESPONSE_INFO = uintptr            /* wincrypt.h:2415:24 */
+type OCSP_RESPONSE_INFO = _OCSP_RESPONSE_INFO /* wincrypt.h:2638:5 */
+type POCSP_RESPONSE_INFO = uintptr            /* wincrypt.h:2638:24 */
 
 type _OCSP_BASIC_SIGNED_RESPONSE_INFO = struct {
 	FToBeSigned    CRYPT_DER_BLOB
 	FSignatureInfo OCSP_SIGNATURE_INFO
-} /* wincrypt.h:2426:11 */
+} /* wincrypt.h:2649:11 */
 
-type OCSP_BASIC_SIGNED_RESPONSE_INFO = _OCSP_BASIC_SIGNED_RESPONSE_INFO /* wincrypt.h:2429:5 */
-type POCSP_BASIC_SIGNED_RESPONSE_INFO = uintptr                         /* wincrypt.h:2429:37 */
+type OCSP_BASIC_SIGNED_RESPONSE_INFO = _OCSP_BASIC_SIGNED_RESPONSE_INFO /* wincrypt.h:2652:5 */
+type POCSP_BASIC_SIGNED_RESPONSE_INFO = uintptr                         /* wincrypt.h:2652:37 */
 
 type _OCSP_BASIC_REVOKED_INFO = struct {
 	FRevocationDate  FILETIME
 	FdwCrlReasonCode DWORD
-} /* wincrypt.h:2431:11 */
+} /* wincrypt.h:2654:11 */
 
-type OCSP_BASIC_REVOKED_INFO = _OCSP_BASIC_REVOKED_INFO /* wincrypt.h:2434:5 */
-type POCSP_BASIC_REVOKED_INFO = uintptr                 /* wincrypt.h:2434:29 */
+type OCSP_BASIC_REVOKED_INFO = _OCSP_BASIC_REVOKED_INFO /* wincrypt.h:2657:5 */
+type POCSP_BASIC_REVOKED_INFO = uintptr                 /* wincrypt.h:2657:29 */
 
 type _OCSP_BASIC_RESPONSE_ENTRY = struct {
 	FCertId       OCSP_CERT_ID
 	FdwCertStatus DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	F__80         struct{ FpRevokedInfo POCSP_BASIC_REVOKED_INFO }
 	FThisUpdate   FILETIME
 	FNextUpdate   FILETIME
 	FcExtension   DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	FrgExtension  PCERT_EXTENSION
-} /* wincrypt.h:2436:11 */
+} /* wincrypt.h:2659:11 */
 
-type OCSP_BASIC_RESPONSE_ENTRY = _OCSP_BASIC_RESPONSE_ENTRY /* wincrypt.h:2446:5 */
-type POCSP_BASIC_RESPONSE_ENTRY = uintptr                   /* wincrypt.h:2446:31 */
+type OCSP_BASIC_RESPONSE_ENTRY = _OCSP_BASIC_RESPONSE_ENTRY /* wincrypt.h:2669:5 */
+type POCSP_BASIC_RESPONSE_ENTRY = uintptr                   /* wincrypt.h:2669:31 */
 
 type _OCSP_BASIC_RESPONSE_INFO = struct {
 	FdwVersion           DWORD
@@ -48166,175 +48671,193 @@ type _OCSP_BASIC_RESPONSE_INFO = struct {
 	F__8                 struct{ FByNameResponderId CERT_NAME_BLOB }
 	FProducedAt          FILETIME
 	FcResponseEntry      DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FrgResponseEntry     POCSP_BASIC_RESPONSE_ENTRY
 	FcExtension          DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FrgExtension         PCERT_EXTENSION
-} /* wincrypt.h:2452:11 */
+} /* wincrypt.h:2675:11 */
+
+type OCSP_BASIC_RESPONSE_INFO = _OCSP_BASIC_RESPONSE_INFO /* wincrypt.h:2687:5 */
+type POCSP_BASIC_RESPONSE_INFO = uintptr                  /* wincrypt.h:2687:30 */
+
+type _CERT_SUPPORTED_ALGORITHM_INFO = struct {
+	FAlgorithm            CRYPT_ALGORITHM_IDENTIFIER
+	FIntendedKeyUsage     CRYPT_BIT_BLOB
+	FIntendedCertPolicies CERT_POLICIES_INFO
+} /* wincrypt.h:2693:11 */
+
+type CERT_SUPPORTED_ALGORITHM_INFO = _CERT_SUPPORTED_ALGORITHM_INFO /* wincrypt.h:2697:5 */
+type PCERT_SUPPORTED_ALGORITHM_INFO = uintptr                       /* wincrypt.h:2697:36 */
 
-type OCSP_BASIC_RESPONSE_INFO = _OCSP_BASIC_RESPONSE_INFO /* wincrypt.h:2464:5 */
-type POCSP_BASIC_RESPONSE_INFO = uintptr                  /* wincrypt.h:2464:30 */
+type _CERT_TPM_SPECIFICATION_INFO = struct {
+	FpwszFamily LPWSTR
+	FdwLevel    DWORD
+	FdwRevision DWORD
+} /* wincrypt.h:2699:11 */
 
-type HCRYPTOIDFUNCSET = uintptr  /* wincrypt.h:2470:16 */
-type HCRYPTOIDFUNCADDR = uintptr /* wincrypt.h:2471:16 */
+type CERT_TPM_SPECIFICATION_INFO = _CERT_TPM_SPECIFICATION_INFO /* wincrypt.h:2703:5 */
+type PCERT_TPM_SPECIFICATION_INFO = uintptr                     /* wincrypt.h:2703:34 */
+
+type HCRYPTOIDFUNCSET = uintptr  /* wincrypt.h:2705:16 */
+type HCRYPTOIDFUNCADDR = uintptr /* wincrypt.h:2706:16 */
 
 type _CRYPT_OID_FUNC_ENTRY = struct {
 	FpszOID     LPCSTR
 	FpvFuncAddr uintptr
-} /* wincrypt.h:2494:11 */
+} /* wincrypt.h:2729:11 */
 
-type CRYPT_OID_FUNC_ENTRY = _CRYPT_OID_FUNC_ENTRY /* wincrypt.h:2497:5 */
-type PCRYPT_OID_FUNC_ENTRY = uintptr              /* wincrypt.h:2497:26 */
+type CRYPT_OID_FUNC_ENTRY = _CRYPT_OID_FUNC_ENTRY /* wincrypt.h:2732:5 */
+type PCRYPT_OID_FUNC_ENTRY = uintptr              /* wincrypt.h:2732:26 */
 
-type PFN_CRYPT_ENUM_OID_FUNC = uintptr /* wincrypt.h:2518:19 */
+type PFN_CRYPT_ENUM_OID_FUNC = uintptr /* wincrypt.h:2753:19 */
 
 type _CRYPT_OID_INFO = struct {
-	FcbSize    DWORD
-	_          [4]byte
-	FpszOID    LPCSTR
-	FpwszName  LPCWSTR
-	FdwGroupId DWORD
-	F__28      struct{ FdwValue DWORD }
-	FExtraInfo CRYPT_DATA_BLOB
-} /* wincrypt.h:2535:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FpszOID      LPCSTR
+	FpwszName    LPCWSTR
+	FdwGroupId   DWORD
+	F__28        struct{ FdwValue DWORD }
+	FExtraInfo   CRYPT_DATA_BLOB
+} /* wincrypt.h:2770:11 */
 
-type CRYPT_OID_INFO = _CRYPT_OID_INFO /* wincrypt.h:2550:5 */
-type PCRYPT_OID_INFO = uintptr        /* wincrypt.h:2550:20 */
+type CRYPT_OID_INFO = _CRYPT_OID_INFO /* wincrypt.h:2785:5 */
+type PCRYPT_OID_INFO = uintptr        /* wincrypt.h:2785:20 */
 
-type CCRYPT_OID_INFO = CRYPT_OID_INFO /* wincrypt.h:2552:32 */
-type PCCRYPT_OID_INFO = uintptr       /* wincrypt.h:2552:48 */
+type CCRYPT_OID_INFO = CRYPT_OID_INFO /* wincrypt.h:2787:32 */
+type PCCRYPT_OID_INFO = uintptr       /* wincrypt.h:2787:48 */
 
-type PFN_CRYPT_ENUM_OID_INFO = uintptr /* wincrypt.h:2600:19 */
+type PFN_CRYPT_ENUM_OID_INFO = uintptr /* wincrypt.h:2837:19 */
 
 type _CERT_STRONG_SIGN_SERIALIZED_INFO = struct {
 	FdwFlags                    DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FpwszCNGSignHashAlgids      LPWSTR
 	FpwszCNGPubKeyMinBitLengths LPWSTR
-} /* wincrypt.h:2612:11 */
+} /* wincrypt.h:2849:11 */
 
-type CERT_STRONG_SIGN_SERIALIZED_INFO = _CERT_STRONG_SIGN_SERIALIZED_INFO /* wincrypt.h:2616:5 */
-type PCERT_STRONG_SIGN_SERIALIZED_INFO = uintptr                          /* wincrypt.h:2616:38 */
+type CERT_STRONG_SIGN_SERIALIZED_INFO = _CERT_STRONG_SIGN_SERIALIZED_INFO /* wincrypt.h:2853:5 */
+type PCERT_STRONG_SIGN_SERIALIZED_INFO = uintptr                          /* wincrypt.h:2853:38 */
 
 type _CERT_STRONG_SIGN_PARA = struct {
 	FcbSize       DWORD
 	FdwInfoChoice DWORD
 	F__8          struct{ FpvInfo uintptr }
-} /* wincrypt.h:2618:11 */
+} /* wincrypt.h:2855:11 */
 
-type CERT_STRONG_SIGN_PARA = _CERT_STRONG_SIGN_PARA /* wincrypt.h:2626:5 */
-type PCERT_STRONG_SIGN_PARA = uintptr               /* wincrypt.h:2626:27 */
+type CERT_STRONG_SIGN_PARA = _CERT_STRONG_SIGN_PARA /* wincrypt.h:2863:5 */
+type PCERT_STRONG_SIGN_PARA = uintptr               /* wincrypt.h:2863:27 */
 
-type PCCERT_STRONG_SIGN_PARA = uintptr /* wincrypt.h:2628:39 */
+type PCCERT_STRONG_SIGN_PARA = uintptr /* wincrypt.h:2865:39 */
 
-type HCRYPTMSG = uintptr /* wincrypt.h:2651:16 */
+type HCRYPTMSG = uintptr /* wincrypt.h:2888:16 */
 
 type _CERT_ISSUER_SERIAL_NUMBER = struct {
 	FIssuer       CERT_NAME_BLOB
 	FSerialNumber CRYPT_INTEGER_BLOB
-} /* wincrypt.h:2678:11 */
+} /* wincrypt.h:2915:11 */
 
-type CERT_ISSUER_SERIAL_NUMBER = _CERT_ISSUER_SERIAL_NUMBER /* wincrypt.h:2681:5 */
-type PCERT_ISSUER_SERIAL_NUMBER = uintptr                   /* wincrypt.h:2681:31 */
+type CERT_ISSUER_SERIAL_NUMBER = _CERT_ISSUER_SERIAL_NUMBER /* wincrypt.h:2918:5 */
+type PCERT_ISSUER_SERIAL_NUMBER = uintptr                   /* wincrypt.h:2918:31 */
 
 type _CERT_ID = struct {
-	FdwIdChoice DWORD
-	_           [4]byte
-	F__8        struct{ FIssuerSerialNumber CERT_ISSUER_SERIAL_NUMBER }
-} /* wincrypt.h:2683:11 */
+	FdwIdChoice  DWORD
+	F__ccgo_pad1 [4]byte
+	F__8         struct{ FIssuerSerialNumber CERT_ISSUER_SERIAL_NUMBER }
+} /* wincrypt.h:2920:11 */
 
-type CERT_ID = _CERT_ID /* wincrypt.h:2690:5 */
-type PCERT_ID = uintptr /* wincrypt.h:2690:13 */
+type CERT_ID = _CERT_ID /* wincrypt.h:2927:5 */
+type PCERT_ID = uintptr /* wincrypt.h:2927:13 */
 
 type _CMSG_SIGNER_ENCODE_INFO = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpCertInfo     PCERT_INFO
 	F__16          struct{ FhCryptProv HCRYPTPROV }
 	FdwKeySpec     DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FHashAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvHashAuxInfo uintptr
 	FcAuthAttr     DWORD
-	_              [4]byte
+	F__ccgo_pad3   [4]byte
 	FrgAuthAttr    PCRYPT_ATTRIBUTE
 	FcUnauthAttr   DWORD
-	_              [4]byte
+	F__ccgo_pad4   [4]byte
 	FrgUnauthAttr  PCRYPT_ATTRIBUTE
-} /* wincrypt.h:2696:11 */
+} /* wincrypt.h:2933:11 */
 
-type CMSG_SIGNER_ENCODE_INFO = _CMSG_SIGNER_ENCODE_INFO /* wincrypt.h:2715:5 */
-type PCMSG_SIGNER_ENCODE_INFO = uintptr                 /* wincrypt.h:2715:29 */
+type CMSG_SIGNER_ENCODE_INFO = _CMSG_SIGNER_ENCODE_INFO /* wincrypt.h:2952:5 */
+type PCMSG_SIGNER_ENCODE_INFO = uintptr                 /* wincrypt.h:2952:29 */
 
 type _CMSG_SIGNED_ENCODE_INFO = struct {
 	FcbSize        DWORD
 	FcSigners      DWORD
 	FrgSigners     PCMSG_SIGNER_ENCODE_INFO
 	FcCertEncoded  DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FrgCertEncoded PCERT_BLOB
 	FcCrlEncoded   DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FrgCrlEncoded  PCRL_BLOB
-} /* wincrypt.h:2717:11 */
+} /* wincrypt.h:2954:11 */
 
-type CMSG_SIGNED_ENCODE_INFO = _CMSG_SIGNED_ENCODE_INFO /* wincrypt.h:2729:5 */
-type PCMSG_SIGNED_ENCODE_INFO = uintptr                 /* wincrypt.h:2729:29 */
+type CMSG_SIGNED_ENCODE_INFO = _CMSG_SIGNED_ENCODE_INFO /* wincrypt.h:2966:5 */
+type PCMSG_SIGNED_ENCODE_INFO = uintptr                 /* wincrypt.h:2966:29 */
 
 type _CMSG_RECIPIENT_ENCODE_INFO = struct {
 	FdwRecipientChoice DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	F__8               struct {
 		FpKeyTrans PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO
 	}
-} /* wincrypt.h:2731:11 */
+} /* wincrypt.h:2968:11 */
 
-type CMSG_RECIPIENT_ENCODE_INFO = _CMSG_RECIPIENT_ENCODE_INFO /* wincrypt.h:2731:46 */
-type PCMSG_RECIPIENT_ENCODE_INFO = uintptr                    /* wincrypt.h:2731:73 */
+type CMSG_RECIPIENT_ENCODE_INFO = _CMSG_RECIPIENT_ENCODE_INFO /* wincrypt.h:2968:46 */
+type PCMSG_RECIPIENT_ENCODE_INFO = uintptr                    /* wincrypt.h:2968:73 */
 
 type _CMSG_ENVELOPED_ENCODE_INFO = struct {
 	FcbSize                     DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FhCryptProv                 HCRYPTPROV_LEGACY
 	FContentEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvEncryptionAuxInfo        uintptr
 	FcRecipients                DWORD
-	_                           [4]byte
+	F__ccgo_pad2                [4]byte
 	FrgpRecipients              uintptr
-} /* wincrypt.h:2733:11 */
+} /* wincrypt.h:2970:11 */
 
-type CMSG_ENVELOPED_ENCODE_INFO = _CMSG_ENVELOPED_ENCODE_INFO /* wincrypt.h:2751:5 */
-type PCMSG_ENVELOPED_ENCODE_INFO = uintptr                    /* wincrypt.h:2751:32 */
+type CMSG_ENVELOPED_ENCODE_INFO = _CMSG_ENVELOPED_ENCODE_INFO /* wincrypt.h:2988:5 */
+type PCMSG_ENVELOPED_ENCODE_INFO = uintptr                    /* wincrypt.h:2988:32 */
 
 type _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = struct {
 	FcbSize                 DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvKeyEncryptionAuxInfo uintptr
 	FhCryptProv             HCRYPTPROV_LEGACY
 	FRecipientPublicKey     CRYPT_BIT_BLOB
 	FRecipientId            CERT_ID
-} /* wincrypt.h:2753:11 */
+} /* wincrypt.h:2990:11 */
 
-type CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO /* wincrypt.h:2760:5 */
-type PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:2760:42 */
+type CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO /* wincrypt.h:2997:5 */
+type PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:2997:42 */
 
 type _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO = struct {
 	FcbSize             DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FRecipientPublicKey CRYPT_BIT_BLOB
 	FRecipientId        CERT_ID
 	FDate               FILETIME
 	FpOtherAttr         PCRYPT_ATTRIBUTE_TYPE_VALUE
-} /* wincrypt.h:2762:11 */
+} /* wincrypt.h:2999:11 */
 
-type CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO = _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO /* wincrypt.h:2768:5 */
-type PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO = uintptr                                  /* wincrypt.h:2768:46 */
+type CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO = _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO /* wincrypt.h:3005:5 */
+type PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO = uintptr                                  /* wincrypt.h:3005:46 */
 
 type _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = struct {
 	FcbSize                    DWORD
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FKeyEncryptionAlgorithm    CRYPT_ALGORITHM_IDENTIFIER
 	FpvKeyEncryptionAuxInfo    uintptr
 	FKeyWrapAlgorithm          CRYPT_ALGORITHM_IDENTIFIER
@@ -48345,100 +48868,100 @@ type _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = struct {
 	F__88                      struct{ FpEphemeralAlgorithm PCRYPT_ALGORITHM_IDENTIFIER }
 	FUserKeyingMaterial        CRYPT_DATA_BLOB
 	FcRecipientEncryptedKeys   DWORD
-	_                          [4]byte
+	F__ccgo_pad2               [4]byte
 	FrgpRecipientEncryptedKeys uintptr
-} /* wincrypt.h:2770:11 */
+} /* wincrypt.h:3007:11 */
 
-type CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO /* wincrypt.h:2786:5 */
-type PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:2786:42 */
+type CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO /* wincrypt.h:3023:5 */
+type PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:3023:42 */
 
 type _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO = struct {
 	FcbSize                 DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvKeyEncryptionAuxInfo uintptr
 	FhCryptProv             HCRYPTPROV
 	FdwKeyChoice            DWORD
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	F__56                   struct{ FhKeyEncryptionKey HCRYPTKEY }
 	FKeyId                  CRYPT_DATA_BLOB
 	FDate                   FILETIME
 	FpOtherAttr             PCRYPT_ATTRIBUTE_TYPE_VALUE
-} /* wincrypt.h:2791:11 */
+} /* wincrypt.h:3028:11 */
 
-type CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO = _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO /* wincrypt.h:2804:5 */
-type PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:2804:42 */
+type CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO = _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO /* wincrypt.h:3041:5 */
+type PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO = uintptr                              /* wincrypt.h:3041:42 */
 
 type _CMSG_RC2_AUX_INFO = struct {
 	FcbSize   DWORD
 	FdwBitLen DWORD
-} /* wincrypt.h:2824:11 */
+} /* wincrypt.h:3061:11 */
 
-type CMSG_RC2_AUX_INFO = _CMSG_RC2_AUX_INFO /* wincrypt.h:2827:5 */
-type PCMSG_RC2_AUX_INFO = uintptr           /* wincrypt.h:2827:23 */
+type CMSG_RC2_AUX_INFO = _CMSG_RC2_AUX_INFO /* wincrypt.h:3064:5 */
+type PCMSG_RC2_AUX_INFO = uintptr           /* wincrypt.h:3064:23 */
 
 type _CMSG_SP3_COMPATIBLE_AUX_INFO = struct {
 	FcbSize  DWORD
 	FdwFlags DWORD
-} /* wincrypt.h:2829:11 */
+} /* wincrypt.h:3066:11 */
 
-type CMSG_SP3_COMPATIBLE_AUX_INFO = _CMSG_SP3_COMPATIBLE_AUX_INFO /* wincrypt.h:2832:5 */
-type PCMSG_SP3_COMPATIBLE_AUX_INFO = uintptr                      /* wincrypt.h:2832:34 */
+type CMSG_SP3_COMPATIBLE_AUX_INFO = _CMSG_SP3_COMPATIBLE_AUX_INFO /* wincrypt.h:3069:5 */
+type PCMSG_SP3_COMPATIBLE_AUX_INFO = uintptr                      /* wincrypt.h:3069:34 */
 
 type _CMSG_RC4_AUX_INFO = struct {
 	FcbSize   DWORD
 	FdwBitLen DWORD
-} /* wincrypt.h:2834:11 */
+} /* wincrypt.h:3071:11 */
 
-type CMSG_RC4_AUX_INFO = _CMSG_RC4_AUX_INFO /* wincrypt.h:2837:5 */
-type PCMSG_RC4_AUX_INFO = uintptr           /* wincrypt.h:2837:23 */
+type CMSG_RC4_AUX_INFO = _CMSG_RC4_AUX_INFO /* wincrypt.h:3074:5 */
+type PCMSG_RC4_AUX_INFO = uintptr           /* wincrypt.h:3074:23 */
 
 type _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FSignedInfo    CMSG_SIGNED_ENCODE_INFO
 	FEnvelopedInfo CMSG_ENVELOPED_ENCODE_INFO
-} /* wincrypt.h:2839:11 */
+} /* wincrypt.h:3076:11 */
 
-type CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO = _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO /* wincrypt.h:2843:5 */
-type PCMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO = uintptr                               /* wincrypt.h:2843:43 */
+type CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO = _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO /* wincrypt.h:3080:5 */
+type PCMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO = uintptr                               /* wincrypt.h:3080:43 */
 
 type _CMSG_HASHED_ENCODE_INFO = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhCryptProv    HCRYPTPROV_LEGACY
 	FHashAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvHashAuxInfo uintptr
-} /* wincrypt.h:2845:11 */
+} /* wincrypt.h:3082:11 */
 
-type CMSG_HASHED_ENCODE_INFO = _CMSG_HASHED_ENCODE_INFO /* wincrypt.h:2850:5 */
-type PCMSG_HASHED_ENCODE_INFO = uintptr                 /* wincrypt.h:2850:29 */
+type CMSG_HASHED_ENCODE_INFO = _CMSG_HASHED_ENCODE_INFO /* wincrypt.h:3087:5 */
+type PCMSG_HASHED_ENCODE_INFO = uintptr                 /* wincrypt.h:3087:29 */
 
 type _CMSG_ENCRYPTED_ENCODE_INFO = struct {
 	FcbSize                     DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FContentEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FpvEncryptionAuxInfo        uintptr
-} /* wincrypt.h:2852:11 */
+} /* wincrypt.h:3089:11 */
 
-type CMSG_ENCRYPTED_ENCODE_INFO = _CMSG_ENCRYPTED_ENCODE_INFO /* wincrypt.h:2856:5 */
-type PCMSG_ENCRYPTED_ENCODE_INFO = uintptr                    /* wincrypt.h:2856:32 */
+type CMSG_ENCRYPTED_ENCODE_INFO = _CMSG_ENCRYPTED_ENCODE_INFO /* wincrypt.h:3093:5 */
+type PCMSG_ENCRYPTED_ENCODE_INFO = uintptr                    /* wincrypt.h:3093:32 */
 
-type PFN_CMSG_STREAM_OUTPUT = uintptr /* wincrypt.h:2858:19 */
+type PFN_CMSG_STREAM_OUTPUT = uintptr /* wincrypt.h:3095:19 */
 
 type _CMSG_STREAM_INFO = struct {
 	FcbContent       DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FpfnStreamOutput PFN_CMSG_STREAM_OUTPUT
 	FpvArg           uintptr
-} /* wincrypt.h:2862:11 */
+} /* wincrypt.h:3099:11 */
 
-type CMSG_STREAM_INFO = _CMSG_STREAM_INFO /* wincrypt.h:2866:5 */
-type PCMSG_STREAM_INFO = uintptr          /* wincrypt.h:2866:22 */
+type CMSG_STREAM_INFO = _CMSG_STREAM_INFO /* wincrypt.h:3103:5 */
+type PCMSG_STREAM_INFO = uintptr          /* wincrypt.h:3103:22 */
 
 type _CMSG_SIGNER_INFO = struct {
 	FdwVersion               DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FIssuer                  CERT_NAME_BLOB
 	FSerialNumber            CRYPT_INTEGER_BLOB
 	FHashAlgorithm           CRYPT_ALGORITHM_IDENTIFIER
@@ -48446,206 +48969,206 @@ type _CMSG_SIGNER_INFO = struct {
 	FEncryptedHash           CRYPT_DATA_BLOB
 	FAuthAttrs               CRYPT_ATTRIBUTES
 	FUnauthAttrs             CRYPT_ATTRIBUTES
-} /* wincrypt.h:2921:11 */
+} /* wincrypt.h:3159:11 */
 
-type CMSG_SIGNER_INFO = _CMSG_SIGNER_INFO /* wincrypt.h:2930:5 */
-type PCMSG_SIGNER_INFO = uintptr          /* wincrypt.h:2930:22 */
+type CMSG_SIGNER_INFO = _CMSG_SIGNER_INFO /* wincrypt.h:3168:5 */
+type PCMSG_SIGNER_INFO = uintptr          /* wincrypt.h:3168:22 */
 
 type _CMSG_CMS_SIGNER_INFO = struct {
 	FdwVersion               DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FSignerId                CERT_ID
 	FHashAlgorithm           CRYPT_ALGORITHM_IDENTIFIER
 	FHashEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedHash           CRYPT_DATA_BLOB
 	FAuthAttrs               CRYPT_ATTRIBUTES
 	FUnauthAttrs             CRYPT_ATTRIBUTES
-} /* wincrypt.h:2932:11 */
+} /* wincrypt.h:3170:11 */
 
-type CMSG_CMS_SIGNER_INFO = _CMSG_CMS_SIGNER_INFO /* wincrypt.h:2940:5 */
-type PCMSG_CMS_SIGNER_INFO = uintptr              /* wincrypt.h:2940:26 */
+type CMSG_CMS_SIGNER_INFO = _CMSG_CMS_SIGNER_INFO /* wincrypt.h:3178:5 */
+type PCMSG_CMS_SIGNER_INFO = uintptr              /* wincrypt.h:3178:26 */
 
-type CMSG_ATTR = CRYPT_ATTRIBUTES /* wincrypt.h:2942:28 */
-type PCMSG_ATTR = uintptr         /* wincrypt.h:2943:28 */
+type CMSG_ATTR = CRYPT_ATTRIBUTES /* wincrypt.h:3180:28 */
+type PCMSG_ATTR = uintptr         /* wincrypt.h:3181:28 */
 
 type _CMSG_KEY_TRANS_RECIPIENT_INFO = struct {
 	FdwVersion              DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FRecipientId            CERT_ID
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedKey           CRYPT_DATA_BLOB
-} /* wincrypt.h:2965:11 */
+} /* wincrypt.h:3203:11 */
 
-type CMSG_KEY_TRANS_RECIPIENT_INFO = _CMSG_KEY_TRANS_RECIPIENT_INFO /* wincrypt.h:2970:5 */
-type PCMSG_KEY_TRANS_RECIPIENT_INFO = uintptr                       /* wincrypt.h:2970:35 */
+type CMSG_KEY_TRANS_RECIPIENT_INFO = _CMSG_KEY_TRANS_RECIPIENT_INFO /* wincrypt.h:3208:5 */
+type PCMSG_KEY_TRANS_RECIPIENT_INFO = uintptr                       /* wincrypt.h:3208:35 */
 
 type _CMSG_RECIPIENT_ENCRYPTED_KEY_INFO = struct {
 	FRecipientId  CERT_ID
 	FEncryptedKey CRYPT_DATA_BLOB
 	FDate         FILETIME
 	FpOtherAttr   PCRYPT_ATTRIBUTE_TYPE_VALUE
-} /* wincrypt.h:2972:11 */
+} /* wincrypt.h:3210:11 */
 
-type CMSG_RECIPIENT_ENCRYPTED_KEY_INFO = _CMSG_RECIPIENT_ENCRYPTED_KEY_INFO /* wincrypt.h:2977:5 */
-type PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO = uintptr                           /* wincrypt.h:2977:39 */
+type CMSG_RECIPIENT_ENCRYPTED_KEY_INFO = _CMSG_RECIPIENT_ENCRYPTED_KEY_INFO /* wincrypt.h:3215:5 */
+type PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO = uintptr                           /* wincrypt.h:3215:39 */
 
 type _CMSG_KEY_AGREE_RECIPIENT_INFO = struct {
 	FdwVersion          DWORD
 	FdwOriginatorChoice DWORD
 	F__8                struct {
 		FOriginatorCertId CERT_ID
-		_                 [8]byte
+		F__ccgo_pad1      [8]byte
 	}
 	FUserKeyingMaterial        CRYPT_DATA_BLOB
 	FKeyEncryptionAlgorithm    CRYPT_ALGORITHM_IDENTIFIER
 	FcRecipientEncryptedKeys   DWORD
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FrgpRecipientEncryptedKeys uintptr
-} /* wincrypt.h:2979:11 */
+} /* wincrypt.h:3217:11 */
 
-type CMSG_KEY_AGREE_RECIPIENT_INFO = _CMSG_KEY_AGREE_RECIPIENT_INFO /* wincrypt.h:2990:5 */
-type PCMSG_KEY_AGREE_RECIPIENT_INFO = uintptr                       /* wincrypt.h:2990:35 */
+type CMSG_KEY_AGREE_RECIPIENT_INFO = _CMSG_KEY_AGREE_RECIPIENT_INFO /* wincrypt.h:3228:5 */
+type PCMSG_KEY_AGREE_RECIPIENT_INFO = uintptr                       /* wincrypt.h:3228:35 */
 
 type _CMSG_MAIL_LIST_RECIPIENT_INFO = struct {
 	FdwVersion              DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FKeyId                  CRYPT_DATA_BLOB
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedKey           CRYPT_DATA_BLOB
 	FDate                   FILETIME
 	FpOtherAttr             PCRYPT_ATTRIBUTE_TYPE_VALUE
-} /* wincrypt.h:2995:11 */
+} /* wincrypt.h:3233:11 */
 
-type CMSG_MAIL_LIST_RECIPIENT_INFO = _CMSG_MAIL_LIST_RECIPIENT_INFO /* wincrypt.h:3002:5 */
-type PCMSG_MAIL_LIST_RECIPIENT_INFO = uintptr                       /* wincrypt.h:3002:35 */
+type CMSG_MAIL_LIST_RECIPIENT_INFO = _CMSG_MAIL_LIST_RECIPIENT_INFO /* wincrypt.h:3240:5 */
+type PCMSG_MAIL_LIST_RECIPIENT_INFO = uintptr                       /* wincrypt.h:3240:35 */
 
 type _CMSG_CMS_RECIPIENT_INFO = struct {
 	FdwRecipientChoice DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	F__8               struct {
 		FpKeyTrans PCMSG_KEY_TRANS_RECIPIENT_INFO
 	}
-} /* wincrypt.h:3004:11 */
+} /* wincrypt.h:3242:11 */
 
-type CMSG_CMS_RECIPIENT_INFO = _CMSG_CMS_RECIPIENT_INFO /* wincrypt.h:3011:5 */
-type PCMSG_CMS_RECIPIENT_INFO = uintptr                 /* wincrypt.h:3011:29 */
+type CMSG_CMS_RECIPIENT_INFO = _CMSG_CMS_RECIPIENT_INFO /* wincrypt.h:3249:5 */
+type PCMSG_CMS_RECIPIENT_INFO = uintptr                 /* wincrypt.h:3249:29 */
 
 type _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhCryptProv    HCRYPTPROV_LEGACY
 	FdwSignerIndex DWORD
 	FdwSignerType  DWORD
 	FpvSigner      uintptr
-} /* wincrypt.h:3044:11 */
+} /* wincrypt.h:3282:11 */
 
-type CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA = _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA /* wincrypt.h:3050:5 */
-type PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA = uintptr                            /* wincrypt.h:3050:40 */
+type CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA = _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA /* wincrypt.h:3288:5 */
+type PCMSG_CTRL_VERIFY_SIGNATURE_EX_PARA = uintptr                            /* wincrypt.h:3288:40 */
 
 type _CMSG_CTRL_DECRYPT_PARA = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	F__8              struct{ FhCryptProv HCRYPTPROV }
 	FdwKeySpec        DWORD
 	FdwRecipientIndex DWORD
-} /* wincrypt.h:3057:11 */
+} /* wincrypt.h:3295:11 */
 
-type CMSG_CTRL_DECRYPT_PARA = _CMSG_CTRL_DECRYPT_PARA /* wincrypt.h:3065:5 */
-type PCMSG_CTRL_DECRYPT_PARA = uintptr                /* wincrypt.h:3065:28 */
+type CMSG_CTRL_DECRYPT_PARA = _CMSG_CTRL_DECRYPT_PARA /* wincrypt.h:3303:5 */
+type PCMSG_CTRL_DECRYPT_PARA = uintptr                /* wincrypt.h:3303:28 */
 
 type _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	F__8              struct{ FhCryptProv HCRYPTPROV }
 	FdwKeySpec        DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FpKeyTrans        PCMSG_KEY_TRANS_RECIPIENT_INFO
 	FdwRecipientIndex DWORD
-	_                 [4]byte
-} /* wincrypt.h:3067:11 */
+	F__ccgo_pad3      [4]byte
+} /* wincrypt.h:3305:11 */
 
-type CMSG_CTRL_KEY_TRANS_DECRYPT_PARA = _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA /* wincrypt.h:3076:5 */
-type PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA = uintptr                          /* wincrypt.h:3076:38 */
+type CMSG_CTRL_KEY_TRANS_DECRYPT_PARA = _CMSG_CTRL_KEY_TRANS_DECRYPT_PARA /* wincrypt.h:3314:5 */
+type PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA = uintptr                          /* wincrypt.h:3314:38 */
 
 type _CMSG_CTRL_KEY_AGREE_DECRYPT_PARA = struct {
 	FcbSize                       DWORD
-	_                             [4]byte
+	F__ccgo_pad1                  [4]byte
 	F__8                          struct{ FhCryptProv HCRYPTPROV }
 	FdwKeySpec                    DWORD
-	_                             [4]byte
+	F__ccgo_pad2                  [4]byte
 	FpKeyAgree                    PCMSG_KEY_AGREE_RECIPIENT_INFO
 	FdwRecipientIndex             DWORD
 	FdwRecipientEncryptedKeyIndex DWORD
 	FOriginatorPublicKey          CRYPT_BIT_BLOB
-} /* wincrypt.h:3078:11 */
+} /* wincrypt.h:3316:11 */
 
-type CMSG_CTRL_KEY_AGREE_DECRYPT_PARA = _CMSG_CTRL_KEY_AGREE_DECRYPT_PARA /* wincrypt.h:3089:5 */
-type PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA = uintptr                          /* wincrypt.h:3089:38 */
+type CMSG_CTRL_KEY_AGREE_DECRYPT_PARA = _CMSG_CTRL_KEY_AGREE_DECRYPT_PARA /* wincrypt.h:3327:5 */
+type PCMSG_CTRL_KEY_AGREE_DECRYPT_PARA = uintptr                          /* wincrypt.h:3327:38 */
 
 type _CMSG_CTRL_MAIL_LIST_DECRYPT_PARA = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhCryptProv       HCRYPTPROV
 	FpMailList        PCMSG_MAIL_LIST_RECIPIENT_INFO
 	FdwRecipientIndex DWORD
 	FdwKeyChoice      DWORD
 	F__32             struct{ FhKeyEncryptionKey HCRYPTKEY }
-} /* wincrypt.h:3091:11 */
+} /* wincrypt.h:3329:11 */
 
-type CMSG_CTRL_MAIL_LIST_DECRYPT_PARA = _CMSG_CTRL_MAIL_LIST_DECRYPT_PARA /* wincrypt.h:3101:5 */
-type PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA = uintptr                          /* wincrypt.h:3101:38 */
+type CMSG_CTRL_MAIL_LIST_DECRYPT_PARA = _CMSG_CTRL_MAIL_LIST_DECRYPT_PARA /* wincrypt.h:3339:5 */
+type PCMSG_CTRL_MAIL_LIST_DECRYPT_PARA = uintptr                          /* wincrypt.h:3339:38 */
 
 type _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA = struct {
 	FcbSize        DWORD
 	FdwSignerIndex DWORD
 	Fblob          CRYPT_DATA_BLOB
-} /* wincrypt.h:3103:11 */
+} /* wincrypt.h:3341:11 */
 
-type CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA = _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA /* wincrypt.h:3107:5 */
-type PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA = uintptr                               /* wincrypt.h:3107:43 */
+type CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA = _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA /* wincrypt.h:3345:5 */
+type PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA = uintptr                               /* wincrypt.h:3345:43 */
 
 type _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA = struct {
 	FcbSize            DWORD
 	FdwSignerIndex     DWORD
 	FdwUnauthAttrIndex DWORD
-} /* wincrypt.h:3109:11 */
+} /* wincrypt.h:3347:11 */
 
-type CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA = _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA /* wincrypt.h:3113:5 */
-type PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA = uintptr                               /* wincrypt.h:3113:43 */
+type CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA = _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA /* wincrypt.h:3351:5 */
+type PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA = uintptr                               /* wincrypt.h:3351:43 */
 
-type PFN_CMSG_ALLOC = uintptr /* wincrypt.h:3122:16 */
-type PFN_CMSG_FREE = uintptr  /* wincrypt.h:3123:16 */
+type PFN_CMSG_ALLOC = uintptr /* wincrypt.h:3360:16 */
+type PFN_CMSG_FREE = uintptr  /* wincrypt.h:3361:16 */
 
-type PFN_CMSG_GEN_ENCRYPT_KEY = uintptr    /* wincrypt.h:3129:19 */
-type PFN_CMSG_EXPORT_ENCRYPT_KEY = uintptr /* wincrypt.h:3130:19 */
-type PFN_CMSG_IMPORT_ENCRYPT_KEY = uintptr /* wincrypt.h:3131:19 */
+type PFN_CMSG_GEN_ENCRYPT_KEY = uintptr    /* wincrypt.h:3367:19 */
+type PFN_CMSG_EXPORT_ENCRYPT_KEY = uintptr /* wincrypt.h:3368:19 */
+type PFN_CMSG_IMPORT_ENCRYPT_KEY = uintptr /* wincrypt.h:3369:19 */
 
 type _CMSG_CONTENT_ENCRYPT_INFO = struct {
 	FcbSize                       DWORD
-	_                             [4]byte
+	F__ccgo_pad1                  [4]byte
 	FhCryptProv                   HCRYPTPROV_LEGACY
 	FContentEncryptionAlgorithm   CRYPT_ALGORITHM_IDENTIFIER
 	FpvEncryptionAuxInfo          uintptr
 	FcRecipients                  DWORD
-	_                             [4]byte
+	F__ccgo_pad2                  [4]byte
 	FrgCmsRecipients              PCMSG_RECIPIENT_ENCODE_INFO
 	FpfnAlloc                     PFN_CMSG_ALLOC
 	FpfnFree                      PFN_CMSG_FREE
 	FdwEncryptFlags               DWORD
-	_                             [4]byte
+	F__ccgo_pad3                  [4]byte
 	F__88                         struct{ FhContentEncryptKey HCRYPTKEY }
 	FdwFlags                      DWORD
 	FfCNG                         WINBOOL
 	FpbCNGContentEncryptKeyObject uintptr
 	FpbContentEncryptKey          uintptr
 	FcbContentEncryptKey          DWORD
-	_                             [4]byte
-} /* wincrypt.h:3137:11 */
+	F__ccgo_pad4                  [4]byte
+} /* wincrypt.h:3375:11 */
 
-type CMSG_CONTENT_ENCRYPT_INFO = _CMSG_CONTENT_ENCRYPT_INFO /* wincrypt.h:3156:5 */
-type PCMSG_CONTENT_ENCRYPT_INFO = uintptr                   /* wincrypt.h:3156:31 */
+type CMSG_CONTENT_ENCRYPT_INFO = _CMSG_CONTENT_ENCRYPT_INFO /* wincrypt.h:3394:5 */
+type PCMSG_CONTENT_ENCRYPT_INFO = uintptr                   /* wincrypt.h:3394:31 */
 
-type PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY = uintptr /* wincrypt.h:3168:19 */
+type PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY = uintptr /* wincrypt.h:3406:19 */
 
 type _CMSG_KEY_TRANS_ENCRYPT_INFO = struct {
 	FcbSize                 DWORD
@@ -48653,22 +49176,22 @@ type _CMSG_KEY_TRANS_ENCRYPT_INFO = struct {
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedKey           CRYPT_DATA_BLOB
 	FdwFlags                DWORD
-	_                       [4]byte
-} /* wincrypt.h:3170:11 */
+	F__ccgo_pad1            [4]byte
+} /* wincrypt.h:3408:11 */
 
-type CMSG_KEY_TRANS_ENCRYPT_INFO = _CMSG_KEY_TRANS_ENCRYPT_INFO /* wincrypt.h:3176:5 */
-type PCMSG_KEY_TRANS_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3176:33 */
+type CMSG_KEY_TRANS_ENCRYPT_INFO = _CMSG_KEY_TRANS_ENCRYPT_INFO /* wincrypt.h:3414:5 */
+type PCMSG_KEY_TRANS_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3414:33 */
 
-type PFN_CMSG_EXPORT_KEY_TRANS = uintptr /* wincrypt.h:3185:19 */
+type PFN_CMSG_EXPORT_KEY_TRANS = uintptr /* wincrypt.h:3423:19 */
 
 type _CMSG_KEY_AGREE_KEY_ENCRYPT_INFO = struct {
 	FcbSize       DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FEncryptedKey CRYPT_DATA_BLOB
-} /* wincrypt.h:3187:11 */
+} /* wincrypt.h:3425:11 */
 
-type CMSG_KEY_AGREE_KEY_ENCRYPT_INFO = _CMSG_KEY_AGREE_KEY_ENCRYPT_INFO /* wincrypt.h:3190:5 */
-type PCMSG_KEY_AGREE_KEY_ENCRYPT_INFO = uintptr                         /* wincrypt.h:3190:37 */
+type CMSG_KEY_AGREE_KEY_ENCRYPT_INFO = _CMSG_KEY_AGREE_KEY_ENCRYPT_INFO /* wincrypt.h:3428:5 */
+type PCMSG_KEY_AGREE_KEY_ENCRYPT_INFO = uintptr                         /* wincrypt.h:3428:37 */
 
 type _CMSG_KEY_AGREE_ENCRYPT_INFO = struct {
 	FcbSize                 DWORD
@@ -48676,22 +49199,22 @@ type _CMSG_KEY_AGREE_ENCRYPT_INFO = struct {
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FUserKeyingMaterial     CRYPT_DATA_BLOB
 	FdwOriginatorChoice     DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	F__56                   struct {
 		FOriginatorCertId CERT_ID
-		_                 [8]byte
+		F__ccgo_pad1      [8]byte
 	}
 	FcKeyAgreeKeyEncryptInfo   DWORD
-	_                          [4]byte
+	F__ccgo_pad2               [4]byte
 	FrgpKeyAgreeKeyEncryptInfo uintptr
 	FdwFlags                   DWORD
-	_                          [4]byte
-} /* wincrypt.h:3192:11 */
+	F__ccgo_pad3               [4]byte
+} /* wincrypt.h:3430:11 */
 
-type CMSG_KEY_AGREE_ENCRYPT_INFO = _CMSG_KEY_AGREE_ENCRYPT_INFO /* wincrypt.h:3205:5 */
-type PCMSG_KEY_AGREE_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3205:33 */
+type CMSG_KEY_AGREE_ENCRYPT_INFO = _CMSG_KEY_AGREE_ENCRYPT_INFO /* wincrypt.h:3443:5 */
+type PCMSG_KEY_AGREE_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3443:33 */
 
-type PFN_CMSG_EXPORT_KEY_AGREE = uintptr /* wincrypt.h:3218:19 */
+type PFN_CMSG_EXPORT_KEY_AGREE = uintptr /* wincrypt.h:3456:19 */
 
 type _CMSG_MAIL_LIST_ENCRYPT_INFO = struct {
 	FcbSize                 DWORD
@@ -48699,99 +49222,101 @@ type _CMSG_MAIL_LIST_ENCRYPT_INFO = struct {
 	FKeyEncryptionAlgorithm CRYPT_ALGORITHM_IDENTIFIER
 	FEncryptedKey           CRYPT_DATA_BLOB
 	FdwFlags                DWORD
-	_                       [4]byte
-} /* wincrypt.h:3220:11 */
+	F__ccgo_pad1            [4]byte
+} /* wincrypt.h:3458:11 */
 
-type CMSG_MAIL_LIST_ENCRYPT_INFO = _CMSG_MAIL_LIST_ENCRYPT_INFO /* wincrypt.h:3226:5 */
-type PCMSG_MAIL_LIST_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3226:33 */
+type CMSG_MAIL_LIST_ENCRYPT_INFO = _CMSG_MAIL_LIST_ENCRYPT_INFO /* wincrypt.h:3464:5 */
+type PCMSG_MAIL_LIST_ENCRYPT_INFO = uintptr                     /* wincrypt.h:3464:33 */
 
-type PFN_CMSG_EXPORT_MAIL_LIST = uintptr /* wincrypt.h:3240:19 */
-type PFN_CMSG_IMPORT_KEY_TRANS = uintptr /* wincrypt.h:3241:19 */
-type PFN_CMSG_IMPORT_KEY_AGREE = uintptr /* wincrypt.h:3242:19 */
-type PFN_CMSG_IMPORT_MAIL_LIST = uintptr /* wincrypt.h:3243:19 */
+type PFN_CMSG_EXPORT_MAIL_LIST = uintptr /* wincrypt.h:3478:19 */
+type PFN_CMSG_IMPORT_KEY_TRANS = uintptr /* wincrypt.h:3479:19 */
+type PFN_CMSG_IMPORT_KEY_AGREE = uintptr /* wincrypt.h:3480:19 */
+type PFN_CMSG_IMPORT_MAIL_LIST = uintptr /* wincrypt.h:3481:19 */
 
 type _CMSG_CNG_CONTENT_DECRYPT_INFO = struct {
 	FcbSize                       DWORD
-	_                             [4]byte
+	F__ccgo_pad1                  [4]byte
 	FContentEncryptionAlgorithm   CRYPT_ALGORITHM_IDENTIFIER
 	FpfnAlloc                     PFN_CMSG_ALLOC
 	FpfnFree                      PFN_CMSG_FREE
 	FhNCryptKey                   NCRYPT_KEY_HANDLE
 	FpbContentEncryptKey          uintptr
 	FcbContentEncryptKey          DWORD
-	_                             [4]byte
+	F__ccgo_pad2                  [4]byte
 	FhCNGContentEncryptKey        BCRYPT_KEY_HANDLE
 	FpbCNGContentEncryptKeyObject uintptr
-} /* wincrypt.h:3245:11 */
+} /* wincrypt.h:3483:11 */
 
-type CMSG_CNG_CONTENT_DECRYPT_INFO = _CMSG_CNG_CONTENT_DECRYPT_INFO /* wincrypt.h:3255:5 */
-type PCMSG_CNG_CONTENT_DECRYPT_INFO = uintptr                       /* wincrypt.h:3255:35 */
+type CMSG_CNG_CONTENT_DECRYPT_INFO = _CMSG_CNG_CONTENT_DECRYPT_INFO /* wincrypt.h:3493:5 */
+type PCMSG_CNG_CONTENT_DECRYPT_INFO = uintptr                       /* wincrypt.h:3493:35 */
 
-type PFN_CMSG_CNG_IMPORT_KEY_TRANS = uintptr           /* wincrypt.h:3261:19 */
-type PFN_CMSG_CNG_IMPORT_KEY_AGREE = uintptr           /* wincrypt.h:3262:19 */
-type PFN_CMSG_CNG_IMPORT_CONTENT_ENCRYPT_KEY = uintptr /* wincrypt.h:3263:19 */
+type PFN_CMSG_CNG_IMPORT_KEY_TRANS = uintptr           /* wincrypt.h:3499:19 */
+type PFN_CMSG_CNG_IMPORT_KEY_AGREE = uintptr           /* wincrypt.h:3500:19 */
+type PFN_CMSG_CNG_IMPORT_CONTENT_ENCRYPT_KEY = uintptr /* wincrypt.h:3501:19 */
 
-type HCERTSTORE = uintptr /* wincrypt.h:3267:16 */
+type HCERTSTORE = uintptr /* wincrypt.h:3505:16 */
 
 type _CERT_CONTEXT = struct {
 	FdwCertEncodingType DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FpbCertEncoded      uintptr
 	FcbCertEncoded      DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FpCertInfo          PCERT_INFO
 	FhCertStore         HCERTSTORE
-} /* wincrypt.h:3269:11 */
+} /* wincrypt.h:3507:11 */
 
-type CERT_CONTEXT = _CERT_CONTEXT /* wincrypt.h:3275:5 */
-type PCERT_CONTEXT = uintptr      /* wincrypt.h:3275:18 */
+type CERT_CONTEXT = _CERT_CONTEXT /* wincrypt.h:3513:5 */
+type PCERT_CONTEXT = uintptr      /* wincrypt.h:3513:18 */
 
-type PCCERT_CONTEXT = uintptr /* wincrypt.h:3277:30 */
+type PCCERT_CONTEXT = uintptr /* wincrypt.h:3515:30 */
 
 type _CRL_CONTEXT = struct {
 	FdwCertEncodingType DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FpbCrlEncoded       uintptr
 	FcbCrlEncoded       DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FpCrlInfo           PCRL_INFO
 	FhCertStore         HCERTSTORE
-} /* wincrypt.h:3280:11 */
+} /* wincrypt.h:3518:11 */
 
-type CRL_CONTEXT = _CRL_CONTEXT /* wincrypt.h:3286:5 */
-type PCRL_CONTEXT = uintptr     /* wincrypt.h:3286:17 */
+type CRL_CONTEXT = _CRL_CONTEXT /* wincrypt.h:3524:5 */
+type PCRL_CONTEXT = uintptr     /* wincrypt.h:3524:17 */
 
-type PCCRL_CONTEXT = uintptr /* wincrypt.h:3288:29 */
+type PCCRL_CONTEXT = uintptr /* wincrypt.h:3526:29 */
 
 type _CTL_CONTEXT = struct {
 	FdwMsgAndCertEncodingType DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FpbCtlEncoded             uintptr
 	FcbCtlEncoded             DWORD
-	_                         [4]byte
+	F__ccgo_pad2              [4]byte
 	FpCtlInfo                 PCTL_INFO
 	FhCertStore               HCERTSTORE
 	FhCryptMsg                HCRYPTMSG
 	FpbCtlContent             uintptr
 	FcbCtlContent             DWORD
-	_                         [4]byte
-} /* wincrypt.h:3290:11 */
+	F__ccgo_pad3              [4]byte
+} /* wincrypt.h:3528:11 */
+
+type CTL_CONTEXT = _CTL_CONTEXT /* wincrypt.h:3537:5 */
+type PCTL_CONTEXT = uintptr     /* wincrypt.h:3537:17 */
 
-type CTL_CONTEXT = _CTL_CONTEXT /* wincrypt.h:3299:5 */
-type PCTL_CONTEXT = uintptr     /* wincrypt.h:3299:17 */
+type PCCTL_CONTEXT = uintptr /* wincrypt.h:3539:29 */
 
-type PCCTL_CONTEXT = uintptr /* wincrypt.h:3301:29 */
+type CertKeyType = uint32 /* wincrypt.h:3666:5 */
 
 type _CRYPT_KEY_PROV_PARAM = struct {
-	FdwParam DWORD
-	_        [4]byte
-	FpbData  uintptr
-	FcbData  DWORD
-	FdwFlags DWORD
-} /* wincrypt.h:3414:11 */
+	FdwParam     DWORD
+	F__ccgo_pad1 [4]byte
+	FpbData      uintptr
+	FcbData      DWORD
+	FdwFlags     DWORD
+} /* wincrypt.h:3699:11 */
 
-type CRYPT_KEY_PROV_PARAM = _CRYPT_KEY_PROV_PARAM /* wincrypt.h:3419:5 */
-type PCRYPT_KEY_PROV_PARAM = uintptr              /* wincrypt.h:3419:26 */
+type CRYPT_KEY_PROV_PARAM = _CRYPT_KEY_PROV_PARAM /* wincrypt.h:3704:5 */
+type PCRYPT_KEY_PROV_PARAM = uintptr              /* wincrypt.h:3704:26 */
 
 type _CRYPT_KEY_PROV_INFO = struct {
 	FpwszContainerName LPWSTR
@@ -48799,75 +49324,75 @@ type _CRYPT_KEY_PROV_INFO = struct {
 	FdwProvType        DWORD
 	FdwFlags           DWORD
 	FcProvParam        DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FrgProvParam       PCRYPT_KEY_PROV_PARAM
 	FdwKeySpec         DWORD
-	_                  [4]byte
-} /* wincrypt.h:3421:11 */
+	F__ccgo_pad2       [4]byte
+} /* wincrypt.h:3706:11 */
 
-type CRYPT_KEY_PROV_INFO = _CRYPT_KEY_PROV_INFO /* wincrypt.h:3429:5 */
-type PCRYPT_KEY_PROV_INFO = uintptr             /* wincrypt.h:3429:25 */
+type CRYPT_KEY_PROV_INFO = _CRYPT_KEY_PROV_INFO /* wincrypt.h:3714:5 */
+type PCRYPT_KEY_PROV_INFO = uintptr             /* wincrypt.h:3714:25 */
 
 type _CERT_KEY_CONTEXT = struct {
-	FcbSize    DWORD
-	_          [4]byte
-	F__8       struct{ FhCryptProv HCRYPTPROV }
-	FdwKeySpec DWORD
-	_          [4]byte
-} /* wincrypt.h:3436:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	F__8         struct{ FhCryptProv HCRYPTPROV }
+	FdwKeySpec   DWORD
+	F__ccgo_pad2 [4]byte
+} /* wincrypt.h:3721:11 */
 
-type CERT_KEY_CONTEXT = _CERT_KEY_CONTEXT /* wincrypt.h:3443:5 */
-type PCERT_KEY_CONTEXT = uintptr          /* wincrypt.h:3443:22 */
+type CERT_KEY_CONTEXT = _CERT_KEY_CONTEXT /* wincrypt.h:3728:5 */
+type PCERT_KEY_CONTEXT = uintptr          /* wincrypt.h:3728:22 */
 
 type _ROOT_INFO_LUID = struct {
 	FLowPart  DWORD
 	FHighPart LONG
-} /* wincrypt.h:3445:11 */
+} /* wincrypt.h:3730:11 */
 
-type ROOT_INFO_LUID = _ROOT_INFO_LUID /* wincrypt.h:3448:5 */
-type PROOT_INFO_LUID = uintptr        /* wincrypt.h:3448:20 */
+type ROOT_INFO_LUID = _ROOT_INFO_LUID /* wincrypt.h:3733:5 */
+type PROOT_INFO_LUID = uintptr        /* wincrypt.h:3733:20 */
 
 type _CRYPT_SMART_CARD_ROOT_INFO = struct {
 	FrgbCardID [16]BYTE
 	Fluid      ROOT_INFO_LUID
-} /* wincrypt.h:3450:11 */
+} /* wincrypt.h:3735:11 */
 
-type CRYPT_SMART_CARD_ROOT_INFO = _CRYPT_SMART_CARD_ROOT_INFO /* wincrypt.h:3453:5 */
-type PCRYPT_SMART_CARD_ROOT_INFO = uintptr                    /* wincrypt.h:3453:32 */
+type CRYPT_SMART_CARD_ROOT_INFO = _CRYPT_SMART_CARD_ROOT_INFO /* wincrypt.h:3738:5 */
+type PCRYPT_SMART_CARD_ROOT_INFO = uintptr                    /* wincrypt.h:3738:32 */
 
 type _CERT_SYSTEM_STORE_RELOCATE_PARA = struct {
 	F__0 struct{ FhKeyBase HKEY }
 	F__8 struct{ FpvSystemStore uintptr }
-} /* wincrypt.h:3529:11 */
+} /* wincrypt.h:3814:11 */
 
-type CERT_SYSTEM_STORE_RELOCATE_PARA = _CERT_SYSTEM_STORE_RELOCATE_PARA /* wincrypt.h:3539:5 */
-type PCERT_SYSTEM_STORE_RELOCATE_PARA = uintptr                         /* wincrypt.h:3539:37 */
+type CERT_SYSTEM_STORE_RELOCATE_PARA = _CERT_SYSTEM_STORE_RELOCATE_PARA /* wincrypt.h:3824:5 */
+type PCERT_SYSTEM_STORE_RELOCATE_PARA = uintptr                         /* wincrypt.h:3824:37 */
 
 type _CERT_REGISTRY_STORE_CLIENT_GPT_PARA = struct {
 	FhKeyBase    HKEY
 	FpwszRegPath LPWSTR
-} /* wincrypt.h:3633:11 */
+} /* wincrypt.h:3937:11 */
 
-type CERT_REGISTRY_STORE_CLIENT_GPT_PARA = _CERT_REGISTRY_STORE_CLIENT_GPT_PARA /* wincrypt.h:3636:5 */
-type PCERT_REGISTRY_STORE_CLIENT_GPT_PARA = uintptr                             /* wincrypt.h:3636:41 */
+type CERT_REGISTRY_STORE_CLIENT_GPT_PARA = _CERT_REGISTRY_STORE_CLIENT_GPT_PARA /* wincrypt.h:3940:5 */
+type PCERT_REGISTRY_STORE_CLIENT_GPT_PARA = uintptr                             /* wincrypt.h:3940:41 */
 
 type _CERT_REGISTRY_STORE_ROAMING_PARA = struct {
 	FhKey               HKEY
 	FpwszStoreDirectory LPWSTR
-} /* wincrypt.h:3640:11 */
+} /* wincrypt.h:3944:11 */
 
-type CERT_REGISTRY_STORE_ROAMING_PARA = _CERT_REGISTRY_STORE_ROAMING_PARA /* wincrypt.h:3643:5 */
-type PCERT_REGISTRY_STORE_ROAMING_PARA = uintptr                          /* wincrypt.h:3643:38 */
+type CERT_REGISTRY_STORE_ROAMING_PARA = _CERT_REGISTRY_STORE_ROAMING_PARA /* wincrypt.h:3947:5 */
+type PCERT_REGISTRY_STORE_ROAMING_PARA = uintptr                          /* wincrypt.h:3947:38 */
 
 type _CERT_LDAP_STORE_OPENED_PARA = struct {
 	FpvLdapSessionHandle uintptr
 	FpwszLdapUrl         LPCWSTR
-} /* wincrypt.h:3655:11 */
+} /* wincrypt.h:3959:11 */
 
-type CERT_LDAP_STORE_OPENED_PARA = _CERT_LDAP_STORE_OPENED_PARA /* wincrypt.h:3658:5 */
-type PCERT_LDAP_STORE_OPENED_PARA = uintptr                     /* wincrypt.h:3658:33 */
+type CERT_LDAP_STORE_OPENED_PARA = _CERT_LDAP_STORE_OPENED_PARA /* wincrypt.h:3962:5 */
+type PCERT_LDAP_STORE_OPENED_PARA = uintptr                     /* wincrypt.h:3962:33 */
 
-type HCERTSTOREPROV = uintptr /* wincrypt.h:3664:16 */
+type HCERTSTOREPROV = uintptr /* wincrypt.h:3968:16 */
 
 type _CERT_STORE_PROV_INFO = struct {
 	FcbSize              DWORD
@@ -48875,29 +49400,29 @@ type _CERT_STORE_PROV_INFO = struct {
 	FrgpvStoreProvFunc   uintptr
 	FhStoreProv          HCERTSTOREPROV
 	FdwStoreProvFlags    DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FhStoreProvFuncAddr2 HCRYPTOIDFUNCADDR
-} /* wincrypt.h:3668:11 */
-
-type CERT_STORE_PROV_INFO = _CERT_STORE_PROV_INFO /* wincrypt.h:3675:5 */
-type PCERT_STORE_PROV_INFO = uintptr              /* wincrypt.h:3675:26 */
-
-type PFN_CERT_DLL_OPEN_STORE_PROV_FUNC = uintptr /* wincrypt.h:3677:19 */
-
-type PFN_CERT_STORE_PROV_CLOSE = uintptr             /* wincrypt.h:3713:16 */
-type PFN_CERT_STORE_PROV_READ_CERT = uintptr         /* wincrypt.h:3714:19 */
-type PFN_CERT_STORE_PROV_WRITE_CERT = uintptr        /* wincrypt.h:3715:19 */
-type PFN_CERT_STORE_PROV_DELETE_CERT = uintptr       /* wincrypt.h:3716:19 */
-type PFN_CERT_STORE_PROV_SET_CERT_PROPERTY = uintptr /* wincrypt.h:3717:19 */
-type PFN_CERT_STORE_PROV_READ_CRL = uintptr          /* wincrypt.h:3718:19 */
-type PFN_CERT_STORE_PROV_WRITE_CRL = uintptr         /* wincrypt.h:3719:19 */
-type PFN_CERT_STORE_PROV_DELETE_CRL = uintptr        /* wincrypt.h:3720:19 */
-type PFN_CERT_STORE_PROV_SET_CRL_PROPERTY = uintptr  /* wincrypt.h:3721:19 */
-type PFN_CERT_STORE_PROV_READ_CTL = uintptr          /* wincrypt.h:3722:19 */
-type PFN_CERT_STORE_PROV_WRITE_CTL = uintptr         /* wincrypt.h:3723:19 */
-type PFN_CERT_STORE_PROV_DELETE_CTL = uintptr        /* wincrypt.h:3724:19 */
-type PFN_CERT_STORE_PROV_SET_CTL_PROPERTY = uintptr  /* wincrypt.h:3725:19 */
-type PFN_CERT_STORE_PROV_CONTROL = uintptr           /* wincrypt.h:3726:19 */
+} /* wincrypt.h:3972:11 */
+
+type CERT_STORE_PROV_INFO = _CERT_STORE_PROV_INFO /* wincrypt.h:3979:5 */
+type PCERT_STORE_PROV_INFO = uintptr              /* wincrypt.h:3979:26 */
+
+type PFN_CERT_DLL_OPEN_STORE_PROV_FUNC = uintptr /* wincrypt.h:3981:19 */
+
+type PFN_CERT_STORE_PROV_CLOSE = uintptr             /* wincrypt.h:4017:16 */
+type PFN_CERT_STORE_PROV_READ_CERT = uintptr         /* wincrypt.h:4018:19 */
+type PFN_CERT_STORE_PROV_WRITE_CERT = uintptr        /* wincrypt.h:4019:19 */
+type PFN_CERT_STORE_PROV_DELETE_CERT = uintptr       /* wincrypt.h:4020:19 */
+type PFN_CERT_STORE_PROV_SET_CERT_PROPERTY = uintptr /* wincrypt.h:4021:19 */
+type PFN_CERT_STORE_PROV_READ_CRL = uintptr          /* wincrypt.h:4022:19 */
+type PFN_CERT_STORE_PROV_WRITE_CRL = uintptr         /* wincrypt.h:4023:19 */
+type PFN_CERT_STORE_PROV_DELETE_CRL = uintptr        /* wincrypt.h:4024:19 */
+type PFN_CERT_STORE_PROV_SET_CRL_PROPERTY = uintptr  /* wincrypt.h:4025:19 */
+type PFN_CERT_STORE_PROV_READ_CTL = uintptr          /* wincrypt.h:4026:19 */
+type PFN_CERT_STORE_PROV_WRITE_CTL = uintptr         /* wincrypt.h:4027:19 */
+type PFN_CERT_STORE_PROV_DELETE_CTL = uintptr        /* wincrypt.h:4028:19 */
+type PFN_CERT_STORE_PROV_SET_CTL_PROPERTY = uintptr  /* wincrypt.h:4029:19 */
+type PFN_CERT_STORE_PROV_CONTROL = uintptr           /* wincrypt.h:4030:19 */
 
 type _CERT_STORE_PROV_FIND_INFO = struct {
 	FcbSize                   DWORD
@@ -48905,147 +49430,147 @@ type _CERT_STORE_PROV_FIND_INFO = struct {
 	FdwFindFlags              DWORD
 	FdwFindType               DWORD
 	FpvFindPara               uintptr
-} /* wincrypt.h:3728:11 */
+} /* wincrypt.h:4032:11 */
 
-type CERT_STORE_PROV_FIND_INFO = _CERT_STORE_PROV_FIND_INFO /* wincrypt.h:3734:5 */
-type PCERT_STORE_PROV_FIND_INFO = uintptr                   /* wincrypt.h:3734:31 */
+type CERT_STORE_PROV_FIND_INFO = _CERT_STORE_PROV_FIND_INFO /* wincrypt.h:4038:5 */
+type PCERT_STORE_PROV_FIND_INFO = uintptr                   /* wincrypt.h:4038:31 */
 
-type CCERT_STORE_PROV_FIND_INFO = CERT_STORE_PROV_FIND_INFO /* wincrypt.h:3736:43 */
-type PCCERT_STORE_PROV_FIND_INFO = uintptr                  /* wincrypt.h:3736:70 */
+type CCERT_STORE_PROV_FIND_INFO = CERT_STORE_PROV_FIND_INFO /* wincrypt.h:4040:43 */
+type PCCERT_STORE_PROV_FIND_INFO = uintptr                  /* wincrypt.h:4040:70 */
 
-type PFN_CERT_STORE_PROV_FIND_CERT = uintptr         /* wincrypt.h:3738:19 */
-type PFN_CERT_STORE_PROV_FREE_FIND_CERT = uintptr    /* wincrypt.h:3739:19 */
-type PFN_CERT_STORE_PROV_GET_CERT_PROPERTY = uintptr /* wincrypt.h:3740:19 */
-type PFN_CERT_STORE_PROV_FIND_CRL = uintptr          /* wincrypt.h:3741:19 */
-type PFN_CERT_STORE_PROV_FREE_FIND_CRL = uintptr     /* wincrypt.h:3742:19 */
-type PFN_CERT_STORE_PROV_GET_CRL_PROPERTY = uintptr  /* wincrypt.h:3743:19 */
-type PFN_CERT_STORE_PROV_FIND_CTL = uintptr          /* wincrypt.h:3744:19 */
-type PFN_CERT_STORE_PROV_FREE_FIND_CTL = uintptr     /* wincrypt.h:3745:19 */
-type PFN_CERT_STORE_PROV_GET_CTL_PROPERTY = uintptr  /* wincrypt.h:3746:19 */
+type PFN_CERT_STORE_PROV_FIND_CERT = uintptr         /* wincrypt.h:4042:19 */
+type PFN_CERT_STORE_PROV_FREE_FIND_CERT = uintptr    /* wincrypt.h:4043:19 */
+type PFN_CERT_STORE_PROV_GET_CERT_PROPERTY = uintptr /* wincrypt.h:4044:19 */
+type PFN_CERT_STORE_PROV_FIND_CRL = uintptr          /* wincrypt.h:4045:19 */
+type PFN_CERT_STORE_PROV_FREE_FIND_CRL = uintptr     /* wincrypt.h:4046:19 */
+type PFN_CERT_STORE_PROV_GET_CRL_PROPERTY = uintptr  /* wincrypt.h:4047:19 */
+type PFN_CERT_STORE_PROV_FIND_CTL = uintptr          /* wincrypt.h:4048:19 */
+type PFN_CERT_STORE_PROV_FREE_FIND_CTL = uintptr     /* wincrypt.h:4049:19 */
+type PFN_CERT_STORE_PROV_GET_CTL_PROPERTY = uintptr  /* wincrypt.h:4050:19 */
 
 type _CRL_FIND_ISSUED_FOR_PARA = struct {
 	FpSubjectCert PCCERT_CONTEXT
 	FpIssuerCert  PCCERT_CONTEXT
-} /* wincrypt.h:3848:11 */
+} /* wincrypt.h:4152:11 */
 
-type CRL_FIND_ISSUED_FOR_PARA = _CRL_FIND_ISSUED_FOR_PARA /* wincrypt.h:3851:5 */
-type PCRL_FIND_ISSUED_FOR_PARA = uintptr                  /* wincrypt.h:3851:30 */
+type CRL_FIND_ISSUED_FOR_PARA = _CRL_FIND_ISSUED_FOR_PARA /* wincrypt.h:4155:5 */
+type PCRL_FIND_ISSUED_FOR_PARA = uintptr                  /* wincrypt.h:4155:30 */
 
 type _CTL_ANY_SUBJECT_INFO = struct {
 	FSubjectAlgorithm  CRYPT_ALGORITHM_IDENTIFIER
 	FSubjectIdentifier CRYPT_DATA_BLOB
-} /* wincrypt.h:3853:11 */
+} /* wincrypt.h:4157:11 */
 
-type CTL_ANY_SUBJECT_INFO = _CTL_ANY_SUBJECT_INFO /* wincrypt.h:3856:5 */
-type PCTL_ANY_SUBJECT_INFO = uintptr              /* wincrypt.h:3856:26 */
+type CTL_ANY_SUBJECT_INFO = _CTL_ANY_SUBJECT_INFO /* wincrypt.h:4160:5 */
+type PCTL_ANY_SUBJECT_INFO = uintptr              /* wincrypt.h:4160:26 */
 
 type _CTL_FIND_USAGE_PARA = struct {
 	FcbSize         DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FSubjectUsage   CTL_USAGE
 	FListIdentifier CRYPT_DATA_BLOB
 	FpSigner        PCERT_INFO
-} /* wincrypt.h:3968:11 */
+} /* wincrypt.h:4272:11 */
 
-type CTL_FIND_USAGE_PARA = _CTL_FIND_USAGE_PARA /* wincrypt.h:3973:5 */
-type PCTL_FIND_USAGE_PARA = uintptr             /* wincrypt.h:3973:25 */
+type CTL_FIND_USAGE_PARA = _CTL_FIND_USAGE_PARA /* wincrypt.h:4277:5 */
+type PCTL_FIND_USAGE_PARA = uintptr             /* wincrypt.h:4277:25 */
 
 type _CTL_FIND_SUBJECT_PARA = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpUsagePara    PCTL_FIND_USAGE_PARA
 	FdwSubjectType DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FpvSubject     uintptr
-} /* wincrypt.h:3975:11 */
+} /* wincrypt.h:4279:11 */
 
-type CTL_FIND_SUBJECT_PARA = _CTL_FIND_SUBJECT_PARA /* wincrypt.h:3980:5 */
-type PCTL_FIND_SUBJECT_PARA = uintptr               /* wincrypt.h:3980:27 */
+type CTL_FIND_SUBJECT_PARA = _CTL_FIND_SUBJECT_PARA /* wincrypt.h:4284:5 */
+type PCTL_FIND_SUBJECT_PARA = uintptr               /* wincrypt.h:4284:27 */
 
-type PFN_CERT_CREATE_CONTEXT_SORT_FUNC = uintptr /* wincrypt.h:3982:19 */
+type PFN_CERT_CREATE_CONTEXT_SORT_FUNC = uintptr /* wincrypt.h:4286:19 */
 
 type _CERT_CREATE_CONTEXT_PARA = struct {
-	FcbSize  DWORD
-	_        [4]byte
-	FpfnFree PFN_CRYPT_FREE
-	FpvFree  uintptr
-	FpfnSort PFN_CERT_CREATE_CONTEXT_SORT_FUNC
-	FpvSort  uintptr
-} /* wincrypt.h:3984:11 */
+	FcbSize      DWORD
+	F__ccgo_pad1 [4]byte
+	FpfnFree     PFN_CRYPT_FREE
+	FpvFree      uintptr
+	FpfnSort     PFN_CERT_CREATE_CONTEXT_SORT_FUNC
+	FpvSort      uintptr
+} /* wincrypt.h:4288:11 */
 
-type CERT_CREATE_CONTEXT_PARA = _CERT_CREATE_CONTEXT_PARA /* wincrypt.h:3990:5 */
-type PCERT_CREATE_CONTEXT_PARA = uintptr                  /* wincrypt.h:3990:30 */
+type CERT_CREATE_CONTEXT_PARA = _CERT_CREATE_CONTEXT_PARA /* wincrypt.h:4294:5 */
+type PCERT_CREATE_CONTEXT_PARA = uintptr                  /* wincrypt.h:4294:30 */
 
-type _CERT_SYSTEM_STORE_INFO = struct{ FcbSize DWORD } /* wincrypt.h:3992:11 */
+type _CERT_SYSTEM_STORE_INFO = struct{ FcbSize DWORD } /* wincrypt.h:4296:11 */
 
-type CERT_SYSTEM_STORE_INFO = _CERT_SYSTEM_STORE_INFO /* wincrypt.h:3994:5 */
-type PCERT_SYSTEM_STORE_INFO = uintptr                /* wincrypt.h:3994:28 */
+type CERT_SYSTEM_STORE_INFO = _CERT_SYSTEM_STORE_INFO /* wincrypt.h:4298:5 */
+type PCERT_SYSTEM_STORE_INFO = uintptr                /* wincrypt.h:4298:28 */
 
 type _CERT_PHYSICAL_STORE_INFO = struct {
 	FcbSize               DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FpszOpenStoreProvider LPSTR
 	FdwOpenEncodingType   DWORD
 	FdwOpenFlags          DWORD
 	FOpenParameters       CRYPT_DATA_BLOB
 	FdwFlags              DWORD
 	FdwPriority           DWORD
-} /* wincrypt.h:3996:11 */
+} /* wincrypt.h:4300:11 */
 
-type CERT_PHYSICAL_STORE_INFO = _CERT_PHYSICAL_STORE_INFO /* wincrypt.h:4004:5 */
-type PCERT_PHYSICAL_STORE_INFO = uintptr                  /* wincrypt.h:4004:30 */
+type CERT_PHYSICAL_STORE_INFO = _CERT_PHYSICAL_STORE_INFO /* wincrypt.h:4308:5 */
+type PCERT_PHYSICAL_STORE_INFO = uintptr                  /* wincrypt.h:4308:30 */
 
-type PFN_CERT_ENUM_SYSTEM_STORE_LOCATION = uintptr /* wincrypt.h:4024:19 */
-type PFN_CERT_ENUM_SYSTEM_STORE = uintptr          /* wincrypt.h:4025:19 */
-type PFN_CERT_ENUM_PHYSICAL_STORE = uintptr        /* wincrypt.h:4026:19 */
+type PFN_CERT_ENUM_SYSTEM_STORE_LOCATION = uintptr /* wincrypt.h:4328:19 */
+type PFN_CERT_ENUM_SYSTEM_STORE = uintptr          /* wincrypt.h:4329:19 */
+type PFN_CERT_ENUM_PHYSICAL_STORE = uintptr        /* wincrypt.h:4330:19 */
 
 type _CTL_VERIFY_USAGE_PARA = struct {
 	FcbSize         DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FListIdentifier CRYPT_DATA_BLOB
 	FcCtlStore      DWORD
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FrghCtlStore    uintptr
 	FcSignerStore   DWORD
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FrghSignerStore uintptr
-} /* wincrypt.h:4071:11 */
+} /* wincrypt.h:4375:11 */
 
-type CTL_VERIFY_USAGE_PARA = _CTL_VERIFY_USAGE_PARA /* wincrypt.h:4078:5 */
-type PCTL_VERIFY_USAGE_PARA = uintptr               /* wincrypt.h:4078:27 */
+type CTL_VERIFY_USAGE_PARA = _CTL_VERIFY_USAGE_PARA /* wincrypt.h:4382:5 */
+type PCTL_VERIFY_USAGE_PARA = uintptr               /* wincrypt.h:4382:27 */
 
 type _CTL_VERIFY_USAGE_STATUS = struct {
 	FcbSize          DWORD
 	FdwError         DWORD
 	FdwFlags         DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FppCtl           uintptr
 	FdwCtlEntryIndex DWORD
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FppSigner        uintptr
 	FdwSignerIndex   DWORD
-	_                [4]byte
-} /* wincrypt.h:4080:11 */
+	F__ccgo_pad3     [4]byte
+} /* wincrypt.h:4384:11 */
 
-type CTL_VERIFY_USAGE_STATUS = _CTL_VERIFY_USAGE_STATUS /* wincrypt.h:4088:5 */
-type PCTL_VERIFY_USAGE_STATUS = uintptr                 /* wincrypt.h:4088:29 */
+type CTL_VERIFY_USAGE_STATUS = _CTL_VERIFY_USAGE_STATUS /* wincrypt.h:4392:5 */
+type PCTL_VERIFY_USAGE_STATUS = uintptr                 /* wincrypt.h:4392:29 */
 
 type _CERT_REVOCATION_CRL_INFO = struct {
 	FcbSize           DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FpBaseCrlContext  PCCRL_CONTEXT
 	FpDeltaCrlContext PCCRL_CONTEXT
 	FpCrlEntry        PCRL_ENTRY
 	FfDeltaCrlEntry   WINBOOL
-	_                 [4]byte
-} /* wincrypt.h:4099:11 */
+	F__ccgo_pad2      [4]byte
+} /* wincrypt.h:4403:11 */
 
-type CERT_REVOCATION_CRL_INFO = _CERT_REVOCATION_CRL_INFO /* wincrypt.h:4105:5 */
-type PCERT_REVOCATION_CRL_INFO = uintptr                  /* wincrypt.h:4105:30 */
+type CERT_REVOCATION_CRL_INFO = _CERT_REVOCATION_CRL_INFO /* wincrypt.h:4409:5 */
+type PCERT_REVOCATION_CRL_INFO = uintptr                  /* wincrypt.h:4409:30 */
 
 type _CERT_REVOCATION_CHAIN_PARA = struct {
 	FcbSize                     DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FhChainEngine               HCERTCHAINENGINE
 	FhAdditionalStore           HCERTSTORE
 	FdwChainFlags               DWORD
@@ -49053,25 +49578,25 @@ type _CERT_REVOCATION_CHAIN_PARA = struct {
 	FpftCurrentTime             LPFILETIME
 	FpftCacheResync             LPFILETIME
 	FcbMaxUrlRetrievalByteCount DWORD
-	_                           [4]byte
-} /* wincrypt.h:4107:11 */
+	F__ccgo_pad2                [4]byte
+} /* wincrypt.h:4411:11 */
 
-type CERT_REVOCATION_CHAIN_PARA = _CERT_REVOCATION_CHAIN_PARA /* wincrypt.h:4107:46 */
-type PCERT_REVOCATION_CHAIN_PARA = uintptr                    /* wincrypt.h:4107:73 */
+type CERT_REVOCATION_CHAIN_PARA = _CERT_REVOCATION_CHAIN_PARA /* wincrypt.h:4411:46 */
+type PCERT_REVOCATION_CHAIN_PARA = uintptr                    /* wincrypt.h:4411:73 */
 
 type _CERT_REVOCATION_PARA = struct {
 	FcbSize       DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpIssuerCert  PCCERT_CONTEXT
 	FcCertStore   DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	FrgCertStore  uintptr
 	FhCrlStore    HCERTSTORE
 	FpftTimeToUse LPFILETIME
-} /* wincrypt.h:4109:11 */
+} /* wincrypt.h:4413:11 */
 
-type CERT_REVOCATION_PARA = _CERT_REVOCATION_PARA /* wincrypt.h:4125:5 */
-type PCERT_REVOCATION_PARA = uintptr              /* wincrypt.h:4125:26 */
+type CERT_REVOCATION_PARA = _CERT_REVOCATION_PARA /* wincrypt.h:4429:5 */
+type PCERT_REVOCATION_PARA = uintptr              /* wincrypt.h:4429:26 */
 
 type _CERT_REVOCATION_STATUS = struct {
 	FcbSize            DWORD
@@ -49080,40 +49605,40 @@ type _CERT_REVOCATION_STATUS = struct {
 	FdwReason          DWORD
 	FfHasFreshnessTime WINBOOL
 	FdwFreshnessTime   DWORD
-} /* wincrypt.h:4127:11 */
+} /* wincrypt.h:4431:11 */
 
-type CERT_REVOCATION_STATUS = _CERT_REVOCATION_STATUS /* wincrypt.h:4134:5 */
-type PCERT_REVOCATION_STATUS = uintptr                /* wincrypt.h:4134:28 */
+type CERT_REVOCATION_STATUS = _CERT_REVOCATION_STATUS /* wincrypt.h:4438:5 */
+type PCERT_REVOCATION_STATUS = uintptr                /* wincrypt.h:4438:28 */
 
 type _CRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO = struct {
 	FCertSignHashCNGAlgPropData        CRYPT_DATA_BLOB
 	FCertIssuerPubKeyBitLengthPropData CRYPT_DATA_BLOB
-} /* wincrypt.h:4171:11 */
+} /* wincrypt.h:4475:11 */
 
-type CRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO = _CRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO /* wincrypt.h:4174:5 */
-type PCRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO = uintptr                                       /* wincrypt.h:4174:52 */
+type CRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO = _CRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO /* wincrypt.h:4478:5 */
+type PCRYPT_VERIFY_CERT_SIGN_STRONG_PROPERTIES_INFO = uintptr                                       /* wincrypt.h:4478:52 */
 
-type PFN_CRYPT_EXTRACT_ENCODED_SIGNATURE_PARAMETERS_FUNC = uintptr /* wincrypt.h:4176:19 */
-type PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC = uintptr                 /* wincrypt.h:4177:19 */
-type PFN_CRYPT_VERIFY_ENCODED_SIGNATURE_FUNC = uintptr             /* wincrypt.h:4178:19 */
+type PFN_CRYPT_EXTRACT_ENCODED_SIGNATURE_PARAMETERS_FUNC = uintptr /* wincrypt.h:4480:19 */
+type PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC = uintptr                 /* wincrypt.h:4481:19 */
+type PFN_CRYPT_VERIFY_ENCODED_SIGNATURE_FUNC = uintptr             /* wincrypt.h:4482:19 */
 
-type HCRYPTDEFAULTCONTEXT = uintptr /* wincrypt.h:4180:16 */
+type HCRYPTDEFAULTCONTEXT = uintptr /* wincrypt.h:4484:16 */
 
 type _CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA = struct {
-	FcOID     DWORD
-	_         [4]byte
-	FrgpszOID uintptr
-} /* wincrypt.h:4182:11 */
+	FcOID        DWORD
+	F__ccgo_pad1 [4]byte
+	FrgpszOID    uintptr
+} /* wincrypt.h:4486:11 */
 
-type CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA = _CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA /* wincrypt.h:4185:5 */
-type PCRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA = uintptr                              /* wincrypt.h:4185:42 */
+type CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA = _CRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA /* wincrypt.h:4489:5 */
+type PCRYPT_DEFAULT_CONTEXT_MULTI_OID_PARA = uintptr                              /* wincrypt.h:4489:42 */
 
-type PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC = uintptr /* wincrypt.h:4222:19 */
+type PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC = uintptr /* wincrypt.h:4526:19 */
 
-type PFN_IMPORT_PRIV_KEY_FUNC = uintptr /* wincrypt.h:4254:19 */
-type PFN_EXPORT_PRIV_KEY_FUNC = uintptr /* wincrypt.h:4255:19 */
+type PFN_IMPORT_PRIV_KEY_FUNC = uintptr /* wincrypt.h:4558:19 */
+type PFN_EXPORT_PRIV_KEY_FUNC = uintptr /* wincrypt.h:4559:19 */
 
-type PFN_CRYPT_GET_SIGNER_CERTIFICATE = uintptr /* wincrypt.h:4323:26 */
+type PFN_CRYPT_GET_SIGNER_CERTIFICATE = uintptr /* wincrypt.h:4627:26 */
 
 type _CRYPT_SIGN_MESSAGE_PARA = struct {
 	FcbSize             DWORD
@@ -49122,23 +49647,23 @@ type _CRYPT_SIGN_MESSAGE_PARA = struct {
 	FHashAlgorithm      CRYPT_ALGORITHM_IDENTIFIER
 	FpvHashAuxInfo      uintptr
 	FcMsgCert           DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FrgpMsgCert         uintptr
 	FcMsgCrl            DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FrgpMsgCrl          uintptr
 	FcAuthAttr          DWORD
-	_                   [4]byte
+	F__ccgo_pad3        [4]byte
 	FrgAuthAttr         PCRYPT_ATTRIBUTE
 	FcUnauthAttr        DWORD
-	_                   [4]byte
+	F__ccgo_pad4        [4]byte
 	FrgUnauthAttr       PCRYPT_ATTRIBUTE
 	FdwFlags            DWORD
 	FdwInnerContentType DWORD
-} /* wincrypt.h:4325:11 */
+} /* wincrypt.h:4629:11 */
 
-type CRYPT_SIGN_MESSAGE_PARA = _CRYPT_SIGN_MESSAGE_PARA /* wincrypt.h:4345:5 */
-type PCRYPT_SIGN_MESSAGE_PARA = uintptr                 /* wincrypt.h:4345:29 */
+type CRYPT_SIGN_MESSAGE_PARA = _CRYPT_SIGN_MESSAGE_PARA /* wincrypt.h:4649:5 */
+type PCRYPT_SIGN_MESSAGE_PARA = uintptr                 /* wincrypt.h:4649:29 */
 
 type _CRYPT_VERIFY_MESSAGE_PARA = struct {
 	FcbSize                   DWORD
@@ -49146,10 +49671,10 @@ type _CRYPT_VERIFY_MESSAGE_PARA = struct {
 	FhCryptProv               HCRYPTPROV_LEGACY
 	FpfnGetSignerCertificate  PFN_CRYPT_GET_SIGNER_CERTIFICATE
 	FpvGetArg                 uintptr
-} /* wincrypt.h:4352:11 */
+} /* wincrypt.h:4656:11 */
 
-type CRYPT_VERIFY_MESSAGE_PARA = _CRYPT_VERIFY_MESSAGE_PARA /* wincrypt.h:4361:5 */
-type PCRYPT_VERIFY_MESSAGE_PARA = uintptr                   /* wincrypt.h:4361:31 */
+type CRYPT_VERIFY_MESSAGE_PARA = _CRYPT_VERIFY_MESSAGE_PARA /* wincrypt.h:4665:5 */
+type PCRYPT_VERIFY_MESSAGE_PARA = uintptr                   /* wincrypt.h:4665:31 */
 
 type _CRYPT_ENCRYPT_MESSAGE_PARA = struct {
 	FcbSize                     DWORD
@@ -49159,21 +49684,21 @@ type _CRYPT_ENCRYPT_MESSAGE_PARA = struct {
 	FpvEncryptionAuxInfo        uintptr
 	FdwFlags                    DWORD
 	FdwInnerContentType         DWORD
-} /* wincrypt.h:4363:11 */
+} /* wincrypt.h:4667:11 */
 
-type CRYPT_ENCRYPT_MESSAGE_PARA = _CRYPT_ENCRYPT_MESSAGE_PARA /* wincrypt.h:4371:5 */
-type PCRYPT_ENCRYPT_MESSAGE_PARA = uintptr                    /* wincrypt.h:4371:32 */
+type CRYPT_ENCRYPT_MESSAGE_PARA = _CRYPT_ENCRYPT_MESSAGE_PARA /* wincrypt.h:4675:5 */
+type PCRYPT_ENCRYPT_MESSAGE_PARA = uintptr                    /* wincrypt.h:4675:32 */
 
 type _CRYPT_DECRYPT_MESSAGE_PARA = struct {
 	FcbSize                   DWORD
 	FdwMsgAndCertEncodingType DWORD
 	FcCertStore               DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FrghCertStore             uintptr
-} /* wincrypt.h:4375:11 */
+} /* wincrypt.h:4679:11 */
 
-type CRYPT_DECRYPT_MESSAGE_PARA = _CRYPT_DECRYPT_MESSAGE_PARA /* wincrypt.h:4383:5 */
-type PCRYPT_DECRYPT_MESSAGE_PARA = uintptr                    /* wincrypt.h:4383:32 */
+type CRYPT_DECRYPT_MESSAGE_PARA = _CRYPT_DECRYPT_MESSAGE_PARA /* wincrypt.h:4687:5 */
+type PCRYPT_DECRYPT_MESSAGE_PARA = uintptr                    /* wincrypt.h:4687:32 */
 
 type _CRYPT_HASH_MESSAGE_PARA = struct {
 	FcbSize            DWORD
@@ -49181,91 +49706,91 @@ type _CRYPT_HASH_MESSAGE_PARA = struct {
 	FhCryptProv        HCRYPTPROV_LEGACY
 	FHashAlgorithm     CRYPT_ALGORITHM_IDENTIFIER
 	FpvHashAuxInfo     uintptr
-} /* wincrypt.h:4385:11 */
+} /* wincrypt.h:4689:11 */
 
-type CRYPT_HASH_MESSAGE_PARA = _CRYPT_HASH_MESSAGE_PARA /* wincrypt.h:4391:5 */
-type PCRYPT_HASH_MESSAGE_PARA = uintptr                 /* wincrypt.h:4391:29 */
+type CRYPT_HASH_MESSAGE_PARA = _CRYPT_HASH_MESSAGE_PARA /* wincrypt.h:4695:5 */
+type PCRYPT_HASH_MESSAGE_PARA = uintptr                 /* wincrypt.h:4695:29 */
 
 type _CRYPT_KEY_SIGN_MESSAGE_PARA = struct {
 	FcbSize                   DWORD
 	FdwMsgAndCertEncodingType DWORD
 	F__8                      struct{ FhCryptProv HCRYPTPROV }
 	FdwKeySpec                DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FHashAlgorithm            CRYPT_ALGORITHM_IDENTIFIER
 	FpvHashAuxInfo            uintptr
 	FPubKeyAlgorithm          CRYPT_ALGORITHM_IDENTIFIER
-} /* wincrypt.h:4393:11 */
+} /* wincrypt.h:4697:11 */
 
-type CRYPT_KEY_SIGN_MESSAGE_PARA = _CRYPT_KEY_SIGN_MESSAGE_PARA /* wincrypt.h:4404:5 */
-type PCRYPT_KEY_SIGN_MESSAGE_PARA = uintptr                     /* wincrypt.h:4404:33 */
+type CRYPT_KEY_SIGN_MESSAGE_PARA = _CRYPT_KEY_SIGN_MESSAGE_PARA /* wincrypt.h:4708:5 */
+type PCRYPT_KEY_SIGN_MESSAGE_PARA = uintptr                     /* wincrypt.h:4708:33 */
 
 type _CRYPT_KEY_VERIFY_MESSAGE_PARA = struct {
 	FcbSize            DWORD
 	FdwMsgEncodingType DWORD
 	FhCryptProv        HCRYPTPROV_LEGACY
-} /* wincrypt.h:4406:11 */
+} /* wincrypt.h:4710:11 */
 
-type CRYPT_KEY_VERIFY_MESSAGE_PARA = _CRYPT_KEY_VERIFY_MESSAGE_PARA /* wincrypt.h:4410:5 */
-type PCRYPT_KEY_VERIFY_MESSAGE_PARA = uintptr                       /* wincrypt.h:4410:35 */
+type CRYPT_KEY_VERIFY_MESSAGE_PARA = _CRYPT_KEY_VERIFY_MESSAGE_PARA /* wincrypt.h:4714:5 */
+type PCRYPT_KEY_VERIFY_MESSAGE_PARA = uintptr                       /* wincrypt.h:4714:35 */
 
 type _CERT_CHAIN = struct {
 	FcCerts         DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	Fcerts          PCERT_BLOB
 	FkeyLocatorInfo CRYPT_KEY_PROV_INFO
-} /* wincrypt.h:4412:11 */
+} /* wincrypt.h:4716:11 */
 
-type CERT_CHAIN = _CERT_CHAIN /* wincrypt.h:4416:5 */
-type PCERT_CHAIN = uintptr    /* wincrypt.h:4416:16 */
+type CERT_CHAIN = _CERT_CHAIN /* wincrypt.h:4720:5 */
+type PCERT_CHAIN = uintptr    /* wincrypt.h:4720:16 */
 
-type HCRYPTASYNC = HANDLE                      /* wincrypt.h:4489:18 */
-type PHCRYPTASYNC = uintptr                    /* wincrypt.h:4489:30 */
-type PFN_CRYPT_ASYNC_PARAM_FREE_FUNC = uintptr /* wincrypt.h:4490:16 */
+type HCRYPTASYNC = HANDLE                      /* wincrypt.h:4793:18 */
+type PHCRYPTASYNC = uintptr                    /* wincrypt.h:4793:30 */
+type PFN_CRYPT_ASYNC_PARAM_FREE_FUNC = uintptr /* wincrypt.h:4794:16 */
 
 type _CRYPT_BLOB_ARRAY = struct {
-	FcBlob  DWORD
-	_       [4]byte
-	FrgBlob PCRYPT_DATA_BLOB
-} /* wincrypt.h:4500:11 */
+	FcBlob       DWORD
+	F__ccgo_pad1 [4]byte
+	FrgBlob      PCRYPT_DATA_BLOB
+} /* wincrypt.h:4804:11 */
 
-type CRYPT_BLOB_ARRAY = _CRYPT_BLOB_ARRAY /* wincrypt.h:4503:5 */
-type PCRYPT_BLOB_ARRAY = uintptr          /* wincrypt.h:4503:22 */
+type CRYPT_BLOB_ARRAY = _CRYPT_BLOB_ARRAY /* wincrypt.h:4807:5 */
+type PCRYPT_BLOB_ARRAY = uintptr          /* wincrypt.h:4807:22 */
 
 type _CRYPT_CREDENTIALS = struct {
 	FcbSize            DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpszCredentialsOid LPCSTR
 	FpvCredentials     LPVOID
-} /* wincrypt.h:4505:11 */
+} /* wincrypt.h:4809:11 */
 
-type CRYPT_CREDENTIALS = _CRYPT_CREDENTIALS /* wincrypt.h:4509:5 */
-type PCRYPT_CREDENTIALS = uintptr           /* wincrypt.h:4509:23 */
+type CRYPT_CREDENTIALS = _CRYPT_CREDENTIALS /* wincrypt.h:4813:5 */
+type PCRYPT_CREDENTIALS = uintptr           /* wincrypt.h:4813:23 */
 
 type _CRYPT_PASSWORD_CREDENTIALSA = struct {
 	FcbSize      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpszUsername LPSTR
 	FpszPassword LPSTR
-} /* wincrypt.h:4516:11 */
+} /* wincrypt.h:4820:11 */
 
-type CRYPT_PASSWORD_CREDENTIALSA = _CRYPT_PASSWORD_CREDENTIALSA /* wincrypt.h:4520:5 */
-type PCRYPT_PASSWORD_CREDENTIALSA = uintptr                     /* wincrypt.h:4520:33 */
+type CRYPT_PASSWORD_CREDENTIALSA = _CRYPT_PASSWORD_CREDENTIALSA /* wincrypt.h:4824:5 */
+type PCRYPT_PASSWORD_CREDENTIALSA = uintptr                     /* wincrypt.h:4824:33 */
 
 type _CRYPT_PASSWORD_CREDENTIALSW = struct {
 	FcbSize      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpszUsername LPWSTR
 	FpszPassword LPWSTR
-} /* wincrypt.h:4522:11 */
+} /* wincrypt.h:4826:11 */
 
-type CRYPT_PASSWORD_CREDENTIALSW = _CRYPT_PASSWORD_CREDENTIALSW /* wincrypt.h:4526:5 */
-type PCRYPT_PASSWORD_CREDENTIALSW = uintptr                     /* wincrypt.h:4526:33 */
+type CRYPT_PASSWORD_CREDENTIALSW = _CRYPT_PASSWORD_CREDENTIALSW /* wincrypt.h:4830:5 */
+type PCRYPT_PASSWORD_CREDENTIALSW = uintptr                     /* wincrypt.h:4830:33 */
 
-type CRYPT_PASSWORD_CREDENTIALS = CRYPT_PASSWORD_CREDENTIALSA   /* wincrypt.h:4528:55 */
-type PCRYPT_PASSWORD_CREDENTIALS = PCRYPT_PASSWORD_CREDENTIALSA /* wincrypt.h:4529:56 */
+type CRYPT_PASSWORD_CREDENTIALS = CRYPT_PASSWORD_CREDENTIALSA   /* wincrypt.h:4832:55 */
+type PCRYPT_PASSWORD_CREDENTIALS = PCRYPT_PASSWORD_CREDENTIALSA /* wincrypt.h:4833:56 */
 
-type PFN_FREE_ENCODED_OBJECT_FUNC = uintptr /* wincrypt.h:4535:16 */
+type PFN_FREE_ENCODED_OBJECT_FUNC = uintptr /* wincrypt.h:4839:16 */
 
 type _CRYPTNET_URL_CACHE_PRE_FETCH_INFO = struct {
 	FcbSize         DWORD
@@ -49275,19 +49800,19 @@ type _CRYPTNET_URL_CACHE_PRE_FETCH_INFO = struct {
 	FThisUpdateTime FILETIME
 	FNextUpdateTime FILETIME
 	FPublishTime    FILETIME
-} /* wincrypt.h:4572:11 */
+} /* wincrypt.h:4878:11 */
 
-type CRYPTNET_URL_CACHE_PRE_FETCH_INFO = _CRYPTNET_URL_CACHE_PRE_FETCH_INFO /* wincrypt.h:4580:5 */
-type PCRYPTNET_URL_CACHE_PRE_FETCH_INFO = uintptr                           /* wincrypt.h:4580:39 */
+type CRYPTNET_URL_CACHE_PRE_FETCH_INFO = _CRYPTNET_URL_CACHE_PRE_FETCH_INFO /* wincrypt.h:4886:5 */
+type PCRYPTNET_URL_CACHE_PRE_FETCH_INFO = uintptr                           /* wincrypt.h:4886:39 */
 
 type _CRYPTNET_URL_CACHE_FLUSH_INFO = struct {
 	FcbSize          DWORD
 	FdwExemptSeconds DWORD
 	FExpireTime      FILETIME
-} /* wincrypt.h:4589:11 */
+} /* wincrypt.h:4896:11 */
 
-type CRYPTNET_URL_CACHE_FLUSH_INFO = _CRYPTNET_URL_CACHE_FLUSH_INFO /* wincrypt.h:4593:5 */
-type PCRYPTNET_URL_CACHE_FLUSH_INFO = uintptr                       /* wincrypt.h:4593:35 */
+type CRYPTNET_URL_CACHE_FLUSH_INFO = _CRYPTNET_URL_CACHE_FLUSH_INFO /* wincrypt.h:4900:5 */
+type PCRYPTNET_URL_CACHE_FLUSH_INFO = uintptr                       /* wincrypt.h:4900:35 */
 
 type _CRYPTNET_URL_CACHE_RESPONSE_INFO = struct {
 	FcbSize           DWORD
@@ -49295,21 +49820,21 @@ type _CRYPTNET_URL_CACHE_RESPONSE_INFO = struct {
 	FwResponseFlags   WORD
 	FLastModifiedTime FILETIME
 	FdwMaxAge         DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FpwszETag         LPCWSTR
 	FdwProxyId        DWORD
-	_                 [4]byte
-} /* wincrypt.h:4598:11 */
+	F__ccgo_pad2      [4]byte
+} /* wincrypt.h:4905:11 */
 
-type CRYPTNET_URL_CACHE_RESPONSE_INFO = _CRYPTNET_URL_CACHE_RESPONSE_INFO /* wincrypt.h:4606:5 */
-type PCRYPTNET_URL_CACHE_RESPONSE_INFO = uintptr                          /* wincrypt.h:4606:38 */
+type CRYPTNET_URL_CACHE_RESPONSE_INFO = _CRYPTNET_URL_CACHE_RESPONSE_INFO /* wincrypt.h:4913:5 */
+type PCRYPTNET_URL_CACHE_RESPONSE_INFO = uintptr                          /* wincrypt.h:4913:38 */
 
 type _CRYPT_RETRIEVE_AUX_INFO = struct {
 	FcbSize                     DWORD
-	_                           [4]byte
+	F__ccgo_pad1                [4]byte
 	FpLastSyncTime              uintptr
 	FdwMaxUrlRetrievalByteCount DWORD
-	_                           [4]byte
+	F__ccgo_pad2                [4]byte
 	FpPreFetchInfo              PCRYPTNET_URL_CACHE_PRE_FETCH_INFO
 	FpFlushInfo                 PCRYPTNET_URL_CACHE_FLUSH_INFO
 	FppResponseInfo             uintptr
@@ -49317,54 +49842,54 @@ type _CRYPT_RETRIEVE_AUX_INFO = struct {
 	FpftCacheResync             LPFILETIME
 	FfProxyCacheRetrieval       WINBOOL
 	FdwHttpStatusCode           DWORD
-} /* wincrypt.h:4613:11 */
+} /* wincrypt.h:4920:11 */
 
-type CRYPT_RETRIEVE_AUX_INFO = _CRYPT_RETRIEVE_AUX_INFO /* wincrypt.h:4624:5 */
-type PCRYPT_RETRIEVE_AUX_INFO = uintptr                 /* wincrypt.h:4624:29 */
+type CRYPT_RETRIEVE_AUX_INFO = _CRYPT_RETRIEVE_AUX_INFO /* wincrypt.h:4931:5 */
+type PCRYPT_RETRIEVE_AUX_INFO = uintptr                 /* wincrypt.h:4931:29 */
 
-type PFN_CRYPT_CANCEL_RETRIEVAL = uintptr /* wincrypt.h:4631:19 */
+type PFN_CRYPT_CANCEL_RETRIEVAL = uintptr /* wincrypt.h:4940:19 */
 
-type PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC = uintptr /* wincrypt.h:4639:16 */
+type PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC = uintptr /* wincrypt.h:4948:16 */
 
 type _CRYPT_ASYNC_RETRIEVAL_COMPLETION = struct {
 	FpfnCompletion PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC
 	FpvCompletion  LPVOID
-} /* wincrypt.h:4641:11 */
+} /* wincrypt.h:4950:11 */
 
-type CRYPT_ASYNC_RETRIEVAL_COMPLETION = _CRYPT_ASYNC_RETRIEVAL_COMPLETION /* wincrypt.h:4644:5 */
-type PCRYPT_ASYNC_RETRIEVAL_COMPLETION = uintptr                          /* wincrypt.h:4644:38 */
+type CRYPT_ASYNC_RETRIEVAL_COMPLETION = _CRYPT_ASYNC_RETRIEVAL_COMPLETION /* wincrypt.h:4953:5 */
+type PCRYPT_ASYNC_RETRIEVAL_COMPLETION = uintptr                          /* wincrypt.h:4953:38 */
 
-type PFN_CANCEL_ASYNC_RETRIEVAL_FUNC = uintptr /* wincrypt.h:4648:19 */
+type PFN_CANCEL_ASYNC_RETRIEVAL_FUNC = uintptr /* wincrypt.h:4957:19 */
 
 type _CRYPT_URL_ARRAY = struct {
-	FcUrl     DWORD
-	_         [4]byte
-	FrgwszUrl uintptr
-} /* wincrypt.h:4655:11 */
+	FcUrl        DWORD
+	F__ccgo_pad1 [4]byte
+	FrgwszUrl    uintptr
+} /* wincrypt.h:4964:11 */
 
-type CRYPT_URL_ARRAY = _CRYPT_URL_ARRAY /* wincrypt.h:4658:5 */
-type PCRYPT_URL_ARRAY = uintptr         /* wincrypt.h:4658:21 */
+type CRYPT_URL_ARRAY = _CRYPT_URL_ARRAY /* wincrypt.h:4967:5 */
+type PCRYPT_URL_ARRAY = uintptr         /* wincrypt.h:4967:21 */
 
 type _CRYPT_URL_INFO = struct {
 	FcbSize          DWORD
 	FdwSyncDeltaTime DWORD
 	FcGroup          DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FrgcGroupEntry   uintptr
-} /* wincrypt.h:4660:11 */
+} /* wincrypt.h:4969:11 */
 
-type CRYPT_URL_INFO = _CRYPT_URL_INFO /* wincrypt.h:4665:5 */
-type PCRYPT_URL_INFO = uintptr        /* wincrypt.h:4665:20 */
+type CRYPT_URL_INFO = _CRYPT_URL_INFO /* wincrypt.h:4974:5 */
+type PCRYPT_URL_INFO = uintptr        /* wincrypt.h:4974:20 */
 
 type _CERT_CRL_CONTEXT_PAIR = struct {
 	FpCertContext PCCERT_CONTEXT
 	FpCrlContext  PCCRL_CONTEXT
-} /* wincrypt.h:4685:11 */
+} /* wincrypt.h:4994:11 */
 
-type CERT_CRL_CONTEXT_PAIR = _CERT_CRL_CONTEXT_PAIR /* wincrypt.h:4688:5 */
-type PCERT_CRL_CONTEXT_PAIR = uintptr               /* wincrypt.h:4688:27 */
+type CERT_CRL_CONTEXT_PAIR = _CERT_CRL_CONTEXT_PAIR /* wincrypt.h:4997:5 */
+type PCERT_CRL_CONTEXT_PAIR = uintptr               /* wincrypt.h:4997:27 */
 
-type PCCERT_CRL_CONTEXT_PAIR = uintptr /* wincrypt.h:4690:39 */
+type PCCERT_CRL_CONTEXT_PAIR = uintptr /* wincrypt.h:4999:39 */
 
 type _CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = struct {
 	FcbSize             DWORD
@@ -49374,40 +49899,40 @@ type _CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = struct {
 	FpMaxAgeTime        LPFILETIME
 	FpChainPara         PCERT_REVOCATION_CHAIN_PARA
 	FpDeltaCrlIndicator PCRYPT_INTEGER_BLOB
-} /* wincrypt.h:4692:11 */
+} /* wincrypt.h:5001:11 */
 
-type CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = _CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO /* wincrypt.h:4700:5 */
-type PCRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = uintptr                                /* wincrypt.h:4700:45 */
+type CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = _CRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO /* wincrypt.h:5009:5 */
+type PCRYPT_GET_TIME_VALID_OBJECT_EXTRA_INFO = uintptr                                /* wincrypt.h:5009:45 */
 
-type PFN_CRYPT_ENUM_KEYID_PROP = uintptr /* wincrypt.h:4702:19 */
+type PFN_CRYPT_ENUM_KEYID_PROP = uintptr /* wincrypt.h:5011:19 */
 
-type HCERTCHAINENGINE = HANDLE /* wincrypt.h:4838:18 */
+type HCERTCHAINENGINE = HANDLE /* wincrypt.h:5243:18 */
 
 type _CERT_CHAIN_ENGINE_CONFIG = struct {
 	FcbSize                    DWORD
-	_                          [4]byte
+	F__ccgo_pad1               [4]byte
 	FhRestrictedRoot           HCERTSTORE
 	FhRestrictedTrust          HCERTSTORE
 	FhRestrictedOther          HCERTSTORE
 	FcAdditionalStore          DWORD
-	_                          [4]byte
+	F__ccgo_pad2               [4]byte
 	FrghAdditionalStore        uintptr
 	FdwFlags                   DWORD
 	FdwUrlRetrievalTimeout     DWORD
 	FMaximumCachedCertificates DWORD
 	FCycleDetectionModulus     DWORD
-} /* wincrypt.h:4840:11 */
+} /* wincrypt.h:5245:11 */
 
-type CERT_CHAIN_ENGINE_CONFIG = _CERT_CHAIN_ENGINE_CONFIG /* wincrypt.h:4858:5 */
-type PCERT_CHAIN_ENGINE_CONFIG = uintptr                  /* wincrypt.h:4858:30 */
+type CERT_CHAIN_ENGINE_CONFIG = _CERT_CHAIN_ENGINE_CONFIG /* wincrypt.h:5263:5 */
+type PCERT_CHAIN_ENGINE_CONFIG = uintptr                  /* wincrypt.h:5263:30 */
 
 type _CERT_TRUST_STATUS = struct {
 	FdwErrorStatus DWORD
 	FdwInfoStatus  DWORD
-} /* wincrypt.h:4868:11 */
+} /* wincrypt.h:5273:11 */
 
-type CERT_TRUST_STATUS = _CERT_TRUST_STATUS /* wincrypt.h:4871:5 */
-type PCERT_TRUST_STATUS = uintptr           /* wincrypt.h:4871:23 */
+type CERT_TRUST_STATUS = _CERT_TRUST_STATUS /* wincrypt.h:5276:5 */
+type PCERT_TRUST_STATUS = uintptr           /* wincrypt.h:5276:23 */
 
 type _CERT_REVOCATION_INFO = struct {
 	FcbSize             DWORD
@@ -49417,36 +49942,36 @@ type _CERT_REVOCATION_INFO = struct {
 	FfHasFreshnessTime  WINBOOL
 	FdwFreshnessTime    DWORD
 	FpCrlInfo           PCERT_REVOCATION_CRL_INFO
-} /* wincrypt.h:4918:11 */
+} /* wincrypt.h:5332:11 */
 
-type CERT_REVOCATION_INFO = _CERT_REVOCATION_INFO /* wincrypt.h:4926:5 */
-type PCERT_REVOCATION_INFO = uintptr              /* wincrypt.h:4926:26 */
+type CERT_REVOCATION_INFO = _CERT_REVOCATION_INFO /* wincrypt.h:5340:5 */
+type PCERT_REVOCATION_INFO = uintptr              /* wincrypt.h:5340:26 */
 
 type _CERT_TRUST_LIST_INFO = struct {
 	FcbSize      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpCtlEntry   PCTL_ENTRY
 	FpCtlContext PCCTL_CONTEXT
-} /* wincrypt.h:4928:11 */
+} /* wincrypt.h:5342:11 */
 
-type CERT_TRUST_LIST_INFO = _CERT_TRUST_LIST_INFO /* wincrypt.h:4932:5 */
-type PCERT_TRUST_LIST_INFO = uintptr              /* wincrypt.h:4932:26 */
+type CERT_TRUST_LIST_INFO = _CERT_TRUST_LIST_INFO /* wincrypt.h:5346:5 */
+type PCERT_TRUST_LIST_INFO = uintptr              /* wincrypt.h:5346:26 */
 
 type _CERT_CHAIN_ELEMENT = struct {
 	FcbSize                DWORD
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FpCertContext          PCCERT_CONTEXT
 	FTrustStatus           CERT_TRUST_STATUS
 	FpRevocationInfo       PCERT_REVOCATION_INFO
 	FpIssuanceUsage        PCERT_ENHKEY_USAGE
 	FpApplicationUsage     PCERT_ENHKEY_USAGE
 	FpwszExtendedErrorInfo LPCWSTR
-} /* wincrypt.h:4934:11 */
+} /* wincrypt.h:5348:11 */
 
-type CERT_CHAIN_ELEMENT = _CERT_CHAIN_ELEMENT /* wincrypt.h:4942:5 */
-type PCERT_CHAIN_ELEMENT = uintptr            /* wincrypt.h:4942:24 */
+type CERT_CHAIN_ELEMENT = _CERT_CHAIN_ELEMENT /* wincrypt.h:5356:5 */
+type PCERT_CHAIN_ELEMENT = uintptr            /* wincrypt.h:5356:24 */
 
-type PCCERT_CHAIN_ELEMENT = uintptr /* wincrypt.h:4944:36 */
+type PCCERT_CHAIN_ELEMENT = uintptr /* wincrypt.h:5358:36 */
 
 type _CERT_SIMPLE_CHAIN = struct {
 	FcbSize                      DWORD
@@ -49456,12 +49981,12 @@ type _CERT_SIMPLE_CHAIN = struct {
 	FpTrustListInfo              PCERT_TRUST_LIST_INFO
 	FfHasRevocationFreshnessTime WINBOOL
 	FdwRevocationFreshnessTime   DWORD
-} /* wincrypt.h:4946:11 */
+} /* wincrypt.h:5360:11 */
 
-type CERT_SIMPLE_CHAIN = _CERT_SIMPLE_CHAIN /* wincrypt.h:4954:5 */
-type PCERT_SIMPLE_CHAIN = uintptr           /* wincrypt.h:4954:23 */
+type CERT_SIMPLE_CHAIN = _CERT_SIMPLE_CHAIN /* wincrypt.h:5368:5 */
+type PCERT_SIMPLE_CHAIN = uintptr           /* wincrypt.h:5368:23 */
 
-type PCCERT_SIMPLE_CHAIN = uintptr /* wincrypt.h:4956:35 */
+type PCCERT_SIMPLE_CHAIN = uintptr /* wincrypt.h:5370:35 */
 
 type _CERT_CHAIN_CONTEXT = struct {
 	FcbSize                      DWORD
@@ -49469,83 +49994,83 @@ type _CERT_CHAIN_CONTEXT = struct {
 	FcChain                      DWORD
 	FrgpChain                    uintptr
 	FcLowerQualityChainContext   DWORD
-	_                            [4]byte
+	F__ccgo_pad1                 [4]byte
 	FrgpLowerQualityChainContext uintptr
 	FfHasRevocationFreshnessTime WINBOOL
 	FdwRevocationFreshnessTime   DWORD
 	FdwCreateFlags               DWORD
 	FChainId                     GUID
-	_                            [4]byte
-} /* wincrypt.h:4958:11 */
+	F__ccgo_pad2                 [4]byte
+} /* wincrypt.h:5372:11 */
 
-type CERT_CHAIN_CONTEXT = _CERT_CHAIN_CONTEXT /* wincrypt.h:4958:38 */
-type PCERT_CHAIN_CONTEXT = uintptr            /* wincrypt.h:4958:57 */
-type PCCERT_CHAIN_CONTEXT = uintptr           /* wincrypt.h:4959:36 */
+type CERT_CHAIN_CONTEXT = _CERT_CHAIN_CONTEXT /* wincrypt.h:5372:38 */
+type PCERT_CHAIN_CONTEXT = uintptr            /* wincrypt.h:5372:57 */
+type PCCERT_CHAIN_CONTEXT = uintptr           /* wincrypt.h:5373:36 */
 
 type _CERT_USAGE_MATCH = struct {
-	FdwType DWORD
-	_       [4]byte
-	FUsage  CERT_ENHKEY_USAGE
-} /* wincrypt.h:4977:11 */
+	FdwType      DWORD
+	F__ccgo_pad1 [4]byte
+	FUsage       CERT_ENHKEY_USAGE
+} /* wincrypt.h:5391:11 */
 
-type CERT_USAGE_MATCH = _CERT_USAGE_MATCH /* wincrypt.h:4980:5 */
-type PCERT_USAGE_MATCH = uintptr          /* wincrypt.h:4980:22 */
+type CERT_USAGE_MATCH = _CERT_USAGE_MATCH /* wincrypt.h:5394:5 */
+type PCERT_USAGE_MATCH = uintptr          /* wincrypt.h:5394:22 */
 
 type _CTL_USAGE_MATCH = struct {
-	FdwType DWORD
-	_       [4]byte
-	FUsage  CTL_USAGE
-} /* wincrypt.h:4982:11 */
+	FdwType      DWORD
+	F__ccgo_pad1 [4]byte
+	FUsage       CTL_USAGE
+} /* wincrypt.h:5396:11 */
 
-type CTL_USAGE_MATCH = _CTL_USAGE_MATCH /* wincrypt.h:4985:5 */
-type PCTL_USAGE_MATCH = uintptr         /* wincrypt.h:4985:21 */
+type CTL_USAGE_MATCH = _CTL_USAGE_MATCH /* wincrypt.h:5399:5 */
+type PCTL_USAGE_MATCH = uintptr         /* wincrypt.h:5399:21 */
 
 type _CERT_CHAIN_PARA = struct {
 	FcbSize         DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FRequestedUsage CERT_USAGE_MATCH
-} /* wincrypt.h:4987:11 */
+} /* wincrypt.h:5401:11 */
 
-type CERT_CHAIN_PARA = _CERT_CHAIN_PARA /* wincrypt.h:4999:5 */
-type PCERT_CHAIN_PARA = uintptr         /* wincrypt.h:4999:21 */
+type CERT_CHAIN_PARA = _CERT_CHAIN_PARA /* wincrypt.h:5413:5 */
+type PCERT_CHAIN_PARA = uintptr         /* wincrypt.h:5413:21 */
 
 type _CRL_REVOCATION_INFO = struct {
 	FpCrlEntry       PCRL_ENTRY
 	FpCrlContext     PCCRL_CONTEXT
 	FpCrlIssuerChain PCCERT_CHAIN_CONTEXT
-} /* wincrypt.h:5033:11 */
+} /* wincrypt.h:5451:11 */
 
-type CRL_REVOCATION_INFO = _CRL_REVOCATION_INFO /* wincrypt.h:5037:5 */
-type PCRL_REVOCATION_INFO = uintptr             /* wincrypt.h:5037:25 */
+type CRL_REVOCATION_INFO = _CRL_REVOCATION_INFO /* wincrypt.h:5455:5 */
+type PCRL_REVOCATION_INFO = uintptr             /* wincrypt.h:5455:25 */
 
-type PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK = uintptr /* wincrypt.h:5043:19 */
+type PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK = uintptr /* wincrypt.h:5461:19 */
 
 type _CERT_CHAIN_FIND_BY_ISSUER_PARA = struct {
 	FcbSize                   DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 	FpszUsageIdentifier       LPCSTR
 	FdwKeySpec                DWORD
 	FdwAcquirePrivateKeyFlags DWORD
 	FcIssuer                  DWORD
-	_                         [4]byte
+	F__ccgo_pad2              [4]byte
 	FrgIssuer                 uintptr
 	FpfnFindCallback          PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK
 	FpvFindArg                uintptr
-} /* wincrypt.h:5045:11 */
+} /* wincrypt.h:5463:11 */
 
-type CERT_CHAIN_FIND_ISSUER_PARA = _CERT_CHAIN_FIND_BY_ISSUER_PARA    /* wincrypt.h:5058:5 */
-type PCERT_CHAIN_FIND_ISSUER_PARA = uintptr                           /* wincrypt.h:5058:33 */
-type CERT_CHAIN_FIND_BY_ISSUER_PARA = _CERT_CHAIN_FIND_BY_ISSUER_PARA /* wincrypt.h:5058:63 */
-type PCERT_CHAIN_FIND_BY_ISSUER_PARA = uintptr                        /* wincrypt.h:5058:94 */
+type CERT_CHAIN_FIND_ISSUER_PARA = _CERT_CHAIN_FIND_BY_ISSUER_PARA    /* wincrypt.h:5476:5 */
+type PCERT_CHAIN_FIND_ISSUER_PARA = uintptr                           /* wincrypt.h:5476:33 */
+type CERT_CHAIN_FIND_BY_ISSUER_PARA = _CERT_CHAIN_FIND_BY_ISSUER_PARA /* wincrypt.h:5476:63 */
+type PCERT_CHAIN_FIND_BY_ISSUER_PARA = uintptr                        /* wincrypt.h:5476:94 */
 
 type _CERT_CHAIN_POLICY_PARA = struct {
 	FcbSize            DWORD
 	FdwFlags           DWORD
 	FpvExtraPolicyPara uintptr
-} /* wincrypt.h:5067:11 */
+} /* wincrypt.h:5485:11 */
 
-type CERT_CHAIN_POLICY_PARA = _CERT_CHAIN_POLICY_PARA /* wincrypt.h:5071:5 */
-type PCERT_CHAIN_POLICY_PARA = uintptr                /* wincrypt.h:5071:28 */
+type CERT_CHAIN_POLICY_PARA = _CERT_CHAIN_POLICY_PARA /* wincrypt.h:5489:5 */
+type PCERT_CHAIN_POLICY_PARA = uintptr                /* wincrypt.h:5489:28 */
 
 type _CERT_CHAIN_POLICY_STATUS = struct {
 	FcbSize              DWORD
@@ -49553,73 +50078,122 @@ type _CERT_CHAIN_POLICY_STATUS = struct {
 	FlChainIndex         LONG
 	FlElementIndex       LONG
 	FpvExtraPolicyStatus uintptr
-} /* wincrypt.h:5073:11 */
+} /* wincrypt.h:5491:11 */
 
-type CERT_CHAIN_POLICY_STATUS = _CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5079:5 */
-type PCERT_CHAIN_POLICY_STATUS = uintptr                  /* wincrypt.h:5079:30 */
+type CERT_CHAIN_POLICY_STATUS = _CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5497:5 */
+type PCERT_CHAIN_POLICY_STATUS = uintptr                  /* wincrypt.h:5497:30 */
 
 type _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA = struct {
 	FcbSize              DWORD
 	FdwRegPolicySettings DWORD
 	FpSignerInfo         PCMSG_SIGNER_INFO
-} /* wincrypt.h:5118:11 */
+} /* wincrypt.h:5540:11 */
 
-type AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA = _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5122:5 */
-type PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                   /* wincrypt.h:5122:48 */
+type AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA = _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5544:5 */
+type PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                   /* wincrypt.h:5544:48 */
 
 type _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS = struct {
 	FcbSize      DWORD
 	FfCommercial WINBOOL
-} /* wincrypt.h:5124:11 */
+} /* wincrypt.h:5546:11 */
 
-type AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS = _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5127:5 */
-type PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                                     /* wincrypt.h:5127:50 */
+type AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS = _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5549:5 */
+type PAUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                                     /* wincrypt.h:5549:50 */
 
 type _AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA = struct {
 	FcbSize              DWORD
 	FdwRegPolicySettings DWORD
 	FfCommercial         WINBOOL
-} /* wincrypt.h:5129:11 */
+} /* wincrypt.h:5551:11 */
 
-type AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA = _AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5133:5 */
-type PAUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                      /* wincrypt.h:5133:50 */
+type AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA = _AUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5555:5 */
+type PAUTHENTICODE_TS_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                      /* wincrypt.h:5555:50 */
 
 type _HTTPSPolicyCallbackData = struct {
 	F__0            struct{ FcbStruct DWORD }
 	FdwAuthType     DWORD
 	FfdwChecks      DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FpwszServerName uintptr
-} /* wincrypt.h:5138:11 */
+} /* wincrypt.h:5560:11 */
 
-type HTTPSPolicyCallbackData = _HTTPSPolicyCallbackData          /* wincrypt.h:5146:5 */
-type PHTTPSPolicyCallbackData = uintptr                          /* wincrypt.h:5146:29 */
-type SSL_EXTRA_CERT_CHAIN_POLICY_PARA = _HTTPSPolicyCallbackData /* wincrypt.h:5146:55 */
-type PSSL_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                 /* wincrypt.h:5146:88 */
+type HTTPSPolicyCallbackData = _HTTPSPolicyCallbackData          /* wincrypt.h:5568:5 */
+type PHTTPSPolicyCallbackData = uintptr                          /* wincrypt.h:5568:29 */
+type SSL_EXTRA_CERT_CHAIN_POLICY_PARA = _HTTPSPolicyCallbackData /* wincrypt.h:5568:55 */
+type PSSL_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                 /* wincrypt.h:5568:88 */
 
 type _EV_EXTRA_CERT_CHAIN_POLICY_PARA = struct {
 	FcbSize                      DWORD
 	FdwRootProgramQualifierFlags DWORD
-} /* wincrypt.h:5153:11 */
+} /* wincrypt.h:5576:11 */
 
-type EV_EXTRA_CERT_CHAIN_POLICY_PARA = _EV_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5156:5 */
-type PEV_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                         /* wincrypt.h:5156:37 */
+type EV_EXTRA_CERT_CHAIN_POLICY_PARA = _EV_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5579:5 */
+type PEV_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                         /* wincrypt.h:5579:37 */
 
 type _EV_EXTRA_CERT_CHAIN_POLICY_STATUS = struct {
 	FcbSize               DWORD
 	FdwQualifiers         DWORD
 	FdwIssuanceUsageIndex DWORD
-} /* wincrypt.h:5158:11 */
+} /* wincrypt.h:5581:11 */
+
+type EV_EXTRA_CERT_CHAIN_POLICY_STATUS = _EV_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5585:5 */
+type PEV_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                           /* wincrypt.h:5585:39 */
 
-type EV_EXTRA_CERT_CHAIN_POLICY_STATUS = _EV_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5162:5 */
-type PEV_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                           /* wincrypt.h:5162:39 */
+type _SSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS = struct {
+	FcbSize          DWORD
+	FdwErrorLevel    DWORD
+	FdwErrorCategory DWORD
+	FdwReserved      DWORD
+	FwszErrorText    [256]WCHAR
+} /* wincrypt.h:5588:11 */
+
+type SSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS = _SSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5594:5 */
+type PSSL_F12_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                                /* wincrypt.h:5594:45 */
+
+type _SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA = struct {
+	FcbSize         DWORD
+	FdwReserved     DWORD
+	FpwszServerName LPWSTR
+	FrgpszHpkpValue [2]LPSTR
+} /* wincrypt.h:5608:11 */
+
+type SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA = _SSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5613:5 */
+type PSSL_HPKP_HEADER_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                      /* wincrypt.h:5613:51 */
+
+type _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA = struct {
+	FcbSize         DWORD
+	FdwReserved     DWORD
+	FpwszServerName PCWSTR
+} /* wincrypt.h:5615:11 */
+
+type SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA = _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA /* wincrypt.h:5619:5 */
+type PSSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_PARA = uintptr                                  /* wincrypt.h:5619:47 */
+
+type _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS = struct {
+	FcbSize       DWORD
+	FlError       LONG
+	FwszErrorText [512]WCHAR
+} /* wincrypt.h:5622:11 */
+
+type SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS = _SSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS /* wincrypt.h:5626:5 */
+type PSSL_KEY_PIN_EXTRA_CERT_CHAIN_POLICY_STATUS = uintptr                                    /* wincrypt.h:5626:49 */
 
 type _CRYPT_PKCS12_PBE_PARAMS = struct {
 	FiIterations int32
 	FcbSalt      ULONG
-} /* wincrypt.h:5199:11 */
+} /* wincrypt.h:5677:11 */
+
+type CRYPT_PKCS12_PBE_PARAMS = _CRYPT_PKCS12_PBE_PARAMS /* wincrypt.h:5680:5 */
+
+type _PKCS12_PBES2_EXPORT_PARAMS = struct {
+	FdwSize            DWORD
+	F__ccgo_pad1       [4]byte
+	FhNcryptDescriptor PVOID
+	FpwszPbes2Alg      LPWSTR
+} /* wincrypt.h:5729:11 */
 
-type CRYPT_PKCS12_PBE_PARAMS = _CRYPT_PKCS12_PBE_PARAMS /* wincrypt.h:5202:5 */
+type PKCS12_PBES2_EXPORT_PARAMS = _PKCS12_PBES2_EXPORT_PARAMS /* wincrypt.h:5733:5 */
+type PPKCS12_PBES2_EXPORT_PARAMS = uintptr                    /* wincrypt.h:5733:33 */
 
 // *
 // This file is part of the mingw-w64 runtime package.
@@ -49659,18 +50233,18 @@ type EFS_CERTIFICATE_BLOB = _CERTIFICATE_BLOB /* winefs.h:22:5 */
 type PEFS_CERTIFICATE_BLOB = uintptr          /* winefs.h:22:26 */
 
 type _EFS_HASH_BLOB = struct {
-	FcbData DWORD
-	_       [4]byte
-	FpbData PBYTE
+	FcbData      DWORD
+	F__ccgo_pad1 [4]byte
+	FpbData      PBYTE
 } /* winefs.h:24:11 */
 
 type EFS_HASH_BLOB = _EFS_HASH_BLOB /* winefs.h:27:5 */
 type PEFS_HASH_BLOB = uintptr       /* winefs.h:27:19 */
 
 type _EFS_RPC_BLOB = struct {
-	FcbData DWORD
-	_       [4]byte
-	FpbData PBYTE
+	FcbData      DWORD
+	F__ccgo_pad1 [4]byte
+	FpbData      PBYTE
 } /* winefs.h:29:11 */
 
 type EFS_RPC_BLOB = _EFS_RPC_BLOB /* winefs.h:32:5 */
@@ -49688,7 +50262,7 @@ type PEFS_KEY_INFO = uintptr      /* winefs.h:39:18 */
 
 type _ENCRYPTION_CERTIFICATE = struct {
 	FcbTotalLength DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpUserSid      uintptr
 	FpCertBlob     PEFS_CERTIFICATE_BLOB
 } /* winefs.h:41:11 */
@@ -49698,7 +50272,7 @@ type PENCRYPTION_CERTIFICATE = uintptr                /* winefs.h:45:28 */
 
 type _ENCRYPTION_CERTIFICATE_HASH = struct {
 	FcbTotalLength        DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FpUserSid             uintptr
 	FpHash                PEFS_HASH_BLOB
 	FlpDisplayInformation LPWSTR
@@ -49708,18 +50282,18 @@ type ENCRYPTION_CERTIFICATE_HASH = _ENCRYPTION_CERTIFICATE_HASH /* winefs.h:54:5
 type PENCRYPTION_CERTIFICATE_HASH = uintptr                     /* winefs.h:54:33 */
 
 type _ENCRYPTION_CERTIFICATE_HASH_LIST = struct {
-	FnCert_Hash DWORD
-	_           [4]byte
-	FpUsers     uintptr
+	FnCert_Hash  DWORD
+	F__ccgo_pad1 [4]byte
+	FpUsers      uintptr
 } /* winefs.h:56:11 */
 
 type ENCRYPTION_CERTIFICATE_HASH_LIST = _ENCRYPTION_CERTIFICATE_HASH_LIST /* winefs.h:59:5 */
 type PENCRYPTION_CERTIFICATE_HASH_LIST = uintptr                          /* winefs.h:59:38 */
 
 type _ENCRYPTION_CERTIFICATE_LIST = struct {
-	FnUsers DWORD
-	_       [4]byte
-	FpUsers uintptr
+	FnUsers      DWORD
+	F__ccgo_pad1 [4]byte
+	FpUsers      uintptr
 } /* winefs.h:61:11 */
 
 type ENCRYPTION_CERTIFICATE_LIST = _ENCRYPTION_CERTIFICATE_LIST /* winefs.h:64:5 */
@@ -49735,7 +50309,7 @@ type PENCRYPTION_CERTIFICATE_LIST = uintptr                     /* winefs.h:64:3
 // 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 1.6 from include/wtypes.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -49817,7 +50391,7 @@ type NDR_NOTIFY2_ROUTINE = uintptr /* rpcndr.h:141:16 */
 
 type _SCONTEXT_QUEUE = struct {
 	FNumberOfObjects uint32
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FArrayOfObjects  uintptr
 } /* rpcndr.h:143:11 */
 
@@ -49842,12 +50416,12 @@ type _MIDL_STUB_MESSAGE = struct {
 	FpAllocAllNodesContext  uintptr
 	FpPointerQueueState     uintptr
 	FIgnoreEmbeddedPointers int32
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FPointerBufferMark      uintptr
 	FfBufferValid           uint8
 	FuFlags                 uint8
 	FUniquePtrCount         uint16
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	FMaxCount               ULONG_PTR
 	FOffset                 uint32
 	FActualCount            uint32
@@ -49862,13 +50436,13 @@ type _MIDL_STUB_MESSAGE = struct {
 	FFullPtrRefId           uint32
 	FPointerLength          uint32
 	FfInDontFree            uint32 /* int fInDontFree: 1, int fDontCallFreeInst: 1, int fInOnlyParam: 1, int fHasReturn: 1, int fHasExtensions: 1, int fHasNewCorrDesc: 1, int fIsOicfServer: 1, int fHasMemoryValidateCallback: 1, int fUnused: 8, int fUnused2: 16 */
-	_                       [4]byte
+	F__ccgo_pad3            [4]byte
 	FdwDestContext          uint32
-	_                       [4]byte
+	F__ccgo_pad4            [4]byte
 	FpvDestContext          uintptr
 	FSavedContextHandles    uintptr
 	FParamNumber            int32
-	_                       [4]byte
+	F__ccgo_pad5            [4]byte
 	FpRpcChannelBuffer      uintptr
 	FpArrayInfo             PARRAY_INFO
 	FSizePtrCountArray      uintptr
@@ -49876,7 +50450,7 @@ type _MIDL_STUB_MESSAGE = struct {
 	FSizePtrLengthArray     uintptr
 	FpArgQueue              uintptr
 	FdwStubPhase            uint32
-	_                       [4]byte
+	F__ccgo_pad6            [4]byte
 	FLowStackMark           uintptr
 	FpAsyncMsg              PNDR_ASYNC_MESSAGE
 	FpCorrInfo              PNDR_CORRELATION_INFO
@@ -49908,7 +50482,7 @@ type _MIDL_STUB_DESC = struct {
 	FVersion                     uint32
 	FpMallocFreeStruct           uintptr
 	FMIDLVersion                 int32
-	_                            [4]byte
+	F__ccgo_pad1                 [4]byte
 	FCommFaultOffsets            uintptr
 	FaUserMarshalQuadruple       uintptr
 	FNotifyRoutineTable          uintptr
@@ -49923,7 +50497,7 @@ type _FULL_PTR_XLAT_TABLES = struct {
 		FXlatTable       uintptr
 		FStateTable      uintptr
 		FNumberOfEntries uint32
-		_                [4]byte
+		F__ccgo_pad1     [4]byte
 	}
 	FPointerToRefId struct {
 		FXlatTable       uintptr
@@ -49941,7 +50515,7 @@ type PFORMAT_STRING = uintptr /* rpcndr.h:218:31 */
 
 type ARRAY_INFO = struct {
 	FDimension             int32
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FBufferConformanceMark uintptr
 	FBufferVarianceMark    uintptr
 	FMaxCountArray         uintptr
@@ -49961,7 +50535,7 @@ type CS_STUB_INFO = struct {
 
 type _MIDL_SYNTAX_INFO = struct {
 	FTransferSyntax        RPC_SYNTAX_IDENTIFIER
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FDispatchTable         uintptr
 	FProcString            PFORMAT_STRING
 	FFmtStringOffset       uintptr
@@ -49991,11 +50565,11 @@ type GENERIC_BINDING_ROUTINE_PAIR = _GENERIC_BINDING_ROUTINE_PAIR /* rpcndr.h:32
 type PGENERIC_BINDING_ROUTINE_PAIR = uintptr                      /* rpcndr.h:326:34 */
 
 type __GENERIC_BINDING_INFO = struct {
-	FpObj      uintptr
-	FSize      uint32
-	_          [4]byte
-	FpfnBind   GENERIC_BINDING_ROUTINE
-	FpfnUnbind GENERIC_UNBIND_ROUTINE
+	FpObj        uintptr
+	FSize        uint32
+	F__ccgo_pad1 [4]byte
+	FpfnBind     GENERIC_BINDING_ROUTINE
+	FpfnUnbind   GENERIC_UNBIND_ROUTINE
 } /* rpcndr.h:328:11 */
 
 type GENERIC_BINDING_INFO = __GENERIC_BINDING_INFO /* rpcndr.h:333:5 */
@@ -50031,7 +50605,7 @@ type USER_MARSHAL_CB_TYPE = uint32 /* rpcndr.h:362:5 */
 
 type _USER_MARSHAL_CB = struct {
 	FFlags       uint32
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpStubMsg    PMIDL_STUB_MESSAGE
 	FpReserve    PFORMAT_STRING
 	FSignature   uint32
@@ -50086,8 +50660,8 @@ type PMIDL_STUB_DESC = uintptr /* rpcndr.h:442:32 */
 type PMIDL_XMIT_TYPE = uintptr /* rpcndr.h:443:16 */
 
 type _MIDL_FORMAT_STRING = struct {
-	_    [0]uint16
-	FPad int16
+	F__ccgo_pad1 [0]uint16
+	FPad         int16
 } /* rpcndr.h:445:11 */
 
 type MIDL_FORMAT_STRING = _MIDL_FORMAT_STRING /* rpcndr.h:448:5 */
@@ -50132,11 +50706,11 @@ type CLIENT_CALL_RETURN = _CLIENT_CALL_RETURN /* rpcndr.h:493:5 */
 type XLAT_SIDE = uint32 /* rpcndr.h:497:5 */
 
 type _FULL_PTR_TO_REFID_ELEMENT = struct {
-	FNext    uintptr
-	FPointer uintptr
-	FRefId   uint32
-	FState   uint8
-	_        [3]byte
+	FNext        uintptr
+	FPointer     uintptr
+	FRefId       uint32
+	FState       uint8
+	F__ccgo_pad1 [3]byte
 } /* rpcndr.h:499:11 */
 
 type FULL_PTR_TO_REFID_ELEMENT = _FULL_PTR_TO_REFID_ELEMENT /* rpcndr.h:504:5 */
@@ -50156,7 +50730,7 @@ type RPC_SS_THREAD_HANDLE = uintptr /* rpcndr.h:705:16 */
 type _NDR_USER_MARSHAL_INFO_LEVEL1 = struct {
 	FBuffer            uintptr
 	FBufferSize        uint32
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpfnAllocate       uintptr
 	FpfnFree           uintptr
 	FpRpcChannelBuffer uintptr
@@ -50167,7 +50741,7 @@ type NDR_USER_MARSHAL_INFO_LEVEL1 = _NDR_USER_MARSHAL_INFO_LEVEL1 /* rpcndr.h:77
 
 type _NDR_USER_MARSHAL_INFO = struct {
 	FInformationLevel uint32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	F__8              struct{ FLevel1 NDR_USER_MARSHAL_INFO_LEVEL1 }
 } /* rpcndr.h:772:11 */
 
@@ -50280,24 +50854,24 @@ type IRpcChannelBuffer = IRpcChannelBuffer1 /* combaseapi.h:147:37 */
 
 type COINITBASE = uint32 /* combaseapi.h:151:3 */
 
-type OLECHAR = WCHAR     /* wtypesbase.h:68:15 */
-type LPOLESTR = uintptr  /* wtypesbase.h:69:17 */
-type LPCOLESTR = uintptr /* wtypesbase.h:70:23 */
-type DOUBLE = float64    /* wtypesbase.h:93:16 */
+type OLECHAR = WCHAR     /* wtypesbase.h:69:15 */
+type LPOLESTR = uintptr  /* wtypesbase.h:70:17 */
+type LPCOLESTR = uintptr /* wtypesbase.h:71:23 */
+type DOUBLE = float64    /* wtypesbase.h:94:16 */
 
 type _COAUTHIDENTITY = struct {
 	FUser           uintptr
 	FUserLength     ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FDomain         uintptr
 	FDomainLength   ULONG
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FPassword       uintptr
 	FPasswordLength ULONG
 	FFlags          ULONG
-} /* wtypesbase.h:184:9 */
+} /* wtypesbase.h:185:9 */
 
-type COAUTHIDENTITY = _COAUTHIDENTITY /* wtypesbase.h:192:3 */
+type COAUTHIDENTITY = _COAUTHIDENTITY /* wtypesbase.h:193:3 */
 
 type _COAUTHINFO = struct {
 	FdwAuthnSvc           DWORD
@@ -50307,119 +50881,119 @@ type _COAUTHINFO = struct {
 	FdwImpersonationLevel DWORD
 	FpAuthIdentityData    uintptr
 	FdwCapabilities       DWORD
-	_                     [4]byte
-} /* wtypesbase.h:194:9 */
+	F__ccgo_pad1          [4]byte
+} /* wtypesbase.h:195:9 */
 
-type COAUTHINFO = _COAUTHINFO /* wtypesbase.h:202:3 */
+type COAUTHINFO = _COAUTHINFO /* wtypesbase.h:203:3 */
 
-type SCODE = LONG     /* wtypesbase.h:204:14 */
-type PSCODE = uintptr /* wtypesbase.h:205:15 */
+type SCODE = LONG     /* wtypesbase.h:205:14 */
+type PSCODE = uintptr /* wtypesbase.h:206:15 */
 
-type MEMCTX = int32 /* wtypesbase.h:238:3 */
+type MEMCTX = int32 /* wtypesbase.h:239:3 */
 
-type CLSCTX = int32 /* wtypesbase.h:293:3 */
+type CLSCTX = int32 /* wtypesbase.h:294:3 */
 
-type MSHLFLAGS = uint32 /* wtypesbase.h:306:3 */
+type MSHLFLAGS = uint32 /* wtypesbase.h:307:3 */
 
-type MSHCTX = uint32 /* wtypesbase.h:314:3 */
+type MSHCTX = uint32 /* wtypesbase.h:315:3 */
 
 type _BYTE_BLOB = struct {
-	FclSize ULONG
-	FabData [1]Byte
-	_       [3]byte
-} /* wtypesbase.h:316:9 */
+	FclSize      ULONG
+	FabData      [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypesbase.h:317:9 */
 
-type BYTE_BLOB = _BYTE_BLOB /* wtypesbase.h:319:3 */
+type BYTE_BLOB = _BYTE_BLOB /* wtypesbase.h:320:3 */
 
-type UP_BYTE_BLOB = uintptr /* wtypesbase.h:321:19 */
+type UP_BYTE_BLOB = uintptr /* wtypesbase.h:322:19 */
 
 type _WORD_BLOB = struct {
-	FclSize ULONG
-	FasData [1]uint16
-	_       [2]byte
-} /* wtypesbase.h:323:9 */
+	FclSize      ULONG
+	FasData      [1]uint16
+	F__ccgo_pad1 [2]byte
+} /* wtypesbase.h:324:9 */
 
-type WORD_BLOB = _WORD_BLOB /* wtypesbase.h:326:3 */
+type WORD_BLOB = _WORD_BLOB /* wtypesbase.h:327:3 */
 
-type UP_WORD_BLOB = uintptr /* wtypesbase.h:328:19 */
+type UP_WORD_BLOB = uintptr /* wtypesbase.h:329:19 */
 
 type _DWORD_BLOB = struct {
 	FclSize ULONG
 	FalData [1]ULONG
-} /* wtypesbase.h:330:9 */
+} /* wtypesbase.h:331:9 */
 
-type DWORD_BLOB = _DWORD_BLOB /* wtypesbase.h:333:3 */
+type DWORD_BLOB = _DWORD_BLOB /* wtypesbase.h:334:3 */
 
-type UP_DWORD_BLOB = uintptr /* wtypesbase.h:335:20 */
+type UP_DWORD_BLOB = uintptr /* wtypesbase.h:336:20 */
 
 type _FLAGGED_BYTE_BLOB = struct {
-	FfFlags ULONG
-	FclSize ULONG
-	FabData [1]Byte
-	_       [3]byte
-} /* wtypesbase.h:337:9 */
+	FfFlags      ULONG
+	FclSize      ULONG
+	FabData      [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypesbase.h:338:9 */
 
-type FLAGGED_BYTE_BLOB = _FLAGGED_BYTE_BLOB /* wtypesbase.h:341:3 */
+type FLAGGED_BYTE_BLOB = _FLAGGED_BYTE_BLOB /* wtypesbase.h:342:3 */
 
-type UP_FLAGGED_BYTE_BLOB = uintptr /* wtypesbase.h:343:27 */
+type UP_FLAGGED_BYTE_BLOB = uintptr /* wtypesbase.h:344:27 */
 
 type _FLAGGED_WORD_BLOB = struct {
-	FfFlags ULONG
-	FclSize ULONG
-	FasData [1]uint16
-	_       [2]byte
-} /* wtypesbase.h:345:9 */
+	FfFlags      ULONG
+	FclSize      ULONG
+	FasData      [1]uint16
+	F__ccgo_pad1 [2]byte
+} /* wtypesbase.h:346:9 */
 
-type FLAGGED_WORD_BLOB = _FLAGGED_WORD_BLOB /* wtypesbase.h:349:3 */
+type FLAGGED_WORD_BLOB = _FLAGGED_WORD_BLOB /* wtypesbase.h:350:3 */
 
-type UP_FLAGGED_WORD_BLOB = uintptr /* wtypesbase.h:351:27 */
+type UP_FLAGGED_WORD_BLOB = uintptr /* wtypesbase.h:352:27 */
 
 type _BYTE_SIZEDARR = struct {
-	FclSize ULONG
-	_       [4]byte
-	FpData  uintptr
-} /* wtypesbase.h:353:9 */
+	FclSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpData       uintptr
+} /* wtypesbase.h:354:9 */
 
-type BYTE_SIZEDARR = _BYTE_SIZEDARR /* wtypesbase.h:356:3 */
+type BYTE_SIZEDARR = _BYTE_SIZEDARR /* wtypesbase.h:357:3 */
 
 type _SHORT_SIZEDARR = struct {
-	FclSize ULONG
-	_       [4]byte
-	FpData  uintptr
-} /* wtypesbase.h:358:9 */
+	FclSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpData       uintptr
+} /* wtypesbase.h:359:9 */
 
-type WORD_SIZEDARR = _SHORT_SIZEDARR /* wtypesbase.h:361:3 */
+type WORD_SIZEDARR = _SHORT_SIZEDARR /* wtypesbase.h:362:3 */
 
 type _LONG_SIZEDARR = struct {
-	FclSize ULONG
-	_       [4]byte
-	FpData  uintptr
-} /* wtypesbase.h:363:9 */
+	FclSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpData       uintptr
+} /* wtypesbase.h:364:9 */
 
-type DWORD_SIZEDARR = _LONG_SIZEDARR /* wtypesbase.h:366:3 */
+type DWORD_SIZEDARR = _LONG_SIZEDARR /* wtypesbase.h:367:3 */
 
 type _HYPER_SIZEDARR = struct {
-	FclSize ULONG
-	_       [4]byte
-	FpData  uintptr
-} /* wtypesbase.h:368:9 */
+	FclSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpData       uintptr
+} /* wtypesbase.h:369:9 */
 
-type HYPER_SIZEDARR = _HYPER_SIZEDARR /* wtypesbase.h:371:3 */
+type HYPER_SIZEDARR = _HYPER_SIZEDARR /* wtypesbase.h:372:3 */
 
 type tagBLOB = struct {
-	FcbSize    ULONG
-	_          [4]byte
-	FpBlobData uintptr
-} /* wtypesbase.h:382:9 */
+	FcbSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpBlobData   uintptr
+} /* wtypesbase.h:383:9 */
 
-type BLOB = tagBLOB   /* wtypesbase.h:385:3 */
-type LPBLOB = uintptr /* wtypesbase.h:386:24 */
+type BLOB = tagBLOB   /* wtypesbase.h:386:3 */
+type LPBLOB = uintptr /* wtypesbase.h:387:24 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50455,13 +51029,13 @@ type LPBLOB = uintptr /* wtypesbase.h:386:24 */
 
 // Forward declarations
 
-type IUnknown1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:22:9 */
+type IUnknown1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:23:9 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50497,19 +51071,19 @@ type IUnknown1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:22:9 */
 
 // Forward declarations
 
-type IUnknown = IUnknown1 /* unknwnbase.h:22:28 */
+type IUnknown = IUnknown1 /* unknwnbase.h:23:28 */
 
-type AsyncIUnknown1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:27:9 */
+type AsyncIUnknown1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:31:9 */
 
-type AsyncIUnknown = AsyncIUnknown1 /* unknwnbase.h:27:33 */
+type AsyncIUnknown = AsyncIUnknown1 /* unknwnbase.h:31:33 */
 
-type IClassFactory1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:32:9 */
+type IClassFactory1 = struct{ FlpVtbl uintptr } /* unknwnbase.h:39:9 */
 
-type IClassFactory = IClassFactory1 /* unknwnbase.h:32:33 */
+type IClassFactory = IClassFactory1 /* unknwnbase.h:39:33 */
 
 // Headers for imported files
 
-//** Autogenerated by WIDL 1.6 from include/wtypesbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypesbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50555,14 +51129,14 @@ type IClassFactory = IClassFactory1 /* unknwnbase.h:32:33 */
 //
 // IUnknown interface
 
-type LPUNKNOWN = uintptr /* unknwnbase.h:58:18 */
+type LPUNKNOWN = uintptr /* unknwnbase.h:68:18 */
 type IUnknownVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
-} /* unknwnbase.h:22:9 */
+} /* unknwnbase.h:23:9 */
 
-type IUnknownVtbl = IUnknownVtbl1 /* unknwnbase.h:126:3 */
+type IUnknownVtbl = IUnknownVtbl1 /* unknwnbase.h:138:3 */
 type AsyncIUnknownVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -50573,30 +51147,30 @@ type AsyncIUnknownVtbl1 = struct {
 	FFinish_AddRef         uintptr
 	FBegin_Release         uintptr
 	FFinish_Release        uintptr
-} /* unknwnbase.h:27:9 */
+} /* unknwnbase.h:31:9 */
 
-type AsyncIUnknownVtbl = AsyncIUnknownVtbl1 /* unknwnbase.h:254:3 */
+type AsyncIUnknownVtbl = AsyncIUnknownVtbl1 /* unknwnbase.h:244:3 */
 
 // ****************************************************************************
 //
 // IClassFactory interface
 
-type LPCLASSFACTORY = uintptr /* unknwnbase.h:363:23 */
+type LPCLASSFACTORY = uintptr /* unknwnbase.h:310:23 */
 type IClassFactoryVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FCreateInstance uintptr
 	FLockServer     uintptr
-} /* unknwnbase.h:32:9 */
+} /* unknwnbase.h:39:9 */
 
-type IClassFactoryVtbl = IClassFactoryVtbl1 /* unknwnbase.h:410:3 */
+type IClassFactoryVtbl = IClassFactoryVtbl1 /* unknwnbase.h:357:3 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/objidlbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/objidlbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50632,13 +51206,13 @@ type IClassFactoryVtbl = IClassFactoryVtbl1 /* unknwnbase.h:410:3 */
 
 // Forward declarations
 
-type IMarshal1 = struct{ FlpVtbl uintptr } /* objidlbase.h:22:9 */
+type IMarshal1 = struct{ FlpVtbl uintptr } /* objidlbase.h:23:9 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/objidlbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/objidlbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50674,199 +51248,199 @@ type IMarshal1 = struct{ FlpVtbl uintptr } /* objidlbase.h:22:9 */
 
 // Forward declarations
 
-type IMarshal = IMarshal1 /* objidlbase.h:22:28 */
+type IMarshal = IMarshal1 /* objidlbase.h:23:28 */
 
-type INoMarshal1 = struct{ FlpVtbl uintptr } /* objidlbase.h:27:9 */
+type INoMarshal1 = struct{ FlpVtbl uintptr } /* objidlbase.h:31:9 */
 
-type INoMarshal = INoMarshal1 /* objidlbase.h:27:30 */
+type INoMarshal = INoMarshal1 /* objidlbase.h:31:30 */
 
-type IAgileObject1 = struct{ FlpVtbl uintptr } /* objidlbase.h:32:9 */
+type IAgileObject1 = struct{ FlpVtbl uintptr } /* objidlbase.h:39:9 */
 
-type IAgileObject = IAgileObject1 /* objidlbase.h:32:32 */
+type IAgileObject = IAgileObject1 /* objidlbase.h:39:32 */
 
-type IAgileReference1 = struct{ FlpVtbl uintptr } /* objidlbase.h:37:9 */
+type IAgileReference1 = struct{ FlpVtbl uintptr } /* objidlbase.h:47:9 */
 
-type IAgileReference = IAgileReference1 /* objidlbase.h:37:35 */
+type IAgileReference = IAgileReference1 /* objidlbase.h:47:35 */
 
-type IMarshal21 = struct{ FlpVtbl uintptr } /* objidlbase.h:42:9 */
+type IMarshal21 = struct{ FlpVtbl uintptr } /* objidlbase.h:55:9 */
 
-type IMarshal2 = IMarshal21 /* objidlbase.h:42:29 */
+type IMarshal2 = IMarshal21 /* objidlbase.h:55:29 */
 
-type IMalloc1 = struct{ FlpVtbl uintptr } /* objidlbase.h:47:9 */
+type IMalloc1 = struct{ FlpVtbl uintptr } /* objidlbase.h:63:9 */
 
-type IMalloc = IMalloc1 /* objidlbase.h:47:27 */
+type IMalloc = IMalloc1 /* objidlbase.h:63:27 */
 
-type IStdMarshalInfo1 = struct{ FlpVtbl uintptr } /* objidlbase.h:52:9 */
+type IStdMarshalInfo1 = struct{ FlpVtbl uintptr } /* objidlbase.h:71:9 */
 
-type IStdMarshalInfo = IStdMarshalInfo1 /* objidlbase.h:52:35 */
+type IStdMarshalInfo = IStdMarshalInfo1 /* objidlbase.h:71:35 */
 
-type IExternalConnection1 = struct{ FlpVtbl uintptr } /* objidlbase.h:57:9 */
+type IExternalConnection1 = struct{ FlpVtbl uintptr } /* objidlbase.h:79:9 */
 
-type IExternalConnection = IExternalConnection1 /* objidlbase.h:57:39 */
+type IExternalConnection = IExternalConnection1 /* objidlbase.h:79:39 */
 
-type IMultiQI1 = struct{ FlpVtbl uintptr } /* objidlbase.h:62:9 */
+type IMultiQI1 = struct{ FlpVtbl uintptr } /* objidlbase.h:87:9 */
 
-type IMultiQI = IMultiQI1 /* objidlbase.h:62:28 */
+type IMultiQI = IMultiQI1 /* objidlbase.h:87:28 */
 
-type AsyncIMultiQI1 = struct{ FlpVtbl uintptr } /* objidlbase.h:67:9 */
+type AsyncIMultiQI1 = struct{ FlpVtbl uintptr } /* objidlbase.h:95:9 */
 
-type AsyncIMultiQI = AsyncIMultiQI1 /* objidlbase.h:67:33 */
+type AsyncIMultiQI = AsyncIMultiQI1 /* objidlbase.h:95:33 */
 
-type IInternalUnknown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:72:9 */
+type IInternalUnknown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:103:9 */
 
-type IInternalUnknown = IInternalUnknown1 /* objidlbase.h:72:36 */
+type IInternalUnknown = IInternalUnknown1 /* objidlbase.h:103:36 */
 
-type IEnumUnknown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:77:9 */
+type IEnumUnknown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:111:9 */
 
-type IEnumUnknown = IEnumUnknown1 /* objidlbase.h:77:32 */
+type IEnumUnknown = IEnumUnknown1 /* objidlbase.h:111:32 */
 
-type IEnumString1 = struct{ FlpVtbl uintptr } /* objidlbase.h:82:9 */
+type IEnumString1 = struct{ FlpVtbl uintptr } /* objidlbase.h:119:9 */
 
-type IEnumString = IEnumString1 /* objidlbase.h:82:31 */
+type IEnumString = IEnumString1 /* objidlbase.h:119:31 */
 
-type ISequentialStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:87:9 */
+type ISequentialStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:127:9 */
 
-type ISequentialStream = ISequentialStream1 /* objidlbase.h:87:37 */
+type ISequentialStream = ISequentialStream1 /* objidlbase.h:127:37 */
 
-type IStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:92:9 */
+type IStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:135:9 */
 
-type IStream = IStream1 /* objidlbase.h:92:27 */
+type IStream = IStream1 /* objidlbase.h:135:27 */
 
-type IRpcChannelBuffer21 = struct{ FlpVtbl uintptr } /* objidlbase.h:102:9 */
+type IRpcChannelBuffer21 = struct{ FlpVtbl uintptr } /* objidlbase.h:151:9 */
 
-type IRpcChannelBuffer2 = IRpcChannelBuffer21 /* objidlbase.h:102:38 */
+type IRpcChannelBuffer2 = IRpcChannelBuffer21 /* objidlbase.h:151:38 */
 
-type IAsyncRpcChannelBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:107:9 */
+type IAsyncRpcChannelBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:159:9 */
 
-type IAsyncRpcChannelBuffer = IAsyncRpcChannelBuffer1 /* objidlbase.h:107:42 */
+type IAsyncRpcChannelBuffer = IAsyncRpcChannelBuffer1 /* objidlbase.h:159:42 */
 
-type IRpcChannelBuffer31 = struct{ FlpVtbl uintptr } /* objidlbase.h:112:9 */
+type IRpcChannelBuffer31 = struct{ FlpVtbl uintptr } /* objidlbase.h:167:9 */
 
-type IRpcChannelBuffer3 = IRpcChannelBuffer31 /* objidlbase.h:112:38 */
+type IRpcChannelBuffer3 = IRpcChannelBuffer31 /* objidlbase.h:167:38 */
 
-type IRpcSyntaxNegotiate1 = struct{ FlpVtbl uintptr } /* objidlbase.h:117:9 */
+type IRpcSyntaxNegotiate1 = struct{ FlpVtbl uintptr } /* objidlbase.h:175:9 */
 
-type IRpcSyntaxNegotiate = IRpcSyntaxNegotiate1 /* objidlbase.h:117:39 */
+type IRpcSyntaxNegotiate = IRpcSyntaxNegotiate1 /* objidlbase.h:175:39 */
 
-type IRpcProxyBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:122:9 */
+type IRpcProxyBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:183:9 */
 
-type IRpcProxyBuffer = IRpcProxyBuffer1 /* objidlbase.h:122:35 */
+type IRpcProxyBuffer = IRpcProxyBuffer1 /* objidlbase.h:183:35 */
 
-type IPSFactoryBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:132:9 */
+type IPSFactoryBuffer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:199:9 */
 
-type IPSFactoryBuffer = IPSFactoryBuffer1 /* objidlbase.h:132:36 */
+type IPSFactoryBuffer = IPSFactoryBuffer1 /* objidlbase.h:199:36 */
 
-type IChannelHook1 = struct{ FlpVtbl uintptr } /* objidlbase.h:137:9 */
+type IChannelHook1 = struct{ FlpVtbl uintptr } /* objidlbase.h:207:9 */
 
-type IChannelHook = IChannelHook1 /* objidlbase.h:137:32 */
+type IChannelHook = IChannelHook1 /* objidlbase.h:207:32 */
 
-type IClientSecurity1 = struct{ FlpVtbl uintptr } /* objidlbase.h:142:9 */
+type IClientSecurity1 = struct{ FlpVtbl uintptr } /* objidlbase.h:215:9 */
 
-type IClientSecurity = IClientSecurity1 /* objidlbase.h:142:35 */
+type IClientSecurity = IClientSecurity1 /* objidlbase.h:215:35 */
 
-type IServerSecurity1 = struct{ FlpVtbl uintptr } /* objidlbase.h:147:9 */
+type IServerSecurity1 = struct{ FlpVtbl uintptr } /* objidlbase.h:223:9 */
 
-type IServerSecurity = IServerSecurity1 /* objidlbase.h:147:35 */
+type IServerSecurity = IServerSecurity1 /* objidlbase.h:223:35 */
 
-type IRpcOptions1 = struct{ FlpVtbl uintptr } /* objidlbase.h:152:9 */
+type IRpcOptions1 = struct{ FlpVtbl uintptr } /* objidlbase.h:231:9 */
 
-type IRpcOptions = IRpcOptions1 /* objidlbase.h:152:31 */
+type IRpcOptions = IRpcOptions1 /* objidlbase.h:231:31 */
 
-type IGlobalOptions1 = struct{ FlpVtbl uintptr } /* objidlbase.h:157:9 */
+type IGlobalOptions1 = struct{ FlpVtbl uintptr } /* objidlbase.h:239:9 */
 
-type IGlobalOptions = IGlobalOptions1 /* objidlbase.h:157:34 */
+type IGlobalOptions = IGlobalOptions1 /* objidlbase.h:239:34 */
 
-type ISurrogate1 = struct{ FlpVtbl uintptr } /* objidlbase.h:162:9 */
+type ISurrogate1 = struct{ FlpVtbl uintptr } /* objidlbase.h:247:9 */
 
-type ISurrogate = ISurrogate1 /* objidlbase.h:162:30 */
+type ISurrogate = ISurrogate1 /* objidlbase.h:247:30 */
 
-type IGlobalInterfaceTable1 = struct{ FlpVtbl uintptr } /* objidlbase.h:167:9 */
+type IGlobalInterfaceTable1 = struct{ FlpVtbl uintptr } /* objidlbase.h:255:9 */
 
-type IGlobalInterfaceTable = IGlobalInterfaceTable1 /* objidlbase.h:167:41 */
+type IGlobalInterfaceTable = IGlobalInterfaceTable1 /* objidlbase.h:255:41 */
 
-type ISynchronize1 = struct{ FlpVtbl uintptr } /* objidlbase.h:172:9 */
+type ISynchronize1 = struct{ FlpVtbl uintptr } /* objidlbase.h:263:9 */
 
-type ISynchronize = ISynchronize1 /* objidlbase.h:172:32 */
+type ISynchronize = ISynchronize1 /* objidlbase.h:263:32 */
 
-type ISynchronizeHandle1 = struct{ FlpVtbl uintptr } /* objidlbase.h:177:9 */
+type ISynchronizeHandle1 = struct{ FlpVtbl uintptr } /* objidlbase.h:271:9 */
 
-type ISynchronizeHandle = ISynchronizeHandle1 /* objidlbase.h:177:38 */
+type ISynchronizeHandle = ISynchronizeHandle1 /* objidlbase.h:271:38 */
 
-type ISynchronizeEvent1 = struct{ FlpVtbl uintptr } /* objidlbase.h:182:9 */
+type ISynchronizeEvent1 = struct{ FlpVtbl uintptr } /* objidlbase.h:279:9 */
 
-type ISynchronizeEvent = ISynchronizeEvent1 /* objidlbase.h:182:37 */
+type ISynchronizeEvent = ISynchronizeEvent1 /* objidlbase.h:279:37 */
 
-type ISynchronizeContainer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:187:9 */
+type ISynchronizeContainer1 = struct{ FlpVtbl uintptr } /* objidlbase.h:287:9 */
 
-type ISynchronizeContainer = ISynchronizeContainer1 /* objidlbase.h:187:41 */
+type ISynchronizeContainer = ISynchronizeContainer1 /* objidlbase.h:287:41 */
 
-type ISynchronizeMutex1 = struct{ FlpVtbl uintptr } /* objidlbase.h:192:9 */
+type ISynchronizeMutex1 = struct{ FlpVtbl uintptr } /* objidlbase.h:295:9 */
 
-type ISynchronizeMutex = ISynchronizeMutex1 /* objidlbase.h:192:37 */
+type ISynchronizeMutex = ISynchronizeMutex1 /* objidlbase.h:295:37 */
 
-type ICancelMethodCalls1 = struct{ FlpVtbl uintptr } /* objidlbase.h:197:9 */
+type ICancelMethodCalls1 = struct{ FlpVtbl uintptr } /* objidlbase.h:303:9 */
 
-type ICancelMethodCalls = ICancelMethodCalls1 /* objidlbase.h:197:38 */
+type ICancelMethodCalls = ICancelMethodCalls1 /* objidlbase.h:303:38 */
 
-type IAsyncManager1 = struct{ FlpVtbl uintptr } /* objidlbase.h:202:9 */
+type IAsyncManager1 = struct{ FlpVtbl uintptr } /* objidlbase.h:311:9 */
 
-type IAsyncManager = IAsyncManager1 /* objidlbase.h:202:33 */
+type IAsyncManager = IAsyncManager1 /* objidlbase.h:311:33 */
 
-type ICallFactory1 = struct{ FlpVtbl uintptr } /* objidlbase.h:207:9 */
+type ICallFactory1 = struct{ FlpVtbl uintptr } /* objidlbase.h:319:9 */
 
-type ICallFactory = ICallFactory1 /* objidlbase.h:207:32 */
+type ICallFactory = ICallFactory1 /* objidlbase.h:319:32 */
 
-type IRpcHelper1 = struct{ FlpVtbl uintptr } /* objidlbase.h:212:9 */
+type IRpcHelper1 = struct{ FlpVtbl uintptr } /* objidlbase.h:327:9 */
 
-type IRpcHelper = IRpcHelper1 /* objidlbase.h:212:30 */
+type IRpcHelper = IRpcHelper1 /* objidlbase.h:327:30 */
 
-type IReleaseMarshalBuffers1 = struct{ FlpVtbl uintptr } /* objidlbase.h:217:9 */
+type IReleaseMarshalBuffers1 = struct{ FlpVtbl uintptr } /* objidlbase.h:335:9 */
 
-type IReleaseMarshalBuffers = IReleaseMarshalBuffers1 /* objidlbase.h:217:42 */
+type IReleaseMarshalBuffers = IReleaseMarshalBuffers1 /* objidlbase.h:335:42 */
 
-type IWaitMultiple1 = struct{ FlpVtbl uintptr } /* objidlbase.h:222:9 */
+type IWaitMultiple1 = struct{ FlpVtbl uintptr } /* objidlbase.h:343:9 */
 
-type IWaitMultiple = IWaitMultiple1 /* objidlbase.h:222:33 */
+type IWaitMultiple = IWaitMultiple1 /* objidlbase.h:343:33 */
 
-type IAddrTrackingControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:227:9 */
+type IAddrTrackingControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:351:9 */
 
-type IAddrTrackingControl = IAddrTrackingControl1 /* objidlbase.h:227:40 */
+type IAddrTrackingControl = IAddrTrackingControl1 /* objidlbase.h:351:40 */
 
-type IAddrExclusionControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:232:9 */
+type IAddrExclusionControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:359:9 */
 
-type IAddrExclusionControl = IAddrExclusionControl1 /* objidlbase.h:232:41 */
+type IAddrExclusionControl = IAddrExclusionControl1 /* objidlbase.h:359:41 */
 
-type IPipeByte1 = struct{ FlpVtbl uintptr } /* objidlbase.h:237:9 */
+type IPipeByte1 = struct{ FlpVtbl uintptr } /* objidlbase.h:367:9 */
 
-type IPipeByte = IPipeByte1 /* objidlbase.h:237:29 */
+type IPipeByte = IPipeByte1 /* objidlbase.h:367:29 */
 
-type IPipeLong1 = struct{ FlpVtbl uintptr } /* objidlbase.h:242:9 */
+type IPipeLong1 = struct{ FlpVtbl uintptr } /* objidlbase.h:375:9 */
 
-type IPipeLong = IPipeLong1 /* objidlbase.h:242:29 */
+type IPipeLong = IPipeLong1 /* objidlbase.h:375:29 */
 
-type IPipeDouble1 = struct{ FlpVtbl uintptr } /* objidlbase.h:247:9 */
+type IPipeDouble1 = struct{ FlpVtbl uintptr } /* objidlbase.h:383:9 */
 
-type IPipeDouble = IPipeDouble1 /* objidlbase.h:247:31 */
+type IPipeDouble = IPipeDouble1 /* objidlbase.h:383:31 */
 
-type IComThreadingInfo1 = struct{ FlpVtbl uintptr } /* objidlbase.h:262:9 */
+type IComThreadingInfo1 = struct{ FlpVtbl uintptr } /* objidlbase.h:407:9 */
 
-type IComThreadingInfo = IComThreadingInfo1 /* objidlbase.h:262:37 */
+type IComThreadingInfo = IComThreadingInfo1 /* objidlbase.h:407:37 */
 
-type IProcessInitControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:267:9 */
+type IProcessInitControl1 = struct{ FlpVtbl uintptr } /* objidlbase.h:415:9 */
 
-type IProcessInitControl = IProcessInitControl1 /* objidlbase.h:267:39 */
+type IProcessInitControl = IProcessInitControl1 /* objidlbase.h:415:39 */
 
-type IFastRundown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:272:9 */
+type IFastRundown1 = struct{ FlpVtbl uintptr } /* objidlbase.h:423:9 */
 
-type IFastRundown = IFastRundown1 /* objidlbase.h:272:32 */
+type IFastRundown = IFastRundown1 /* objidlbase.h:423:32 */
 
-type IMarshalingStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:277:9 */
+type IMarshalingStream1 = struct{ FlpVtbl uintptr } /* objidlbase.h:431:9 */
 
-type IMarshalingStream = IMarshalingStream1 /* objidlbase.h:277:37 */
+type IMarshalingStream = IMarshalingStream1 /* objidlbase.h:431:37 */
 
 // Headers for imported files
 
-//** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50900,7 +51474,7 @@ type IMarshalingStream = IMarshalingStream1 /* objidlbase.h:277:37 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/wtypesbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypesbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50944,16 +51518,16 @@ type IMarshalingStream = IMarshalingStream1 /* objidlbase.h:277:37 */
 
 type _COSERVERINFO = struct {
 	FdwReserved1 DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpwszName    LPWSTR
 	FpAuthInfo   uintptr
 	FdwReserved2 DWORD
-	_            [4]byte
-} /* objidlbase.h:352:9 */
+	F__ccgo_pad2 [4]byte
+} /* objidlbase.h:522:9 */
 
 // Headers for imported files
 
-//** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.14 from include/unknwnbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -50987,7 +51561,7 @@ type _COSERVERINFO = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/wtypesbase.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypesbase.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -51029,13 +51603,13 @@ type _COSERVERINFO = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type COSERVERINFO = _COSERVERINFO /* objidlbase.h:357:3 */
+type COSERVERINFO = _COSERVERINFO /* objidlbase.h:527:3 */
 
 // ****************************************************************************
 //
 // IMarshal interface
 
-type LPMARSHAL = uintptr /* objidlbase.h:365:18 */
+type LPMARSHAL = uintptr /* objidlbase.h:535:18 */
 type IMarshalVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
@@ -51046,37 +51620,37 @@ type IMarshalVtbl1 = struct {
 	FUnmarshalInterface uintptr
 	FReleaseMarshalData uintptr
 	FDisconnectObject   uintptr
-} /* objidlbase.h:22:9 */
+} /* objidlbase.h:23:9 */
 
-type IMarshalVtbl = IMarshalVtbl1 /* objidlbase.h:469:3 */
+type IMarshalVtbl = IMarshalVtbl1 /* objidlbase.h:639:3 */
 type INoMarshalVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
-} /* objidlbase.h:27:9 */
+} /* objidlbase.h:31:9 */
 
-type INoMarshalVtbl = INoMarshalVtbl1 /* objidlbase.h:623:3 */
+type INoMarshalVtbl = INoMarshalVtbl1 /* objidlbase.h:729:3 */
 type IAgileObjectVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
-} /* objidlbase.h:32:9 */
+} /* objidlbase.h:39:9 */
 
-type IAgileObjectVtbl = IAgileObjectVtbl1 /* objidlbase.h:686:3 */
+type IAgileObjectVtbl = IAgileObjectVtbl1 /* objidlbase.h:793:3 */
 type IAgileReferenceVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FResolve        uintptr
-} /* objidlbase.h:37:9 */
+} /* objidlbase.h:47:9 */
 
-type IAgileReferenceVtbl = IAgileReferenceVtbl1 /* objidlbase.h:758:3 */
+type IAgileReferenceVtbl = IAgileReferenceVtbl1 /* objidlbase.h:866:3 */
 
 // ****************************************************************************
 //
 // IMarshal2 interface
 
-type LPMARSHAL2 = uintptr /* objidlbase.h:812:19 */
+type LPMARSHAL2 = uintptr /* objidlbase.h:912:19 */
 type IMarshal2Vtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
@@ -51087,15 +51661,15 @@ type IMarshal2Vtbl1 = struct {
 	FUnmarshalInterface uintptr
 	FReleaseMarshalData uintptr
 	FDisconnectObject   uintptr
-} /* objidlbase.h:42:9 */
+} /* objidlbase.h:55:9 */
 
-type IMarshal2Vtbl = IMarshal2Vtbl1 /* objidlbase.h:881:3 */
+type IMarshal2Vtbl = IMarshal2Vtbl1 /* objidlbase.h:981:3 */
 
 // ****************************************************************************
 //
 // IMalloc interface
 
-type LPMALLOC = uintptr /* objidlbase.h:944:17 */
+type LPMALLOC = uintptr /* objidlbase.h:1045:17 */
 type IMallocVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51106,82 +51680,82 @@ type IMallocVtbl1 = struct {
 	FGetSize        uintptr
 	FDidAlloc       uintptr
 	FHeapMinimize   uintptr
-} /* objidlbase.h:47:9 */
+} /* objidlbase.h:63:9 */
 
-type IMallocVtbl = IMallocVtbl1 /* objidlbase.h:1016:3 */
+type IMallocVtbl = IMallocVtbl1 /* objidlbase.h:1117:3 */
 
 // ****************************************************************************
 //
 // IStdMarshalInfo interface
 
-type LPSTDMARSHALINFO = uintptr /* objidlbase.h:1127:25 */
+type LPSTDMARSHALINFO = uintptr /* objidlbase.h:1181:25 */
 type IStdMarshalInfoVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
 	FRelease            uintptr
 	FGetClassForHandler uintptr
-} /* objidlbase.h:52:9 */
+} /* objidlbase.h:71:9 */
 
-type IStdMarshalInfoVtbl = IStdMarshalInfoVtbl1 /* objidlbase.h:1167:3 */
+type IStdMarshalInfoVtbl = IStdMarshalInfoVtbl1 /* objidlbase.h:1221:3 */
 
 // ****************************************************************************
 //
 // IExternalConnection interface
 
-type LPEXTERNALCONNECTION = uintptr /* objidlbase.h:1220:29 */
+type LPEXTERNALCONNECTION = uintptr /* objidlbase.h:1265:29 */
 
-type EXTCONN = uint32 /* objidlbase.h:1226:3 */
+type EXTCONN = uint32 /* objidlbase.h:1271:3 */
 type IExternalConnectionVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
 	FRelease           uintptr
 	FAddConnection     uintptr
 	FReleaseConnection uintptr
-} /* objidlbase.h:57:9 */
+} /* objidlbase.h:79:9 */
 
-type IExternalConnectionVtbl = IExternalConnectionVtbl1 /* objidlbase.h:1275:3 */
+type IExternalConnectionVtbl = IExternalConnectionVtbl1 /* objidlbase.h:1320:3 */
 
-type LPMULTIQI = uintptr /* objidlbase.h:1335:18 */
+type LPMULTIQI = uintptr /* objidlbase.h:1362:18 */
 
 type tagMULTI_QI = struct {
-	FpIID uintptr
-	FpItf uintptr
-	Fhr   HRESULT
-	_     [4]byte
-} /* objidlbase.h:1339:9 */
+	FpIID        uintptr
+	FpItf        uintptr
+	Fhr          HRESULT
+	F__ccgo_pad1 [4]byte
+} /* objidlbase.h:1366:9 */
 
-type MULTI_QI = tagMULTI_QI /* objidlbase.h:1343:3 */
+type MULTI_QI = tagMULTI_QI /* objidlbase.h:1370:3 */
 type IMultiQIVtbl1 = struct {
 	FQueryInterface          uintptr
 	FAddRef                  uintptr
 	FRelease                 uintptr
 	FQueryMultipleInterfaces uintptr
-} /* objidlbase.h:62:9 */
+} /* objidlbase.h:87:9 */
 
-type IMultiQIVtbl = IMultiQIVtbl1 /* objidlbase.h:1387:3 */
+type IMultiQIVtbl = IMultiQIVtbl1 /* objidlbase.h:1414:3 */
 type AsyncIMultiQIVtbl1 = struct {
 	FQueryInterface                 uintptr
 	FAddRef                         uintptr
 	FRelease                        uintptr
 	FBegin_QueryMultipleInterfaces  uintptr
 	FFinish_QueryMultipleInterfaces uintptr
-} /* objidlbase.h:67:9 */
+} /* objidlbase.h:95:9 */
 
-type AsyncIMultiQIVtbl = AsyncIMultiQIVtbl1 /* objidlbase.h:1481:3 */
+type AsyncIMultiQIVtbl = AsyncIMultiQIVtbl1 /* objidlbase.h:1500:3 */
 type IInternalUnknownVtbl1 = struct {
 	FQueryInterface         uintptr
 	FAddRef                 uintptr
 	FRelease                uintptr
 	FQueryInternalInterface uintptr
-} /* objidlbase.h:72:9 */
+} /* objidlbase.h:103:9 */
 
-type IInternalUnknownVtbl = IInternalUnknownVtbl1 /* objidlbase.h:1584:3 */
+type IInternalUnknownVtbl = IInternalUnknownVtbl1 /* objidlbase.h:1586:3 */
 
 // ****************************************************************************
 //
 // IEnumUnknown interface
 
-type LPENUMUNKNOWN = uintptr /* objidlbase.h:1638:22 */
+type LPENUMUNKNOWN = uintptr /* objidlbase.h:1632:22 */
 type IEnumUnknownVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51190,15 +51764,15 @@ type IEnumUnknownVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* objidlbase.h:77:9 */
+} /* objidlbase.h:111:9 */
 
-type IEnumUnknownVtbl = IEnumUnknownVtbl1 /* objidlbase.h:1698:3 */
+type IEnumUnknownVtbl = IEnumUnknownVtbl1 /* objidlbase.h:1692:3 */
 
 // ****************************************************************************
 //
 // IEnumString interface
 
-type LPENUMSTRING = uintptr /* objidlbase.h:1796:21 */
+type LPENUMSTRING = uintptr /* objidlbase.h:1768:21 */
 type IEnumStringVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51207,29 +51781,29 @@ type IEnumStringVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* objidlbase.h:82:9 */
+} /* objidlbase.h:119:9 */
 
-type IEnumStringVtbl = IEnumStringVtbl1 /* objidlbase.h:1856:3 */
+type IEnumStringVtbl = IEnumStringVtbl1 /* objidlbase.h:1828:3 */
 type ISequentialStreamVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FRead           uintptr
 	FWrite          uintptr
-} /* objidlbase.h:87:9 */
+} /* objidlbase.h:127:9 */
 
-type ISequentialStreamVtbl = ISequentialStreamVtbl1 /* objidlbase.h:2003:3 */
+type ISequentialStreamVtbl = ISequentialStreamVtbl1 /* objidlbase.h:1953:3 */
 
 // ****************************************************************************
 //
 // IStream interface
 
-type LPSTREAM = uintptr /* objidlbase.h:2090:17 */
+type LPSTREAM = uintptr /* objidlbase.h:2041:17 */
 
 type tagSTATSTG = struct {
 	FpwcsName          LPOLESTR
 	Ftype              DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FcbSize            ULARGE_INTEGER
 	Fmtime             FILETIME
 	Fctime             FILETIME
@@ -51239,15 +51813,15 @@ type tagSTATSTG = struct {
 	Fclsid             CLSID
 	FgrfStateBits      DWORD
 	Freserved          DWORD
-} /* objidlbase.h:2092:9 */
+} /* objidlbase.h:2043:9 */
 
-type STATSTG = tagSTATSTG /* objidlbase.h:2104:3 */
+type STATSTG = tagSTATSTG /* objidlbase.h:2055:3 */
 
-type STGTY = uint32 /* objidlbase.h:2111:3 */
+type STGTY = uint32 /* objidlbase.h:2062:3 */
 
-type STREAM_SEEK = uint32 /* objidlbase.h:2117:3 */
+type STREAM_SEEK = uint32 /* objidlbase.h:2068:3 */
 
-type LOCKTYPE = uint32 /* objidlbase.h:2123:3 */
+type LOCKTYPE = uint32 /* objidlbase.h:2074:3 */
 type IStreamVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51263,31 +51837,31 @@ type IStreamVtbl1 = struct {
 	FUnlockRegion   uintptr
 	FStat           uintptr
 	FClone          uintptr
-} /* objidlbase.h:92:9 */
+} /* objidlbase.h:135:9 */
 
-type IStreamVtbl = IStreamVtbl1 /* objidlbase.h:2247:3 */
+type IStreamVtbl = IStreamVtbl1 /* objidlbase.h:2198:3 */
 
 // ****************************************************************************
 //
 // IRpcChannelBuffer interface
 
-type RPCOLEDATAREP = ULONG /* objidlbase.h:2435:15 */
+type RPCOLEDATAREP = ULONG /* objidlbase.h:2327:15 */
 
 type tagRPCOLEMESSAGE = struct {
 	Freserved1          uintptr
 	FdataRepresentation RPCOLEDATAREP
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FBuffer             uintptr
 	FcbBuffer           ULONG
 	FiMethod            ULONG
 	Freserved2          [5]uintptr
 	FrpcFlags           ULONG
-	_                   [4]byte
-} /* objidlbase.h:2437:9 */
+	F__ccgo_pad2        [4]byte
+} /* objidlbase.h:2329:9 */
 
-type RPCOLEMESSAGE = tagRPCOLEMESSAGE /* objidlbase.h:2445:3 */
+type RPCOLEMESSAGE = tagRPCOLEMESSAGE /* objidlbase.h:2337:3 */
 
-type PRPCOLEMESSAGE = uintptr /* objidlbase.h:2447:23 */
+type PRPCOLEMESSAGE = uintptr /* objidlbase.h:2339:23 */
 type IRpcChannelBufferVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51299,7 +51873,7 @@ type IRpcChannelBufferVtbl1 = struct {
 	FIsConnected    uintptr
 } /* rpcndr.h:211:3 */
 
-type IRpcChannelBufferVtbl = IRpcChannelBufferVtbl1 /* objidlbase.h:2516:3 */
+type IRpcChannelBufferVtbl = IRpcChannelBufferVtbl1 /* objidlbase.h:2408:3 */
 type IRpcChannelBuffer2Vtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
@@ -51310,9 +51884,9 @@ type IRpcChannelBuffer2Vtbl1 = struct {
 	FGetDestCtx         uintptr
 	FIsConnected        uintptr
 	FGetProtocolVersion uintptr
-} /* objidlbase.h:102:9 */
+} /* objidlbase.h:151:9 */
 
-type IRpcChannelBuffer2Vtbl = IRpcChannelBuffer2Vtbl1 /* objidlbase.h:2676:3 */
+type IRpcChannelBuffer2Vtbl = IRpcChannelBuffer2Vtbl1 /* objidlbase.h:2527:3 */
 type IAsyncRpcChannelBufferVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
@@ -51326,9 +51900,9 @@ type IAsyncRpcChannelBufferVtbl1 = struct {
 	FSend               uintptr
 	FReceive            uintptr
 	FGetDestCtxEx       uintptr
-} /* objidlbase.h:107:9 */
+} /* objidlbase.h:159:9 */
 
-type IAsyncRpcChannelBufferVtbl = IAsyncRpcChannelBufferVtbl1 /* objidlbase.h:2835:3 */
+type IAsyncRpcChannelBufferVtbl = IAsyncRpcChannelBufferVtbl1 /* objidlbase.h:2679:3 */
 type IRpcChannelBuffer3Vtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
@@ -51346,26 +51920,26 @@ type IRpcChannelBuffer3Vtbl1 = struct {
 	FGetDestCtxEx       uintptr
 	FGetState           uintptr
 	FRegisterAsync      uintptr
-} /* objidlbase.h:112:9 */
+} /* objidlbase.h:167:9 */
 
-type IRpcChannelBuffer3Vtbl = IRpcChannelBuffer3Vtbl1 /* objidlbase.h:3065:3 */
+type IRpcChannelBuffer3Vtbl = IRpcChannelBuffer3Vtbl1 /* objidlbase.h:2881:3 */
 type IRpcSyntaxNegotiateVtbl1 = struct {
 	FQueryInterface  uintptr
 	FAddRef          uintptr
 	FRelease         uintptr
 	FNegotiateSyntax uintptr
-} /* objidlbase.h:117:9 */
+} /* objidlbase.h:175:9 */
 
-type IRpcSyntaxNegotiateVtbl = IRpcSyntaxNegotiateVtbl1 /* objidlbase.h:3259:3 */
+type IRpcSyntaxNegotiateVtbl = IRpcSyntaxNegotiateVtbl1 /* objidlbase.h:3011:3 */
 type IRpcProxyBufferVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FConnect        uintptr
 	FDisconnect     uintptr
-} /* objidlbase.h:122:9 */
+} /* objidlbase.h:183:9 */
 
-type IRpcProxyBufferVtbl = IRpcProxyBufferVtbl1 /* objidlbase.h:3350:3 */
+type IRpcProxyBufferVtbl = IRpcProxyBufferVtbl1 /* objidlbase.h:3095:3 */
 type IRpcStubBufferVtbl1 = struct {
 	FQueryInterface            uintptr
 	FAddRef                    uintptr
@@ -51379,16 +51953,16 @@ type IRpcStubBufferVtbl1 = struct {
 	FDebugServerRelease        uintptr
 } /* rpcndr.h:680:3 */
 
-type IRpcStubBufferVtbl = IRpcStubBufferVtbl1 /* objidlbase.h:3490:3 */
+type IRpcStubBufferVtbl = IRpcStubBufferVtbl1 /* objidlbase.h:3221:3 */
 type IPSFactoryBufferVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FCreateProxy    uintptr
 	FCreateStub     uintptr
-} /* objidlbase.h:132:9 */
+} /* objidlbase.h:199:9 */
 
-type IPSFactoryBufferVtbl = IPSFactoryBufferVtbl1 /* objidlbase.h:3663:3 */
+type IPSFactoryBufferVtbl = IPSFactoryBufferVtbl1 /* objidlbase.h:3340:3 */
 
 type SChannelHookCallInfo1 = struct {
 	Fiid         IID
@@ -51396,11 +51970,11 @@ type SChannelHookCallInfo1 = struct {
 	FuCausality  GUID
 	FdwServerPid DWORD
 	FiMethod     DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpObject     uintptr
-} /* objidlbase.h:3728:9 */
+} /* objidlbase.h:3385:9 */
 
-type SChannelHookCallInfo = SChannelHookCallInfo1 /* objidlbase.h:3735:3 */
+type SChannelHookCallInfo = SChannelHookCallInfo1 /* objidlbase.h:3392:3 */
 type IChannelHookVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -51411,9 +51985,9 @@ type IChannelHookVtbl1 = struct {
 	FServerNotify     uintptr
 	FServerGetSize    uintptr
 	FServerFillBuffer uintptr
-} /* objidlbase.h:137:9 */
+} /* objidlbase.h:207:9 */
 
-type IChannelHookVtbl = IChannelHookVtbl1 /* objidlbase.h:3854:3 */
+type IChannelHookVtbl = IChannelHookVtbl1 /* objidlbase.h:3511:3 */
 
 // ****************************************************************************
 //
@@ -51424,36 +51998,36 @@ type tagSOLE_AUTHENTICATION_SERVICE = struct {
 	FdwAuthzSvc     DWORD
 	FpPrincipalName uintptr
 	Fhr             HRESULT
-	_               [4]byte
-} /* objidlbase.h:3990:9 */
+	F__ccgo_pad1    [4]byte
+} /* objidlbase.h:3579:9 */
 
 // ****************************************************************************
 //
 // IClientSecurity interface
 
-type SOLE_AUTHENTICATION_SERVICE = tagSOLE_AUTHENTICATION_SERVICE /* objidlbase.h:3995:3 */
+type SOLE_AUTHENTICATION_SERVICE = tagSOLE_AUTHENTICATION_SERVICE /* objidlbase.h:3584:3 */
 
-type PSOLE_AUTHENTICATION_SERVICE = uintptr /* objidlbase.h:3997:37 */
+type PSOLE_AUTHENTICATION_SERVICE = uintptr /* objidlbase.h:3586:37 */
 
-type EOLE_AUTHENTICATION_CAPABILITIES = uint32 /* objidlbase.h:4015:3 */
+type EOLE_AUTHENTICATION_CAPABILITIES = uint32 /* objidlbase.h:3604:3 */
 
 type tagSOLE_AUTHENTICATION_INFO = struct {
 	FdwAuthnSvc DWORD
 	FdwAuthzSvc DWORD
 	FpAuthInfo  uintptr
-} /* objidlbase.h:4022:9 */
+} /* objidlbase.h:3611:9 */
 
-type SOLE_AUTHENTICATION_INFO = tagSOLE_AUTHENTICATION_INFO /* objidlbase.h:4026:3 */
-type PSOLE_AUTHENTICATION_INFO = uintptr                    /* objidlbase.h:4027:44 */
+type SOLE_AUTHENTICATION_INFO = tagSOLE_AUTHENTICATION_INFO /* objidlbase.h:3615:3 */
+type PSOLE_AUTHENTICATION_INFO = uintptr                    /* objidlbase.h:3616:44 */
 
 type tagSOLE_AUTHENTICATION_LIST = struct {
-	FcAuthInfo DWORD
-	_          [4]byte
-	FaAuthInfo uintptr
-} /* objidlbase.h:4029:9 */
+	FcAuthInfo   DWORD
+	F__ccgo_pad1 [4]byte
+	FaAuthInfo   uintptr
+} /* objidlbase.h:3618:9 */
 
-type SOLE_AUTHENTICATION_LIST = tagSOLE_AUTHENTICATION_LIST /* objidlbase.h:4032:3 */
-type PSOLE_AUTHENTICATION_LIST = uintptr                    /* objidlbase.h:4033:44 */
+type SOLE_AUTHENTICATION_LIST = tagSOLE_AUTHENTICATION_LIST /* objidlbase.h:3621:3 */
+type PSOLE_AUTHENTICATION_LIST = uintptr                    /* objidlbase.h:3622:44 */
 type IClientSecurityVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51461,9 +52035,9 @@ type IClientSecurityVtbl1 = struct {
 	FQueryBlanket   uintptr
 	FSetBlanket     uintptr
 	FCopyProxy      uintptr
-} /* objidlbase.h:142:9 */
+} /* objidlbase.h:215:9 */
 
-type IClientSecurityVtbl = IClientSecurityVtbl1 /* objidlbase.h:4113:3 */
+type IClientSecurityVtbl = IClientSecurityVtbl1 /* objidlbase.h:3702:3 */
 type IServerSecurityVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -51472,62 +52046,62 @@ type IServerSecurityVtbl1 = struct {
 	FImpersonateClient uintptr
 	FRevertToSelf      uintptr
 	FIsImpersonating   uintptr
-} /* objidlbase.h:147:9 */
+} /* objidlbase.h:223:9 */
 
-type IServerSecurityVtbl = IServerSecurityVtbl1 /* objidlbase.h:4269:3 */
+type IServerSecurityVtbl = IServerSecurityVtbl1 /* objidlbase.h:3820:3 */
 
-type RPCOPT_PROPERTIES = uint32 /* objidlbase.h:4357:3 */
+type RPCOPT_PROPERTIES = uint32 /* objidlbase.h:3874:3 */
 
-type RPCOPT_SERVER_LOCALITY_VALUES = uint32 /* objidlbase.h:4363:3 */
+type RPCOPT_SERVER_LOCALITY_VALUES = uint32 /* objidlbase.h:3880:3 */
 type IRpcOptionsVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FSet            uintptr
 	FQuery          uintptr
-} /* objidlbase.h:152:9 */
+} /* objidlbase.h:231:9 */
 
-type IRpcOptionsVtbl = IRpcOptionsVtbl1 /* objidlbase.h:4420:3 */
+type IRpcOptionsVtbl = IRpcOptionsVtbl1 /* objidlbase.h:3937:3 */
 
-type GLOBALOPT_PROPERTIES = uint32 /* objidlbase.h:4489:3 */
+type GLOBALOPT_PROPERTIES = uint32 /* objidlbase.h:3987:3 */
 
-type GLOBALOPT_EH_VALUES = uint32 /* objidlbase.h:4496:3 */
+type GLOBALOPT_EH_VALUES = uint32 /* objidlbase.h:3994:3 */
 
-type GLOBALOPT_RPCTP_VALUES = uint32 /* objidlbase.h:4501:3 */
+type GLOBALOPT_RPCTP_VALUES = uint32 /* objidlbase.h:3999:3 */
 
-type GLOBALOPT_RO_FLAGS = uint32 /* objidlbase.h:4512:3 */
+type GLOBALOPT_RO_FLAGS = uint32 /* objidlbase.h:4010:3 */
 
-type GLOBALOPT_UNMARSHALING_POLICY_VALUES = uint32 /* objidlbase.h:4518:3 */
+type GLOBALOPT_UNMARSHALING_POLICY_VALUES = uint32 /* objidlbase.h:4016:3 */
 type IGlobalOptionsVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FSet            uintptr
 	FQuery          uintptr
-} /* objidlbase.h:157:9 */
+} /* objidlbase.h:239:9 */
 
-type IGlobalOptionsVtbl = IGlobalOptionsVtbl1 /* objidlbase.h:4571:3 */
+type IGlobalOptionsVtbl = IGlobalOptionsVtbl1 /* objidlbase.h:4069:3 */
 
 // ****************************************************************************
 //
 // ISurrogate interface
 
-type LPSURROGATE = uintptr /* objidlbase.h:4639:20 */
+type LPSURROGATE = uintptr /* objidlbase.h:4120:20 */
 type ISurrogateVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FLoadDllServer  uintptr
 	FFreeSurrogate  uintptr
-} /* objidlbase.h:162:9 */
+} /* objidlbase.h:247:9 */
 
-type ISurrogateVtbl = ISurrogateVtbl1 /* objidlbase.h:4681:3 */
+type ISurrogateVtbl = ISurrogateVtbl1 /* objidlbase.h:4162:3 */
 
 // ****************************************************************************
 //
 // IGlobalInterfaceTable interface
 
-type LPGLOBALINTERFACETABLE = uintptr /* objidlbase.h:4743:31 */
+type LPGLOBALINTERFACETABLE = uintptr /* objidlbase.h:4210:31 */
 type IGlobalInterfaceTableVtbl1 = struct {
 	FQueryInterface            uintptr
 	FAddRef                    uintptr
@@ -51535,9 +52109,9 @@ type IGlobalInterfaceTableVtbl1 = struct {
 	FRegisterInterfaceInGlobal uintptr
 	FRevokeInterfaceFromGlobal uintptr
 	FGetInterfaceFromGlobal    uintptr
-} /* objidlbase.h:167:9 */
+} /* objidlbase.h:255:9 */
 
-type IGlobalInterfaceTableVtbl = IGlobalInterfaceTableVtbl1 /* objidlbase.h:4801:3 */
+type IGlobalInterfaceTableVtbl = IGlobalInterfaceTableVtbl1 /* objidlbase.h:4268:3 */
 type ISynchronizeVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51545,35 +52119,35 @@ type ISynchronizeVtbl1 = struct {
 	FWait           uintptr
 	FSignal         uintptr
 	FReset          uintptr
-} /* objidlbase.h:172:9 */
+} /* objidlbase.h:263:9 */
 
-type ISynchronizeVtbl = ISynchronizeVtbl1 /* objidlbase.h:4930:3 */
+type ISynchronizeVtbl = ISynchronizeVtbl1 /* objidlbase.h:4370:3 */
 type ISynchronizeHandleVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetHandle      uintptr
-} /* objidlbase.h:177:9 */
+} /* objidlbase.h:271:9 */
 
-type ISynchronizeHandleVtbl = ISynchronizeHandleVtbl1 /* objidlbase.h:5038:3 */
+type ISynchronizeHandleVtbl = ISynchronizeHandleVtbl1 /* objidlbase.h:4456:3 */
 type ISynchronizeEventVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetHandle      uintptr
 	FSetEventHandle uintptr
-} /* objidlbase.h:182:9 */
+} /* objidlbase.h:279:9 */
 
-type ISynchronizeEventVtbl = ISynchronizeEventVtbl1 /* objidlbase.h:5128:3 */
+type ISynchronizeEventVtbl = ISynchronizeEventVtbl1 /* objidlbase.h:4539:3 */
 type ISynchronizeContainerVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FAddSynchronize uintptr
 	FWaitMultiple   uintptr
-} /* objidlbase.h:187:9 */
+} /* objidlbase.h:287:9 */
 
-type ISynchronizeContainerVtbl = ISynchronizeContainerVtbl1 /* objidlbase.h:5230:3 */
+type ISynchronizeContainerVtbl = ISynchronizeContainerVtbl1 /* objidlbase.h:4634:3 */
 type ISynchronizeMutexVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51582,30 +52156,30 @@ type ISynchronizeMutexVtbl1 = struct {
 	FSignal         uintptr
 	FReset          uintptr
 	FReleaseMutex   uintptr
-} /* objidlbase.h:192:9 */
+} /* objidlbase.h:295:9 */
 
-type ISynchronizeMutexVtbl = ISynchronizeMutexVtbl1 /* objidlbase.h:5340:3 */
+type ISynchronizeMutexVtbl = ISynchronizeMutexVtbl1 /* objidlbase.h:4727:3 */
 
 // ****************************************************************************
 //
 // ICancelMethodCalls interface
 
-type LPCANCELMETHODCALLS = uintptr /* objidlbase.h:5404:28 */
+type LPCANCELMETHODCALLS = uintptr /* objidlbase.h:4785:28 */
 type ICancelMethodCallsVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FCancel         uintptr
 	FTestCancel     uintptr
-} /* objidlbase.h:197:9 */
+} /* objidlbase.h:303:9 */
 
-type ICancelMethodCallsVtbl = ICancelMethodCallsVtbl1 /* objidlbase.h:5446:3 */
+type ICancelMethodCallsVtbl = ICancelMethodCallsVtbl1 /* objidlbase.h:4827:3 */
 
 // ****************************************************************************
 //
 // IAsyncManager interface
 
-type DCOM_CALL_STATE = uint32 /* objidlbase.h:5512:3 */
+type DCOM_CALL_STATE = uint32 /* objidlbase.h:4879:3 */
 type IAsyncManagerVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -51613,108 +52187,108 @@ type IAsyncManagerVtbl1 = struct {
 	FCompleteCall   uintptr
 	FGetCallContext uintptr
 	FGetState       uintptr
-} /* objidlbase.h:202:9 */
+} /* objidlbase.h:311:9 */
 
-type IAsyncManagerVtbl = IAsyncManagerVtbl1 /* objidlbase.h:5564:3 */
+type IAsyncManagerVtbl = IAsyncManagerVtbl1 /* objidlbase.h:4931:3 */
 type ICallFactoryVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FCreateCall     uintptr
-} /* objidlbase.h:207:9 */
+} /* objidlbase.h:319:9 */
 
-type ICallFactoryVtbl = ICallFactoryVtbl1 /* objidlbase.h:5680:3 */
+type ICallFactoryVtbl = ICallFactoryVtbl1 /* objidlbase.h:5023:3 */
 type IRpcHelperVtbl1 = struct {
 	FQueryInterface         uintptr
 	FAddRef                 uintptr
 	FRelease                uintptr
 	FGetDCOMProtocolVersion uintptr
 	FGetIIDFromOBJREF       uintptr
-} /* objidlbase.h:212:9 */
+} /* objidlbase.h:327:9 */
 
-type IRpcHelperVtbl = IRpcHelperVtbl1 /* objidlbase.h:5777:3 */
+type IRpcHelperVtbl = IRpcHelperVtbl1 /* objidlbase.h:5110:3 */
 type IReleaseMarshalBuffersVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
 	FRelease              uintptr
 	FReleaseMarshalBuffer uintptr
-} /* objidlbase.h:217:9 */
+} /* objidlbase.h:335:9 */
 
-type IReleaseMarshalBuffersVtbl = IReleaseMarshalBuffersVtbl1 /* objidlbase.h:5879:3 */
+type IReleaseMarshalBuffersVtbl = IReleaseMarshalBuffersVtbl1 /* objidlbase.h:5196:3 */
 type IWaitMultipleVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FWaitMultiple   uintptr
 	FAddSynchronize uintptr
-} /* objidlbase.h:222:9 */
+} /* objidlbase.h:343:9 */
 
-type IWaitMultipleVtbl = IWaitMultipleVtbl1 /* objidlbase.h:5975:3 */
+type IWaitMultipleVtbl = IWaitMultipleVtbl1 /* objidlbase.h:5283:3 */
 
 // ****************************************************************************
 //
 // IAddrTrackingControl interface
 
-type LPADDRTRACKINGCONTROL = uintptr /* objidlbase.h:6039:30 */
+type LPADDRTRACKINGCONTROL = uintptr /* objidlbase.h:5331:30 */
 type IAddrTrackingControlVtbl1 = struct {
 	FQueryInterface                uintptr
 	FAddRef                        uintptr
 	FRelease                       uintptr
 	FEnableCOMDynamicAddrTracking  uintptr
 	FDisableCOMDynamicAddrTracking uintptr
-} /* objidlbase.h:227:9 */
+} /* objidlbase.h:351:9 */
 
-type IAddrTrackingControlVtbl = IAddrTrackingControlVtbl1 /* objidlbase.h:6079:3 */
+type IAddrTrackingControlVtbl = IAddrTrackingControlVtbl1 /* objidlbase.h:5371:3 */
 
 // ****************************************************************************
 //
 // IAddrExclusionControl interface
 
-type LPADDREXCLUSIONCONTROL = uintptr /* objidlbase.h:6140:31 */
+type LPADDREXCLUSIONCONTROL = uintptr /* objidlbase.h:5419:31 */
 type IAddrExclusionControlVtbl1 = struct {
 	FQueryInterface              uintptr
 	FAddRef                      uintptr
 	FRelease                     uintptr
 	FGetCurrentAddrExclusionList uintptr
 	FUpdateAddrExclusionList     uintptr
-} /* objidlbase.h:232:9 */
+} /* objidlbase.h:359:9 */
 
-type IAddrExclusionControlVtbl = IAddrExclusionControlVtbl1 /* objidlbase.h:6184:3 */
+type IAddrExclusionControlVtbl = IAddrExclusionControlVtbl1 /* objidlbase.h:5463:3 */
 type IPipeByteVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FPull           uintptr
 	FPush           uintptr
-} /* objidlbase.h:237:9 */
+} /* objidlbase.h:367:9 */
 
-type IPipeByteVtbl = IPipeByteVtbl1 /* objidlbase.h:6295:3 */
+type IPipeByteVtbl = IPipeByteVtbl1 /* objidlbase.h:5558:3 */
 type IPipeLongVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FPull           uintptr
 	FPush           uintptr
-} /* objidlbase.h:242:9 */
+} /* objidlbase.h:375:9 */
 
-type IPipeLongVtbl = IPipeLongVtbl1 /* objidlbase.h:6408:3 */
+type IPipeLongVtbl = IPipeLongVtbl1 /* objidlbase.h:5653:3 */
 type IPipeDoubleVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FPull           uintptr
 	FPush           uintptr
-} /* objidlbase.h:247:9 */
+} /* objidlbase.h:383:9 */
 
-type IPipeDoubleVtbl = IPipeDoubleVtbl1 /* objidlbase.h:6521:3 */
+type IPipeDoubleVtbl = IPipeDoubleVtbl1 /* objidlbase.h:5748:3 */
 
-type APTTYPEQUALIFIER = uint32 /* objidlbase.h:6923:3 */
+type APTTYPEQUALIFIER = uint32 /* objidlbase.h:6057:3 */
 
-type APTTYPE = int32 /* objidlbase.h:6931:3 */
+type APTTYPE = int32 /* objidlbase.h:6065:3 */
 
-type THDTYPE = uint32 /* objidlbase.h:6938:3 */
+type THDTYPE = uint32 /* objidlbase.h:6072:3 */
 
-type APARTMENTID = DWORD /* objidlbase.h:6940:15 */
+type APARTMENTID = DWORD /* objidlbase.h:6074:15 */
 type IComThreadingInfoVtbl1 = struct {
 	FQueryInterface            uintptr
 	FAddRef                    uintptr
@@ -51723,26 +52297,26 @@ type IComThreadingInfoVtbl1 = struct {
 	FGetCurrentThreadType      uintptr
 	FGetCurrentLogicalThreadId uintptr
 	FSetCurrentLogicalThreadId uintptr
-} /* objidlbase.h:262:9 */
+} /* objidlbase.h:407:9 */
 
-type IComThreadingInfoVtbl = IComThreadingInfoVtbl1 /* objidlbase.h:7003:3 */
+type IComThreadingInfoVtbl = IComThreadingInfoVtbl1 /* objidlbase.h:6137:3 */
 type IProcessInitControlVtbl1 = struct {
 	FQueryInterface          uintptr
 	FAddRef                  uintptr
 	FRelease                 uintptr
 	FResetInitializerTimeout uintptr
-} /* objidlbase.h:267:9 */
+} /* objidlbase.h:415:9 */
 
-type IProcessInitControlVtbl = IProcessInitControlVtbl1 /* objidlbase.h:7124:3 */
+type IProcessInitControlVtbl = IProcessInitControlVtbl1 /* objidlbase.h:6227:3 */
 type IFastRundownVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
-} /* objidlbase.h:272:9 */
+} /* objidlbase.h:423:9 */
 
-type IFastRundownVtbl = IFastRundownVtbl1 /* objidlbase.h:7201:3 */
+type IFastRundownVtbl = IFastRundownVtbl1 /* objidlbase.h:6297:3 */
 
-type CO_MARSHALING_CONTEXT_ATTRIBUTES = uint32 /* objidlbase.h:7234:3 */
+type CO_MARSHALING_CONTEXT_ATTRIBUTES = uint32 /* objidlbase.h:6331:3 */
 type IMarshalingStreamVtbl1 = struct {
 	FQueryInterface                uintptr
 	FAddRef                        uintptr
@@ -51759,11 +52333,11 @@ type IMarshalingStreamVtbl1 = struct {
 	FStat                          uintptr
 	FClone                         uintptr
 	FGetMarshalingContextAttribute uintptr
-} /* objidlbase.h:277:9 */
+} /* objidlbase.h:431:9 */
 
-type IMarshalingStreamVtbl = IMarshalingStreamVtbl1 /* objidlbase.h:7337:3 */
+type IMarshalingStreamVtbl = IMarshalingStreamVtbl1 /* objidlbase.h:6434:3 */
 
-type STDMSHLFLAGS = uint32 /* combaseapi.h:217:3 */
+type STDMSHLFLAGS = uint32 /* combaseapi.h:219:3 */
 
 type tagPROPVARIANT = struct {
 	F__0 struct {
@@ -51773,20 +52347,20 @@ type tagPROPVARIANT = struct {
 			FwReserved2 PROPVAR_PAD2
 			FwReserved3 PROPVAR_PAD3
 			F__8        struct {
-				_     [0]uint64
-				FcVal CHAR
-				_     [15]byte
+				F__ccgo_pad1 [0]uint64
+				FcVal        CHAR
+				F__ccgo_pad2 [15]byte
 			}
 		}
 	}
-} /* combaseapi.h:306:9 */
+} /* combaseapi.h:308:9 */
 
-type PROPVARIANT = tagPROPVARIANT /* combaseapi.h:306:31 */
+type PROPVARIANT = tagPROPVARIANT /* combaseapi.h:308:31 */
 
-type COWAIT_FLAGS = uint32 /* combaseapi.h:329:3 */
+type COWAIT_FLAGS = uint32 /* combaseapi.h:331:3 */
 
-type LPFNGETCLASSOBJECT = uintptr /* combaseapi.h:356:17 */
-type LPFNCANUNLOADNOW = uintptr   /* combaseapi.h:357:17 */
+type LPFNGETCLASSOBJECT = uintptr /* combaseapi.h:358:17 */
+type LPFNCANUNLOADNOW = uintptr   /* combaseapi.h:359:17 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -52032,148 +52606,148 @@ type tagRemHGLOBAL = struct {
 	FfNullHGlobal LONG
 	FcbData       ULONG
 	Fdata         [1]Byte
-	_             [3]byte
-} /* wtypes.h:42:9 */
+	F__ccgo_pad1  [3]byte
+} /* wtypes.h:43:9 */
 
-type RemHGLOBAL = tagRemHGLOBAL /* wtypes.h:46:3 */
+type RemHGLOBAL = tagRemHGLOBAL /* wtypes.h:47:3 */
 
 type tagRemHMETAFILEPICT = struct {
-	Fmm     LONG
-	FxExt   LONG
-	FyExt   LONG
-	FcbData ULONG
-	Fdata   [1]Byte
-	_       [3]byte
-} /* wtypes.h:48:9 */
+	Fmm          LONG
+	FxExt        LONG
+	FyExt        LONG
+	FcbData      ULONG
+	Fdata        [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypes.h:49:9 */
 
-type RemHMETAFILEPICT = tagRemHMETAFILEPICT /* wtypes.h:54:3 */
+type RemHMETAFILEPICT = tagRemHMETAFILEPICT /* wtypes.h:55:3 */
 
 type tagRemHENHMETAFILE = struct {
-	FcbData ULONG
-	Fdata   [1]Byte
-	_       [3]byte
-} /* wtypes.h:56:9 */
+	FcbData      ULONG
+	Fdata        [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypes.h:57:9 */
 
-type RemHENHMETAFILE = tagRemHENHMETAFILE /* wtypes.h:59:3 */
+type RemHENHMETAFILE = tagRemHENHMETAFILE /* wtypes.h:60:3 */
 type tagRemHBITMAP = struct {
-	FcbData ULONG
-	Fdata   [1]Byte
-	_       [3]byte
-} /* wtypes.h:60:9 */
+	FcbData      ULONG
+	Fdata        [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypes.h:61:9 */
 
-type RemHBITMAP = tagRemHBITMAP /* wtypes.h:63:3 */
+type RemHBITMAP = tagRemHBITMAP /* wtypes.h:64:3 */
 
 type tagRemHPALETTE = struct {
-	FcbData ULONG
-	Fdata   [1]Byte
-	_       [3]byte
-} /* wtypes.h:65:9 */
+	FcbData      ULONG
+	Fdata        [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypes.h:66:9 */
 
-type RemHPALETTE = tagRemHPALETTE /* wtypes.h:68:3 */
+type RemHPALETTE = tagRemHPALETTE /* wtypes.h:69:3 */
 
 type tagRemBRUSH = struct {
-	FcbData ULONG
-	Fdata   [1]Byte
-	_       [3]byte
-} /* wtypes.h:70:9 */
+	FcbData      ULONG
+	Fdata        [1]Byte
+	F__ccgo_pad1 [3]byte
+} /* wtypes.h:71:9 */
 
-type RemHBRUSH = tagRemBRUSH /* wtypes.h:73:3 */
+type RemHBRUSH = tagRemBRUSH /* wtypes.h:74:3 */
 
-type DVASPECT = uint32 /* wtypes.h:186:3 */
+type DVASPECT = uint32 /* wtypes.h:187:3 */
 
-type STGC = uint32 /* wtypes.h:194:3 */
+type STGC = uint32 /* wtypes.h:195:3 */
 
-type STGMOVE = uint32 /* wtypes.h:200:3 */
+type STGMOVE = uint32 /* wtypes.h:201:3 */
 
-type STATFLAG = uint32  /* wtypes.h:206:3 */
-type HCONTEXT = uintptr /* wtypes.h:207:14 */
+type STATFLAG = uint32  /* wtypes.h:207:3 */
+type HCONTEXT = uintptr /* wtypes.h:208:14 */
 
 type _userCLIPFORMAT = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FdwValue DWORD
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FdwValue     DWORD
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:226:9 */
+} /* wtypes.h:227:9 */
 
-type UserCLIPFORMAT = _userCLIPFORMAT /* wtypes.h:232:3 */
+type UserCLIPFORMAT = _userCLIPFORMAT /* wtypes.h:233:3 */
 
-type WireCLIPFORMAT = uintptr /* wtypes.h:234:24 */
-type CLIPFORMAT = WORD        /* wtypes.h:235:14 */
+type WireCLIPFORMAT = uintptr /* wtypes.h:235:24 */
+type CLIPFORMAT = WORD        /* wtypes.h:236:14 */
 
 type _GDI_NONREMOTE = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:237:9 */
+} /* wtypes.h:238:9 */
 
-type GDI_NONREMOTE = _GDI_NONREMOTE /* wtypes.h:243:3 */
+type GDI_NONREMOTE = _GDI_NONREMOTE /* wtypes.h:244:3 */
 
 type _userHGLOBAL = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:245:9 */
+} /* wtypes.h:246:9 */
 
-type UserHGLOBAL = _userHGLOBAL /* wtypes.h:252:3 */
+type UserHGLOBAL = _userHGLOBAL /* wtypes.h:253:3 */
 
-type WireHGLOBAL = uintptr /* wtypes.h:254:21 */
+type WireHGLOBAL = uintptr /* wtypes.h:255:21 */
 
 type _userHMETAFILE = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:256:9 */
+} /* wtypes.h:257:9 */
 
-type UserHMETAFILE = _userHMETAFILE /* wtypes.h:263:3 */
+type UserHMETAFILE = _userHMETAFILE /* wtypes.h:264:3 */
 
 type _remoteMETAFILEPICT = struct {
-	Fmm   LONG
-	FxExt LONG
-	FyExt LONG
-	_     [4]byte
-	FhMF  uintptr
-} /* wtypes.h:265:9 */
+	Fmm          LONG
+	FxExt        LONG
+	FyExt        LONG
+	F__ccgo_pad1 [4]byte
+	FhMF         uintptr
+} /* wtypes.h:266:9 */
 
-type RemoteMETAFILEPICT = _remoteMETAFILEPICT /* wtypes.h:270:3 */
+type RemoteMETAFILEPICT = _remoteMETAFILEPICT /* wtypes.h:271:3 */
 
 type _userHMETAFILEPICT = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:272:9 */
+} /* wtypes.h:273:9 */
 
-type UserHMETAFILEPICT = _userHMETAFILEPICT /* wtypes.h:279:3 */
+type UserHMETAFILEPICT = _userHMETAFILEPICT /* wtypes.h:280:3 */
 
 type _userHENHMETAFILE = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:281:9 */
+} /* wtypes.h:282:9 */
 
-type UserHENHMETAFILE = _userHENHMETAFILE /* wtypes.h:288:3 */
+type UserHENHMETAFILE = _userHENHMETAFILE /* wtypes.h:289:3 */
 
 type _userBITMAP = struct {
 	FbmType       LONG
@@ -52184,122 +52758,122 @@ type _userBITMAP = struct {
 	FbmBitsPixel  WORD
 	FcbSize       ULONG
 	FpBuffer      [1]Byte
-	_             [3]byte
-} /* wtypes.h:290:9 */
+	F__ccgo_pad1  [3]byte
+} /* wtypes.h:291:9 */
 
-type UserBITMAP = _userBITMAP /* wtypes.h:299:3 */
+type UserBITMAP = _userBITMAP /* wtypes.h:300:3 */
 
 type _userHBITMAP = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:301:9 */
+} /* wtypes.h:302:9 */
 
-type UserHBITMAP = _userHBITMAP /* wtypes.h:308:3 */
+type UserHBITMAP = _userHBITMAP /* wtypes.h:309:3 */
 
 type _userHPALETTE = struct {
-	FfContext LONG
-	_         [4]byte
-	Fu        struct {
-		_        [0]uint64
-		FhInproc LONG
-		_        [4]byte
+	FfContext    LONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FhInproc     LONG
+		F__ccgo_pad2 [4]byte
 	}
-} /* wtypes.h:310:9 */
+} /* wtypes.h:311:9 */
 
-type UserHPALETTE = _userHPALETTE /* wtypes.h:317:3 */
+type UserHPALETTE = _userHPALETTE /* wtypes.h:318:3 */
 
 type _RemotableHandle = struct {
 	FfContext LONG
 	Fu        struct{ FhInproc LONG }
-} /* wtypes.h:319:9 */
+} /* wtypes.h:320:9 */
 
-type RemotableHandle = _RemotableHandle /* wtypes.h:325:3 */
+type RemotableHandle = _RemotableHandle /* wtypes.h:326:3 */
 
-type WireHWND = uintptr     /* wtypes.h:327:25 */
-type WireHMENU = uintptr    /* wtypes.h:328:25 */
-type WireHACCEL = uintptr   /* wtypes.h:329:25 */
-type WireHBRUSH = uintptr   /* wtypes.h:330:25 */
-type WireHFONT = uintptr    /* wtypes.h:331:25 */
-type WireHDC = uintptr      /* wtypes.h:332:25 */
-type WireHICON = uintptr    /* wtypes.h:333:25 */
-type WireHRGN = uintptr     /* wtypes.h:334:25 */
-type WireHMONITOR = uintptr /* wtypes.h:335:25 */
+type WireHWND = uintptr     /* wtypes.h:328:25 */
+type WireHMENU = uintptr    /* wtypes.h:329:25 */
+type WireHACCEL = uintptr   /* wtypes.h:330:25 */
+type WireHBRUSH = uintptr   /* wtypes.h:331:25 */
+type WireHFONT = uintptr    /* wtypes.h:332:25 */
+type WireHDC = uintptr      /* wtypes.h:333:25 */
+type WireHICON = uintptr    /* wtypes.h:334:25 */
+type WireHRGN = uintptr     /* wtypes.h:335:25 */
+type WireHMONITOR = uintptr /* wtypes.h:336:25 */
 
-type WireHBITMAP = uintptr       /* wtypes.h:400:21 */
-type WireHPALETTE = uintptr      /* wtypes.h:401:22 */
-type WireHENHMETAFILE = uintptr  /* wtypes.h:402:26 */
-type WireHMETAFILE = uintptr     /* wtypes.h:403:23 */
-type WireHMETAFILEPICT = uintptr /* wtypes.h:404:27 */
+type WireHBITMAP = uintptr       /* wtypes.h:401:21 */
+type WireHPALETTE = uintptr      /* wtypes.h:402:22 */
+type WireHENHMETAFILE = uintptr  /* wtypes.h:403:26 */
+type WireHMETAFILE = uintptr     /* wtypes.h:404:23 */
+type WireHMETAFILEPICT = uintptr /* wtypes.h:405:27 */
 
-type HMETAFILEPICT = uintptr /* wtypes.h:415:14 */
+type HMETAFILEPICT = uintptr /* wtypes.h:416:14 */
 
-type DATE = float64 /* wtypes.h:420:16 */
+type DATE = float64 /* wtypes.h:421:16 */
 
 type tagCY = struct {
-	_  [0]uint64
-	Fs struct {
+	F__ccgo_pad1 [0]uint64
+	Fs           struct {
 		FLo uint32
 		FHi int32
 	}
-} /* wtypes.h:431:9 */
+} /* wtypes.h:432:9 */
 
-type CY = tagCY /* wtypes.h:437:3 */
+type CY = tagCY /* wtypes.h:438:3 */
 
-type LPCY = uintptr /* wtypes.h:441:12 */
+type LPCY = uintptr /* wtypes.h:442:12 */
 
 type tagDEC = struct {
 	FwReserved USHORT
 	Fu         struct {
-		_  [0]uint16
-		Fs struct {
+		F__ccgo_pad1 [0]uint16
+		Fs           struct {
 			Fscale BYTE
 			Fsign  BYTE
 		}
 	}
 	FHi32 ULONG
 	Fu2   struct {
-		_   [0]uint64
-		Fs2 struct {
+		F__ccgo_pad1 [0]uint64
+		Fs2          struct {
 			FLo32  ULONG
 			FMid32 ULONG
 		}
 	}
-} /* wtypes.h:452:9 */
+} /* wtypes.h:453:9 */
 
-type DECIMAL = tagDEC /* wtypes.h:469:3 */
+type DECIMAL = tagDEC /* wtypes.h:470:3 */
 
-type LPDECIMAL = uintptr /* wtypes.h:475:17 */
+type LPDECIMAL = uintptr /* wtypes.h:476:17 */
 
-type WireBSTR = uintptr /* wtypes.h:477:27 */
-type BSTR = uintptr     /* wtypes.h:478:17 */
+type WireBSTR = uintptr /* wtypes.h:478:27 */
+type BSTR = uintptr     /* wtypes.h:479:17 */
 
-type LPBSTR = uintptr /* wtypes.h:480:14 */
+type LPBSTR = uintptr /* wtypes.h:481:14 */
 
-type VARIANT_BOOL = int16 /* wtypes.h:482:15 */
+type VARIANT_BOOL = int16 /* wtypes.h:483:15 */
 
 type tagBSTRBLOB = struct {
-	FcbSize ULONG
-	_       [4]byte
-	FpData  uintptr
-} /* wtypes.h:492:9 */
+	FcbSize      ULONG
+	F__ccgo_pad1 [4]byte
+	FpData       uintptr
+} /* wtypes.h:493:9 */
 
-type BSTRBLOB = tagBSTRBLOB /* wtypes.h:495:3 */
-type LPBSTRBLOB = uintptr   /* wtypes.h:496:28 */
+type BSTRBLOB = tagBSTRBLOB /* wtypes.h:496:3 */
+type LPBSTRBLOB = uintptr   /* wtypes.h:497:28 */
 
 type tagCLIPDATA = struct {
 	FcbSize    ULONG
 	FulClipFmt LONG
 	FpClipData uintptr
-} /* wtypes.h:502:9 */
+} /* wtypes.h:503:9 */
 
-type CLIPDATA = tagCLIPDATA /* wtypes.h:506:3 */
+type CLIPDATA = tagCLIPDATA /* wtypes.h:507:3 */
 
-type VARTYPE = uint16 /* wtypes.h:510:24 */
+type VARTYPE = uint16 /* wtypes.h:511:24 */
 
 type PROPID = ULONG /* wtypes.h:568:15 */
 
@@ -52333,11 +52907,11 @@ type TYSPEC = uint32 /* wtypes.h:602:3 */
 
 type __WIDL_wtypes_generated_name_00000001 = struct {
 	Ftyspec       DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	Ftagged_union struct {
-		_      [0]uint64
-		Fclsid CLSID
-		_      [16]byte
+		F__ccgo_pad1 [0]uint64
+		Fclsid       CLSID
+		F__ccgo_pad2 [16]byte
 	}
 } /* wtypes.h:604:9 */
 
@@ -52374,7 +52948,7 @@ type UCLSSPEC = __WIDL_wtypes_generated_name_00000001 /* wtypes.h:621:3 */
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/wtypes.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -52472,7 +53046,7 @@ type tagBIND_OPTS2 = struct {
 	FdwTrackFlags        DWORD
 	FdwClassContext      DWORD
 	Flocale              LCID
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FpServerInfo         uintptr
 } /* objidl.h:7960:9 */
 
@@ -52486,7 +53060,7 @@ type tagBIND_OPTS3 = struct {
 	FdwTrackFlags        DWORD
 	FdwClassContext      DWORD
 	Flocale              LCID
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FpServerInfo         uintptr
 	Fhwnd                HWND
 } /* objidl.h:7977:9 */
@@ -52665,10 +53239,10 @@ type IEnumSTATSTGVtbl = IEnumSTATSTGVtbl1 /* objidl.h:9711:3 */
 
 type LPSTORAGE = uintptr /* objidl.h:9808:18 */
 type tagRemSNB = struct {
-	FulCntStr  ULONG
-	FulCntChar ULONG
-	FrgString  [1]OLECHAR
-	_          [2]byte
+	FulCntStr    ULONG
+	FulCntChar   ULONG
+	FrgString    [1]OLECHAR
+	F__ccgo_pad1 [2]byte
 } /* objidl.h:9809:9 */
 
 type RemSNB = tagRemSNB /* objidl.h:9813:3 */
@@ -52768,19 +53342,19 @@ type tagDVTARGETDEVICE = struct {
 	FtdPortNameOffset   WORD
 	FtdExtDevmodeOffset WORD
 	FtdData             [1]BYTE
-	_                   [3]byte
+	F__ccgo_pad1        [3]byte
 } /* objidl.h:10927:9 */
 
 type DVTARGETDEVICE = tagDVTARGETDEVICE /* objidl.h:10934:3 */
 type LPCLIPFORMAT = uintptr             /* objidl.h:10935:20 */
 type tagFORMATETC = struct {
-	FcfFormat CLIPFORMAT
-	_         [6]byte
-	Fptd      uintptr
-	FdwAspect DWORD
-	Flindex   LONG
-	Ftymed    DWORD
-	_         [4]byte
+	FcfFormat    CLIPFORMAT
+	F__ccgo_pad1 [6]byte
+	Fptd         uintptr
+	FdwAspect    DWORD
+	Flindex      LONG
+	Ftymed       DWORD
+	F__ccgo_pad2 [4]byte
 } /* objidl.h:10936:9 */
 
 type FORMATETC = tagFORMATETC /* objidl.h:10942:3 */
@@ -52806,10 +53380,10 @@ type ADVF = uint32            /* objidl.h:11108:3 */
 type tagSTATDATA = struct {
 	Fformatetc    FORMATETC
 	Fadvf         DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpAdvSink     uintptr
 	FdwConnection DWORD
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 } /* objidl.h:11109:9 */
 
 type STATDATA = tagSTATDATA /* objidl.h:11114:3 */
@@ -52853,38 +53427,38 @@ type tagRemSTGMEDIUM = struct {
 	FpUnkForRelease ULONG
 	FcbData         ULONG
 	Fdata           [1]Byte
-	_               [3]byte
+	F__ccgo_pad1    [3]byte
 } /* objidl.h:11367:9 */
 
 type RemSTGMEDIUM = tagRemSTGMEDIUM /* objidl.h:11374:3 */
 type tagSTGMEDIUM = struct {
 	Ftymed          DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	Fu              struct{ FhBitmap HBITMAP }
 	FpUnkForRelease uintptr
 } /* objidl.h:11376:9 */
 
 type USTGMEDIUM = tagSTGMEDIUM /* objidl.h:11388:2 */
 type _GDI_OBJECT = struct {
-	FObjectType DWORD
-	_           [4]byte
-	Fu          struct{ FhBitmap WireHBITMAP }
+	FObjectType  DWORD
+	F__ccgo_pad1 [4]byte
+	Fu           struct{ FhBitmap WireHBITMAP }
 } /* objidl.h:11404:9 */
 
 type GDI_OBJECT = _GDI_OBJECT /* objidl.h:11411:3 */
 type _userSTGMEDIUM = struct {
 	Fu struct {
-		Ftymed DWORD
-		_      [4]byte
-		Fu     struct{ FhMetaFilePict WireHMETAFILEPICT }
+		Ftymed       DWORD
+		F__ccgo_pad1 [4]byte
+		Fu           struct{ FhMetaFilePict WireHMETAFILEPICT }
 	}
 	FpUnkForRelease uintptr
 } /* objidl.h:11412:9 */
 
 type _STGMEDIUM_UNION = struct {
-	Ftymed DWORD
-	_      [4]byte
-	Fu     struct{ FhMetaFilePict WireHMETAFILEPICT }
+	Ftymed       DWORD
+	F__ccgo_pad1 [4]byte
+	Fu           struct{ FhMetaFilePict WireHMETAFILEPICT }
 } /* objidl.h:11412:9 */
 
 type UserSTGMEDIUM = _userSTGMEDIUM /* objidl.h:11426:3 */
@@ -53026,10 +53600,10 @@ type SERVERCALL = uint32       /* objidl.h:12739:3 */
 type PENDINGTYPE = uint32      /* objidl.h:12743:3 */
 type PENDINGMSG = uint32       /* objidl.h:12748:3 */
 type tagINTERFACEINFO = struct {
-	FpUnk    uintptr
-	Fiid     IID
-	FwMethod WORD
-	_        [6]byte
+	FpUnk        uintptr
+	Fiid         IID
+	FwMethod     WORD
+	F__ccgo_pad1 [6]byte
 } /* objidl.h:12749:9 */
 
 type INTERFACEINFO = tagINTERFACEINFO /* objidl.h:12753:3 */
@@ -53078,7 +53652,7 @@ type IProgressNotifyVtbl = IProgressNotifyVtbl1 /* objidl.h:13233:3 */
 
 type tagStorageLayout = struct {
 	FLayoutType      DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FpwcsElementName uintptr
 	FcOffset         LARGE_INTEGER
 	FcBytes          LARGE_INTEGER
@@ -53231,7 +53805,7 @@ type tagSTGOPTIONS = struct {
 
 type STGOPTIONS = tagSTGOPTIONS /* objbase.h:137:3 */
 
-//** Autogenerated by WIDL 1.6 from include/urlmon.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/urlmon.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -53267,9 +53841,9 @@ type STGOPTIONS = tagSTGOPTIONS /* objbase.h:137:3 */
 
 // Forward declarations
 
-type IPersistMoniker1 = struct{ FlpVtbl uintptr } /* urlmon.h:22:9 */
+type IPersistMoniker1 = struct{ FlpVtbl uintptr } /* urlmon.h:23:9 */
 
-//** Autogenerated by WIDL 1.6 from include/urlmon.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/urlmon.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -53305,167 +53879,167 @@ type IPersistMoniker1 = struct{ FlpVtbl uintptr } /* urlmon.h:22:9 */
 
 // Forward declarations
 
-type IPersistMoniker = IPersistMoniker1 /* urlmon.h:22:35 */
+type IPersistMoniker = IPersistMoniker1 /* urlmon.h:23:35 */
 
-type IMonikerProp1 = struct{ FlpVtbl uintptr } /* urlmon.h:27:9 */
+type IMonikerProp1 = struct{ FlpVtbl uintptr } /* urlmon.h:31:9 */
 
-type IMonikerProp = IMonikerProp1 /* urlmon.h:27:32 */
+type IMonikerProp = IMonikerProp1 /* urlmon.h:31:32 */
 
-type IBindProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:32:9 */
+type IBindProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:39:9 */
 
-type IBindProtocol = IBindProtocol1 /* urlmon.h:32:33 */
+type IBindProtocol = IBindProtocol1 /* urlmon.h:39:33 */
 
-type IBinding1 = struct{ FlpVtbl uintptr } /* urlmon.h:37:9 */
+type IBinding1 = struct{ FlpVtbl uintptr } /* urlmon.h:47:9 */
 
-type IBinding = IBinding1 /* urlmon.h:37:28 */
+type IBinding = IBinding1 /* urlmon.h:47:28 */
 
-type IBindStatusCallback1 = struct{ FlpVtbl uintptr } /* urlmon.h:42:9 */
+type IBindStatusCallback1 = struct{ FlpVtbl uintptr } /* urlmon.h:55:9 */
 
-type IBindStatusCallback = IBindStatusCallback1 /* urlmon.h:42:39 */
+type IBindStatusCallback = IBindStatusCallback1 /* urlmon.h:55:39 */
 
-type IBindStatusCallbackEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:47:9 */
+type IBindStatusCallbackEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:63:9 */
 
-type IBindStatusCallbackEx = IBindStatusCallbackEx1 /* urlmon.h:47:41 */
+type IBindStatusCallbackEx = IBindStatusCallbackEx1 /* urlmon.h:63:41 */
 
-type IAuthenticate1 = struct{ FlpVtbl uintptr } /* urlmon.h:52:9 */
+type IAuthenticate1 = struct{ FlpVtbl uintptr } /* urlmon.h:71:9 */
 
-type IAuthenticate = IAuthenticate1 /* urlmon.h:52:33 */
+type IAuthenticate = IAuthenticate1 /* urlmon.h:71:33 */
 
-type IAuthenticateEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:57:9 */
+type IAuthenticateEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:79:9 */
 
-type IAuthenticateEx = IAuthenticateEx1 /* urlmon.h:57:35 */
+type IAuthenticateEx = IAuthenticateEx1 /* urlmon.h:79:35 */
 
-type IHttpNegotiate1 = struct{ FlpVtbl uintptr } /* urlmon.h:62:9 */
+type IHttpNegotiate1 = struct{ FlpVtbl uintptr } /* urlmon.h:87:9 */
 
-type IHttpNegotiate = IHttpNegotiate1 /* urlmon.h:62:34 */
+type IHttpNegotiate = IHttpNegotiate1 /* urlmon.h:87:34 */
 
-type IHttpNegotiate21 = struct{ FlpVtbl uintptr } /* urlmon.h:67:9 */
+type IHttpNegotiate21 = struct{ FlpVtbl uintptr } /* urlmon.h:95:9 */
 
-type IHttpNegotiate2 = IHttpNegotiate21 /* urlmon.h:67:35 */
+type IHttpNegotiate2 = IHttpNegotiate21 /* urlmon.h:95:35 */
 
-type IHttpNegotiate31 = struct{ FlpVtbl uintptr } /* urlmon.h:72:9 */
+type IHttpNegotiate31 = struct{ FlpVtbl uintptr } /* urlmon.h:103:9 */
 
-type IHttpNegotiate3 = IHttpNegotiate31 /* urlmon.h:72:35 */
+type IHttpNegotiate3 = IHttpNegotiate31 /* urlmon.h:103:35 */
 
-type IWinInetFileStream1 = struct{ FlpVtbl uintptr } /* urlmon.h:77:9 */
+type IWinInetFileStream1 = struct{ FlpVtbl uintptr } /* urlmon.h:111:9 */
 
-type IWinInetFileStream = IWinInetFileStream1 /* urlmon.h:77:38 */
+type IWinInetFileStream = IWinInetFileStream1 /* urlmon.h:111:38 */
 
-type IWindowForBindingUI1 = struct{ FlpVtbl uintptr } /* urlmon.h:82:9 */
+type IWindowForBindingUI1 = struct{ FlpVtbl uintptr } /* urlmon.h:119:9 */
 
-type IWindowForBindingUI = IWindowForBindingUI1 /* urlmon.h:82:39 */
+type IWindowForBindingUI = IWindowForBindingUI1 /* urlmon.h:119:39 */
 
-type ICodeInstall1 = struct{ FlpVtbl uintptr } /* urlmon.h:87:9 */
+type ICodeInstall1 = struct{ FlpVtbl uintptr } /* urlmon.h:127:9 */
 
-type ICodeInstall = ICodeInstall1 /* urlmon.h:87:32 */
+type ICodeInstall = ICodeInstall1 /* urlmon.h:127:32 */
 
-type IWinInetInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:112:9 */
+type IWinInetInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:167:9 */
 
-type IWinInetInfo = IWinInetInfo1 /* urlmon.h:112:32 */
+type IWinInetInfo = IWinInetInfo1 /* urlmon.h:167:32 */
 
-type IHttpSecurity1 = struct{ FlpVtbl uintptr } /* urlmon.h:117:9 */
+type IHttpSecurity1 = struct{ FlpVtbl uintptr } /* urlmon.h:175:9 */
 
-type IHttpSecurity = IHttpSecurity1 /* urlmon.h:117:33 */
+type IHttpSecurity = IHttpSecurity1 /* urlmon.h:175:33 */
 
-type IWinInetHttpInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:122:9 */
+type IWinInetHttpInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:183:9 */
 
-type IWinInetHttpInfo = IWinInetHttpInfo1 /* urlmon.h:122:36 */
+type IWinInetHttpInfo = IWinInetHttpInfo1 /* urlmon.h:183:36 */
 
-type IWinInetHttpTimeouts1 = struct{ FlpVtbl uintptr } /* urlmon.h:127:9 */
+type IWinInetHttpTimeouts1 = struct{ FlpVtbl uintptr } /* urlmon.h:191:9 */
 
-type IWinInetHttpTimeouts = IWinInetHttpTimeouts1 /* urlmon.h:127:40 */
+type IWinInetHttpTimeouts = IWinInetHttpTimeouts1 /* urlmon.h:191:40 */
 
-type IBindHost1 = struct{ FlpVtbl uintptr } /* urlmon.h:142:9 */
+type IBindHost1 = struct{ FlpVtbl uintptr } /* urlmon.h:215:9 */
 
-type IBindHost = IBindHost1 /* urlmon.h:142:29 */
+type IBindHost = IBindHost1 /* urlmon.h:215:29 */
 
-type IInternet1 = struct{ FlpVtbl uintptr } /* urlmon.h:147:9 */
+type IInternet1 = struct{ FlpVtbl uintptr } /* urlmon.h:223:9 */
 
-type IInternet = IInternet1 /* urlmon.h:147:29 */
+type IInternet = IInternet1 /* urlmon.h:223:29 */
 
-type IInternetBindInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:152:9 */
+type IInternetBindInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:231:9 */
 
-type IInternetBindInfo = IInternetBindInfo1 /* urlmon.h:152:37 */
+type IInternetBindInfo = IInternetBindInfo1 /* urlmon.h:231:37 */
 
-type IInternetBindInfoEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:157:9 */
+type IInternetBindInfoEx1 = struct{ FlpVtbl uintptr } /* urlmon.h:239:9 */
 
-type IInternetBindInfoEx = IInternetBindInfoEx1 /* urlmon.h:157:39 */
+type IInternetBindInfoEx = IInternetBindInfoEx1 /* urlmon.h:239:39 */
 
-type IInternetProtocolRoot1 = struct{ FlpVtbl uintptr } /* urlmon.h:162:9 */
+type IInternetProtocolRoot1 = struct{ FlpVtbl uintptr } /* urlmon.h:247:9 */
 
-type IInternetProtocolRoot = IInternetProtocolRoot1 /* urlmon.h:162:41 */
+type IInternetProtocolRoot = IInternetProtocolRoot1 /* urlmon.h:247:41 */
 
-type IInternetProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:167:9 */
+type IInternetProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:255:9 */
 
-type IInternetProtocol = IInternetProtocol1 /* urlmon.h:167:37 */
+type IInternetProtocol = IInternetProtocol1 /* urlmon.h:255:37 */
 
-type IInternetProtocolSink1 = struct{ FlpVtbl uintptr } /* urlmon.h:177:9 */
+type IInternetProtocolSink1 = struct{ FlpVtbl uintptr } /* urlmon.h:271:9 */
 
-type IInternetProtocolSink = IInternetProtocolSink1 /* urlmon.h:177:41 */
+type IInternetProtocolSink = IInternetProtocolSink1 /* urlmon.h:271:41 */
 
-type IInternetProtocolSinkStackable1 = struct{ FlpVtbl uintptr } /* urlmon.h:182:9 */
+type IInternetProtocolSinkStackable1 = struct{ FlpVtbl uintptr } /* urlmon.h:279:9 */
 
-type IInternetProtocolSinkStackable = IInternetProtocolSinkStackable1 /* urlmon.h:182:50 */
+type IInternetProtocolSinkStackable = IInternetProtocolSinkStackable1 /* urlmon.h:279:50 */
 
-type IInternetSession1 = struct{ FlpVtbl uintptr } /* urlmon.h:187:9 */
+type IInternetSession1 = struct{ FlpVtbl uintptr } /* urlmon.h:287:9 */
 
-type IInternetSession = IInternetSession1 /* urlmon.h:187:36 */
+type IInternetSession = IInternetSession1 /* urlmon.h:287:36 */
 
-type IInternetThreadSwitch1 = struct{ FlpVtbl uintptr } /* urlmon.h:192:9 */
+type IInternetThreadSwitch1 = struct{ FlpVtbl uintptr } /* urlmon.h:295:9 */
 
-type IInternetThreadSwitch = IInternetThreadSwitch1 /* urlmon.h:192:41 */
+type IInternetThreadSwitch = IInternetThreadSwitch1 /* urlmon.h:295:41 */
 
-type IInternetPriority1 = struct{ FlpVtbl uintptr } /* urlmon.h:197:9 */
+type IInternetPriority1 = struct{ FlpVtbl uintptr } /* urlmon.h:303:9 */
 
-type IInternetPriority = IInternetPriority1 /* urlmon.h:197:37 */
+type IInternetPriority = IInternetPriority1 /* urlmon.h:303:37 */
 
-type IInternetProtocolInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:202:9 */
+type IInternetProtocolInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:311:9 */
 
-type IInternetProtocolInfo = IInternetProtocolInfo1 /* urlmon.h:202:41 */
+type IInternetProtocolInfo = IInternetProtocolInfo1 /* urlmon.h:311:41 */
 
-type IInternetSecurityMgrSite1 = struct{ FlpVtbl uintptr } /* urlmon.h:207:9 */
+type IInternetSecurityMgrSite1 = struct{ FlpVtbl uintptr } /* urlmon.h:319:9 */
 
-type IInternetSecurityMgrSite = IInternetSecurityMgrSite1 /* urlmon.h:207:44 */
+type IInternetSecurityMgrSite = IInternetSecurityMgrSite1 /* urlmon.h:319:44 */
 
-type IInternetSecurityManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:212:9 */
+type IInternetSecurityManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:327:9 */
 
-type IInternetSecurityManager = IInternetSecurityManager1 /* urlmon.h:212:44 */
+type IInternetSecurityManager = IInternetSecurityManager1 /* urlmon.h:327:44 */
 
-type IInternetHostSecurityManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:232:9 */
+type IInternetHostSecurityManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:359:9 */
 
-type IInternetHostSecurityManager = IInternetHostSecurityManager1 /* urlmon.h:232:48 */
+type IInternetHostSecurityManager = IInternetHostSecurityManager1 /* urlmon.h:359:48 */
 
-type IInternetZoneManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:237:9 */
+type IInternetZoneManager1 = struct{ FlpVtbl uintptr } /* urlmon.h:367:9 */
 
-type IInternetZoneManager = IInternetZoneManager1 /* urlmon.h:237:40 */
+type IInternetZoneManager = IInternetZoneManager1 /* urlmon.h:367:40 */
 
-type ISoftDistExt1 = struct{ FlpVtbl uintptr } /* urlmon.h:252:9 */
+type ISoftDistExt1 = struct{ FlpVtbl uintptr } /* urlmon.h:391:9 */
 
-type ISoftDistExt = ISoftDistExt1 /* urlmon.h:252:32 */
+type ISoftDistExt = ISoftDistExt1 /* urlmon.h:391:32 */
 
-type ICatalogFileInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:257:9 */
+type ICatalogFileInfo1 = struct{ FlpVtbl uintptr } /* urlmon.h:399:9 */
 
-type ICatalogFileInfo = ICatalogFileInfo1 /* urlmon.h:257:36 */
+type ICatalogFileInfo = ICatalogFileInfo1 /* urlmon.h:399:36 */
 
-type IDataFilter1 = struct{ FlpVtbl uintptr } /* urlmon.h:262:9 */
+type IDataFilter1 = struct{ FlpVtbl uintptr } /* urlmon.h:407:9 */
 
-type IDataFilter = IDataFilter1 /* urlmon.h:262:31 */
+type IDataFilter = IDataFilter1 /* urlmon.h:407:31 */
 
-type IEncodingFilterFactory1 = struct{ FlpVtbl uintptr } /* urlmon.h:267:9 */
+type IEncodingFilterFactory1 = struct{ FlpVtbl uintptr } /* urlmon.h:415:9 */
 
-type IEncodingFilterFactory = IEncodingFilterFactory1 /* urlmon.h:267:42 */
+type IEncodingFilterFactory = IEncodingFilterFactory1 /* urlmon.h:415:42 */
 
-type IWrappedProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:272:9 */
+type IWrappedProtocol1 = struct{ FlpVtbl uintptr } /* urlmon.h:423:9 */
 
-type IWrappedProtocol = IWrappedProtocol1 /* urlmon.h:272:36 */
+type IWrappedProtocol = IWrappedProtocol1 /* urlmon.h:423:36 */
 
-type IGetBindHandle1 = struct{ FlpVtbl uintptr } /* urlmon.h:277:9 */
+type IGetBindHandle1 = struct{ FlpVtbl uintptr } /* urlmon.h:431:9 */
 
-type IGetBindHandle = IGetBindHandle1 /* urlmon.h:277:34 */
+type IGetBindHandle = IGetBindHandle1 /* urlmon.h:431:34 */
 
-type IBindCallbackRedirect1 = struct{ FlpVtbl uintptr } /* urlmon.h:282:9 */
+type IBindCallbackRedirect1 = struct{ FlpVtbl uintptr } /* urlmon.h:439:9 */
 
-type IBindCallbackRedirect = IBindCallbackRedirect1 /* urlmon.h:282:41 */
+type IBindCallbackRedirect = IBindCallbackRedirect1 /* urlmon.h:439:41 */
 
 // Headers for imported files
 
@@ -53503,7 +54077,7 @@ type IBindCallbackRedirect = IBindCallbackRedirect1 /* urlmon.h:282:41 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oleidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oleidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -53539,7 +54113,7 @@ type IBindCallbackRedirect = IBindCallbackRedirect1 /* urlmon.h:282:41 */
 
 // Forward declarations
 
-type IOleAdviseHolder1 = struct{ FlpVtbl uintptr } /* oleidl.h:22:9 */
+type IOleAdviseHolder1 = struct{ FlpVtbl uintptr } /* oleidl.h:23:9 */
 
 // Headers for imported files
 
@@ -53577,7 +54151,7 @@ type IOleAdviseHolder1 = struct{ FlpVtbl uintptr } /* oleidl.h:22:9 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oleidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oleidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -53613,95 +54187,95 @@ type IOleAdviseHolder1 = struct{ FlpVtbl uintptr } /* oleidl.h:22:9 */
 
 // Forward declarations
 
-type IOleAdviseHolder = IOleAdviseHolder1 /* oleidl.h:22:36 */
+type IOleAdviseHolder = IOleAdviseHolder1 /* oleidl.h:23:36 */
 
-type IOleCache1 = struct{ FlpVtbl uintptr } /* oleidl.h:27:9 */
+type IOleCache1 = struct{ FlpVtbl uintptr } /* oleidl.h:31:9 */
 
-type IOleCache = IOleCache1 /* oleidl.h:27:29 */
+type IOleCache = IOleCache1 /* oleidl.h:31:29 */
 
-type IOleCache21 = struct{ FlpVtbl uintptr } /* oleidl.h:32:9 */
+type IOleCache21 = struct{ FlpVtbl uintptr } /* oleidl.h:39:9 */
 
-type IOleCache2 = IOleCache21 /* oleidl.h:32:30 */
+type IOleCache2 = IOleCache21 /* oleidl.h:39:30 */
 
-type IOleCacheControl1 = struct{ FlpVtbl uintptr } /* oleidl.h:37:9 */
+type IOleCacheControl1 = struct{ FlpVtbl uintptr } /* oleidl.h:47:9 */
 
-type IOleCacheControl = IOleCacheControl1 /* oleidl.h:37:36 */
+type IOleCacheControl = IOleCacheControl1 /* oleidl.h:47:36 */
 
-type IParseDisplayName1 = struct{ FlpVtbl uintptr } /* oleidl.h:42:9 */
+type IParseDisplayName1 = struct{ FlpVtbl uintptr } /* oleidl.h:55:9 */
 
-type IParseDisplayName = IParseDisplayName1 /* oleidl.h:42:37 */
+type IParseDisplayName = IParseDisplayName1 /* oleidl.h:55:37 */
 
-type IOleContainer1 = struct{ FlpVtbl uintptr } /* oleidl.h:47:9 */
+type IOleContainer1 = struct{ FlpVtbl uintptr } /* oleidl.h:63:9 */
 
-type IOleContainer = IOleContainer1 /* oleidl.h:47:33 */
+type IOleContainer = IOleContainer1 /* oleidl.h:63:33 */
 
-type IOleClientSite1 = struct{ FlpVtbl uintptr } /* oleidl.h:52:9 */
+type IOleClientSite1 = struct{ FlpVtbl uintptr } /* oleidl.h:71:9 */
 
-type IOleClientSite = IOleClientSite1 /* oleidl.h:52:34 */
+type IOleClientSite = IOleClientSite1 /* oleidl.h:71:34 */
 
-type IOleObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:57:9 */
+type IOleObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:79:9 */
 
-type IOleObject = IOleObject1 /* oleidl.h:57:30 */
+type IOleObject = IOleObject1 /* oleidl.h:79:30 */
 
-type IOleWindow1 = struct{ FlpVtbl uintptr } /* oleidl.h:62:9 */
+type IOleWindow1 = struct{ FlpVtbl uintptr } /* oleidl.h:87:9 */
 
-type IOleWindow = IOleWindow1 /* oleidl.h:62:30 */
+type IOleWindow = IOleWindow1 /* oleidl.h:87:30 */
 
-type IOleLink1 = struct{ FlpVtbl uintptr } /* oleidl.h:67:9 */
+type IOleLink1 = struct{ FlpVtbl uintptr } /* oleidl.h:95:9 */
 
-type IOleLink = IOleLink1 /* oleidl.h:67:28 */
+type IOleLink = IOleLink1 /* oleidl.h:95:28 */
 
-type IOleItemContainer1 = struct{ FlpVtbl uintptr } /* oleidl.h:72:9 */
+type IOleItemContainer1 = struct{ FlpVtbl uintptr } /* oleidl.h:103:9 */
 
-type IOleItemContainer = IOleItemContainer1 /* oleidl.h:72:37 */
+type IOleItemContainer = IOleItemContainer1 /* oleidl.h:103:37 */
 
-type IOleInPlaceUIWindow1 = struct{ FlpVtbl uintptr } /* oleidl.h:77:9 */
+type IOleInPlaceUIWindow1 = struct{ FlpVtbl uintptr } /* oleidl.h:111:9 */
 
-type IOleInPlaceUIWindow = IOleInPlaceUIWindow1 /* oleidl.h:77:39 */
+type IOleInPlaceUIWindow = IOleInPlaceUIWindow1 /* oleidl.h:111:39 */
 
-type IOleInPlaceActiveObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:82:9 */
+type IOleInPlaceActiveObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:119:9 */
 
-type IOleInPlaceActiveObject = IOleInPlaceActiveObject1 /* oleidl.h:82:43 */
+type IOleInPlaceActiveObject = IOleInPlaceActiveObject1 /* oleidl.h:119:43 */
 
-type IOleInPlaceFrame1 = struct{ FlpVtbl uintptr } /* oleidl.h:87:9 */
+type IOleInPlaceFrame1 = struct{ FlpVtbl uintptr } /* oleidl.h:127:9 */
 
-type IOleInPlaceFrame = IOleInPlaceFrame1 /* oleidl.h:87:36 */
+type IOleInPlaceFrame = IOleInPlaceFrame1 /* oleidl.h:127:36 */
 
-type IOleInPlaceObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:92:9 */
+type IOleInPlaceObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:135:9 */
 
-type IOleInPlaceObject = IOleInPlaceObject1 /* oleidl.h:92:37 */
+type IOleInPlaceObject = IOleInPlaceObject1 /* oleidl.h:135:37 */
 
-type IOleInPlaceSite1 = struct{ FlpVtbl uintptr } /* oleidl.h:97:9 */
+type IOleInPlaceSite1 = struct{ FlpVtbl uintptr } /* oleidl.h:143:9 */
 
-type IOleInPlaceSite = IOleInPlaceSite1 /* oleidl.h:97:35 */
+type IOleInPlaceSite = IOleInPlaceSite1 /* oleidl.h:143:35 */
 
-type IContinue1 = struct{ FlpVtbl uintptr } /* oleidl.h:102:9 */
+type IContinue1 = struct{ FlpVtbl uintptr } /* oleidl.h:151:9 */
 
-type IContinue = IContinue1 /* oleidl.h:102:29 */
+type IContinue = IContinue1 /* oleidl.h:151:29 */
 
-type IViewObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:107:9 */
+type IViewObject1 = struct{ FlpVtbl uintptr } /* oleidl.h:159:9 */
 
-type IViewObject = IViewObject1 /* oleidl.h:107:31 */
+type IViewObject = IViewObject1 /* oleidl.h:159:31 */
 
-type IViewObject21 = struct{ FlpVtbl uintptr } /* oleidl.h:112:9 */
+type IViewObject21 = struct{ FlpVtbl uintptr } /* oleidl.h:167:9 */
 
-type IViewObject2 = IViewObject21 /* oleidl.h:112:32 */
+type IViewObject2 = IViewObject21 /* oleidl.h:167:32 */
 
-type IDropSource1 = struct{ FlpVtbl uintptr } /* oleidl.h:117:9 */
+type IDropSource1 = struct{ FlpVtbl uintptr } /* oleidl.h:175:9 */
 
-type IDropSource = IDropSource1 /* oleidl.h:117:31 */
+type IDropSource = IDropSource1 /* oleidl.h:175:31 */
 
-type IDropTarget1 = struct{ FlpVtbl uintptr } /* oleidl.h:122:9 */
+type IDropTarget1 = struct{ FlpVtbl uintptr } /* oleidl.h:183:9 */
 
-type IDropTarget = IDropTarget1 /* oleidl.h:122:31 */
+type IDropTarget = IDropTarget1 /* oleidl.h:183:31 */
 
-type IDropSourceNotify1 = struct{ FlpVtbl uintptr } /* oleidl.h:127:9 */
+type IDropSourceNotify1 = struct{ FlpVtbl uintptr } /* oleidl.h:191:9 */
 
-type IDropSourceNotify = IDropSourceNotify1 /* oleidl.h:127:37 */
+type IDropSourceNotify = IDropSourceNotify1 /* oleidl.h:191:37 */
 
-type IEnumOLEVERB1 = struct{ FlpVtbl uintptr } /* oleidl.h:132:9 */
+type IEnumOLEVERB1 = struct{ FlpVtbl uintptr } /* oleidl.h:199:9 */
 
-type IEnumOLEVERB = IEnumOLEVERB1 /* oleidl.h:132:32 */
+type IEnumOLEVERB = IEnumOLEVERB1 /* oleidl.h:199:32 */
 
 // Headers for imported files
 
@@ -53751,7 +54325,7 @@ type IEnumOLEVERB = IEnumOLEVERB1 /* oleidl.h:132:32 */
 //
 // IOleAdviseHolder interface
 
-type LPOLEADVISEHOLDER = uintptr /* oleidl.h:169:26 */
+type LPOLEADVISEHOLDER = uintptr /* oleidl.h:245:26 */
 type IOleAdviseHolderVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -53762,15 +54336,15 @@ type IOleAdviseHolderVtbl1 = struct {
 	FSendOnRename   uintptr
 	FSendOnSave     uintptr
 	FSendOnClose    uintptr
-} /* oleidl.h:22:9 */
+} /* oleidl.h:23:9 */
 
-type IOleAdviseHolderVtbl = IOleAdviseHolderVtbl1 /* oleidl.h:240:3 */
+type IOleAdviseHolderVtbl = IOleAdviseHolderVtbl1 /* oleidl.h:316:3 */
 
 // ****************************************************************************
 //
 // IOleCache interface
 
-type LPOLECACHE = uintptr /* oleidl.h:352:19 */
+type LPOLECACHE = uintptr /* oleidl.h:382:19 */
 type IOleCacheVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -53780,17 +54354,17 @@ type IOleCacheVtbl1 = struct {
 	FEnumCache      uintptr
 	FInitCache      uintptr
 	FSetData        uintptr
-} /* oleidl.h:27:9 */
+} /* oleidl.h:31:9 */
 
-type IOleCacheVtbl = IOleCacheVtbl1 /* oleidl.h:424:3 */
+type IOleCacheVtbl = IOleCacheVtbl1 /* oleidl.h:454:3 */
 
 // ****************************************************************************
 //
 // IOleCache2 interface
 
-type LPOLECACHE2 = uintptr /* oleidl.h:527:20 */
+type LPOLECACHE2 = uintptr /* oleidl.h:514:20 */
 
-type DISCARDCACHE = uint32 /* oleidl.h:551:3 */
+type DISCARDCACHE = uint32 /* oleidl.h:538:3 */
 type IOleCache2Vtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -53802,44 +54376,44 @@ type IOleCache2Vtbl1 = struct {
 	FSetData        uintptr
 	FUpdateCache    uintptr
 	FDiscardCache   uintptr
-} /* oleidl.h:32:9 */
+} /* oleidl.h:39:9 */
 
-type IOleCache2Vtbl = IOleCache2Vtbl1 /* oleidl.h:623:3 */
+type IOleCache2Vtbl = IOleCache2Vtbl1 /* oleidl.h:610:3 */
 
 // ****************************************************************************
 //
 // IOleCacheControl interface
 
-type LPOLECACHECONTROL = uintptr /* oleidl.h:722:26 */
+type LPOLECACHECONTROL = uintptr /* oleidl.h:702:26 */
 type IOleCacheControlVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FOnRun          uintptr
 	FOnStop         uintptr
-} /* oleidl.h:37:9 */
+} /* oleidl.h:47:9 */
 
-type IOleCacheControlVtbl = IOleCacheControlVtbl1 /* oleidl.h:764:3 */
+type IOleCacheControlVtbl = IOleCacheControlVtbl1 /* oleidl.h:744:3 */
 
 // ****************************************************************************
 //
 // IParseDisplayName interface
 
-type LPPARSEDISPLAYNAME = uintptr /* oleidl.h:826:27 */
+type LPPARSEDISPLAYNAME = uintptr /* oleidl.h:792:27 */
 type IParseDisplayNameVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
 	FRelease          uintptr
 	FParseDisplayName uintptr
-} /* oleidl.h:42:9 */
+} /* oleidl.h:55:9 */
 
-type IParseDisplayNameVtbl = IParseDisplayNameVtbl1 /* oleidl.h:868:3 */
+type IParseDisplayNameVtbl = IParseDisplayNameVtbl1 /* oleidl.h:834:3 */
 
 // ****************************************************************************
 //
 // IOleContainer interface
 
-type LPOLECONTAINER = uintptr /* oleidl.h:922:23 */
+type LPOLECONTAINER = uintptr /* oleidl.h:878:23 */
 type IOleContainerVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -53847,15 +54421,15 @@ type IOleContainerVtbl1 = struct {
 	FParseDisplayName uintptr
 	FEnumObjects      uintptr
 	FLockContainer    uintptr
-} /* oleidl.h:47:9 */
+} /* oleidl.h:63:9 */
 
-type IOleContainerVtbl = IOleContainerVtbl1 /* oleidl.h:975:3 */
+type IOleContainerVtbl = IOleContainerVtbl1 /* oleidl.h:931:3 */
 
 // ****************************************************************************
 //
 // IOleClientSite interface
 
-type LPOLECLIENTSITE = uintptr /* oleidl.h:1045:24 */
+type LPOLECLIENTSITE = uintptr /* oleidl.h:985:24 */
 type IOleClientSiteVtbl1 = struct {
 	FQueryInterface         uintptr
 	FAddRef                 uintptr
@@ -53866,24 +54440,24 @@ type IOleClientSiteVtbl1 = struct {
 	FShowObject             uintptr
 	FOnShowWindow           uintptr
 	FRequestNewObjectLayout uintptr
-} /* oleidl.h:52:9 */
+} /* oleidl.h:71:9 */
 
-type IOleClientSiteVtbl = IOleClientSiteVtbl1 /* oleidl.h:1117:3 */
+type IOleClientSiteVtbl = IOleClientSiteVtbl1 /* oleidl.h:1057:3 */
 
 // ****************************************************************************
 //
 // IOleObject interface
 
-type LPOLEOBJECT = uintptr /* oleidl.h:1227:20 */
+type LPOLEOBJECT = uintptr /* oleidl.h:1121:20 */
 
-type OLEGETMONIKER = uint32 /* oleidl.h:1234:3 */
+type OLEGETMONIKER = uint32 /* oleidl.h:1128:3 */
 
-type OLEWHICHMK = uint32 /* oleidl.h:1240:3 */
+type OLEWHICHMK = uint32 /* oleidl.h:1134:3 */
 
-type USERCLASSTYPE = uint32 /* oleidl.h:1246:3 */
+type USERCLASSTYPE = uint32 /* oleidl.h:1140:3 */
 
-type OLEMISC = uint32  /* oleidl.h:1271:3 */
-type OLECLOSE = uint32 /* oleidl.h:1276:3 */
+type OLEMISC = uint32  /* oleidl.h:1165:3 */
+type OLECLOSE = uint32 /* oleidl.h:1170:3 */
 type IOleObjectVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -53909,12 +54483,12 @@ type IOleObjectVtbl1 = struct {
 	FEnumAdvise       uintptr
 	FGetMiscStatus    uintptr
 	FSetColorScheme   uintptr
-} /* oleidl.h:57:9 */
+} /* oleidl.h:79:9 */
 
-type IOleObjectVtbl = IOleObjectVtbl1 /* oleidl.h:1484:3 */
-type OLERENDER = uint32               /* oleidl.h:1797:3 */
+type IOleObjectVtbl = IOleObjectVtbl1 /* oleidl.h:1378:3 */
+type OLERENDER = uint32               /* oleidl.h:1509:3 */
 
-type LPOLERENDER = uintptr /* oleidl.h:1799:19 */
+type LPOLERENDER = uintptr /* oleidl.h:1511:19 */
 
 type tagOBJECTDESCRIPTOR = struct {
 	FcbSize             ULONG
@@ -53925,42 +54499,42 @@ type tagOBJECTDESCRIPTOR = struct {
 	FdwStatus           DWORD
 	FdwFullUserTypeName DWORD
 	FdwSrcOfCopy        DWORD
-} /* oleidl.h:1801:9 */
+} /* oleidl.h:1513:9 */
 
-type OBJECTDESCRIPTOR = tagOBJECTDESCRIPTOR  /* oleidl.h:1810:3 */
-type POBJECTDESCRIPTOR = uintptr             /* oleidl.h:1811:36 */
-type LPOBJECTDESCRIPTOR = uintptr            /* oleidl.h:1812:36 */
-type LINKSRCDESCRIPTOR = tagOBJECTDESCRIPTOR /* oleidl.h:1813:36 */
-type PLINKSRCDESCRIPTOR = uintptr            /* oleidl.h:1814:36 */
-type LPLINKSRCDESCRIPTOR = uintptr           /* oleidl.h:1815:36 */
+type OBJECTDESCRIPTOR = tagOBJECTDESCRIPTOR  /* oleidl.h:1522:3 */
+type POBJECTDESCRIPTOR = uintptr             /* oleidl.h:1523:36 */
+type LPOBJECTDESCRIPTOR = uintptr            /* oleidl.h:1524:36 */
+type LINKSRCDESCRIPTOR = tagOBJECTDESCRIPTOR /* oleidl.h:1525:36 */
+type PLINKSRCDESCRIPTOR = uintptr            /* oleidl.h:1526:36 */
+type LPLINKSRCDESCRIPTOR = uintptr           /* oleidl.h:1527:36 */
 
 // ****************************************************************************
 //
 // IOleWindow interface
 
-type LPOLEWINDOW = uintptr /* oleidl.h:1826:20 */
+type LPOLEWINDOW = uintptr /* oleidl.h:1538:20 */
 type IOleWindowVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
 	FRelease              uintptr
 	FGetWindow            uintptr
 	FContextSensitiveHelp uintptr
-} /* oleidl.h:62:9 */
+} /* oleidl.h:87:9 */
 
-type IOleWindowVtbl = IOleWindowVtbl1 /* oleidl.h:1869:3 */
+type IOleWindowVtbl = IOleWindowVtbl1 /* oleidl.h:1581:3 */
 
 // ****************************************************************************
 //
 // IOleLink interface
 
-type LPOLELINK = uintptr /* oleidl.h:1932:18 */
+type LPOLELINK = uintptr /* oleidl.h:1629:18 */
 
-type OLEUPDATE = uint32 /* oleidl.h:1937:3 */
+type OLEUPDATE = uint32 /* oleidl.h:1634:3 */
 
-type LPOLEUPDATE = uintptr /* oleidl.h:1939:19 */
-type POLEUPDATE = uintptr  /* oleidl.h:1940:19 */
+type LPOLEUPDATE = uintptr /* oleidl.h:1636:19 */
+type POLEUPDATE = uintptr  /* oleidl.h:1637:19 */
 
-type OLELINKBIND = uint32 /* oleidl.h:1944:3 */
+type OLELINKBIND = uint32 /* oleidl.h:1641:3 */
 type IOleLinkVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -53976,19 +54550,19 @@ type IOleLinkVtbl1 = struct {
 	FGetBoundSource       uintptr
 	FUnbindSource         uintptr
 	FUpdate               uintptr
-} /* oleidl.h:67:9 */
+} /* oleidl.h:95:9 */
 
-type IOleLinkVtbl = IOleLinkVtbl1 /* oleidl.h:2052:3 */
+type IOleLinkVtbl = IOleLinkVtbl1 /* oleidl.h:1749:3 */
 
 // ****************************************************************************
 //
 // IOleItemContainer interface
 
-type LPOLEITEMCONTAINER = uintptr /* oleidl.h:2223:27 */
+type LPOLEITEMCONTAINER = uintptr /* oleidl.h:1833:27 */
 
-type BINDSPEED = uint32 /* oleidl.h:2229:3 */
+type BINDSPEED = uint32 /* oleidl.h:1839:3 */
 
-type OLECONTF = uint32 /* oleidl.h:2237:3 */
+type OLECONTF = uint32 /* oleidl.h:1847:3 */
 type IOleItemContainerVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -53999,18 +54573,18 @@ type IOleItemContainerVtbl1 = struct {
 	FGetObjectA       uintptr
 	FGetObjectStorage uintptr
 	FIsRunning        uintptr
-} /* oleidl.h:72:9 */
+} /* oleidl.h:103:9 */
 
-type IOleItemContainerVtbl = IOleItemContainerVtbl1 /* oleidl.h:2319:3 */
+type IOleItemContainerVtbl = IOleItemContainerVtbl1 /* oleidl.h:1929:3 */
 
 // ****************************************************************************
 //
 // IOleInPlaceUIWindow interface
 
-type LPOLEINPLACEUIWINDOW = uintptr /* oleidl.h:2417:29 */
-type BORDERWIDTHS = RECT            /* oleidl.h:2418:14 */
-type LPBORDERWIDTHS = LPRECT        /* oleidl.h:2419:16 */
-type LPCBORDERWIDTHS = LPCRECT      /* oleidl.h:2420:17 */
+type LPOLEINPLACEUIWINDOW = uintptr /* oleidl.h:1997:29 */
+type BORDERWIDTHS = RECT            /* oleidl.h:1998:14 */
+type LPBORDERWIDTHS = LPRECT        /* oleidl.h:1999:16 */
+type LPCBORDERWIDTHS = LPCRECT      /* oleidl.h:2000:17 */
 type IOleInPlaceUIWindowVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -54021,15 +54595,15 @@ type IOleInPlaceUIWindowVtbl1 = struct {
 	FRequestBorderSpace   uintptr
 	FSetBorderSpace       uintptr
 	FSetActiveObject      uintptr
-} /* oleidl.h:77:9 */
+} /* oleidl.h:111:9 */
 
-type IOleInPlaceUIWindowVtbl = IOleInPlaceUIWindowVtbl1 /* oleidl.h:2488:3 */
+type IOleInPlaceUIWindowVtbl = IOleInPlaceUIWindowVtbl1 /* oleidl.h:2068:3 */
 
 // ****************************************************************************
 //
 // IOleInPlaceActiveObject interface
 
-type LPOLEINPLACEACTIVEOBJECT = uintptr /* oleidl.h:2586:33 */
+type LPOLEINPLACEACTIVEOBJECT = uintptr /* oleidl.h:2134:33 */
 type IOleInPlaceActiveObjectVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -54041,15 +54615,15 @@ type IOleInPlaceActiveObjectVtbl1 = struct {
 	FOnDocWindowActivate   uintptr
 	FResizeBorder          uintptr
 	FEnableModeless        uintptr
-} /* oleidl.h:82:9 */
+} /* oleidl.h:119:9 */
 
-type IOleInPlaceActiveObjectVtbl = IOleInPlaceActiveObjectVtbl1 /* oleidl.h:2663:3 */
+type IOleInPlaceActiveObjectVtbl = IOleInPlaceActiveObjectVtbl1 /* oleidl.h:2211:3 */
 
 // ****************************************************************************
 //
 // IOleInPlaceFrame interface
 
-type LPOLEINPLACEFRAME = uintptr /* oleidl.h:2790:26 */
+type LPOLEINPLACEFRAME = uintptr /* oleidl.h:2315:26 */
 
 type tagOIFI = struct {
 	Fcb            UINT
@@ -54057,18 +54631,18 @@ type tagOIFI = struct {
 	FhwndFrame     HWND
 	Fhaccel        HACCEL
 	FcAccelEntries UINT
-	_              [4]byte
-} /* oleidl.h:2792:9 */
+	F__ccgo_pad1   [4]byte
+} /* oleidl.h:2317:9 */
 
-type OLEINPLACEFRAMEINFO = tagOIFI   /* oleidl.h:2798:3 */
-type LPOLEINPLACEFRAMEINFO = uintptr /* oleidl.h:2799:24 */
+type OLEINPLACEFRAMEINFO = tagOIFI   /* oleidl.h:2323:3 */
+type LPOLEINPLACEFRAMEINFO = uintptr /* oleidl.h:2324:24 */
 
-type tagOleMenuGroupWidths = struct{ Fwidth [6]LONG } /* oleidl.h:2801:9 */
+type tagOleMenuGroupWidths = struct{ Fwidth [6]LONG } /* oleidl.h:2326:9 */
 
-type OLEMENUGROUPWIDTHS = tagOleMenuGroupWidths /* oleidl.h:2803:3 */
-type LPOLEMENUGROUPWIDTHS = uintptr             /* oleidl.h:2804:38 */
+type OLEMENUGROUPWIDTHS = tagOleMenuGroupWidths /* oleidl.h:2328:3 */
+type LPOLEMENUGROUPWIDTHS = uintptr             /* oleidl.h:2329:38 */
 
-type HOLEMENU = HGLOBAL /* oleidl.h:2806:17 */
+type HOLEMENU = HGLOBAL /* oleidl.h:2331:17 */
 type IOleInPlaceFrameVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -54085,15 +54659,15 @@ type IOleInPlaceFrameVtbl1 = struct {
 	FSetStatusText         uintptr
 	FEnableModeless        uintptr
 	FTranslateAcceleratorA uintptr
-} /* oleidl.h:87:9 */
+} /* oleidl.h:127:9 */
 
-type IOleInPlaceFrameVtbl = IOleInPlaceFrameVtbl1 /* oleidl.h:2912:3 */
+type IOleInPlaceFrameVtbl = IOleInPlaceFrameVtbl1 /* oleidl.h:2437:3 */
 
 // ****************************************************************************
 //
 // IOleInPlaceObject interface
 
-type LPOLEINPLACEOBJECT = uintptr /* oleidl.h:3055:27 */
+type LPOLEINPLACEOBJECT = uintptr /* oleidl.h:2529:27 */
 type IOleInPlaceObjectVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -54104,15 +54678,15 @@ type IOleInPlaceObjectVtbl1 = struct {
 	FUIDeactivate         uintptr
 	FSetObjectRects       uintptr
 	FReactivateAndUndo    uintptr
-} /* oleidl.h:92:9 */
+} /* oleidl.h:135:9 */
 
-type IOleInPlaceObjectVtbl = IOleInPlaceObjectVtbl1 /* oleidl.h:3120:3 */
+type IOleInPlaceObjectVtbl = IOleInPlaceObjectVtbl1 /* oleidl.h:2594:3 */
 
 // ****************************************************************************
 //
 // IOleInPlaceSite interface
 
-type LPOLEINPLACESITE = uintptr /* oleidl.h:3215:25 */
+type LPOLEINPLACESITE = uintptr /* oleidl.h:2660:25 */
 type IOleInPlaceSiteVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -54129,23 +54703,23 @@ type IOleInPlaceSiteVtbl1 = struct {
 	FDiscardUndoState     uintptr
 	FDeactivateAndUndo    uintptr
 	FOnPosRectChange      uintptr
-} /* oleidl.h:97:9 */
+} /* oleidl.h:143:9 */
 
-type IOleInPlaceSiteVtbl = IOleInPlaceSiteVtbl1 /* oleidl.h:3325:3 */
+type IOleInPlaceSiteVtbl = IOleInPlaceSiteVtbl1 /* oleidl.h:2770:3 */
 type IContinueVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FFContinue      uintptr
-} /* oleidl.h:102:9 */
+} /* oleidl.h:151:9 */
 
-type IContinueVtbl = IContinueVtbl1 /* oleidl.h:3525:3 */
+type IContinueVtbl = IContinueVtbl1 /* oleidl.h:2893:3 */
 
 // ****************************************************************************
 //
 // IViewObject interface
 
-type LPVIEWOBJECT = uintptr /* oleidl.h:3575:21 */
+type LPVIEWOBJECT = uintptr /* oleidl.h:2937:21 */
 type IViewObjectVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -54156,15 +54730,15 @@ type IViewObjectVtbl1 = struct {
 	FUnfreeze       uintptr
 	FSetAdvise      uintptr
 	FGetAdvise      uintptr
-} /* oleidl.h:107:9 */
+} /* oleidl.h:159:9 */
 
-type IViewObjectVtbl = IViewObjectVtbl1 /* oleidl.h:3688:3 */
+type IViewObjectVtbl = IViewObjectVtbl1 /* oleidl.h:3050:3 */
 
 // ****************************************************************************
 //
 // IViewObject2 interface
 
-type LPVIEWOBJECT2 = uintptr /* oleidl.h:3880:22 */
+type LPVIEWOBJECT2 = uintptr /* oleidl.h:3225:22 */
 type IViewObject2Vtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -54176,30 +54750,30 @@ type IViewObject2Vtbl1 = struct {
 	FSetAdvise      uintptr
 	FGetAdvise      uintptr
 	FGetExtent      uintptr
-} /* oleidl.h:112:9 */
+} /* oleidl.h:167:9 */
 
-type IViewObject2Vtbl = IViewObject2Vtbl1 /* oleidl.h:3968:3 */
+type IViewObject2Vtbl = IViewObject2Vtbl1 /* oleidl.h:3313:3 */
 
 // ****************************************************************************
 //
 // IDropSource interface
 
-type LPDROPSOURCE = uintptr /* oleidl.h:4048:21 */
+type LPDROPSOURCE = uintptr /* oleidl.h:3383:21 */
 type IDropSourceVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
 	FRelease           uintptr
 	FQueryContinueDrag uintptr
 	FGiveFeedback      uintptr
-} /* oleidl.h:117:9 */
+} /* oleidl.h:175:9 */
 
-type IDropSourceVtbl = IDropSourceVtbl1 /* oleidl.h:4093:3 */
+type IDropSourceVtbl = IDropSourceVtbl1 /* oleidl.h:3428:3 */
 
 // ****************************************************************************
 //
 // IDropTarget interface
 
-type LPDROPTARGET = uintptr /* oleidl.h:4157:21 */
+type LPDROPTARGET = uintptr /* oleidl.h:3476:21 */
 type IDropTargetVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -54208,37 +54782,37 @@ type IDropTargetVtbl1 = struct {
 	FDragOver       uintptr
 	FDragLeave      uintptr
 	FDrop           uintptr
-} /* oleidl.h:122:9 */
+} /* oleidl.h:183:9 */
 
-type IDropTargetVtbl = IDropTargetVtbl1 /* oleidl.h:4257:3 */
+type IDropTargetVtbl = IDropTargetVtbl1 /* oleidl.h:3576:3 */
 type IDropSourceNotifyVtbl1 = struct {
 	FQueryInterface  uintptr
 	FAddRef          uintptr
 	FRelease         uintptr
 	FDragEnterTarget uintptr
 	FDragLeaveTarget uintptr
-} /* oleidl.h:127:9 */
+} /* oleidl.h:191:9 */
 
-type IDropSourceNotifyVtbl = IDropSourceNotifyVtbl1 /* oleidl.h:4391:3 */
+type IDropSourceNotifyVtbl = IDropSourceNotifyVtbl1 /* oleidl.h:3672:3 */
 
 // ****************************************************************************
 //
 // IEnumOLEVERB interface
 
-type LPENUMOLEVERB = uintptr /* oleidl.h:4455:22 */
+type LPENUMOLEVERB = uintptr /* oleidl.h:3722:22 */
 
 type tagOLEVERB = struct {
 	FlVerb        LONG
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FlpszVerbName LPOLESTR
 	FfuFlags      DWORD
 	FgrfAttribs   DWORD
-} /* oleidl.h:4457:9 */
+} /* oleidl.h:3724:9 */
 
-type OLEVERB = tagOLEVERB /* oleidl.h:4462:3 */
-type LPOLEVERB = uintptr  /* oleidl.h:4463:27 */
+type OLEVERB = tagOLEVERB /* oleidl.h:3729:3 */
+type LPOLEVERB = uintptr  /* oleidl.h:3730:27 */
 
-type OLEVERBATTRIB = uint32 /* oleidl.h:4468:3 */
+type OLEVERBATTRIB = uint32 /* oleidl.h:3735:3 */
 type IEnumOLEVERBVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -54247,13 +54821,13 @@ type IEnumOLEVERBVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* oleidl.h:132:9 */
+} /* oleidl.h:199:9 */
 
-type IEnumOLEVERBVtbl = IEnumOLEVERBVtbl1 /* oleidl.h:4528:3 */
+type IEnumOLEVERBVtbl = IEnumOLEVERBVtbl1 /* oleidl.h:3795:3 */
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/servprov.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/servprov.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54289,11 +54863,11 @@ type IEnumOLEVERBVtbl = IEnumOLEVERBVtbl1 /* oleidl.h:4528:3 */
 
 // Forward declarations
 
-type IServiceProvider1 = struct{ FlpVtbl uintptr } /* servprov.h:22:9 */
+type IServiceProvider1 = struct{ FlpVtbl uintptr } /* servprov.h:23:9 */
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/servprov.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/servprov.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54329,7 +54903,7 @@ type IServiceProvider1 = struct{ FlpVtbl uintptr } /* servprov.h:22:9 */
 
 // Forward declarations
 
-type IServiceProvider = IServiceProvider1 /* servprov.h:22:36 */
+type IServiceProvider = IServiceProvider1 /* servprov.h:23:36 */
 
 // Headers for imported files
 
@@ -54379,21 +54953,21 @@ type IServiceProvider = IServiceProvider1 /* servprov.h:22:36 */
 //
 // IServiceProvider interface
 
-type LPSERVICEPROVIDER = uintptr /* servprov.h:55:26 */
+type LPSERVICEPROVIDER = uintptr /* servprov.h:62:26 */
 type IServiceProviderVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FQueryService   uintptr
-} /* servprov.h:22:9 */
+} /* servprov.h:23:9 */
 
-type IServiceProviderVtbl = IServiceProviderVtbl1 /* servprov.h:115:3 */
+type IServiceProviderVtbl = IServiceProviderVtbl1 /* servprov.h:122:3 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/msxml.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/msxml.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54499,7 +55073,7 @@ type IServiceProviderVtbl = IServiceProviderVtbl1 /* servprov.h:115:3 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54535,13 +55109,13 @@ type IServiceProviderVtbl = IServiceProviderVtbl1 /* servprov.h:115:3 */
 
 // Forward declarations
 
-type ICreateTypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:22:9 */
+type ICreateTypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:23:9 */
 
 // Begin additional prototypes for all interfaces
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/msxml.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/msxml.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54647,7 +55221,7 @@ type ICreateTypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:22:9 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -54683,91 +55257,91 @@ type ICreateTypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:22:9 */
 
 // Forward declarations
 
-type ICreateTypeInfo = ICreateTypeInfo1 /* oaidl.h:22:35 */
+type ICreateTypeInfo = ICreateTypeInfo1 /* oaidl.h:23:35 */
 
-type ICreateTypeInfo21 = struct{ FlpVtbl uintptr } /* oaidl.h:27:9 */
+type ICreateTypeInfo21 = struct{ FlpVtbl uintptr } /* oaidl.h:31:9 */
 
-type ICreateTypeInfo2 = ICreateTypeInfo21 /* oaidl.h:27:36 */
+type ICreateTypeInfo2 = ICreateTypeInfo21 /* oaidl.h:31:36 */
 
-type ICreateTypeLib1 = struct{ FlpVtbl uintptr } /* oaidl.h:32:9 */
+type ICreateTypeLib1 = struct{ FlpVtbl uintptr } /* oaidl.h:39:9 */
 
-type ICreateTypeLib = ICreateTypeLib1 /* oaidl.h:32:34 */
+type ICreateTypeLib = ICreateTypeLib1 /* oaidl.h:39:34 */
 
-type ICreateTypeLib21 = struct{ FlpVtbl uintptr } /* oaidl.h:37:9 */
+type ICreateTypeLib21 = struct{ FlpVtbl uintptr } /* oaidl.h:47:9 */
 
-type ICreateTypeLib2 = ICreateTypeLib21 /* oaidl.h:37:35 */
+type ICreateTypeLib2 = ICreateTypeLib21 /* oaidl.h:47:35 */
 
-type IDispatch1 = struct{ FlpVtbl uintptr } /* oaidl.h:42:9 */
+type IDispatch1 = struct{ FlpVtbl uintptr } /* oaidl.h:55:9 */
 
-type IDispatch = IDispatch1 /* oaidl.h:42:29 */
+type IDispatch = IDispatch1 /* oaidl.h:55:29 */
 
-type IEnumVARIANT1 = struct{ FlpVtbl uintptr } /* oaidl.h:47:9 */
+type IEnumVARIANT1 = struct{ FlpVtbl uintptr } /* oaidl.h:63:9 */
 
-type IEnumVARIANT = IEnumVARIANT1 /* oaidl.h:47:32 */
+type IEnumVARIANT = IEnumVARIANT1 /* oaidl.h:63:32 */
 
-type ITypeComp1 = struct{ FlpVtbl uintptr } /* oaidl.h:52:9 */
+type ITypeComp1 = struct{ FlpVtbl uintptr } /* oaidl.h:71:9 */
 
-type ITypeComp = ITypeComp1 /* oaidl.h:52:29 */
+type ITypeComp = ITypeComp1 /* oaidl.h:71:29 */
 
-type ITypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:57:9 */
+type ITypeInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:79:9 */
 
-type ITypeInfo = ITypeInfo1 /* oaidl.h:57:29 */
+type ITypeInfo = ITypeInfo1 /* oaidl.h:79:29 */
 
-type ITypeInfo21 = struct{ FlpVtbl uintptr } /* oaidl.h:62:9 */
+type ITypeInfo21 = struct{ FlpVtbl uintptr } /* oaidl.h:87:9 */
 
-type ITypeInfo2 = ITypeInfo21 /* oaidl.h:62:30 */
+type ITypeInfo2 = ITypeInfo21 /* oaidl.h:87:30 */
 
-type ITypeLib1 = struct{ FlpVtbl uintptr } /* oaidl.h:67:9 */
+type ITypeLib1 = struct{ FlpVtbl uintptr } /* oaidl.h:95:9 */
 
-type ITypeLib = ITypeLib1 /* oaidl.h:67:28 */
+type ITypeLib = ITypeLib1 /* oaidl.h:95:28 */
 
-type ITypeLib21 = struct{ FlpVtbl uintptr } /* oaidl.h:72:9 */
+type ITypeLib21 = struct{ FlpVtbl uintptr } /* oaidl.h:103:9 */
 
-type ITypeLib2 = ITypeLib21 /* oaidl.h:72:29 */
+type ITypeLib2 = ITypeLib21 /* oaidl.h:103:29 */
 
-type ITypeChangeEvents1 = struct{ FlpVtbl uintptr } /* oaidl.h:77:9 */
+type ITypeChangeEvents1 = struct{ FlpVtbl uintptr } /* oaidl.h:111:9 */
 
-type ITypeChangeEvents = ITypeChangeEvents1 /* oaidl.h:77:37 */
+type ITypeChangeEvents = ITypeChangeEvents1 /* oaidl.h:111:37 */
 
-type IErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:82:9 */
+type IErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:119:9 */
 
-type IErrorInfo = IErrorInfo1 /* oaidl.h:82:30 */
+type IErrorInfo = IErrorInfo1 /* oaidl.h:119:30 */
 
-type ICreateErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:87:9 */
+type ICreateErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:127:9 */
 
-type ICreateErrorInfo = ICreateErrorInfo1 /* oaidl.h:87:36 */
+type ICreateErrorInfo = ICreateErrorInfo1 /* oaidl.h:127:36 */
 
-type ISupportErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:92:9 */
+type ISupportErrorInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:135:9 */
 
-type ISupportErrorInfo = ISupportErrorInfo1 /* oaidl.h:92:37 */
+type ISupportErrorInfo = ISupportErrorInfo1 /* oaidl.h:135:37 */
 
-type ITypeFactory1 = struct{ FlpVtbl uintptr } /* oaidl.h:97:9 */
+type ITypeFactory1 = struct{ FlpVtbl uintptr } /* oaidl.h:143:9 */
 
-type ITypeFactory = ITypeFactory1 /* oaidl.h:97:32 */
+type ITypeFactory = ITypeFactory1 /* oaidl.h:143:32 */
 
-type ITypeMarshal1 = struct{ FlpVtbl uintptr } /* oaidl.h:102:9 */
+type ITypeMarshal1 = struct{ FlpVtbl uintptr } /* oaidl.h:151:9 */
 
-type ITypeMarshal = ITypeMarshal1 /* oaidl.h:102:32 */
+type ITypeMarshal = ITypeMarshal1 /* oaidl.h:151:32 */
 
-type IRecordInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:107:9 */
+type IRecordInfo1 = struct{ FlpVtbl uintptr } /* oaidl.h:159:9 */
 
-type IRecordInfo = IRecordInfo1 /* oaidl.h:107:31 */
+type IRecordInfo = IRecordInfo1 /* oaidl.h:159:31 */
 
-type IErrorLog1 = struct{ FlpVtbl uintptr } /* oaidl.h:112:9 */
+type IErrorLog1 = struct{ FlpVtbl uintptr } /* oaidl.h:167:9 */
 
-type IErrorLog = IErrorLog1 /* oaidl.h:112:29 */
+type IErrorLog = IErrorLog1 /* oaidl.h:167:29 */
 
-type IPropertyBag1 = struct{ FlpVtbl uintptr } /* oaidl.h:117:9 */
+type IPropertyBag1 = struct{ FlpVtbl uintptr } /* oaidl.h:175:9 */
 
-type IPropertyBag = IPropertyBag1 /* oaidl.h:117:32 */
-type CURRENCY = CY                /* oaidl.h:243:12 */
+type IPropertyBag = IPropertyBag1 /* oaidl.h:175:32 */
+type CURRENCY = CY                /* oaidl.h:358:12 */
 type tagSAFEARRAYBOUND = struct {
 	FcElements ULONG
 	FlLbound   LONG
-} /* oaidl.h:244:9 */
+} /* oaidl.h:359:9 */
 
-type SAFEARRAYBOUND = tagSAFEARRAYBOUND /* oaidl.h:247:3 */
-type LPSAFEARRAYBOUND = uintptr         /* oaidl.h:248:34 */
+type SAFEARRAYBOUND = tagSAFEARRAYBOUND /* oaidl.h:362:3 */
+type LPSAFEARRAYBOUND = uintptr         /* oaidl.h:363:34 */
 
 type _wireVARIANT = struct {
 	FclSize      DWORD
@@ -54777,108 +55351,108 @@ type _wireVARIANT = struct {
 	FwReserved2  USHORT
 	FwReserved3  USHORT
 	F__16        struct {
-		FllVal LONGLONG
-		_      [8]byte
+		FllVal       LONGLONG
+		F__ccgo_pad1 [8]byte
 	}
-} /* oaidl.h:250:9 */
+} /* oaidl.h:365:9 */
 
-type WireVARIANT = uintptr /* oaidl.h:250:29 */
+type WireVARIANT = uintptr /* oaidl.h:365:29 */
 type _wireBRECORD = struct {
 	FfFlags   ULONG
 	FclSize   ULONG
 	FpRecInfo uintptr
 	FpRecord  uintptr
-} /* oaidl.h:251:9 */
+} /* oaidl.h:366:9 */
 
-type WireBRECORD = uintptr /* oaidl.h:251:29 */
+type WireBRECORD = uintptr /* oaidl.h:366:29 */
 
 type _wireSAFEARR_BSTR = struct {
-	FSize  ULONG
-	_      [4]byte
-	FaBstr uintptr
-} /* oaidl.h:253:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FaBstr       uintptr
+} /* oaidl.h:368:9 */
 
-type SAFEARR_BSTR = _wireSAFEARR_BSTR /* oaidl.h:256:3 */
+type SAFEARR_BSTR = _wireSAFEARR_BSTR /* oaidl.h:371:3 */
 
 type _wireSAFEARR_UNKNOWN = struct {
-	FSize      ULONG
-	_          [4]byte
-	FapUnknown uintptr
-} /* oaidl.h:258:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FapUnknown   uintptr
+} /* oaidl.h:373:9 */
 
-type SAFEARR_UNKNOWN = _wireSAFEARR_UNKNOWN /* oaidl.h:261:3 */
+type SAFEARR_UNKNOWN = _wireSAFEARR_UNKNOWN /* oaidl.h:376:3 */
 
 type _wireSAFEARR_DISPATCH = struct {
-	FSize       ULONG
-	_           [4]byte
-	FapDispatch uintptr
-} /* oaidl.h:263:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FapDispatch  uintptr
+} /* oaidl.h:378:9 */
 
-type SAFEARR_DISPATCH = _wireSAFEARR_DISPATCH /* oaidl.h:266:3 */
+type SAFEARR_DISPATCH = _wireSAFEARR_DISPATCH /* oaidl.h:381:3 */
 
 type _wireSAFEARR_VARIANT = struct {
-	FSize     ULONG
-	_         [4]byte
-	FaVariant uintptr
-} /* oaidl.h:268:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FaVariant    uintptr
+} /* oaidl.h:383:9 */
 
-type SAFEARR_VARIANT = _wireSAFEARR_VARIANT /* oaidl.h:271:3 */
+type SAFEARR_VARIANT = _wireSAFEARR_VARIANT /* oaidl.h:386:3 */
 
 type _wireSAFEARR_BRECORD = struct {
-	FSize    ULONG
-	_        [4]byte
-	FaRecord uintptr
-} /* oaidl.h:273:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FaRecord     uintptr
+} /* oaidl.h:388:9 */
 
-type SAFEARR_BRECORD = _wireSAFEARR_BRECORD /* oaidl.h:276:3 */
+type SAFEARR_BRECORD = _wireSAFEARR_BRECORD /* oaidl.h:391:3 */
 
 type _wireSAFEARR_HAVEIID = struct {
-	FSize      ULONG
-	_          [4]byte
-	FapUnknown uintptr
-	Fiid       IID
-} /* oaidl.h:278:9 */
+	FSize        ULONG
+	F__ccgo_pad1 [4]byte
+	FapUnknown   uintptr
+	Fiid         IID
+} /* oaidl.h:393:9 */
 
-type SAFEARR_HAVEIID = _wireSAFEARR_HAVEIID /* oaidl.h:282:3 */
+type SAFEARR_HAVEIID = _wireSAFEARR_HAVEIID /* oaidl.h:397:3 */
 
-type SF_TYPE = uint32 /* oaidl.h:296:3 */
+type SF_TYPE = uint32 /* oaidl.h:411:3 */
 
 type _wireSAFEARRAY_UNION = struct {
-	FsfType ULONG
-	_       [4]byte
-	Fu      struct {
-		FBstrStr SAFEARR_BSTR
-		_        [16]byte
+	FsfType      ULONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		FBstrStr     SAFEARR_BSTR
+		F__ccgo_pad1 [16]byte
 	}
-} /* oaidl.h:298:9 */
+} /* oaidl.h:413:9 */
 
-type SAFEARRAYUNION = _wireSAFEARRAY_UNION /* oaidl.h:312:3 */
+type SAFEARRAYUNION = _wireSAFEARRAY_UNION /* oaidl.h:427:3 */
 
 type _wireSAFEARRAY = struct {
 	FcDims         USHORT
 	FfFeatures     USHORT
 	FcbElements    ULONG
 	FcLocks        ULONG
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FuArrayStructs SAFEARRAYUNION
 	Frgsabound     [1]SAFEARRAYBOUND
-} /* oaidl.h:314:9 */
+} /* oaidl.h:429:9 */
 
-type WireSAFEARRAY = uintptr  /* oaidl.h:321:3 */
-type WirePSAFEARRAY = uintptr /* oaidl.h:322:23 */
+type WireSAFEARRAY = uintptr  /* oaidl.h:436:3 */
+type WirePSAFEARRAY = uintptr /* oaidl.h:437:23 */
 
 type tagSAFEARRAY = struct {
-	FcDims      USHORT
-	FfFeatures  USHORT
-	FcbElements ULONG
-	FcLocks     ULONG
-	_           [4]byte
-	FpvData     PVOID
-	Frgsabound  [1]SAFEARRAYBOUND
-} /* oaidl.h:324:9 */
-
-type SAFEARRAY = tagSAFEARRAY /* oaidl.h:331:3 */
-type LPSAFEARRAY = uintptr    /* oaidl.h:332:19 */
+	FcDims       USHORT
+	FfFeatures   USHORT
+	FcbElements  ULONG
+	FcLocks      ULONG
+	F__ccgo_pad1 [4]byte
+	FpvData      PVOID
+	Frgsabound   [1]SAFEARRAYBOUND
+} /* oaidl.h:439:9 */
+
+type SAFEARRAY = tagSAFEARRAY /* oaidl.h:446:3 */
+type LPSAFEARRAY = uintptr    /* oaidl.h:447:19 */
 
 // Kludge for 3.0 release to disable new default-behavior.
 // For now we define _FORCENAMELESSUNION.  For 4.0 this define
@@ -54892,18 +55466,18 @@ type tagVARIANT = struct {
 			FwReserved2 WORD
 			FwReserved3 WORD
 			Fn3         struct {
-				FllVal LONGLONG
-				_      [8]byte
+				FllVal       LONGLONG
+				F__ccgo_pad1 [8]byte
 			}
 		}
 	}
-} /* oaidl.h:380:9 */
+} /* oaidl.h:495:9 */
 
 // Kludge for 3.0 release to disable new default-behavior.
 // For now we define _FORCENAMELESSUNION.  For 4.0 this define
 // will be removed.
 
-type VARIANT = tagVARIANT /* oaidl.h:380:27 */
+type VARIANT = tagVARIANT /* oaidl.h:495:27 */
 
 type __tagVARIANT = struct {
 	Fvt         VARTYPE
@@ -54911,77 +55485,77 @@ type __tagVARIANT = struct {
 	FwReserved2 WORD
 	FwReserved3 WORD
 	Fn3         struct {
-		FllVal LONGLONG
-		_      [8]byte
+		FllVal       LONGLONG
+		F__ccgo_pad1 [8]byte
 	}
-} /* oaidl.h:384:9 */
+} /* oaidl.h:499:9 */
 
 type __tagBRECORD = struct {
 	FpvRecord PVOID
 	FpRecInfo uintptr
-} /* oaidl.h:433:17 */
+} /* oaidl.h:548:17 */
 
-type LPVARIANT = uintptr    /* oaidl.h:444:17 */
-type VARIANTARG = VARIANT   /* oaidl.h:445:17 */
-type LPVARIANTARG = uintptr /* oaidl.h:446:17 */
+type LPVARIANT = uintptr    /* oaidl.h:558:17 */
+type VARIANTARG = VARIANT   /* oaidl.h:559:17 */
+type LPVARIANTARG = uintptr /* oaidl.h:560:17 */
 
-type DISPID = LONG     /* oaidl.h:525:14 */
-type MEMBERID = DISPID /* oaidl.h:526:16 */
-type HREFTYPE = DWORD  /* oaidl.h:527:15 */
-type TYPEKIND = uint32 /* oaidl.h:538:3 */
+type DISPID = LONG     /* oaidl.h:637:14 */
+type MEMBERID = DISPID /* oaidl.h:638:16 */
+type HREFTYPE = DWORD  /* oaidl.h:639:15 */
+type TYPEKIND = uint32 /* oaidl.h:650:3 */
 
 type tagTYPEDESC = struct {
-	F__0 struct{ Flptdesc uintptr }
-	Fvt  VARTYPE
-	_    [6]byte
-} /* oaidl.h:540:9 */
+	F__0         struct{ Flptdesc uintptr }
+	Fvt          VARTYPE
+	F__ccgo_pad1 [6]byte
+} /* oaidl.h:652:9 */
 
 type tagARRAYDESC = struct {
-	FtdescElem TYPEDESC
-	FcDims     USHORT
-	_          [2]byte
-	Frgbounds  [1]SAFEARRAYBOUND
-	_          [4]byte
-} /* oaidl.h:543:9 */
+	FtdescElem   TYPEDESC
+	FcDims       USHORT
+	F__ccgo_pad1 [2]byte
+	Frgbounds    [1]SAFEARRAYBOUND
+	F__ccgo_pad2 [4]byte
+} /* oaidl.h:655:9 */
 
-type TYPEDESC = tagTYPEDESC /* oaidl.h:547:3 */
+type TYPEDESC = tagTYPEDESC /* oaidl.h:659:3 */
 
-type ARRAYDESC = tagARRAYDESC /* oaidl.h:553:3 */
+type ARRAYDESC = tagARRAYDESC /* oaidl.h:665:3 */
 
 type tagPARAMDESCEX = struct {
 	FcBytes          ULONG
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FvarDefaultValue VARIANTARG
-} /* oaidl.h:555:9 */
+} /* oaidl.h:667:9 */
 
-type PARAMDESCEX = tagPARAMDESCEX /* oaidl.h:558:3 */
-type LPPARAMDESCEX = uintptr      /* oaidl.h:559:31 */
+type PARAMDESCEX = tagPARAMDESCEX /* oaidl.h:670:3 */
+type LPPARAMDESCEX = uintptr      /* oaidl.h:671:31 */
 
 type tagPARAMDESC = struct {
 	Fpparamdescex LPPARAMDESCEX
 	FwParamFlags  USHORT
-	_             [6]byte
-} /* oaidl.h:561:9 */
+	F__ccgo_pad1  [6]byte
+} /* oaidl.h:673:9 */
 
-type PARAMDESC = tagPARAMDESC /* oaidl.h:564:3 */
-type LPPARAMDESC = uintptr    /* oaidl.h:565:29 */
+type PARAMDESC = tagPARAMDESC /* oaidl.h:676:3 */
+type LPPARAMDESC = uintptr    /* oaidl.h:677:29 */
 
 type tagIDLDESC = struct {
-	FdwReserved ULONG_PTR
-	FwIDLFlags  USHORT
-	_           [6]byte
-} /* oaidl.h:584:9 */
+	FdwReserved  ULONG_PTR
+	FwIDLFlags   USHORT
+	F__ccgo_pad1 [6]byte
+} /* oaidl.h:696:9 */
 
-type IDLDESC = tagIDLDESC /* oaidl.h:587:3 */
-type LPIDLDESC = uintptr  /* oaidl.h:588:27 */
+type IDLDESC = tagIDLDESC /* oaidl.h:699:3 */
+type LPIDLDESC = uintptr  /* oaidl.h:700:27 */
 
 type tagELEMDESC = struct {
 	Ftdesc TYPEDESC
 	Fu     struct{ Fidldesc IDLDESC }
-} /* oaidl.h:608:11 */
+} /* oaidl.h:720:11 */
 
-type ELEMDESC = tagELEMDESC /* oaidl.h:614:5 */
-type LPELEMDESC = uintptr   /* oaidl.h:614:14 */
+type ELEMDESC = tagELEMDESC /* oaidl.h:726:5 */
+type LPELEMDESC = uintptr   /* oaidl.h:726:14 */
 
 type tagTYPEATTR = struct {
 	Fguid             GUID
@@ -55002,47 +55576,47 @@ type tagTYPEATTR = struct {
 	FwMinorVerNum     WORD
 	FtdescAlias       TYPEDESC
 	FidldescType      IDLDESC
-} /* oaidl.h:617:9 */
+} /* oaidl.h:729:9 */
 
-type TYPEATTR = tagTYPEATTR /* oaidl.h:636:3 */
-type LPTYPEATTR = uintptr   /* oaidl.h:637:28 */
+type TYPEATTR = tagTYPEATTR /* oaidl.h:748:3 */
+type LPTYPEATTR = uintptr   /* oaidl.h:749:28 */
 
 type tagDISPPARAMS = struct {
 	Frgvarg            uintptr
 	FrgdispidNamedArgs uintptr
 	FcArgs             UINT
 	FcNamedArgs        UINT
-} /* oaidl.h:639:9 */
+} /* oaidl.h:751:9 */
 
-type DISPPARAMS = tagDISPPARAMS /* oaidl.h:644:3 */
+type DISPPARAMS = tagDISPPARAMS /* oaidl.h:756:3 */
 
 type tagEXCEPINFO = struct {
 	FwCode             WORD
 	FwReserved         WORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FbstrSource        BSTR
 	FbstrDescription   BSTR
 	FbstrHelpFile      BSTR
 	FdwHelpContext     DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FpvReserved        PVOID
 	FpfnDeferredFillIn uintptr
 	Fscode             SCODE
-	_                  [4]byte
-} /* oaidl.h:659:11 */
+	F__ccgo_pad3       [4]byte
+} /* oaidl.h:771:11 */
 
-type EXCEPINFO = tagEXCEPINFO /* oaidl.h:669:5 */
-type LPEXCEPINFO = uintptr    /* oaidl.h:669:16 */
+type EXCEPINFO = tagEXCEPINFO /* oaidl.h:781:5 */
+type LPEXCEPINFO = uintptr    /* oaidl.h:781:16 */
 
-type CALLCONV = uint32 /* oaidl.h:684:3 */
+type CALLCONV = uint32 /* oaidl.h:796:3 */
 
-type FUNCKIND = uint32 /* oaidl.h:692:3 */
+type FUNCKIND = uint32 /* oaidl.h:804:3 */
 
-type INVOKEKIND = uint32 /* oaidl.h:699:3 */
+type INVOKEKIND = uint32 /* oaidl.h:811:3 */
 
 type tagFUNCDESC = struct {
 	Fmemid             MEMBERID
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	Flprgscode         uintptr
 	FlprgelemdescParam uintptr
 	Ffunckind          FUNCKIND
@@ -55052,72 +55626,72 @@ type tagFUNCDESC = struct {
 	FcParamsOpt        SHORT
 	FoVft              SHORT
 	FcScodes           SHORT
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FelemdescFunc      ELEMDESC
 	FwFuncFlags        WORD
-	_                  [6]byte
-} /* oaidl.h:701:9 */
+	F__ccgo_pad3       [6]byte
+} /* oaidl.h:813:9 */
 
-type FUNCDESC = tagFUNCDESC /* oaidl.h:714:3 */
-type LPFUNCDESC = uintptr   /* oaidl.h:715:28 */
+type FUNCDESC = tagFUNCDESC /* oaidl.h:826:3 */
+type LPFUNCDESC = uintptr   /* oaidl.h:827:28 */
 
-type VARKIND = uint32 /* oaidl.h:722:3 */
+type VARKIND = uint32 /* oaidl.h:834:3 */
 
 type tagVARDESC = struct {
 	Fmemid       MEMBERID
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FlpstrSchema LPOLESTR
 	F__16        struct {
-		_      [0]uint64
-		FoInst ULONG
-		_      [4]byte
+		F__ccgo_pad1 [0]uint64
+		FoInst       ULONG
+		F__ccgo_pad2 [4]byte
 	}
 	FelemdescVar ELEMDESC
 	FwVarFlags   WORD
-	_            [2]byte
+	F__ccgo_pad2 [2]byte
 	Fvarkind     VARKIND
-} /* oaidl.h:733:9 */
+} /* oaidl.h:845:9 */
 
-type VARDESC = tagVARDESC /* oaidl.h:743:3 */
-type LPVARDESC = uintptr  /* oaidl.h:744:27 */
+type VARDESC = tagVARDESC /* oaidl.h:855:3 */
+type LPVARDESC = uintptr  /* oaidl.h:856:27 */
 
-type TYPEFLAGS = uint32 /* oaidl.h:762:3 */
+type TYPEFLAGS = uint32 /* oaidl.h:874:3 */
 
-type FUNCFLAGS = uint32 /* oaidl.h:778:3 */
+type FUNCFLAGS = uint32 /* oaidl.h:890:3 */
 
-type VARFLAGS = uint32 /* oaidl.h:794:3 */
+type VARFLAGS = uint32 /* oaidl.h:906:3 */
 
 type tagCLEANLOCALSTORAGE = struct {
-	FpInterface uintptr
-	FpStorage   PVOID
-	Fflags      DWORD
-	_           [4]byte
-} /* oaidl.h:796:9 */
+	FpInterface  uintptr
+	FpStorage    PVOID
+	Fflags       DWORD
+	F__ccgo_pad1 [4]byte
+} /* oaidl.h:908:9 */
 
-type CLEANLOCALSTORAGE = tagCLEANLOCALSTORAGE /* oaidl.h:800:3 */
+type CLEANLOCALSTORAGE = tagCLEANLOCALSTORAGE /* oaidl.h:912:3 */
 
 type tagCUSTDATAITEM = struct {
 	Fguid     GUID
 	FvarValue VARIANTARG
-} /* oaidl.h:802:9 */
+} /* oaidl.h:914:9 */
 
-type CUSTDATAITEM = tagCUSTDATAITEM /* oaidl.h:805:3 */
-type LPCUSTDATAITEM = uintptr       /* oaidl.h:806:32 */
+type CUSTDATAITEM = tagCUSTDATAITEM /* oaidl.h:917:3 */
+type LPCUSTDATAITEM = uintptr       /* oaidl.h:918:32 */
 
 type tagCUSTDATA = struct {
 	FcCustData   DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FprgCustData LPCUSTDATAITEM
-} /* oaidl.h:808:9 */
+} /* oaidl.h:920:9 */
 
-type CUSTDATA = tagCUSTDATA /* oaidl.h:811:3 */
-type LPCUSTDATA = uintptr   /* oaidl.h:812:28 */
+type CUSTDATA = tagCUSTDATA /* oaidl.h:923:3 */
+type LPCUSTDATA = uintptr   /* oaidl.h:924:28 */
 
 // ****************************************************************************
 //
 // ICreateTypeInfo interface
 
-type LPCREATETYPEINFO = uintptr /* oaidl.h:825:25 */
+type LPCREATETYPEINFO = uintptr /* oaidl.h:937:25 */
 type ICreateTypeInfoVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -55145,15 +55719,15 @@ type ICreateTypeInfoVtbl1 = struct {
 	FSetMops              uintptr
 	FSetTypeIdldesc       uintptr
 	FLayOut               uintptr
-} /* oaidl.h:22:9 */
+} /* oaidl.h:23:9 */
 
-type ICreateTypeInfoVtbl = ICreateTypeInfoVtbl1 /* oaidl.h:1046:3 */
+type ICreateTypeInfoVtbl = ICreateTypeInfoVtbl1 /* oaidl.h:1158:3 */
 
 // ****************************************************************************
 //
 // ICreateTypeInfo2 interface
 
-type LPCREATETYPEINFO2 = uintptr /* oaidl.h:1376:26 */
+type LPCREATETYPEINFO2 = uintptr /* oaidl.h:1290:26 */
 type ICreateTypeInfo2Vtbl1 = struct {
 	FQueryInterface           uintptr
 	FAddRef                   uintptr
@@ -55196,15 +55770,15 @@ type ICreateTypeInfo2Vtbl1 = struct {
 	FSetVarHelpStringContext  uintptr
 	FInvalidate               uintptr
 	FSetName                  uintptr
-} /* oaidl.h:27:9 */
+} /* oaidl.h:31:9 */
 
-type ICreateTypeInfo2Vtbl = ICreateTypeInfo2Vtbl1 /* oaidl.h:1643:3 */
+type ICreateTypeInfo2Vtbl = ICreateTypeInfo2Vtbl1 /* oaidl.h:1557:3 */
 
 // ****************************************************************************
 //
 // ICreateTypeLib interface
 
-type LPCREATETYPELIB = uintptr /* oaidl.h:1968:24 */
+type LPCREATETYPELIB = uintptr /* oaidl.h:1751:24 */
 type ICreateTypeLibVtbl1 = struct {
 	FQueryInterface  uintptr
 	FAddRef          uintptr
@@ -55219,15 +55793,15 @@ type ICreateTypeLibVtbl1 = struct {
 	FSetLcid         uintptr
 	FSetLibFlags     uintptr
 	FSaveAllChanges  uintptr
-} /* oaidl.h:32:9 */
+} /* oaidl.h:39:9 */
 
-type ICreateTypeLibVtbl = ICreateTypeLibVtbl1 /* oaidl.h:2072:3 */
+type ICreateTypeLibVtbl = ICreateTypeLibVtbl1 /* oaidl.h:1855:3 */
 
 // ****************************************************************************
 //
 // ICreateTypeLib2 interface
 
-type LPCREATETYPELIB2 = uintptr /* oaidl.h:2233:25 */
+type LPCREATETYPELIB2 = uintptr /* oaidl.h:1935:25 */
 type ICreateTypeLib2Vtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -55246,15 +55820,15 @@ type ICreateTypeLib2Vtbl1 = struct {
 	FSetCustData          uintptr
 	FSetHelpStringContext uintptr
 	FSetHelpStringDll     uintptr
-} /* oaidl.h:37:9 */
+} /* oaidl.h:47:9 */
 
-type ICreateTypeLib2Vtbl = ICreateTypeLib2Vtbl1 /* oaidl.h:2334:3 */
+type ICreateTypeLib2Vtbl = ICreateTypeLib2Vtbl1 /* oaidl.h:2036:3 */
 
 // ****************************************************************************
 //
 // IDispatch interface
 
-type LPDISPATCH = uintptr /* oaidl.h:2466:19 */
+type LPDISPATCH = uintptr /* oaidl.h:2136:19 */
 type IDispatchVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -55263,15 +55837,15 @@ type IDispatchVtbl1 = struct {
 	FGetTypeInfo      uintptr
 	FGetIDsOfNames    uintptr
 	FInvoke           uintptr
-} /* oaidl.h:42:9 */
+} /* oaidl.h:55:9 */
 
-type IDispatchVtbl = IDispatchVtbl1 /* oaidl.h:2567:3 */
+type IDispatchVtbl = IDispatchVtbl1 /* oaidl.h:2237:3 */
 
 // ****************************************************************************
 //
 // IEnumVARIANT interface
 
-type LPENUMVARIANT = uintptr /* oaidl.h:2693:22 */
+type LPENUMVARIANT = uintptr /* oaidl.h:2334:22 */
 type IEnumVARIANTVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -55280,37 +55854,37 @@ type IEnumVARIANTVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* oaidl.h:47:9 */
+} /* oaidl.h:63:9 */
 
-type IEnumVARIANTVtbl = IEnumVARIANTVtbl1 /* oaidl.h:2753:3 */
+type IEnumVARIANTVtbl = IEnumVARIANTVtbl1 /* oaidl.h:2394:3 */
 
 // ****************************************************************************
 //
 // ITypeComp interface
 
-type LPTYPECOMP = uintptr /* oaidl.h:2851:19 */
+type LPTYPECOMP = uintptr /* oaidl.h:2470:19 */
 
-type DESCKIND = uint32 /* oaidl.h:2860:3 */
+type DESCKIND = uint32 /* oaidl.h:2479:3 */
 
-type tagBINDPTR = struct{ Flpfuncdesc uintptr } /* oaidl.h:2862:9 */
+type tagBINDPTR = struct{ Flpfuncdesc uintptr } /* oaidl.h:2481:9 */
 
-type BINDPTR = tagBINDPTR /* oaidl.h:2866:3 */
-type LPBINDPTR = uintptr  /* oaidl.h:2867:26 */
+type BINDPTR = tagBINDPTR /* oaidl.h:2485:3 */
+type LPBINDPTR = uintptr  /* oaidl.h:2486:26 */
 type ITypeCompVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FBind           uintptr
 	FBindType       uintptr
-} /* oaidl.h:52:9 */
+} /* oaidl.h:71:9 */
 
-type ITypeCompVtbl = ITypeCompVtbl1 /* oaidl.h:2926:3 */
+type ITypeCompVtbl = ITypeCompVtbl1 /* oaidl.h:2545:3 */
 
 // ****************************************************************************
 //
 // ITypeInfo interface
 
-type LPTYPEINFO = uintptr /* oaidl.h:3031:19 */
+type LPTYPEINFO = uintptr /* oaidl.h:2651:19 */
 type ITypeInfoVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -55334,15 +55908,15 @@ type ITypeInfoVtbl1 = struct {
 	FReleaseTypeAttr      uintptr
 	FReleaseFuncDesc      uintptr
 	FReleaseVarDesc       uintptr
-} /* oaidl.h:57:9 */
+} /* oaidl.h:79:9 */
 
-type ITypeInfoVtbl = ITypeInfoVtbl1 /* oaidl.h:3253:3 */
+type ITypeInfoVtbl = ITypeInfoVtbl1 /* oaidl.h:2873:3 */
 
 // ****************************************************************************
 //
 // ITypeInfo2 interface
 
-type LPTYPEINFO2 = uintptr /* oaidl.h:3662:20 */
+type LPTYPEINFO2 = uintptr /* oaidl.h:3239:20 */
 type ITypeInfo2Vtbl1 = struct {
 	FQueryInterface         uintptr
 	FAddRef                 uintptr
@@ -55381,19 +55955,19 @@ type ITypeInfo2Vtbl1 = struct {
 	FGetAllParamCustData    uintptr
 	FGetAllVarCustData      uintptr
 	FGetAllImplTypeCustData uintptr
-} /* oaidl.h:62:9 */
+} /* oaidl.h:87:9 */
 
-type ITypeInfo2Vtbl = ITypeInfo2Vtbl1 /* oaidl.h:3947:3 */
+type ITypeInfo2Vtbl = ITypeInfo2Vtbl1 /* oaidl.h:3524:3 */
 
 // ****************************************************************************
 //
 // ITypeLib interface
 
-type SYSKIND = uint32 /* oaidl.h:4289:3 */
+type SYSKIND = uint32 /* oaidl.h:3737:3 */
 
-type LIBFLAGS = uint32 /* oaidl.h:4296:3 */
+type LIBFLAGS = uint32 /* oaidl.h:3744:3 */
 
-type LPTYPELIB = uintptr /* oaidl.h:4298:18 */
+type LPTYPELIB = uintptr /* oaidl.h:3746:18 */
 
 type tagTLIBATTR = struct {
 	Fguid         GUID
@@ -55402,11 +55976,11 @@ type tagTLIBATTR = struct {
 	FwMajorVerNum WORD
 	FwMinorVerNum WORD
 	FwLibFlags    WORD
-	_             [2]byte
-} /* oaidl.h:4300:9 */
+	F__ccgo_pad1  [2]byte
+} /* oaidl.h:3748:9 */
 
-type TLIBATTR = tagTLIBATTR /* oaidl.h:4307:3 */
-type LPTLIBATTR = uintptr   /* oaidl.h:4308:28 */
+type TLIBATTR = tagTLIBATTR /* oaidl.h:3755:3 */
+type LPTLIBATTR = uintptr   /* oaidl.h:3756:28 */
 type ITypeLibVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -55421,15 +55995,15 @@ type ITypeLibVtbl1 = struct {
 	FIsName            uintptr
 	FFindName          uintptr
 	FReleaseTLibAttr   uintptr
-} /* oaidl.h:67:9 */
+} /* oaidl.h:95:9 */
 
-type ITypeLibVtbl = ITypeLibVtbl1 /* oaidl.h:4432:3 */
+type ITypeLibVtbl = ITypeLibVtbl1 /* oaidl.h:3880:3 */
 
 // ****************************************************************************
 //
 // ITypeLib2 interface
 
-type LPTYPELIB2 = uintptr /* oaidl.h:4667:19 */
+type LPTYPELIB2 = uintptr /* oaidl.h:4081:19 */
 type ITypeLib2Vtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -55448,32 +56022,32 @@ type ITypeLib2Vtbl1 = struct {
 	FGetLibStatistics  uintptr
 	FGetDocumentation2 uintptr
 	FGetAllCustData    uintptr
-} /* oaidl.h:72:9 */
+} /* oaidl.h:103:9 */
 
-type ITypeLib2Vtbl = ITypeLib2Vtbl1 /* oaidl.h:4789:3 */
+type ITypeLib2Vtbl = ITypeLib2Vtbl1 /* oaidl.h:4203:3 */
 
 // ****************************************************************************
 //
 // ITypeChangeEvents interface
 
-type LPTYPECHANGEEVENTS = uintptr /* oaidl.h:4948:27 */
+type LPTYPECHANGEEVENTS = uintptr /* oaidl.h:4346:27 */
 
-type CHANGEKIND = uint32 /* oaidl.h:4959:3 */
+type CHANGEKIND = uint32 /* oaidl.h:4357:3 */
 type ITypeChangeEventsVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
 	FRelease           uintptr
 	FRequestTypeChange uintptr
 	FAfterTypeChange   uintptr
-} /* oaidl.h:77:9 */
+} /* oaidl.h:111:9 */
 
-type ITypeChangeEventsVtbl = ITypeChangeEventsVtbl1 /* oaidl.h:5012:3 */
+type ITypeChangeEventsVtbl = ITypeChangeEventsVtbl1 /* oaidl.h:4410:3 */
 
 // ****************************************************************************
 //
 // IErrorInfo interface
 
-type LPERRORINFO = uintptr /* oaidl.h:5080:20 */
+type LPERRORINFO = uintptr /* oaidl.h:4458:20 */
 type IErrorInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -55483,15 +56057,15 @@ type IErrorInfoVtbl1 = struct {
 	FGetDescription uintptr
 	FGetHelpFile    uintptr
 	FGetHelpContext uintptr
-} /* oaidl.h:82:9 */
+} /* oaidl.h:119:9 */
 
-type IErrorInfoVtbl = IErrorInfoVtbl1 /* oaidl.h:5144:3 */
+type IErrorInfoVtbl = IErrorInfoVtbl1 /* oaidl.h:4522:3 */
 
 // ****************************************************************************
 //
 // ICreateErrorInfo interface
 
-type LPCREATEERRORINFO = uintptr /* oaidl.h:5243:26 */
+type LPCREATEERRORINFO = uintptr /* oaidl.h:4582:26 */
 type ICreateErrorInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -55501,31 +56075,31 @@ type ICreateErrorInfoVtbl1 = struct {
 	FSetDescription uintptr
 	FSetHelpFile    uintptr
 	FSetHelpContext uintptr
-} /* oaidl.h:87:9 */
+} /* oaidl.h:127:9 */
 
-type ICreateErrorInfoVtbl = ICreateErrorInfoVtbl1 /* oaidl.h:5307:3 */
+type ICreateErrorInfoVtbl = ICreateErrorInfoVtbl1 /* oaidl.h:4646:3 */
 
 // ****************************************************************************
 //
 // ISupportErrorInfo interface
 
-type LPSUPPORTERRORINFO = uintptr /* oaidl.h:5406:27 */
+type LPSUPPORTERRORINFO = uintptr /* oaidl.h:4706:27 */
 type ISupportErrorInfoVtbl1 = struct {
 	FQueryInterface             uintptr
 	FAddRef                     uintptr
 	FRelease                    uintptr
 	FInterfaceSupportsErrorInfo uintptr
-} /* oaidl.h:92:9 */
+} /* oaidl.h:135:9 */
 
-type ISupportErrorInfoVtbl = ISupportErrorInfoVtbl1 /* oaidl.h:5442:3 */
+type ISupportErrorInfoVtbl = ISupportErrorInfoVtbl1 /* oaidl.h:4742:3 */
 type ITypeFactoryVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
 	FRelease            uintptr
 	FCreateFromTypeInfo uintptr
-} /* oaidl.h:97:9 */
+} /* oaidl.h:143:9 */
 
-type ITypeFactoryVtbl = ITypeFactoryVtbl1 /* oaidl.h:5531:3 */
+type ITypeFactoryVtbl = ITypeFactoryVtbl1 /* oaidl.h:4824:3 */
 type ITypeMarshalVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -55534,15 +56108,15 @@ type ITypeMarshalVtbl1 = struct {
 	FMarshal        uintptr
 	FUnmarshal      uintptr
 	FFree           uintptr
-} /* oaidl.h:102:9 */
+} /* oaidl.h:151:9 */
 
-type ITypeMarshalVtbl = ITypeMarshalVtbl1 /* oaidl.h:5663:3 */
+type ITypeMarshalVtbl = ITypeMarshalVtbl1 /* oaidl.h:4947:3 */
 
 // ****************************************************************************
 //
 // IRecordInfo interface
 
-type LPRECORDINFO = uintptr /* oaidl.h:5762:21 */
+type LPRECORDINFO = uintptr /* oaidl.h:5003:21 */
 type IRecordInfoVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -55563,162 +56137,162 @@ type IRecordInfoVtbl1 = struct {
 	FRecordCreate     uintptr
 	FRecordCreateCopy uintptr
 	FRecordDestroy    uintptr
-} /* oaidl.h:107:9 */
+} /* oaidl.h:159:9 */
 
-type IRecordInfoVtbl = IRecordInfoVtbl1 /* oaidl.h:5930:3 */
+type IRecordInfoVtbl = IRecordInfoVtbl1 /* oaidl.h:5171:3 */
 
 // ****************************************************************************
 //
 // IErrorLog interface
 
-type LPERRORLOG = uintptr /* oaidl.h:6174:19 */
+type LPERRORLOG = uintptr /* oaidl.h:5275:19 */
 type IErrorLogVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FAddError       uintptr
-} /* oaidl.h:112:9 */
+} /* oaidl.h:167:9 */
 
-type IErrorLogVtbl = IErrorLogVtbl1 /* oaidl.h:6212:3 */
+type IErrorLogVtbl = IErrorLogVtbl1 /* oaidl.h:5313:3 */
 
 // ****************************************************************************
 //
 // IPropertyBag interface
 
-type LPPROPERTYBAG = uintptr /* oaidl.h:6264:22 */
+type LPPROPERTYBAG = uintptr /* oaidl.h:5357:22 */
 type IPropertyBagVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FRead           uintptr
 	FWrite          uintptr
-} /* oaidl.h:117:9 */
+} /* oaidl.h:175:9 */
 
-type IPropertyBagVtbl = IPropertyBagVtbl1 /* oaidl.h:6313:3 */
+type IPropertyBagVtbl = IPropertyBagVtbl1 /* oaidl.h:5406:3 */
 
 // End additional prototypes
 
-type IXMLDOMImplementation1 = struct{ FlpVtbl uintptr } /* msxml.h:34:9 */
+type IXMLDOMImplementation1 = struct{ FlpVtbl uintptr } /* msxml.h:35:9 */
 
 // End additional prototypes
 
-type IXMLDOMImplementation = IXMLDOMImplementation1 /* msxml.h:34:38 */
+type IXMLDOMImplementation = IXMLDOMImplementation1 /* msxml.h:35:38 */
 
-type IXMLDOMNode1 = struct{ FlpVtbl uintptr } /* msxml.h:39:9 */
+type IXMLDOMNode1 = struct{ FlpVtbl uintptr } /* msxml.h:40:9 */
 
-type IXMLDOMNode = IXMLDOMNode1 /* msxml.h:39:28 */
+type IXMLDOMNode = IXMLDOMNode1 /* msxml.h:40:28 */
 
-type IXMLDOMDocumentFragment1 = struct{ FlpVtbl uintptr } /* msxml.h:44:9 */
+type IXMLDOMDocumentFragment1 = struct{ FlpVtbl uintptr } /* msxml.h:45:9 */
 
-type IXMLDOMDocumentFragment = IXMLDOMDocumentFragment1 /* msxml.h:44:40 */
+type IXMLDOMDocumentFragment = IXMLDOMDocumentFragment1 /* msxml.h:45:40 */
 
-type IXMLDOMDocument1 = struct{ FlpVtbl uintptr } /* msxml.h:49:9 */
+type IXMLDOMDocument1 = struct{ FlpVtbl uintptr } /* msxml.h:50:9 */
 
-type IXMLDOMDocument = IXMLDOMDocument1 /* msxml.h:49:32 */
+type IXMLDOMDocument = IXMLDOMDocument1 /* msxml.h:50:32 */
 
-type IXMLDOMNodeList1 = struct{ FlpVtbl uintptr } /* msxml.h:54:9 */
+type IXMLDOMNodeList1 = struct{ FlpVtbl uintptr } /* msxml.h:55:9 */
 
-type IXMLDOMNodeList = IXMLDOMNodeList1 /* msxml.h:54:32 */
+type IXMLDOMNodeList = IXMLDOMNodeList1 /* msxml.h:55:32 */
 
-type IXMLDOMNamedNodeMap1 = struct{ FlpVtbl uintptr } /* msxml.h:59:9 */
+type IXMLDOMNamedNodeMap1 = struct{ FlpVtbl uintptr } /* msxml.h:60:9 */
 
-type IXMLDOMNamedNodeMap = IXMLDOMNamedNodeMap1 /* msxml.h:59:36 */
+type IXMLDOMNamedNodeMap = IXMLDOMNamedNodeMap1 /* msxml.h:60:36 */
 
-type IXMLDOMCharacterData1 = struct{ FlpVtbl uintptr } /* msxml.h:64:9 */
+type IXMLDOMCharacterData1 = struct{ FlpVtbl uintptr } /* msxml.h:65:9 */
 
-type IXMLDOMCharacterData = IXMLDOMCharacterData1 /* msxml.h:64:37 */
+type IXMLDOMCharacterData = IXMLDOMCharacterData1 /* msxml.h:65:37 */
 
-type IXMLDOMAttribute1 = struct{ FlpVtbl uintptr } /* msxml.h:69:9 */
+type IXMLDOMAttribute1 = struct{ FlpVtbl uintptr } /* msxml.h:70:9 */
 
-type IXMLDOMAttribute = IXMLDOMAttribute1 /* msxml.h:69:33 */
+type IXMLDOMAttribute = IXMLDOMAttribute1 /* msxml.h:70:33 */
 
-type IXMLDOMElement1 = struct{ FlpVtbl uintptr } /* msxml.h:74:9 */
+type IXMLDOMElement1 = struct{ FlpVtbl uintptr } /* msxml.h:75:9 */
 
-type IXMLDOMElement = IXMLDOMElement1 /* msxml.h:74:31 */
+type IXMLDOMElement = IXMLDOMElement1 /* msxml.h:75:31 */
 
-type IXMLDOMText1 = struct{ FlpVtbl uintptr } /* msxml.h:79:9 */
+type IXMLDOMText1 = struct{ FlpVtbl uintptr } /* msxml.h:80:9 */
 
-type IXMLDOMText = IXMLDOMText1 /* msxml.h:79:28 */
+type IXMLDOMText = IXMLDOMText1 /* msxml.h:80:28 */
 
-type IXMLDOMComment1 = struct{ FlpVtbl uintptr } /* msxml.h:84:9 */
+type IXMLDOMComment1 = struct{ FlpVtbl uintptr } /* msxml.h:85:9 */
 
-type IXMLDOMComment = IXMLDOMComment1 /* msxml.h:84:31 */
+type IXMLDOMComment = IXMLDOMComment1 /* msxml.h:85:31 */
 
-type IXMLDOMProcessingInstruction1 = struct{ FlpVtbl uintptr } /* msxml.h:89:9 */
+type IXMLDOMProcessingInstruction1 = struct{ FlpVtbl uintptr } /* msxml.h:90:9 */
 
-type IXMLDOMProcessingInstruction = IXMLDOMProcessingInstruction1 /* msxml.h:89:45 */
+type IXMLDOMProcessingInstruction = IXMLDOMProcessingInstruction1 /* msxml.h:90:45 */
 
-type IXMLDOMCDATASection1 = struct{ FlpVtbl uintptr } /* msxml.h:94:9 */
+type IXMLDOMCDATASection1 = struct{ FlpVtbl uintptr } /* msxml.h:95:9 */
 
-type IXMLDOMCDATASection = IXMLDOMCDATASection1 /* msxml.h:94:36 */
+type IXMLDOMCDATASection = IXMLDOMCDATASection1 /* msxml.h:95:36 */
 
-type IXMLDOMDocumentType1 = struct{ FlpVtbl uintptr } /* msxml.h:99:9 */
+type IXMLDOMDocumentType1 = struct{ FlpVtbl uintptr } /* msxml.h:100:9 */
 
-type IXMLDOMDocumentType = IXMLDOMDocumentType1 /* msxml.h:99:36 */
+type IXMLDOMDocumentType = IXMLDOMDocumentType1 /* msxml.h:100:36 */
 
-type IXMLDOMNotation1 = struct{ FlpVtbl uintptr } /* msxml.h:104:9 */
+type IXMLDOMNotation1 = struct{ FlpVtbl uintptr } /* msxml.h:105:9 */
 
-type IXMLDOMNotation = IXMLDOMNotation1 /* msxml.h:104:32 */
+type IXMLDOMNotation = IXMLDOMNotation1 /* msxml.h:105:32 */
 
-type IXMLDOMEntity1 = struct{ FlpVtbl uintptr } /* msxml.h:109:9 */
+type IXMLDOMEntity1 = struct{ FlpVtbl uintptr } /* msxml.h:110:9 */
 
-type IXMLDOMEntity = IXMLDOMEntity1 /* msxml.h:109:30 */
+type IXMLDOMEntity = IXMLDOMEntity1 /* msxml.h:110:30 */
 
-type IXMLDOMEntityReference1 = struct{ FlpVtbl uintptr } /* msxml.h:114:9 */
+type IXMLDOMEntityReference1 = struct{ FlpVtbl uintptr } /* msxml.h:115:9 */
 
-type IXMLDOMEntityReference = IXMLDOMEntityReference1 /* msxml.h:114:39 */
+type IXMLDOMEntityReference = IXMLDOMEntityReference1 /* msxml.h:115:39 */
 
-type IXMLDOMParseError1 = struct{ FlpVtbl uintptr } /* msxml.h:119:9 */
+type IXMLDOMParseError1 = struct{ FlpVtbl uintptr } /* msxml.h:120:9 */
 
-type IXMLDOMParseError = IXMLDOMParseError1 /* msxml.h:119:34 */
+type IXMLDOMParseError = IXMLDOMParseError1 /* msxml.h:120:34 */
 
-type IXTLRuntime1 = struct{ FlpVtbl uintptr } /* msxml.h:124:9 */
+type IXTLRuntime1 = struct{ FlpVtbl uintptr } /* msxml.h:125:9 */
 
-type IXTLRuntime = IXTLRuntime1 /* msxml.h:124:28 */
+type IXTLRuntime = IXTLRuntime1 /* msxml.h:125:28 */
 
-type XMLDOMDocumentEvents1 = struct{ FlpVtbl uintptr } /* msxml.h:129:9 */
+type XMLDOMDocumentEvents1 = struct{ FlpVtbl uintptr } /* msxml.h:130:9 */
 
-type XMLDOMDocumentEvents = XMLDOMDocumentEvents1 /* msxml.h:129:37 */
+type XMLDOMDocumentEvents = XMLDOMDocumentEvents1 /* msxml.h:130:37 */
 
-type IXMLHttpRequest1 = struct{ FlpVtbl uintptr } /* msxml.h:152:9 */
+type IXMLHttpRequest1 = struct{ FlpVtbl uintptr } /* msxml.h:153:9 */
 
-type IXMLHttpRequest = IXMLHttpRequest1 /* msxml.h:152:32 */
+type IXMLHttpRequest = IXMLHttpRequest1 /* msxml.h:153:32 */
 
-type IXMLDSOControl1 = struct{ FlpVtbl uintptr } /* msxml.h:166:9 */
+type IXMLDSOControl1 = struct{ FlpVtbl uintptr } /* msxml.h:167:9 */
 
-type IXMLDSOControl = IXMLDSOControl1 /* msxml.h:166:31 */
+type IXMLDSOControl = IXMLDSOControl1 /* msxml.h:167:31 */
 
-type IXMLElementCollection1 = struct{ FlpVtbl uintptr } /* msxml.h:180:9 */
+type IXMLElementCollection1 = struct{ FlpVtbl uintptr } /* msxml.h:181:9 */
 
-type IXMLElementCollection = IXMLElementCollection1 /* msxml.h:180:38 */
+type IXMLElementCollection = IXMLElementCollection1 /* msxml.h:181:38 */
 
-type IXMLDocument1 = struct{ FlpVtbl uintptr } /* msxml.h:185:9 */
+type IXMLDocument1 = struct{ FlpVtbl uintptr } /* msxml.h:186:9 */
 
-type IXMLDocument = IXMLDocument1 /* msxml.h:185:29 */
+type IXMLDocument = IXMLDocument1 /* msxml.h:186:29 */
 
-type IXMLDocument21 = struct{ FlpVtbl uintptr } /* msxml.h:190:9 */
+type IXMLDocument21 = struct{ FlpVtbl uintptr } /* msxml.h:191:9 */
 
-type IXMLDocument2 = IXMLDocument21 /* msxml.h:190:30 */
+type IXMLDocument2 = IXMLDocument21 /* msxml.h:191:30 */
 
-type IXMLElement1 = struct{ FlpVtbl uintptr } /* msxml.h:195:9 */
+type IXMLElement1 = struct{ FlpVtbl uintptr } /* msxml.h:196:9 */
 
-type IXMLElement = IXMLElement1 /* msxml.h:195:28 */
+type IXMLElement = IXMLElement1 /* msxml.h:196:28 */
 
-type IXMLElement21 = struct{ FlpVtbl uintptr } /* msxml.h:200:9 */
+type IXMLElement21 = struct{ FlpVtbl uintptr } /* msxml.h:201:9 */
 
-type IXMLElement2 = IXMLElement21 /* msxml.h:200:29 */
+type IXMLElement2 = IXMLElement21 /* msxml.h:201:29 */
 
-type IXMLAttribute1 = struct{ FlpVtbl uintptr } /* msxml.h:205:9 */
+type IXMLAttribute1 = struct{ FlpVtbl uintptr } /* msxml.h:206:9 */
 
-type IXMLAttribute = IXMLAttribute1 /* msxml.h:205:30 */
+type IXMLAttribute = IXMLAttribute1 /* msxml.h:206:30 */
 
-type IXMLError1 = struct{ FlpVtbl uintptr } /* msxml.h:210:9 */
+type IXMLError1 = struct{ FlpVtbl uintptr } /* msxml.h:211:9 */
 
-type IXMLError = IXMLError1 /* msxml.h:210:26 */
+type IXMLError = IXMLError1 /* msxml.h:211:26 */
 
 type _xml_error = struct {
 	F_nLine       uint32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	F_pchBuf      BSTR
 	F_cchBuf      uint32
 	F_ich         uint32
@@ -55726,13 +56300,13 @@ type _xml_error = struct {
 	F_pszExpected BSTR
 	F_reserved1   DWORD
 	F_reserved2   DWORD
-} /* msxml.h:224:11 */
+} /* msxml.h:225:11 */
 
-type XML_ERROR = _xml_error /* msxml.h:233:5 */
+type XML_ERROR = _xml_error /* msxml.h:234:5 */
 
-type DOMNodeType = uint32 /* msxml.h:245:5 */
+type DOMNodeType = uint32 /* msxml.h:246:5 */
 
-type XMLELEM_TYPE = uint32 /* msxml.h:250:5 */
+type XMLELEM_TYPE = uint32 /* msxml.h:251:5 */
 type IXMLDOMImplementationVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -55742,9 +56316,9 @@ type IXMLDOMImplementationVtbl1 = struct {
 	FGetIDsOfNames    uintptr
 	FInvoke           uintptr
 	FhasFeature       uintptr
-} /* msxml.h:34:9 */
+} /* msxml.h:35:9 */
 
-type IXMLDOMImplementationVtbl = IXMLDOMImplementationVtbl1 /* msxml.h:274:5 */
+type IXMLDOMImplementationVtbl = IXMLDOMImplementationVtbl1 /* msxml.h:275:5 */
 type IXMLDOMNodeVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -55789,9 +56363,9 @@ type IXMLDOMNodeVtbl1 = struct {
 	Fget_prefix            uintptr
 	Fget_baseName          uintptr
 	FtransformNodeToObject uintptr
-} /* msxml.h:39:9 */
+} /* msxml.h:40:9 */
 
-type IXMLDOMNodeVtbl = IXMLDOMNodeVtbl1 /* msxml.h:383:5 */
+type IXMLDOMNodeVtbl = IXMLDOMNodeVtbl1 /* msxml.h:384:5 */
 type IXMLDOMDocumentFragmentVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -55836,9 +56410,9 @@ type IXMLDOMDocumentFragmentVtbl1 = struct {
 	Fget_prefix            uintptr
 	Fget_baseName          uintptr
 	FtransformNodeToObject uintptr
-} /* msxml.h:44:9 */
+} /* msxml.h:45:9 */
 
-type IXMLDOMDocumentFragmentVtbl = IXMLDOMDocumentFragmentVtbl1 /* msxml.h:560:5 */
+type IXMLDOMDocumentFragmentVtbl = IXMLDOMDocumentFragmentVtbl1 /* msxml.h:561:5 */
 type IXMLDOMDocumentVtbl1 = struct {
 	FQueryInterface              uintptr
 	FAddRef                      uintptr
@@ -55916,9 +56490,9 @@ type IXMLDOMDocumentVtbl1 = struct {
 	Fput_onreadystatechange      uintptr
 	Fput_ondataavailable         uintptr
 	Fput_ontransformnode         uintptr
-} /* msxml.h:49:9 */
+} /* msxml.h:50:9 */
 
-type IXMLDOMDocumentVtbl = IXMLDOMDocumentVtbl1 /* msxml.h:732:5 */
+type IXMLDOMDocumentVtbl = IXMLDOMDocumentVtbl1 /* msxml.h:733:5 */
 type IXMLDOMNodeListVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -55932,9 +56506,9 @@ type IXMLDOMNodeListVtbl1 = struct {
 	FnextNode         uintptr
 	Freset            uintptr
 	Fget__newEnum     uintptr
-} /* msxml.h:54:9 */
+} /* msxml.h:55:9 */
 
-type IXMLDOMNodeListVtbl = IXMLDOMNodeListVtbl1 /* msxml.h:911:5 */
+type IXMLDOMNodeListVtbl = IXMLDOMNodeListVtbl1 /* msxml.h:912:5 */
 type IXMLDOMNamedNodeMapVtbl1 = struct {
 	FQueryInterface      uintptr
 	FAddRef              uintptr
@@ -55953,9 +56527,9 @@ type IXMLDOMNamedNodeMapVtbl1 = struct {
 	FnextNode            uintptr
 	Freset               uintptr
 	Fget__newEnum        uintptr
-} /* msxml.h:59:9 */
+} /* msxml.h:60:9 */
 
-type IXMLDOMNamedNodeMapVtbl = IXMLDOMNamedNodeMapVtbl1 /* msxml.h:980:5 */
+type IXMLDOMNamedNodeMapVtbl = IXMLDOMNamedNodeMapVtbl1 /* msxml.h:981:5 */
 type IXMLDOMCharacterDataVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56008,9 +56582,9 @@ type IXMLDOMCharacterDataVtbl1 = struct {
 	FinsertData            uintptr
 	FdeleteData            uintptr
 	FreplaceData           uintptr
-} /* msxml.h:64:9 */
+} /* msxml.h:65:9 */
 
-type IXMLDOMCharacterDataVtbl = IXMLDOMCharacterDataVtbl1 /* msxml.h:1096:5 */
+type IXMLDOMCharacterDataVtbl = IXMLDOMCharacterDataVtbl1 /* msxml.h:1097:5 */
 type IXMLDOMAttributeVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56058,9 +56632,9 @@ type IXMLDOMAttributeVtbl1 = struct {
 	Fget_name              uintptr
 	Fget_value             uintptr
 	Fput_value             uintptr
-} /* msxml.h:69:9 */
+} /* msxml.h:70:9 */
 
-type IXMLDOMAttributeVtbl = IXMLDOMAttributeVtbl1 /* msxml.h:1232:5 */
+type IXMLDOMAttributeVtbl = IXMLDOMAttributeVtbl1 /* msxml.h:1233:5 */
 type IXMLDOMElementVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56114,9 +56688,9 @@ type IXMLDOMElementVtbl1 = struct {
 	FremoveAttributeNode   uintptr
 	FgetElementsByTagName  uintptr
 	Fnormalize             uintptr
-} /* msxml.h:74:9 */
+} /* msxml.h:75:9 */
 
-type IXMLDOMElementVtbl = IXMLDOMElementVtbl1 /* msxml.h:1365:5 */
+type IXMLDOMElementVtbl = IXMLDOMElementVtbl1 /* msxml.h:1366:5 */
 type IXMLDOMTextVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56170,9 +56744,9 @@ type IXMLDOMTextVtbl1 = struct {
 	FdeleteData            uintptr
 	FreplaceData           uintptr
 	FsplitText             uintptr
-} /* msxml.h:79:9 */
+} /* msxml.h:80:9 */
 
-type IXMLDOMTextVtbl = IXMLDOMTextVtbl1 /* msxml.h:1508:5 */
+type IXMLDOMTextVtbl = IXMLDOMTextVtbl1 /* msxml.h:1509:5 */
 type IXMLDOMCommentVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56225,9 +56799,9 @@ type IXMLDOMCommentVtbl1 = struct {
 	FinsertData            uintptr
 	FdeleteData            uintptr
 	FreplaceData           uintptr
-} /* msxml.h:84:9 */
+} /* msxml.h:85:9 */
 
-type IXMLDOMCommentVtbl = IXMLDOMCommentVtbl1 /* msxml.h:1632:5 */
+type IXMLDOMCommentVtbl = IXMLDOMCommentVtbl1 /* msxml.h:1633:5 */
 type IXMLDOMProcessingInstructionVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56275,9 +56849,9 @@ type IXMLDOMProcessingInstructionVtbl1 = struct {
 	Fget_target            uintptr
 	Fget_data              uintptr
 	Fput_data              uintptr
-} /* msxml.h:89:9 */
+} /* msxml.h:90:9 */
 
-type IXMLDOMProcessingInstructionVtbl = IXMLDOMProcessingInstructionVtbl1 /* msxml.h:1752:5 */
+type IXMLDOMProcessingInstructionVtbl = IXMLDOMProcessingInstructionVtbl1 /* msxml.h:1753:5 */
 type IXMLDOMCDATASectionVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56331,9 +56905,9 @@ type IXMLDOMCDATASectionVtbl1 = struct {
 	FdeleteData            uintptr
 	FreplaceData           uintptr
 	FsplitText             uintptr
-} /* msxml.h:94:9 */
+} /* msxml.h:95:9 */
 
-type IXMLDOMCDATASectionVtbl = IXMLDOMCDATASectionVtbl1 /* msxml.h:1875:5 */
+type IXMLDOMCDATASectionVtbl = IXMLDOMCDATASectionVtbl1 /* msxml.h:1876:5 */
 type IXMLDOMDocumentTypeVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56381,9 +56955,9 @@ type IXMLDOMDocumentTypeVtbl1 = struct {
 	Fget_name              uintptr
 	Fget_entities          uintptr
 	Fget_notations         uintptr
-} /* msxml.h:99:9 */
+} /* msxml.h:100:9 */
 
-type IXMLDOMDocumentTypeVtbl = IXMLDOMDocumentTypeVtbl1 /* msxml.h:1996:5 */
+type IXMLDOMDocumentTypeVtbl = IXMLDOMDocumentTypeVtbl1 /* msxml.h:1997:5 */
 type IXMLDOMNotationVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56430,9 +57004,9 @@ type IXMLDOMNotationVtbl1 = struct {
 	FtransformNodeToObject uintptr
 	Fget_publicId          uintptr
 	Fget_systemId          uintptr
-} /* msxml.h:104:9 */
+} /* msxml.h:105:9 */
 
-type IXMLDOMNotationVtbl = IXMLDOMNotationVtbl1 /* msxml.h:2115:5 */
+type IXMLDOMNotationVtbl = IXMLDOMNotationVtbl1 /* msxml.h:2116:5 */
 type IXMLDOMEntityVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56480,9 +57054,9 @@ type IXMLDOMEntityVtbl1 = struct {
 	Fget_publicId          uintptr
 	Fget_systemId          uintptr
 	Fget_notationName      uintptr
-} /* msxml.h:109:9 */
+} /* msxml.h:110:9 */
 
-type IXMLDOMEntityVtbl = IXMLDOMEntityVtbl1 /* msxml.h:2233:5 */
+type IXMLDOMEntityVtbl = IXMLDOMEntityVtbl1 /* msxml.h:2234:5 */
 type IXMLDOMEntityReferenceVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56527,9 +57101,9 @@ type IXMLDOMEntityReferenceVtbl1 = struct {
 	Fget_prefix            uintptr
 	Fget_baseName          uintptr
 	FtransformNodeToObject uintptr
-} /* msxml.h:114:9 */
+} /* msxml.h:115:9 */
 
-type IXMLDOMEntityReferenceVtbl = IXMLDOMEntityReferenceVtbl1 /* msxml.h:2347:5 */
+type IXMLDOMEntityReferenceVtbl = IXMLDOMEntityReferenceVtbl1 /* msxml.h:2348:5 */
 type IXMLDOMParseErrorVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56545,9 +57119,9 @@ type IXMLDOMParseErrorVtbl1 = struct {
 	Fget_line         uintptr
 	Fget_linepos      uintptr
 	Fget_filepos      uintptr
-} /* msxml.h:119:9 */
+} /* msxml.h:120:9 */
 
-type IXMLDOMParseErrorVtbl = IXMLDOMParseErrorVtbl1 /* msxml.h:2431:5 */
+type IXMLDOMParseErrorVtbl = IXMLDOMParseErrorVtbl1 /* msxml.h:2432:5 */
 type IXTLRuntimeVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56601,9 +57175,9 @@ type IXTLRuntimeVtbl1 = struct {
 	FformatNumber          uintptr
 	FformatDate            uintptr
 	FformatTime            uintptr
-} /* msxml.h:124:9 */
+} /* msxml.h:125:9 */
 
-type IXTLRuntimeVtbl = IXTLRuntimeVtbl1 /* msxml.h:2540:5 */
+type IXTLRuntimeVtbl = IXTLRuntimeVtbl1 /* msxml.h:2541:5 */
 type XMLDOMDocumentEventsVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56612,9 +57186,9 @@ type XMLDOMDocumentEventsVtbl1 = struct {
 	FGetTypeInfo      uintptr
 	FGetIDsOfNames    uintptr
 	FInvoke           uintptr
-} /* msxml.h:129:9 */
+} /* msxml.h:130:9 */
 
-type XMLDOMDocumentEventsVtbl = XMLDOMDocumentEventsVtbl1 /* msxml.h:2636:5 */
+type XMLDOMDocumentEventsVtbl = XMLDOMDocumentEventsVtbl1 /* msxml.h:2637:5 */
 type IXMLHttpRequestVtbl1 = struct {
 	FQueryInterface         uintptr
 	FAddRef                 uintptr
@@ -56637,9 +57211,9 @@ type IXMLHttpRequestVtbl1 = struct {
 	Fget_responseStream     uintptr
 	Fget_readyState         uintptr
 	Fput_onreadystatechange uintptr
-} /* msxml.h:152:9 */
+} /* msxml.h:153:9 */
 
-type IXMLHttpRequestVtbl = IXMLHttpRequestVtbl1 /* msxml.h:2707:5 */
+type IXMLHttpRequestVtbl = IXMLHttpRequestVtbl1 /* msxml.h:2708:5 */
 type IXMLDSOControlVtbl1 = struct {
 	FQueryInterface        uintptr
 	FAddRef                uintptr
@@ -56653,9 +57227,9 @@ type IXMLDSOControlVtbl1 = struct {
 	Fget_JavaDSOCompatible uintptr
 	Fput_JavaDSOCompatible uintptr
 	Fget_readyState        uintptr
-} /* msxml.h:166:9 */
+} /* msxml.h:167:9 */
 
-type IXMLDSOControlVtbl = IXMLDSOControlVtbl1 /* msxml.h:2798:5 */
+type IXMLDSOControlVtbl = IXMLDSOControlVtbl1 /* msxml.h:2799:5 */
 type IXMLElementCollectionVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56668,9 +57242,9 @@ type IXMLElementCollectionVtbl1 = struct {
 	Fget_length       uintptr
 	Fget__newEnum     uintptr
 	Fitem             uintptr
-} /* msxml.h:180:9 */
+} /* msxml.h:181:9 */
 
-type IXMLElementCollectionVtbl = IXMLElementCollectionVtbl1 /* msxml.h:2860:5 */
+type IXMLElementCollectionVtbl = IXMLElementCollectionVtbl1 /* msxml.h:2861:5 */
 type IXMLDocumentVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -56693,9 +57267,9 @@ type IXMLDocumentVtbl1 = struct {
 	Fget_doctype          uintptr
 	Fget_dtdURL           uintptr
 	FcreateElement        uintptr
-} /* msxml.h:185:9 */
+} /* msxml.h:186:9 */
 
-type IXMLDocumentVtbl = IXMLDocumentVtbl1 /* msxml.h:2934:5 */
+type IXMLDocumentVtbl = IXMLDocumentVtbl1 /* msxml.h:2935:5 */
 type IXMLDocument2Vtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -56720,9 +57294,9 @@ type IXMLDocument2Vtbl1 = struct {
 	FcreateElement        uintptr
 	Fget_async            uintptr
 	Fput_async            uintptr
-} /* msxml.h:190:9 */
+} /* msxml.h:191:9 */
 
-type IXMLDocument2Vtbl = IXMLDocument2Vtbl1 /* msxml.h:3042:5 */
+type IXMLDocument2Vtbl = IXMLDocument2Vtbl1 /* msxml.h:3043:5 */
 type IXMLElementVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56743,9 +57317,9 @@ type IXMLElementVtbl1 = struct {
 	Fput_text         uintptr
 	FaddChild         uintptr
 	FremoveChild      uintptr
-} /* msxml.h:195:9 */
+} /* msxml.h:196:9 */
 
-type IXMLElementVtbl = IXMLElementVtbl1 /* msxml.h:3148:5 */
+type IXMLElementVtbl = IXMLElementVtbl1 /* msxml.h:3149:5 */
 type IXMLElement2Vtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56767,9 +57341,9 @@ type IXMLElement2Vtbl1 = struct {
 	FaddChild         uintptr
 	FremoveChild      uintptr
 	Fget_attributes   uintptr
-} /* msxml.h:200:9 */
+} /* msxml.h:201:9 */
 
-type IXMLElement2Vtbl = IXMLElement2Vtbl1 /* msxml.h:3244:5 */
+type IXMLElement2Vtbl = IXMLElement2Vtbl1 /* msxml.h:3245:5 */
 type IXMLAttributeVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -56780,23 +57354,23 @@ type IXMLAttributeVtbl1 = struct {
 	FInvoke           uintptr
 	Fget_name         uintptr
 	Fget_value        uintptr
-} /* msxml.h:205:9 */
+} /* msxml.h:206:9 */
 
-type IXMLAttributeVtbl = IXMLAttributeVtbl1 /* msxml.h:3321:5 */
+type IXMLAttributeVtbl = IXMLAttributeVtbl1 /* msxml.h:3322:5 */
 type IXMLErrorVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetErrorInfo   uintptr
-} /* msxml.h:210:9 */
+} /* msxml.h:211:9 */
 
-type IXMLErrorVtbl = IXMLErrorVtbl1 /* msxml.h:3359:5 */
+type IXMLErrorVtbl = IXMLErrorVtbl1 /* msxml.h:3360:5 */
 
 // ****************************************************************************
 //
 // IPersistMoniker interface
 
-type LPPERSISTMONIKER = uintptr /* urlmon.h:590:25 */
+type LPPERSISTMONIKER = uintptr /* urlmon.h:795:25 */
 type IPersistMonikerVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -56807,45 +57381,45 @@ type IPersistMonikerVtbl1 = struct {
 	FSave           uintptr
 	FSaveCompleted  uintptr
 	FGetCurMoniker  uintptr
-} /* urlmon.h:22:9 */
+} /* urlmon.h:23:9 */
 
-type IPersistMonikerVtbl = IPersistMonikerVtbl1 /* urlmon.h:672:3 */
+type IPersistMonikerVtbl = IPersistMonikerVtbl1 /* urlmon.h:877:3 */
 
 // ****************************************************************************
 //
 // IMonikerProp interface
 
-type LPMONIKERPROP = uintptr /* urlmon.h:791:22 */
+type LPMONIKERPROP = uintptr /* urlmon.h:944:22 */
 
-type MONIKERPROPERTY = uint32 /* urlmon.h:799:3 */
+type MONIKERPROPERTY = uint32 /* urlmon.h:952:3 */
 type IMonikerPropVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FPutProperty    uintptr
-} /* urlmon.h:27:9 */
+} /* urlmon.h:31:9 */
 
-type IMonikerPropVtbl = IMonikerPropVtbl1 /* urlmon.h:837:3 */
+type IMonikerPropVtbl = IMonikerPropVtbl1 /* urlmon.h:990:3 */
 
 // ****************************************************************************
 //
 // IBindProtocol interface
 
-type LPBINDPROTOCOL = uintptr /* urlmon.h:893:23 */
+type LPBINDPROTOCOL = uintptr /* urlmon.h:1038:23 */
 type IBindProtocolVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FCreateBinding  uintptr
-} /* urlmon.h:32:9 */
+} /* urlmon.h:39:9 */
 
-type IBindProtocolVtbl = IBindProtocolVtbl1 /* urlmon.h:933:3 */
+type IBindProtocolVtbl = IBindProtocolVtbl1 /* urlmon.h:1078:3 */
 
 // ****************************************************************************
 //
 // IBinding interface
 
-type LPBINDING = uintptr /* urlmon.h:990:18 */
+type LPBINDING = uintptr /* urlmon.h:1126:18 */
 type IBindingVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -56856,27 +57430,27 @@ type IBindingVtbl1 = struct {
 	FSetPriority    uintptr
 	FGetPriority    uintptr
 	FGetBindResult  uintptr
-} /* urlmon.h:37:9 */
+} /* urlmon.h:47:9 */
 
-type IBindingVtbl = IBindingVtbl1 /* urlmon.h:1064:3 */
+type IBindingVtbl = IBindingVtbl1 /* urlmon.h:1200:3 */
 
 // ****************************************************************************
 //
 // IBindStatusCallback interface
 
-type LPBINDSTATUSCALLBACK = uintptr /* urlmon.h:1193:29 */
+type LPBINDSTATUSCALLBACK = uintptr /* urlmon.h:1293:29 */
 
-type BINDVERB = uint32 /* urlmon.h:1201:3 */
+type BINDVERB = uint32 /* urlmon.h:1301:3 */
 
-type BINDINFOF = uint32 /* urlmon.h:1206:3 */
+type BINDINFOF = uint32 /* urlmon.h:1306:3 */
 
-type BINDF = uint32 /* urlmon.h:1240:3 */
+type BINDF = uint32 /* urlmon.h:1340:3 */
 
-type URL_ENCODING = uint32 /* urlmon.h:1246:3 */
+type URL_ENCODING = uint32 /* urlmon.h:1346:3 */
 
 type _tagBINDINFO = struct {
 	FcbSize             ULONG
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FszExtraInfo        LPWSTR
 	FstgmedData         STGMEDIUM
 	FgrfBindInfoF       DWORD
@@ -56890,24 +57464,24 @@ type _tagBINDINFO = struct {
 	Fiid                IID
 	FpUnk               uintptr
 	FdwReserved         DWORD
-	_                   [4]byte
-} /* urlmon.h:1248:9 */
+	F__ccgo_pad2        [4]byte
+} /* urlmon.h:1348:9 */
 
-type BINDINFO = _tagBINDINFO /* urlmon.h:1263:3 */
+type BINDINFO = _tagBINDINFO /* urlmon.h:1363:3 */
 
 type _REMSECURITY_ATTRIBUTES = struct {
 	FnLength              DWORD
 	FlpSecurityDescriptor DWORD
 	FbInheritHandle       WINBOOL
-} /* urlmon.h:1265:9 */
+} /* urlmon.h:1365:9 */
 
-type REMSECURITY_ATTRIBUTES = _REMSECURITY_ATTRIBUTES /* urlmon.h:1269:3 */
-type PREMSECURITY_ATTRIBUTES = uintptr                /* urlmon.h:1270:40 */
-type LPREMSECURITY_ATTRIBUTES = uintptr               /* urlmon.h:1271:40 */
+type REMSECURITY_ATTRIBUTES = _REMSECURITY_ATTRIBUTES /* urlmon.h:1369:3 */
+type PREMSECURITY_ATTRIBUTES = uintptr                /* urlmon.h:1370:40 */
+type LPREMSECURITY_ATTRIBUTES = uintptr               /* urlmon.h:1371:40 */
 
 type _tagRemBINDINFO = struct {
 	FcbSize             ULONG
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FszExtraInfo        LPWSTR
 	FgrfBindInfoF       DWORD
 	FdwBindVerb         DWORD
@@ -56918,13 +57492,13 @@ type _tagRemBINDINFO = struct {
 	FdwCodePage         DWORD
 	FsecurityAttributes REMSECURITY_ATTRIBUTES
 	Fiid                IID
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FpUnk               uintptr
 	FdwReserved         DWORD
-	_                   [4]byte
-} /* urlmon.h:1273:9 */
+	F__ccgo_pad3        [4]byte
+} /* urlmon.h:1373:9 */
 
-type RemBINDINFO = _tagRemBINDINFO /* urlmon.h:1287:3 */
+type RemBINDINFO = _tagRemBINDINFO /* urlmon.h:1387:3 */
 
 type tagRemFORMATETC = struct {
 	FcfFormat DWORD
@@ -56932,16 +57506,16 @@ type tagRemFORMATETC = struct {
 	FdwAspect DWORD
 	Flindex   LONG
 	Ftymed    DWORD
-} /* urlmon.h:1289:9 */
+} /* urlmon.h:1389:9 */
 
-type RemFORMATETC = tagRemFORMATETC /* urlmon.h:1295:3 */
-type LPREMFORMATETC = uintptr       /* urlmon.h:1296:32 */
+type RemFORMATETC = tagRemFORMATETC /* urlmon.h:1395:3 */
+type LPREMFORMATETC = uintptr       /* urlmon.h:1396:32 */
 
-type BINDINFO_OPTIONS = int32 /* urlmon.h:1314:3 */
+type BINDINFO_OPTIONS = int32 /* urlmon.h:1414:3 */
 
-type BSCF = uint32 /* urlmon.h:1324:3 */
+type BSCF = uint32 /* urlmon.h:1424:3 */
 
-type BINDSTATUS = uint32 /* urlmon.h:1395:3 */
+type BINDSTATUS = uint32 /* urlmon.h:1495:3 */
 type IBindStatusCallbackVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -56954,17 +57528,17 @@ type IBindStatusCallbackVtbl1 = struct {
 	FGetBindInfo       uintptr
 	FOnDataAvailable   uintptr
 	FOnObjectAvailable uintptr
-} /* urlmon.h:42:9 */
+} /* urlmon.h:55:9 */
 
-type IBindStatusCallbackVtbl = IBindStatusCallbackVtbl1 /* urlmon.h:1500:3 */
+type IBindStatusCallbackVtbl = IBindStatusCallbackVtbl1 /* urlmon.h:1600:3 */
 
 // ****************************************************************************
 //
 // IBindStatusCallbackEx interface
 
-type LPBINDSTATUSCALLBACKEX = uintptr /* urlmon.h:1673:31 */
+type LPBINDSTATUSCALLBACKEX = uintptr /* urlmon.h:1720:31 */
 
-type BINDF2 = uint32 /* urlmon.h:1699:3 */
+type BINDF2 = uint32 /* urlmon.h:1746:3 */
 type IBindStatusCallbackExVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -56978,68 +57552,68 @@ type IBindStatusCallbackExVtbl1 = struct {
 	FOnDataAvailable   uintptr
 	FOnObjectAvailable uintptr
 	FGetBindInfoEx     uintptr
-} /* urlmon.h:47:9 */
+} /* urlmon.h:63:9 */
 
-type IBindStatusCallbackExVtbl = IBindStatusCallbackExVtbl1 /* urlmon.h:1784:3 */
+type IBindStatusCallbackExVtbl = IBindStatusCallbackExVtbl1 /* urlmon.h:1831:3 */
 
 // ****************************************************************************
 //
 // IAuthenticate interface
 
-type LPAUTHENTICATION = uintptr /* urlmon.h:1890:23 */
+type LPAUTHENTICATION = uintptr /* urlmon.h:1938:23 */
 type IAuthenticateVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FAuthenticate   uintptr
-} /* urlmon.h:52:9 */
+} /* urlmon.h:71:9 */
 
-type IAuthenticateVtbl = IAuthenticateVtbl1 /* urlmon.h:1930:3 */
+type IAuthenticateVtbl = IAuthenticateVtbl1 /* urlmon.h:1978:3 */
 
 // ****************************************************************************
 //
 // IAuthenticateEx interface
 
-type LPAUTHENTICATIONEX = uintptr /* urlmon.h:1987:25 */
+type LPAUTHENTICATIONEX = uintptr /* urlmon.h:2026:25 */
 
-type AUTHENTICATEF = uint32 /* urlmon.h:1993:3 */
+type AUTHENTICATEF = uint32 /* urlmon.h:2032:3 */
 
 type _tagAUTHENTICATEINFO = struct {
 	FdwFlags    DWORD
 	FdwReserved DWORD
-} /* urlmon.h:1995:9 */
+} /* urlmon.h:2034:9 */
 
-type AUTHENTICATEINFO = _tagAUTHENTICATEINFO /* urlmon.h:1998:3 */
+type AUTHENTICATEINFO = _tagAUTHENTICATEINFO /* urlmon.h:2037:3 */
 type IAuthenticateExVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FAuthenticate   uintptr
 	FAuthenticateEx uintptr
-} /* urlmon.h:57:9 */
+} /* urlmon.h:79:9 */
 
-type IAuthenticateExVtbl = IAuthenticateExVtbl1 /* urlmon.h:2047:3 */
+type IAuthenticateExVtbl = IAuthenticateExVtbl1 /* urlmon.h:2086:3 */
 
 // ****************************************************************************
 //
 // IHttpNegotiate interface
 
-type LPHTTPNEGOTIATE = uintptr /* urlmon.h:2111:24 */
+type LPHTTPNEGOTIATE = uintptr /* urlmon.h:2140:24 */
 type IHttpNegotiateVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
 	FRelease              uintptr
 	FBeginningTransaction uintptr
 	FOnResponse           uintptr
-} /* urlmon.h:62:9 */
+} /* urlmon.h:87:9 */
 
-type IHttpNegotiateVtbl = IHttpNegotiateVtbl1 /* urlmon.h:2166:3 */
+type IHttpNegotiateVtbl = IHttpNegotiateVtbl1 /* urlmon.h:2195:3 */
 
 // ****************************************************************************
 //
 // IHttpNegotiate2 interface
 
-type LPHTTPNEGOTIATE2 = uintptr /* urlmon.h:2239:25 */
+type LPHTTPNEGOTIATE2 = uintptr /* urlmon.h:2247:25 */
 type IHttpNegotiate2Vtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -57047,15 +57621,15 @@ type IHttpNegotiate2Vtbl1 = struct {
 	FBeginningTransaction uintptr
 	FOnResponse           uintptr
 	FGetRootSecurityId    uintptr
-} /* urlmon.h:67:9 */
+} /* urlmon.h:95:9 */
 
-type IHttpNegotiate2Vtbl = IHttpNegotiate2Vtbl1 /* urlmon.h:2294:3 */
+type IHttpNegotiate2Vtbl = IHttpNegotiate2Vtbl1 /* urlmon.h:2302:3 */
 
 // ****************************************************************************
 //
 // IHttpNegotiate3 interface
 
-type LPHTTPNEGOTIATE3 = uintptr /* urlmon.h:2361:25 */
+type LPHTTPNEGOTIATE3 = uintptr /* urlmon.h:2360:25 */
 type IHttpNegotiate3Vtbl1 = struct {
 	FQueryInterface                 uintptr
 	FAddRef                         uintptr
@@ -57064,113 +57638,113 @@ type IHttpNegotiate3Vtbl1 = struct {
 	FOnResponse                     uintptr
 	FGetRootSecurityId              uintptr
 	FGetSerializedClientCertContext uintptr
-} /* urlmon.h:72:9 */
+} /* urlmon.h:103:9 */
 
-type IHttpNegotiate3Vtbl = IHttpNegotiate3Vtbl1 /* urlmon.h:2421:3 */
+type IHttpNegotiate3Vtbl = IHttpNegotiate3Vtbl1 /* urlmon.h:2420:3 */
 
 // ****************************************************************************
 //
 // IWinInetFileStream interface
 
-type LPWININETFILESTREAM = uintptr /* urlmon.h:2493:28 */
+type LPWININETFILESTREAM = uintptr /* urlmon.h:2484:28 */
 type IWinInetFileStreamVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
 	FRelease            uintptr
 	FSetHandleForUnlock uintptr
 	FSetDeleteFile      uintptr
-} /* urlmon.h:77:9 */
+} /* urlmon.h:111:9 */
 
-type IWinInetFileStreamVtbl = IWinInetFileStreamVtbl1 /* urlmon.h:2538:3 */
+type IWinInetFileStreamVtbl = IWinInetFileStreamVtbl1 /* urlmon.h:2529:3 */
 
 // ****************************************************************************
 //
 // IWindowForBindingUI interface
 
-type LPWINDOWFORBINDINGUI = uintptr /* urlmon.h:2606:29 */
+type LPWINDOWFORBINDINGUI = uintptr /* urlmon.h:2581:29 */
 type IWindowForBindingUIVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetWindow      uintptr
-} /* urlmon.h:82:9 */
+} /* urlmon.h:119:9 */
 
-type IWindowForBindingUIVtbl = IWindowForBindingUIVtbl1 /* urlmon.h:2644:3 */
+type IWindowForBindingUIVtbl = IWindowForBindingUIVtbl1 /* urlmon.h:2619:3 */
 
 // ****************************************************************************
 //
 // ICodeInstall interface
 
-type LPCODEINSTALL = uintptr /* urlmon.h:2700:22 */
+type LPCODEINSTALL = uintptr /* urlmon.h:2667:22 */
 
-type CIP_STATUS = uint32 /* urlmon.h:2713:3 */
+type CIP_STATUS = uint32 /* urlmon.h:2680:3 */
 type ICodeInstallVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
 	FRelease              uintptr
 	FGetWindow            uintptr
 	FOnCodeInstallProblem uintptr
-} /* urlmon.h:87:9 */
+} /* urlmon.h:127:9 */
 
-type ICodeInstallVtbl = ICodeInstallVtbl1 /* urlmon.h:2761:3 */
+type ICodeInstallVtbl = ICodeInstallVtbl1 /* urlmon.h:2728:3 */
 
 // ****************************************************************************
 //
 // IWinInetInfo interface
 
-type LPWININETINFO = uintptr /* urlmon.h:4260:22 */
+type LPWININETINFO = uintptr /* urlmon.h:3783:22 */
 type IWinInetInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FQueryOption    uintptr
-} /* urlmon.h:112:9 */
+} /* urlmon.h:167:9 */
 
-type IWinInetInfoVtbl = IWinInetInfoVtbl1 /* urlmon.h:4299:3 */
+type IWinInetInfoVtbl = IWinInetInfoVtbl1 /* urlmon.h:3822:3 */
 
 // ****************************************************************************
 //
 // IHttpSecurity interface
 
-type LPHTTPSECURITY = uintptr /* urlmon.h:4368:23 */
+type LPHTTPSECURITY = uintptr /* urlmon.h:3892:23 */
 type IHttpSecurityVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
 	FRelease           uintptr
 	FGetWindow         uintptr
 	FOnSecurityProblem uintptr
-} /* urlmon.h:117:9 */
+} /* urlmon.h:175:9 */
 
-type IHttpSecurityVtbl = IHttpSecurityVtbl1 /* urlmon.h:4410:3 */
+type IHttpSecurityVtbl = IHttpSecurityVtbl1 /* urlmon.h:3934:3 */
 
 // ****************************************************************************
 //
 // IWinInetHttpInfo interface
 
-type LPWININETHTTPINFO = uintptr /* urlmon.h:4471:26 */
+type LPWININETHTTPINFO = uintptr /* urlmon.h:3988:26 */
 type IWinInetHttpInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FQueryOption    uintptr
 	FQueryInfo      uintptr
-} /* urlmon.h:122:9 */
+} /* urlmon.h:183:9 */
 
-type IWinInetHttpInfoVtbl = IWinInetHttpInfoVtbl1 /* urlmon.h:4522:3 */
+type IWinInetHttpInfoVtbl = IWinInetHttpInfoVtbl1 /* urlmon.h:4039:3 */
 type IWinInetHttpTimeoutsVtbl1 = struct {
 	FQueryInterface     uintptr
 	FAddRef             uintptr
 	FRelease            uintptr
 	FGetRequestTimeouts uintptr
-} /* urlmon.h:127:9 */
+} /* urlmon.h:191:9 */
 
-type IWinInetHttpTimeoutsVtbl = IWinInetHttpTimeoutsVtbl1 /* urlmon.h:4638:3 */
+type IWinInetHttpTimeoutsVtbl = IWinInetHttpTimeoutsVtbl1 /* urlmon.h:4156:3 */
 
 // ****************************************************************************
 //
 // IBindHost interface
 
-type LPBINDHOST = uintptr /* urlmon.h:4925:19 */
+type LPBINDHOST = uintptr /* urlmon.h:4412:19 */
 type IBindHostVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -57178,45 +57752,45 @@ type IBindHostVtbl1 = struct {
 	FCreateMoniker        uintptr
 	FMonikerBindToStorage uintptr
 	FMonikerBindToObject  uintptr
-} /* urlmon.h:142:9 */
+} /* urlmon.h:215:9 */
 
-type IBindHostVtbl = IBindHostVtbl1 /* urlmon.h:4997:3 */
+type IBindHostVtbl = IBindHostVtbl1 /* urlmon.h:4484:3 */
 
 // ****************************************************************************
 //
 // IInternet interface
 
-type LPIINTERNET = uintptr /* urlmon.h:5196:19 */
+type LPIINTERNET = uintptr /* urlmon.h:4703:19 */
 type IInternetVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
-} /* urlmon.h:147:9 */
+} /* urlmon.h:223:9 */
 
-type IInternetVtbl = IInternetVtbl1 /* urlmon.h:5223:3 */
+type IInternetVtbl = IInternetVtbl1 /* urlmon.h:4730:3 */
 
 // ****************************************************************************
 //
 // IInternetBindInfo interface
 
-type LPIINTERNETBINDINFO = uintptr /* urlmon.h:5264:27 */
+type LPIINTERNETBINDINFO = uintptr /* urlmon.h:4772:27 */
 
-type BINDSTRING = uint32 /* urlmon.h:5290:3 */
+type BINDSTRING = uint32 /* urlmon.h:4798:3 */
 type IInternetBindInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetBindInfo    uintptr
 	FGetBindString  uintptr
-} /* urlmon.h:152:9 */
+} /* urlmon.h:231:9 */
 
-type IInternetBindInfoVtbl = IInternetBindInfoVtbl1 /* urlmon.h:5341:3 */
+type IInternetBindInfoVtbl = IInternetBindInfoVtbl1 /* urlmon.h:4849:3 */
 
 // ****************************************************************************
 //
 // IInternetBindInfoEx interface
 
-type LPIINTERNETBINDINFOEX = uintptr /* urlmon.h:5412:29 */
+type LPIINTERNETBINDINFOEX = uintptr /* urlmon.h:4901:29 */
 type IInternetBindInfoExVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57224,34 +57798,34 @@ type IInternetBindInfoExVtbl1 = struct {
 	FGetBindInfo    uintptr
 	FGetBindString  uintptr
 	FGetBindInfoEx  uintptr
-} /* urlmon.h:157:9 */
+} /* urlmon.h:239:9 */
 
-type IInternetBindInfoExVtbl = IInternetBindInfoExVtbl1 /* urlmon.h:5467:3 */
+type IInternetBindInfoExVtbl = IInternetBindInfoExVtbl1 /* urlmon.h:4956:3 */
 
 // ****************************************************************************
 //
 // IInternetProtocolRoot interface
 
-type LPIINTERNETPROTOCOLROOT = uintptr /* urlmon.h:5535:31 */
+type LPIINTERNETPROTOCOLROOT = uintptr /* urlmon.h:5014:31 */
 
-type PI_FLAGS = uint32 /* urlmon.h:5553:3 */
+type PI_FLAGS = uint32 /* urlmon.h:5032:3 */
 type _tagPROTOCOLDATA = struct {
-	FgrfFlags DWORD
-	FdwState  DWORD
-	FpData    LPVOID
-	FcbData   ULONG
-	_         [4]byte
-} /* urlmon.h:5554:9 */
+	FgrfFlags    DWORD
+	FdwState     DWORD
+	FpData       LPVOID
+	FcbData      ULONG
+	F__ccgo_pad1 [4]byte
+} /* urlmon.h:5033:9 */
 
-type PROTOCOLDATA = _tagPROTOCOLDATA /* urlmon.h:5559:3 */
+type PROTOCOLDATA = _tagPROTOCOLDATA /* urlmon.h:5038:3 */
 
 type _tagStartParam = struct {
 	Fiid       IID
 	FpIBindCtx uintptr
 	FpItf      uintptr
-} /* urlmon.h:5561:9 */
+} /* urlmon.h:5040:9 */
 
-type StartParam = _tagStartParam /* urlmon.h:5565:3 */
+type StartParam = _tagStartParam /* urlmon.h:5044:3 */
 type IInternetProtocolRootVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57262,15 +57836,15 @@ type IInternetProtocolRootVtbl1 = struct {
 	FTerminate      uintptr
 	FSuspend        uintptr
 	FResume         uintptr
-} /* urlmon.h:162:9 */
+} /* urlmon.h:247:9 */
 
-type IInternetProtocolRootVtbl = IInternetProtocolRootVtbl1 /* urlmon.h:5644:3 */
+type IInternetProtocolRootVtbl = IInternetProtocolRootVtbl1 /* urlmon.h:5123:3 */
 
 // ****************************************************************************
 //
 // IInternetProtocol interface
 
-type LPIINTERNETPROTOCOL = uintptr /* urlmon.h:5762:27 */
+type LPIINTERNETPROTOCOL = uintptr /* urlmon.h:5191:27 */
 type IInternetProtocolVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57285,15 +57859,15 @@ type IInternetProtocolVtbl1 = struct {
 	FSeek           uintptr
 	FLockRequest    uintptr
 	FUnlockRequest  uintptr
-} /* urlmon.h:167:9 */
+} /* urlmon.h:255:9 */
 
-type IInternetProtocolVtbl = IInternetProtocolVtbl1 /* urlmon.h:5854:3 */
+type IInternetProtocolVtbl = IInternetProtocolVtbl1 /* urlmon.h:5283:3 */
 
 // ****************************************************************************
 //
 // IInternetProtocolSink interface
 
-type LPIINTERNETPROTOCOLSINK = uintptr /* urlmon.h:6168:31 */
+type LPIINTERNETPROTOCOLSINK = uintptr /* urlmon.h:5552:31 */
 type IInternetProtocolSinkVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57302,15 +57876,15 @@ type IInternetProtocolSinkVtbl1 = struct {
 	FReportProgress uintptr
 	FReportData     uintptr
 	FReportResult   uintptr
-} /* urlmon.h:177:9 */
+} /* urlmon.h:271:9 */
 
-type IInternetProtocolSinkVtbl = IInternetProtocolSinkVtbl1 /* urlmon.h:6235:3 */
+type IInternetProtocolSinkVtbl = IInternetProtocolSinkVtbl1 /* urlmon.h:5619:3 */
 
 // ****************************************************************************
 //
 // IInternetProtocolSinkStackable interface
 
-type LPIINTERNETPROTOCOLSINKStackable = uintptr /* urlmon.h:6331:40 */
+type LPIINTERNETPROTOCOLSINKStackable = uintptr /* urlmon.h:5679:40 */
 type IInternetProtocolSinkStackableVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57318,17 +57892,17 @@ type IInternetProtocolSinkStackableVtbl1 = struct {
 	FSwitchSink     uintptr
 	FCommitSwitch   uintptr
 	FRollbackSwitch uintptr
-} /* urlmon.h:182:9 */
+} /* urlmon.h:279:9 */
 
-type IInternetProtocolSinkStackableVtbl = IInternetProtocolSinkStackableVtbl1 /* urlmon.h:6379:3 */
+type IInternetProtocolSinkStackableVtbl = IInternetProtocolSinkStackableVtbl1 /* urlmon.h:5727:3 */
 
 // ****************************************************************************
 //
 // IInternetSession interface
 
-type LPIINTERNETSESSION = uintptr /* urlmon.h:6456:26 */
+type LPIINTERNETSESSION = uintptr /* urlmon.h:5783:26 */
 
-type OIBDG_FLAGS = uint32 /* urlmon.h:6461:3 */
+type OIBDG_FLAGS = uint32 /* urlmon.h:5788:3 */
 type IInternetSessionVtbl1 = struct {
 	FQueryInterface       uintptr
 	FAddRef               uintptr
@@ -57340,51 +57914,51 @@ type IInternetSessionVtbl1 = struct {
 	FCreateBinding        uintptr
 	FSetSessionOption     uintptr
 	FGetSessionOption     uintptr
-} /* urlmon.h:187:9 */
+} /* urlmon.h:287:9 */
 
-type IInternetSessionVtbl = IInternetSessionVtbl1 /* urlmon.h:6579:3 */
+type IInternetSessionVtbl = IInternetSessionVtbl1 /* urlmon.h:5906:3 */
 
 // ****************************************************************************
 //
 // IInternetThreadSwitch interface
 
-type LPIINTERNETTHREADSWITCH = uintptr /* urlmon.h:6726:31 */
+type LPIINTERNETTHREADSWITCH = uintptr /* urlmon.h:5978:31 */
 type IInternetThreadSwitchVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FPrepare        uintptr
 	FContinue       uintptr
-} /* urlmon.h:192:9 */
+} /* urlmon.h:295:9 */
 
-type IInternetThreadSwitchVtbl = IInternetThreadSwitchVtbl1 /* urlmon.h:6767:3 */
+type IInternetThreadSwitchVtbl = IInternetThreadSwitchVtbl1 /* urlmon.h:6019:3 */
 
 // ****************************************************************************
 //
 // IInternetPriority interface
 
-type LPIINTERNETPRIORITY = uintptr /* urlmon.h:6832:27 */
+type LPIINTERNETPRIORITY = uintptr /* urlmon.h:6071:27 */
 type IInternetPriorityVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FSetPriority    uintptr
 	FGetPriority    uintptr
-} /* urlmon.h:197:9 */
+} /* urlmon.h:303:9 */
 
-type IInternetPriorityVtbl = IInternetPriorityVtbl1 /* urlmon.h:6875:3 */
+type IInternetPriorityVtbl = IInternetPriorityVtbl1 /* urlmon.h:6114:3 */
 
 // ****************************************************************************
 //
 // IInternetProtocolInfo interface
 
-type LPIINTERNETPROTOCOLINFO = uintptr /* urlmon.h:6942:31 */
+type LPIINTERNETPROTOCOLINFO = uintptr /* urlmon.h:6166:31 */
 
-type PARSEACTION = uint32 /* urlmon.h:6964:3 */
+type PARSEACTION = uint32 /* urlmon.h:6188:3 */
 
-type PSUACTION = uint32 /* urlmon.h:6969:3 */
+type PSUACTION = uint32 /* urlmon.h:6193:3 */
 
-type QUERYOPTION = uint32 /* urlmon.h:6988:3 */
+type QUERYOPTION = uint32 /* urlmon.h:6212:3 */
 type IInternetProtocolInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -57393,27 +57967,27 @@ type IInternetProtocolInfoVtbl1 = struct {
 	FCombineUrl     uintptr
 	FCompareUrl     uintptr
 	FQueryInfo      uintptr
-} /* urlmon.h:202:9 */
+} /* urlmon.h:311:9 */
 
-type IInternetProtocolInfoVtbl = IInternetProtocolInfoVtbl1 /* urlmon.h:7085:3 */
+type IInternetProtocolInfoVtbl = IInternetProtocolInfoVtbl1 /* urlmon.h:6309:3 */
 type IInternetSecurityMgrSiteVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetWindow      uintptr
 	FEnableModeless uintptr
-} /* urlmon.h:207:9 */
+} /* urlmon.h:319:9 */
 
-type IInternetSecurityMgrSiteVtbl = IInternetSecurityMgrSiteVtbl1 /* urlmon.h:7412:3 */
+type IInternetSecurityMgrSiteVtbl = IInternetSecurityMgrSiteVtbl1 /* urlmon.h:6585:3 */
 
 // ****************************************************************************
 //
 // IInternetSecurityManager interface
 
-type PUAF = uint32    /* urlmon.h:7517:3 */
-type PUAFOUT = uint32 /* urlmon.h:7521:3 */
+type PUAF = uint32    /* urlmon.h:6675:3 */
+type PUAFOUT = uint32 /* urlmon.h:6679:3 */
 
-type SZM_FLAGS = uint32 /* urlmon.h:7527:3 */
+type SZM_FLAGS = uint32 /* urlmon.h:6685:3 */
 type IInternetSecurityManagerVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -57426,9 +58000,9 @@ type IInternetSecurityManagerVtbl1 = struct {
 	FQueryCustomPolicy uintptr
 	FSetZoneMapping    uintptr
 	FGetZoneMappings   uintptr
-} /* urlmon.h:212:9 */
+} /* urlmon.h:327:9 */
 
-type IInternetSecurityManagerVtbl = IInternetSecurityManagerVtbl1 /* urlmon.h:7656:3 */
+type IInternetSecurityManagerVtbl = IInternetSecurityManagerVtbl1 /* urlmon.h:6814:3 */
 type IInternetHostSecurityManagerVtbl1 = struct {
 	FQueryInterface    uintptr
 	FAddRef            uintptr
@@ -57436,21 +58010,21 @@ type IInternetHostSecurityManagerVtbl1 = struct {
 	FGetSecurityId     uintptr
 	FProcessUrlAction  uintptr
 	FQueryCustomPolicy uintptr
-} /* urlmon.h:232:9 */
+} /* urlmon.h:359:9 */
 
-type IInternetHostSecurityManagerVtbl = IInternetHostSecurityManagerVtbl1 /* urlmon.h:8537:3 */
+type IInternetHostSecurityManagerVtbl = IInternetHostSecurityManagerVtbl1 /* urlmon.h:7521:3 */
 
 // ****************************************************************************
 //
 // IInternetZoneManager interface
 
-type LPURLZONEMANAGER = uintptr /* urlmon.h:8832:30 */
+type LPURLZONEMANAGER = uintptr /* urlmon.h:7780:30 */
 
-type URLZONE = int32 /* urlmon.h:8845:3 */
+type URLZONE = int32 /* urlmon.h:7793:3 */
 
-type URLTEMPLATE = uint32 /* urlmon.h:8858:3 */
+type URLTEMPLATE = uint32 /* urlmon.h:7806:3 */
 
-type ZAFLAGS = uint32 /* urlmon.h:8879:3 */
+type ZAFLAGS = uint32 /* urlmon.h:7826:3 */
 
 type _ZONEATTRIBUTES = struct {
 	FcbSize                 ULONG
@@ -57461,12 +58035,12 @@ type _ZONEATTRIBUTES = struct {
 	FdwTemplateRecommended  DWORD
 	FdwTemplateCurrentLevel DWORD
 	FdwFlags                DWORD
-} /* urlmon.h:8881:9 */
+} /* urlmon.h:7828:9 */
 
-type ZONEATTRIBUTES = _ZONEATTRIBUTES /* urlmon.h:8890:3 */
-type LPZONEATTRIBUTES = uintptr       /* urlmon.h:8891:32 */
+type ZONEATTRIBUTES = _ZONEATTRIBUTES /* urlmon.h:7837:3 */
+type LPZONEATTRIBUTES = uintptr       /* urlmon.h:7838:32 */
 
-type URLZONEREG = uint32 /* urlmon.h:8898:3 */
+type URLZONEREG = uint32 /* urlmon.h:7845:3 */
 type IInternetZoneManagerVtbl1 = struct {
 	FQueryInterface             uintptr
 	FAddRef                     uintptr
@@ -57483,29 +58057,29 @@ type IInternetZoneManagerVtbl1 = struct {
 	FGetZoneAt                  uintptr
 	FDestroyZoneEnumerator      uintptr
 	FCopyTemplatePoliciesToZone uintptr
-} /* urlmon.h:237:9 */
+} /* urlmon.h:367:9 */
 
-type IInternetZoneManagerVtbl = IInternetZoneManagerVtbl1 /* urlmon.h:9073:3 */
+type IInternetZoneManagerVtbl = IInternetZoneManagerVtbl1 /* urlmon.h:8020:3 */
 
 type _tagCODEBASEHOLD = struct {
 	FcbSize      ULONG
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FszDistUnit  LPWSTR
 	FszCodeBase  LPWSTR
 	FdwVersionMS DWORD
 	FdwVersionLS DWORD
 	FdwStyle     DWORD
-	_            [4]byte
-} /* urlmon.h:9899:9 */
+	F__ccgo_pad2 [4]byte
+} /* urlmon.h:8657:9 */
 
-type CODEBASEHOLD = _tagCODEBASEHOLD /* urlmon.h:9906:3 */
-type LPCODEBASEHOLD = uintptr        /* urlmon.h:9907:33 */
+type CODEBASEHOLD = _tagCODEBASEHOLD /* urlmon.h:8664:3 */
+type LPCODEBASEHOLD = uintptr        /* urlmon.h:8665:33 */
 
 type _tagSOFTDISTINFO = struct {
 	FcbSize                ULONG
 	FdwFlags               DWORD
 	FdwAdState             DWORD
-	_                      [4]byte
+	F__ccgo_pad1           [4]byte
 	FszTitle               LPWSTR
 	FszAbstract            LPWSTR
 	FszHREF                LPWSTR
@@ -57516,11 +58090,11 @@ type _tagSOFTDISTINFO = struct {
 	FdwAdvertisedVersionMS DWORD
 	FdwAdvertisedVersionLS DWORD
 	FdwReserved            DWORD
-	_                      [4]byte
-} /* urlmon.h:9909:9 */
+	F__ccgo_pad2           [4]byte
+} /* urlmon.h:8667:9 */
 
-type SOFTDISTINFO = _tagSOFTDISTINFO /* urlmon.h:9923:3 */
-type LPSOFTDISTINFO = uintptr        /* urlmon.h:9924:33 */
+type SOFTDISTINFO = _tagSOFTDISTINFO /* urlmon.h:8681:3 */
+type LPSOFTDISTINFO = uintptr        /* urlmon.h:8682:33 */
 type ISoftDistExtVtbl1 = struct {
 	FQueryInterface               uintptr
 	FAddRef                       uintptr
@@ -57529,30 +58103,30 @@ type ISoftDistExtVtbl1 = struct {
 	FGetFirstCodeBase             uintptr
 	FGetNextCodeBase              uintptr
 	FAsyncInstallDistributionUnit uintptr
-} /* urlmon.h:252:9 */
+} /* urlmon.h:391:9 */
 
-type ISoftDistExtVtbl = ISoftDistExtVtbl1 /* urlmon.h:10001:3 */
+type ISoftDistExtVtbl = ISoftDistExtVtbl1 /* urlmon.h:8759:3 */
 
 // ****************************************************************************
 //
 // ICatalogFileInfo interface
 
-type LPCATALOGFILEINFO = uintptr /* urlmon.h:10102:26 */
+type LPCATALOGFILEINFO = uintptr /* urlmon.h:8822:26 */
 type ICatalogFileInfoVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetCatalogFile uintptr
 	FGetJavaTrust   uintptr
-} /* urlmon.h:257:9 */
+} /* urlmon.h:399:9 */
 
-type ICatalogFileInfoVtbl = ICatalogFileInfoVtbl1 /* urlmon.h:10145:3 */
+type ICatalogFileInfoVtbl = ICatalogFileInfoVtbl1 /* urlmon.h:8865:3 */
 
 // ****************************************************************************
 //
 // IDataFilter interface
 
-type LPDATAFILTER = uintptr /* urlmon.h:10212:21 */
+type LPDATAFILTER = uintptr /* urlmon.h:8917:21 */
 type IDataFilterVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
@@ -57560,120 +58134,120 @@ type IDataFilterVtbl1 = struct {
 	FDoEncode         uintptr
 	FDoDecode         uintptr
 	FSetEncodingLevel uintptr
-} /* urlmon.h:262:9 */
+} /* urlmon.h:407:9 */
 
-type IDataFilterVtbl = IDataFilterVtbl1 /* urlmon.h:10294:3 */
+type IDataFilterVtbl = IDataFilterVtbl1 /* urlmon.h:8999:3 */
 
 type _tagPROTOCOLFILTERDATA = struct {
 	FcbSize        DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpProtocolSink uintptr
 	FpProtocol     uintptr
 	FpUnk          uintptr
 	FdwFilterFlags DWORD
-	_              [4]byte
-} /* urlmon.h:10383:9 */
+	F__ccgo_pad2   [4]byte
+} /* urlmon.h:9049:9 */
 
-type PROTOCOLFILTERDATA = _tagPROTOCOLFILTERDATA /* urlmon.h:10389:3 */
+type PROTOCOLFILTERDATA = _tagPROTOCOLFILTERDATA /* urlmon.h:9055:3 */
 
 // ****************************************************************************
 //
 // IEncodingFilterFactory interface
 
-type LPENCODINGFILTERFACTORY = uintptr /* urlmon.h:10397:32 */
+type LPENCODINGFILTERFACTORY = uintptr /* urlmon.h:9063:32 */
 
 type _tagDATAINFO = struct {
 	FulTotalSize      ULONG
 	FulavrPacketSize  ULONG
 	FulConnectSpeed   ULONG
 	FulProcessorSpeed ULONG
-} /* urlmon.h:10399:9 */
+} /* urlmon.h:9065:9 */
 
-type DATAINFO = _tagDATAINFO /* urlmon.h:10404:3 */
+type DATAINFO = _tagDATAINFO /* urlmon.h:9070:3 */
 type IEncodingFilterFactoryVtbl1 = struct {
 	FQueryInterface   uintptr
 	FAddRef           uintptr
 	FRelease          uintptr
 	FFindBestFilter   uintptr
 	FGetDefaultFilter uintptr
-} /* urlmon.h:267:9 */
+} /* urlmon.h:415:9 */
 
-type IEncodingFilterFactoryVtbl = IEncodingFilterFactoryVtbl1 /* urlmon.h:10457:3 */
+type IEncodingFilterFactoryVtbl = IEncodingFilterFactoryVtbl1 /* urlmon.h:9123:3 */
 
 type _tagHIT_LOGGING_INFO = struct {
 	FdwStructSize      DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FlpszLoggedUrlName LPSTR
 	FStartTime         SYSTEMTIME
 	FEndTime           SYSTEMTIME
 	FlpszExtendedInfo  LPSTR
-} /* urlmon.h:10527:9 */
+} /* urlmon.h:9173:9 */
 
-type HIT_LOGGING_INFO = _tagHIT_LOGGING_INFO /* urlmon.h:10533:3 */
-type LPHIT_LOGGING_INFO = uintptr            /* urlmon.h:10534:37 */
+type HIT_LOGGING_INFO = _tagHIT_LOGGING_INFO /* urlmon.h:9179:3 */
+type LPHIT_LOGGING_INFO = uintptr            /* urlmon.h:9180:37 */
 
 type CONFIRMSAFETY = struct {
-	Fclsid   CLSID
-	FpUnk    uintptr
-	FdwFlags DWORD
-	_        [4]byte
-} /* urlmon.h:10540:1 */
+	Fclsid       CLSID
+	FpUnk        uintptr
+	FdwFlags     DWORD
+	F__ccgo_pad1 [4]byte
+} /* urlmon.h:9186:1 */
 
 // ****************************************************************************
 //
 // IWrappedProtocol interface
 
-type LPIWRAPPEDPROTOCOL = uintptr /* urlmon.h:10559:26 */
+type LPIWRAPPEDPROTOCOL = uintptr /* urlmon.h:9204:26 */
 type IWrappedProtocolVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetWrapperCode uintptr
-} /* urlmon.h:272:9 */
+} /* urlmon.h:423:9 */
 
-type IWrappedProtocolVtbl = IWrappedProtocolVtbl1 /* urlmon.h:10597:3 */
+type IWrappedProtocolVtbl = IWrappedProtocolVtbl1 /* urlmon.h:9242:3 */
 
 // ****************************************************************************
 //
 // IGetBindHandle interface
 
-type LPGETBINDHANDLE = uintptr /* urlmon.h:10653:24 */
+type LPGETBINDHANDLE = uintptr /* urlmon.h:9290:24 */
 
-type BINDHANDLETYPES = uint32 /* urlmon.h:10659:3 */
+type BINDHANDLETYPES = uint32 /* urlmon.h:9296:3 */
 type IGetBindHandleVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FGetBindHandle  uintptr
-} /* urlmon.h:277:9 */
+} /* urlmon.h:431:9 */
 
-type IGetBindHandleVtbl = IGetBindHandleVtbl1 /* urlmon.h:10697:3 */
+type IGetBindHandleVtbl = IGetBindHandleVtbl1 /* urlmon.h:9334:3 */
 
 type _tagPROTOCOL_ARGUMENT = struct {
 	FszMethod    LPCWSTR
 	FszTargetUrl LPCWSTR
-} /* urlmon.h:10747:9 */
+} /* urlmon.h:9376:9 */
 
-type PROTOCOL_ARGUMENT = _tagPROTOCOL_ARGUMENT /* urlmon.h:10750:3 */
-type LPPROTOCOL_ARGUMENT = uintptr             /* urlmon.h:10751:38 */
+type PROTOCOL_ARGUMENT = _tagPROTOCOL_ARGUMENT /* urlmon.h:9379:3 */
+type LPPROTOCOL_ARGUMENT = uintptr             /* urlmon.h:9380:38 */
 
 // ****************************************************************************
 //
 // IBindCallbackRedirect interface
 
-type LPBINDCALLBACKREDIRECT = uintptr /* urlmon.h:10763:31 */
+type LPBINDCALLBACKREDIRECT = uintptr /* urlmon.h:9392:31 */
 type IBindCallbackRedirectVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
 	FRelease        uintptr
 	FRedirect       uintptr
-} /* urlmon.h:282:9 */
+} /* urlmon.h:439:9 */
 
-type IBindCallbackRedirectVtbl = IBindCallbackRedirectVtbl1 /* urlmon.h:10801:3 */
+type IBindCallbackRedirectVtbl = IBindCallbackRedirectVtbl1 /* urlmon.h:9430:3 */
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/propidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/propidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57709,11 +58283,11 @@ type IBindCallbackRedirectVtbl = IBindCallbackRedirectVtbl1 /* urlmon.h:10801:3
 
 // Forward declarations
 
-type IPropertyStorage1 = struct{ FlpVtbl uintptr } /* propidl.h:22:9 */
+type IPropertyStorage1 = struct{ FlpVtbl uintptr } /* propidl.h:23:9 */
 
 // End additional prototypes
 
-//** Autogenerated by WIDL 1.6 from include/propidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/propidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57749,23 +58323,23 @@ type IPropertyStorage1 = struct{ FlpVtbl uintptr } /* propidl.h:22:9 */
 
 // Forward declarations
 
-type IPropertyStorage = IPropertyStorage1 /* propidl.h:22:36 */
+type IPropertyStorage = IPropertyStorage1 /* propidl.h:23:36 */
 
-type IPropertySetStorage1 = struct{ FlpVtbl uintptr } /* propidl.h:27:9 */
+type IPropertySetStorage1 = struct{ FlpVtbl uintptr } /* propidl.h:31:9 */
 
-type IPropertySetStorage = IPropertySetStorage1 /* propidl.h:27:39 */
+type IPropertySetStorage = IPropertySetStorage1 /* propidl.h:31:39 */
 
-type IEnumSTATPROPSTG1 = struct{ FlpVtbl uintptr } /* propidl.h:32:9 */
+type IEnumSTATPROPSTG1 = struct{ FlpVtbl uintptr } /* propidl.h:39:9 */
 
-type IEnumSTATPROPSTG = IEnumSTATPROPSTG1 /* propidl.h:32:36 */
+type IEnumSTATPROPSTG = IEnumSTATPROPSTG1 /* propidl.h:39:36 */
 
-type IEnumSTATPROPSETSTG1 = struct{ FlpVtbl uintptr } /* propidl.h:37:9 */
+type IEnumSTATPROPSETSTG1 = struct{ FlpVtbl uintptr } /* propidl.h:47:9 */
 
-type IEnumSTATPROPSETSTG = IEnumSTATPROPSETSTG1 /* propidl.h:37:39 */
+type IEnumSTATPROPSETSTG = IEnumSTATPROPSETSTG1 /* propidl.h:47:39 */
 
 // Headers for imported files
 
-//** Autogenerated by WIDL 1.6 from include/wtypes.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57833,7 +58407,7 @@ type IEnumSTATPROPSETSTG = IEnumSTATPROPSETSTG1 /* propidl.h:37:39 */
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57878,11 +58452,11 @@ type IEnumSTATPROPSETSTG = IEnumSTATPROPSETSTG1 /* propidl.h:37:39 */
 type tagVersionedStream = struct {
 	FguidVersion GUID
 	FpStream     uintptr
-} /* propidl.h:75:9 */
+} /* propidl.h:97:9 */
 
 // Headers for imported files
 
-//** Autogenerated by WIDL 1.6 from include/wtypes.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/wtypes.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57950,7 +58524,7 @@ type tagVersionedStream = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-//** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit **
+//** Autogenerated by WIDL 4.12.1 from include/oaidl.idl - Do not edit **
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -57992,190 +58566,190 @@ type tagVersionedStream = struct {
 // This file is part of the mingw-w64 runtime package.
 // No warranty is given; refer to the file DISCLAIMER within this package.
 
-type VERSIONEDSTREAM = tagVersionedStream /* propidl.h:78:3 */
-type LPVERSIONEDSTREAM = uintptr          /* propidl.h:79:35 */
+type VERSIONEDSTREAM = tagVersionedStream /* propidl.h:100:3 */
+type LPVERSIONEDSTREAM = uintptr          /* propidl.h:101:35 */
 
 type tagCAC = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:101:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:123:9 */
 
-type CAC = tagCAC /* propidl.h:104:3 */
+type CAC = tagCAC /* propidl.h:126:3 */
 type tagCAUB = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:105:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:127:9 */
 
-type CAUB = tagCAUB /* propidl.h:108:3 */
+type CAUB = tagCAUB /* propidl.h:130:3 */
 type tagCAI = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:109:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:131:9 */
 
-type CAI = tagCAI /* propidl.h:112:3 */
+type CAI = tagCAI /* propidl.h:134:3 */
 type tagCAUI = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:113:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:135:9 */
 
-type CAUI = tagCAUI /* propidl.h:116:3 */
+type CAUI = tagCAUI /* propidl.h:138:3 */
 type tagCAL = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:117:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:139:9 */
 
-type CAL = tagCAL /* propidl.h:120:3 */
+type CAL = tagCAL /* propidl.h:142:3 */
 type tagCAUL = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:121:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:143:9 */
 
-type CAUL = tagCAUL /* propidl.h:124:3 */
+type CAUL = tagCAUL /* propidl.h:146:3 */
 type tagCAFLT = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:125:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:147:9 */
 
-type CAFLT = tagCAFLT /* propidl.h:128:3 */
+type CAFLT = tagCAFLT /* propidl.h:150:3 */
 type tagCADBL = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:129:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:151:9 */
 
-type CADBL = tagCADBL /* propidl.h:132:3 */
+type CADBL = tagCADBL /* propidl.h:154:3 */
 type tagCACY = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:133:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:155:9 */
 
-type CACY = tagCACY /* propidl.h:136:3 */
+type CACY = tagCACY /* propidl.h:158:3 */
 type tagCADATE = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:137:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:159:9 */
 
-type CADATE = tagCADATE /* propidl.h:140:3 */
+type CADATE = tagCADATE /* propidl.h:162:3 */
 type tagCABSTR = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:141:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:163:9 */
 
-type CABSTR = tagCABSTR /* propidl.h:144:3 */
+type CABSTR = tagCABSTR /* propidl.h:166:3 */
 type tagCABSTRBLOB = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:145:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:167:9 */
 
-type CABSTRBLOB = tagCABSTRBLOB /* propidl.h:148:3 */
+type CABSTRBLOB = tagCABSTRBLOB /* propidl.h:170:3 */
 type tagCABOOL = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:149:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:171:9 */
 
-type CABOOL = tagCABOOL /* propidl.h:152:3 */
+type CABOOL = tagCABOOL /* propidl.h:174:3 */
 type tagCASCODE = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:153:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:175:9 */
 
-type CASCODE = tagCASCODE /* propidl.h:156:3 */
+type CASCODE = tagCASCODE /* propidl.h:178:3 */
 type tagCAPROPVARIANT = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:157:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:179:9 */
 
-type CAPROPVARIANT = tagCAPROPVARIANT /* propidl.h:160:3 */
+type CAPROPVARIANT = tagCAPROPVARIANT /* propidl.h:182:3 */
 type tagCAH = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:161:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:183:9 */
 
-type CAH = tagCAH /* propidl.h:164:3 */
+type CAH = tagCAH /* propidl.h:186:3 */
 type tagCAUH = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:165:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:187:9 */
 
-type CAUH = tagCAUH /* propidl.h:168:3 */
+type CAUH = tagCAUH /* propidl.h:190:3 */
 type tagCALPSTR = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:169:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:191:9 */
 
-type CALPSTR = tagCALPSTR /* propidl.h:172:3 */
+type CALPSTR = tagCALPSTR /* propidl.h:194:3 */
 type tagCALPWSTR = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:173:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:195:9 */
 
-type CALPWSTR = tagCALPWSTR /* propidl.h:176:3 */
+type CALPWSTR = tagCALPWSTR /* propidl.h:198:3 */
 type tagCAFILETIME = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:177:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:199:9 */
 
-type CAFILETIME = tagCAFILETIME /* propidl.h:180:3 */
+type CAFILETIME = tagCAFILETIME /* propidl.h:202:3 */
 type tagCACLIPDATA = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:181:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:203:9 */
 
-type CACLIPDATA = tagCACLIPDATA /* propidl.h:184:3 */
+type CACLIPDATA = tagCACLIPDATA /* propidl.h:206:3 */
 type tagCACLSID = struct {
-	FcElems ULONG
-	_       [4]byte
-	FpElems uintptr
-} /* propidl.h:185:9 */
+	FcElems      ULONG
+	F__ccgo_pad1 [4]byte
+	FpElems      uintptr
+} /* propidl.h:207:9 */
 
-type CACLSID = tagCACLSID /* propidl.h:188:3 */
+type CACLSID = tagCACLSID /* propidl.h:210:3 */
 
-type PROPVAR_PAD1 = WORD /* propidl.h:195:14 */
-type PROPVAR_PAD2 = WORD /* propidl.h:196:14 */
-type PROPVAR_PAD3 = WORD /* propidl.h:197:14 */
+type PROPVAR_PAD1 = WORD /* propidl.h:217:14 */
+type PROPVAR_PAD2 = WORD /* propidl.h:218:14 */
+type PROPVAR_PAD3 = WORD /* propidl.h:219:14 */
 
-type LPPROPVARIANT = uintptr /* propidl.h:294:31 */
+type LPPROPVARIANT = uintptr /* propidl.h:315:31 */
 
 type tagPROPSPEC = struct {
-	FulKind ULONG
-	_       [4]byte
-	Fu      struct {
-		_       [0]uint64
-		Fpropid PROPID
-		_       [4]byte
+	FulKind      ULONG
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		Fpropid      PROPID
+		F__ccgo_pad2 [4]byte
 	}
-} /* propidl.h:404:9 */
+} /* propidl.h:424:9 */
 
-type PROPSPEC = tagPROPSPEC /* propidl.h:410:3 */
+type PROPSPEC = tagPROPSPEC /* propidl.h:430:3 */
 
 type tagSTATPROPSTG = struct {
-	FlpwstrName LPOLESTR
-	Fpropid     PROPID
-	Fvt         VARTYPE
-	_           [2]byte
-} /* propidl.h:412:9 */
+	FlpwstrName  LPOLESTR
+	Fpropid      PROPID
+	Fvt          VARTYPE
+	F__ccgo_pad1 [2]byte
+} /* propidl.h:432:9 */
 
-type STATPROPSTG = tagSTATPROPSTG /* propidl.h:416:3 */
+type STATPROPSTG = tagSTATPROPSTG /* propidl.h:436:3 */
 
 type tagSTATPROPSETSTG = struct {
 	Ffmtid       FMTID
@@ -58185,9 +58759,9 @@ type tagSTATPROPSETSTG = struct {
 	Fctime       FILETIME
 	Fatime       FILETIME
 	FdwOSVersion DWORD
-} /* propidl.h:423:9 */
+} /* propidl.h:443:9 */
 
-type STATPROPSETSTG = tagSTATPROPSETSTG /* propidl.h:431:3 */
+type STATPROPSETSTG = tagSTATPROPSETSTG /* propidl.h:451:3 */
 type IPropertyStorageVtbl1 = struct {
 	FQueryInterface      uintptr
 	FAddRef              uintptr
@@ -58204,15 +58778,15 @@ type IPropertyStorageVtbl1 = struct {
 	FSetTimes            uintptr
 	FSetClass            uintptr
 	FStat                uintptr
-} /* propidl.h:22:9 */
+} /* propidl.h:23:9 */
 
-type IPropertyStorageVtbl = IPropertyStorageVtbl1 /* propidl.h:575:3 */
+type IPropertyStorageVtbl = IPropertyStorageVtbl1 /* propidl.h:595:3 */
 
 // ****************************************************************************
 //
 // IPropertySetStorage interface
 
-type LPPROPERTYSETSTORAGE = uintptr /* propidl.h:770:29 */
+type LPPROPERTYSETSTORAGE = uintptr /* propidl.h:683:29 */
 type IPropertySetStorageVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -58221,15 +58795,15 @@ type IPropertySetStorageVtbl1 = struct {
 	FOpen           uintptr
 	FDelete         uintptr
 	FEnum           uintptr
-} /* propidl.h:27:9 */
+} /* propidl.h:31:9 */
 
-type IPropertySetStorageVtbl = IPropertySetStorageVtbl1 /* propidl.h:839:3 */
+type IPropertySetStorageVtbl = IPropertySetStorageVtbl1 /* propidl.h:752:3 */
 
 // ****************************************************************************
 //
 // IEnumSTATPROPSTG interface
 
-type LPENUMSTATPROPSTG = uintptr /* propidl.h:932:26 */
+type LPENUMSTATPROPSTG = uintptr /* propidl.h:808:26 */
 type IEnumSTATPROPSTGVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -58238,15 +58812,15 @@ type IEnumSTATPROPSTGVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* propidl.h:32:9 */
+} /* propidl.h:39:9 */
 
-type IEnumSTATPROPSTGVtbl = IEnumSTATPROPSTGVtbl1 /* propidl.h:992:3 */
+type IEnumSTATPROPSTGVtbl = IEnumSTATPROPSTGVtbl1 /* propidl.h:868:3 */
 
 // ****************************************************************************
 //
 // IEnumSTATPROPSETSTG interface
 
-type LPENUMSTATPROPSETSTG = uintptr /* propidl.h:1090:29 */
+type LPENUMSTATPROPSETSTG = uintptr /* propidl.h:944:29 */
 type IEnumSTATPROPSETSTGVtbl1 = struct {
 	FQueryInterface uintptr
 	FAddRef         uintptr
@@ -58255,19 +58829,19 @@ type IEnumSTATPROPSETSTGVtbl1 = struct {
 	FSkip           uintptr
 	FReset          uintptr
 	FClone          uintptr
-} /* propidl.h:37:9 */
+} /* propidl.h:47:9 */
 
-type IEnumSTATPROPSETSTGVtbl = IEnumSTATPROPSETSTGVtbl1 /* propidl.h:1150:3 */
+type IEnumSTATPROPSETSTGVtbl = IEnumSTATPROPSETSTGVtbl1 /* propidl.h:1004:3 */
 
-type LPPROPERTYSTORAGE = uintptr /* propidl.h:1242:26 */
+type LPPROPERTYSTORAGE = uintptr /* propidl.h:1074:26 */
 
 type tagSERIALIZEDPROPERTYVALUE = struct {
-	FdwType DWORD
-	Frgb    [1]BYTE
-	_       [3]byte
-} /* propidl.h:1268:9 */
+	FdwType      DWORD
+	Frgb         [1]BYTE
+	F__ccgo_pad1 [3]byte
+} /* propidl.h:1100:9 */
 
-type SERIALIZEDPROPERTYVALUE = tagSERIALIZEDPROPERTYVALUE /* propidl.h:1271:3 */
+type SERIALIZEDPROPERTYVALUE = tagSERIALIZEDPROPERTYVALUE /* propidl.h:1103:3 */
 
 type NUMPARSE = struct {
 	FcDig       INT
@@ -58286,33 +58860,33 @@ type UDATE = struct {
 type REGKIND = uint32 /* oleauto.h:592:3 */
 
 type tagPARAMDATA = struct {
-	FszName uintptr
-	Fvt     VARTYPE
-	_       [6]byte
+	FszName      uintptr
+	Fvt          VARTYPE
+	F__ccgo_pad1 [6]byte
 } /* oleauto.h:611:9 */
 
 type PARAMDATA = tagPARAMDATA /* oleauto.h:614:3 */
 type LPPARAMDATA = uintptr    /* oleauto.h:614:13 */
 
 type tagMETHODDATA = struct {
-	FszName   uintptr
-	Fppdata   uintptr
-	Fdispid   DISPID
-	FiMeth    UINT
-	Fcc       CALLCONV
-	FcArgs    UINT
-	FwFlags   WORD
-	FvtReturn VARTYPE
-	_         [4]byte
+	FszName      uintptr
+	Fppdata      uintptr
+	Fdispid      DISPID
+	FiMeth       UINT
+	Fcc          CALLCONV
+	FcArgs       UINT
+	FwFlags      WORD
+	FvtReturn    VARTYPE
+	F__ccgo_pad1 [4]byte
 } /* oleauto.h:616:9 */
 
 type METHODDATA = tagMETHODDATA /* oleauto.h:625:3 */
 type LPMETHODDATA = uintptr     /* oleauto.h:625:14 */
 
 type tagINTERFACEDATA = struct {
-	Fpmethdata uintptr
-	FcMembers  UINT
-	_          [4]byte
+	Fpmethdata   uintptr
+	FcMembers    UINT
+	F__ccgo_pad1 [4]byte
 } /* oleauto.h:627:9 */
 
 type INTERFACEDATA = tagINTERFACEDATA /* oleauto.h:630:3 */
@@ -58336,13 +58910,13 @@ type _STORAGE_READ_CAPACITY = struct {
 	FVersion        ULONG
 	FSize           ULONG
 	FBlockLength    ULONG
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FNumberOfBlocks LARGE_INTEGER
 	FDiskLength     LARGE_INTEGER
-} /* winioctl.h:168:9 */
+} /* winioctl.h:194:9 */
 
-type STORAGE_READ_CAPACITY = _STORAGE_READ_CAPACITY /* winioctl.h:174:3 */
-type PSTORAGE_READ_CAPACITY = uintptr               /* winioctl.h:174:26 */
+type STORAGE_READ_CAPACITY = _STORAGE_READ_CAPACITY /* winioctl.h:200:3 */
+type PSTORAGE_READ_CAPACITY = uintptr               /* winioctl.h:200:26 */
 
 type _STORAGE_HOTPLUG_INFO = struct {
 	FSize                     DWORD
@@ -58350,24 +58924,24 @@ type _STORAGE_HOTPLUG_INFO = struct {
 	FMediaHotplug             BOOLEAN
 	FDeviceHotplug            BOOLEAN
 	FWriteCacheEnableOverride BOOLEAN
-} /* winioctl.h:205:11 */
+} /* winioctl.h:231:11 */
 
-type STORAGE_HOTPLUG_INFO = _STORAGE_HOTPLUG_INFO /* winioctl.h:211:5 */
-type PSTORAGE_HOTPLUG_INFO = uintptr              /* winioctl.h:211:26 */
+type STORAGE_HOTPLUG_INFO = _STORAGE_HOTPLUG_INFO /* winioctl.h:237:5 */
+type PSTORAGE_HOTPLUG_INFO = uintptr              /* winioctl.h:237:26 */
 
 type _STORAGE_DEVICE_NUMBER = struct {
 	FDeviceType      DWORD
 	FDeviceNumber    DWORD
 	FPartitionNumber DWORD
-} /* winioctl.h:213:11 */
+} /* winioctl.h:239:11 */
 
-type STORAGE_DEVICE_NUMBER = _STORAGE_DEVICE_NUMBER /* winioctl.h:217:5 */
-type PSTORAGE_DEVICE_NUMBER = uintptr               /* winioctl.h:217:27 */
+type STORAGE_DEVICE_NUMBER = _STORAGE_DEVICE_NUMBER /* winioctl.h:243:5 */
+type PSTORAGE_DEVICE_NUMBER = uintptr               /* winioctl.h:243:27 */
 
-type _STORAGE_BUS_RESET_REQUEST = struct{ FPathId BYTE } /* winioctl.h:219:11 */
+type _STORAGE_BUS_RESET_REQUEST = struct{ FPathId BYTE } /* winioctl.h:245:11 */
 
-type STORAGE_BUS_RESET_REQUEST = _STORAGE_BUS_RESET_REQUEST /* winioctl.h:221:5 */
-type PSTORAGE_BUS_RESET_REQUEST = uintptr                   /* winioctl.h:221:31 */
+type STORAGE_BUS_RESET_REQUEST = _STORAGE_BUS_RESET_REQUEST /* winioctl.h:247:5 */
+type PSTORAGE_BUS_RESET_REQUEST = uintptr                   /* winioctl.h:247:31 */
 
 type STORAGE_BREAK_RESERVATION_REQUEST1 = struct {
 	FLength   DWORD
@@ -58375,23 +58949,23 @@ type STORAGE_BREAK_RESERVATION_REQUEST1 = struct {
 	FPathId   BYTE
 	FTargetId BYTE
 	FLun      BYTE
-} /* winioctl.h:223:11 */
+} /* winioctl.h:249:11 */
 
-type STORAGE_BREAK_RESERVATION_REQUEST = STORAGE_BREAK_RESERVATION_REQUEST1 /* winioctl.h:229:5 */
-type PSTORAGE_BREAK_RESERVATION_REQUEST = uintptr                           /* winioctl.h:229:39 */
+type STORAGE_BREAK_RESERVATION_REQUEST = STORAGE_BREAK_RESERVATION_REQUEST1 /* winioctl.h:255:5 */
+type PSTORAGE_BREAK_RESERVATION_REQUEST = uintptr                           /* winioctl.h:255:39 */
 
-type _PREVENT_MEDIA_REMOVAL = struct{ FPreventMediaRemoval BOOLEAN } /* winioctl.h:231:11 */
+type _PREVENT_MEDIA_REMOVAL = struct{ FPreventMediaRemoval BOOLEAN } /* winioctl.h:257:11 */
 
-type PREVENT_MEDIA_REMOVAL = _PREVENT_MEDIA_REMOVAL /* winioctl.h:233:5 */
-type PPREVENT_MEDIA_REMOVAL = uintptr               /* winioctl.h:233:27 */
+type PREVENT_MEDIA_REMOVAL = _PREVENT_MEDIA_REMOVAL /* winioctl.h:259:5 */
+type PPREVENT_MEDIA_REMOVAL = uintptr               /* winioctl.h:259:27 */
 
 type _CLASS_MEDIA_CHANGE_CONTEXT = struct {
 	FMediaChangeCount DWORD
 	FNewState         DWORD
-} /* winioctl.h:235:11 */
+} /* winioctl.h:261:11 */
 
-type CLASS_MEDIA_CHANGE_CONTEXT = _CLASS_MEDIA_CHANGE_CONTEXT /* winioctl.h:238:5 */
-type PCLASS_MEDIA_CHANGE_CONTEXT = uintptr                    /* winioctl.h:238:32 */
+type CLASS_MEDIA_CHANGE_CONTEXT = _CLASS_MEDIA_CHANGE_CONTEXT /* winioctl.h:264:5 */
+type PCLASS_MEDIA_CHANGE_CONTEXT = uintptr                    /* winioctl.h:264:32 */
 
 type _TAPE_STATISTICS = struct {
 	FVersion                DWORD
@@ -58402,22 +58976,22 @@ type _TAPE_STATISTICS = struct {
 	FUnrecoveredReads       LARGE_INTEGER
 	FCompressionRatioReads  BYTE
 	FCompressionRatioWrites BYTE
-	_                       [6]byte
-} /* winioctl.h:240:11 */
+	F__ccgo_pad1            [6]byte
+} /* winioctl.h:266:11 */
 
-type TAPE_STATISTICS = _TAPE_STATISTICS /* winioctl.h:249:5 */
-type PTAPE_STATISTICS = uintptr         /* winioctl.h:249:21 */
+type TAPE_STATISTICS = _TAPE_STATISTICS /* winioctl.h:275:5 */
+type PTAPE_STATISTICS = uintptr         /* winioctl.h:275:21 */
 
-type _TAPE_GET_STATISTICS = struct{ FOperation DWORD } /* winioctl.h:258:11 */
+type _TAPE_GET_STATISTICS = struct{ FOperation DWORD } /* winioctl.h:284:11 */
 
-type TAPE_GET_STATISTICS = _TAPE_GET_STATISTICS /* winioctl.h:260:5 */
-type PTAPE_GET_STATISTICS = uintptr             /* winioctl.h:260:25 */
+type TAPE_GET_STATISTICS = _TAPE_GET_STATISTICS /* winioctl.h:286:5 */
+type PTAPE_GET_STATISTICS = uintptr             /* winioctl.h:286:25 */
 
-type STORAGE_MEDIA_TYPE = uint32   /* winioctl.h:330:5 */
-type PSTORAGE_MEDIA_TYPE = uintptr /* winioctl.h:330:25 */
+type STORAGE_MEDIA_TYPE = uint32   /* winioctl.h:356:5 */
+type PSTORAGE_MEDIA_TYPE = uintptr /* winioctl.h:356:25 */
 
-type STORAGE_BUS_TYPE = uint32   /* winioctl.h:363:5 */
-type PSTORAGE_BUS_TYPE = uintptr /* winioctl.h:363:23 */
+type STORAGE_BUS_TYPE = uint32   /* winioctl.h:389:5 */
+type PSTORAGE_BUS_TYPE = uintptr /* winioctl.h:389:23 */
 
 type _DEVICE_MEDIA_INFO = struct {
 	FDeviceSpecific struct {
@@ -58431,30 +59005,30 @@ type _DEVICE_MEDIA_INFO = struct {
 			FMediaCharacteristics DWORD
 		}
 	}
-} /* winioctl.h:365:11 */
+} /* winioctl.h:391:11 */
 
-type DEVICE_MEDIA_INFO = _DEVICE_MEDIA_INFO /* winioctl.h:398:5 */
-type PDEVICE_MEDIA_INFO = uintptr           /* winioctl.h:398:23 */
+type DEVICE_MEDIA_INFO = _DEVICE_MEDIA_INFO /* winioctl.h:424:5 */
+type PDEVICE_MEDIA_INFO = uintptr           /* winioctl.h:424:23 */
 
 type _GET_MEDIA_TYPES = struct {
 	FDeviceType     DWORD
 	FMediaInfoCount DWORD
 	FMediaInfo      [1]DEVICE_MEDIA_INFO
-} /* winioctl.h:400:11 */
+} /* winioctl.h:426:11 */
 
-type GET_MEDIA_TYPES = _GET_MEDIA_TYPES /* winioctl.h:404:5 */
-type PGET_MEDIA_TYPES = uintptr         /* winioctl.h:404:21 */
+type GET_MEDIA_TYPES = _GET_MEDIA_TYPES /* winioctl.h:430:5 */
+type PGET_MEDIA_TYPES = uintptr         /* winioctl.h:430:21 */
 
 type _STORAGE_PREDICT_FAILURE = struct {
 	FPredictFailure DWORD
 	FVendorSpecific [512]BYTE
-} /* winioctl.h:406:11 */
+} /* winioctl.h:432:11 */
 
-type STORAGE_PREDICT_FAILURE = _STORAGE_PREDICT_FAILURE /* winioctl.h:409:5 */
-type PSTORAGE_PREDICT_FAILURE = uintptr                 /* winioctl.h:409:29 */
+type STORAGE_PREDICT_FAILURE = _STORAGE_PREDICT_FAILURE /* winioctl.h:435:5 */
+type PSTORAGE_PREDICT_FAILURE = uintptr                 /* winioctl.h:435:29 */
 
-type MEDIA_TYPE = uint32   /* winioctl.h:503:3 */
-type PMEDIA_TYPE = uintptr /* winioctl.h:503:14 */
+type MEDIA_TYPE = uint32   /* winioctl.h:529:3 */
+type PMEDIA_TYPE = uintptr /* winioctl.h:529:14 */
 
 type _FORMAT_PARAMETERS = struct {
 	FMediaType           MEDIA_TYPE
@@ -58462,13 +59036,13 @@ type _FORMAT_PARAMETERS = struct {
 	FEndCylinderNumber   DWORD
 	FStartHeadNumber     DWORD
 	FEndHeadNumber       DWORD
-} /* winioctl.h:505:9 */
+} /* winioctl.h:531:9 */
 
-type FORMAT_PARAMETERS = _FORMAT_PARAMETERS /* winioctl.h:511:3 */
-type PFORMAT_PARAMETERS = uintptr           /* winioctl.h:511:21 */
+type FORMAT_PARAMETERS = _FORMAT_PARAMETERS /* winioctl.h:537:3 */
+type PFORMAT_PARAMETERS = uintptr           /* winioctl.h:537:21 */
 
-type BAD_TRACK_NUMBER = WORD     /* winioctl.h:513:14 */
-type PBAD_TRACK_NUMBER = uintptr /* winioctl.h:514:14 */
+type BAD_TRACK_NUMBER = WORD     /* winioctl.h:539:14 */
+type PBAD_TRACK_NUMBER = uintptr /* winioctl.h:540:14 */
 
 type _FORMAT_EX_PARAMETERS = struct {
 	FMediaType           MEDIA_TYPE
@@ -58479,11 +59053,11 @@ type _FORMAT_EX_PARAMETERS = struct {
 	FFormatGapLength     WORD
 	FSectorsPerTrack     WORD
 	FSectorNumber        [1]WORD
-	_                    [2]byte
-} /* winioctl.h:516:9 */
+	F__ccgo_pad1         [2]byte
+} /* winioctl.h:542:9 */
 
-type FORMAT_EX_PARAMETERS = _FORMAT_EX_PARAMETERS /* winioctl.h:525:3 */
-type PFORMAT_EX_PARAMETERS = uintptr              /* winioctl.h:525:24 */
+type FORMAT_EX_PARAMETERS = _FORMAT_EX_PARAMETERS /* winioctl.h:551:3 */
+type PFORMAT_EX_PARAMETERS = uintptr              /* winioctl.h:551:24 */
 
 type _DISK_GEOMETRY = struct {
 	FCylinders         LARGE_INTEGER
@@ -58491,10 +59065,10 @@ type _DISK_GEOMETRY = struct {
 	FTracksPerCylinder DWORD
 	FSectorsPerTrack   DWORD
 	FBytesPerSector    DWORD
-} /* winioctl.h:527:9 */
+} /* winioctl.h:553:9 */
 
-type DISK_GEOMETRY = _DISK_GEOMETRY /* winioctl.h:533:3 */
-type PDISK_GEOMETRY = uintptr       /* winioctl.h:533:17 */
+type DISK_GEOMETRY = _DISK_GEOMETRY /* winioctl.h:559:3 */
+type PDISK_GEOMETRY = uintptr       /* winioctl.h:559:17 */
 
 type _PARTITION_INFORMATION = struct {
 	FStartingOffset      LARGE_INTEGER
@@ -58505,43 +59079,43 @@ type _PARTITION_INFORMATION = struct {
 	FBootIndicator       BOOLEAN
 	FRecognizedPartition BOOLEAN
 	FRewritePartition    BOOLEAN
-	_                    [4]byte
-} /* winioctl.h:537:9 */
+	F__ccgo_pad1         [4]byte
+} /* winioctl.h:563:9 */
 
-type PARTITION_INFORMATION = _PARTITION_INFORMATION /* winioctl.h:546:3 */
-type PPARTITION_INFORMATION = uintptr               /* winioctl.h:546:25 */
+type PARTITION_INFORMATION = _PARTITION_INFORMATION /* winioctl.h:572:3 */
+type PPARTITION_INFORMATION = uintptr               /* winioctl.h:572:25 */
 
-type _SET_PARTITION_INFORMATION = struct{ FPartitionType BYTE } /* winioctl.h:548:9 */
+type _SET_PARTITION_INFORMATION = struct{ FPartitionType BYTE } /* winioctl.h:574:9 */
 
-type SET_PARTITION_INFORMATION = _SET_PARTITION_INFORMATION /* winioctl.h:550:3 */
-type PSET_PARTITION_INFORMATION = uintptr                   /* winioctl.h:550:29 */
+type SET_PARTITION_INFORMATION = _SET_PARTITION_INFORMATION /* winioctl.h:576:3 */
+type PSET_PARTITION_INFORMATION = uintptr                   /* winioctl.h:576:29 */
 
 type _DRIVE_LAYOUT_INFORMATION = struct {
 	FPartitionCount DWORD
 	FSignature      DWORD
 	FPartitionEntry [1]PARTITION_INFORMATION
-} /* winioctl.h:552:9 */
+} /* winioctl.h:578:9 */
 
-type DRIVE_LAYOUT_INFORMATION = _DRIVE_LAYOUT_INFORMATION /* winioctl.h:556:3 */
-type PDRIVE_LAYOUT_INFORMATION = uintptr                  /* winioctl.h:556:28 */
+type DRIVE_LAYOUT_INFORMATION = _DRIVE_LAYOUT_INFORMATION /* winioctl.h:582:3 */
+type PDRIVE_LAYOUT_INFORMATION = uintptr                  /* winioctl.h:582:28 */
 
 type _VERIFY_INFORMATION = struct {
 	FStartingOffset LARGE_INTEGER
 	FLength         DWORD
-	_               [4]byte
-} /* winioctl.h:558:9 */
+	F__ccgo_pad1    [4]byte
+} /* winioctl.h:584:9 */
 
-type VERIFY_INFORMATION = _VERIFY_INFORMATION /* winioctl.h:561:3 */
-type PVERIFY_INFORMATION = uintptr            /* winioctl.h:561:22 */
+type VERIFY_INFORMATION = _VERIFY_INFORMATION /* winioctl.h:587:3 */
+type PVERIFY_INFORMATION = uintptr            /* winioctl.h:587:22 */
 
 type _REASSIGN_BLOCKS = struct {
 	FReserved    WORD
 	FCount       WORD
 	FBlockNumber [1]DWORD
-} /* winioctl.h:563:9 */
+} /* winioctl.h:589:9 */
 
-type REASSIGN_BLOCKS = _REASSIGN_BLOCKS /* winioctl.h:567:3 */
-type PREASSIGN_BLOCKS = uintptr         /* winioctl.h:567:19 */
+type REASSIGN_BLOCKS = _REASSIGN_BLOCKS /* winioctl.h:593:3 */
+type PREASSIGN_BLOCKS = uintptr         /* winioctl.h:593:19 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -58550,151 +59124,151 @@ type PREASSIGN_BLOCKS = uintptr         /* winioctl.h:567:19 */
 type _REASSIGN_BLOCKS_EX = struct {
 	FReserved    WORD
 	FCount       WORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FBlockNumber [1]LARGE_INTEGER
-} /* winioctl.h:570:9 */
+} /* winioctl.h:596:9 */
 
 // *
 // 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.
-type REASSIGN_BLOCKS_EX = _REASSIGN_BLOCKS_EX /* winioctl.h:574:3 */
-type PREASSIGN_BLOCKS_EX = uintptr            /* winioctl.h:574:22 */
+type REASSIGN_BLOCKS_EX = _REASSIGN_BLOCKS_EX /* winioctl.h:600:3 */
+type PREASSIGN_BLOCKS_EX = uintptr            /* winioctl.h:600:22 */
 // *
 // 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.
 
-type PARTITION_STYLE = uint32 /* winioctl.h:579:3 */
+type PARTITION_STYLE = uint32 /* winioctl.h:605:3 */
 
 type _PARTITION_INFORMATION_GPT = struct {
 	FPartitionType GUID
 	FPartitionId   GUID
 	FAttributes    DWORD64
 	FName          [36]WCHAR
-} /* winioctl.h:581:9 */
+} /* winioctl.h:607:9 */
 
-type PARTITION_INFORMATION_GPT = _PARTITION_INFORMATION_GPT /* winioctl.h:586:3 */
-type PPARTITION_INFORMATION_GPT = uintptr                   /* winioctl.h:586:29 */
+type PARTITION_INFORMATION_GPT = _PARTITION_INFORMATION_GPT /* winioctl.h:612:3 */
+type PPARTITION_INFORMATION_GPT = uintptr                   /* winioctl.h:612:29 */
 
 type _PARTITION_INFORMATION_MBR = struct {
 	FPartitionType       BYTE
 	FBootIndicator       BOOLEAN
 	FRecognizedPartition BOOLEAN
-	_                    [1]byte
+	F__ccgo_pad1         [1]byte
 	FHiddenSectors       DWORD
-} /* winioctl.h:595:9 */
+} /* winioctl.h:621:9 */
 
-type PARTITION_INFORMATION_MBR = _PARTITION_INFORMATION_MBR /* winioctl.h:600:3 */
-type PPARTITION_INFORMATION_MBR = uintptr                   /* winioctl.h:600:29 */
+type PARTITION_INFORMATION_MBR = _PARTITION_INFORMATION_MBR /* winioctl.h:626:3 */
+type PPARTITION_INFORMATION_MBR = uintptr                   /* winioctl.h:626:29 */
 
-type SET_PARTITION_INFORMATION_MBR = SET_PARTITION_INFORMATION /* winioctl.h:602:35 */
-type SET_PARTITION_INFORMATION_GPT = PARTITION_INFORMATION_GPT /* winioctl.h:603:35 */
+type SET_PARTITION_INFORMATION_MBR = SET_PARTITION_INFORMATION /* winioctl.h:628:35 */
+type SET_PARTITION_INFORMATION_GPT = PARTITION_INFORMATION_GPT /* winioctl.h:629:35 */
 
 type _SET_PARTITION_INFORMATION_EX = struct {
 	FPartitionStyle PARTITION_STYLE
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	Fu              struct {
-		_    [0]uint64
-		FMbr SET_PARTITION_INFORMATION_MBR
-		_    [111]byte
+		F__ccgo_pad1 [0]uint64
+		FMbr         SET_PARTITION_INFORMATION_MBR
+		F__ccgo_pad2 [111]byte
 	}
-} /* winioctl.h:605:9 */
+} /* winioctl.h:631:9 */
 
-type SET_PARTITION_INFORMATION_EX = _SET_PARTITION_INFORMATION_EX /* winioctl.h:611:3 */
-type PSET_PARTITION_INFORMATION_EX = uintptr                      /* winioctl.h:611:32 */
+type SET_PARTITION_INFORMATION_EX = _SET_PARTITION_INFORMATION_EX /* winioctl.h:637:3 */
+type PSET_PARTITION_INFORMATION_EX = uintptr                      /* winioctl.h:637:32 */
 
 type _CREATE_DISK_GPT = struct {
 	FDiskId            GUID
 	FMaxPartitionCount DWORD
-} /* winioctl.h:613:9 */
+} /* winioctl.h:639:9 */
 
-type CREATE_DISK_GPT = _CREATE_DISK_GPT /* winioctl.h:616:3 */
-type PCREATE_DISK_GPT = uintptr         /* winioctl.h:616:19 */
+type CREATE_DISK_GPT = _CREATE_DISK_GPT /* winioctl.h:642:3 */
+type PCREATE_DISK_GPT = uintptr         /* winioctl.h:642:19 */
 
-type _CREATE_DISK_MBR = struct{ FSignature DWORD } /* winioctl.h:618:9 */
+type _CREATE_DISK_MBR = struct{ FSignature DWORD } /* winioctl.h:644:9 */
 
-type CREATE_DISK_MBR = _CREATE_DISK_MBR /* winioctl.h:620:3 */
-type PCREATE_DISK_MBR = uintptr         /* winioctl.h:620:19 */
+type CREATE_DISK_MBR = _CREATE_DISK_MBR /* winioctl.h:646:3 */
+type PCREATE_DISK_MBR = uintptr         /* winioctl.h:646:19 */
 
 type _CREATE_DISK = struct {
 	FPartitionStyle PARTITION_STYLE
 	Fu              struct {
-		FMbr CREATE_DISK_MBR
-		_    [16]byte
+		FMbr         CREATE_DISK_MBR
+		F__ccgo_pad1 [16]byte
 	}
-} /* winioctl.h:622:9 */
+} /* winioctl.h:648:9 */
 
-type CREATE_DISK = _CREATE_DISK /* winioctl.h:628:3 */
-type PCREATE_DISK = uintptr     /* winioctl.h:628:15 */
+type CREATE_DISK = _CREATE_DISK /* winioctl.h:654:3 */
+type PCREATE_DISK = uintptr     /* winioctl.h:654:15 */
 
-type _GET_LENGTH_INFORMATION = struct{ FLength LARGE_INTEGER } /* winioctl.h:630:9 */
+type _GET_LENGTH_INFORMATION = struct{ FLength LARGE_INTEGER } /* winioctl.h:656:9 */
 
-type GET_LENGTH_INFORMATION = _GET_LENGTH_INFORMATION /* winioctl.h:632:3 */
-type PGET_LENGTH_INFORMATION = uintptr                /* winioctl.h:632:26 */
+type GET_LENGTH_INFORMATION = _GET_LENGTH_INFORMATION /* winioctl.h:658:3 */
+type PGET_LENGTH_INFORMATION = uintptr                /* winioctl.h:658:26 */
 
 type _PARTITION_INFORMATION_EX = struct {
 	FPartitionStyle   PARTITION_STYLE
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FStartingOffset   LARGE_INTEGER
 	FPartitionLength  LARGE_INTEGER
 	FPartitionNumber  DWORD
 	FRewritePartition BOOLEAN
-	_                 [3]byte
+	F__ccgo_pad2      [3]byte
 	Fu                struct {
-		_    [0]uint64
-		FMbr PARTITION_INFORMATION_MBR
-		_    [104]byte
+		F__ccgo_pad1 [0]uint64
+		FMbr         PARTITION_INFORMATION_MBR
+		F__ccgo_pad2 [104]byte
 	}
-} /* winioctl.h:634:9 */
+} /* winioctl.h:660:9 */
 
-type PARTITION_INFORMATION_EX = _PARTITION_INFORMATION_EX /* winioctl.h:644:3 */
-type PPARTITION_INFORMATION_EX = uintptr                  /* winioctl.h:644:28 */
+type PARTITION_INFORMATION_EX = _PARTITION_INFORMATION_EX /* winioctl.h:670:3 */
+type PPARTITION_INFORMATION_EX = uintptr                  /* winioctl.h:670:28 */
 
 type _DRIVE_LAYOUT_INFORMATION_GPT = struct {
 	FDiskId               GUID
 	FStartingUsableOffset LARGE_INTEGER
 	FUsableLength         LARGE_INTEGER
 	FMaxPartitionCount    DWORD
-	_                     [4]byte
-} /* winioctl.h:646:9 */
+	F__ccgo_pad1          [4]byte
+} /* winioctl.h:672:9 */
 
-type DRIVE_LAYOUT_INFORMATION_GPT = _DRIVE_LAYOUT_INFORMATION_GPT /* winioctl.h:651:3 */
-type PDRIVE_LAYOUT_INFORMATION_GPT = uintptr                      /* winioctl.h:651:32 */
+type DRIVE_LAYOUT_INFORMATION_GPT = _DRIVE_LAYOUT_INFORMATION_GPT /* winioctl.h:677:3 */
+type PDRIVE_LAYOUT_INFORMATION_GPT = uintptr                      /* winioctl.h:677:32 */
 
-type _DRIVE_LAYOUT_INFORMATION_MBR = struct{ FSignature DWORD } /* winioctl.h:653:9 */
+type _DRIVE_LAYOUT_INFORMATION_MBR = struct{ FSignature DWORD } /* winioctl.h:679:9 */
 
-type DRIVE_LAYOUT_INFORMATION_MBR = _DRIVE_LAYOUT_INFORMATION_MBR /* winioctl.h:655:3 */
-type PDRIVE_LAYOUT_INFORMATION_MBR = uintptr                      /* winioctl.h:655:32 */
+type DRIVE_LAYOUT_INFORMATION_MBR = _DRIVE_LAYOUT_INFORMATION_MBR /* winioctl.h:681:3 */
+type PDRIVE_LAYOUT_INFORMATION_MBR = uintptr                      /* winioctl.h:681:32 */
 
 type _DRIVE_LAYOUT_INFORMATION_EX = struct {
 	FPartitionStyle DWORD
 	FPartitionCount DWORD
 	Fu              struct {
-		_    [0]uint64
-		FMbr DRIVE_LAYOUT_INFORMATION_MBR
-		_    [36]byte
+		F__ccgo_pad1 [0]uint64
+		FMbr         DRIVE_LAYOUT_INFORMATION_MBR
+		F__ccgo_pad2 [36]byte
 	}
 	FPartitionEntry [1]PARTITION_INFORMATION_EX
-} /* winioctl.h:657:9 */
+} /* winioctl.h:683:9 */
 
-type DRIVE_LAYOUT_INFORMATION_EX = _DRIVE_LAYOUT_INFORMATION_EX /* winioctl.h:665:3 */
-type PDRIVE_LAYOUT_INFORMATION_EX = uintptr                     /* winioctl.h:665:31 */
+type DRIVE_LAYOUT_INFORMATION_EX = _DRIVE_LAYOUT_INFORMATION_EX /* winioctl.h:691:3 */
+type PDRIVE_LAYOUT_INFORMATION_EX = uintptr                     /* winioctl.h:691:31 */
 
-type DETECTION_TYPE = uint32 /* winioctl.h:669:3 */
+type DETECTION_TYPE = uint32 /* winioctl.h:695:3 */
 
 type _DISK_INT13_INFO = struct {
 	FDriveSelect     WORD
-	_                [2]byte
+	F__ccgo_pad1     [2]byte
 	FMaxCylinders    DWORD
 	FSectorsPerTrack WORD
 	FMaxHeads        WORD
 	FNumberDrives    WORD
-	_                [2]byte
-} /* winioctl.h:671:9 */
+	F__ccgo_pad2     [2]byte
+} /* winioctl.h:697:9 */
 
-type DISK_INT13_INFO = _DISK_INT13_INFO /* winioctl.h:677:3 */
-type PDISK_INT13_INFO = uintptr         /* winioctl.h:677:19 */
+type DISK_INT13_INFO = _DISK_INT13_INFO /* winioctl.h:703:3 */
+type PDISK_INT13_INFO = uintptr         /* winioctl.h:703:19 */
 
 type _DISK_EX_INT13_INFO = struct {
 	FExBufferSize      WORD
@@ -58705,11 +59279,11 @@ type _DISK_EX_INT13_INFO = struct {
 	FExSectorsPerDrive DWORD64
 	FExSectorSize      WORD
 	FExReserved        WORD
-	_                  [4]byte
-} /* winioctl.h:679:9 */
+	F__ccgo_pad1       [4]byte
+} /* winioctl.h:705:9 */
 
-type DISK_EX_INT13_INFO = _DISK_EX_INT13_INFO /* winioctl.h:688:3 */
-type PDISK_EX_INT13_INFO = uintptr            /* winioctl.h:688:22 */
+type DISK_EX_INT13_INFO = _DISK_EX_INT13_INFO /* winioctl.h:714:3 */
+type PDISK_EX_INT13_INFO = uintptr            /* winioctl.h:714:22 */
 
 type _DISK_DETECTION_INFO = struct {
 	FSizeOfDetectInfo DWORD
@@ -58720,10 +59294,10 @@ type _DISK_DETECTION_INFO = struct {
 			FExInt13 DISK_EX_INT13_INFO
 		}
 	}
-} /* winioctl.h:690:9 */
+} /* winioctl.h:716:9 */
 
-type DISK_DETECTION_INFO = _DISK_DETECTION_INFO /* winioctl.h:699:3 */
-type PDISK_DETECTION_INFO = uintptr             /* winioctl.h:699:23 */
+type DISK_DETECTION_INFO = _DISK_DETECTION_INFO /* winioctl.h:725:3 */
+type PDISK_DETECTION_INFO = uintptr             /* winioctl.h:725:23 */
 
 type _DISK_PARTITION_INFO = struct {
 	FSizeOfPartitionInfo DWORD
@@ -58733,43 +59307,43 @@ type _DISK_PARTITION_INFO = struct {
 			FSignature DWORD
 			FCheckSum  DWORD
 		}
-		_ [8]byte
+		F__ccgo_pad1 [8]byte
 	}
-} /* winioctl.h:701:9 */
+} /* winioctl.h:727:9 */
 
-type DISK_PARTITION_INFO = _DISK_PARTITION_INFO /* winioctl.h:713:3 */
-type PDISK_PARTITION_INFO = uintptr             /* winioctl.h:713:23 */
+type DISK_PARTITION_INFO = _DISK_PARTITION_INFO /* winioctl.h:739:3 */
+type PDISK_PARTITION_INFO = uintptr             /* winioctl.h:739:23 */
 
 type _DISK_GEOMETRY_EX = struct {
-	FGeometry DISK_GEOMETRY
-	FDiskSize LARGE_INTEGER
-	FData     [1]BYTE
-	_         [7]byte
-} /* winioctl.h:718:9 */
+	FGeometry    DISK_GEOMETRY
+	FDiskSize    LARGE_INTEGER
+	FData        [1]BYTE
+	F__ccgo_pad1 [7]byte
+} /* winioctl.h:744:9 */
 
-type DISK_GEOMETRY_EX = _DISK_GEOMETRY_EX /* winioctl.h:722:3 */
-type PDISK_GEOMETRY_EX = uintptr          /* winioctl.h:722:20 */
+type DISK_GEOMETRY_EX = _DISK_GEOMETRY_EX /* winioctl.h:748:3 */
+type PDISK_GEOMETRY_EX = uintptr          /* winioctl.h:748:20 */
 
 type _DISK_CONTROLLER_NUMBER = struct {
 	FControllerNumber DWORD
 	FDiskNumber       DWORD
-} /* winioctl.h:724:9 */
+} /* winioctl.h:750:9 */
 
-type DISK_CONTROLLER_NUMBER = _DISK_CONTROLLER_NUMBER /* winioctl.h:727:3 */
-type PDISK_CONTROLLER_NUMBER = uintptr                /* winioctl.h:727:26 */
+type DISK_CONTROLLER_NUMBER = _DISK_CONTROLLER_NUMBER /* winioctl.h:753:3 */
+type PDISK_CONTROLLER_NUMBER = uintptr                /* winioctl.h:753:26 */
 
-type DISK_CACHE_RETENTION_PRIORITY = uint32 /* winioctl.h:731:3 */
+type DISK_CACHE_RETENTION_PRIORITY = uint32 /* winioctl.h:757:3 */
 
 type _DISK_CACHE_INFORMATION = struct {
 	FParametersSavable             BOOLEAN
 	FReadCacheEnabled              BOOLEAN
 	FWriteCacheEnabled             BOOLEAN
-	_                              [1]byte
+	F__ccgo_pad1                   [1]byte
 	FReadRetentionPriority         DISK_CACHE_RETENTION_PRIORITY
 	FWriteRetentionPriority        DISK_CACHE_RETENTION_PRIORITY
 	FDisablePrefetchTransferLength WORD
 	FPrefetchScalar                BOOLEAN
-	_                              [1]byte
+	F__ccgo_pad2                   [1]byte
 	Fu                             struct {
 		FScalarPrefetch struct {
 			FMinimum       WORD
@@ -58777,28 +59351,28 @@ type _DISK_CACHE_INFORMATION = struct {
 			FMaximumBlocks WORD
 		}
 	}
-	_ [2]byte
-} /* winioctl.h:733:9 */
+	F__ccgo_pad3 [2]byte
+} /* winioctl.h:759:9 */
 
-type DISK_CACHE_INFORMATION = _DISK_CACHE_INFORMATION /* winioctl.h:752:3 */
-type PDISK_CACHE_INFORMATION = uintptr                /* winioctl.h:752:26 */
+type DISK_CACHE_INFORMATION = _DISK_CACHE_INFORMATION /* winioctl.h:778:3 */
+type PDISK_CACHE_INFORMATION = uintptr                /* winioctl.h:778:26 */
 
 type _DISK_GROW_PARTITION = struct {
 	FPartitionNumber DWORD
-	_                [4]byte
+	F__ccgo_pad1     [4]byte
 	FBytesToGrow     LARGE_INTEGER
-} /* winioctl.h:754:9 */
+} /* winioctl.h:780:9 */
 
-type DISK_GROW_PARTITION = _DISK_GROW_PARTITION /* winioctl.h:757:3 */
-type PDISK_GROW_PARTITION = uintptr             /* winioctl.h:757:23 */
+type DISK_GROW_PARTITION = _DISK_GROW_PARTITION /* winioctl.h:783:3 */
+type PDISK_GROW_PARTITION = uintptr             /* winioctl.h:783:23 */
 
 type _HISTOGRAM_BUCKET = struct {
 	FReads  DWORD
 	FWrites DWORD
-} /* winioctl.h:761:9 */
+} /* winioctl.h:787:9 */
 
-type HISTOGRAM_BUCKET = _HISTOGRAM_BUCKET /* winioctl.h:764:3 */
-type PHISTOGRAM_BUCKET = uintptr          /* winioctl.h:764:20 */
+type HISTOGRAM_BUCKET = _HISTOGRAM_BUCKET /* winioctl.h:790:3 */
+type PHISTOGRAM_BUCKET = uintptr          /* winioctl.h:790:20 */
 
 type _DISK_HISTOGRAM = struct {
 	FDiskSize     LARGE_INTEGER
@@ -58812,10 +59386,10 @@ type _DISK_HISTOGRAM = struct {
 	FReadCount    DWORD
 	FWriteCount   DWORD
 	FHistogram    PHISTOGRAM_BUCKET
-} /* winioctl.h:768:9 */
+} /* winioctl.h:794:9 */
 
-type DISK_HISTOGRAM = _DISK_HISTOGRAM /* winioctl.h:780:3 */
-type PDISK_HISTOGRAM = uintptr        /* winioctl.h:780:18 */
+type DISK_HISTOGRAM = _DISK_HISTOGRAM /* winioctl.h:806:3 */
+type PDISK_HISTOGRAM = uintptr        /* winioctl.h:806:18 */
 
 type _DISK_PERFORMANCE = struct {
 	FBytesRead           LARGE_INTEGER
@@ -58830,11 +59404,11 @@ type _DISK_PERFORMANCE = struct {
 	FQueryTime           LARGE_INTEGER
 	FStorageDeviceNumber DWORD
 	FStorageManagerName  [8]WCHAR
-	_                    [4]byte
-} /* winioctl.h:784:9 */
+	F__ccgo_pad1         [4]byte
+} /* winioctl.h:810:9 */
 
-type DISK_PERFORMANCE = _DISK_PERFORMANCE /* winioctl.h:797:3 */
-type PDISK_PERFORMANCE = uintptr          /* winioctl.h:797:20 */
+type DISK_PERFORMANCE = _DISK_PERFORMANCE /* winioctl.h:823:3 */
+type PDISK_PERFORMANCE = uintptr          /* winioctl.h:823:20 */
 
 type _DISK_RECORD = struct {
 	FByteOffset     LARGE_INTEGER
@@ -58844,59 +59418,59 @@ type _DISK_RECORD = struct {
 	FNumberOfBytes  DWORD
 	FDeviceNumber   BYTE
 	FReadRequest    BOOLEAN
-	_               [2]byte
-} /* winioctl.h:799:9 */
+	F__ccgo_pad1    [2]byte
+} /* winioctl.h:825:9 */
 
-type DISK_RECORD = _DISK_RECORD /* winioctl.h:807:3 */
-type PDISK_RECORD = uintptr     /* winioctl.h:807:15 */
+type DISK_RECORD = _DISK_RECORD /* winioctl.h:833:3 */
+type PDISK_RECORD = uintptr     /* winioctl.h:833:15 */
 
 type _DISK_LOGGING = struct {
 	FFunction      BYTE
-	_              [7]byte
+	F__ccgo_pad1   [7]byte
 	FBufferAddress PVOID
 	FBufferSize    DWORD
-	_              [4]byte
-} /* winioctl.h:809:9 */
+	F__ccgo_pad2   [4]byte
+} /* winioctl.h:835:9 */
 
-type DISK_LOGGING = _DISK_LOGGING /* winioctl.h:813:3 */
-type PDISK_LOGGING = uintptr      /* winioctl.h:813:16 */
+type DISK_LOGGING = _DISK_LOGGING /* winioctl.h:839:3 */
+type PDISK_LOGGING = uintptr      /* winioctl.h:839:16 */
 
-type BIN_TYPES = uint32 /* winioctl.h:822:3 */
+type BIN_TYPES = uint32 /* winioctl.h:848:3 */
 
 type _BIN_RANGE = struct {
 	FStartValue LARGE_INTEGER
 	FLength     LARGE_INTEGER
-} /* winioctl.h:824:9 */
+} /* winioctl.h:850:9 */
 
-type BIN_RANGE = _BIN_RANGE /* winioctl.h:827:3 */
-type PBIN_RANGE = uintptr   /* winioctl.h:827:13 */
+type BIN_RANGE = _BIN_RANGE /* winioctl.h:853:3 */
+type PBIN_RANGE = uintptr   /* winioctl.h:853:13 */
 
 type _PERF_BIN = struct {
 	FNumberOfBins DWORD
 	FTypeOfBin    DWORD
 	FBinsRanges   [1]BIN_RANGE
-} /* winioctl.h:829:9 */
+} /* winioctl.h:855:9 */
 
-type PERF_BIN = _PERF_BIN /* winioctl.h:833:3 */
-type PPERF_BIN = uintptr  /* winioctl.h:833:12 */
+type PERF_BIN = _PERF_BIN /* winioctl.h:859:3 */
+type PPERF_BIN = uintptr  /* winioctl.h:859:12 */
 
 type _BIN_COUNT = struct {
-	FBinRange BIN_RANGE
-	FBinCount DWORD
-	_         [4]byte
-} /* winioctl.h:835:9 */
+	FBinRange    BIN_RANGE
+	FBinCount    DWORD
+	F__ccgo_pad1 [4]byte
+} /* winioctl.h:861:9 */
 
-type BIN_COUNT = _BIN_COUNT /* winioctl.h:838:3 */
-type PBIN_COUNT = uintptr   /* winioctl.h:838:13 */
+type BIN_COUNT = _BIN_COUNT /* winioctl.h:864:3 */
+type PBIN_COUNT = uintptr   /* winioctl.h:864:13 */
 
 type _BIN_RESULTS = struct {
 	FNumberOfBins DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FBinCounts    [1]BIN_COUNT
-} /* winioctl.h:840:9 */
+} /* winioctl.h:866:9 */
 
-type BIN_RESULTS = _BIN_RESULTS /* winioctl.h:843:3 */
-type PBIN_RESULTS = uintptr     /* winioctl.h:843:15 */
+type BIN_RESULTS = _BIN_RESULTS /* winioctl.h:869:3 */
+type PBIN_RESULTS = uintptr     /* winioctl.h:869:15 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -58909,15 +59483,15 @@ type _GETVERSIONINPARAMS = struct {
 	FbIDEDeviceMap BYTE
 	FfCapabilities DWORD
 	FdwReserved    [4]DWORD
-} /* winioctl.h:846:9 */
+} /* winioctl.h:872:9 */
 
 // *
 // 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.
-type GETVERSIONINPARAMS = _GETVERSIONINPARAMS /* winioctl.h:853:3 */
-type PGETVERSIONINPARAMS = uintptr            /* winioctl.h:853:22 */
-type LPGETVERSIONINPARAMS = uintptr           /* winioctl.h:853:43 */
+type GETVERSIONINPARAMS = _GETVERSIONINPARAMS /* winioctl.h:879:3 */
+type PGETVERSIONINPARAMS = uintptr            /* winioctl.h:879:22 */
+type LPGETVERSIONINPARAMS = uintptr           /* winioctl.h:879:43 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -58936,7 +59510,7 @@ type _IDEREGS = struct {
 	FbDriveHeadReg    BYTE
 	FbCommandReg      BYTE
 	FbReserved        BYTE
-} /* winioctl.h:861:9 */
+} /* winioctl.h:887:9 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -58947,9 +59521,9 @@ type _IDEREGS = struct {
 // 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.
-type IDEREGS = _IDEREGS  /* winioctl.h:870:3 */
-type PIDEREGS = uintptr  /* winioctl.h:870:11 */
-type LPIDEREGS = uintptr /* winioctl.h:870:21 */
+type IDEREGS = _IDEREGS  /* winioctl.h:896:3 */
+type PIDEREGS = uintptr  /* winioctl.h:896:11 */
+type LPIDEREGS = uintptr /* winioctl.h:896:21 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -58966,8 +59540,8 @@ type _SENDCMDINPARAMS = struct {
 	FbReserved    [3]BYTE
 	FdwReserved   [4]DWORD
 	FbBuffer      [1]BYTE
-	_             [3]byte
-} /* winioctl.h:881:9 */
+	F__ccgo_pad1  [3]byte
+} /* winioctl.h:907:9 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -58978,9 +59552,9 @@ type _SENDCMDINPARAMS = struct {
 // 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.
-type SENDCMDINPARAMS = _SENDCMDINPARAMS /* winioctl.h:888:3 */
-type PSENDCMDINPARAMS = uintptr         /* winioctl.h:888:19 */
-type LPSENDCMDINPARAMS = uintptr        /* winioctl.h:888:37 */
+type SENDCMDINPARAMS = _SENDCMDINPARAMS /* winioctl.h:914:3 */
+type PSENDCMDINPARAMS = uintptr         /* winioctl.h:914:19 */
+type LPSENDCMDINPARAMS = uintptr        /* winioctl.h:914:37 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -58995,7 +59569,7 @@ type _DRIVERSTATUS = struct {
 	FbIDEError    BYTE
 	FbReserved    [2]BYTE
 	FdwReserved   [2]DWORD
-} /* winioctl.h:892:9 */
+} /* winioctl.h:918:9 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -59006,9 +59580,9 @@ type _DRIVERSTATUS = struct {
 // 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.
-type DRIVERSTATUS = _DRIVERSTATUS /* winioctl.h:897:3 */
-type PDRIVERSTATUS = uintptr      /* winioctl.h:897:16 */
-type LPDRIVERSTATUS = uintptr     /* winioctl.h:897:31 */
+type DRIVERSTATUS = _DRIVERSTATUS /* winioctl.h:923:3 */
+type PDRIVERSTATUS = uintptr      /* winioctl.h:923:16 */
+type LPDRIVERSTATUS = uintptr     /* winioctl.h:923:31 */
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
 // This file is part of the mingw-w64 runtime package.
@@ -59022,8 +59596,8 @@ type _SENDCMDOUTPARAMS = struct {
 	FcBufferSize  DWORD
 	FDriverStatus DRIVERSTATUS
 	FbBuffer      [1]BYTE
-	_             [3]byte
-} /* winioctl.h:920:9 */
+	F__ccgo_pad1  [3]byte
+} /* winioctl.h:946:9 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -59034,32 +59608,32 @@ type _SENDCMDOUTPARAMS = struct {
 // 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.
-type SENDCMDOUTPARAMS = _SENDCMDOUTPARAMS /* winioctl.h:924:3 */
-type PSENDCMDOUTPARAMS = uintptr          /* winioctl.h:924:20 */
-type LPSENDCMDOUTPARAMS = uintptr         /* winioctl.h:924:39 */
+type SENDCMDOUTPARAMS = _SENDCMDOUTPARAMS /* winioctl.h:950:3 */
+type PSENDCMDOUTPARAMS = uintptr          /* winioctl.h:950:20 */
+type LPSENDCMDOUTPARAMS = uintptr         /* winioctl.h:950:39 */
 // *
 // 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.
 
-type ELEMENT_TYPE = uint32   /* winioctl.h:970:3 */
-type PELEMENT_TYPE = uintptr /* winioctl.h:970:16 */
+type ELEMENT_TYPE = uint32   /* winioctl.h:996:3 */
+type PELEMENT_TYPE = uintptr /* winioctl.h:996:16 */
 
 type _CHANGER_ELEMENT = struct {
 	FElementType    ELEMENT_TYPE
 	FElementAddress DWORD
-} /* winioctl.h:972:9 */
+} /* winioctl.h:998:9 */
 
-type CHANGER_ELEMENT = _CHANGER_ELEMENT /* winioctl.h:975:3 */
-type PCHANGER_ELEMENT = uintptr         /* winioctl.h:975:19 */
+type CHANGER_ELEMENT = _CHANGER_ELEMENT /* winioctl.h:1001:3 */
+type PCHANGER_ELEMENT = uintptr         /* winioctl.h:1001:19 */
 
 type _CHANGER_ELEMENT_LIST = struct {
 	FElement          CHANGER_ELEMENT
 	FNumberOfElements DWORD
-} /* winioctl.h:977:9 */
+} /* winioctl.h:1003:9 */
 
-type CHANGER_ELEMENT_LIST = _CHANGER_ELEMENT_LIST /* winioctl.h:980:3 */
-type PCHANGER_ELEMENT_LIST = uintptr              /* winioctl.h:980:25 */
+type CHANGER_ELEMENT_LIST = _CHANGER_ELEMENT_LIST /* winioctl.h:1006:3 */
+type PCHANGER_ELEMENT_LIST = uintptr              /* winioctl.h:1006:25 */
 
 type _GET_CHANGER_PARAMETERS = struct {
 	FSize                       DWORD
@@ -59090,10 +59664,10 @@ type _GET_CHANGER_PARAMETERS = struct {
 	FPositionCapabilities       BYTE
 	FReserved1                  [2]BYTE
 	FReserved2                  [2]DWORD
-} /* winioctl.h:1044:9 */
+} /* winioctl.h:1070:9 */
 
-type GET_CHANGER_PARAMETERS = _GET_CHANGER_PARAMETERS /* winioctl.h:1073:3 */
-type PGET_CHANGER_PARAMETERS = uintptr                /* winioctl.h:1073:26 */
+type GET_CHANGER_PARAMETERS = _GET_CHANGER_PARAMETERS /* winioctl.h:1099:3 */
+type PGET_CHANGER_PARAMETERS = uintptr                /* winioctl.h:1099:26 */
 
 type _CHANGER_PRODUCT_DATA = struct {
 	FVendorId     [8]BYTE
@@ -59101,27 +59675,27 @@ type _CHANGER_PRODUCT_DATA = struct {
 	FRevision     [4]BYTE
 	FSerialNumber [32]BYTE
 	FDeviceType   BYTE
-} /* winioctl.h:1075:9 */
+} /* winioctl.h:1101:9 */
 
-type CHANGER_PRODUCT_DATA = _CHANGER_PRODUCT_DATA /* winioctl.h:1081:3 */
-type PCHANGER_PRODUCT_DATA = uintptr              /* winioctl.h:1081:24 */
+type CHANGER_PRODUCT_DATA = _CHANGER_PRODUCT_DATA /* winioctl.h:1107:3 */
+type PCHANGER_PRODUCT_DATA = uintptr              /* winioctl.h:1107:24 */
 
 type _CHANGER_SET_ACCESS = struct {
 	FElement CHANGER_ELEMENT
 	FControl DWORD
-} /* winioctl.h:1088:9 */
+} /* winioctl.h:1114:9 */
 
-type CHANGER_SET_ACCESS = _CHANGER_SET_ACCESS /* winioctl.h:1091:3 */
-type PCHANGER_SET_ACCESS = uintptr            /* winioctl.h:1091:22 */
+type CHANGER_SET_ACCESS = _CHANGER_SET_ACCESS /* winioctl.h:1117:3 */
+type PCHANGER_SET_ACCESS = uintptr            /* winioctl.h:1117:22 */
 
 type _CHANGER_READ_ELEMENT_STATUS = struct {
 	FElementList   CHANGER_ELEMENT_LIST
 	FVolumeTagInfo BOOLEAN
-	_              [3]byte
-} /* winioctl.h:1093:9 */
+	F__ccgo_pad1   [3]byte
+} /* winioctl.h:1119:9 */
 
-type CHANGER_READ_ELEMENT_STATUS = _CHANGER_READ_ELEMENT_STATUS /* winioctl.h:1096:3 */
-type PCHANGER_READ_ELEMENT_STATUS = uintptr                     /* winioctl.h:1096:31 */
+type CHANGER_READ_ELEMENT_STATUS = _CHANGER_READ_ELEMENT_STATUS /* winioctl.h:1122:3 */
+type PCHANGER_READ_ELEMENT_STATUS = uintptr                     /* winioctl.h:1122:31 */
 
 type _CHANGER_ELEMENT_STATUS = struct {
 	FElement           CHANGER_ELEMENT
@@ -59133,10 +59707,10 @@ type _CHANGER_ELEMENT_STATUS = struct {
 	FReserved          WORD
 	FPrimaryVolumeID   [36]BYTE
 	FAlternateVolumeID [36]BYTE
-} /* winioctl.h:1098:9 */
+} /* winioctl.h:1124:9 */
 
-type CHANGER_ELEMENT_STATUS = _CHANGER_ELEMENT_STATUS /* winioctl.h:1108:3 */
-type PCHANGER_ELEMENT_STATUS = uintptr                /* winioctl.h:1108:26 */
+type CHANGER_ELEMENT_STATUS = _CHANGER_ELEMENT_STATUS /* winioctl.h:1134:3 */
+type PCHANGER_ELEMENT_STATUS = uintptr                /* winioctl.h:1134:26 */
 
 type _CHANGER_ELEMENT_STATUS_EX = struct {
 	FElement               CHANGER_ELEMENT
@@ -59151,29 +59725,29 @@ type _CHANGER_ELEMENT_STATUS_EX = struct {
 	FVendorIdentification  [8]BYTE
 	FProductIdentification [16]BYTE
 	FSerialNumber          [32]BYTE
-} /* winioctl.h:1110:9 */
+} /* winioctl.h:1136:9 */
 
-type CHANGER_ELEMENT_STATUS_EX = _CHANGER_ELEMENT_STATUS_EX /* winioctl.h:1123:3 */
-type PCHANGER_ELEMENT_STATUS_EX = uintptr                   /* winioctl.h:1123:29 */
+type CHANGER_ELEMENT_STATUS_EX = _CHANGER_ELEMENT_STATUS_EX /* winioctl.h:1149:3 */
+type PCHANGER_ELEMENT_STATUS_EX = uintptr                   /* winioctl.h:1149:29 */
 
 type _CHANGER_INITIALIZE_ELEMENT_STATUS = struct {
 	FElementList CHANGER_ELEMENT_LIST
 	FBarCodeScan BOOLEAN
-	_            [3]byte
-} /* winioctl.h:1151:9 */
+	F__ccgo_pad1 [3]byte
+} /* winioctl.h:1177:9 */
 
-type CHANGER_INITIALIZE_ELEMENT_STATUS = _CHANGER_INITIALIZE_ELEMENT_STATUS /* winioctl.h:1154:3 */
-type PCHANGER_INITIALIZE_ELEMENT_STATUS = uintptr                           /* winioctl.h:1154:37 */
+type CHANGER_INITIALIZE_ELEMENT_STATUS = _CHANGER_INITIALIZE_ELEMENT_STATUS /* winioctl.h:1180:3 */
+type PCHANGER_INITIALIZE_ELEMENT_STATUS = uintptr                           /* winioctl.h:1180:37 */
 
 type _CHANGER_SET_POSITION = struct {
 	FTransport   CHANGER_ELEMENT
 	FDestination CHANGER_ELEMENT
 	FFlip        BOOLEAN
-	_            [3]byte
-} /* winioctl.h:1156:9 */
+	F__ccgo_pad1 [3]byte
+} /* winioctl.h:1182:9 */
 
-type CHANGER_SET_POSITION = _CHANGER_SET_POSITION /* winioctl.h:1160:3 */
-type PCHANGER_SET_POSITION = uintptr              /* winioctl.h:1160:24 */
+type CHANGER_SET_POSITION = _CHANGER_SET_POSITION /* winioctl.h:1186:3 */
+type PCHANGER_SET_POSITION = uintptr              /* winioctl.h:1186:24 */
 
 type _CHANGER_EXCHANGE_MEDIUM = struct {
 	FTransport    CHANGER_ELEMENT
@@ -59182,56 +59756,56 @@ type _CHANGER_EXCHANGE_MEDIUM = struct {
 	FDestination2 CHANGER_ELEMENT
 	FFlip1        BOOLEAN
 	FFlip2        BOOLEAN
-	_             [2]byte
-} /* winioctl.h:1162:9 */
+	F__ccgo_pad1  [2]byte
+} /* winioctl.h:1188:9 */
 
-type CHANGER_EXCHANGE_MEDIUM = _CHANGER_EXCHANGE_MEDIUM /* winioctl.h:1169:3 */
-type PCHANGER_EXCHANGE_MEDIUM = uintptr                 /* winioctl.h:1169:27 */
+type CHANGER_EXCHANGE_MEDIUM = _CHANGER_EXCHANGE_MEDIUM /* winioctl.h:1195:3 */
+type PCHANGER_EXCHANGE_MEDIUM = uintptr                 /* winioctl.h:1195:27 */
 
 type _CHANGER_MOVE_MEDIUM = struct {
 	FTransport   CHANGER_ELEMENT
 	FSource      CHANGER_ELEMENT
 	FDestination CHANGER_ELEMENT
 	FFlip        BOOLEAN
-	_            [3]byte
-} /* winioctl.h:1171:9 */
+	F__ccgo_pad1 [3]byte
+} /* winioctl.h:1197:9 */
 
-type CHANGER_MOVE_MEDIUM = _CHANGER_MOVE_MEDIUM /* winioctl.h:1176:3 */
-type PCHANGER_MOVE_MEDIUM = uintptr             /* winioctl.h:1176:23 */
+type CHANGER_MOVE_MEDIUM = _CHANGER_MOVE_MEDIUM /* winioctl.h:1202:3 */
+type PCHANGER_MOVE_MEDIUM = uintptr             /* winioctl.h:1202:23 */
 
 type _CHANGER_SEND_VOLUME_TAG_INFORMATION = struct {
 	FStartingElement  CHANGER_ELEMENT
 	FActionCode       DWORD
 	FVolumeIDTemplate [40]BYTE
-} /* winioctl.h:1178:9 */
+} /* winioctl.h:1204:9 */
 
-type CHANGER_SEND_VOLUME_TAG_INFORMATION = _CHANGER_SEND_VOLUME_TAG_INFORMATION /* winioctl.h:1182:3 */
-type PCHANGER_SEND_VOLUME_TAG_INFORMATION = uintptr                             /* winioctl.h:1182:39 */
+type CHANGER_SEND_VOLUME_TAG_INFORMATION = _CHANGER_SEND_VOLUME_TAG_INFORMATION /* winioctl.h:1208:3 */
+type PCHANGER_SEND_VOLUME_TAG_INFORMATION = uintptr                             /* winioctl.h:1208:39 */
 
 type _READ_ELEMENT_ADDRESS_INFO = struct {
 	FNumberOfElements DWORD
 	FElementStatus    [1]CHANGER_ELEMENT_STATUS
-} /* winioctl.h:1184:9 */
+} /* winioctl.h:1210:9 */
 
-type READ_ELEMENT_ADDRESS_INFO = _READ_ELEMENT_ADDRESS_INFO /* winioctl.h:1187:3 */
-type PREAD_ELEMENT_ADDRESS_INFO = uintptr                   /* winioctl.h:1187:29 */
+type READ_ELEMENT_ADDRESS_INFO = _READ_ELEMENT_ADDRESS_INFO /* winioctl.h:1213:3 */
+type PREAD_ELEMENT_ADDRESS_INFO = uintptr                   /* winioctl.h:1213:29 */
 
-type CHANGER_DEVICE_PROBLEM_TYPE = uint32   /* winioctl.h:1209:3 */
-type PCHANGER_DEVICE_PROBLEM_TYPE = uintptr /* winioctl.h:1209:31 */
+type CHANGER_DEVICE_PROBLEM_TYPE = uint32   /* winioctl.h:1235:3 */
+type PCHANGER_DEVICE_PROBLEM_TYPE = uintptr /* winioctl.h:1235:31 */
 
 type _PATHNAME_BUFFER = struct {
 	FPathNameLength DWORD
 	FName           [1]WCHAR
-	_               [2]byte
-} /* winioctl.h:1309:9 */
+	F__ccgo_pad1    [2]byte
+} /* winioctl.h:1335:9 */
 
-type PATHNAME_BUFFER = _PATHNAME_BUFFER /* winioctl.h:1312:3 */
-type PPATHNAME_BUFFER = uintptr         /* winioctl.h:1312:19 */
+type PATHNAME_BUFFER = _PATHNAME_BUFFER /* winioctl.h:1338:3 */
+type PPATHNAME_BUFFER = uintptr         /* winioctl.h:1338:19 */
 
-type _FSCTL_QUERY_FAT_BPB_BUFFER = struct{ FFirst0x24BytesOfBootSector [36]BYTE } /* winioctl.h:1314:9 */
+type _FSCTL_QUERY_FAT_BPB_BUFFER = struct{ FFirst0x24BytesOfBootSector [36]BYTE } /* winioctl.h:1340:9 */
 
-type FSCTL_QUERY_FAT_BPB_BUFFER = _FSCTL_QUERY_FAT_BPB_BUFFER /* winioctl.h:1316:3 */
-type PFSCTL_QUERY_FAT_BPB_BUFFER = uintptr                    /* winioctl.h:1316:30 */
+type FSCTL_QUERY_FAT_BPB_BUFFER = _FSCTL_QUERY_FAT_BPB_BUFFER /* winioctl.h:1342:3 */
+type PFSCTL_QUERY_FAT_BPB_BUFFER = uintptr                    /* winioctl.h:1342:30 */
 
 type NTFS_VOLUME_DATA_BUFFER = struct {
 	FVolumeSerialNumber           LARGE_INTEGER
@@ -59248,102 +59822,102 @@ type NTFS_VOLUME_DATA_BUFFER = struct {
 	FMft2StartLcn                 LARGE_INTEGER
 	FMftZoneStart                 LARGE_INTEGER
 	FMftZoneEnd                   LARGE_INTEGER
-}                                       /* winioctl.h:1333:3 */
-type PNTFS_VOLUME_DATA_BUFFER = uintptr /* winioctl.h:1333:27 */
+}                                       /* winioctl.h:1359:3 */
+type PNTFS_VOLUME_DATA_BUFFER = uintptr /* winioctl.h:1359:27 */
 
 type NTFS_EXTENDED_VOLUME_DATA = struct {
 	FByteCount    DWORD
 	FMajorVersion WORD
 	FMinorVersion WORD
-}                                         /* winioctl.h:1339:3 */
-type PNTFS_EXTENDED_VOLUME_DATA = uintptr /* winioctl.h:1339:29 */
+}                                         /* winioctl.h:1365:3 */
+type PNTFS_EXTENDED_VOLUME_DATA = uintptr /* winioctl.h:1365:29 */
 
-type STARTING_LCN_INPUT_BUFFER = struct{ FStartingLcn LARGE_INTEGER } /* winioctl.h:1343:3 */
-type PSTARTING_LCN_INPUT_BUFFER = uintptr                             /* winioctl.h:1343:29 */
+type STARTING_LCN_INPUT_BUFFER = struct{ FStartingLcn LARGE_INTEGER } /* winioctl.h:1369:3 */
+type PSTARTING_LCN_INPUT_BUFFER = uintptr                             /* winioctl.h:1369:29 */
 
 type VOLUME_BITMAP_BUFFER = struct {
 	FStartingLcn LARGE_INTEGER
 	FBitmapSize  LARGE_INTEGER
 	FBuffer      [1]BYTE
-	_            [7]byte
-}                                    /* winioctl.h:1349:3 */
-type PVOLUME_BITMAP_BUFFER = uintptr /* winioctl.h:1349:24 */
+	F__ccgo_pad1 [7]byte
+}                                    /* winioctl.h:1375:3 */
+type PVOLUME_BITMAP_BUFFER = uintptr /* winioctl.h:1375:24 */
 
-type STARTING_VCN_INPUT_BUFFER = struct{ FStartingVcn LARGE_INTEGER } /* winioctl.h:1353:3 */
-type PSTARTING_VCN_INPUT_BUFFER = uintptr                             /* winioctl.h:1353:29 */
+type STARTING_VCN_INPUT_BUFFER = struct{ FStartingVcn LARGE_INTEGER } /* winioctl.h:1379:3 */
+type PSTARTING_VCN_INPUT_BUFFER = uintptr                             /* winioctl.h:1379:29 */
 
 type RETRIEVAL_POINTERS_BUFFER1 = struct {
 	FExtentCount DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FStartingVcn LARGE_INTEGER
 	FExtents     [1]struct {
 		FNextVcn LARGE_INTEGER
 		FLcn     LARGE_INTEGER
 	}
-} /* winioctl.h:1355:9 */
+} /* winioctl.h:1381:9 */
 
-type RETRIEVAL_POINTERS_BUFFER = RETRIEVAL_POINTERS_BUFFER1 /* winioctl.h:1362:3 */
-type PRETRIEVAL_POINTERS_BUFFER = uintptr                   /* winioctl.h:1362:29 */
+type RETRIEVAL_POINTERS_BUFFER = RETRIEVAL_POINTERS_BUFFER1 /* winioctl.h:1388:3 */
+type PRETRIEVAL_POINTERS_BUFFER = uintptr                   /* winioctl.h:1388:29 */
 
-type NTFS_FILE_RECORD_INPUT_BUFFER = struct{ FFileReferenceNumber LARGE_INTEGER } /* winioctl.h:1366:3 */
-type PNTFS_FILE_RECORD_INPUT_BUFFER = uintptr                                     /* winioctl.h:1366:33 */
+type NTFS_FILE_RECORD_INPUT_BUFFER = struct{ FFileReferenceNumber LARGE_INTEGER } /* winioctl.h:1392:3 */
+type PNTFS_FILE_RECORD_INPUT_BUFFER = uintptr                                     /* winioctl.h:1392:33 */
 
 type NTFS_FILE_RECORD_OUTPUT_BUFFER = struct {
 	FFileReferenceNumber LARGE_INTEGER
 	FFileRecordLength    DWORD
 	FFileRecordBuffer    [1]BYTE
-	_                    [3]byte
-}                                              /* winioctl.h:1372:3 */
-type PNTFS_FILE_RECORD_OUTPUT_BUFFER = uintptr /* winioctl.h:1372:34 */
+	F__ccgo_pad1         [3]byte
+}                                              /* winioctl.h:1398:3 */
+type PNTFS_FILE_RECORD_OUTPUT_BUFFER = uintptr /* winioctl.h:1398:34 */
 
 type MOVE_FILE_DATA = struct {
 	FFileHandle   HANDLE
 	FStartingVcn  LARGE_INTEGER
 	FStartingLcn  LARGE_INTEGER
 	FClusterCount DWORD
-	_             [4]byte
-}                              /* winioctl.h:1379:3 */
-type PMOVE_FILE_DATA = uintptr /* winioctl.h:1379:18 */
+	F__ccgo_pad1  [4]byte
+}                              /* winioctl.h:1405:3 */
+type PMOVE_FILE_DATA = uintptr /* winioctl.h:1405:18 */
 
 type _MOVE_FILE_DATA32 = struct {
 	FFileHandle   UINT32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FStartingVcn  LARGE_INTEGER
 	FStartingLcn  LARGE_INTEGER
 	FClusterCount DWORD
-	_             [4]byte
-} /* winioctl.h:1382:9 */
+	F__ccgo_pad2  [4]byte
+} /* winioctl.h:1408:9 */
 
-type MOVE_FILE_DATA32 = _MOVE_FILE_DATA32 /* winioctl.h:1387:3 */
-type PMOVE_FILE_DATA32 = uintptr          /* winioctl.h:1387:20 */
+type MOVE_FILE_DATA32 = _MOVE_FILE_DATA32 /* winioctl.h:1413:3 */
+type PMOVE_FILE_DATA32 = uintptr          /* winioctl.h:1413:20 */
 
 type FIND_BY_SID_DATA = struct {
 	FRestart DWORD
 	FSid     SID
-}                                /* winioctl.h:1393:3 */
-type PFIND_BY_SID_DATA = uintptr /* winioctl.h:1393:20 */
+}                                /* winioctl.h:1419:3 */
+type PFIND_BY_SID_DATA = uintptr /* winioctl.h:1419:20 */
 
 type FIND_BY_SID_OUTPUT = struct {
 	FNextEntryOffset DWORD
 	FFileIndex       DWORD
 	FFileNameLength  DWORD
 	FFileName        [1]WCHAR
-	_                [2]byte
-}                                  /* winioctl.h:1400:3 */
-type PFIND_BY_SID_OUTPUT = uintptr /* winioctl.h:1400:22 */
+	F__ccgo_pad1     [2]byte
+}                                  /* winioctl.h:1426:3 */
+type PFIND_BY_SID_OUTPUT = uintptr /* winioctl.h:1426:22 */
 
 type MFT_ENUM_DATA = struct {
 	FStartFileReferenceNumber DWORDLONG
 	FLowUsn                   USN
 	FHighUsn                  USN
-}                             /* winioctl.h:1406:3 */
-type PMFT_ENUM_DATA = uintptr /* winioctl.h:1406:17 */
+}                             /* winioctl.h:1432:3 */
+type PMFT_ENUM_DATA = uintptr /* winioctl.h:1432:17 */
 
 type CREATE_USN_JOURNAL_DATA = struct {
 	FMaximumSize     DWORDLONG
 	FAllocationDelta DWORDLONG
-}                                       /* winioctl.h:1411:3 */
-type PCREATE_USN_JOURNAL_DATA = uintptr /* winioctl.h:1411:27 */
+}                                       /* winioctl.h:1437:3 */
+type PCREATE_USN_JOURNAL_DATA = uintptr /* winioctl.h:1437:27 */
 
 type READ_USN_JOURNAL_DATA = struct {
 	FStartUsn          USN
@@ -59352,8 +59926,8 @@ type READ_USN_JOURNAL_DATA = struct {
 	FTimeout           DWORDLONG
 	FBytesToWaitFor    DWORDLONG
 	FUsnJournalID      DWORDLONG
-}                                     /* winioctl.h:1420:3 */
-type PREAD_USN_JOURNAL_DATA = uintptr /* winioctl.h:1420:25 */
+}                                     /* winioctl.h:1446:3 */
+type PREAD_USN_JOURNAL_DATA = uintptr /* winioctl.h:1446:25 */
 
 type USN_RECORD = struct {
 	FRecordLength              DWORD
@@ -59370,9 +59944,9 @@ type USN_RECORD = struct {
 	FFileNameLength            WORD
 	FFileNameOffset            WORD
 	FFileName                  [1]WCHAR
-	_                          [2]byte
-}                          /* winioctl.h:1437:3 */
-type PUSN_RECORD = uintptr /* winioctl.h:1437:14 */
+	F__ccgo_pad1               [2]byte
+}                          /* winioctl.h:1463:3 */
+type PUSN_RECORD = uintptr /* winioctl.h:1463:14 */
 
 type USN_JOURNAL_DATA = struct {
 	FUsnJournalID    DWORDLONG
@@ -59382,46 +59956,46 @@ type USN_JOURNAL_DATA = struct {
 	FMaxUsn          USN
 	FMaximumSize     DWORDLONG
 	FAllocationDelta DWORDLONG
-}                                /* winioctl.h:1472:3 */
-type PUSN_JOURNAL_DATA = uintptr /* winioctl.h:1472:20 */
+}                                /* winioctl.h:1498:3 */
+type PUSN_JOURNAL_DATA = uintptr /* winioctl.h:1498:20 */
 
 type DELETE_USN_JOURNAL_DATA = struct {
 	FUsnJournalID DWORDLONG
 	FDeleteFlags  DWORD
-	_             [4]byte
-}                                       /* winioctl.h:1477:3 */
-type PDELETE_USN_JOURNAL_DATA = uintptr /* winioctl.h:1477:27 */
+	F__ccgo_pad1  [4]byte
+}                                       /* winioctl.h:1503:3 */
+type PDELETE_USN_JOURNAL_DATA = uintptr /* winioctl.h:1503:27 */
 
 type MARK_HANDLE_INFO = struct {
 	FUsnSourceInfo DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FVolumeHandle  HANDLE
 	FHandleInfo    DWORD
-	_              [4]byte
-}                                /* winioctl.h:1488:3 */
-type PMARK_HANDLE_INFO = uintptr /* winioctl.h:1488:20 */
+	F__ccgo_pad2   [4]byte
+}                                /* winioctl.h:1514:3 */
+type PMARK_HANDLE_INFO = uintptr /* winioctl.h:1514:20 */
 
 type MARK_HANDLE_INFO32 = struct {
 	FUsnSourceInfo DWORD
 	FVolumeHandle  UINT32
 	FHandleInfo    DWORD
-}                                  /* winioctl.h:1497:3 */
-type PMARK_HANDLE_INFO32 = uintptr /* winioctl.h:1497:22 */
+}                                  /* winioctl.h:1523:3 */
+type PMARK_HANDLE_INFO32 = uintptr /* winioctl.h:1523:22 */
 
 type BULK_SECURITY_TEST_DATA = struct {
 	FDesiredAccess ACCESS_MASK
 	FSecurityIds   [1]DWORD
-}                                       /* winioctl.h:1513:3 */
-type PBULK_SECURITY_TEST_DATA = uintptr /* winioctl.h:1513:27 */
+}                                       /* winioctl.h:1539:3 */
+type PBULK_SECURITY_TEST_DATA = uintptr /* winioctl.h:1539:27 */
 
 type _FILE_PREFETCH = struct {
 	FType     DWORD
 	FCount    DWORD
 	FPrefetch [1]DWORDLONG
-} /* winioctl.h:1518:9 */
+} /* winioctl.h:1544:9 */
 
-type FILE_PREFETCH = _FILE_PREFETCH /* winioctl.h:1522:3 */
-type PFILE_PREFETCH = uintptr       /* winioctl.h:1522:17 */
+type FILE_PREFETCH = _FILE_PREFETCH /* winioctl.h:1548:3 */
+type PFILE_PREFETCH = uintptr       /* winioctl.h:1548:17 */
 
 type _FILESYSTEM_STATISTICS = struct {
 	FFileSystemType          WORD
@@ -59439,10 +60013,10 @@ type _FILESYSTEM_STATISTICS = struct {
 	FMetaDataWrites          DWORD
 	FMetaDataWriteBytes      DWORD
 	FMetaDataDiskWrites      DWORD
-} /* winioctl.h:1526:9 */
+} /* winioctl.h:1552:9 */
 
-type FILESYSTEM_STATISTICS = _FILESYSTEM_STATISTICS /* winioctl.h:1542:3 */
-type PFILESYSTEM_STATISTICS = uintptr               /* winioctl.h:1542:25 */
+type FILESYSTEM_STATISTICS = _FILESYSTEM_STATISTICS /* winioctl.h:1568:3 */
+type PFILESYSTEM_STATISTICS = uintptr               /* winioctl.h:1568:25 */
 
 type _FAT_STATISTICS = struct {
 	FCreateHits          DWORD
@@ -59454,10 +60028,10 @@ type _FAT_STATISTICS = struct {
 	FNonCachedWriteBytes DWORD
 	FNonCachedDiskReads  DWORD
 	FNonCachedDiskWrites DWORD
-} /* winioctl.h:1547:9 */
+} /* winioctl.h:1573:9 */
 
-type FAT_STATISTICS = _FAT_STATISTICS /* winioctl.h:1557:3 */
-type PFAT_STATISTICS = uintptr        /* winioctl.h:1557:18 */
+type FAT_STATISTICS = _FAT_STATISTICS /* winioctl.h:1583:3 */
+type PFAT_STATISTICS = uintptr        /* winioctl.h:1583:18 */
 
 type _EXFAT_STATISTICS = struct {
 	FCreateHits          DWORD
@@ -59469,10 +60043,10 @@ type _EXFAT_STATISTICS = struct {
 	FNonCachedWriteBytes DWORD
 	FNonCachedDiskReads  DWORD
 	FNonCachedDiskWrites DWORD
-} /* winioctl.h:1559:9 */
+} /* winioctl.h:1585:9 */
 
-type EXFAT_STATISTICS = _EXFAT_STATISTICS /* winioctl.h:1569:3 */
-type PEXFAT_STATISTICS = uintptr          /* winioctl.h:1569:21 */
+type EXFAT_STATISTICS = _EXFAT_STATISTICS /* winioctl.h:1595:3 */
+type PEXFAT_STATISTICS = uintptr          /* winioctl.h:1595:21 */
 
 type _NTFS_STATISTICS = struct {
 	FLogFileFullExceptions DWORD
@@ -59490,7 +60064,7 @@ type _NTFS_STATISTICS = struct {
 	FMftWritesFlushForLogFileFull WORD
 	FMftWritesLazyWriter          WORD
 	FMftWritesUserRequest         WORD
-	_                             [2]byte
+	F__ccgo_pad1                  [2]byte
 	FMft2Writes                   DWORD
 	FMft2WriteBytes               DWORD
 	FMft2WritesUserLevel          struct {
@@ -59502,7 +60076,7 @@ type _NTFS_STATISTICS = struct {
 	FMft2WritesFlushForLogFileFull   WORD
 	FMft2WritesLazyWriter            WORD
 	FMft2WritesUserRequest           WORD
-	_                                [2]byte
+	F__ccgo_pad2                     [2]byte
 	FRootIndexReads                  DWORD
 	FRootIndexReadBytes              DWORD
 	FRootIndexWrites                 DWORD
@@ -59532,7 +60106,7 @@ type _NTFS_STATISTICS = struct {
 		FSetInfo WORD
 		FFlush   WORD
 	}
-	_                    [2]byte
+	F__ccgo_pad3         [2]byte
 	FUserIndexReads      DWORD
 	FUserIndexReadBytes  DWORD
 	FUserIndexWrites     DWORD
@@ -59553,10 +60127,10 @@ type _NTFS_STATISTICS = struct {
 		FCacheMiss         DWORD
 		FCacheMissClusters DWORD
 	}
-} /* winioctl.h:1571:9 */
+} /* winioctl.h:1597:9 */
 
-type NTFS_STATISTICS = _NTFS_STATISTICS /* winioctl.h:1647:3 */
-type PNTFS_STATISTICS = uintptr         /* winioctl.h:1647:19 */
+type NTFS_STATISTICS = _NTFS_STATISTICS /* winioctl.h:1673:3 */
+type PNTFS_STATISTICS = uintptr         /* winioctl.h:1673:19 */
 
 type _FILE_OBJECTID_BUFFER = struct {
 	FObjectId [16]BYTE
@@ -59567,54 +60141,54 @@ type _FILE_OBJECTID_BUFFER = struct {
 			FDomainId      [16]BYTE
 		}
 	}
-} /* winioctl.h:1649:9 */
+} /* winioctl.h:1675:9 */
 
-type FILE_OBJECTID_BUFFER = _FILE_OBJECTID_BUFFER /* winioctl.h:1659:3 */
-type PFILE_OBJECTID_BUFFER = uintptr              /* winioctl.h:1659:24 */
+type FILE_OBJECTID_BUFFER = _FILE_OBJECTID_BUFFER /* winioctl.h:1685:3 */
+type PFILE_OBJECTID_BUFFER = uintptr              /* winioctl.h:1685:24 */
 
-type _FILE_SET_SPARSE_BUFFER = struct{ FSetSparse BOOLEAN } /* winioctl.h:1661:9 */
+type _FILE_SET_SPARSE_BUFFER = struct{ FSetSparse BOOLEAN } /* winioctl.h:1687:9 */
 
-type FILE_SET_SPARSE_BUFFER = _FILE_SET_SPARSE_BUFFER /* winioctl.h:1663:3 */
-type PFILE_SET_SPARSE_BUFFER = uintptr                /* winioctl.h:1663:26 */
+type FILE_SET_SPARSE_BUFFER = _FILE_SET_SPARSE_BUFFER /* winioctl.h:1689:3 */
+type PFILE_SET_SPARSE_BUFFER = uintptr                /* winioctl.h:1689:26 */
 
 type _FILE_ZERO_DATA_INFORMATION = struct {
 	FFileOffset      LARGE_INTEGER
 	FBeyondFinalZero LARGE_INTEGER
-} /* winioctl.h:1665:9 */
+} /* winioctl.h:1691:9 */
 
-type FILE_ZERO_DATA_INFORMATION = _FILE_ZERO_DATA_INFORMATION /* winioctl.h:1668:3 */
-type PFILE_ZERO_DATA_INFORMATION = uintptr                    /* winioctl.h:1668:30 */
+type FILE_ZERO_DATA_INFORMATION = _FILE_ZERO_DATA_INFORMATION /* winioctl.h:1694:3 */
+type PFILE_ZERO_DATA_INFORMATION = uintptr                    /* winioctl.h:1694:30 */
 
 type _FILE_ALLOCATED_RANGE_BUFFER = struct {
 	FFileOffset LARGE_INTEGER
 	FLength     LARGE_INTEGER
-} /* winioctl.h:1670:9 */
+} /* winioctl.h:1696:9 */
 
-type FILE_ALLOCATED_RANGE_BUFFER = _FILE_ALLOCATED_RANGE_BUFFER /* winioctl.h:1673:3 */
-type PFILE_ALLOCATED_RANGE_BUFFER = uintptr                     /* winioctl.h:1673:31 */
+type FILE_ALLOCATED_RANGE_BUFFER = _FILE_ALLOCATED_RANGE_BUFFER /* winioctl.h:1699:3 */
+type PFILE_ALLOCATED_RANGE_BUFFER = uintptr                     /* winioctl.h:1699:31 */
 
 type _ENCRYPTION_BUFFER = struct {
 	FEncryptionOperation DWORD
 	FPrivate             [1]BYTE
-	_                    [3]byte
-} /* winioctl.h:1675:9 */
+	F__ccgo_pad1         [3]byte
+} /* winioctl.h:1701:9 */
 
-type ENCRYPTION_BUFFER = _ENCRYPTION_BUFFER /* winioctl.h:1678:3 */
-type PENCRYPTION_BUFFER = uintptr           /* winioctl.h:1678:21 */
+type ENCRYPTION_BUFFER = _ENCRYPTION_BUFFER /* winioctl.h:1704:3 */
+type PENCRYPTION_BUFFER = uintptr           /* winioctl.h:1704:21 */
 
-type _DECRYPTION_STATUS_BUFFER = struct{ FNoEncryptedStreams BOOLEAN } /* winioctl.h:1687:9 */
+type _DECRYPTION_STATUS_BUFFER = struct{ FNoEncryptedStreams BOOLEAN } /* winioctl.h:1713:9 */
 
-type DECRYPTION_STATUS_BUFFER = _DECRYPTION_STATUS_BUFFER /* winioctl.h:1689:3 */
-type PDECRYPTION_STATUS_BUFFER = uintptr                  /* winioctl.h:1689:28 */
+type DECRYPTION_STATUS_BUFFER = _DECRYPTION_STATUS_BUFFER /* winioctl.h:1715:3 */
+type PDECRYPTION_STATUS_BUFFER = uintptr                  /* winioctl.h:1715:28 */
 
 type _REQUEST_RAW_ENCRYPTED_DATA = struct {
-	FFileOffset LONGLONG
-	FLength     DWORD
-	_           [4]byte
-} /* winioctl.h:1694:9 */
+	FFileOffset  LONGLONG
+	FLength      DWORD
+	F__ccgo_pad1 [4]byte
+} /* winioctl.h:1720:9 */
 
-type REQUEST_RAW_ENCRYPTED_DATA = _REQUEST_RAW_ENCRYPTED_DATA /* winioctl.h:1697:3 */
-type PREQUEST_RAW_ENCRYPTED_DATA = uintptr                    /* winioctl.h:1697:30 */
+type REQUEST_RAW_ENCRYPTED_DATA = _REQUEST_RAW_ENCRYPTED_DATA /* winioctl.h:1723:3 */
+type PREQUEST_RAW_ENCRYPTED_DATA = uintptr                    /* winioctl.h:1723:30 */
 
 type _ENCRYPTED_DATA_INFO = struct {
 	FStartingFileOffset         DWORDLONG
@@ -59628,54 +60202,54 @@ type _ENCRYPTED_DATA_INFO = struct {
 	FEncryptionFormat           BYTE
 	FNumberOfDataBlocks         WORD
 	FDataBlockSize              [1]DWORD
-} /* winioctl.h:1699:9 */
+} /* winioctl.h:1725:9 */
 
-type ENCRYPTED_DATA_INFO = _ENCRYPTED_DATA_INFO /* winioctl.h:1711:3 */
-type PENCRYPTED_DATA_INFO = uintptr             /* winioctl.h:1712:29 */
+type ENCRYPTED_DATA_INFO = _ENCRYPTED_DATA_INFO /* winioctl.h:1737:3 */
+type PENCRYPTED_DATA_INFO = uintptr             /* winioctl.h:1738:29 */
 
 type _PLEX_READ_DATA_REQUEST = struct {
 	FByteOffset LARGE_INTEGER
 	FByteLength DWORD
 	FPlexNumber DWORD
-} /* winioctl.h:1714:9 */
+} /* winioctl.h:1740:9 */
 
-type PLEX_READ_DATA_REQUEST = _PLEX_READ_DATA_REQUEST /* winioctl.h:1718:3 */
-type PPLEX_READ_DATA_REQUEST = uintptr                /* winioctl.h:1718:26 */
+type PLEX_READ_DATA_REQUEST = _PLEX_READ_DATA_REQUEST /* winioctl.h:1744:3 */
+type PPLEX_READ_DATA_REQUEST = uintptr                /* winioctl.h:1744:26 */
 
 type _SI_COPYFILE = struct {
 	FSourceFileNameLength      DWORD
 	FDestinationFileNameLength DWORD
 	FFlags                     DWORD
 	FFileNameBuffer            [1]WCHAR
-	_                          [2]byte
-} /* winioctl.h:1720:9 */
+	F__ccgo_pad1               [2]byte
+} /* winioctl.h:1746:9 */
 
-type SI_COPYFILE = _SI_COPYFILE /* winioctl.h:1725:3 */
-type PSI_COPYFILE = uintptr     /* winioctl.h:1725:15 */
+type SI_COPYFILE = _SI_COPYFILE /* winioctl.h:1751:3 */
+type PSI_COPYFILE = uintptr     /* winioctl.h:1751:15 */
 
 type _STORAGE_DESCRIPTOR_HEADER = struct {
 	FVersion DWORD
 	FSize    DWORD
-} /* winioctl.h:1731:9 */
+} /* winioctl.h:1757:9 */
 
-type STORAGE_DESCRIPTOR_HEADER = _STORAGE_DESCRIPTOR_HEADER /* winioctl.h:1734:3 */
-type PSTORAGE_DESCRIPTOR_HEADER = uintptr                   /* winioctl.h:1734:30 */
+type STORAGE_DESCRIPTOR_HEADER = _STORAGE_DESCRIPTOR_HEADER /* winioctl.h:1760:3 */
+type PSTORAGE_DESCRIPTOR_HEADER = uintptr                   /* winioctl.h:1760:30 */
 
-type STORAGE_PROPERTY_ID = uint32   /* winioctl.h:1746:3 */
-type PSTORAGE_PROPERTY_ID = uintptr /* winioctl.h:1746:24 */
+type STORAGE_PROPERTY_ID = uint32   /* winioctl.h:1772:3 */
+type PSTORAGE_PROPERTY_ID = uintptr /* winioctl.h:1772:24 */
 
-type STORAGE_QUERY_TYPE = uint32   /* winioctl.h:1753:3 */
-type PSTORAGE_QUERY_TYPE = uintptr /* winioctl.h:1753:23 */
+type STORAGE_QUERY_TYPE = uint32   /* winioctl.h:1779:3 */
+type PSTORAGE_QUERY_TYPE = uintptr /* winioctl.h:1779:23 */
 
 type _STORAGE_PROPERTY_QUERY = struct {
 	FPropertyId           STORAGE_PROPERTY_ID
 	FQueryType            STORAGE_QUERY_TYPE
 	FAdditionalParameters [1]BYTE
-	_                     [3]byte
-} /* winioctl.h:1755:9 */
+	F__ccgo_pad1          [3]byte
+} /* winioctl.h:1781:9 */
 
-type STORAGE_PROPERTY_QUERY = _STORAGE_PROPERTY_QUERY /* winioctl.h:1759:3 */
-type PSTORAGE_PROPERTY_QUERY = uintptr                /* winioctl.h:1759:27 */
+type STORAGE_PROPERTY_QUERY = _STORAGE_PROPERTY_QUERY /* winioctl.h:1785:3 */
+type PSTORAGE_PROPERTY_QUERY = uintptr                /* winioctl.h:1785:27 */
 
 type _STORAGE_DEVICE_DESCRIPTOR = struct {
 	FVersion               DWORD
@@ -59691,11 +60265,11 @@ type _STORAGE_DEVICE_DESCRIPTOR = struct {
 	FBusType               STORAGE_BUS_TYPE
 	FRawPropertiesLength   DWORD
 	FRawDeviceProperties   [1]BYTE
-	_                      [3]byte
-} /* winioctl.h:1761:9 */
+	F__ccgo_pad1           [3]byte
+} /* winioctl.h:1787:9 */
 
-type STORAGE_DEVICE_DESCRIPTOR = _STORAGE_DEVICE_DESCRIPTOR /* winioctl.h:1775:3 */
-type PSTORAGE_DEVICE_DESCRIPTOR = uintptr                   /* winioctl.h:1775:30 */
+type STORAGE_DEVICE_DESCRIPTOR = _STORAGE_DEVICE_DESCRIPTOR /* winioctl.h:1801:3 */
+type PSTORAGE_DEVICE_DESCRIPTOR = uintptr                   /* winioctl.h:1801:30 */
 
 type _STORAGE_ADAPTER_DESCRIPTOR = struct {
 	FVersion               DWORD
@@ -59708,49 +60282,49 @@ type _STORAGE_ADAPTER_DESCRIPTOR = struct {
 	FCommandQueueing       BOOLEAN
 	FAcceleratedTransfer   BOOLEAN
 	FBusType               BYTE
-	_                      [1]byte
+	F__ccgo_pad1           [1]byte
 	FBusMajorVersion       WORD
 	FBusMinorVersion       WORD
-	_                      [2]byte
-} /* winioctl.h:1777:9 */
+	F__ccgo_pad2           [2]byte
+} /* winioctl.h:1803:9 */
 
-type STORAGE_ADAPTER_DESCRIPTOR = _STORAGE_ADAPTER_DESCRIPTOR /* winioctl.h:1790:3 */
-type PSTORAGE_ADAPTER_DESCRIPTOR = uintptr                    /* winioctl.h:1790:31 */
+type STORAGE_ADAPTER_DESCRIPTOR = _STORAGE_ADAPTER_DESCRIPTOR /* winioctl.h:1816:3 */
+type PSTORAGE_ADAPTER_DESCRIPTOR = uintptr                    /* winioctl.h:1816:31 */
 
 type _STORAGE_DEVICE_ID_DESCRIPTOR = struct {
 	FVersion             DWORD
 	FSize                DWORD
 	FNumberOfIdentifiers DWORD
 	FIdentifiers         [1]BYTE
-	_                    [3]byte
-} /* winioctl.h:1792:9 */
+	F__ccgo_pad1         [3]byte
+} /* winioctl.h:1818:9 */
 
-type STORAGE_DEVICE_ID_DESCRIPTOR = _STORAGE_DEVICE_ID_DESCRIPTOR /* winioctl.h:1797:3 */
-type PSTORAGE_DEVICE_ID_DESCRIPTOR = uintptr                      /* winioctl.h:1797:33 */
+type STORAGE_DEVICE_ID_DESCRIPTOR = _STORAGE_DEVICE_ID_DESCRIPTOR /* winioctl.h:1823:3 */
+type PSTORAGE_DEVICE_ID_DESCRIPTOR = uintptr                      /* winioctl.h:1823:33 */
 
-type _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION = struct{ FGptAttributes ULONGLONG } /* winioctl.h:1799:9 */
+type _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION = struct{ FGptAttributes ULONGLONG } /* winioctl.h:1825:9 */
 
-type VOLUME_GET_GPT_ATTRIBUTES_INFORMATION = _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION /* winioctl.h:1801:3 */
-type PVOLUME_GET_GPT_ATTRIBUTES_INFORMATION = uintptr                               /* winioctl.h:1801:42 */
+type VOLUME_GET_GPT_ATTRIBUTES_INFORMATION = _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION /* winioctl.h:1827:3 */
+type PVOLUME_GET_GPT_ATTRIBUTES_INFORMATION = uintptr                               /* winioctl.h:1827:42 */
 
 type _DISK_EXTENT = struct {
 	FDiskNumber     DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FStartingOffset LARGE_INTEGER
 	FExtentLength   LARGE_INTEGER
-} /* winioctl.h:2318:9 */
+} /* winioctl.h:2344:9 */
 
-type DISK_EXTENT = _DISK_EXTENT /* winioctl.h:2322:3 */
-type PDISK_EXTENT = uintptr     /* winioctl.h:2322:15 */
+type DISK_EXTENT = _DISK_EXTENT /* winioctl.h:2348:3 */
+type PDISK_EXTENT = uintptr     /* winioctl.h:2348:15 */
 
 type _VOLUME_DISK_EXTENTS = struct {
 	FNumberOfDiskExtents DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FExtents             [1]DISK_EXTENT
-} /* winioctl.h:2324:9 */
+} /* winioctl.h:2350:9 */
 
-type VOLUME_DISK_EXTENTS = _VOLUME_DISK_EXTENTS /* winioctl.h:2327:3 */
-type PVOLUME_DISK_EXTENTS = uintptr             /* winioctl.h:2327:23 */
+type VOLUME_DISK_EXTENTS = _VOLUME_DISK_EXTENTS /* winioctl.h:2353:3 */
+type PVOLUME_DISK_EXTENTS = uintptr             /* winioctl.h:2353:23 */
 
 // *
 // This file has no copyright assigned and is placed in the Public Domain.
@@ -59784,11 +60358,11 @@ type SCARD_T0_COMMAND = struct {
 type LPSCARD_T0_COMMAND = uintptr /* winsmcrd.h:170:22 */
 
 type SCARD_T0_REQUEST = struct {
-	FioRequest SCARD_IO_REQUEST
-	FbSw1      BYTE
-	FbSw2      BYTE
-	F__10      struct{ FCmdBytes SCARD_T0_COMMAND }
-	_          [1]byte
+	FioRequest   SCARD_IO_REQUEST
+	FbSw1        BYTE
+	FbSw2        BYTE
+	F__10        struct{ FCmdBytes SCARD_T0_COMMAND }
+	F__ccgo_pad1 [1]byte
 } /* winsmcrd.h:179:5 */
 
 type PSCARD_T0_REQUEST = uintptr  /* winsmcrd.h:181:28 */
@@ -59855,16 +60429,16 @@ type LPOCNDSCPROC = uintptr   /* winscard.h:223:16 */
 
 type OPENCARD_SEARCH_CRITERIAA = struct {
 	FdwStructSize         DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FlpstrGroupNames      LPSTR
 	FnMaxGroupNames       DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FrgguidInterfaces     LPCGUID
 	FcguidInterfaces      DWORD
-	_                     [4]byte
+	F__ccgo_pad3          [4]byte
 	FlpstrCardNames       LPSTR
 	FnMaxCardNames        DWORD
-	_                     [4]byte
+	F__ccgo_pad4          [4]byte
 	FlpfnCheck            LPOCNCHKPROC
 	FlpfnConnect          LPOCNCONNPROCA
 	FlpfnDisconnect       LPOCNDSCPROC
@@ -59877,16 +60451,16 @@ type LPOPENCARD_SEARCH_CRITERIAA = uintptr /* winscard.h:239:59 */
 
 type OPENCARD_SEARCH_CRITERIAW = struct {
 	FdwStructSize         DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FlpstrGroupNames      LPWSTR
 	FnMaxGroupNames       DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FrgguidInterfaces     LPCGUID
 	FcguidInterfaces      DWORD
-	_                     [4]byte
+	F__ccgo_pad3          [4]byte
 	FlpstrCardNames       LPWSTR
 	FnMaxCardNames        DWORD
-	_                     [4]byte
+	F__ccgo_pad4          [4]byte
 	FlpfnCheck            LPOCNCHKPROC
 	FlpfnConnect          LPOCNCONNPROCW
 	FlpfnDisconnect       LPOCNDSCPROC
@@ -59903,11 +60477,11 @@ type LPOPENCARD_SEARCH_CRITERIA = LPOPENCARD_SEARCH_CRITERIAA /* winscard.h:259:
 
 type OPENCARDNAME_EXA = struct {
 	FdwStructSize            DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FhSCardContext           SCARDCONTEXT
 	FhwndOwner               HWND
 	FdwFlags                 DWORD
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FlpstrTitle              LPCSTR
 	FlpstrSearchDesc         LPCSTR
 	FhIcon                   HICON
@@ -59918,7 +60492,7 @@ type OPENCARDNAME_EXA = struct {
 	FdwPreferredProtocols    DWORD
 	FlpstrRdr                LPSTR
 	FnMaxRdr                 DWORD
-	_                        [4]byte
+	F__ccgo_pad3             [4]byte
 	FlpstrCard               LPSTR
 	FnMaxCard                DWORD
 	FdwActiveProtocol        DWORD
@@ -59929,11 +60503,11 @@ type LPOPENCARDNAME_EXA = uintptr /* winscard.h:280:41 */
 
 type OPENCARDNAME_EXW = struct {
 	FdwStructSize            DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FhSCardContext           SCARDCONTEXT
 	FhwndOwner               HWND
 	FdwFlags                 DWORD
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FlpstrTitle              LPCWSTR
 	FlpstrSearchDesc         LPCWSTR
 	FhIcon                   HICON
@@ -59944,7 +60518,7 @@ type OPENCARDNAME_EXW = struct {
 	FdwPreferredProtocols    DWORD
 	FlpstrRdr                LPWSTR
 	FnMaxRdr                 DWORD
-	_                        [4]byte
+	F__ccgo_pad3             [4]byte
 	FlpstrCard               LPWSTR
 	FnMaxCard                DWORD
 	FdwActiveProtocol        DWORD
@@ -59959,32 +60533,32 @@ type LPOPENCARDNAME_EX = LPOPENCARDNAME_EXA /* winscard.h:305:3 */
 
 type OPENCARDNAMEA = struct {
 	FdwStructSize         DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FhwndOwner            HWND
 	FhSCardContext        SCARDCONTEXT
 	FlpstrGroupNames      LPSTR
 	FnMaxGroupNames       DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FlpstrCardNames       LPSTR
 	FnMaxCardNames        DWORD
-	_                     [4]byte
+	F__ccgo_pad3          [4]byte
 	FrgguidInterfaces     LPCGUID
 	FcguidInterfaces      DWORD
-	_                     [4]byte
+	F__ccgo_pad4          [4]byte
 	FlpstrRdr             LPSTR
 	FnMaxRdr              DWORD
-	_                     [4]byte
+	F__ccgo_pad5          [4]byte
 	FlpstrCard            LPSTR
 	FnMaxCard             DWORD
-	_                     [4]byte
+	F__ccgo_pad6          [4]byte
 	FlpstrTitle           LPCSTR
 	FdwFlags              DWORD
-	_                     [4]byte
+	F__ccgo_pad7          [4]byte
 	FpvUserData           LPVOID
 	FdwShareMode          DWORD
 	FdwPreferredProtocols DWORD
 	FdwActiveProtocol     DWORD
-	_                     [4]byte
+	F__ccgo_pad8          [4]byte
 	FlpfnConnect          LPOCNCONNPROCA
 	FlpfnCheck            LPOCNCHKPROC
 	FlpfnDisconnect       LPOCNDSCPROC
@@ -59995,32 +60569,32 @@ type LPOPENCARDNAMEA = uintptr /* winscard.h:343:35 */
 
 type OPENCARDNAMEW = struct {
 	FdwStructSize         DWORD
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	FhwndOwner            HWND
 	FhSCardContext        SCARDCONTEXT
 	FlpstrGroupNames      LPWSTR
 	FnMaxGroupNames       DWORD
-	_                     [4]byte
+	F__ccgo_pad2          [4]byte
 	FlpstrCardNames       LPWSTR
 	FnMaxCardNames        DWORD
-	_                     [4]byte
+	F__ccgo_pad3          [4]byte
 	FrgguidInterfaces     LPCGUID
 	FcguidInterfaces      DWORD
-	_                     [4]byte
+	F__ccgo_pad4          [4]byte
 	FlpstrRdr             LPWSTR
 	FnMaxRdr              DWORD
-	_                     [4]byte
+	F__ccgo_pad5          [4]byte
 	FlpstrCard            LPWSTR
 	FnMaxCard             DWORD
-	_                     [4]byte
+	F__ccgo_pad6          [4]byte
 	FlpstrTitle           LPCWSTR
 	FdwFlags              DWORD
-	_                     [4]byte
+	F__ccgo_pad7          [4]byte
 	FpvUserData           LPVOID
 	FdwShareMode          DWORD
 	FdwPreferredProtocols DWORD
 	FdwActiveProtocol     DWORD
-	_                     [4]byte
+	F__ccgo_pad8          [4]byte
 	FlpfnConnect          LPOCNCONNPROCW
 	FlpfnCheck            LPOCNCHKPROC
 	FlpfnDisconnect       LPOCNDSCPROC
@@ -60172,18 +60746,18 @@ type LPCPROPSHEETPAGEW = LPCPROPSHEETPAGEW_V3 /* prsht.h:179:32 */
 type PFNPROPSHEETCALLBACK = uintptr /* prsht.h:227:15 */
 
 type _PROPSHEETHEADERA = struct {
-	FdwSize     DWORD
-	FdwFlags    DWORD
-	FhwndParent HWND
-	FhInstance  HINSTANCE
-	Fu          struct{ FhIcon HICON }
-	FpszCaption LPCSTR
-	FnPages     UINT
-	_           [4]byte
-	Fu2         struct {
-		_           [0]uint64
-		FnStartPage UINT
-		_           [4]byte
+	FdwSize      DWORD
+	FdwFlags     DWORD
+	FhwndParent  HWND
+	FhInstance   HINSTANCE
+	Fu           struct{ FhIcon HICON }
+	FpszCaption  LPCSTR
+	FnPages      UINT
+	F__ccgo_pad1 [4]byte
+	Fu2          struct {
+		F__ccgo_pad1 [0]uint64
+		FnStartPage  UINT
+		F__ccgo_pad2 [4]byte
 	}
 	Fu3           struct{ Fppsp LPCPROPSHEETPAGEA }
 	FpfnCallback  PFNPROPSHEETCALLBACK
@@ -60198,18 +60772,18 @@ type LPPROPSHEETHEADERA = uintptr         /* prsht.h:264:22 */
 type LPCPROPSHEETHEADERA = uintptr /* prsht.h:266:34 */
 
 type _PROPSHEETHEADERW = struct {
-	FdwSize     DWORD
-	FdwFlags    DWORD
-	FhwndParent HWND
-	FhInstance  HINSTANCE
-	Fu          struct{ FhIcon HICON }
-	FpszCaption LPCWSTR
-	FnPages     UINT
-	_           [4]byte
-	Fu2         struct {
-		_           [0]uint64
-		FnStartPage UINT
-		_           [4]byte
+	FdwSize      DWORD
+	FdwFlags     DWORD
+	FhwndParent  HWND
+	FhInstance   HINSTANCE
+	Fu           struct{ FhIcon HICON }
+	FpszCaption  LPCWSTR
+	FnPages      UINT
+	F__ccgo_pad1 [4]byte
+	Fu2          struct {
+		F__ccgo_pad1 [0]uint64
+		FnStartPage  UINT
+		F__ccgo_pad2 [4]byte
 	}
 	Fu3           struct{ Fppsp LPCPROPSHEETPAGEW }
 	FpfnCallback  PFNPROPSHEETCALLBACK
@@ -60241,7 +60815,7 @@ type LPPSHNOTIFY = uintptr  /* prsht.h:327:15 */
 
 type _PRINTER_INFO_1A = struct {
 	FFlags        DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpDescription LPSTR
 	FpName        LPSTR
 	FpComment     LPSTR
@@ -60258,7 +60832,7 @@ type LPPRINTER_INFO_1A = uintptr        /* winspool.h:24:39 */
 
 type _PRINTER_INFO_1W = struct {
 	FFlags        DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpDescription LPWSTR
 	FpName        LPWSTR
 	FpComment     LPWSTR
@@ -60342,7 +60916,7 @@ type _PRINTER_INFO_4A = struct {
 	FpPrinterName LPSTR
 	FpServerName  LPSTR
 	FAttributes   DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 } /* winspool.h:93:11 */
 
 type PRINTER_INFO_4A = _PRINTER_INFO_4A /* winspool.h:97:5 */
@@ -60353,7 +60927,7 @@ type _PRINTER_INFO_4W = struct {
 	FpPrinterName LPWSTR
 	FpServerName  LPWSTR
 	FAttributes   DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 } /* winspool.h:99:11 */
 
 type PRINTER_INFO_4W = _PRINTER_INFO_4W /* winspool.h:103:5 */
@@ -60370,7 +60944,7 @@ type _PRINTER_INFO_5A = struct {
 	FAttributes               DWORD
 	FDeviceNotSelectedTimeout DWORD
 	FTransmissionRetryTimeout DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 } /* winspool.h:109:11 */
 
 type PRINTER_INFO_5A = _PRINTER_INFO_5A /* winspool.h:115:5 */
@@ -60383,7 +60957,7 @@ type _PRINTER_INFO_5W = struct {
 	FAttributes               DWORD
 	FDeviceNotSelectedTimeout DWORD
 	FTransmissionRetryTimeout DWORD
-	_                         [4]byte
+	F__ccgo_pad1              [4]byte
 } /* winspool.h:117:11 */
 
 type PRINTER_INFO_5W = _PRINTER_INFO_5W /* winspool.h:123:5 */
@@ -60403,7 +60977,7 @@ type LPPRINTER_INFO_6 = uintptr       /* winspool.h:131:37 */
 type _PRINTER_INFO_7A = struct {
 	FpszObjectGUID LPSTR
 	FdwAction      DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winspool.h:133:11 */
 
 type PRINTER_INFO_7A = _PRINTER_INFO_7A /* winspool.h:136:5 */
@@ -60413,7 +60987,7 @@ type LPPRINTER_INFO_7A = uintptr        /* winspool.h:136:39 */
 type _PRINTER_INFO_7W = struct {
 	FpszObjectGUID LPWSTR
 	FdwAction      DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winspool.h:138:11 */
 
 type PRINTER_INFO_7W = _PRINTER_INFO_7W /* winspool.h:141:5 */
@@ -60458,7 +61032,7 @@ type LPPRINTER_INFO_9 = LPPRINTER_INFO_9A /* winspool.h:175:3 */
 
 type _JOB_INFO_1A = struct {
 	FJobId        DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpPrinterName LPSTR
 	FpMachineName LPSTR
 	FpUserName    LPSTR
@@ -60471,7 +61045,7 @@ type _JOB_INFO_1A = struct {
 	FTotalPages   DWORD
 	FPagesPrinted DWORD
 	FSubmitted    SYSTEMTIME
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 } /* winspool.h:232:11 */
 
 type JOB_INFO_1A = _JOB_INFO_1A /* winspool.h:246:5 */
@@ -60480,7 +61054,7 @@ type LPJOB_INFO_1A = uintptr    /* winspool.h:246:31 */
 
 type _JOB_INFO_1W = struct {
 	FJobId        DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpPrinterName LPWSTR
 	FpMachineName LPWSTR
 	FpUserName    LPWSTR
@@ -60493,7 +61067,7 @@ type _JOB_INFO_1W = struct {
 	FTotalPages   DWORD
 	FPagesPrinted DWORD
 	FSubmitted    SYSTEMTIME
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 } /* winspool.h:248:11 */
 
 type JOB_INFO_1W = _JOB_INFO_1W /* winspool.h:262:5 */
@@ -60506,7 +61080,7 @@ type LPJOB_INFO_1 = LPJOB_INFO_1A /* winspool.h:266:3 */
 
 type _JOB_INFO_2A = struct {
 	FJobId               DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FpPrinterName        LPSTR
 	FpMachineName        LPSTR
 	FpUserName           LPSTR
@@ -60529,7 +61103,7 @@ type _JOB_INFO_2A = struct {
 	FSubmitted           SYSTEMTIME
 	FTime                DWORD
 	FPagesPrinted        DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 } /* winspool.h:268:11 */
 
 type JOB_INFO_2A = _JOB_INFO_2A /* winspool.h:292:5 */
@@ -60538,7 +61112,7 @@ type LPJOB_INFO_2A = uintptr    /* winspool.h:292:31 */
 
 type _JOB_INFO_2W = struct {
 	FJobId               DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FpPrinterName        LPWSTR
 	FpMachineName        LPWSTR
 	FpUserName           LPWSTR
@@ -60561,7 +61135,7 @@ type _JOB_INFO_2W = struct {
 	FSubmitted           SYSTEMTIME
 	FTime                DWORD
 	FPagesPrinted        DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 } /* winspool.h:294:11 */
 
 type JOB_INFO_2W = _JOB_INFO_2W /* winspool.h:318:5 */
@@ -60583,9 +61157,9 @@ type PJOB_INFO_3 = uintptr    /* winspool.h:328:16 */
 type LPJOB_INFO_3 = uintptr   /* winspool.h:328:29 */
 
 type _ADDJOB_INFO_1A = struct {
-	FPath  LPSTR
-	FJobId DWORD
-	_      [4]byte
+	FPath        LPSTR
+	FJobId       DWORD
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:354:11 */
 
 type ADDJOB_INFO_1A = _ADDJOB_INFO_1A /* winspool.h:357:5 */
@@ -60593,9 +61167,9 @@ type PADDJOB_INFO_1A = uintptr        /* winspool.h:357:20 */
 type LPADDJOB_INFO_1A = uintptr       /* winspool.h:357:37 */
 
 type _ADDJOB_INFO_1W = struct {
-	FPath  LPWSTR
-	FJobId DWORD
-	_      [4]byte
+	FPath        LPWSTR
+	FJobId       DWORD
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:359:11 */
 
 type ADDJOB_INFO_1W = _ADDJOB_INFO_1W /* winspool.h:362:5 */
@@ -60624,7 +61198,7 @@ type LPDRIVER_INFO_1 = LPDRIVER_INFO_1A /* winspool.h:378:3 */
 
 type _DRIVER_INFO_2A = struct {
 	FcVersion     DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpName        LPSTR
 	FpEnvironment LPSTR
 	FpDriverPath  LPSTR
@@ -60638,7 +61212,7 @@ type LPDRIVER_INFO_2A = uintptr       /* winspool.h:387:37 */
 
 type _DRIVER_INFO_2W = struct {
 	FcVersion     DWORD
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FpName        LPWSTR
 	FpEnvironment LPWSTR
 	FpDriverPath  LPWSTR
@@ -60656,7 +61230,7 @@ type LPDRIVER_INFO_2 = LPDRIVER_INFO_2A /* winspool.h:400:3 */
 
 type _DRIVER_INFO_3A = struct {
 	FcVersion         DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FpName            LPSTR
 	FpEnvironment     LPSTR
 	FpDriverPath      LPSTR
@@ -60674,7 +61248,7 @@ type LPDRIVER_INFO_3A = uintptr       /* winspool.h:413:37 */
 
 type _DRIVER_INFO_3W = struct {
 	FcVersion         DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FpName            LPWSTR
 	FpEnvironment     LPWSTR
 	FpDriverPath      LPWSTR
@@ -60696,7 +61270,7 @@ type LPDRIVER_INFO_3 = LPDRIVER_INFO_3A /* winspool.h:430:3 */
 
 type _DRIVER_INFO_4A = struct {
 	FcVersion          DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpName             LPSTR
 	FpEnvironment      LPSTR
 	FpDriverPath       LPSTR
@@ -60715,7 +61289,7 @@ type LPDRIVER_INFO_4A = uintptr       /* winspool.h:444:37 */
 
 type _DRIVER_INFO_4W = struct {
 	FcVersion          DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpName             LPWSTR
 	FpEnvironment      LPWSTR
 	FpDriverPath       LPWSTR
@@ -60738,7 +61312,7 @@ type LPDRIVER_INFO_4 = LPDRIVER_INFO_4A /* winspool.h:462:3 */
 
 type _DRIVER_INFO_5A = struct {
 	FcVersion           DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FpName              LPSTR
 	FpEnvironment       LPSTR
 	FpDriverPath        LPSTR
@@ -60747,7 +61321,7 @@ type _DRIVER_INFO_5A = struct {
 	FdwDriverAttributes DWORD
 	FdwConfigVersion    DWORD
 	FdwDriverVersion    DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 } /* winspool.h:464:11 */
 
 type DRIVER_INFO_5A = _DRIVER_INFO_5A /* winspool.h:474:5 */
@@ -60756,7 +61330,7 @@ type LPDRIVER_INFO_5A = uintptr       /* winspool.h:474:37 */
 
 type _DRIVER_INFO_5W = struct {
 	FcVersion           DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FpName              LPWSTR
 	FpEnvironment       LPWSTR
 	FpDriverPath        LPWSTR
@@ -60765,7 +61339,7 @@ type _DRIVER_INFO_5W = struct {
 	FdwDriverAttributes DWORD
 	FdwConfigVersion    DWORD
 	FdwDriverVersion    DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 } /* winspool.h:476:11 */
 
 type DRIVER_INFO_5W = _DRIVER_INFO_5W /* winspool.h:486:5 */
@@ -60778,7 +61352,7 @@ type LPDRIVER_INFO_5 = LPDRIVER_INFO_5A /* winspool.h:490:3 */
 
 type _DRIVER_INFO_6A = struct {
 	FcVersion          DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpName             LPSTR
 	FpEnvironment      LPSTR
 	FpDriverPath       LPSTR
@@ -60803,7 +61377,7 @@ type LPDRIVER_INFO_6A = uintptr       /* winspool.h:510:37 */
 
 type _DRIVER_INFO_6W = struct {
 	FcVersion          DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FpName             LPWSTR
 	FpEnvironment      LPWSTR
 	FpDriverPath       LPWSTR
@@ -60856,7 +61430,7 @@ type LPDOC_INFO_1 = LPDOC_INFO_1A /* winspool.h:563:3 */
 
 type _FORM_INFO_1A = struct {
 	FFlags         DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpName         LPSTR
 	FSize          SIZEL
 	FImageableArea RECTL
@@ -60868,7 +61442,7 @@ type LPFORM_INFO_1A = uintptr     /* winspool.h:570:33 */
 
 type _FORM_INFO_1W = struct {
 	FFlags         DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FpName         LPWSTR
 	FSize          SIZEL
 	FImageableArea RECTL
@@ -60915,7 +61489,7 @@ type _DOC_INFO_3A = struct {
 	FpOutputFile LPSTR
 	FpDatatype   LPSTR
 	FdwFlags     DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:606:11 */
 
 type DOC_INFO_3A = _DOC_INFO_3A /* winspool.h:611:5 */
@@ -60927,7 +61501,7 @@ type _DOC_INFO_3W = struct {
 	FpOutputFile LPWSTR
 	FpDatatype   LPWSTR
 	FdwFlags     DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:613:11 */
 
 type DOC_INFO_3W = _DOC_INFO_3W /* winspool.h:618:5 */
@@ -61008,11 +61582,11 @@ type PPORT_INFO_2 = PPORT_INFO_2A   /* winspool.h:680:3 */
 type LPPORT_INFO_2 = LPPORT_INFO_2A /* winspool.h:681:3 */
 
 type _PORT_INFO_3A = struct {
-	FdwStatus   DWORD
-	_           [4]byte
-	FpszStatus  LPSTR
-	FdwSeverity DWORD
-	_           [4]byte
+	FdwStatus    DWORD
+	F__ccgo_pad1 [4]byte
+	FpszStatus   LPSTR
+	FdwSeverity  DWORD
+	F__ccgo_pad2 [4]byte
 } /* winspool.h:688:11 */
 
 type PORT_INFO_3A = _PORT_INFO_3A /* winspool.h:692:5 */
@@ -61020,11 +61594,11 @@ type PPORT_INFO_3A = uintptr      /* winspool.h:692:18 */
 type LPPORT_INFO_3A = uintptr     /* winspool.h:692:33 */
 
 type _PORT_INFO_3W = struct {
-	FdwStatus   DWORD
-	_           [4]byte
-	FpszStatus  LPWSTR
-	FdwSeverity DWORD
-	_           [4]byte
+	FdwStatus    DWORD
+	F__ccgo_pad1 [4]byte
+	FpszStatus   LPWSTR
+	FdwSeverity  DWORD
+	F__ccgo_pad2 [4]byte
 } /* winspool.h:694:11 */
 
 type PORT_INFO_3W = _PORT_INFO_3W /* winspool.h:698:5 */
@@ -61095,7 +61669,7 @@ type _PRINTER_DEFAULTSA = struct {
 	FpDatatype     LPSTR
 	FpDevMode      LPDEVMODEA
 	FDesiredAccess ACCESS_MASK
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winspool.h:761:11 */
 
 type PRINTER_DEFAULTSA = _PRINTER_DEFAULTSA /* winspool.h:765:5 */
@@ -61106,7 +61680,7 @@ type _PRINTER_DEFAULTSW = struct {
 	FpDatatype     LPWSTR
 	FpDevMode      LPDEVMODEW
 	FDesiredAccess ACCESS_MASK
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winspool.h:767:11 */
 
 type PRINTER_DEFAULTSW = _PRINTER_DEFAULTSW /* winspool.h:771:5 */
@@ -61123,7 +61697,7 @@ type _PRINTER_ENUM_VALUESA = struct {
 	FdwType      DWORD
 	FpData       LPBYTE
 	FcbData      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:777:11 */
 
 type PRINTER_ENUM_VALUESA = _PRINTER_ENUM_VALUESA /* winspool.h:783:5 */
@@ -61136,7 +61710,7 @@ type _PRINTER_ENUM_VALUESW = struct {
 	FdwType      DWORD
 	FpData       LPBYTE
 	FcbData      DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 } /* winspool.h:785:11 */
 
 type PRINTER_ENUM_VALUESW = _PRINTER_ENUM_VALUESW /* winspool.h:791:5 */
@@ -61161,11 +61735,11 @@ type PPRINTER_NOTIFY_OPTIONS_TYPE = uintptr                     /* winspool.h:10
 type LPPRINTER_NOTIFY_OPTIONS_TYPE = uintptr                    /* winspool.h:1006:63 */
 
 type _PRINTER_NOTIFY_OPTIONS = struct {
-	FVersion DWORD
-	FFlags   DWORD
-	FCount   DWORD
-	_        [4]byte
-	FpTypes  PPRINTER_NOTIFY_OPTIONS_TYPE
+	FVersion     DWORD
+	FFlags       DWORD
+	FCount       DWORD
+	F__ccgo_pad1 [4]byte
+	FpTypes      PPRINTER_NOTIFY_OPTIONS_TYPE
 } /* winspool.h:1010:11 */
 
 type PRINTER_NOTIFY_OPTIONS = _PRINTER_NOTIFY_OPTIONS /* winspool.h:1015:5 */
@@ -61173,15 +61747,15 @@ type PPRINTER_NOTIFY_OPTIONS = uintptr                /* winspool.h:1015:28 */
 type LPPRINTER_NOTIFY_OPTIONS = uintptr               /* winspool.h:1015:53 */
 
 type _PRINTER_NOTIFY_INFO_DATA = struct {
-	FType       WORD
-	FField      WORD
-	FReserved   DWORD
-	FId         DWORD
-	_           [4]byte
-	FNotifyData struct {
-		_        [0]uint64
-		FadwData [2]DWORD
-		_        [8]byte
+	FType        WORD
+	FField       WORD
+	FReserved    DWORD
+	FId          DWORD
+	F__ccgo_pad1 [4]byte
+	FNotifyData  struct {
+		F__ccgo_pad1 [0]uint64
+		FadwData     [2]DWORD
+		F__ccgo_pad2 [8]byte
 	}
 } /* winspool.h:1019:11 */
 
@@ -61190,11 +61764,11 @@ type PPRINTER_NOTIFY_INFO_DATA = uintptr                  /* winspool.h:1031:30
 type LPPRINTER_NOTIFY_INFO_DATA = uintptr                 /* winspool.h:1031:57 */
 
 type _PRINTER_NOTIFY_INFO = struct {
-	FVersion DWORD
-	FFlags   DWORD
-	FCount   DWORD
-	_        [4]byte
-	FaData   [1]PRINTER_NOTIFY_INFO_DATA
+	FVersion     DWORD
+	FFlags       DWORD
+	FCount       DWORD
+	F__ccgo_pad1 [4]byte
+	FaData       [1]PRINTER_NOTIFY_INFO_DATA
 } /* winspool.h:1033:11 */
 
 type PRINTER_NOTIFY_INFO = _PRINTER_NOTIFY_INFO /* winspool.h:1038:5 */
@@ -61202,21 +61776,21 @@ type PPRINTER_NOTIFY_INFO = uintptr             /* winspool.h:1038:25 */
 type LPPRINTER_NOTIFY_INFO = uintptr            /* winspool.h:1038:47 */
 
 type _BINARY_CONTAINER = struct {
-	FcbBuf DWORD
-	_      [4]byte
-	FpData LPBYTE
+	FcbBuf       DWORD
+	F__ccgo_pad1 [4]byte
+	FpData       LPBYTE
 } /* winspool.h:1040:11 */
 
 type BINARY_CONTAINER = _BINARY_CONTAINER /* winspool.h:1043:5 */
 type PBINARY_CONTAINER = uintptr          /* winspool.h:1043:22 */
 
 type _BIDI_DATA = struct {
-	FdwBidiType DWORD
-	_           [4]byte
-	Fu          struct {
-		_      [0]uint64
-		FbData WINBOOL
-		_      [12]byte
+	FdwBidiType  DWORD
+	F__ccgo_pad1 [4]byte
+	Fu           struct {
+		F__ccgo_pad1 [0]uint64
+		FbData       WINBOOL
+		F__ccgo_pad2 [12]byte
 	}
 } /* winspool.h:1045:11 */
 
@@ -61226,7 +61800,7 @@ type LPBIDI_DATA = uintptr  /* winspool.h:1054:27 */
 
 type _BIDI_REQUEST_DATA = struct {
 	FdwReqNumber DWORD
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FpSchema     LPWSTR
 	Fdata        BIDI_DATA
 } /* winspool.h:1056:11 */
@@ -61236,11 +61810,11 @@ type PBIDI_REQUEST_DATA = uintptr           /* winspool.h:1060:24 */
 type LPBIDI_REQUEST_DATA = uintptr          /* winspool.h:1060:45 */
 
 type _BIDI_REQUEST_CONTAINER = struct {
-	FVersion DWORD
-	FFlags   DWORD
-	FCount   DWORD
-	_        [4]byte
-	FaData   [1]BIDI_REQUEST_DATA
+	FVersion     DWORD
+	FFlags       DWORD
+	FCount       DWORD
+	F__ccgo_pad1 [4]byte
+	FaData       [1]BIDI_REQUEST_DATA
 } /* winspool.h:1062:11 */
 
 type BIDI_REQUEST_CONTAINER = _BIDI_REQUEST_CONTAINER /* winspool.h:1067:4 */
@@ -61259,11 +61833,11 @@ type PBIDI_RESPONSE_DATA = uintptr            /* winspool.h:1074:24 */
 type LPBIDI_RESPONSE_DATA = uintptr           /* winspool.h:1074:45 */
 
 type _BIDI_RESPONSE_CONTAINER = struct {
-	FVersion DWORD
-	FFlags   DWORD
-	FCount   DWORD
-	_        [4]byte
-	FaData   [1]BIDI_RESPONSE_DATA
+	FVersion     DWORD
+	FFlags       DWORD
+	FCount       DWORD
+	F__ccgo_pad1 [4]byte
+	FaData       [1]BIDI_RESPONSE_DATA
 } /* winspool.h:1076:11 */
 
 type BIDI_RESPONSE_CONTAINER = _BIDI_RESPONSE_CONTAINER /* winspool.h:1081:5 */
@@ -61321,7 +61895,7 @@ type LPOFNHOOKPROC = uintptr /* commdlg.h:46:20 */
 
 type tagOFN_NT4A = struct {
 	FlStructSize       DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FhwndOwner         HWND
 	FhInstance         HINSTANCE
 	FlpstrFilter       LPCSTR
@@ -61330,10 +61904,10 @@ type tagOFN_NT4A = struct {
 	FnFilterIndex      DWORD
 	FlpstrFile         LPSTR
 	FnMaxFile          DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FlpstrFileTitle    LPSTR
 	FnMaxFileTitle     DWORD
-	_                  [4]byte
+	F__ccgo_pad3       [4]byte
 	FlpstrInitialDir   LPCSTR
 	FlpstrTitle        LPCSTR
 	FFlags             DWORD
@@ -61349,7 +61923,7 @@ type OPENFILENAME_NT4A = tagOFN_NT4A /* commdlg.h:73:5 */
 type LPOPENFILENAME_NT4A = uintptr   /* commdlg.h:73:23 */
 type tagOFN_NT4W = struct {
 	FlStructSize       DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FhwndOwner         HWND
 	FhInstance         HINSTANCE
 	FlpstrFilter       LPCWSTR
@@ -61358,10 +61932,10 @@ type tagOFN_NT4W = struct {
 	FnFilterIndex      DWORD
 	FlpstrFile         LPWSTR
 	FnMaxFile          DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FlpstrFileTitle    LPWSTR
 	FnMaxFileTitle     DWORD
-	_                  [4]byte
+	F__ccgo_pad3       [4]byte
 	FlpstrInitialDir   LPCWSTR
 	FlpstrTitle        LPCWSTR
 	FFlags             DWORD
@@ -61381,7 +61955,7 @@ type LPOPENFILENAME_NT4 = LPOPENFILENAME_NT4A /* commdlg.h:98:3 */
 
 type tagOFNA = struct {
 	FlStructSize       DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FhwndOwner         HWND
 	FhInstance         HINSTANCE
 	FlpstrFilter       LPCSTR
@@ -61390,10 +61964,10 @@ type tagOFNA = struct {
 	FnFilterIndex      DWORD
 	FlpstrFile         LPSTR
 	FnMaxFile          DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FlpstrFileTitle    LPSTR
 	FnMaxFileTitle     DWORD
-	_                  [4]byte
+	F__ccgo_pad3       [4]byte
 	FlpstrInitialDir   LPCSTR
 	FlpstrTitle        LPCSTR
 	FFlags             DWORD
@@ -61412,7 +61986,7 @@ type OPENFILENAMEA = tagOFNA   /* commdlg.h:124:5 */
 type LPOPENFILENAMEA = uintptr /* commdlg.h:124:19 */
 type tagOFNW = struct {
 	FlStructSize       DWORD
-	_                  [4]byte
+	F__ccgo_pad1       [4]byte
 	FhwndOwner         HWND
 	FhInstance         HINSTANCE
 	FlpstrFilter       LPCWSTR
@@ -61421,10 +61995,10 @@ type tagOFNW = struct {
 	FnFilterIndex      DWORD
 	FlpstrFile         LPWSTR
 	FnMaxFile          DWORD
-	_                  [4]byte
+	F__ccgo_pad2       [4]byte
 	FlpstrFileTitle    LPWSTR
 	FnMaxFileTitle     DWORD
-	_                  [4]byte
+	F__ccgo_pad3       [4]byte
 	FlpstrInitialDir   LPCWSTR
 	FlpstrTitle        LPCWSTR
 	FFlags             DWORD
@@ -61493,14 +62067,14 @@ type LPOFNOTIFYEX = LPOFNOTIFYEXA /* commdlg.h:237:3 */
 
 type tagCHOOSECOLORA = struct {
 	FlStructSize    DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FhwndOwner      HWND
 	FhInstance      HWND
 	FrgbResult      COLORREF
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FlpCustColors   uintptr
 	FFlags          DWORD
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FlCustData      LPARAM
 	FlpfnHook       LPCCHOOKPROC
 	FlpTemplateName LPCSTR
@@ -61510,14 +62084,14 @@ type CHOOSECOLORA = tagCHOOSECOLORA /* commdlg.h:291:5 */
 type LPCHOOSECOLORA = uintptr       /* commdlg.h:291:18 */
 type tagCHOOSECOLORW = struct {
 	FlStructSize    DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FhwndOwner      HWND
 	FhInstance      HWND
 	FrgbResult      COLORREF
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FlpCustColors   uintptr
 	FFlags          DWORD
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FlCustData      LPARAM
 	FlpfnHook       LPCCHOOKPROC
 	FlpTemplateName LPCWSTR
@@ -61533,16 +62107,16 @@ type LPFRHOOKPROC = uintptr /* commdlg.h:322:20 */
 
 type tagFINDREPLACEA = struct {
 	FlStructSize      DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhwndOwner        HWND
 	FhInstance        HINSTANCE
 	FFlags            DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FlpstrFindWhat    LPSTR
 	FlpstrReplaceWith LPSTR
 	FwFindWhatLen     WORD
 	FwReplaceWithLen  WORD
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FlCustData        LPARAM
 	FlpfnHook         LPFRHOOKPROC
 	FlpTemplateName   LPCSTR
@@ -61553,16 +62127,16 @@ type LPFINDREPLACEA = uintptr       /* commdlg.h:336:18 */
 
 type tagFINDREPLACEW = struct {
 	FlStructSize      DWORD
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FhwndOwner        HWND
 	FhInstance        HINSTANCE
 	FFlags            DWORD
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FlpstrFindWhat    LPWSTR
 	FlpstrReplaceWith LPWSTR
 	FwFindWhatLen     WORD
 	FwReplaceWithLen  WORD
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FlCustData        LPARAM
 	FlpfnHook         LPFRHOOKPROC
 	FlpTemplateName   LPCWSTR
@@ -61578,14 +62152,14 @@ type LPCFHOOKPROC = uintptr /* commdlg.h:387:20 */
 
 type tagCHOOSEFONTA = struct {
 	FlStructSize            DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FhwndOwner              HWND
 	FhDC                    HDC
 	FlpLogFont              LPLOGFONTA
 	FiPointSize             INT
 	FFlags                  DWORD
 	FrgbColors              COLORREF
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	FlCustData              LPARAM
 	FlpfnHook               LPCFHOOKPROC
 	FlpTemplateName         LPCSTR
@@ -61595,7 +62169,7 @@ type tagCHOOSEFONTA = struct {
 	F___MISSING_ALIGNMENT__ WORD
 	FnSizeMin               INT
 	FnSizeMax               INT
-	_                       [4]byte
+	F__ccgo_pad3            [4]byte
 } /* commdlg.h:389:11 */
 
 type CHOOSEFONTA = tagCHOOSEFONTA /* commdlg.h:406:5 */
@@ -61603,14 +62177,14 @@ type LPCHOOSEFONTA = uintptr      /* commdlg.h:406:17 */
 
 type tagCHOOSEFONTW = struct {
 	FlStructSize            DWORD
-	_                       [4]byte
+	F__ccgo_pad1            [4]byte
 	FhwndOwner              HWND
 	FhDC                    HDC
 	FlpLogFont              LPLOGFONTW
 	FiPointSize             INT
 	FFlags                  DWORD
 	FrgbColors              COLORREF
-	_                       [4]byte
+	F__ccgo_pad2            [4]byte
 	FlCustData              LPARAM
 	FlpfnHook               LPCFHOOKPROC
 	FlpTemplateName         LPCWSTR
@@ -61620,7 +62194,7 @@ type tagCHOOSEFONTW = struct {
 	F___MISSING_ALIGNMENT__ WORD
 	FnSizeMin               INT
 	FnSizeMax               INT
-	_                       [4]byte
+	F__ccgo_pad3            [4]byte
 } /* commdlg.h:408:11 */
 
 type CHOOSEFONTW = tagCHOOSEFONTW /* commdlg.h:425:5 */
@@ -61634,7 +62208,7 @@ type LPSETUPHOOKPROC = uintptr /* commdlg.h:517:20 */
 
 type tagPDA = struct {
 	FlStructSize         DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FhwndOwner           HWND
 	FhDevMode            HGLOBAL
 	FhDevNames           HGLOBAL
@@ -61645,7 +62219,7 @@ type tagPDA = struct {
 	FnMinPage            WORD
 	FnMaxPage            WORD
 	FnCopies             WORD
-	_                    [2]byte
+	F__ccgo_pad2         [2]byte
 	FhInstance           HINSTANCE
 	FlCustData           LPARAM
 	FlpfnPrintHook       LPPRINTHOOKPROC
@@ -61661,7 +62235,7 @@ type LPPRINTDLGA = uintptr /* commdlg.h:539:15 */
 
 type tagPDW = struct {
 	FlStructSize         DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FhwndOwner           HWND
 	FhDevMode            HGLOBAL
 	FhDevNames           HGLOBAL
@@ -61672,7 +62246,7 @@ type tagPDW = struct {
 	FnMinPage            WORD
 	FnMaxPage            WORD
 	FnCopies             WORD
-	_                    [2]byte
+	F__ccgo_pad2         [2]byte
 	FhInstance           HINSTANCE
 	FlCustData           LPARAM
 	FlpfnPrintHook       LPPRINTHOOKPROC
@@ -61727,7 +62301,7 @@ type LPPRINTPAGERANGE = uintptr         /* commdlg.h:602:20 */
 
 type tagPDEXA = struct {
 	FlStructSize         DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FhwndOwner           HWND
 	FhDevMode            HGLOBAL
 	FhDevNames           HGLOBAL
@@ -61737,17 +62311,17 @@ type tagPDEXA = struct {
 	FExclusionFlags      DWORD
 	FnPageRanges         DWORD
 	FnMaxPageRanges      DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FlpPageRanges        LPPRINTPAGERANGE
 	FnMinPage            DWORD
 	FnMaxPage            DWORD
 	FnCopies             DWORD
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FhInstance           HINSTANCE
 	FlpPrintTemplateName LPCSTR
 	FlpCallback          LPUNKNOWN
 	FnPropertyPages      DWORD
-	_                    [4]byte
+	F__ccgo_pad4         [4]byte
 	FlphPropertyPages    uintptr
 	FnStartPage          DWORD
 	FdwResultAction      DWORD
@@ -61758,7 +62332,7 @@ type LPPRINTDLGEXA = uintptr /* commdlg.h:626:17 */
 
 type tagPDEXW = struct {
 	FlStructSize         DWORD
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FhwndOwner           HWND
 	FhDevMode            HGLOBAL
 	FhDevNames           HGLOBAL
@@ -61768,17 +62342,17 @@ type tagPDEXW = struct {
 	FExclusionFlags      DWORD
 	FnPageRanges         DWORD
 	FnMaxPageRanges      DWORD
-	_                    [4]byte
+	F__ccgo_pad2         [4]byte
 	FlpPageRanges        LPPRINTPAGERANGE
 	FnMinPage            DWORD
 	FnMaxPage            DWORD
 	FnCopies             DWORD
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FhInstance           HINSTANCE
 	FlpPrintTemplateName LPCWSTR
 	FlpCallback          LPUNKNOWN
 	FnPropertyPages      DWORD
-	_                    [4]byte
+	F__ccgo_pad4         [4]byte
 	FlphPropertyPages    uintptr
 	FnStartPage          DWORD
 	FdwResultAction      DWORD
@@ -61805,7 +62379,7 @@ type LPPAGESETUPHOOK = uintptr /* commdlg.h:717:20 */
 
 type tagPSDA = struct {
 	FlStructSize             DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FhwndOwner               HWND
 	FhDevMode                HGLOBAL
 	FhDevNames               HGLOBAL
@@ -61813,7 +62387,7 @@ type tagPSDA = struct {
 	FptPaperSize             POINT
 	FrtMinMargin             RECT
 	FrtMargin                RECT
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FhInstance               HINSTANCE
 	FlCustData               LPARAM
 	FlpfnPageSetupHook       LPPAGESETUPHOOK
@@ -61827,7 +62401,7 @@ type LPPAGESETUPDLGA = uintptr /* commdlg.h:734:19 */
 
 type tagPSDW = struct {
 	FlStructSize             DWORD
-	_                        [4]byte
+	F__ccgo_pad1             [4]byte
 	FhwndOwner               HWND
 	FhDevMode                HGLOBAL
 	FhDevNames               HGLOBAL
@@ -61835,7 +62409,7 @@ type tagPSDW = struct {
 	FptPaperSize             POINT
 	FrtMinMargin             RECT
 	FrtMargin                RECT
-	_                        [4]byte
+	F__ccgo_pad2             [4]byte
 	FhInstance               HINSTANCE
 	FlCustData               LPARAM
 	FlpfnPageSetupHook       LPPAGESETUPHOOK
@@ -61935,11 +62509,11 @@ type LPSC_ACTION = uintptr  /* winsvc.h:113:15 */
 
 type _SERVICE_FAILURE_ACTIONSA = struct {
 	FdwResetPeriod DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpRebootMsg   LPSTR
 	FlpCommand     LPSTR
 	FcActions      DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FlpsaActions   uintptr
 } /* winsvc.h:115:11 */
 
@@ -61948,11 +62522,11 @@ type LPSERVICE_FAILURE_ACTIONSA = uintptr                 /* winsvc.h:121:30 */
 
 type _SERVICE_FAILURE_ACTIONSW = struct {
 	FdwResetPeriod DWORD
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FlpRebootMsg   LPWSTR
 	FlpCommand     LPWSTR
 	FcActions      DWORD
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FlpsaActions   uintptr
 } /* winsvc.h:123:11 */
 
@@ -62007,7 +62581,7 @@ type _ENUM_SERVICE_STATUSA = struct {
 	FlpServiceName LPSTR
 	FlpDisplayName LPSTR
 	FServiceStatus SERVICE_STATUS
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winsvc.h:169:11 */
 
 type ENUM_SERVICE_STATUSA = _ENUM_SERVICE_STATUSA /* winsvc.h:173:5 */
@@ -62017,7 +62591,7 @@ type _ENUM_SERVICE_STATUSW = struct {
 	FlpServiceName LPWSTR
 	FlpDisplayName LPWSTR
 	FServiceStatus SERVICE_STATUS
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 } /* winsvc.h:175:11 */
 
 type ENUM_SERVICE_STATUSW = _ENUM_SERVICE_STATUSW /* winsvc.h:179:5 */
@@ -62030,7 +62604,7 @@ type _ENUM_SERVICE_STATUS_PROCESSA = struct {
 	FlpServiceName        LPSTR
 	FlpDisplayName        LPSTR
 	FServiceStatusProcess SERVICE_STATUS_PROCESS
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 } /* winsvc.h:184:11 */
 
 type ENUM_SERVICE_STATUS_PROCESSA = _ENUM_SERVICE_STATUS_PROCESSA /* winsvc.h:188:5 */
@@ -62040,7 +62614,7 @@ type _ENUM_SERVICE_STATUS_PROCESSW = struct {
 	FlpServiceName        LPWSTR
 	FlpDisplayName        LPWSTR
 	FServiceStatusProcess SERVICE_STATUS_PROCESS
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 } /* winsvc.h:190:11 */
 
 type ENUM_SERVICE_STATUS_PROCESSW = _ENUM_SERVICE_STATUS_PROCESSW /* winsvc.h:194:5 */
@@ -62053,10 +62627,10 @@ type SC_LOCK = LPVOID /* winsvc.h:199:18 */
 
 type _QUERY_SERVICE_LOCK_STATUSA = struct {
 	FfIsLocked      DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FlpLockOwner    LPSTR
 	FdwLockDuration DWORD
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 } /* winsvc.h:201:11 */
 
 type QUERY_SERVICE_LOCK_STATUSA = _QUERY_SERVICE_LOCK_STATUSA /* winsvc.h:205:5 */
@@ -62064,10 +62638,10 @@ type LPQUERY_SERVICE_LOCK_STATUSA = uintptr                   /* winsvc.h:205:32
 
 type _QUERY_SERVICE_LOCK_STATUSW = struct {
 	FfIsLocked      DWORD
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FlpLockOwner    LPWSTR
 	FdwLockDuration DWORD
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 } /* winsvc.h:207:11 */
 
 type QUERY_SERVICE_LOCK_STATUSW = _QUERY_SERVICE_LOCK_STATUSW /* winsvc.h:211:5 */
@@ -62080,11 +62654,11 @@ type _QUERY_SERVICE_CONFIGA = struct {
 	FdwServiceType      DWORD
 	FdwStartType        DWORD
 	FdwErrorControl     DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FlpBinaryPathName   LPSTR
 	FlpLoadOrderGroup   LPSTR
 	FdwTagId            DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FlpDependencies     LPSTR
 	FlpServiceStartName LPSTR
 	FlpDisplayName      LPSTR
@@ -62097,11 +62671,11 @@ type _QUERY_SERVICE_CONFIGW = struct {
 	FdwServiceType      DWORD
 	FdwStartType        DWORD
 	FdwErrorControl     DWORD
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FlpBinaryPathName   LPWSTR
 	FlpLoadOrderGroup   LPWSTR
 	FdwTagId            DWORD
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	FlpDependencies     LPWSTR
 	FlpServiceStartName LPWSTR
 	FlpDisplayName      LPWSTR
@@ -62164,7 +62738,7 @@ type _MODEMDEVCAPS = struct {
 	FdwMaxDTERate              DWORD
 	FdwMaxDCERate              DWORD
 	FabVariablePortion         [1]BYTE
-	_                          [3]byte
+	F__ccgo_pad1               [3]byte
 } /* mcx.h:9:9 */
 
 // *
@@ -62189,7 +62763,7 @@ type _MODEMSETTINGS = struct {
 	FdwNegotiatedModemOptions DWORD
 	FdwNegotiatedDCERate      DWORD
 	FabVariablePortion        [1]BYTE
-	_                         [3]byte
+	F__ccgo_pad1              [3]byte
 } /* mcx.h:32:9 */
 
 type MODEMSETTINGS = _MODEMSETTINGS /* mcx.h:45:3 */
@@ -62328,7 +62902,7 @@ type tagIMEMENUITEMINFOA = struct {
 	FhbmpUnchecked HBITMAP
 	FdwItemData    DWORD
 	FszString      [80]CHAR
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhbmpItem      HBITMAP
 } /* imm.h:95:11 */
 
@@ -62346,7 +62920,7 @@ type tagIMEMENUITEMINFOW = struct {
 	FhbmpUnchecked HBITMAP
 	FdwItemData    DWORD
 	FszString      [80]WCHAR
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FhbmpItem      HBITMAP
 } /* imm.h:107:11 */
 
@@ -62446,7 +63020,7 @@ type Mem0Global = struct {
 	FalarmThreshold Sqlite3_int64
 	FhardLimit      Sqlite3_int64
 	FnearlyFull     int32
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 } /* sqlite3.c:27830:19 */
 
 // Default value of the hard heap limit.  0 means "no limit".
@@ -62553,7 +63127,9 @@ func Xsqlite3MallocInit(tls *libc.TLS) int32 { /* sqlite3.c:27944:20: */
 		Xsqlite3Config.FpPage = uintptr(0)
 		Xsqlite3Config.FszPage = 0
 	}
-	rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 40 /* &.xInit */))))(tls, Xsqlite3Config.Fm.FpAppData)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxInit})).f(tls, Xsqlite3Config.Fm.FpAppData)
 	if rc != SQLITE_OK {
 		libc.Xmemset(tls, uintptr(unsafe.Pointer(&mem0)), 0, uint64(unsafe.Sizeof(mem0)))
 	}
@@ -62570,7 +63146,7 @@ func Xsqlite3HeapNearlyFull(tls *libc.TLS) int32 { /* sqlite3.c:27965:20: */
 // Deinitialize the memory allocation subsystem.
 func Xsqlite3MallocEnd(tls *libc.TLS) { /* sqlite3.c:27972:21: */
 	if Xsqlite3Config.Fm.FxShutdown != 0 {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 48 /* &.xShutdown */))))(tls, Xsqlite3Config.Fm.FpAppData)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxShutdown})).f(tls, Xsqlite3Config.Fm.FpAppData)
 	}
 	libc.Xmemset(tls, uintptr(unsafe.Pointer(&mem0)), 0, uint64(unsafe.Sizeof(mem0)))
 }
@@ -62624,7 +63200,7 @@ func mallocWithAlarm(tls *libc.TLS, n int32, pp uintptr) { /* sqlite3.c:28013:13
 	// mode and specifically when the DMD "Dark Matter Detector" is enabled
 	// or else a crash results.  Hence, do not attempt to optimize out the
 	// following xRoundup() call.
-	nFull = (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 32 /* &.xRoundup */))))(tls, n)
+	nFull = (*struct{ f func(*libc.TLS, int32) int32 })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRoundup})).f(tls, n)
 
 	Xsqlite3StatusHighwater(tls, SQLITE_STATUS_MALLOC_SIZE, n)
 	if mem0.FalarmThreshold > int64(0) {
@@ -62643,10 +63219,14 @@ func mallocWithAlarm(tls *libc.TLS, n int32, pp uintptr) { /* sqlite3.c:28013:13
 			libc.AtomicStoreNInt32((uintptr(unsafe.Pointer(&mem0)) + 24 /* &.nearlyFull */), int32(0), 0)
 		}
 	}
-	p = (*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ /* &.xMalloc */))))(tls, nFull)
+	p = (*struct {
+		f func(*libc.TLS, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxMalloc})).f(tls, nFull)
 	if (p == uintptr(0)) && (mem0.FalarmThreshold > int64(0)) {
 		sqlite3MallocAlarm(tls, nFull)
-		p = (*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ /* &.xMalloc */))))(tls, nFull)
+		p = (*struct {
+			f func(*libc.TLS, int32) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxMalloc})).f(tls, nFull)
 	}
 	if p != 0 {
 		nFull = Xsqlite3MallocSize(tls, p)
@@ -62676,7 +63256,9 @@ func Xsqlite3Malloc(tls *libc.TLS, n U64) uintptr { /* sqlite3.c:28062:21: */
 		mallocWithAlarm(tls, int32(n), bp /* &p */)
 		Xsqlite3_mutex_leave(tls, mem0.Fmutex)
 	} else {
-		*(*uintptr)(unsafe.Pointer(bp /* p */)) = (*(*func(*libc.TLS, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ /* &.xMalloc */))))(tls, int32(n))
+		*(*uintptr)(unsafe.Pointer(bp /* p */)) = (*struct {
+			f func(*libc.TLS, int32) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxMalloc})).f(tls, int32(n))
 	}
 	// IMP: R-11148-40995
 	return *(*uintptr)(unsafe.Pointer(bp /* p */))
@@ -62711,7 +63293,9 @@ func isLookaside(tls *libc.TLS, db uintptr, p uintptr) int32 { /* sqlite3.c:2810
 // sqlite3Malloc() or sqlite3_malloc().
 func Xsqlite3MallocSize(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:28115:20: */
 
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 24 /* &.xSize */))))(tls, p)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxSize})).f(tls, p)
 }
 
 func lookasideMallocSize(tls *libc.TLS, db uintptr, p uintptr) int32 { /* sqlite3.c:28119:12: */
@@ -62735,13 +63319,17 @@ func Xsqlite3DbMallocSize(tls *libc.TLS, db uintptr, p uintptr) int32 { /* sqlit
 			}
 		}
 	}
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 24 /* &.xSize */))))(tls, p)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxSize})).f(tls, p)
 }
 
 func Xsqlite3_msize(tls *libc.TLS, p uintptr) Sqlite3_uint64 { /* sqlite3.c:28155:27: */
 
 	if p != 0 {
-		return uint64((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 24 /* &.xSize */))))(tls, p))
+		return uint64((*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxSize})).f(tls, p))
 	}
 	return uint64(0)
 }
@@ -62756,10 +63344,10 @@ func Xsqlite3_free(tls *libc.TLS, p uintptr) { /* sqlite3.c:28164:17: */
 		Xsqlite3_mutex_enter(tls, mem0.Fmutex)
 		Xsqlite3StatusDown(tls, SQLITE_STATUS_MEMORY_USED, Xsqlite3MallocSize(tls, p))
 		Xsqlite3StatusDown(tls, SQLITE_STATUS_MALLOC_COUNT, 1)
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 8 /* &.xFree */))))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxFree})).f(tls, p)
 		Xsqlite3_mutex_leave(tls, mem0.Fmutex)
 	} else {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 8 /* &.xFree */))))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxFree})).f(tls, p)
 	}
 }
 
@@ -62827,7 +63415,7 @@ func Xsqlite3Realloc(tls *libc.TLS, pOld uintptr, nBytes U64) uintptr { /* sqlit
 	// IMPLEMENTATION-OF: R-46199-30249 SQLite guarantees that the second
 	// argument to xRealloc is always a value returned by a prior call to
 	// xRoundup.
-	nNew = (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 32 /* &.xRoundup */))))(tls, int32(nBytes))
+	nNew = (*struct{ f func(*libc.TLS, int32) int32 })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRoundup})).f(tls, int32(nBytes))
 	if nOld == nNew {
 		pNew = pOld
 	} else if Xsqlite3Config.FbMemstat != 0 {
@@ -62842,10 +63430,14 @@ func Xsqlite3Realloc(tls *libc.TLS, pOld uintptr, nBytes U64) uintptr { /* sqlit
 				return uintptr(0)
 			}
 		}
-		pNew = (*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 16 /* &.xRealloc */))))(tls, pOld, nNew)
+		pNew = (*struct {
+			f func(*libc.TLS, uintptr, int32) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRealloc})).f(tls, pOld, nNew)
 		if (pNew == uintptr(0)) && (mem0.FalarmThreshold > int64(0)) {
 			sqlite3MallocAlarm(tls, int32(nBytes))
-			pNew = (*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 16 /* &.xRealloc */))))(tls, pOld, nNew)
+			pNew = (*struct {
+				f func(*libc.TLS, uintptr, int32) uintptr
+			})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRealloc})).f(tls, pOld, nNew)
 		}
 		if pNew != 0 {
 			nNew = Xsqlite3MallocSize(tls, pNew)
@@ -62853,7 +63445,9 @@ func Xsqlite3Realloc(tls *libc.TLS, pOld uintptr, nBytes U64) uintptr { /* sqlit
 		}
 		Xsqlite3_mutex_leave(tls, mem0.Fmutex)
 	} else {
-		pNew = (*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 32 /* &.m */ + 16 /* &.xRealloc */))))(tls, pOld, nNew)
+		pNew = (*struct {
+			f func(*libc.TLS, uintptr, int32) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fm.FxRealloc})).f(tls, pOld, nNew)
 	}
 	// IMP: R-11148-40995
 	return pNew
@@ -65148,7 +65742,9 @@ func renderLogMsg(tls *libc.TLS, iErrCode int32, zFormat uintptr, ap Va_list) {
 
 	Xsqlite3StrAccumInit(tls, bp /* &acc */, uintptr(0), bp+32 /* &zMsg[0] */, int32(unsafe.Sizeof([210]int8{})), 0)
 	Xsqlite3_str_vappendf(tls, bp /* &acc */, zFormat, ap)
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 376 /* &.xLog */))))(tls, Xsqlite3Config.FpLogArg, iErrCode,
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.FxLog})).f(tls, Xsqlite3Config.FpLogArg, iErrCode,
 		Xsqlite3StrAccumFinish(tls, bp /* &acc */))
 }
 
@@ -65403,13 +65999,18 @@ type Useconds_t = uint32 /* types.h:84:22 */
 
 type X_sigset_t = uint64 /* types.h:104:28 */
 
-type X_tls_callback_type = uintptr /* process.h:58:16 */
+type X_beginthread_proc_type = uintptr   /* process.h:32:16 */
+type X_beginthreadex_proc_type = uintptr /* process.h:33:20 */
+
+type X_tls_callback_type = uintptr /* process.h:61:16 */
 
 // Thread procedure Win32 compatibility shim
 func sqlite3ThreadProc(tls *libc.TLS, pArg uintptr) uint32 { /* sqlite3.c:30989:27: */
 	var p uintptr = pArg
 
-	(*SQLiteThread)(unsafe.Pointer(p)).FpResult = (*(*func(*libc.TLS, uintptr) uintptr)(unsafe.Pointer((p + 16 /* &.xTask */))))(tls, (*SQLiteThread)(unsafe.Pointer(p)).FpIn)
+	(*SQLiteThread)(unsafe.Pointer(p)).FpResult = (*struct {
+		f func(*libc.TLS, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*SQLiteThread)(unsafe.Pointer(p)).FxTask})).f(tls, (*SQLiteThread)(unsafe.Pointer(p)).FpIn)
 
 	libc.X_endthreadex(tls, uint32(0))
 	return uint32(0) // NOT REACHED
@@ -65443,7 +66044,9 @@ func Xsqlite3ThreadCreate(tls *libc.TLS, ppThread uintptr, xTask uintptr, pIn ui
 	}
 	if (*SQLiteThread)(unsafe.Pointer(p)).FxTask == uintptr(0) {
 		(*SQLiteThread)(unsafe.Pointer(p)).Fid = uint32(libc.XGetCurrentThreadId(tls))
-		(*SQLiteThread)(unsafe.Pointer(p)).FpResult = (*(*func(*libc.TLS, uintptr) uintptr)(unsafe.Pointer(&xTask)))(tls, pIn)
+		(*SQLiteThread)(unsafe.Pointer(p)).FpResult = (*struct {
+			f func(*libc.TLS, uintptr) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{xTask})).f(tls, pIn)
 	}
 	*(*uintptr)(unsafe.Pointer(ppThread)) = p
 	return SQLITE_OK
@@ -66052,12 +66655,12 @@ func Xsqlite3Utf16ByteLen(tls *libc.TLS, zIn uintptr, nChar int32) int32 { /* sq
 // No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
 type _exception = struct {
-	Ftype   int32
-	_       [4]byte
-	Fname   uintptr
-	Farg1   float64
-	Farg2   float64
-	Fretval float64
+	Ftype        int32
+	F__ccgo_pad1 [4]byte
+	Fname        uintptr
+	Farg1        float64
+	Farg2        float64
+	Fretval      float64
 } /* math.h:15:1 */
 
 // See also float.h
@@ -66079,25 +66682,21 @@ type __mingw_flt_type_t = struct{ Fx float32 } /* math.h:127:11 */
 type X__mingw_flt_type_t = __mingw_flt_type_t /* math.h:130:5 */
 
 type __mingw_ldbl_type_t = struct {
-	Fx float64
-	_  [8]byte
+	Fx           float64
+	F__ccgo_pad1 [8]byte
 } /* math.h:132:11 */
 
 type X__mingw_ldbl_type_t = __mingw_ldbl_type_t /* math.h:141:5 */
 
-type __mingw_fp_types_t = struct{ Fld uintptr } /* math.h:143:11 */
-
-type X__mingw_fp_types_t = __mingw_fp_types_t /* math.h:151:5 */
-
 type _complex = struct {
 	Fx float64
 	Fy float64
-} /* math.h:270:3 */
+} /* math.h:260:3 */
 
 // Use the compiler's builtin define for FLT_EVAL_METHOD to
 //    set float_t and double_t.
-type Float_t = float32  /* math.h:372:15 */
-type Double_t = float64 /* math.h:373:16 */
+type Float_t = float32  /* math.h:362:15 */
+type Double_t = float64 /* math.h:363:16 */
 
 // Documentation on decimal float math
 //    http://h21007.www2.hp.com/portal/site/dspp/menuitem.863c3e4cbcdc3f3515b49c108973a801?ciid=8cf166fedd1aa110VgnVCM100000a360ea10RCRD
@@ -66125,7 +66724,7 @@ type Double_t = float64 /* math.h:373:16 */
 func Xsqlite3FaultSim(tls *libc.TLS, iTest int32) int32 { /* sqlite3.c:31735:20: */
 	var xCallback uintptr = Xsqlite3Config.FxTestCallback
 	if xCallback != 0 {
-		return (*(*func(*libc.TLS, int32) int32)(unsafe.Pointer(&xCallback)))(tls, iTest)
+		return (*struct{ f func(*libc.TLS, int32) int32 })(unsafe.Pointer(&struct{ uintptr }{xCallback})).f(tls, iTest)
 	}
 	return SQLITE_OK
 }
@@ -68481,13 +69080,13 @@ var azName = [180]uintptr{
 
 // Forward references to structures used for WAL
 type winShm = struct {
-	FpShmNode   uintptr
-	FpNext      uintptr
-	FhasMutex   U8
-	_           [1]byte
-	FsharedMask U16
-	FexclMask   U16
-	_           [2]byte
+	FpShmNode    uintptr
+	FpNext       uintptr
+	FhasMutex    U8
+	F__ccgo_pad1 [1]byte
+	FsharedMask  U16
+	FexclMask    U16
+	F__ccgo_pad2 [2]byte
 } /* sqlite3.c:42604:9 */
 
 //************* End of opcodes.c ********************************************
@@ -68637,19 +69236,19 @@ type winShm = struct {
 // Forward references to structures used for WAL
 type WinShm = winShm /* sqlite3.c:42604:23 */ // A connection to shared-memory
 type winShmNode = struct {
-	Fmutex      uintptr
-	FzFilename  uintptr
-	FhFile      WinFile
-	FszRegion   int32
-	FnRegion    int32
-	FisReadonly U8
-	FisUnlocked U8
-	_           [6]byte
-	FaRegion    uintptr
-	FlastErrno  DWORD
-	FnRef       int32
-	FpFirst     uintptr
-	FpNext      uintptr
+	Fmutex       uintptr
+	FzFilename   uintptr
+	FhFile       WinFile
+	FszRegion    int32
+	FnRegion     int32
+	FisReadonly  U8
+	FisUnlocked  U8
+	F__ccgo_pad1 [6]byte
+	FaRegion     uintptr
+	FlastErrno   DWORD
+	FnRef        int32
+	FpFirst      uintptr
+	FpNext       uintptr
 } /* sqlite3.c:42604:9 */
 
 // A connection to shared-memory
@@ -68665,12 +69264,12 @@ type winFile = struct {
 	FpVfs           uintptr
 	Fh              HANDLE
 	Flocktype       U8
-	_               [1]byte
+	F__ccgo_pad1    [1]byte
 	FsharedLockByte int16
 	FctrlFlags      U8
-	_               [3]byte
+	F__ccgo_pad2    [3]byte
 	FlastErrno      DWORD
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FpShm           uintptr
 	FzPath          uintptr
 	FszChunk        int32
@@ -68693,10 +69292,10 @@ type WinFile = winFile /* sqlite3.c:42625:24 */
 // The winVfsAppData structure is used for the pAppData member for all of the
 // Win32 VFS variants.
 type winVfsAppData = struct {
-	FpMethod  uintptr
-	FpAppData uintptr
-	FbNoLock  WINBOOL
-	_         [4]byte
+	FpMethod     uintptr
+	FpAppData    uintptr
+	FbNoLock     WINBOOL
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:42659:9 */
 
 // The winVfsAppData structure is used for the pAppData member for all of the
@@ -70940,10 +71539,10 @@ shmpage_out:
 	iOffset1 = (iRegion * szRegion)
 	iOffsetShift1 = (int32(DWORD(iOffset1) % winSysInfo.FdwAllocationGranularity))
 	p = (*ShmRegion)(unsafe.Pointer((*WinShmNode)(unsafe.Pointer(pShmNode)).FaRegion + uintptr(iRegion)*16)).FpMap
-	*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&pp))) = (p + uintptr(iOffsetShift1))
+	*(*uintptr)(unsafe.Pointer(pp)) = (p + uintptr(iOffsetShift1))
 	goto __18
 __17:
-	*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&pp))) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(pp)) = uintptr(0)
 __18:
 	;
 	if !(((*WinShmNode)(unsafe.Pointer(pShmNode)).FisReadonly != 0) && (rc == SQLITE_OK)) {
@@ -71952,11 +72551,11 @@ func winDlClose(tls *libc.TLS, pVfs uintptr, pHandle uintptr) { /* sqlite3.c:481
 
 // State information for the randomness gatherer.
 type EntropyGatherer1 = struct {
-	Fa    uintptr
-	Fna   int32
-	Fi    int32
-	FnXor int32
-	_     [4]byte
+	Fa           uintptr
+	Fna          int32
+	Fi           int32
+	FnXor        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:48168:9 */
 
 // State information for the randomness gatherer.
@@ -72260,26 +72859,26 @@ func Xsqlite3_os_end(tls *libc.TLS) int32 { /* sqlite3.c:48502:16: */
 // Forward declaration of objects used by this utility
 type MemVfs = sqlite3_vfs /* sqlite3.c:48545:28 */
 type MemFile1 = struct {
-	Fbase   Sqlite3_file
-	FpStore uintptr
-	FeLock  int32
-	_       [4]byte
+	Fbase        Sqlite3_file
+	FpStore      uintptr
+	FeLock       int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:48546:9 */
 
 type MemFile = MemFile1 /* sqlite3.c:48546:24 */
 type MemStore1 = struct {
-	Fsz      Sqlite3_int64
-	FszAlloc Sqlite3_int64
-	FszMax   Sqlite3_int64
-	FaData   uintptr
-	FpMutex  uintptr
-	FnMmap   int32
-	FmFlags  uint32
-	FnRdLock int32
-	FnWrLock int32
-	FnRef    int32
-	_        [4]byte
-	FzFName  uintptr
+	Fsz          Sqlite3_int64
+	FszAlloc     Sqlite3_int64
+	FszMax       Sqlite3_int64
+	FaData       uintptr
+	FpMutex      uintptr
+	FnMmap       int32
+	FmFlags      uint32
+	FnRdLock     int32
+	FnWrLock     int32
+	FnRef        int32
+	F__ccgo_pad1 [4]byte
+	FzFName      uintptr
 } /* sqlite3.c:48546:9 */
 
 type MemStore = MemStore1 /* sqlite3.c:48547:25 */
@@ -72289,9 +72888,9 @@ type MemStore = MemStore1 /* sqlite3.c:48547:25 */
 //
 // Must hold SQLITE_MUTEX_STATIC_VFS1 to access any part of this object.
 type MemFS = struct {
-	FnMemStore  int32
-	_           [4]byte
-	FapMemStore uintptr
+	FnMemStore   int32
+	F__ccgo_pad1 [4]byte
+	FapMemStore  uintptr
 } /* sqlite3.c:48617:8 */
 
 // File-scope variables for holding the memdb files that are accessible
@@ -72592,7 +73191,9 @@ func memdbOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFd uintptr, flags in
 	var p uintptr = uintptr(0)
 	var szName int32
 	if (flags & SQLITE_OPEN_MAIN_DB) == 0 {
-		return (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 40 /* &.xOpen */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, zName, pFd, flags, pOutFlags)
+		return (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxOpen})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, zName, pFd, flags, pOutFlags)
 	}
 	libc.Xmemset(tls, pFile, 0, uint64(unsafe.Sizeof(MemStore{})))
 	szName = Xsqlite3Strlen30(tls, zName)
@@ -72684,44 +73285,60 @@ func memdbFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, z
 
 // Open the dynamic library located at zPath and return a handle.
 func memdbDlOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr) uintptr { /* sqlite3.c:49147:13: */
-	return (*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 72 /* &.xDlOpen */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, zPath)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxDlOpen})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, zPath)
 }
 
 // Populate the buffer zErrMsg (size nByte bytes) with a human readable
 // utf-8 string describing the most recent error encountered associated
 // with dynamic libraries.
 func memdbDlError(tls *libc.TLS, pVfs uintptr, nByte int32, zErrMsg uintptr) { /* sqlite3.c:49156:13: */
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 80 /* &.xDlError */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nByte, zErrMsg)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxDlError})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nByte, zErrMsg)
 }
 
 // Return a pointer to the symbol zSymbol in the dynamic library pHandle.
 func memdbDlSym(tls *libc.TLS, pVfs uintptr, p uintptr, zSym uintptr) uintptr { /* sqlite3.c:49163:13: */
-	return (*(*func(*libc.TLS, uintptr, uintptr, uintptr) uintptr)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 88 /* &.xDlSym */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, p, zSym)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxDlSym})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, p, zSym)
 }
 
 // Close the dynamic library handle pHandle.
 func memdbDlClose(tls *libc.TLS, pVfs uintptr, pHandle uintptr) { /* sqlite3.c:49170:13: */
-	(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 96 /* &.xDlClose */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, pHandle)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxDlClose})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, pHandle)
 }
 
 // Populate the buffer pointed to by zBufOut with nByte bytes of
 // random data.
 func memdbRandomness(tls *libc.TLS, pVfs uintptr, nByte int32, zBufOut uintptr) int32 { /* sqlite3.c:49178:12: */
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 104 /* &.xRandomness */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nByte, zBufOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxRandomness})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nByte, zBufOut)
 }
 
 // Sleep for nMicro microseconds. Return the number of microseconds
 // actually slept.
 func memdbSleep(tls *libc.TLS, pVfs uintptr, nMicro int32) int32 { /* sqlite3.c:49186:12: */
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 112 /* &.xSleep */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nMicro)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxSleep})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, nMicro)
 }
 
 func memdbGetLastError(tls *libc.TLS, pVfs uintptr, a int32, b uintptr) int32 { /* sqlite3.c:49199:12: */
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 128 /* &.xGetLastError */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, a, b)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxGetLastError})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, a, b)
 }
 
 func memdbCurrentTimeInt64(tls *libc.TLS, pVfs uintptr, p uintptr) int32 { /* sqlite3.c:49202:12: */
-	return (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData + 136 /* &.xCurrentTimeInt64 */))))(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, p)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(((*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData))).FxCurrentTimeInt64})).f(tls, (*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FpAppData, p)
 }
 
 // Translate a database connection pointer and schema name into a
@@ -73468,7 +74085,9 @@ func pcacheManageDirtyList(tls *libc.TLS, pPage uintptr, addRemove U8) { /* sqli
 func pcacheUnpin(tls *libc.TLS, p uintptr) { /* sqlite3.c:50041:13: */
 	if (*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FbPurgeable != 0 {
 
-		(*(*func(*libc.TLS, uintptr, uintptr, int32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 64 /* &.xUnpin */))))(tls, (*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, 0)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32)
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxUnpin})).f(tls, (*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, 0)
 
 	}
 }
@@ -73503,13 +74122,15 @@ func Xsqlite3PcacheInitialize(tls *libc.TLS) int32 { /* sqlite3.c:50072:20: */
 		Xsqlite3PCacheSetDefault(tls)
 
 	}
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 16 /* &.xInit */))))(tls, Xsqlite3Config.Fpcache2.FpArg)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxInit})).f(tls, Xsqlite3Config.Fpcache2.FpArg)
 }
 
 func Xsqlite3PcacheShutdown(tls *libc.TLS) { /* sqlite3.c:50082:21: */
 	if Xsqlite3Config.Fpcache2.FxShutdown != 0 {
 		// IMPLEMENTATION-OF: R-26000-56589 The xShutdown() method may be NULL.
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 24 /* &.xShutdown */))))(tls, Xsqlite3Config.Fpcache2.FpArg)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxShutdown})).f(tls, Xsqlite3Config.Fpcache2.FpArg)
 	}
 }
 
@@ -73549,15 +74170,19 @@ func Xsqlite3PcacheSetPageSize(tls *libc.TLS, pCache uintptr, szPage int32) int3
 
 	if (*PCache)(unsafe.Pointer(pCache)).FszPage != 0 {
 		var pNew uintptr
-		pNew = (*(*func(*libc.TLS, int32, int32, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 32 /* &.xCreate */))))(tls,
+		pNew = (*struct {
+			f func(*libc.TLS, int32, int32, int32) uintptr
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxCreate})).f(tls,
 			szPage, (int32(uint64((*PCache)(unsafe.Pointer(pCache)).FszExtra) + (((uint64(unsafe.Sizeof(PgHdr{}))) + uint64(7)) & libc.Uint64FromInt32(libc.CplInt32(7))))),
 			int32((*PCache)(unsafe.Pointer(pCache)).FbPurgeable))
 		if pNew == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 40 /* &.xCachesize */))))(tls, pNew, numberOfCachePages(tls, pCache))
+		(*struct {
+			f func(*libc.TLS, uintptr, int32)
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxCachesize})).f(tls, pNew, numberOfCachePages(tls, pCache))
 		if (*PCache)(unsafe.Pointer(pCache)).FpCache != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 88 /* &.xDestroy */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxDestroy})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
 		}
 		(*PCache)(unsafe.Pointer(pCache)).FpCache = pNew
 		(*PCache)(unsafe.Pointer(pCache)).FszPage = szPage
@@ -73600,7 +74225,9 @@ func Xsqlite3PcacheFetch(tls *libc.TLS, pCache uintptr, pgno Pgno, createFlag in
 	//          (createFlag==1 AND !(bPurgeable AND pDirty)
 	eCreate = (createFlag & int32((*PCache)(unsafe.Pointer(pCache)).FeCreate))
 
-	pRes = (*(*func(*libc.TLS, uintptr, uint32, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 56 /* &.xFetch */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, pgno, eCreate)
+	pRes = (*struct {
+		f func(*libc.TLS, uintptr, uint32, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxFetch})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, pgno, eCreate)
 
 	return pRes
 }
@@ -73640,14 +74267,18 @@ func Xsqlite3PcacheFetchStress(tls *libc.TLS, pCache uintptr, pgno Pgno, ppPage
 		if pPg != 0 {
 			var rc int32
 
-			rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pCache + 48 /* &.xStress */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpStress, pPg)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*PCache)(unsafe.Pointer(pCache)).FxStress})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpStress, pPg)
 
 			if (rc != SQLITE_OK) && (rc != SQLITE_BUSY) {
 				return rc
 			}
 		}
 	}
-	*(*uintptr)(unsafe.Pointer(ppPage)) = (*(*func(*libc.TLS, uintptr, uint32, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 56 /* &.xFetch */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, pgno, 2)
+	*(*uintptr)(unsafe.Pointer(ppPage)) = (*struct {
+		f func(*libc.TLS, uintptr, uint32, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxFetch})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, pgno, 2)
 	if *(*uintptr)(unsafe.Pointer(ppPage)) == uintptr(0) {
 		return SQLITE_NOMEM
 	}
@@ -73725,7 +74356,9 @@ func Xsqlite3PcacheDrop(tls *libc.TLS, p uintptr) { /* sqlite3.c:50349:21: */
 		pcacheManageDirtyList(tls, p, uint8(PCACHE_DIRTYLIST_REMOVE))
 	}
 	(*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FnRefSum--
-	(*(*func(*libc.TLS, uintptr, uintptr, int32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 64 /* &.xUnpin */))))(tls, (*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, 1)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32)
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxUnpin})).f(tls, (*PCache)(unsafe.Pointer((*PgHdr)(unsafe.Pointer(p)).FpCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, 1)
 }
 
 // Make sure the page is marked as dirty. If it isn't dirty already,
@@ -73788,7 +74421,9 @@ func Xsqlite3PcacheClearSyncFlags(tls *libc.TLS, pCache uintptr) { /* sqlite3.c:
 func Xsqlite3PcacheMove(tls *libc.TLS, p uintptr, newPgno Pgno) { /* sqlite3.c:50433:21: */
 	var pCache uintptr = (*PgHdr)(unsafe.Pointer(p)).FpCache
 
-	(*(*func(*libc.TLS, uintptr, uintptr, uint32, uint32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 72 /* &.xRekey */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, (*PgHdr)(unsafe.Pointer(p)).Fpgno, newPgno)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uint32, uint32)
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxRekey})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, (*PgHdr)(unsafe.Pointer(p)).FpPage, (*PgHdr)(unsafe.Pointer(p)).Fpgno, newPgno)
 	(*PgHdr)(unsafe.Pointer(p)).Fpgno = newPgno
 	if ((int32((*PgHdr)(unsafe.Pointer(p)).Fflags) & PGHDR_DIRTY) != 0) && ((int32((*PgHdr)(unsafe.Pointer(p)).Fflags) & PGHDR_NEED_SYNC) != 0) {
 		pcacheManageDirtyList(tls, p, uint8(PCACHE_DIRTYLIST_FRONT))
@@ -73820,21 +74455,25 @@ func Xsqlite3PcacheTruncate(tls *libc.TLS, pCache uintptr, pgno Pgno) { /* sqlit
 		}
 		if (pgno == Pgno(0)) && ((*PCache)(unsafe.Pointer(pCache)).FnRefSum != 0) {
 			var pPage1 uintptr
-			pPage1 = (*(*func(*libc.TLS, uintptr, uint32, int32) uintptr)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 56 /* &.xFetch */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, uint32(1), 0)
+			pPage1 = (*struct {
+				f func(*libc.TLS, uintptr, uint32, int32) uintptr
+			})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxFetch})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, uint32(1), 0)
 			if pPage1 != 0 { // Page 1 is always available in cache, because
 				// pCache->nRefSum>0
 				libc.Xmemset(tls, (*Sqlite3_pcache_page)(unsafe.Pointer(pPage1)).FpBuf, 0, uint64((*PCache)(unsafe.Pointer(pCache)).FszPage))
 				pgno = Pgno(1)
 			}
 		}
-		(*(*func(*libc.TLS, uintptr, uint32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 80 /* &.xTruncate */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, (pgno + Pgno(1)))
+		(*struct {
+			f func(*libc.TLS, uintptr, uint32)
+		})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxTruncate})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache, (pgno + Pgno(1)))
 	}
 }
 
 // Close a cache.
 func Xsqlite3PcacheClose(tls *libc.TLS, pCache uintptr) { /* sqlite3.c:50488:21: */
 
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 88 /* &.xDestroy */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxDestroy})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
 }
 
 // Discard the contents of the cache.
@@ -73950,14 +74589,18 @@ func Xsqlite3PcachePageRefcount(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:5
 // Return the total number of pages in the cache.
 func Xsqlite3PcachePagecount(tls *libc.TLS, pCache uintptr) int32 { /* sqlite3.c:50605:20: */
 
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 48 /* &.xPagecount */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxPagecount})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
 }
 
 // Set the suggested cache-size value.
 func Xsqlite3PcacheSetCachesize(tls *libc.TLS, pCache uintptr, mxPage int32) { /* sqlite3.c:50622:21: */
 
 	(*PCache)(unsafe.Pointer(pCache)).FszCache = mxPage
-	(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 40 /* &.xCachesize */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache,
+	(*struct {
+		f func(*libc.TLS, uintptr, int32)
+	})(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxCachesize})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache,
 		numberOfCachePages(tls, pCache))
 }
 
@@ -73983,7 +74626,7 @@ func Xsqlite3PcacheSetSpillsize(tls *libc.TLS, p uintptr, mxPage int32) int32 {
 // Free up as much memory as possible from the page cache.
 func Xsqlite3PcacheShrink(tls *libc.TLS, pCache uintptr) { /* sqlite3.c:50651:21: */
 
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((uintptr(unsafe.Pointer(&Xsqlite3Config)) + 168 /* &.pcache2 */ + 96 /* &.xShrink */))))(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{Xsqlite3Config.Fpcache2.FxShrink})).f(tls, (*PCache)(unsafe.Pointer(pCache)).FpCache)
 }
 
 // Return the size of the header added by this middleware layer
@@ -75635,7 +76278,7 @@ type Wal1 = struct {
 	FpDbFd               uintptr
 	FpWalFd              uintptr
 	FiCallback           U32
-	_                    [4]byte
+	F__ccgo_pad1         [4]byte
 	FmxWalSize           I64
 	FnWiData             int32
 	FszFirstBlock        int32
@@ -75651,13 +76294,13 @@ type Wal1 = struct {
 	FsyncHeader          U8
 	FpadToSectorBoundary U8
 	FbShmUnreliable      U8
-	_                    [1]byte
+	F__ccgo_pad2         [1]byte
 	Fhdr                 WalIndexHdr
 	FminFrame            U32
 	FiReCksum            U32
 	FzWalName            uintptr
 	FnCkpt               U32
-	_                    [4]byte
+	F__ccgo_pad3         [4]byte
 	FpSnapshot           uintptr
 } /* sqlite3.c:1331:9 */
 
@@ -76093,7 +76736,7 @@ type PagerSavepoint1 = struct {
 	FiSubRec            Pgno
 	FbTruncateOnRelease int32
 	FaWalData           [4]U32
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 } /* sqlite3.c:1331:9 */
 
 //************* End of wal.h ************************************************
@@ -77725,7 +78368,7 @@ func pager_playback_one_page(tls *libc.TLS, pPager uintptr, pOffset uintptr, pDo
 		var pData uintptr
 		pData = (*PgHdr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pPg */)))).FpData
 		libc.Xmemcpy(tls, pData, aData, uint64((*Pager)(unsafe.Pointer(pPager)).FpageSize))
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pPager + 256 /* &.xReiniter */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 8 /* pPg */)))
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Pager)(unsafe.Pointer(pPager)).FxReiniter})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8 /* pPg */)))
 		// It used to be that sqlite3PcacheMakeClean(pPg) was called here.  But
 		// that call was dangerous and had no detectable benefit since the cache
 		// is normally cleaned by sqlite3PcacheCleanAll() after rollback and so
@@ -78458,7 +79101,7 @@ func pagerUndoCallback(tls *libc.TLS, pCtx uintptr, iPg Pgno) int32 { /* sqlite3
 		} else {
 			rc = readDbPage(tls, pPg)
 			if rc == SQLITE_OK {
-				(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pPager + 256 /* &.xReiniter */))))(tls, pPg)
+				(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Pager)(unsafe.Pointer(pPager)).FxReiniter})).f(tls, pPg)
 			}
 			Xsqlite3PagerUnrefNotNull(tls, pPg)
 		}
@@ -79190,7 +79833,9 @@ func pager_wait_on_lock(tls *libc.TLS, pPager uintptr, locktype int32) int32 { /
 	// may be invoked during, according to the comment above
 	// sqlite3PagerSetBusyhandler().
 
-	for ok := true; ok; ok = ((rc == SQLITE_BUSY) && ((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pPager + 224 /* &.xBusyHandler */))))(tls, (*Pager)(unsafe.Pointer(pPager)).FpBusyHandlerArg) != 0)) {
+	for ok := true; ok; ok = ((rc == SQLITE_BUSY) && ((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Pager)(unsafe.Pointer(pPager)).FxBusyHandler})).f(tls, (*Pager)(unsafe.Pointer(pPager)).FpBusyHandlerArg) != 0)) {
 		rc = pagerLockDb(tls, pPager, locktype)
 	}
 	return rc
@@ -80993,7 +81638,9 @@ func getPageError(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flag
 
 // Dispatch all page fetch requests to the appropriate getter method.
 func Xsqlite3PagerGet(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags int32) int32 { /* sqlite3.c:58297:20: */
-	return (*(*func(*libc.TLS, uintptr, Pgno, uintptr, int32) int32)(unsafe.Pointer((pPager + 264 /* &.xGet */))))(tls, pPager, pgno, ppPage, flags)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Pgno, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Pager)(unsafe.Pointer(pPager)).FxGet})).f(tls, pPager, pgno, ppPage, flags)
 }
 
 // Acquire a page if it is already in the in-memory cache.  Do
@@ -83250,12 +83897,12 @@ type WalIterator1 = struct {
 	FiPrior   U32
 	FnSegment int32
 	FaSegment [1]struct {
-		FiNext  int32
-		_       [4]byte
-		FaIndex uintptr
-		FaPgno  uintptr
-		FnEntry int32
-		FiZero  int32
+		FiNext       int32
+		F__ccgo_pad1 [4]byte
+		FaIndex      uintptr
+		FaPgno       uintptr
+		FnEntry      int32
+		FiZero       int32
 	}
 } /* sqlite3.c:60656:9 */
 
@@ -83292,12 +83939,12 @@ type Ht_slot = U16 /* sqlite3.c:60848:13 */
 //
 // This functionality is used by the checkpoint code (see walCheckpoint()).
 type WalSegment = struct {
-	FiNext  int32
-	_       [4]byte
-	FaIndex uintptr
-	FaPgno  uintptr
-	FnEntry int32
-	FiZero  int32
+	FiNext       int32
+	F__ccgo_pad1 [4]byte
+	FaIndex      uintptr
+	FaPgno       uintptr
+	FnEntry      int32
+	FiZero       int32
 } /* sqlite3.c:60656:9 */
 
 // Define the parameters of the hash tables in the wal-index file. There
@@ -83333,13 +83980,13 @@ func walIndexPageRealloc(tls *libc.TLS, pWal uintptr, iPage int32, ppPage uintpt
 		var nByte Sqlite3_int64 = (Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * (uint64(iPage + 1))))
 		var apNew uintptr
 		libc.AtomicStoreUintptr(&apNew, uintptr(Xsqlite3Realloc(tls, (*Wal)(unsafe.Pointer(pWal)).FapWiData, uint64(nByte))))
-		if !(libc.AtomicLoadUintptr(&apNew) != 0) {
-			*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&ppPage))) = uintptr(0)
+		if !(apNew != 0) {
+			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
 			return SQLITE_NOMEM
 		}
-		libc.Xmemset(tls, (libc.AtomicLoadUintptr(&apNew) + uintptr((*Wal)(unsafe.Pointer(pWal)).FnWiData)*8), 0,
+		libc.Xmemset(tls, (apNew + uintptr((*Wal)(unsafe.Pointer(pWal)).FnWiData)*8), 0,
 			(uint64(unsafe.Sizeof(uintptr(0))) * (uint64((iPage + 1) - (*Wal)(unsafe.Pointer(pWal)).FnWiData))))
-		(*Wal)(unsafe.Pointer(pWal)).FapWiData = libc.AtomicLoadUintptr(&apNew)
+		(*Wal)(unsafe.Pointer(pWal)).FapWiData = apNew
 		(*Wal)(unsafe.Pointer(pWal)).FnWiData = (iPage + 1)
 	}
 
@@ -83366,14 +84013,14 @@ func walIndexPageRealloc(tls *libc.TLS, pWal uintptr, iPage int32, ppPage uintpt
 		}
 	}
 
-	*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&ppPage))) = *(*uintptr)(unsafe.Pointer((*Wal)(unsafe.Pointer(pWal)).FapWiData + uintptr(iPage)*8))
+	*(*uintptr)(unsafe.Pointer(ppPage)) = *(*uintptr)(unsafe.Pointer((*Wal)(unsafe.Pointer(pWal)).FapWiData + uintptr(iPage)*8))
 
 	return rc
 }
 
 func walIndexPage(tls *libc.TLS, pWal uintptr, iPage int32, ppPage uintptr) int32 { /* sqlite3.c:60962:12: */
-	if ((*Wal)(unsafe.Pointer(pWal)).FnWiData <= iPage) || ((libc.AssignPtrUintptr(libc.AtomicLoadUintptr(&ppPage), *(*uintptr)(unsafe.Pointer((*Wal)(unsafe.Pointer(pWal)).FapWiData + uintptr(iPage)*8)))) == uintptr(0)) {
-		return walIndexPageRealloc(tls, pWal, iPage, libc.AtomicLoadUintptr(&ppPage))
+	if ((*Wal)(unsafe.Pointer(pWal)).FnWiData <= iPage) || ((libc.AssignPtrUintptr(ppPage, *(*uintptr)(unsafe.Pointer((*Wal)(unsafe.Pointer(pWal)).FapWiData + uintptr(iPage)*8)))) == uintptr(0)) {
+		return walIndexPageRealloc(tls, pWal, iPage, ppPage)
 	}
 	return SQLITE_OK
 }
@@ -83458,9 +84105,9 @@ func walIndexWriteHdr(tls *libc.TLS, pWal uintptr) { /* sqlite3.c:61077:28: */
 	(*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion = U32(WALINDEX_MAX_VERSION)
 	walChecksumBytes(tls, 1, (pWal + 72 /* &.hdr */), nCksum, uintptr(0), pWal+72 /* &.hdr */ +40 /* &.aCksum */)
 	// Possible TSAN false-positive.  See tag-20200519-1
-	libc.Xmemcpy(tls, (libc.AtomicLoadUintptr(&aHdr) + 1*48), (pWal + 72 /* &.hdr */), uint64(unsafe.Sizeof(WalIndexHdr{})))
+	libc.Xmemcpy(tls, (aHdr + 1*48), (pWal + 72 /* &.hdr */), uint64(unsafe.Sizeof(WalIndexHdr{})))
 	walShmBarrier(tls, pWal)
-	libc.Xmemcpy(tls, (libc.AtomicLoadUintptr(&aHdr)), (pWal + 72 /* &.hdr */), uint64(unsafe.Sizeof(WalIndexHdr{})))
+	libc.Xmemcpy(tls, (aHdr), (pWal + 72 /* &.hdr */), uint64(unsafe.Sizeof(WalIndexHdr{})))
 }
 
 // This function encodes a single frame header and writes it to a buffer
@@ -83595,10 +84242,10 @@ func walNextHash(tls *libc.TLS, iPriorHash int32) int32 { /* sqlite3.c:61258:12:
 // of a page hash table in the wal-index.  This becomes the return value
 // from walHashGet().
 type WalHashLoc1 = struct {
-	FaHash uintptr
-	FaPgno uintptr
-	FiZero U32
-	_      [4]byte
+	FaHash       uintptr
+	FaPgno       uintptr
+	FiZero       U32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:61267:9 */
 
 // An instance of the WalHashLoc object is used to describe the location
@@ -84023,9 +84670,9 @@ finished:
 	// currently holding locks that exclude all other writers and
 	// checkpointers. Then set the values of read-mark slots 1 through N.
 	libc.AtomicStoreUintptr(&pInfo, uintptr(walCkptInfo(tls, pWal)))
-	(*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill = U32(0)
-	(*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted = (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame
-	*(*U32)(unsafe.Pointer((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */))) = U32(0)
+	(*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill = U32(0)
+	(*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted = (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame
+	*(*U32)(unsafe.Pointer((pInfo + 4 /* &.aReadMark */))) = U32(0)
 	i = 1
 __22:
 	if !(i < (SQLITE_SHM_NLOCK - 3)) {
@@ -84038,10 +84685,10 @@ __22:
 	if !((i == 1) && ((*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0)) {
 		goto __27
 	}
-	*(*U32)(unsafe.Pointer((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4)) = (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame
+	*(*U32)(unsafe.Pointer((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4)) = (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame
 	goto __28
 __27:
-	*(*U32)(unsafe.Pointer((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4)) = READMARK_NOT_USED
+	*(*U32)(unsafe.Pointer((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4)) = READMARK_NOT_USED
 __28:
 	;
 	walUnlockExclusive(tls, pWal, (3 + (i)), 1)
@@ -84324,9 +84971,9 @@ func walMergesort(tls *libc.TLS, aContent uintptr, aBuffer uintptr, aList uintpt
 }
 
 type Sublist = struct {
-	FnList int32
-	_      [4]byte
-	FaList uintptr
+	FnList       int32
+	F__ccgo_pad1 [4]byte
+	FaList       uintptr
 } /* sqlite3.c:61957:3 */
 
 // Free an iterator allocated by walIteratorInit().
@@ -84432,7 +85079,9 @@ func walIteratorInit(tls *libc.TLS, pWal uintptr, nBackfill U32, pp uintptr) int
 // lock is successfully obtained or the busy-handler returns 0.
 func walBusyLock(tls *libc.TLS, pWal uintptr, xBusy uintptr, pBusyArg uintptr, lockIdx int32, n int32) int32 { /* sqlite3.c:62195:12: */
 	var rc int32
-	for ok := true; ok; ok = (((xBusy != 0) && (rc == SQLITE_BUSY)) && ((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(&xBusy)))(tls, pBusyArg) != 0)) {
+	for ok := true; ok; ok = (((xBusy != 0) && (rc == SQLITE_BUSY)) && ((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xBusy})).f(tls, pBusyArg) != 0)) {
 		rc = walLockExclusive(tls, pWal, lockIdx, n)
 	}
 	return rc
@@ -84472,11 +85121,11 @@ func walRestartHdr(tls *libc.TLS, pWal uintptr, salt1 U32) { /* sqlite3.c:62240:
 	Xsqlite3Put4byte(tls, (aSalt), (U32(1) + Xsqlite3Get4byte(tls, (aSalt))))
 	libc.Xmemcpy(tls, ((pWal + 72 /* &.hdr */ + 32 /* &.aSalt */) + 1*4), bp /* &salt1 */, uint64(4))
 	walIndexWriteHdr(tls, pWal)
-	libc.AtomicStoreNInt32((libc.AtomicLoadUintptr(&pInfo) /* &.nBackfill */), int32(0), 0)
-	(*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted = U32(0)
-	*(*U32)(unsafe.Pointer((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + 1*4)) = U32(0)
+	libc.AtomicStoreNInt32((pInfo /* &.nBackfill */), int32(0), 0)
+	(*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted = U32(0)
+	*(*U32)(unsafe.Pointer((pInfo + 4 /* &.aReadMark */) + 1*4)) = U32(0)
 	for i = 2; i < (SQLITE_SHM_NLOCK - 3); i++ {
-		*(*U32)(unsafe.Pointer((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4)) = READMARK_NOT_USED
+		*(*U32)(unsafe.Pointer((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4)) = READMARK_NOT_USED
 	}
 
 }
@@ -84544,7 +85193,7 @@ func walCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32, xBusy u
 	szPage = walPagesize(tls, pWal)
 
 	libc.AtomicStoreUintptr(&pInfo, uintptr(walCkptInfo(tls, pWal)))
-	if !((*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill < (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame) {
+	if !((*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill < (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame) {
 		goto __1
 	}
 
@@ -84562,7 +85211,7 @@ __2:
 	if !(i < (SQLITE_SHM_NLOCK - 3)) {
 		goto __4
 	}
-	y = U32(libc.AtomicLoadNUint32(((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4), 0))
+	y = U32(libc.AtomicLoadNUint32(((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4), 0))
 	if !(mxSafeFrame > y) {
 		goto __5
 	}
@@ -84577,7 +85226,7 @@ __2:
 		}
 		return READMARK_NOT_USED
 	}()
-	libc.AtomicStoreNUint32(((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4), uint32(iMark), 0)
+	libc.AtomicStoreNUint32(((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4), uint32(iMark), 0)
 	walUnlockExclusive(tls, pWal, (3 + (i)), 1)
 	goto __7
 __6:
@@ -84604,10 +85253,10 @@ __4:
 	;
 
 	// Allocate the iterator
-	if !((*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill < mxSafeFrame) {
+	if !((*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill < mxSafeFrame) {
 		goto __10
 	}
-	rc = walIteratorInit(tls, pWal, (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill, bp /* &pIter */)
+	rc = walIteratorInit(tls, pWal, (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill, bp /* &pIter */)
 
 __10:
 	;
@@ -84616,9 +85265,9 @@ __10:
 		((libc.AssignInt32(&rc, walBusyLock(tls, pWal, xBusy, pBusyArg, (3+(0)), 1))) == SQLITE_OK)) {
 		goto __11
 	}
-	nBackfill = (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill
+	nBackfill = (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill
 
-	(*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted = mxSafeFrame
+	(*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted = mxSafeFrame
 
 	// Sync the WAL to disk
 	rc = Xsqlite3OsSync(tls, (*Wal)(unsafe.Pointer(pWal)).FpWalFd, (((sync_flags) >> 2) & 0x03))
@@ -84720,7 +85369,7 @@ __23:
 	if !(rc == SQLITE_OK) {
 		goto __25
 	}
-	libc.AtomicStoreNUint32((libc.AtomicLoadUintptr(&pInfo) /* &.nBackfill */), uint32(mxSafeFrame), 0)
+	libc.AtomicStoreNUint32((pInfo /* &.nBackfill */), uint32(mxSafeFrame), 0)
 __25:
 	;
 __22:
@@ -84750,7 +85399,7 @@ __1:
 		goto __27
 	}
 
-	if !((*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill < (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame) {
+	if !((*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill < (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame) {
 		goto __28
 	}
 	rc = SQLITE_BUSY
@@ -84923,9 +85572,9 @@ func walIndexTryHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 { /* sq
 	// shared among multiple processes and not all mutex implementions work
 	// reliably in that environment.
 	libc.AtomicStoreUintptr(&aHdr, uintptr(walIndexHdr(tls, pWal)))
-	libc.Xmemcpy(tls, bp /* &h1 */, (libc.AtomicLoadUintptr(&aHdr)), uint64(unsafe.Sizeof(WalIndexHdr{}))) // Possible TSAN false-positive
+	libc.Xmemcpy(tls, bp /* &h1 */, (aHdr), uint64(unsafe.Sizeof(WalIndexHdr{}))) // Possible TSAN false-positive
 	walShmBarrier(tls, pWal)
-	libc.Xmemcpy(tls, bp+48 /* &h2 */, (libc.AtomicLoadUintptr(&aHdr) + 1*48), uint64(unsafe.Sizeof(WalIndexHdr{})))
+	libc.Xmemcpy(tls, bp+48 /* &h2 */, (aHdr + 1*48), uint64(unsafe.Sizeof(WalIndexHdr{})))
 
 	if (libc.Xmemcmp(tls, bp /* &h1 */, bp+48 /* &h2 */, uint64(unsafe.Sizeof(WalIndexHdr{}))) != 0) {
 		return 1 // Dirty read
@@ -85002,7 +85651,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 { /* s
 	// works, but may fail if the wal-index header is corrupt or currently
 	// being modified by another thread or process.
 	badHdr = func() int32 {
-		if libc.AtomicLoadPUintptr(bp /* page0 */) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp /* page0 */)) != 0 {
 			return walIndexTryHdr(tls, pWal, pChanged)
 		}
 		return 1
@@ -85428,7 +86077,7 @@ func walTryBeginRead(tls *libc.TLS, pWal uintptr, pChanged uintptr, useWal int32
 	}
 
 	libc.AtomicStoreUintptr(&pInfo, uintptr(walCkptInfo(tls, pWal)))
-	if (!(useWal != 0) && (U32(libc.AtomicLoadNUint32((libc.AtomicLoadUintptr(&pInfo) /* &.nBackfill */), 0)) == (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame)) &&
+	if (!(useWal != 0) && (U32(libc.AtomicLoadNUint32((pInfo /* &.nBackfill */), 0)) == (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame)) &&
 		(((*Wal)(unsafe.Pointer(pWal)).FpSnapshot == uintptr(0)) || ((*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame == U32(0))) {
 		// The WAL has been completely backfilled (or it is empty).
 		// and can be safely ignored.
@@ -85469,7 +86118,7 @@ func walTryBeginRead(tls *libc.TLS, pWal uintptr, pChanged uintptr, useWal int32
 		mxFrame = (*WalIndexHdr)(unsafe.Pointer((*Wal)(unsafe.Pointer(pWal)).FpSnapshot)).FmxFrame
 	}
 	for i = 1; i < (SQLITE_SHM_NLOCK - 3); i++ {
-		var thisMark U32 = U32(libc.AtomicLoadNUint32(((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4), 0))
+		var thisMark U32 = U32(libc.AtomicLoadNUint32(((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4), 0))
 		if (mxReadMark <= thisMark) && (thisMark <= mxFrame) {
 
 			mxReadMark = thisMark
@@ -85481,7 +86130,7 @@ func walTryBeginRead(tls *libc.TLS, pWal uintptr, pChanged uintptr, useWal int32
 		for i = 1; i < (SQLITE_SHM_NLOCK - 3); i++ {
 			rc = walLockExclusive(tls, pWal, (3 + (i)), 1)
 			if rc == SQLITE_OK {
-				libc.AtomicStoreNUint32(((libc.AtomicLoadUintptr(&pInfo) + 4 /* &.aReadMark */) + uintptr(i)*4), uint32(mxFrame), 0)
+				libc.AtomicStoreNUint32(((pInfo + 4 /* &.aReadMark */) + uintptr(i)*4), uint32(mxFrame), 0)
 				mxReadMark = mxFrame
 				mxI = i
 				walUnlockExclusive(tls, pWal, (3 + (i)), 1)
@@ -85539,9 +86188,9 @@ func walTryBeginRead(tls *libc.TLS, pWal uintptr, pChanged uintptr, useWal int32
 	// that it can read version A from the database file. However, since
 	// we can guarantee that the checkpointer that set nBackfill could not
 	// see any pages past pWal->hdr.mxFrame, this problem does not come up.
-	(*Wal)(unsafe.Pointer(pWal)).FminFrame = (U32(libc.AtomicLoadNUint32((libc.AtomicLoadUintptr(&pInfo) /* &.nBackfill */), 0) + 1))
+	(*Wal)(unsafe.Pointer(pWal)).FminFrame = (U32(libc.AtomicLoadNUint32((pInfo /* &.nBackfill */), 0) + 1))
 	walShmBarrier(tls, pWal)
-	if (U32(libc.AtomicLoadNUint32(((libc.AtomicLoadUintptr(&pInfo)+4 /* &.aReadMark */)+uintptr(mxI)*4), 0)) != mxReadMark) ||
+	if (U32(libc.AtomicLoadNUint32(((pInfo+4 /* &.aReadMark */)+uintptr(mxI)*4), 0)) != mxReadMark) ||
 		(libc.Xmemcmp(tls, walIndexHdr(tls, pWal), (pWal+72 /* &.hdr */), uint64(unsafe.Sizeof(WalIndexHdr{}))) != 0) {
 		walUnlockShared(tls, pWal, (3 + (mxI)))
 		return -1
@@ -85589,8 +86238,8 @@ func Xsqlite3WalSnapshotRecover(tls *libc.TLS, pWal uintptr) int32 { /* sqlite3.
 			if (pBuf1 == uintptr(0)) || (pBuf2 == uintptr(0)) {
 				rc = SQLITE_NOMEM
 			} else {
-				var i U32 = (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted
-				for i = (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted; i > U32(libc.AtomicLoadNUint32((libc.AtomicLoadUintptr(&pInfo) /* &.nBackfill */), 0)); i-- {
+				var i U32 = (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted
+				for i = (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted; i > U32(libc.AtomicLoadNUint32((pInfo /* &.nBackfill */), 0)); i-- {
 					// var sLoc WalHashLoc at bp+8, 24
 					// Hash table location
 					var pgno U32    // Page number in db file
@@ -85617,7 +86266,7 @@ func Xsqlite3WalSnapshotRecover(tls *libc.TLS, pWal uintptr) int32 { /* sqlite3.
 						}
 					}
 
-					(*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted = (i - U32(1))
+					(*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted = (i - U32(1))
 				}
 			}
 
@@ -85697,7 +86346,7 @@ func Xsqlite3WalBeginReadTransaction(tls *libc.TLS, pWal uintptr, pChanged uintp
 			// with *pSnapshot and set *pChanged as appropriate for opening the
 			// snapshot.
 			if !(libc.Xmemcmp(tls, pSnapshot+32 /* &.aSalt */, pWal+72 /* &.hdr */ +32 /* &.aSalt */, uint64(unsafe.Sizeof([2]U32{}))) != 0) &&
-				((*WalIndexHdr)(unsafe.Pointer(pSnapshot)).FmxFrame >= (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfillAttempted) {
+				((*WalIndexHdr)(unsafe.Pointer(pSnapshot)).FmxFrame >= (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfillAttempted) {
 
 				libc.Xmemcpy(tls, (pWal + 72 /* &.hdr */), pSnapshot, uint64(unsafe.Sizeof(WalIndexHdr{})))
 				*(*int32)(unsafe.Pointer(pChanged)) = bChanged
@@ -85936,7 +86585,9 @@ func Xsqlite3WalUndo(tls *libc.TLS, pWal uintptr, xUndo uintptr, pUndoCtx uintpt
 			// page 1 is never written to the log until the transaction is
 			// committed. As a result, the call to xUndo may not fail.
 
-			rc = (*(*func(*libc.TLS, uintptr, Pgno) int32)(unsafe.Pointer(&xUndo)))(tls, pUndoCtx, walFramePgno(tls, pWal, iFrame))
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, Pgno) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xUndo})).f(tls, pUndoCtx, walFramePgno(tls, pWal, iFrame))
 		}
 		if iMax != (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame {
 			walCleanupHash(tls, pWal)
@@ -86002,7 +86653,7 @@ func walRestartLog(tls *libc.TLS, pWal uintptr) int32 { /* sqlite3.c:63690:12: *
 	if int32((*Wal)(unsafe.Pointer(pWal)).FreadLock) == 0 {
 		var pInfo uintptr = walCkptInfo(tls, pWal)
 
-		if (*WalCkptInfo)(unsafe.Pointer(libc.AtomicLoadUintptr(&pInfo))).FnBackfill > U32(0) {
+		if (*WalCkptInfo)(unsafe.Pointer(pInfo)).FnBackfill > U32(0) {
 			// var salt1 U32 at bp, 4
 
 			Xsqlite3_randomness(tls, 4, bp /* &salt1 */)
@@ -86912,7 +87563,7 @@ type MemPage1 = struct {
 	FchildPtrSize    U8
 	Fmax1bytePayload U8
 	FnOverflow       U8
-	_                [1]byte
+	F__ccgo_pad1     [1]byte
 	FmaxLocal        U16
 	FminLocal        U16
 	FcellOffset      U16
@@ -86920,7 +87571,7 @@ type MemPage1 = struct {
 	FnCell           U16
 	FmaskPage        U16
 	FaiOvfl          [4]U16
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FapOvfl          [4]uintptr
 	FpBt             uintptr
 	FaData           uintptr
@@ -87177,11 +87828,11 @@ type MemPage1 = struct {
 // Forward declarations
 type MemPage = MemPage1 /* sqlite3.c:64658:24 */
 type BtLock1 = struct {
-	FpBtree uintptr
-	FiTable Pgno
-	FeLock  U8
-	_       [3]byte
-	FpNext  uintptr
+	FpBtree      uintptr
+	FiTable      Pgno
+	FeLock       U8
+	F__ccgo_pad1 [3]byte
+	FpNext       uintptr
 } /* sqlite3.c:1331:9 */
 
 type BtLock = BtLock1 /* sqlite3.c:64659:23 */
@@ -88527,7 +89178,9 @@ func btreeParseCellPtrIndex(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo u
 }
 
 func btreeParseCell(tls *libc.TLS, pPage uintptr, iCell int32, pInfo uintptr) { /* sqlite3.c:66752:13: */
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, ((*MemPage)(unsafe.Pointer((pPage))).FaData + uintptr((int32((*MemPage)(unsafe.Pointer((pPage))).FmaskPage) & int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(((*MemPage)(unsafe.Pointer((pPage))).FaCellIdx + uintptr((2 * (iCell))))))))))), pInfo)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, ((*MemPage)(unsafe.Pointer((pPage))).FaData + uintptr((int32((*MemPage)(unsafe.Pointer((pPage))).FmaskPage) & int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(((*MemPage)(unsafe.Pointer((pPage))).FaCellIdx + uintptr((2 * (iCell))))))))))), pInfo)
 }
 
 // The following routines are implementations of the MemPage.xCellSize
@@ -88608,7 +89261,9 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 		return
 	}
 
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, pCell, bp /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp /* &info */)
 	if U32((*CellInfo)(unsafe.Pointer(bp /* &info */)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp /* &info */)).FnPayload {
 		var ovfl Pgno
 		if (Uptr(((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd)) >= Uptr((pCell))) && (Uptr(((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd)) < Uptr((pCell + uintptr((*CellInfo)(unsafe.Pointer(bp /* &info */)).FnLocal)))) {
@@ -88791,7 +89446,9 @@ __18:
 __21:
 	;
 
-	size = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pPage + 120 /* &.xCellSize */))))(tls, pPage, (src + uintptr(pc))))
+	size = int32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, (src + uintptr(pc))))
 	cbrk = cbrk - (size)
 	if !((cbrk < iCellStart) || ((pc + size) > usableSize)) {
 		goto __22
@@ -89281,7 +89938,9 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 { /* sqlite3.c:67431
 		if (pc < iCellFirst) || (pc > iCellLast) {
 			return Xsqlite3CorruptError(tls, 67452)
 		}
-		sz = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pPage + 120 /* &.xCellSize */))))(tls, pPage, (data + uintptr(pc))))
+		sz = int32((*struct {
+			f func(*libc.TLS, uintptr, uintptr) U16
+		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, (data + uintptr(pc))))
 
 		if (pc + sz) > usableSize {
 			return Xsqlite3CorruptError(tls, 67457)
@@ -90119,7 +90778,7 @@ func Xsqlite3BtreeClose(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:68190:20:
 
 		Xsqlite3PagerClose(tls, (*BtShared)(unsafe.Pointer(pBt)).FpPager, (*Btree)(unsafe.Pointer(p)).Fdb)
 		if ((*BtShared)(unsafe.Pointer(pBt)).FxFreeSchema != 0) && ((*BtShared)(unsafe.Pointer(pBt)).FpSchema != 0) {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pBt + 80 /* &.xFreeSchema */))))(tls, (*BtShared)(unsafe.Pointer(pBt)).FpSchema)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*BtShared)(unsafe.Pointer(pBt)).FxFreeSchema})).f(tls, (*BtShared)(unsafe.Pointer(pBt)).FpSchema)
 		}
 		Xsqlite3DbFree(tls, uintptr(0), (*BtShared)(unsafe.Pointer(pBt)).FpSchema)
 		freeTempSpace(tls, pBt)
@@ -91073,7 +91732,9 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 			if int32(eType) == PTRMAP_OVERFLOW1 {
 				// var info CellInfo at bp, 24
 
-				(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, pCell, bp /* &info */)
+				(*struct {
+					f func(*libc.TLS, uintptr, uintptr, uintptr)
+				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp /* &info */)
 				if U32((*CellInfo)(unsafe.Pointer(bp /* &info */)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp /* &info */)).FnPayload {
 					if (pCell + uintptr((*CellInfo)(unsafe.Pointer(bp /* &info */)).FnSize)) > ((*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize)) {
 						return Xsqlite3CorruptError(tls, 69109)
@@ -92879,7 +93540,9 @@ __35: // Size of the pCell cell in bytes
 	// single byte varint and the record fits entirely on the main
 	// b-tree page.
 
-	c = (*(*func(*libc.TLS, int32, uintptr, uintptr) int32)(unsafe.Pointer(&xRecordCompare)))(tls, nCell, (pCell + 1), pIdxKey)
+	c = (*struct {
+		f func(*libc.TLS, int32, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xRecordCompare})).f(tls, nCell, (pCell + 1), pIdxKey)
 	goto __39
 __38:
 	if !(!((int32(*(*U8)(unsafe.Pointer(pCell + 1))) & 0x80) != 0) &&
@@ -92889,12 +93552,16 @@ __38:
 	// The record-size field is a 2 byte varint and the record
 	// fits entirely on the main b-tree page.
 
-	c = (*(*func(*libc.TLS, int32, uintptr, uintptr) int32)(unsafe.Pointer(&xRecordCompare)))(tls, nCell, (pCell + 2), pIdxKey)
+	c = (*struct {
+		f func(*libc.TLS, int32, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xRecordCompare})).f(tls, nCell, (pCell + 2), pIdxKey)
 	goto __41
 __40:
 	pCellBody = (pCell - uintptr((*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize))
 	nOverrun = 18 // Size of the overrun padding
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, pCellBody, (pCur + 48 /* &.info */))
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCellBody, (pCur + 48 /* &.info */))
 	nCell = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnKey)
 	// True if key size is 2^32 or more
 	// Invalid key size:  0x80 0x80 0x00
@@ -94466,13 +95133,13 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 // entries, shift down.  The end result is that each ixNx[] entry should
 // be larger than the previous
 type CellArray1 = struct {
-	FnCell  int32
-	_       [4]byte
-	FpRef   uintptr
-	FapCell uintptr
-	FszCell uintptr
-	FapEnd  [6]uintptr
-	FixNx   [6]int32
+	FnCell       int32
+	F__ccgo_pad1 [4]byte
+	FpRef        uintptr
+	FapCell      uintptr
+	FszCell      uintptr
+	FapEnd       [6]uintptr
+	FixNx        [6]int32
 } /* sqlite3.c:72392:9 */
 
 // The following parameters determine how many adjacent pages get involved
@@ -94559,7 +95226,9 @@ func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) { /* sqlite
 	for N > 0 {
 
 		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer(((*CellArray)(unsafe.Pointer(p)).FpRef + 120 /* &.xCellSize */))))(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 
 		}
@@ -94571,7 +95240,9 @@ func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) { /* sqlite
 // Return the size of the Nth element of the cell array
 func computeCellSize(tls *libc.TLS, p uintptr, N int32) U16 { /* sqlite3.c:72424:28: */
 
-	*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(N)*2)) = (*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer(((*CellArray)(unsafe.Pointer(p)).FpRef + 120 /* &.xCellSize */))))(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(N)*8)))
+	*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(N)*2)) = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(N)*8)))
 	return *(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(N)*2))
 }
 
@@ -94998,7 +95669,9 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 
 		var pOut uintptr = (pSpace + 4)
 		*(*uintptr)(unsafe.Pointer(bp + 16 /* pCell */)) = *(*uintptr)(unsafe.Pointer((pPage + 40 /* &.apOvfl */)))
-		*(*U16)(unsafe.Pointer(bp + 24 /* szCell */)) = (*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pPage + 120 /* &.xCellSize */))))(tls, pPage, *(*uintptr)(unsafe.Pointer(bp + 16 /* pCell */)))
+		*(*U16)(unsafe.Pointer(bp + 24 /* szCell */)) = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) U16
+		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, *(*uintptr)(unsafe.Pointer(bp + 16 /* pCell */)))
 		var pStop uintptr
 		// var b CellArray at bp+32, 104
 
@@ -95364,13 +96037,17 @@ __16:
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((pParent + 40 /* &.apOvfl */)))
 	*(*Pgno)(unsafe.Pointer(bp + 272 /* pgno */)) = Xsqlite3Get4byte(tls, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8)))
-	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew[0] */ + uintptr(i)*4)) = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pParent + 120 /* &.xCellSize */))))(tls, pParent, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8))))
+	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew[0] */ + uintptr(i)*4)) = int32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pParent)).FxCellSize})).f(tls, pParent, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8))))
 	(*MemPage)(unsafe.Pointer(pParent)).FnOverflow = U8(0)
 	goto __18
 __17:
 	*(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8)) = ((*MemPage)(unsafe.Pointer((pParent))).FaData + uintptr((int32((*MemPage)(unsafe.Pointer((pParent))).FmaskPage) & int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(((*MemPage)(unsafe.Pointer((pParent))).FaCellIdx + uintptr((2 * ((i + nxDiv) - int32((*MemPage)(unsafe.Pointer(pParent)).FnOverflow))))))))))))
 	*(*Pgno)(unsafe.Pointer(bp + 272 /* pgno */)) = Xsqlite3Get4byte(tls, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8)))
-	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew[0] */ + uintptr(i)*4)) = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pParent + 120 /* &.xCellSize */))))(tls, pParent, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8))))
+	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew[0] */ + uintptr(i)*4)) = int32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pParent)).FxCellSize})).f(tls, pParent, *(*uintptr)(unsafe.Pointer(bp + 32 /* &apDiv[0] */ + uintptr(i)*8))))
 
 	// Drop the cell from the parent page. apDiv[i] still points to
 	// the cell within the parent, even though it has been dropped.
@@ -95632,7 +96309,9 @@ __46:
 	if !(j < int32((*MemPage)(unsafe.Pointer(p)).FnOverflow)) {
 		goto __48
 	}
-	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew */ + uintptr(i)*4)) += (2 + int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((p + 120 /* &.xCellSize */))))(tls, p, *(*uintptr)(unsafe.Pointer((p + 40 /* &.apOvfl */) + uintptr(j)*8)))))
+	*(*int32)(unsafe.Pointer(bp + 48 /* &szNew */ + uintptr(i)*4)) += (2 + int32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(p)).FxCellSize})).f(tls, p, *(*uintptr)(unsafe.Pointer((p + 40 /* &.apOvfl */) + uintptr(j)*8)))))
 	goto __47
 __47:
 	j++
@@ -96136,7 +96815,9 @@ __118:
 		goto __120
 	}
 	j--
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pNew2 + 128 /* &.xParseCell */))))(tls, pNew2, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+96 /* &b */)).FapCell + uintptr(j)*8)), bp+328 /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pNew2)).FxParseCell})).f(tls, pNew2, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+96 /* &b */)).FapCell + uintptr(j)*8)), bp+328 /* &info */)
 	pCell1 = pTemp1
 	sz2 = (4 + Xsqlite3PutVarint(tls, (pCell1+4), uint64((*CellInfo)(unsafe.Pointer(bp+328 /* &info */)).FnKey)))
 	pTemp1 = uintptr(0)
@@ -96157,7 +96838,9 @@ __120:
 		goto __122
 	}
 
-	sz2 = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pParent + 120 /* &.xCellSize */))))(tls, pParent, pCell1))
+	sz2 = int32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pParent)).FxCellSize})).f(tls, pParent, pCell1))
 __122:
 	;
 __121:
@@ -96953,7 +97636,9 @@ __25:
 	if !(((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) && (*(*int32)(unsafe.Pointer(bp + 108 /* szNew */)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal))) {
 		goto __26
 	}
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, newCell, bp+80 /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, newCell, bp+80 /* &info */)
 	if !((*CellInfo)(unsafe.Pointer(bp+80 /* &info */)).FnPayload != U32((*CellInfo)(unsafe.Pointer(bp+80 /* &info */)).FnLocal)) {
 		goto __27
 	}
@@ -96994,7 +97679,9 @@ __31:
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
 __32:
 	;
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, oldCell, bp+112 /* &info1 */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+112 /* &info1 */)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+112 /* &info1 */)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+112 /* &info1 */)).FnPayload) {
 		goto __33
 	}
@@ -97363,7 +98050,9 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 { /* sqlit
 	if *(*int32)(unsafe.Pointer(bp + 24 /* rc */)) != 0 {
 		return *(*int32)(unsafe.Pointer(bp + 24 /* rc */))
 	}
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pPage + 128 /* &.xParseCell */))))(tls, pPage, pCell, bp /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp /* &info */)
 	if U32((*CellInfo)(unsafe.Pointer(bp /* &info */)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp /* &info */)).FnPayload {
 		*(*int32)(unsafe.Pointer(bp + 24 /* rc */)) = clearCellOverflow(tls, pPage, pCell, bp /* &info */)
 	} else {
@@ -97401,7 +98090,9 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 { /* sqlit
 		if pCell < ((*MemPage)(unsafe.Pointer(pLeaf)).FaData + 4) {
 			return Xsqlite3CorruptError(tls, 74681)
 		}
-		nCell = int32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((pLeaf + 120 /* &.xCellSize */))))(tls, pLeaf, pCell))
+		nCell = int32((*struct {
+			f func(*libc.TLS, uintptr, uintptr) U16
+		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pLeaf)).FxCellSize})).f(tls, pLeaf, pCell))
 
 		pTmp = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 
@@ -97673,7 +98364,9 @@ __8:
 	;
 __7:
 	;
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp /* pPage */)) + 128 /* &.xParseCell */))))(tls, *(*uintptr)(unsafe.Pointer(bp /* pPage */)), pCell, bp+8 /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp /* pPage */)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp /* pPage */)), pCell, bp+8 /* &info */)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+8 /* &info */)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+8 /* &info */)).FnPayload) {
 		goto __9
 	}
@@ -98404,7 +99097,9 @@ __9:
 __12:
 	;
 	pCell = (data + uintptr(pc))
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)) + 128 /* &.xParseCell */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)), pCell, bp+112 /* &info */)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)), pCell, bp+112 /* &info */)
 	if !((pc + U32((*CellInfo)(unsafe.Pointer(bp+112 /* &info */)).FnSize)) > usableSize) {
 		goto __13
 	}
@@ -98505,7 +99200,9 @@ __24:
 		goto __26
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((data + uintptr((cellStart + (i * 2))))))))
-	size = U32((*(*func(*libc.TLS, uintptr, uintptr) U16)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)) + 120 /* &.xCellSize */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)), (data + uintptr(pc))))
+	size = U32((*struct {
+		f func(*libc.TLS, uintptr, uintptr) U16
+	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96 /* pPage */)), (data + uintptr(pc))))
 	btreeHeapInsert(tls, heap, ((pc << 16) | ((pc + size) - U32(1))))
 	goto __25
 __25:
@@ -99890,7 +100587,7 @@ func Xsqlite3VdbeMemGrow(tls *libc.TLS, pMem uintptr, n int32, bPreserve int32)
 	}
 	if (int32((*Mem)(unsafe.Pointer(pMem)).Fflags) & MEM_Dyn) != 0 {
 
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pMem + 48 /* &.xDel */))))(tls, (*Mem)(unsafe.Pointer(pMem)).Fz)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Mem)(unsafe.Pointer(pMem)).FxDel})).f(tls, (*Mem)(unsafe.Pointer(pMem)).Fz)
 	}
 
 	(*Mem)(unsafe.Pointer(pMem)).Fz = (*Mem)(unsafe.Pointer(pMem)).FzMalloc
@@ -100052,7 +100749,7 @@ func Xsqlite3VdbeMemFinalize(tls *libc.TLS, pMem uintptr, pFunc uintptr) int32 {
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpOut = bp + 56 /* &t */
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpMem = pMem
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpFunc = pFunc
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pFunc + 32 /* &.xFinalize */))))(tls, bp /* &ctx */) // IMP: R-24505-23230
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer(pFunc)).FxFinalize})).f(tls, bp /* &ctx */) // IMP: R-24505-23230
 
 	if (*Mem)(unsafe.Pointer(pMem)).FszMalloc > 0 {
 		Xsqlite3DbFreeNN(tls, (*Mem)(unsafe.Pointer(pMem)).Fdb, (*Mem)(unsafe.Pointer(pMem)).FzMalloc)
@@ -100078,7 +100775,7 @@ func Xsqlite3VdbeMemAggValue(tls *libc.TLS, pAccum uintptr, pOut uintptr, pFunc
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpMem = pAccum
 	(*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FpFunc = pFunc
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pFunc + 40 /* &.xValue */))))(tls, bp /* &ctx */)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer(pFunc)).FxValue})).f(tls, bp /* &ctx */)
 	return (*Sqlite3_context)(unsafe.Pointer(bp /* &ctx */)).FisError
 }
 
@@ -100097,7 +100794,7 @@ func vdbeMemClearExternAndSetNull(tls *libc.TLS, p uintptr) { /* sqlite3.c:77496
 	}
 	if (int32((*Mem)(unsafe.Pointer(p)).Fflags) & MEM_Dyn) != 0 {
 
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((p + 48 /* &.xDel */))))(tls, (*Mem)(unsafe.Pointer(p)).Fz)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Mem)(unsafe.Pointer(p)).FxDel})).f(tls, (*Mem)(unsafe.Pointer(p)).Fz)
 	}
 	(*Mem)(unsafe.Pointer(p)).Fflags = U16(MEM_Null)
 }
@@ -100304,7 +101001,7 @@ func Xsqlite3VdbeMemNumerify(tls *libc.TLS, pMem uintptr) int32 { /* sqlite3.c:7
 
 		rc = Xsqlite3AtoF(tls, (*Mem)(unsafe.Pointer(pMem)).Fz, (pMem /* &.u */ /* &.r */), (*Mem)(unsafe.Pointer(pMem)).Fn, (*Mem)(unsafe.Pointer(pMem)).Fenc)
 		if (((rc == 0) || (rc == 1)) && (Xsqlite3Atoi64(tls, (*Mem)(unsafe.Pointer(pMem)).Fz, bp /* &ix */, (*Mem)(unsafe.Pointer(pMem)).Fn, (*Mem)(unsafe.Pointer(pMem)).Fenc) <= 1)) ||
-			(Xsqlite3RealSameAsInt(tls, *(*float64)(unsafe.Pointer(pMem /* &.u */)), libc.AssignPtrInt64(bp /* ix */, I64(*(*float64)(unsafe.Pointer(pMem /* &.u */))))) != 0) {
+			(Xsqlite3RealSameAsInt(tls, *(*float64)(unsafe.Pointer(pMem /* &.u */)), libc.AssignPtrInt64(bp /* ix */, libc.Int64FromFloat64(*(*float64)(unsafe.Pointer(pMem /* &.u */))))) != 0) {
 			*(*I64)(unsafe.Pointer(pMem /* &.u */)) = *(*Sqlite3_int64)(unsafe.Pointer(bp /* ix */))
 			(*Mem)(unsafe.Pointer(pMem)).Fflags = (U16((int32((*Mem)(unsafe.Pointer((pMem))).Fflags) & libc.CplInt32((MEM_TypeMask | MEM_Zero))) | MEM_Int))
 		} else {
@@ -100805,11 +101502,11 @@ func Xsqlite3ValueNew(tls *libc.TLS, db uintptr) uintptr { /* sqlite3.c:78293:30
 // Context object passed by sqlite3Stat4ProbeSetValue() through to
 // valueNew(). See comments above valueNew() for details.
 type ValueNewStat4Ctx = struct {
-	FpParse uintptr
-	FpIdx   uintptr
-	FppRec  uintptr
-	FiVal   int32
-	_       [4]byte
+	FpParse      uintptr
+	FpIdx        uintptr
+	FppRec       uintptr
+	FiVal        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:78306:1 */
 
 // Allocate and return a pointer to a new sqlite3_value object. If
@@ -100959,7 +101656,9 @@ __9:
 	libc.Xmemset(tls, bp+8 /* &ctx */, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
 	(*Sqlite3_context)(unsafe.Pointer(bp + 8 /* &ctx */)).FpOut = pVal
 	(*Sqlite3_context)(unsafe.Pointer(bp + 8 /* &ctx */)).FpFunc = pFunc
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer((pFunc + 24 /* &.xSFunc */))))(tls, bp+8 /* &ctx */, nVal, apVal)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer(pFunc)).FxSFunc})).f(tls, bp+8 /* &ctx */, nVal, apVal)
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+8 /* &ctx */)).FisError != 0) {
 		goto __10
 	}
@@ -103261,7 +103960,9 @@ func Xsqlite3VdbeFreeCursor(tls *libc.TLS, p uintptr, pCx uintptr) { /* sqlite3.
 			var pModule uintptr = (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pVCur)).FpVtab)).FpModule
 
 			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(pVCur)).FpVtab)).FnRef--
-			(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule + 56 /* &.xClose */))))(tls, pVCur)
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxClose})).f(tls, pVCur)
 			break
 
 		}
@@ -103430,7 +104131,9 @@ func vdbeCommit(tls *libc.TLS, db uintptr, p uintptr) int32 { /* sqlite3.c:81537
 
 	// If there are any write-transactions at all, invoke the commit hook
 	if (needXcommit != 0) && ((*Sqlite3)(unsafe.Pointer(db)).FxCommitCallback != 0) {
-		rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((db + 280 /* &.xCommitCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCommitArg)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxCommitCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCommitArg)
 		if rc != 0 {
 			return (SQLITE_CONSTRAINT | (int32(2) << 8))
 		}
@@ -104027,7 +104730,7 @@ func Xsqlite3VdbeDeleteAuxData(tls *libc.TLS, db uintptr, pp uintptr, iOp int32,
 				(((*AuxData)(unsafe.Pointer(pAux)).FiAuxArg > 31) || !((uint32(mask) & (uint32((uint32(1))) << ((*AuxData)(unsafe.Pointer(pAux)).FiAuxArg))) != 0))) {
 
 			if (*AuxData)(unsafe.Pointer(pAux)).FxDeleteAux != 0 {
-				(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pAux + 16 /* &.xDeleteAux */))))(tls, (*AuxData)(unsafe.Pointer(pAux)).FpAux)
+				(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*AuxData)(unsafe.Pointer(pAux)).FxDeleteAux})).f(tls, (*AuxData)(unsafe.Pointer(pAux)).FpAux)
 			}
 			*(*uintptr)(unsafe.Pointer(pp)) = (*AuxData)(unsafe.Pointer(pAux)).FpNextAux
 			Xsqlite3DbFree(tls, db, pAux)
@@ -104569,7 +105272,9 @@ func vdbeCompareMemString(tls *libc.TLS, pMem1 uintptr, pMem2 uintptr, pColl uin
 	if int32((*Mem)(unsafe.Pointer(pMem1)).Fenc) == int32((*CollSeq)(unsafe.Pointer(pColl)).Fenc) {
 		// The strings are already in the correct encoding.  Call the
 		// comparison function directly
-		return (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer((pColl + 24 /* &.xCmp */))))(tls, (*CollSeq)(unsafe.Pointer(pColl)).FpUser, (*Mem)(unsafe.Pointer(pMem1)).Fn, (*Mem)(unsafe.Pointer(pMem1)).Fz, (*Mem)(unsafe.Pointer(pMem2)).Fn, (*Mem)(unsafe.Pointer(pMem2)).Fz)
+		return (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*CollSeq)(unsafe.Pointer(pColl)).FxCmp})).f(tls, (*CollSeq)(unsafe.Pointer(pColl)).FpUser, (*Mem)(unsafe.Pointer(pMem1)).Fn, (*Mem)(unsafe.Pointer(pMem1)).Fz, (*Mem)(unsafe.Pointer(pMem2)).Fn, (*Mem)(unsafe.Pointer(pMem2)).Fz)
 	} else {
 		var rc int32
 		var v1 uintptr
@@ -104590,7 +105295,9 @@ func vdbeCompareMemString(tls *libc.TLS, pMem1 uintptr, pMem2 uintptr, pColl uin
 			}
 			rc = 0
 		} else {
-			rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer((pColl + 24 /* &.xCmp */))))(tls, (*CollSeq)(unsafe.Pointer(pColl)).FpUser, (*Mem)(unsafe.Pointer(bp /* &c1 */)).Fn, v1, (*Mem)(unsafe.Pointer(bp+56 /* &c2 */)).Fn, v2)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*CollSeq)(unsafe.Pointer(pColl)).FxCmp})).f(tls, (*CollSeq)(unsafe.Pointer(pColl)).FpUser, (*Mem)(unsafe.Pointer(bp /* &c1 */)).Fn, v1, (*Mem)(unsafe.Pointer(bp+56 /* &c2 */)).Fn, v2)
 		}
 		Xsqlite3VdbeMemRelease(tls, bp /* &c1 */)
 		Xsqlite3VdbeMemRelease(tls, bp+56 /* &c2 */)
@@ -105612,7 +106319,9 @@ func Xsqlite3VdbePreUpdateHook(tls *libc.TLS, v uintptr, pCsr uintptr, op int32,
 	(*PreUpdate)(unsafe.Pointer(bp /* &preupdate */)).FiBlobWrite = iBlobWrite
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpPreUpdate = bp /* &preupdate */
-	(*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, Sqlite3_int64, Sqlite3_int64))(unsafe.Pointer((db + 336 /* &.xPreUpdateCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpPreUpdateArg, db, op, zDb, zTbl, iKey1, iKey2)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, Sqlite3_int64, Sqlite3_int64)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpPreUpdateArg, db, op, zDb, zTbl, iKey1, iKey2)
 	(*Sqlite3)(unsafe.Pointer(db)).FpPreUpdate = uintptr(0)
 	Xsqlite3DbFree(tls, db, (*PreUpdate)(unsafe.Pointer(bp /* &preupdate */)).FaRecord)
 	vdbeFreeUnpacked(tls, db, (int32((*PreUpdate)(unsafe.Pointer(bp /* &preupdate */)).Fkeyinfo.FnKeyField) + 1), (*PreUpdate)(unsafe.Pointer(bp /* &preupdate */)).FpUnpacked)
@@ -105693,10 +106402,14 @@ func invokeProfileCallback(tls *libc.TLS, db uintptr, p uintptr) { /* sqlite3.c:
 	Xsqlite3OsCurrentTimeInt64(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, bp /* &iNow */)
 	*(*Sqlite3_int64)(unsafe.Pointer(bp + 8 /* iElapse */)) = ((*(*Sqlite3_int64)(unsafe.Pointer(bp /* iNow */)) - (*Vdbe)(unsafe.Pointer(p)).FstartTime) * int64(1000000))
 	if (*Sqlite3)(unsafe.Pointer(db)).FxProfile != 0 {
-		(*(*func(*libc.TLS, uintptr, uintptr, U64))(unsafe.Pointer((db + 256 /* &.xProfile */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProfileArg, (*Vdbe)(unsafe.Pointer(p)).FzSql, uint64(*(*Sqlite3_int64)(unsafe.Pointer(bp + 8 /* iElapse */))))
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr, U64)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProfile})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProfileArg, (*Vdbe)(unsafe.Pointer(p)).FzSql, uint64(*(*Sqlite3_int64)(unsafe.Pointer(bp + 8 /* iElapse */))))
 	}
 	if (int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace) & SQLITE_TRACE_PROFILE) != 0 {
-		(*(*func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 240 /* &.trace */ /* &.xV2 */))))(tls, uint32(SQLITE_TRACE_PROFILE), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, bp+8 /* &iElapse */)
+		(*struct {
+			f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, uint32(SQLITE_TRACE_PROFILE), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, bp+8 /* &iElapse */)
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FstartTime = int64(0)
 }
@@ -106006,7 +106719,7 @@ func invokeValueDestructor(tls *libc.TLS, p uintptr, xDel uintptr, pCtx uintptr)
 	} else if xDel == (libc.UintptrFromInt32(-1)) {
 		// noop
 	} else {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDel)))(tls, p)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDel})).f(tls, p)
 	}
 	Xsqlite3_result_error_toobig(tls, pCtx)
 	return SQLITE_TOOBIG
@@ -106178,7 +106891,9 @@ func doWalCallbacks(tls *libc.TLS, db uintptr) int32 { /* sqlite3.c:84742:12: */
 			nEntry = Xsqlite3PagerWalCallback(tls, Xsqlite3BtreePager(tls, pBt))
 			Xsqlite3BtreeLeave(tls, pBt)
 			if ((nEntry > 0) && ((*Sqlite3)(unsafe.Pointer(db)).FxWalCallback != 0)) && (rc == SQLITE_OK) {
-				rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32) int32)(unsafe.Pointer((db + 352 /* &.xWalCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpWalArg, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FzDbSName, nEntry)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, uintptr, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxWalCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpWalArg, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FzDbSName, nEntry)
 			}
 		}
 	}
@@ -106585,7 +107300,7 @@ __6:
 	if !((*AuxData)(unsafe.Pointer(pAuxData)).FxDeleteAux != 0) {
 		goto __10
 	}
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pAuxData + 16 /* &.xDeleteAux */))))(tls, (*AuxData)(unsafe.Pointer(pAuxData)).FpAux)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*AuxData)(unsafe.Pointer(pAuxData)).FxDeleteAux})).f(tls, (*AuxData)(unsafe.Pointer(pAuxData)).FpAux)
 __10:
 	;
 __7:
@@ -106599,7 +107314,7 @@ failed:
 	if !(xDelete != 0) {
 		goto __11
 	}
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDelete)))(tls, pAux)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDelete})).f(tls, pAux)
 __11:
 }
 
@@ -106948,7 +107663,7 @@ func bindText(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData I64, x
 		}
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	} else if (xDel != (uintptr(0))) && (xDel != (libc.UintptrFromInt32(-1))) {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDel)))(tls, zData)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDel})).f(tls, zData)
 	}
 	return rc
 }
@@ -107007,7 +107722,7 @@ func Xsqlite3_bind_pointer(tls *libc.TLS, pStmt uintptr, i int32, pPtr uintptr,
 		Xsqlite3VdbeMemSetPointer(tls, ((*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((i-1))*56), pPtr, zPTtype, xDestructor)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	} else if xDestructor != 0 {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDestructor)))(tls, pPtr)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDestructor})).f(tls, pPtr)
 	}
 	return rc
 }
@@ -111250,7 +111965,9 @@ __185:
 	}
 
 	nProgressLimit = nProgressLimit + (U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps))
-	if !((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((db + 512 /* &.xProgress */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
+	if !((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
 		goto __187
 	}
 	nProgressLimit = (uint64(0xffffffff) | (U64((uint64(0xffffffff))) << 32))
@@ -111852,7 +112569,9 @@ __220:
 	if !((int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace) & SQLITE_TRACE_ROW) != 0) {
 		goto __221
 	}
-	(*(*func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 240 /* &.trace */ /* &.xV2 */))))(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
+	(*struct {
+		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
 __221:
 	;
 
@@ -116153,7 +116872,9 @@ __639:
 		goto __640
 	}
 
-	(*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64))(unsafe.Pointer((db + 312 /* &.xUpdateCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg,
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg,
 		func() int32 {
 			if (int32((*Op)(unsafe.Pointer(pOp)).Fp5) & OPFLAG_ISUPDATE) != 0 {
 				return SQLITE_UPDATE
@@ -116301,7 +117022,9 @@ __647:
 	if !(((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0) && (((*Table)(unsafe.Pointer((pTab1))).FtabFlags & U32(TF_WithoutRowid)) == U32(0))) {
 		goto __649
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64))(unsafe.Pointer((db + 312 /* &.xUpdateCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab1)).FzName,
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab1)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC11)).FmovetoTarget)
 
 __649:
@@ -116493,7 +117216,9 @@ __659:
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC15 + 56 /* &.uc */)))).FpVtab
 	pModule = (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FpModule
 
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pModule + 96 /* &.xRowid */))))(tls, *(*uintptr)(unsafe.Pointer(pC15 + 56 /* &.uc */)), bp+520 /* &v3 */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC15 + 56 /* &.uc */)), bp+520 /* &v3 */)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
 	if !(rc != 0) {
 		goto __663
@@ -116794,7 +117519,9 @@ __121: // jump
 	// The Next opcode is only used after SeekGT, SeekGE, Rewind, and Found.
 	// The Prev opcode is only used after SeekLT, SeekLE, and Last.
 
-	rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((pOp + 16 /* &.p4 */ /* &.xAdvance */))))(tls, *(*uintptr)(unsafe.Pointer(pC20 + 56 /* &.uc */)), (*Op)(unsafe.Pointer(pOp)).Fp3)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(pOp + 16 /* &.p4 */))})).f(tls, *(*uintptr)(unsafe.Pointer(pC20 + 56 /* &.uc */)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC20)).FcacheStatus = U32(CACHE_STALE)
 
@@ -118174,10 +118901,14 @@ __776:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __780
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc + 48 /* &.xInverse */))))(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48 /* &.argv */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48 /* &.argv */)
 	goto __781
 __780:
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc + 24 /* &.xSFunc */))))(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48 /* &.argv */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48 /* &.argv */)
 __781:
 	; // IMP: R-24505-23230
 
@@ -118688,7 +119419,9 @@ __171:
 __822:
 	;
 	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pModule1 + 48 /* &.xOpen */))))(tls, pVtab1, bp+864 /* &pVCur */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+864 /* &pVCur */)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __823
@@ -118710,7 +119443,9 @@ __823:
 	goto __825
 __824:
 	;
-	(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule1 + 56 /* &.xClose */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 864 /* pVCur */)))
+	(*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 864 /* pVCur */)))
 	goto no_mem
 __825:
 	;
@@ -118765,7 +119500,9 @@ __827:
 	goto __828
 __828:
 	;
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer((pModule2 + 64 /* &.xFilter */))))(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16 /* &.p4 */)), nArg, apArg)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16 /* &.p4 */)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
 		goto __829
@@ -118773,7 +119510,9 @@ __828:
 	goto abort_due_to_error
 __829:
 	;
-	res13 = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule2 + 80 /* &.xEof */))))(tls, pVCur1)
+	res13 = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxEof})).f(tls, pVCur1)
 	(*VdbeCursor)(unsafe.Pointer(pCur3)).FnullRow = U8(0)
 
 	if !(res13 != 0) {
@@ -118827,7 +119566,9 @@ __832:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = (U16((int32((*Mem)(unsafe.Pointer((pDest2))).Fflags) & libc.CplInt32((MEM_TypeMask | MEM_Zero))) | MEM_Null))
 __833:
 	;
-	rc = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer((pModule3 + 88 /* &.xColumn */))))(tls, *(*uintptr)(unsafe.Pointer(pCur4 + 56 /* &.uc */)), bp+872 /* &sContext */, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur4 + 56 /* &.uc */)), bp+872 /* &sContext */, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+872 /* &sContext */)).FisError > 0) {
 		goto __834
@@ -118876,7 +119617,9 @@ __837:
 	// xNext(). Instead, if an error occurs, true is returned (indicating that
 	// data is available) and the error code returned when xColumn or
 	// some other method is next invoked on the save virtual table cursor.
-	rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule4 + 72 /* &.xNext */))))(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 56 /* &.uc */)))
+	rc = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 56 /* &.uc */)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
 		goto __838
@@ -118884,7 +119627,9 @@ __837:
 	goto abort_due_to_error
 __838:
 	;
-	res14 = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule4 + 80 /* &.xEof */))))(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 56 /* &.uc */)))
+	res14 = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 56 /* &.uc */)))
 
 	if !(!(res14 != 0)) {
 		goto __839
@@ -118914,7 +119659,9 @@ __175:
 	goto abort_due_to_error
 __840:
 	;
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule + 152 /* &.xRename */))))(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
 	if !(isLegacy == 0) {
 		goto __841
 	}
@@ -119000,7 +119747,9 @@ __847:
 __848:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pModule5 + 104 /* &.xUpdate */))))(tls, pVtab6, nArg1, apArg1, bp+928 /* &rowid1 */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+928 /* &rowid1 */)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !((rc == SQLITE_OK) && ((*Op)(unsafe.Pointer(pOp)).Fp1 != 0)) {
@@ -119154,7 +119903,9 @@ __857:
 
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = (U16((int32((*Mem)(unsafe.Pointer((pOut))).Fflags) & libc.CplInt32((MEM_TypeMask | MEM_Zero))) | MEM_Null))
 
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc + 24 /* &.xSFunc */))))(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48 /* &.argv */) // IMP: R-24505-23230
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48 /* &.argv */) // IMP: R-24505-23230
 
 	// If the function returned an error, throw an exception
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
@@ -119246,7 +119997,9 @@ __182:
 		goto __867
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
-	(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((db + 240 /* &.trace */ /* &.xLegacy */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
 	goto __868
 __867:
@@ -119254,11 +120007,15 @@ __867:
 		goto __869
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6505 /* "-- %s" */, libc.VaList(bp+136, zTrace))
-	(*(*func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 240 /* &.trace */ /* &.xV2 */))))(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
+	(*struct {
+		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
 	goto __870
 __869:
-	(*(*func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 240 /* &.trace */ /* &.xV2 */))))(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+	(*struct {
+		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
 __870:
 	;
 __868:
@@ -119388,7 +120145,9 @@ __883:
 		goto __884
 	}
 	nProgressLimit = nProgressLimit + (U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps))
-	if !((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((db + 512 /* &.xProgress */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
+	if !((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
 		goto __885
 	}
 	nProgressLimit = (uint64(0xffffffff) | (U64((uint64(0xffffffff))) << 32))
@@ -119454,15 +120213,15 @@ var vfsFlags int32 = ((((SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE) | SQLITE_OP
 
 // Valid sqlite3_blob* handles point to Incrblob structures.
 type Incrblob1 = struct {
-	FnByte   int32
-	FiOffset int32
-	FiCol    U16
-	_        [6]byte
-	FpCsr    uintptr
-	FpStmt   uintptr
-	Fdb      uintptr
-	FzDb     uintptr
-	FpTab    uintptr
+	FnByte       int32
+	FiOffset     int32
+	FiCol        U16
+	F__ccgo_pad1 [6]byte
+	FpCsr        uintptr
+	FpStmt       uintptr
+	Fdb          uintptr
+	FzDb         uintptr
+	FpTab        uintptr
 } /* sqlite3.c:94829:9 */
 
 //************* End of vdbe.c ***********************************************
@@ -119971,7 +120730,9 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 				v, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(v)).FapCsr)), SQLITE_DELETE, (*Incrblob)(unsafe.Pointer(p)).FzDb, (*Incrblob)(unsafe.Pointer(p)).FpTab, iKey, -1, int32((*Incrblob)(unsafe.Pointer(p)).FiCol))
 		}
 
-		rc = (*(*func(*libc.TLS, uintptr, U32, U32, uintptr) int32)(unsafe.Pointer(&xCall)))(tls, (*Incrblob)(unsafe.Pointer(p)).FpCsr, (uint32(iOffset + (*Incrblob)(unsafe.Pointer(p)).FiOffset)), uint32(n), z)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, U32, U32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xCall})).f(tls, (*Incrblob)(unsafe.Pointer(p)).FpCsr, (uint32(iOffset + (*Incrblob)(unsafe.Pointer(p)).FiOffset)), uint32(n), z)
 		Xsqlite3BtreeLeaveCursor(tls, (*Incrblob)(unsafe.Pointer(p)).FpCsr)
 		if rc == SQLITE_ABORT {
 			Xsqlite3VdbeFinalize(tls, v)
@@ -120211,11 +120972,11 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 
 // Private objects used by the sorter
 type MergeEngine1 = struct {
-	FnTree  int32
-	_       [4]byte
-	FpTask  uintptr
-	FaTree  uintptr
-	FaReadr uintptr
+	FnTree       int32
+	F__ccgo_pad1 [4]byte
+	FpTask       uintptr
+	FaTree       uintptr
+	FaReadr      uintptr
 } /* sqlite3.c:21218:9 */
 
 //************* End of vdbeblob.c *******************************************
@@ -120369,56 +121130,56 @@ type MergeEngine1 = struct {
 // Private objects used by the sorter
 type MergeEngine = MergeEngine1 /* sqlite3.c:95477:28 */ // Merge PMAs together
 type PmaReader1 = struct {
-	FiReadOff I64
-	FiEof     I64
-	FnAlloc   int32
-	FnKey     int32
-	FpFd      uintptr
-	FaAlloc   uintptr
-	FaKey     uintptr
-	FaBuffer  uintptr
-	FnBuffer  int32
-	_         [4]byte
-	FaMap     uintptr
-	FpIncr    uintptr
+	FiReadOff    I64
+	FiEof        I64
+	FnAlloc      int32
+	FnKey        int32
+	FpFd         uintptr
+	FaAlloc      uintptr
+	FaKey        uintptr
+	FaBuffer     uintptr
+	FnBuffer     int32
+	F__ccgo_pad1 [4]byte
+	FaMap        uintptr
+	FpIncr       uintptr
 } /* sqlite3.c:21218:9 */
 
 // Merge PMAs together
 type PmaReader = PmaReader1 /* sqlite3.c:95478:26 */ // Incrementally read one PMA
 type PmaWriter1 = struct {
-	FeFWErr    int32
-	_          [4]byte
-	FaBuffer   uintptr
-	FnBuffer   int32
-	FiBufStart int32
-	FiBufEnd   int32
-	_          [4]byte
-	FiWriteOff I64
-	FpFd       uintptr
+	FeFWErr      int32
+	F__ccgo_pad1 [4]byte
+	FaBuffer     uintptr
+	FnBuffer     int32
+	FiBufStart   int32
+	FiBufEnd     int32
+	F__ccgo_pad2 [4]byte
+	FiWriteOff   I64
+	FpFd         uintptr
 } /* sqlite3.c:95479:9 */
 
 // Incrementally read one PMA
 type PmaWriter = PmaWriter1 /* sqlite3.c:95479:26 */ // Incrementally write one PMA
 type SorterRecord1 = struct {
-	FnVal int32
-	_     [4]byte
-	Fu    struct{ FpNext uintptr }
+	FnVal        int32
+	F__ccgo_pad1 [4]byte
+	Fu           struct{ FpNext uintptr }
 } /* sqlite3.c:21218:9 */
 
 // Incrementally write one PMA
 type SorterRecord = SorterRecord1 /* sqlite3.c:95480:29 */ // A record being sorted
 type SortSubtask1 = struct {
-	FpThread   uintptr
-	FbDone     int32
-	_          [4]byte
-	FpSorter   uintptr
-	FpUnpacked uintptr
-	Flist      SorterList
-	FnPMA      int32
-	_          [4]byte
-	FxCompare  SorterCompare
-	Ffile      SorterFile
-	Ffile2     SorterFile
+	FpThread     uintptr
+	FbDone       int32
+	F__ccgo_pad1 [4]byte
+	FpSorter     uintptr
+	FpUnpacked   uintptr
+	Flist        SorterList
+	FnPMA        int32
+	F__ccgo_pad2 [4]byte
+	FxCompare    SorterCompare
+	Ffile        SorterFile
+	Ffile2       SorterFile
 } /* sqlite3.c:21218:9 */
 
 // A record being sorted
@@ -120431,23 +121192,23 @@ type SorterFile1 = struct {
 // A sub-task in the sort process
 type SorterFile = SorterFile1 /* sqlite3.c:95482:27 */ // Temporary file object wrapper
 type SorterList1 = struct {
-	FpList   uintptr
-	FaMemory uintptr
-	FszPMA   int32
-	_        [4]byte
+	FpList       uintptr
+	FaMemory     uintptr
+	FszPMA       int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:21218:9 */
 
 // Temporary file object wrapper
 type SorterList = SorterList1 /* sqlite3.c:95483:27 */ // In-memory list of records
 type IncrMerger1 = struct {
-	FpTask      uintptr
-	FpMerger    uintptr
-	FiStartOff  I64
-	FmxSz       int32
-	FbEof       int32
-	FbUseThread int32
-	_           [4]byte
-	FaFile      [2]SorterFile
+	FpTask       uintptr
+	FpMerger     uintptr
+	FiStartOff   I64
+	FmxSz        int32
+	FbEof        int32
+	FbUseThread  int32
+	F__ccgo_pad1 [4]byte
+	FaFile       [2]SorterFile
 } /* sqlite3.c:21218:9 */
 
 // In-memory list of records
@@ -121279,7 +122040,9 @@ func vdbeSorterMerge(tls *libc.TLS, pTask uintptr, p1 uintptr, p2 uintptr) uintp
 
 	for {
 		var res int32
-		res = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32)(unsafe.Pointer((pTask + 64 /* &.xCompare */))))(tls,
+		res = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*SortSubtask)(unsafe.Pointer(pTask)).FxCompare})).f(tls,
 			pTask, bp+8 /* &bCached */, ((p1) + uintptr(1)*16), (*SorterRecord)(unsafe.Pointer(p1)).FnVal, ((p2) + uintptr(1)*16), (*SorterRecord)(unsafe.Pointer(p2)).FnVal)
 
 		if res <= 0 {
@@ -121550,7 +122313,9 @@ func vdbeMergeEngineStep(tls *libc.TLS, pMerger uintptr, pbEof uintptr) int32 {
 			} else if (*PmaReader)(unsafe.Pointer(pReadr2)).FpFd == uintptr(0) {
 				iRes = -1
 			} else {
-				iRes = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32)(unsafe.Pointer((pTask + 64 /* &.xCompare */))))(tls, pTask, bp, /* &bCached */
+				iRes = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*SortSubtask)(unsafe.Pointer(pTask)).FxCompare})).f(tls, pTask, bp, /* &bCached */
 					(*PmaReader)(unsafe.Pointer(pReadr1)).FaKey, (*PmaReader)(unsafe.Pointer(pReadr1)).FnKey, (*PmaReader)(unsafe.Pointer(pReadr2)).FaKey, (*PmaReader)(unsafe.Pointer(pReadr2)).FnKey)
 			}
 
@@ -121959,7 +122724,9 @@ func vdbeMergeEngineCompare(tls *libc.TLS, pMerger uintptr, iOut int32) { /* sql
 		*(*int32)(unsafe.Pointer(bp /* bCached */)) = 0
 		var res int32
 		// from vdbeSortSubtaskMain()
-		res = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32)(unsafe.Pointer((pTask + 64 /* &.xCompare */))))(tls,
+		res = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*SortSubtask)(unsafe.Pointer(pTask)).FxCompare})).f(tls,
 			pTask, bp /* &bCached */, (*PmaReader)(unsafe.Pointer(p1)).FaKey, (*PmaReader)(unsafe.Pointer(p1)).FnKey, (*PmaReader)(unsafe.Pointer(p2)).FaKey, (*PmaReader)(unsafe.Pointer(p2)).FnKey)
 		if res <= 0 {
 			iRes = i1
@@ -122640,16 +123407,16 @@ func Xsqlite3VdbeSorterCompare(tls *libc.TLS, pCsr uintptr, pVal uintptr, nKeyCo
 
 // Forward references to internal structures
 type MemJournal1 = struct {
-	FpMethod    uintptr
-	FnChunkSize int32
-	FnSpill     int32
-	FpFirst     uintptr
-	Fendpoint   FilePoint
-	Freadpoint  FilePoint
-	Fflags      int32
-	_           [4]byte
-	FpVfs       uintptr
-	FzJournal   uintptr
+	FpMethod     uintptr
+	FnChunkSize  int32
+	FnSpill      int32
+	FpFirst      uintptr
+	Fendpoint    FilePoint
+	Freadpoint   FilePoint
+	Fflags       int32
+	F__ccgo_pad1 [4]byte
+	FpVfs        uintptr
+	FzJournal    uintptr
 } /* sqlite3.c:98540:9 */
 
 //************* End of vdbesort.c *******************************************
@@ -123063,7 +123830,9 @@ func walkExpr(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 { /* sqlite3.
 	var rc int32
 
 	for 1 != 0 {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pWalker + 8 /* &.xExprCallback */))))(tls, pWalker, pExpr)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Walker)(unsafe.Pointer(pWalker)).FxExprCallback})).f(tls, pWalker, pExpr)
 		if rc != 0 {
 			return (rc & WRC_Abort)
 		}
@@ -123247,7 +124016,9 @@ func Xsqlite3WalkSelect(tls *libc.TLS, pWalker uintptr, p uintptr) int32 { /* sq
 		return WRC_Continue
 	}
 	for ok := true; ok; ok = (p != uintptr(0)) {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pWalker + 16 /* &.xSelectCallback */))))(tls, pWalker, p)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Walker)(unsafe.Pointer(pWalker)).FxSelectCallback})).f(tls, pWalker, p)
 		if rc != 0 {
 			return (rc & WRC_Abort)
 		}
@@ -123256,7 +124027,9 @@ func Xsqlite3WalkSelect(tls *libc.TLS, pWalker uintptr, p uintptr) int32 { /* sq
 			return WRC_Abort
 		}
 		if (*Walker)(unsafe.Pointer(pWalker)).FxSelectCallback2 != 0 {
-			(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pWalker + 24 /* &.xSelectCallback2 */))))(tls, pWalker, p)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Walker)(unsafe.Pointer(pWalker)).FxSelectCallback2})).f(tls, pWalker, p)
 		}
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 	}
@@ -124300,7 +125073,7 @@ func exprProbability(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:99948:12: */
 	if *(*float64)(unsafe.Pointer(bp /* r */)) > 1.0 {
 		return -1
 	}
-	return (int32(*(*float64)(unsafe.Pointer(bp /* r */)) * 134217728.0))
+	return (libc.Int32FromFloat64(*(*float64)(unsafe.Pointer(bp /* r */)) * 134217728.0))
 }
 
 // This routine is callback for sqlite3WalkExpr().
@@ -130841,7 +131614,9 @@ func exprCodeBetween(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32, x
 		(*Expr)(unsafe.Pointer(bp + 72 /* &compRight */)).FpRight = (*ExprList_item)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(pExpr + 32 /* &.x */)) + 8 /* &.a */) + 1*32)).FpExpr
 		exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+216 /* ®Free1 */))
 		if xJump != 0 {
-			(*(*func(*libc.TLS, uintptr, uintptr, int32, int32))(unsafe.Pointer(&xJump)))(tls, pParse, bp+144 /* &exprAnd */, dest, jumpIfNull)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, int32)
+			})(unsafe.Pointer(&struct{ uintptr }{xJump})).f(tls, pParse, bp+144 /* &exprAnd */, dest, jumpIfNull)
 		} else {
 			// Mark the expression is being from the ON or USING clause of a join
 			// so that the sqlite3ExprCodeTarget() routine will not attempt to move
@@ -134986,25 +135761,25 @@ var aTable = [3]struct {
 // share an instance of the following structure to hold their state
 // information.
 type StatAccum1 = struct {
-	Fdb         uintptr
-	FnEst       TRowcnt
-	FnRow       TRowcnt
-	FnLimit     int32
-	FnCol       int32
-	FnKeyCol    int32
-	FnSkipAhead U8
-	_           [3]byte
-	Fcurrent    StatSample
-	FnPSample   TRowcnt
-	FmxSample   int32
-	FiPrn       U32
-	_           [4]byte
-	FaBest      uintptr
-	FiMin       int32
-	FnSample    int32
-	FnMaxEqZero int32
-	FiGet       int32
-	Fa          uintptr
+	Fdb          uintptr
+	FnEst        TRowcnt
+	FnRow        TRowcnt
+	FnLimit      int32
+	FnCol        int32
+	FnKeyCol     int32
+	FnSkipAhead  U8
+	F__ccgo_pad1 [3]byte
+	Fcurrent     StatSample
+	FnPSample    TRowcnt
+	FmxSample    int32
+	FiPrn        U32
+	F__ccgo_pad2 [4]byte
+	FaBest       uintptr
+	FiMin        int32
+	FnSample     int32
+	FnMaxEqZero  int32
+	FiGet        int32
+	Fa           uintptr
 } /* sqlite3.c:109861:9 */
 
 // Recommended number of samples for sqlite_stat4
@@ -135014,15 +135789,15 @@ type StatAccum1 = struct {
 // information.
 type StatAccum = StatAccum1 /* sqlite3.c:109861:26 */
 type StatSample1 = struct {
-	FanEq      uintptr
-	FanDLt     uintptr
-	FanLt      uintptr
-	Fu         struct{ FiRowid I64 }
-	FnRowid    U32
-	FisPSample U8
-	_          [3]byte
-	FiCol      int32
-	FiHash     U32
+	FanEq        uintptr
+	FanDLt       uintptr
+	FanLt        uintptr
+	Fu           struct{ FiRowid I64 }
+	FnRowid      U32
+	FisPSample   U8
+	F__ccgo_pad1 [3]byte
+	FiCol        int32
+	FiHash       U32
 } /* sqlite3.c:109861:9 */
 
 type StatSample = StatSample1 /* sqlite3.c:109862:27 */
@@ -137449,7 +138224,9 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
 		return SQLITE_OK
 	}
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 496 /* &.xAuth */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
 		var z uintptr = Xsqlite3_mprintf(tls, ts+12147 /* "%s.%s" */, libc.VaList(bp, zTab, zCol))
 		if ((*Sqlite3)(unsafe.Pointer(db)).FnDb > 2) || (iDb != 0) {
@@ -137537,7 +138314,9 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 	// The following testcase() macros show that any of the 3rd through 6th
 	// parameters can be either NULL or a string.
 
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 496 /* &.xAuth */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
 		Xsqlite3ErrorMsg(tls, pParse, ts+12186 /* "not authorized" */, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
@@ -139986,7 +140765,9 @@ func Xsqlite3IsShadowTableOf(tls *libc.TLS, db uintptr, pTab uintptr, zName uint
 	if (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxShadowName == uintptr(0) {
 		return 0
 	}
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Module)(unsafe.Pointer(pMod)).FpModule + 184 /* &.xShadowName */))))(tls, ((zName + uintptr(nName)) + uintptr(1)))
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxShadowName})).f(tls, ((zName + uintptr(nName)) + uintptr(1)))
 }
 
 // Return true if zName is a shadow table name in the current database
@@ -143560,7 +144341,9 @@ func callCollNeeded(tls *libc.TLS, db uintptr, enc int32, zName uintptr) { /* sq
 		if !(zExternal != 0) {
 			return
 		}
-		(*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr))(unsafe.Pointer((db + 368 /* &.xCollNeeded */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCollNeededArg, db, enc, zExternal)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, uintptr)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxCollNeeded})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCollNeededArg, db, enc, zExternal)
 		Xsqlite3DbFree(tls, db, zExternal)
 	}
 	if (*Sqlite3)(unsafe.Pointer(db)).FxCollNeeded16 != 0 {
@@ -143569,7 +144352,9 @@ func callCollNeeded(tls *libc.TLS, db uintptr, enc int32, zName uintptr) { /* sq
 		Xsqlite3ValueSetStr(tls, pTmp, -1, zName, uint8(SQLITE_UTF8), uintptr(0))
 		zExternal = Xsqlite3ValueText(tls, pTmp, uint8(SQLITE_UTF16LE))
 		if zExternal != 0 {
-			(*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr))(unsafe.Pointer((db + 376 /* &.xCollNeeded16 */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCollNeededArg, db, int32((*Sqlite3)(unsafe.Pointer(db)).Fenc), zExternal)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxCollNeeded16})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpCollNeededArg, db, int32((*Sqlite3)(unsafe.Pointer(db)).Fenc), zExternal)
 		}
 		Xsqlite3ValueFree(tls, pTmp)
 	}
@@ -145514,7 +146299,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) { /* sq
 	if (*(*float64)(unsafe.Pointer(bp + 16 /* r */)) < -4503599627370496.0) || (*(*float64)(unsafe.Pointer(bp + 16 /* r */)) > +4503599627370496.0) {
 		// The value has no fractional part so there is nothing to round
 	} else if n == 0 {
-		*(*float64)(unsafe.Pointer(bp + 16 /* r */)) = float64((Sqlite_int64(*(*float64)(unsafe.Pointer(bp + 16 /* r */)) + (func() float64 {
+		*(*float64)(unsafe.Pointer(bp + 16 /* r */)) = float64((libc.Int64FromFloat64(*(*float64)(unsafe.Pointer(bp + 16 /* r */)) + (func() float64 {
 			if *(*float64)(unsafe.Pointer(bp + 16 /* r */)) < float64(0) {
 				return -0.5
 			}
@@ -146587,12 +147372,12 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) { /* sqli
 // An instance of the following structure holds the context of a
 // sum() or avg() aggregate computation.
 type SumCtx1 = struct {
-	FrSum     float64
-	FiSum     I64
-	Fcnt      I64
-	Foverflow U8
-	Fapprox   U8
-	_         [6]byte
+	FrSum        float64
+	FiSum        I64
+	Fcnt         I64
+	Foverflow    U8
+	Fapprox      U8
+	F__ccgo_pad1 [6]byte
 } /* sqlite3.c:120823:9 */
 
 // An instance of the following structure holds the context of a
@@ -150186,9 +150971,9 @@ func Xsqlite3ExprReferencesUpdatedColumn(tls *libc.TLS, pExpr uintptr, aiChng ui
 // of a table in either Index.pNext order, or in some other order established
 // by an array of IndexListTerm objects.
 type IndexListTerm1 = struct {
-	Fp  uintptr
-	Fix int32
-	_   [4]byte
+	Fp           uintptr
+	Fix          int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:124490:9 */
 
 // The sqlite3GenerateConstraintChecks() routine usually wants to visit
@@ -150205,8 +150990,8 @@ type IndexIterator1 = struct {
 	FeType int32
 	Fi     int32
 	Fu     struct {
-		Flx struct{ FpIdx uintptr }
-		_   [8]byte
+		Flx          struct{ FpIdx uintptr }
+		F__ccgo_pad1 [8]byte
 	}
 } /* sqlite3.c:124491:9 */
 
@@ -151951,7 +152736,9 @@ __18:
 	*(*uintptr)(unsafe.Pointer(azVals + uintptr(i)*8)) = uintptr(0)
 __15:
 	;
-	if !((*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer(&xCallback)))(tls, pArg, nCol, azVals, azCols) != 0) {
+	if !((*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xCallback})).f(tls, pArg, nCol, azVals, azCols) != 0) {
 		goto __20
 	}
 	// EVIDENCE-OF: R-38229-40159 If the callback function to
@@ -152556,7 +153343,9 @@ __21:
 __20:
 	;
 	Xsqlite3_free(tls, zAltEntry)
-	rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(&xInit)))(tls, db, bp+56 /* &zErrmsg */, uintptr(unsafe.Pointer(&sqlite3Apis)))
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+56 /* &zErrmsg */, uintptr(unsafe.Pointer(&sqlite3Apis)))
 	if !(rc != 0) {
 		goto __23
 	}
@@ -152661,9 +153450,9 @@ func Xsqlite3_enable_load_extension(tls *libc.TLS, db uintptr, onoff int32) int3
 // This list is shared across threads.  The SQLITE_MUTEX_STATIC_MAIN
 // mutex must be held while accessing this list.
 type sqlite3AutoExtList = struct {
-	FnExt U32
-	_     [4]byte
-	FaExt uintptr
+	FnExt        U32
+	F__ccgo_pad1 [4]byte
+	FaExt        uintptr
 } /* sqlite3.c:127641:9 */
 
 // The following object holds the list of automatically loaded
@@ -152784,7 +153573,9 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) { /* sqlite3.c:127761
 		}
 		Xsqlite3_mutex_leave(tls, mutex)
 		*(*uintptr)(unsafe.Pointer(bp + 8 /* zErrmsg */)) = uintptr(0)
-		if (xInit != 0) && ((libc.AssignInt32(&rc, (*(*func(*libc.TLS, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(&xInit)))(tls, db, bp+8 /* &zErrmsg */, pThunk))) != 0) {
+		if (xInit != 0) && ((libc.AssignInt32(&rc, (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8 /* &zErrmsg */, pThunk))) != 0) {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
 				ts+15925 /* "automatic extens..." */, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8 /* zErrmsg */))))
 			go1 = 0
@@ -152890,13 +153681,13 @@ var pragCName = [51]uintptr{
 
 // Definitions of all built-in pragmas
 type PragmaName1 = struct {
-	FzName      uintptr
-	FePragTyp   U8
-	FmPragFlg   U8
-	FiPragCName U8
-	FnPragCName U8
-	_           [4]byte
-	FiArg       U64
+	FzName       uintptr
+	FePragTyp    U8
+	FmPragFlg    U8
+	FiPragCName  U8
+	FnPragCName  U8
+	F__ccgo_pad1 [4]byte
+	FiArg        U64
 } /* sqlite3.c:127960:9 */
 
 // Definitions of all built-in pragmas
@@ -156671,9 +157462,9 @@ pragma_out:
 }
 
 type EncName = struct {
-	FzName uintptr
-	Fenc   U8
-	_      [7]byte
+	FzName       uintptr
+	Fenc         U8
+	F__ccgo_pad1 [7]byte
 } /* sqlite3.c:130282:18 */
 
 var iLn3 int32 = 0 /* sqlite3.c:128958:22 */
@@ -156731,12 +157522,12 @@ var readCookie = [3]VdbeOpList{
 // Implementation of an eponymous virtual table that runs a pragma.
 //
 type PragmaVtab1 = struct {
-	Fbase    Sqlite3_vtab
-	Fdb      uintptr
-	FpName   uintptr
-	FnHidden U8
-	FiHidden U8
-	_        [6]byte
+	Fbase        Sqlite3_vtab
+	Fdb          uintptr
+	FpName       uintptr
+	FnHidden     U8
+	FiHidden     U8
+	F__ccgo_pad1 [6]byte
 } /* sqlite3.c:130740:9 */
 
 // ****************************************************************************
@@ -157698,7 +158489,9 @@ func Xsqlite3ParserReset(tls *libc.TLS, pParse uintptr) { /* sqlite3.c:131614:21
 	for (*Parse)(unsafe.Pointer(pParse)).FpCleanup != 0 {
 		var pCleanup uintptr = (*Parse)(unsafe.Pointer(pParse)).FpCleanup
 		(*Parse)(unsafe.Pointer(pParse)).FpCleanup = (*ParseCleanup)(unsafe.Pointer(pCleanup)).FpNext
-		(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pCleanup + 16 /* &.xCleanup */))))(tls, db, (*ParseCleanup)(unsafe.Pointer(pCleanup)).FpPtr)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr)
+		})(unsafe.Pointer(&struct{ uintptr }{(*ParseCleanup)(unsafe.Pointer(pCleanup)).FxCleanup})).f(tls, db, (*ParseCleanup)(unsafe.Pointer(pCleanup)).FpPtr)
 		Xsqlite3DbFreeNN(tls, db, pCleanup)
 	}
 	Xsqlite3DbFree(tls, db, (*Parse)(unsafe.Pointer(pParse)).FaLabel)
@@ -157752,7 +158545,9 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 		(*ParseCleanup)(unsafe.Pointer(pCleanup)).FpPtr = pPtr
 		(*ParseCleanup)(unsafe.Pointer(pCleanup)).FxCleanup = xCleanup
 	} else {
-		(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer(&xCleanup)))(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pPtr)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr)
+		})(unsafe.Pointer(&struct{ uintptr }{xCleanup})).f(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pPtr)
 		pPtr = uintptr(0)
 	}
 	return pPtr
@@ -158159,11 +158954,11 @@ func Xsqlite3_prepare16_v3(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 // how to process the DISTINCT keyword, to simplify passing that information
 // into the selectInnerLoop() routine.
 type DistinctCtx1 = struct {
-	FisTnct    U8
-	FeTnctType U8
-	_          [2]byte
-	FtabTnct   int32
-	FaddrTnct  int32
+	FisTnct      U8
+	FeTnctType   U8
+	F__ccgo_pad1 [2]byte
+	FtabTnct     int32
+	FaddrTnct    int32
 } /* sqlite3.c:132093:9 */
 
 //************* End of prepare.c ********************************************
@@ -158213,7 +159008,7 @@ type SortCtx1 = struct {
 	FlabelDone        int32
 	FlabelOBLopt      int32
 	FsortFlags        U8
-	_                 [3]byte
+	F__ccgo_pad1      [3]byte
 	FpDeferredRowLoad uintptr
 } /* sqlite3.c:132119:9 */
 
@@ -158235,9 +159030,9 @@ type SortCtx1 = struct {
 // extracted from the sorter.
 type SortCtx = SortCtx1 /* sqlite3.c:132119:24 */
 type RowLoadInfo1 = struct {
-	FregResult int32
-	FecelFlags U8
-	_          [3]byte
+	FregResult   int32
+	FecelFlags   U8
+	F__ccgo_pad1 [3]byte
 } /* sqlite3.c:132119:9 */
 
 // Delete all the content of a Select structure.  Deallocate the structure
@@ -161702,12 +162497,12 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 // All references to columns in table iTable are to be replaced by corresponding
 // expressions in pEList.
 type SubstContext1 = struct {
-	FpParse     uintptr
-	FiTable     int32
-	FiNewTable  int32
-	FisLeftJoin int32
-	_           [4]byte
-	FpEList     uintptr
+	FpParse      uintptr
+	FiTable      int32
+	FiNewTable   int32
+	FisLeftJoin  int32
+	F__ccgo_pad1 [4]byte
+	FpEList      uintptr
 } /* sqlite3.c:135643:9 */
 
 // An instance of the SubstContext object describes an substitution edit
@@ -165910,14 +166705,14 @@ select_end:
 // This structure is used to pass data from sqlite3_get_table() through
 // to the callback function is uses to build the result.
 type TabResult1 = struct {
-	FazResult uintptr
-	FzErrMsg  uintptr
-	FnAlloc   U32
-	FnRow     U32
-	FnColumn  U32
-	FnData    U32
-	Frc       int32
-	_         [4]byte
+	FazResult    uintptr
+	FzErrMsg     uintptr
+	FnAlloc      U32
+	FnRow        U32
+	FnColumn     U32
+	FnData       U32
+	Frc          int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:139498:9 */
 
 //************* End of select.c *********************************************
@@ -170288,7 +171083,7 @@ func createModule(tls *libc.TLS, db uintptr, zName uintptr, pModule uintptr, pAu
 	Xsqlite3VtabCreateModule(tls, db, zName, pModule, pAux, xDestroy)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	if (rc != SQLITE_OK) && (xDestroy != 0) {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDestroy)))(tls, pAux)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDestroy})).f(tls, pAux)
 	}
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	return rc
@@ -170332,7 +171127,7 @@ func Xsqlite3VtabModuleUnref(tls *libc.TLS, db uintptr, pMod uintptr) { /* sqlit
 	(*Module)(unsafe.Pointer(pMod)).FnRefModule--
 	if (*Module)(unsafe.Pointer(pMod)).FnRefModule == 0 {
 		if (*Module)(unsafe.Pointer(pMod)).FxDestroy != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pMod + 32 /* &.xDestroy */))))(tls, (*Module)(unsafe.Pointer(pMod)).FpAux)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Module)(unsafe.Pointer(pMod)).FxDestroy})).f(tls, (*Module)(unsafe.Pointer(pMod)).FpAux)
 		}
 
 		Xsqlite3DbFree(tls, db, pMod)
@@ -170370,7 +171165,9 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) { /* sqlite3.c:143352:21:
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
 		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
-			(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule + 32 /* &.xDisconnect */))))(tls, p)
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
@@ -170711,7 +171508,9 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	(*VtabCtx)(unsafe.Pointer(bp + 32 /* &sCtx */)).FpPrior = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	(*VtabCtx)(unsafe.Pointer(bp + 32 /* &sCtx */)).FbDeclared = 0
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = bp + 32 /* &sCtx */
-	rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(&xConstruct)))(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, (pVTable + 16 /* &.pVtab */), bp+64 /* &zErr */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xConstruct})).f(tls, db, (*Module)(unsafe.Pointer(pMod)).FpAux, nArg, azArg, (pVTable + 16 /* &.pVtab */), bp+64 /* &zErr */)
 	(*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx = (*VtabCtx)(unsafe.Pointer(bp + 32 /* &sCtx */)).FpPrior
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -171004,7 +171803,9 @@ func Xsqlite3VtabCallDestroy(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr)
 		}
 
 		(*Table)(unsafe.Pointer(pTab)).FnTabRef++
-		rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(&xDestroy)))(tls, (*VTable)(unsafe.Pointer(p)).FpVtab)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xDestroy})).f(tls, (*VTable)(unsafe.Pointer(p)).FpVtab)
 		// Remove the sqlite3_vtab* from the aVTrans[] array, if applicable
 		if rc == SQLITE_OK {
 
@@ -171036,7 +171837,9 @@ func callFinaliser(tls *libc.TLS, db uintptr, offset int32) { /* sqlite3.c:14407
 				var x uintptr
 				x = *(*uintptr)(unsafe.Pointer(((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule + uintptr(offset))))
 				if x != 0 {
-					(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(&x)))(tls, p)
+					(*struct {
+						f func(*libc.TLS, uintptr) int32
+					})(unsafe.Pointer(&struct{ uintptr }{x})).f(tls, p)
 				}
 			}
 			(*VTable)(unsafe.Pointer(pVTab)).FiSavepoint = 0
@@ -171062,7 +171865,9 @@ func Xsqlite3VtabSync(tls *libc.TLS, db uintptr, p uintptr) int32 { /* sqlite3.c
 		var x uintptr
 		var pVtab uintptr = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(aVTrans + uintptr(i)*8)))).FpVtab
 		if (pVtab != 0) && ((libc.AssignUintptr(&x, (*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FpModule)).FxSync)) != uintptr(0)) {
-			rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(&x)))(tls, pVtab)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{x})).f(tls, pVtab)
 			Xsqlite3VtabImportErrmsg(tls, p, pVtab)
 		}
 	}
@@ -171120,13 +171925,17 @@ func Xsqlite3VtabBegin(tls *libc.TLS, db uintptr, pVTab uintptr) int32 { /* sqli
 		// sqlite3.aVTrans[] array.
 		rc = growVTrans(tls, db)
 		if rc == SQLITE_OK {
-			rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pModule + 112 /* &.xBegin */))))(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxBegin})).f(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 			if rc == SQLITE_OK {
 				var iSvpt int32 = ((*Sqlite3)(unsafe.Pointer(db)).FnStatement + (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 				addToVTrans(tls, db, pVTab)
 				if (iSvpt != 0) && ((*Sqlite3_module)(unsafe.Pointer(pModule)).FxSavepoint != 0) {
 					(*VTable)(unsafe.Pointer(pVTab)).FiSavepoint = iSvpt
-					rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((pModule + 160 /* &.xSavepoint */))))(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab, (iSvpt - 1))
+					rc = (*struct {
+						f func(*libc.TLS, uintptr, int32) int32
+					})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxSavepoint})).f(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab, (iSvpt - 1))
 				}
 			}
 		}
@@ -171173,7 +171982,9 @@ func Xsqlite3VtabSavepoint(tls *libc.TLS, db uintptr, op int32, iSavepoint int32
 					break
 				}
 				if (xMethod != 0) && ((*VTable)(unsafe.Pointer(pVTab)).FiSavepoint > iSavepoint) {
-					rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(&xMethod)))(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab, iSavepoint)
+					rc = (*struct {
+						f func(*libc.TLS, uintptr, int32) int32
+					})(unsafe.Pointer(&struct{ uintptr }{xMethod})).f(tls, (*VTable)(unsafe.Pointer(pVTab)).FpVtab, iSavepoint)
 				}
 				Xsqlite3VtabUnlock(tls, pVTab)
 			}
@@ -171232,7 +172043,9 @@ func Xsqlite3VtabOverloadFunction(tls *libc.TLS, db uintptr, pDef uintptr, nArg
 	// Though undocumented, we have historically always invoked xFindFunction
 	// with an all lower-case function name.  Continue in this tradition to
 	// avoid any chance of an incompatibility.
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pMod + 144 /* &.xFindFunction */))))(tls, pVtab, nArg, (*FuncDef)(unsafe.Pointer(pDef)).FzName, bp /* &xSFunc */, bp+8 /* &pArg */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pMod)).FxFindFunction})).f(tls, pVtab, nArg, (*FuncDef)(unsafe.Pointer(pDef)).FzName, bp /* &xSFunc */, bp+8 /* &pArg */)
 	if rc == 0 {
 		return pDef
 	}
@@ -171460,16 +172273,16 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 
 // Forward references
 type WhereClause1 = struct {
-	FpWInfo  uintptr
-	FpOuter  uintptr
-	Fop      U8
-	FhasOr   U8
-	_        [2]byte
-	FnTerm   int32
-	FnSlot   int32
-	_        [4]byte
-	Fa       uintptr
-	FaStatic [8]WhereTerm
+	FpWInfo      uintptr
+	FpOuter      uintptr
+	Fop          U8
+	FhasOr       U8
+	F__ccgo_pad1 [2]byte
+	FnTerm       int32
+	FnSlot       int32
+	F__ccgo_pad2 [4]byte
+	Fa           uintptr
+	FaStatic     [8]WhereTerm
 } /* sqlite3.c:14936:9 */
 
 //************* End of vtab.c ***********************************************
@@ -171547,9 +172360,9 @@ type WhereLevel1 = struct {
 	Fp2          int32
 	Fu           struct {
 		Fin struct {
-			FnIn     int32
-			_        [4]byte
-			FaInLoop uintptr
+			FnIn         int32
+			F__ccgo_pad1 [4]byte
+			FaInLoop     uintptr
 		}
 	}
 	FpWLoop   uintptr
@@ -171578,7 +172391,7 @@ type WhereLoop1 = struct {
 	FnLTerm      U16
 	FnSkip       U16
 	FnLSlot      U16
-	_            [6]byte
+	F__ccgo_pad1 [6]byte
 	FaLTerm      uintptr
 	FpNextLoop   uintptr
 	FaLTermSpace [3]uintptr
@@ -171586,14 +172399,14 @@ type WhereLoop1 = struct {
 
 type WhereLoop = WhereLoop1 /* sqlite3.c:144522:26 */
 type WherePath1 = struct {
-	FmaskLoop  Bitmask
-	FrevLoop   Bitmask
-	FnRow      LogEst
-	FrCost     LogEst
-	FrUnsorted LogEst
-	FisOrdered I8
-	_          [1]byte
-	FaLoop     uintptr
+	FmaskLoop    Bitmask
+	FrevLoop     Bitmask
+	FnRow        LogEst
+	FrCost       LogEst
+	FrUnsorted   LogEst
+	FisOrdered   I8
+	F__ccgo_pad1 [1]byte
+	FaLoop       uintptr
 } /* sqlite3.c:144523:9 */
 
 type WherePath = WherePath1 /* sqlite3.c:144523:26 */
@@ -171608,8 +172421,8 @@ type WhereTerm1 = struct {
 	FiParent    int32
 	FleftCursor int32
 	Fu          struct {
-		_  [0]uint64
-		Fx struct {
+		F__ccgo_pad1 [0]uint64
+		Fx           struct {
 			FleftColumn int32
 			FiField     int32
 		}
@@ -171620,50 +172433,50 @@ type WhereTerm1 = struct {
 
 type WhereTerm = WhereTerm1 /* sqlite3.c:144524:26 */
 type WhereLoopBuilder1 = struct {
-	FpWInfo     uintptr
-	FpWC        uintptr
-	FpOrderBy   uintptr
-	FpNew       uintptr
-	FpOrSet     uintptr
-	FpRec       uintptr
-	FnRecValid  int32
-	FbldFlags1  uint8
-	FbldFlags2  uint8
-	_           [2]byte
-	FiPlanLimit uint32
-	_           [4]byte
+	FpWInfo      uintptr
+	FpWC         uintptr
+	FpOrderBy    uintptr
+	FpNew        uintptr
+	FpOrSet      uintptr
+	FpRec        uintptr
+	FnRecValid   int32
+	FbldFlags1   uint8
+	FbldFlags2   uint8
+	F__ccgo_pad1 [2]byte
+	FiPlanLimit  uint32
+	F__ccgo_pad2 [4]byte
 } /* sqlite3.c:144525:9 */
 
 type WhereLoopBuilder = WhereLoopBuilder1 /* sqlite3.c:144525:33 */
 type WhereScan1 = struct {
-	FpOrigWC   uintptr
-	FpWC       uintptr
-	FzCollName uintptr
-	FpIdxExpr  uintptr
-	Fidxaff    int8
-	FnEquiv    uint8
-	FiEquiv    uint8
-	_          [1]byte
-	FopMask    U32
-	Fk         int32
-	FaiCur     [11]int32
-	FaiColumn  [11]I16
-	_          [2]byte
+	FpOrigWC     uintptr
+	FpWC         uintptr
+	FzCollName   uintptr
+	FpIdxExpr    uintptr
+	Fidxaff      int8
+	FnEquiv      uint8
+	FiEquiv      uint8
+	F__ccgo_pad1 [1]byte
+	FopMask      U32
+	Fk           int32
+	FaiCur       [11]int32
+	FaiColumn    [11]I16
+	F__ccgo_pad2 [2]byte
 } /* sqlite3.c:144526:9 */
 
 type WhereScan = WhereScan1 /* sqlite3.c:144526:26 */
 type WhereOrCost1 = struct {
-	Fprereq Bitmask
-	FrRun   LogEst
-	FnOut   LogEst
-	_       [4]byte
+	Fprereq      Bitmask
+	FrRun        LogEst
+	FnOut        LogEst
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:144525:9 */
 
 type WhereOrCost = WhereOrCost1 /* sqlite3.c:144527:28 */
 type WhereOrSet1 = struct {
-	Fn U16
-	_  [6]byte
-	Fa [3]WhereOrCost
+	Fn           U16
+	F__ccgo_pad1 [6]byte
+	Fa           [3]WhereOrCost
 } /* sqlite3.c:144525:9 */
 
 type WhereOrSet = WhereOrSet1 /* sqlite3.c:144528:27 */
@@ -171682,12 +172495,12 @@ type WhereOrSet = WhereOrSet1 /* sqlite3.c:144528:27 */
 // the loop nested order, with WhereInfo.a[0] being the outer loop and
 // WhereInfo.a[WhereInfo.nLevel-1] being the inner loop.
 type InLoop = struct {
-	FiCur       int32
-	FaddrInTop  int32
-	FiBase      int32
-	FnPrefix    int32
-	FeEndLoopOp U8
-	_           [3]byte
+	FiCur        int32
+	FaddrInTop   int32
+	FiBase       int32
+	FnPrefix     int32
+	FeEndLoopOp  U8
+	F__ccgo_pad1 [3]byte
 } /* sqlite3.c:144567:7 */
 
 // Allowed values for WhereLoopBuider.bldFlags
@@ -174222,7 +175035,9 @@ func isAuxiliaryVtabOperator(tls *libc.TLS, db uintptr, pExpr uintptr, peOp2 uin
 
 			pMod = (*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FpModule
 			if (*Sqlite3_module)(unsafe.Pointer(pMod)).FxFindFunction != uintptr(0) {
-				i = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pMod + 144 /* &.xFindFunction */))))(tls, pVtab, 2, *(*uintptr)(unsafe.Pointer(pExpr + 8 /* &.u */)), bp /* &xNotUsed */, bp+8 /* &pNotUsed */)
+				i = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pMod)).FxFindFunction})).f(tls, pVtab, 2, *(*uintptr)(unsafe.Pointer(pExpr + 8 /* &.u */)), bp /* &xNotUsed */, bp+8 /* &pNotUsed */)
 				if i >= SQLITE_INDEX_CONSTRAINT_FUNCTION {
 					*(*uint8)(unsafe.Pointer(peOp2)) = uint8(i)
 					*(*uintptr)(unsafe.Pointer(ppRight)) = (*ExprList_item)(unsafe.Pointer((pList + 8 /* &.a */) + 1*32)).FpExpr
@@ -174266,9 +175081,9 @@ func isAuxiliaryVtabOperator(tls *libc.TLS, db uintptr, pExpr uintptr, peOp2 uin
 }
 
 type Op2 = struct {
-	FzOp  uintptr
-	FeOp2 uint8
-	_     [7]byte
+	FzOp         uintptr
+	FeOp2        uint8
+	F__ccgo_pad1 [7]byte
 } /* sqlite3.c:147955:18 */
 
 var aOp = [4]Op2{
@@ -176713,7 +177528,9 @@ func vtabBestIndex(tls *libc.TLS, pParse uintptr, pTab uintptr, p uintptr) int32
 	var pVtab uintptr = (*VTable)(unsafe.Pointer(Xsqlite3GetVTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pTab))).FpVtab
 	var rc int32
 
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FpModule + 24 /* &.xBestIndex */))))(tls, pVtab, p)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FpModule)).FxBestIndex})).f(tls, pVtab, p)
 
 	if (rc != SQLITE_OK) && (rc != SQLITE_CONSTRAINT) {
 		if rc == SQLITE_NOMEM {
@@ -181122,9 +181939,9 @@ func Xsqlite3WhereEnd(tls *libc.TLS, pWInfo uintptr) { /* sqlite3.c:154626:21: *
 			}
 			{
 
-				Xsqlite3VdbeJumpHere(tls, v, ((*InLoop)(unsafe.Pointer(pIn)).FaddrInTop + 1))
-				if int32((*InLoop)(unsafe.Pointer(pIn)).FeEndLoopOp) != OP_Noop {
-					if (*InLoop)(unsafe.Pointer(pIn)).FnPrefix != 0 {
+				Xsqlite3VdbeJumpHere(tls, v, (*(*int32)(unsafe.Pointer(pIn + 4)) + 1))
+				if int32(*(*U8)(unsafe.Pointer(pIn + 16))) != OP_Noop {
+					if *(*int32)(unsafe.Pointer(pIn + 12)) != 0 {
 						var bEarlyOut int32 = (libc.Bool32((((*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags & U32(WHERE_VIRTUALTABLE)) == U32(0)) &&
 							(((*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags & U32(WHERE_IN_EARLYOUT)) != U32(0))))
 						if (*WhereLevel)(unsafe.Pointer(pLevel)).FiLeftJoin != 0 {
@@ -181136,26 +181953,26 @@ func Xsqlite3WhereEnd(tls *libc.TLS, pWInfo uintptr) { /* sqlite3.c:154626:21: *
 							// return the null-row. So, if the cursor is not open yet,
 							// jump over the OP_Next or OP_Prev instruction about to
 							// be coded.
-							Xsqlite3VdbeAddOp2(tls, v, OP_IfNotOpen, (*InLoop)(unsafe.Pointer(pIn)).FiCur,
+							Xsqlite3VdbeAddOp2(tls, v, OP_IfNotOpen, *(*int32)(unsafe.Pointer(pIn)),
 								((Xsqlite3VdbeCurrentAddr(tls, v) + 2) + bEarlyOut))
 
 						}
 						if bEarlyOut != 0 {
 							Xsqlite3VdbeAddOp4Int(tls, v, OP_IfNoHope, (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur,
 								(Xsqlite3VdbeCurrentAddr(tls, v) + 2),
-								(*InLoop)(unsafe.Pointer(pIn)).FiBase, (*InLoop)(unsafe.Pointer(pIn)).FnPrefix)
+								*(*int32)(unsafe.Pointer(pIn + 8)), *(*int32)(unsafe.Pointer(pIn + 12)))
 
 							// Retarget the OP_IsNull against the left operand of IN so
 							// it jumps past the OP_IfNoHope.  This is because the
 							// OP_IsNull also bypasses the OP_Affinity opcode that is
 							// required by OP_IfNoHope.
-							Xsqlite3VdbeJumpHere(tls, v, ((*InLoop)(unsafe.Pointer(pIn)).FaddrInTop + 1))
+							Xsqlite3VdbeJumpHere(tls, v, (*(*int32)(unsafe.Pointer(pIn + 4)) + 1))
 						}
 					}
-					Xsqlite3VdbeAddOp2(tls, v, int32((*InLoop)(unsafe.Pointer(pIn)).FeEndLoopOp), (*InLoop)(unsafe.Pointer(pIn)).FiCur, (*InLoop)(unsafe.Pointer(pIn)).FaddrInTop)
+					Xsqlite3VdbeAddOp2(tls, v, int32(*(*U8)(unsafe.Pointer(pIn + 16))), *(*int32)(unsafe.Pointer(pIn)), *(*int32)(unsafe.Pointer(pIn + 4)))
 
 				}
-				Xsqlite3VdbeJumpHere(tls, v, ((*InLoop)(unsafe.Pointer(pIn)).FaddrInTop - 1))
+				Xsqlite3VdbeJumpHere(tls, v, (*(*int32)(unsafe.Pointer(pIn + 4)) - 1))
 
 			}
 			goto __2
@@ -181755,9 +182572,9 @@ func ntileValueFunc(tls *libc.TLS, pCtx uintptr) { /* sqlite3.c:155364:13: */
 
 // Context object for last_value() window function.
 type LastValueCtx = struct {
-	FpVal uintptr
-	FnVal int32
-	_     [4]byte
+	FpVal        uintptr
+	FnVal        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:155391:1 */
 
 // Implementation of last_value().
@@ -181971,11 +182788,11 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 }
 
 type WindowUpdate = struct {
-	FzFunc    uintptr
-	FeFrmType int32
-	FeStart   int32
-	FeEnd     int32
-	_         [4]byte
+	FzFunc       uintptr
+	FeFrmType    int32
+	FeStart      int32
+	FeEnd        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:155605:7 */
 
 // Context object passed through sqlite3WalkExprList() to
@@ -182763,18 +183580,18 @@ func windowArgCount(tls *libc.TLS, pWin uintptr) int32 { /* sqlite3.c:156418:12:
 }
 
 type WindowCodeArg1 = struct {
-	FpParse    uintptr
-	FpMWin     uintptr
-	FpVdbe     uintptr
-	FaddrGosub int32
-	FregGosub  int32
-	FregArg    int32
-	FeDelete   int32
-	FregRowid  int32
-	Fstart     WindowCsrAndReg
-	Fcurrent   WindowCsrAndReg
-	Fend       WindowCsrAndReg
-	_          [4]byte
+	FpParse      uintptr
+	FpMWin       uintptr
+	FpVdbe       uintptr
+	FaddrGosub   int32
+	FregGosub    int32
+	FregArg      int32
+	FeDelete     int32
+	FregRowid    int32
+	Fstart       WindowCsrAndReg
+	Fcurrent     WindowCsrAndReg
+	Fend         WindowCsrAndReg
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:156423:9 */
 
 type WindowCodeArg = WindowCodeArg1 /* sqlite3.c:156423:30 */
@@ -184321,15 +185138,15 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 //
 // Then the "b" IdList records the list "a,b,c".
 type TrigEvent = struct {
-	Fa int32
-	_  [4]byte
-	Fb uintptr
+	Fa           int32
+	F__ccgo_pad1 [4]byte
+	Fb           uintptr
 } /* sqlite3.c:158068:1 */
 
 type FrameBound = struct {
-	FeType int32
-	_      [4]byte
-	FpExpr uintptr
+	FeType       int32
+	F__ccgo_pad1 [4]byte
+	FpExpr       uintptr
 } /* sqlite3.c:158070:1 */
 
 // Disable lookaside memory allocation for objects that might be
@@ -184520,9 +185337,9 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 //    YY_MAX_REDUCE      Maximum value for reduce actions
 //************ Begin control #defines ****************************************
 type YYMINORTYPE = struct {
-	_       [0]uint64
-	Fyyinit int32
-	_       [12]byte
+	F__ccgo_pad1 [0]uint64
+	Fyyinit      int32
+	F__ccgo_pad2 [12]byte
 } /* sqlite3.c:158494:3 */
 //************ End control #defines ******************************************
 
@@ -185391,10 +186208,10 @@ var yyFallback = [184]uint16{
 // actually contains the reduce action for the second half of the
 // SHIFTREDUCE.
 type yyStackEntry = struct {
-	Fstateno uint16
-	Fmajor   uint16
-	_        [4]byte
-	Fminor   YYMINORTYPE
+	Fstateno     uint16
+	Fmajor       uint16
+	F__ccgo_pad1 [4]byte
+	Fminor       YYMINORTYPE
 } /* sqlite3.c:159404:1 */
 
 type YyStackEntry = yyStackEntry /* sqlite3.c:159411:29 */
@@ -190923,7 +191740,7 @@ func functionDestroy(tls *libc.TLS, db uintptr, p uintptr) { /* sqlite3.c:166213
 	if pDestructor != 0 {
 		(*FuncDestructor)(unsafe.Pointer(pDestructor)).FnRef--
 		if (*FuncDestructor)(unsafe.Pointer(pDestructor)).FnRef == 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pDestructor + 8 /* &.xDestroy */))))(tls, (*FuncDestructor)(unsafe.Pointer(pDestructor)).FpUserData)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*FuncDestructor)(unsafe.Pointer(pDestructor)).FxDestroy})).f(tls, (*FuncDestructor)(unsafe.Pointer(pDestructor)).FpUserData)
 			Xsqlite3DbFree(tls, db, pDestructor)
 		}
 	}
@@ -190985,7 +191802,9 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 { /* sqlit
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace) & SQLITE_TRACE_CLOSE) != 0 {
-		(*(*func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((db + 240 /* &.trace */ /* &.xV2 */))))(tls, uint32(SQLITE_TRACE_CLOSE), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, db, uintptr(0))
+		(*struct {
+			f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 240 /* &.trace */))})).f(tls, uint32(SQLITE_TRACE_CLOSE), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, db, uintptr(0))
 	}
 
 	// Force xDisconnect calls on all virtual tables
@@ -191134,7 +191953,7 @@ func Xsqlite3LeaveMutexAndCloseZombie(tls *libc.TLS, db uintptr) { /* sqlite3.c:
 		// Invoke any destructors registered for collation sequence user data.
 		for j = 0; j < 3; j++ {
 			if (*CollSeq)(unsafe.Pointer(pColl+uintptr(j)*40)).FxDel != 0 {
-				(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pColl + uintptr(j)*40 + 32 /* &.xDel */))))(tls, (*CollSeq)(unsafe.Pointer(pColl+uintptr(j)*40)).FpUser)
+				(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*CollSeq)(unsafe.Pointer(pColl + uintptr(j)*40)).FxDel})).f(tls, (*CollSeq)(unsafe.Pointer(pColl+uintptr(j)*40)).FpUser)
 			}
 		}
 		Xsqlite3DbFree(tls, db, pColl)
@@ -191215,7 +192034,7 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) { /* sqlite3
 
 	// If one has been configured, invoke the rollback-hook callback
 	if ((*Sqlite3)(unsafe.Pointer(db)).FxRollbackCallback != 0) && ((inTrans != 0) || !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0)) {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((db + 296 /* &.xRollbackCallback */))))(tls, (*Sqlite3)(unsafe.Pointer(db)).FpRollbackArg)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxRollbackCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpRollbackArg)
 	}
 }
 
@@ -191335,7 +192154,9 @@ func Xsqlite3InvokeBusyHandler(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:16
 	if ((*BusyHandler)(unsafe.Pointer(p)).FxBusyHandler == uintptr(0)) || ((*BusyHandler)(unsafe.Pointer(p)).FnBusy < 0) {
 		return 0
 	}
-	rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((p /* &.xBusyHandler */))))(tls, (*BusyHandler)(unsafe.Pointer(p)).FpBusyArg, (*BusyHandler)(unsafe.Pointer(p)).FnBusy)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*BusyHandler)(unsafe.Pointer(p)).FxBusyHandler})).f(tls, (*BusyHandler)(unsafe.Pointer(p)).FpBusyArg, (*BusyHandler)(unsafe.Pointer(p)).FnBusy)
 	if rc == 0 {
 		(*BusyHandler)(unsafe.Pointer(p)).FnBusy = -1
 	} else {
@@ -191514,7 +192335,7 @@ func createFunctionApi(tls *libc.TLS, db uintptr, zFunc uintptr, nArg int32, enc
 		goto __2
 	}
 	Xsqlite3OomFault(tls, db)
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDestroy)))(tls, p)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDestroy})).f(tls, p)
 	goto out
 __2:
 	;
@@ -191529,7 +192350,7 @@ __1:
 		goto __3
 	}
 
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDestroy)))(tls, p)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDestroy})).f(tls, p)
 	Xsqlite3_free(tls, pArg)
 __3:
 	;
@@ -192043,7 +192864,7 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 				var p uintptr = (aColl + uintptr(j)*40)
 				if int32((*CollSeq)(unsafe.Pointer(p)).Fenc) == int32((*CollSeq)(unsafe.Pointer(pColl)).Fenc) {
 					if (*CollSeq)(unsafe.Pointer(p)).FxDel != 0 {
-						(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((p + 32 /* &.xDel */))))(tls, (*CollSeq)(unsafe.Pointer(p)).FpUser)
+						(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*CollSeq)(unsafe.Pointer(p)).FxDel})).f(tls, (*CollSeq)(unsafe.Pointer(p)).FpUser)
 					}
 					(*CollSeq)(unsafe.Pointer(p)).FxCmp = uintptr(0)
 				}
@@ -192471,9 +193292,9 @@ __43:
 }
 
 type OpenMode = struct {
-	Fz    uintptr
-	Fmode int32
-	_     [4]byte
+	Fz           uintptr
+	Fmode        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:168064:9 */
 
 var aCacheMode = [3]OpenMode{
@@ -193407,7 +194228,7 @@ func Xsqlite3_test_control(tls *libc.TLS, op int32, va uintptr) int32 { /* sqlit
 		{
 			var x int32 = 0
 
-			rc = libc.AtomicLoadInt32(&x)
+			rc = x
 			break
 
 		}
@@ -194119,7 +194940,9 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 		// The blocking transaction has been concluded. Or there never was a
 		// blocking transaction. In either case, invoke the notify callback
 		// immediately.
-		(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer(&xNotify)))(tls, bp /* &pArg */, 1)
+		(*struct {
+			f func(*libc.TLS, uintptr, int32)
+		})(unsafe.Pointer(&struct{ uintptr }{xNotify})).f(tls, bp /* &pArg */, 1)
 	} else {
 		var p uintptr
 
@@ -194206,7 +195029,9 @@ func Xsqlite3ConnectionUnlocked(tls *libc.TLS, db uintptr) { /* sqlite3.c:170018
 		if (*Sqlite3)(unsafe.Pointer(p)).FpUnlockConnection == db {
 
 			if ((*Sqlite3)(unsafe.Pointer(p)).FxUnlockNotify != xUnlockNotify) && (nArg != 0) {
-				(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer(&xUnlockNotify)))(tls, aArg, nArg)
+				(*struct {
+					f func(*libc.TLS, uintptr, int32)
+				})(unsafe.Pointer(&struct{ uintptr }{xUnlockNotify})).f(tls, aArg, nArg)
 				nArg = 0
 			}
 
@@ -194244,7 +195069,9 @@ func Xsqlite3ConnectionUnlocked(tls *libc.TLS, db uintptr) { /* sqlite3.c:170018
 					// reduce the applications ability to prioritize multiple
 					// connections. But it is the best that can be done under the
 					// circumstances.
-					(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer(&xUnlockNotify)))(tls, aArg, nArg)
+					(*struct {
+						f func(*libc.TLS, uintptr, int32)
+					})(unsafe.Pointer(&struct{ uintptr }{xUnlockNotify})).f(tls, aArg, nArg)
 					nArg = 0
 				}
 			}
@@ -194268,7 +195095,9 @@ func Xsqlite3ConnectionUnlocked(tls *libc.TLS, db uintptr) { /* sqlite3.c:170018
 	}
 
 	if nArg != 0 {
-		(*(*func(*libc.TLS, uintptr, int32))(unsafe.Pointer(&xUnlockNotify)))(tls, aArg, nArg)
+		(*struct {
+			f func(*libc.TLS, uintptr, int32)
+		})(unsafe.Pointer(&struct{ uintptr }{xUnlockNotify})).f(tls, aArg, nArg)
 	}
 	Xsqlite3_free(tls, aDyn)
 	leaveMutex(tls) // Leave STATIC_MAIN mutex
@@ -194897,39 +195726,39 @@ var jsonIsSpace = [256]int8{
 
 // Objects
 type JsonString1 = struct {
-	FpCtx    uintptr
-	FzBuf    uintptr
-	FnAlloc  U64
-	FnUsed   U64
-	FbStatic U8
-	FbErr    U8
-	FzSpace  [100]int8
-	_        [2]byte
+	FpCtx        uintptr
+	FzBuf        uintptr
+	FnAlloc      U64
+	FnUsed       U64
+	FbStatic     U8
+	FbErr        U8
+	FzSpace      [100]int8
+	F__ccgo_pad1 [2]byte
 } /* sqlite3.c:189736:9 */
 
 // Objects
 type JsonString = JsonString1 /* sqlite3.c:189736:27 */
 type JsonNode1 = struct {
-	FeType   U8
-	FjnFlags U8
-	_        [2]byte
-	Fn       U32
-	Fu       struct{ FzJContent uintptr }
+	FeType       U8
+	FjnFlags     U8
+	F__ccgo_pad1 [2]byte
+	Fn           U32
+	Fu           struct{ FzJContent uintptr }
 } /* sqlite3.c:189737:9 */
 
 type JsonNode = JsonNode1 /* sqlite3.c:189737:25 */
 type JsonParse1 = struct {
-	FnNode  U32
-	FnAlloc U32
-	FaNode  uintptr
-	FzJson  uintptr
-	FaUp    uintptr
-	Foom    U8
-	FnErr   U8
-	FiDepth U16
-	FnJson  int32
-	FiHold  U32
-	_       [4]byte
+	FnNode       U32
+	FnAlloc      U32
+	FaNode       uintptr
+	FzJson       uintptr
+	FaUp         uintptr
+	Foom         U8
+	FnErr        U8
+	FiDepth      U16
+	FnJson       int32
+	FiHold       U32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:189738:9 */
 
 type JsonParse = JsonParse1 /* sqlite3.c:189738:26 */
@@ -197100,17 +197929,17 @@ func jsonObjectFinal(tls *libc.TLS, ctx uintptr) { /* sqlite3.c:191673:13: */
 // The json_each virtual table
 //
 type JsonEachCursor1 = struct {
-	Fbase       Sqlite3_vtab_cursor
-	FiRowid     U32
-	FiBegin     U32
-	Fi          U32
-	FiEnd       U32
-	FeType      U8
-	FbRecursive U8
-	_           [6]byte
-	FzJson      uintptr
-	FzRoot      uintptr
-	FsParse     JsonParse
+	Fbase        Sqlite3_vtab_cursor
+	FiRowid      U32
+	FiBegin      U32
+	Fi           U32
+	FiEnd        U32
+	FeType       U8
+	FbRecursive  U8
+	F__ccgo_pad1 [6]byte
+	FzJson       uintptr
+	FzRoot       uintptr
+	FsParse      JsonParse
 } /* sqlite3.c:191683:9 */
 
 // ***************************************************************************
@@ -197643,12 +198472,12 @@ func Xsqlite3Json1Init(tls *libc.TLS, db uintptr) int32 { /* sqlite3.c:192174:20
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
 	for i = uint32(0); (uint64(i) < (uint64(unsafe.Sizeof(aAgg)) / uint64(unsafe.Sizeof(struct {
-		FzName  uintptr
-		FnArg   int32
-		_       [4]byte
-		FxStep  uintptr
-		FxFinal uintptr
-		FxValue uintptr
+		FzName       uintptr
+		FnArg        int32
+		F__ccgo_pad1 [4]byte
+		FxStep       uintptr
+		FxFinal      uintptr
+		FxValue      uintptr
 	}{})))) && (rc == SQLITE_OK); i++ {
 		rc = Xsqlite3_create_window_function(tls, db, aAgg[i].FzName, aAgg[i].FnArg,
 			(SQLITE_SUBTYPE | enc), uintptr(0),
@@ -197689,12 +198518,12 @@ var aFunc = [15]struct {
 	{FzName: ts + 24628 /* "json_valid" */, FnArg: 1, FxFunc: 0},
 } /* sqlite3.c:192182:5 */
 var aAgg = [2]struct {
-	FzName  uintptr
-	FnArg   int32
-	_       [4]byte
-	FxStep  uintptr
-	FxFinal uintptr
-	FxValue uintptr
+	FzName       uintptr
+	FnArg        int32
+	F__ccgo_pad1 [4]byte
+	FxStep       uintptr
+	FxFinal      uintptr
+	FxValue      uintptr
 }{
 	{FzName: ts + 24639 /* "json_group_array" */, FnArg: 1,
 		FxStep: 0, FxFinal: 0, FxValue: 0},
@@ -197728,19 +198557,19 @@ type Rtree1 = struct {
 	FinWrTrans       U8
 	FnAux            U8
 	FnAuxNotNull     U8
-	_                [1]byte
+	F__ccgo_pad1     [1]byte
 	FiDepth          int32
 	FzDb             uintptr
 	FzName           uintptr
 	FnBusy           U32
-	_                [4]byte
+	F__ccgo_pad2     [4]byte
 	FnRowEst         I64
 	FnCursor         U32
 	FnNodeRef        U32
 	FzReadAuxSql     uintptr
 	FpDeleted        uintptr
 	FiReinsertHeight int32
-	_                [4]byte
+	F__ccgo_pad3     [4]byte
 	FpNodeBlob       uintptr
 	FpWriteNode      uintptr
 	FpDeleteNode     uintptr
@@ -197769,21 +198598,21 @@ type RtreeCursor1 = struct {
 	FatEOF       U8
 	FbPoint      U8
 	FbAuxValid   U8
-	_            [1]byte
+	F__ccgo_pad1 [1]byte
 	FiStrategy   int32
 	FnConstraint int32
-	_            [4]byte
+	F__ccgo_pad2 [4]byte
 	FaConstraint uintptr
 	FnPointAlloc int32
 	FnPoint      int32
 	FmxLevel     int32
-	_            [4]byte
+	F__ccgo_pad3 [4]byte
 	FaPoint      uintptr
 	FpReadAux    uintptr
 	FsPoint      RtreeSearchPoint
 	FaNode       [5]uintptr
 	FanQueue     [41]U32
-	_            [4]byte
+	F__ccgo_pad4 [4]byte
 } /* sqlite3.c:192363:9 */
 
 type RtreeCursor = RtreeCursor1 /* sqlite3.c:192363:28 */
@@ -197812,13 +198641,13 @@ type RtreeConstraint1 = struct {
 
 type RtreeConstraint = RtreeConstraint1 /* sqlite3.c:192366:32 */
 type RtreeMatchArg1 = struct {
-	FiSize      U32
-	_           [4]byte
-	Fcb         RtreeGeomCallback
-	FnParam     int32
-	_           [4]byte
-	FapSqlParam uintptr
-	FaParam     [1]RtreeDValue
+	FiSize       U32
+	F__ccgo_pad1 [4]byte
+	Fcb          RtreeGeomCallback
+	FnParam      int32
+	F__ccgo_pad2 [4]byte
+	FapSqlParam  uintptr
+	FaParam      [1]RtreeDValue
 } /* sqlite3.c:192367:9 */
 
 type RtreeMatchArg = RtreeMatchArg1 /* sqlite3.c:192367:30 */
@@ -197834,12 +198663,12 @@ type RtreeCoord1 = struct{ Ff RtreeValue }  /* sqlite3.c:192365:9 */
 
 type RtreeCoord = RtreeCoord1 /* sqlite3.c:192369:26 */
 type RtreeSearchPoint1 = struct {
-	FrScore  RtreeDValue
-	Fid      Sqlite3_int64
-	FiLevel  U8
-	FeWithin U8
-	FiCell   U8
-	_        [5]byte
+	FrScore      RtreeDValue
+	Fid          Sqlite3_int64
+	FiLevel      U8
+	FeWithin     U8
+	FiCell       U8
+	F__ccgo_pad1 [5]byte
 } /* sqlite3.c:192363:9 */
 
 type RtreeSearchPoint = RtreeSearchPoint1 /* sqlite3.c:192370:33 */
@@ -198353,7 +199182,7 @@ func resetCursor(tls *libc.TLS, pCsr uintptr) { /* sqlite3.c:193357:13: */
 			var pInfo uintptr = (*RtreeConstraint)(unsafe.Pointer((*RtreeCursor)(unsafe.Pointer(pCsr)).FaConstraint + uintptr(i)*24)).FpInfo
 			if pInfo != 0 {
 				if (*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FxDelUser != 0 {
-					(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pInfo + 32 /* &.xDelUser */))))(tls, (*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FpUser)
+					(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FxDelUser})).f(tls, (*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FpUser)
 				}
 				Xsqlite3_free(tls, pInfo)
 			}
@@ -198489,7 +199318,9 @@ func rtreeCallbackConstraint(tls *libc.TLS, pConstraint uintptr, eInt int32, pCe
 	}
 	if (*RtreeConstraint)(unsafe.Pointer(pConstraint)).Fop == RTREE_MATCH {
 		*(*int32)(unsafe.Pointer(bp + 88 /* eWithin */)) = 0
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pConstraint + 8 /* &.u */ /* &.xGeom */))))(tls, pInfo,
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(pConstraint + 8 /* &.u */))})).f(tls, pInfo,
 			nCoord, bp+8 /* &aCoord[0] */, bp+88 /* &eWithin */)
 		if *(*int32)(unsafe.Pointer(bp + 88 /* eWithin */)) == 0 {
 			*(*int32)(unsafe.Pointer(peWithin)) = NOT_WITHIN
@@ -198500,7 +199331,9 @@ func rtreeCallbackConstraint(tls *libc.TLS, pConstraint uintptr, eInt int32, pCe
 		(*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FiLevel = (int32((*RtreeSearchPoint)(unsafe.Pointer(pSearch)).FiLevel) - 1)
 		(*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FrScore = libc.AssignPtrFloat64(pInfo+80 /* &.rParentScore */, (*RtreeSearchPoint)(unsafe.Pointer(pSearch)).FrScore)
 		(*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FeWithin = libc.AssignPtrInt32(pInfo+88 /* &.eParentWithin */, int32((*RtreeSearchPoint)(unsafe.Pointer(pSearch)).FeWithin))
-		rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pConstraint + 8 /* &.u */ /* &.xQueryFunc */))))(tls, pInfo)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(pConstraint + 8 /* &.u */))})).f(tls, pInfo)
 		if (*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FeWithin < *(*int32)(unsafe.Pointer(peWithin)) {
 			*(*int32)(unsafe.Pointer(peWithin)) = (*Sqlite3_rtree_query_info)(unsafe.Pointer(pInfo)).FeWithin
 		}
@@ -199886,7 +200719,9 @@ func updateMapping(tls *libc.TLS, pRtree uintptr, iRowid I64, pNode uintptr, iHe
 			(*RtreeNode)(unsafe.Pointer(pChild)).FpParent = pNode
 		}
 	}
-	return (*(*func(*libc.TLS, uintptr, Sqlite3_int64, Sqlite3_int64) int32)(unsafe.Pointer(&xSetMapping)))(tls, pRtree, iRowid, (*RtreeNode)(unsafe.Pointer(pNode)).FiNode)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Sqlite3_int64, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xSetMapping})).f(tls, pRtree, iRowid, (*RtreeNode)(unsafe.Pointer(pNode)).FiNode)
 }
 
 func sSplitNode(tls *libc.TLS, pRtree uintptr, pNode uintptr, pCell uintptr, iHeight int32) int32 { /* sqlite3.c:194817:12: */
@@ -201515,10 +202350,10 @@ type RtreeCheck1 = struct {
 	FnLeaf         int32
 	FnNonLeaf      int32
 	Frc            int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FzReport       uintptr
 	FnErr          int32
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 } /* sqlite3.c:196179:9 */
 
 // Context object passed between the various routines that make up the
@@ -202067,12 +202902,12 @@ type GeoPoly = GeoPoly1 /* sqlite3.c:196759:24 */
 
 // State of a parse of a GeoJSON input.
 type GeoParse1 = struct {
-	Fz       uintptr
-	FnVertex int32
-	FnAlloc  int32
-	FnErr    int32
-	_        [4]byte
-	Fa       uintptr
+	Fz           uintptr
+	FnVertex     int32
+	FnAlloc      int32
+	FnErr        int32
+	F__ccgo_pad1 [4]byte
+	Fa           uintptr
 } /* sqlite3.c:196782:9 */
 
 // The size of a memory allocation needed for a GeoPoly object sufficient
@@ -202970,25 +203805,25 @@ func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 
 // Objects used by the overlap algorihm.
 type GeoEvent1 = struct {
-	Fx     float64
-	FeType int32
-	_      [4]byte
-	FpSeg  uintptr
-	FpNext uintptr
+	Fx           float64
+	FeType       int32
+	F__ccgo_pad1 [4]byte
+	FpSeg        uintptr
+	FpNext       uintptr
 } /* sqlite3.c:197516:9 */
 
 // Objects used by the overlap algorihm.
 type GeoEvent = GeoEvent1 /* sqlite3.c:197516:25 */
 type GeoSegment1 = struct {
-	FC     float64
-	FB     float64
-	Fy     float64
-	Fy0    float32
-	Fside  uint8
-	_      [3]byte
-	Fidx   uint32
-	_      [4]byte
-	FpNext uintptr
+	FC           float64
+	FB           float64
+	Fy           float64
+	Fy0          float32
+	Fside        uint8
+	F__ccgo_pad1 [3]byte
+	Fidx         uint32
+	F__ccgo_pad2 [4]byte
+	FpNext       uintptr
 } /* sqlite3.c:197516:9 */
 
 type GeoSegment = GeoSegment1 /* sqlite3.c:197517:27 */
@@ -204100,11 +204935,11 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 { /* sqlite3.c:198409
 	var rc int32 = SQLITE_OK
 	var i int32
 	for i = 0; (uint64(i) < (uint64(unsafe.Sizeof(aFunc1)) / uint64(unsafe.Sizeof(struct {
-		FxFunc uintptr
-		FnArg  int8
-		FbPure uint8
-		_      [6]byte
-		FzName uintptr
+		FxFunc       uintptr
+		FnArg        int8
+		FbPure       uint8
+		F__ccgo_pad1 [6]byte
+		FzName       uintptr
 	}{})))) && (rc == SQLITE_OK); i++ {
 		var enc int32
 		if aFunc1[i].FbPure != 0 {
@@ -204132,11 +204967,11 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 { /* sqlite3.c:198409
 }
 
 var aFunc1 = [12]struct {
-	FxFunc uintptr
-	FnArg  int8
-	FbPure uint8
-	_      [6]byte
-	FzName uintptr
+	FxFunc       uintptr
+	FnArg        int8
+	FbPure       uint8
+	F__ccgo_pad1 [6]byte
+	FzName       uintptr
 }{
 	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27307 /* "geopoly_area" */},
 	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27320 /* "geopoly_blob" */},
@@ -204205,7 +205040,7 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 { /* sqlite3.c:198469:20
 func rtreeFreeCallback(tls *libc.TLS, p uintptr) { /* sqlite3.c:198508:13: */
 	var pInfo uintptr = p
 	if (*RtreeGeomCallback)(unsafe.Pointer(pInfo)).FxDestructor != 0 {
-		(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pInfo + 16 /* &.xDestructor */))))(tls, (*RtreeGeomCallback)(unsafe.Pointer(pInfo)).FpContext)
+		(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*RtreeGeomCallback)(unsafe.Pointer(pInfo)).FxDestructor})).f(tls, (*RtreeGeomCallback)(unsafe.Pointer(pInfo)).FpContext)
 	}
 	Xsqlite3_free(tls, p)
 }
@@ -204705,16 +205540,16 @@ func Xsqlite3_rtree_query_callback(tls *libc.TLS, db uintptr, zQueryFunc uintptr
 
 type sqlite3rbu = struct {
 	FeStage         int32
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FdbMain         uintptr
 	FdbRbu          uintptr
 	FzTarget        uintptr
 	FzRbu           uintptr
 	FzState         uintptr
 	FzStateDb       [5]int8
-	_               [3]byte
+	F__ccgo_pad2    [3]byte
 	Frc             int32
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FzErrmsg        uintptr
 	FnStep          int32
 	FnProgress      int32
@@ -204722,7 +205557,7 @@ type sqlite3rbu = struct {
 	FzVfsName       uintptr
 	FpTargetFd      uintptr
 	FnPagePerSector int32
-	_               [4]byte
+	F__ccgo_pad4    [4]byte
 	FiOalSz         I64
 	FnPhaseOneStep  I64
 	FiMaxFrame      U32
@@ -204731,13 +205566,13 @@ type sqlite3rbu = struct {
 	FnFrameAlloc    int32
 	FaFrame         uintptr
 	Fpgsz           int32
-	_               [4]byte
+	F__ccgo_pad5    [4]byte
 	FaBuf           uintptr
 	FiWalCksum      I64
 	FszTemp         I64
 	FszTempLimit    I64
 	FnRbu           int32
-	_               [4]byte
+	F__ccgo_pad6    [4]byte
 	FpRbuFd         uintptr
 } /* sqlite3.c:199829:9 */
 
@@ -205263,60 +206098,60 @@ type RbuFrame1 = struct {
 
 type RbuFrame = RbuFrame1 /* sqlite3.c:200253:25 */
 type RbuObjIter1 = struct {
-	FpTblIter   uintptr
-	FpIdxIter   uintptr
-	FnTblCol    int32
-	_           [4]byte
-	FazTblCol   uintptr
-	FazTblType  uintptr
-	FaiSrcOrder uintptr
-	FabTblPk    uintptr
-	FabNotNull  uintptr
-	FabIndexed  uintptr
-	FeType      int32
-	FbCleanup   int32
-	FzTbl       uintptr
-	FzDataTbl   uintptr
-	FzIdx       uintptr
-	FiTnum      int32
-	FiPkTnum    int32
-	FbUnique    int32
-	FnIndex     int32
-	FnCol       int32
-	_           [4]byte
-	FpSelect    uintptr
-	FpInsert    uintptr
-	FpDelete    uintptr
-	FpTmpInsert uintptr
-	FnIdxCol    int32
-	_           [4]byte
-	FaIdxCol    uintptr
-	FzIdxSql    uintptr
-	FpRbuUpdate uintptr
+	FpTblIter    uintptr
+	FpIdxIter    uintptr
+	FnTblCol     int32
+	F__ccgo_pad1 [4]byte
+	FazTblCol    uintptr
+	FazTblType   uintptr
+	FaiSrcOrder  uintptr
+	FabTblPk     uintptr
+	FabNotNull   uintptr
+	FabIndexed   uintptr
+	FeType       int32
+	FbCleanup    int32
+	FzTbl        uintptr
+	FzDataTbl    uintptr
+	FzIdx        uintptr
+	FiTnum       int32
+	FiPkTnum     int32
+	FbUnique     int32
+	FnIndex      int32
+	FnCol        int32
+	F__ccgo_pad2 [4]byte
+	FpSelect     uintptr
+	FpInsert     uintptr
+	FpDelete     uintptr
+	FpTmpInsert  uintptr
+	FnIdxCol     int32
+	F__ccgo_pad3 [4]byte
+	FaIdxCol     uintptr
+	FzIdxSql     uintptr
+	FpRbuUpdate  uintptr
 } /* sqlite3.c:199829:9 */
 
 type RbuObjIter = RbuObjIter1 /* sqlite3.c:200254:27 */
 type RbuState1 = struct {
 	FeStage        int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FzTbl          uintptr
 	FzDataTbl      uintptr
 	FzIdx          uintptr
 	FiWalCksum     I64
 	FnRow          int32
-	_              [4]byte
+	F__ccgo_pad2   [4]byte
 	FnProgress     I64
 	FiCookie       U32
-	_              [4]byte
+	F__ccgo_pad3   [4]byte
 	FiOalSz        I64
 	FnPhaseOneStep I64
 } /* sqlite3.c:200255:9 */
 
 type RbuState = RbuState1 /* sqlite3.c:200255:25 */
 type RbuSpan1 = struct {
-	FzSpan uintptr
-	FnSpan int32
-	_      [4]byte
+	FzSpan       uintptr
+	FnSpan       int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:199829:9 */
 
 type RbuSpan = RbuSpan1 /* sqlite3.c:200256:24 */
@@ -205340,7 +206175,7 @@ type rbu_file = struct {
 	FiCookie      U32
 	FiWriteVer    U8
 	FbNolock      U8
-	_             [2]byte
+	F__ccgo_pad1  [2]byte
 	FnShm         int32
 	FapShm        uintptr
 	FzDel         uintptr
@@ -207877,9 +208712,11 @@ func rbuShmChecksum(tls *libc.TLS, p uintptr) I64 { /* sqlite3.c:203029:12: */
 		var pDb uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
 		// var ptr uintptr at bp, 8
 
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 104 /* &.xShmMap */))))(tls, pDb, 0, (32 * 1024), 0, bp /* &ptr */)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+			f func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxShmMap})).f(tls, pDb, 0, (32 * 1024), 0, bp /* &ptr */)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			iRet = ((I64(*(*U32)(unsafe.Pointer(libc.AtomicLoadPUintptr(bp /* ptr */) + 10*4))) << 32) + I64(*(*U32)(unsafe.Pointer(libc.AtomicLoadPUintptr(bp /* ptr */) + 11*4))))
+			iRet = ((I64(*(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp /* ptr */)) + 10*4))) << 32) + I64(*(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp /* ptr */)) + 11*4))))
 		}
 	}
 	return iRet
@@ -207968,7 +208805,9 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) { /* sqlite3.c
 			var pDb uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
 			var pWal uintptr = (*Rbu_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd)).FpReal
 
-			nSectorSize = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 88 /* &.xSectorSize */))))(tls, pDb)
+			nSectorSize = (*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxSectorSize})).f(tls, pDb)
 			if nSectorSize > (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnPagePerSector = (nSectorSize / (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz)
 			} else {
@@ -207979,7 +208818,9 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) { /* sqlite3.c
 			// directory in which the target database and the wal file reside, in
 			// case it has not been synced since the rename() call in
 			// rbuMoveOalFile().
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pWal)).FpMethods + 40 /* &.xSync */))))(tls, pWal, SQLITE_SYNC_NORMAL)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pWal)).FpMethods)).FxSync})).f(tls, pWal, SQLITE_SYNC_NORMAL)
 		}
 	}
 }
@@ -208040,22 +208881,30 @@ func rbuCheckpointFrame(tls *libc.TLS, p uintptr, pFrame uintptr) { /* sqlite3.c
 	var iOff I64
 
 	iOff = ((((I64((*RbuFrame)(unsafe.Pointer(pFrame)).FiWalFrame - U32(1))) * (I64((*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz + 24))) + int64(32)) + int64(24))
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pWal)).FpMethods + 16 /* &.xRead */))))(tls, pWal, (*Sqlite3rbu)(unsafe.Pointer(p)).FaBuf, (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz, iOff)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pWal)).FpMethods)).FxRead})).f(tls, pWal, (*Sqlite3rbu)(unsafe.Pointer(p)).FaBuf, (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz, iOff)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 		return
 	}
 
 	iOff = ((I64((*RbuFrame)(unsafe.Pointer(pFrame)).FiDbPage - U32(1))) * I64((*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz))
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 24 /* &.xWrite */))))(tls, pDb, (*Sqlite3rbu)(unsafe.Pointer(p)).FaBuf, (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz, iOff)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxWrite})).f(tls, pDb, (*Sqlite3rbu)(unsafe.Pointer(p)).FaBuf, (*Sqlite3rbu)(unsafe.Pointer(p)).Fpgsz, iOff)
 }
 
 // Take an EXCLUSIVE lock on the database file.
 func rbuLockDatabase(tls *libc.TLS, p uintptr) { /* sqlite3.c:203202:13: */
 	var pReal uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pReal)).FpMethods + 56 /* &.xLock */))))(tls, pReal, SQLITE_LOCK_SHARED)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pReal)).FpMethods)).FxLock})).f(tls, pReal, SQLITE_LOCK_SHARED)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pReal)).FpMethods + 56 /* &.xLock */))))(tls, pReal, SQLITE_LOCK_EXCLUSIVE)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pReal)).FpMethods)).FxLock})).f(tls, pReal, SQLITE_LOCK_EXCLUSIVE)
 	}
 }
 
@@ -208562,15 +209411,19 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:203701:16:
 						var pDb uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
 
 						// Sync the db file
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 40 /* &.xSync */))))(tls, pDb, SQLITE_SYNC_NORMAL)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+							f func(*libc.TLS, uintptr, int32) int32
+						})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxSync})).f(tls, pDb, SQLITE_SYNC_NORMAL)
 
 						// Update nBackfill
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 							// var ptr uintptr at bp+16, 8
 
-							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 104 /* &.xShmMap */))))(tls, pDb, 0, (32 * 1024), 0, bp+16 /* &ptr */)
+							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+								f func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32
+							})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxShmMap})).f(tls, pDb, 0, (32 * 1024), 0, bp+16 /* &ptr */)
 							if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-								*(*U32)(unsafe.Pointer((libc.AtomicLoadPUintptr(bp + 16 /* ptr */)) + 24*4)) = (*Sqlite3rbu)(unsafe.Pointer(p)).FiMaxFrame
+								*(*U32)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 16 /* ptr */))) + 24*4)) = (*Sqlite3rbu)(unsafe.Pointer(p)).FiMaxFrame
 							}
 						}
 
@@ -208675,7 +209528,9 @@ func rbuDeleteOalFile(tls *libc.TLS, p uintptr) { /* sqlite3.c:203879:13: */
 	if zOal != 0 {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
 
-		(*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer((pVfs + 48 /* &.xDelete */))))(tls, pVfs, zOal, 0)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -209052,7 +209907,9 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 { /* sq
 		// Sync the db file if currently doing an incremental checkpoint
 		if ((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) && ((*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT) {
 			var pDb uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 40 /* &.xSync */))))(tls, pDb, SQLITE_SYNC_NORMAL)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = (*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxSync})).f(tls, pDb, SQLITE_SYNC_NORMAL)
 		}
 
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
@@ -209176,7 +210033,9 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 { /* sqlite3.c:204384
 	// Sync the db file
 	if (rc == SQLITE_OK) && ((*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT) {
 		var pDb uintptr = (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpReal
-		rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods + 40 /* &.xSync */))))(tls, pDb, SQLITE_SYNC_NORMAL)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pDb)).FpMethods)).FxSync})).f(tls, pDb, SQLITE_SYNC_NORMAL)
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
@@ -209272,7 +210131,9 @@ func rbuUnlockShm(tls *libc.TLS, p uintptr) { /* sqlite3.c:204477:13: */
 		var i int32
 		for i = 0; i < SQLITE_SHM_NLOCK; i++ {
 			if ((U32(int32(1) << i)) & (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FmLock) != 0 {
-				(*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(&xShmLock)))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, i, 1, (SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE))
+				(*struct {
+					f func(*libc.TLS, uintptr, int32, int32, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{xShmLock})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, i, 1, (SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE))
 			}
 		}
 		(*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FmLock = U32(0)
@@ -209376,13 +210237,17 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 { /* sqlite3.c:204569:12: *
 	if ((*Rbu_file)(unsafe.Pointer(p)).FopenFlags & SQLITE_OPEN_MAIN_DB) != 0 {
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 128 /* &.xShmUnmap */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		(*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
 	} else if (((*Rbu_file)(unsafe.Pointer(p)).FopenFlags & SQLITE_OPEN_DELETEONCLOSE) != 0) && ((*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0) {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
 
 	// Close the underlying file handle
-	rc = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 8 /* &.xClose */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxClose})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
 	return rc
 }
 
@@ -209425,7 +210290,9 @@ func rbuVfsRead(tls *libc.TLS, pFile uintptr, zBuf uintptr, iAmt int32, iOfst Sq
 			rc = SQLITE_OK
 			libc.Xmemset(tls, zBuf, 0, uint64(iAmt))
 		} else {
-			rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 16 /* &.xRead */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, zBuf, iAmt, iOfst)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxRead})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, zBuf, iAmt, iOfst)
 			// If this is being called to read the first page of the target
 			// database as part of an rbu vacuum operation, synthesize the
 			// contents of the first page if it does not yet exist. Otherwise,
@@ -209435,7 +210302,9 @@ func rbuVfsRead(tls *libc.TLS, pFile uintptr, zBuf uintptr, iAmt int32, iOfst Sq
 				(((*Rbu_file)(unsafe.Pointer(p)).FopenFlags & SQLITE_OPEN_MAIN_DB) != 0)) &&
 				((*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc == SQLITE_OK) {
 				var pFd uintptr = (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpRbuFd
-				rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer(pFd)).FpMethods + 16 /* &.xRead */))))(tls, pFd, zBuf, iAmt, iOfst)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer(pFd)).FpMethods)).FxRead})).f(tls, pFd, zBuf, iAmt, iOfst)
 				if rc == SQLITE_OK {
 					var aBuf uintptr = zBuf
 					var iRoot U32
@@ -209494,7 +210363,9 @@ func rbuVfsWrite(tls *libc.TLS, pFile uintptr, zBuf uintptr, iAmt int32, iOfst S
 				}
 			}
 		}
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 24 /* &.xWrite */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, zBuf, iAmt, iOfst)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, Sqlite3_int64) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxWrite})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, zBuf, iAmt, iOfst)
 		if ((rc == SQLITE_OK) && (iOfst == int64(0))) && (((*Rbu_file)(unsafe.Pointer(p)).FopenFlags & SQLITE_OPEN_MAIN_DB) != 0) {
 			// These look like magic numbers. But they are stable, as they are part
 			// of the definition of the SQLite file format, which may not change.
@@ -209515,7 +210386,9 @@ func rbuVfsTruncate(tls *libc.TLS, pFile uintptr, size Sqlite_int64) int32 { /*
 			return rc
 		}
 	}
-	return (*(*func(*libc.TLS, uintptr, Sqlite3_int64) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 32 /* &.xTruncate */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, size)
+	return (*struct {
+		f func(*libc.TLS, uintptr, Sqlite3_int64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxTruncate})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, size)
 }
 
 // Sync an rbuVfs-file.
@@ -209527,14 +210400,18 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 { /* sqlite3.c:
 		}
 		return SQLITE_OK
 	}
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 40 /* &.xSync */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, flags)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxSync})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, flags)
 }
 
 // Return the current file-size of an rbuVfs-file.
 func rbuVfsFileSize(tls *libc.TLS, pFile uintptr, pSize uintptr) int32 { /* sqlite3.c:204763:12: */
 	var p uintptr = pFile
 	var rc int32
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 48 /* &.xFileSize */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, pSize)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxFileSize})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, pSize)
 
 	// If this is an RBU vacuum operation and this is the target database,
 	// pretend that it has at least one page. Otherwise, SQLite will not
@@ -209560,7 +210437,9 @@ func rbuVfsLock(tls *libc.TLS, pFile uintptr, eLock int32) int32 { /* sqlite3.c:
 		// prevents it from checkpointing the database from sqlite3_close().
 		rc = SQLITE_BUSY
 	} else {
-		rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 56 /* &.xLock */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, eLock)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxLock})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, eLock)
 	}
 
 	return rc
@@ -209569,13 +210448,17 @@ func rbuVfsLock(tls *libc.TLS, pFile uintptr, eLock int32) int32 { /* sqlite3.c:
 // Unlock an rbuVfs-file.
 func rbuVfsUnlock(tls *libc.TLS, pFile uintptr, eLock int32) int32 { /* sqlite3.c:204806:12: */
 	var p uintptr = pFile
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 64 /* &.xUnlock */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, eLock)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxUnlock})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, eLock)
 }
 
 // Check if another file-handle holds a RESERVED lock on an rbuVfs-file.
 func rbuVfsCheckReservedLock(tls *libc.TLS, pFile uintptr, pResOut uintptr) int32 { /* sqlite3.c:204814:12: */
 	var p uintptr = pFile
-	return (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 72 /* &.xCheckReservedLock */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, pResOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxCheckReservedLock})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, pResOut)
 }
 
 // File control method. For custom operations on an rbuVfs-file.
@@ -209593,13 +210476,17 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 		// First try to find another RBU vfs lower down in the vfs stack. If
 		// one is found, this vfs will operate in pass-through mode. The lower
 		// level vfs will do the special RBU handling.
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xControl)))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, op, pArg)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, op, pArg)
 
 		if rc == SQLITE_NOTFOUND {
 			// Now search for a zipvfs instance lower down in the VFS stack. If
 			// one is found, this is an error.
 			*(*uintptr)(unsafe.Pointer(bp + 16 /* dummy */)) = uintptr(0)
-			rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xControl)))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16 /* &dummy */)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16 /* &dummy */)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31885 /* "rbu/zipvfs setup..." */, 0)
@@ -209621,7 +210508,9 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 		(*Rbu_file)(unsafe.Pointer(p)).FbNolock = U8(1)
 	}
 
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xControl)))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, op, pArg)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, op, pArg)
 	if (rc == SQLITE_OK) && (op == SQLITE_FCNTL_VFSNAME) {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
@@ -209638,13 +210527,17 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 // Return the sector-size in bytes for an rbuVfs-file.
 func rbuVfsSectorSize(tls *libc.TLS, pFile uintptr) int32 { /* sqlite3.c:204878:12: */
 	var p uintptr = pFile
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 88 /* &.xSectorSize */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxSectorSize})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
 }
 
 // Return the device characteristic flags supported by an rbuVfs-file.
 func rbuVfsDeviceCharacteristics(tls *libc.TLS, pFile uintptr) int32 { /* sqlite3.c:204886:12: */
 	var p uintptr = pFile
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 96 /* &.xDeviceCharacteristics */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxDeviceCharacteristics})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
 }
 
 // Take or release a shared-memory lock.
@@ -209668,7 +210561,9 @@ func rbuVfsShmLock(tls *libc.TLS, pFile uintptr, ofst int32, n int32, flags int3
 			bCapture = 1
 		}
 		if (bCapture == 0) || (0 == (flags & SQLITE_SHM_UNLOCK)) {
-			rc = (*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 112 /* &.xShmLock */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, ofst, n, flags)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, int32, int32, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmLock})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, ofst, n, flags)
 			if (bCapture != 0) && (rc == SQLITE_OK) {
 				*(*U32)(unsafe.Pointer(pRbu + 316 /* &.mLock */)) |= (U32(((int32(1) << n) - 1) << ofst))
 			}
@@ -209721,13 +210616,15 @@ func rbuVfsShmMap(tls *libc.TLS, pFile uintptr, iRegion int32, szRegion int32, i
 		}
 
 		if rc == SQLITE_OK {
-			*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&pp))) = *(*uintptr)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FapShm + uintptr(iRegion)*8))
+			*(*uintptr)(unsafe.Pointer(pp)) = *(*uintptr)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FapShm + uintptr(iRegion)*8))
 		} else {
-			*(*uintptr)(unsafe.Pointer(libc.AtomicLoadUintptr(&pp))) = uintptr(0)
+			*(*uintptr)(unsafe.Pointer(pp)) = uintptr(0)
 		}
 	} else {
 
-		rc = (*(*func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 104 /* &.xShmMap */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, iRegion, szRegion, isWrite, libc.AtomicLoadUintptr(&pp))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, int32, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmMap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, iRegion, szRegion, isWrite, pp)
 	}
 
 	return rc
@@ -209736,7 +210633,7 @@ func rbuVfsShmMap(tls *libc.TLS, pFile uintptr, iRegion int32, szRegion int32, i
 // Memory barrier.
 func rbuVfsShmBarrier(tls *libc.TLS, pFile uintptr) { /* sqlite3.c:204990:13: */
 	var p uintptr = pFile
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 120 /* &.xShmBarrier */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmBarrier})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal)
 }
 
 // The xShmUnmap method.
@@ -209755,7 +210652,9 @@ func rbuVfsShmUnmap(tls *libc.TLS, pFile uintptr, delFlag int32) int32 { /* sqli
 	} else {
 		// Release the checkpointer and writer locks
 		rbuUnlockShm(tls, p)
-		rc = (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods + 128 /* &.xShmUnmap */))))(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, delFlag)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, delFlag)
 	}
 	return rc
 }
@@ -209810,7 +210709,9 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if rc == SQLITE_OK {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pRealVfs + 40 /* &.xOpen */))))(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
 		// The xOpen() operation has succeeded. Set the sqlite3_file.pMethods
@@ -209850,7 +210751,9 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 // Delete the file located at zPath.
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 { /* sqlite3.c:205115:12: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer((pRealVfs + 48 /* &.xDelete */))))(tls, pRealVfs, zPath, dirSync)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxDelete})).f(tls, pRealVfs, zPath, dirSync)
 }
 
 // Test for access permissions. Return true if the requested permission
@@ -209863,7 +210766,9 @@ func rbuVfsAccess(tls *libc.TLS, pVfs uintptr, zPath uintptr, flags int32, pResO
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).FpRealVfs
 	var rc int32
 
-	rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pRealVfs + 56 /* &.xAccess */))))(tls, pRealVfs, zPath, flags, pResOut)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxAccess})).f(tls, pRealVfs, zPath, flags, pResOut)
 
 	// If this call is to check if a *-wal file associated with an RBU target
 	// database connection exists, and the RBU update is in RBU_STAGE_OAL,
@@ -209900,13 +210805,17 @@ func rbuVfsAccess(tls *libc.TLS, pVfs uintptr, zPath uintptr, flags int32, pResO
 // of at least (DEVSYM_MAX_PATHNAME+1) bytes.
 func rbuVfsFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zOut uintptr) int32 { /* sqlite3.c:205172:12: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pRealVfs + 64 /* &.xFullPathname */))))(tls, pRealVfs, zPath, nOut, zOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxFullPathname})).f(tls, pRealVfs, zPath, nOut, zOut)
 }
 
 // Open the dynamic library located at zPath and return a handle.
 func rbuVfsDlOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr) uintptr { /* sqlite3.c:205186:13: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer((pRealVfs + 72 /* &.xDlOpen */))))(tls, pRealVfs, zPath)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxDlOpen})).f(tls, pRealVfs, zPath)
 }
 
 // Populate the buffer zErrMsg (size nByte bytes) with a human readable
@@ -209914,39 +210823,51 @@ func rbuVfsDlOpen(tls *libc.TLS, pVfs uintptr, zPath uintptr) uintptr { /* sqlit
 // with dynamic libraries.
 func rbuVfsDlError(tls *libc.TLS, pVfs uintptr, nByte int32, zErrMsg uintptr) { /* sqlite3.c:205196:13: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	(*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer((pRealVfs + 80 /* &.xDlError */))))(tls, pRealVfs, nByte, zErrMsg)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxDlError})).f(tls, pRealVfs, nByte, zErrMsg)
 }
 
 // Return a pointer to the symbol zSymbol in the dynamic library pHandle.
 func rbuVfsDlSym(tls *libc.TLS, pVfs uintptr, pArg uintptr, zSym uintptr) uintptr { /* sqlite3.c:205204:13: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, uintptr, uintptr) uintptr)(unsafe.Pointer((pRealVfs + 88 /* &.xDlSym */))))(tls, pRealVfs, pArg, zSym)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxDlSym})).f(tls, pRealVfs, pArg, zSym)
 }
 
 // Close the dynamic library handle pHandle.
 func rbuVfsDlClose(tls *libc.TLS, pVfs uintptr, pHandle uintptr) { /* sqlite3.c:205216:13: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pRealVfs + 96 /* &.xDlClose */))))(tls, pRealVfs, pHandle)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxDlClose})).f(tls, pRealVfs, pHandle)
 }
 
 // Populate the buffer pointed to by zBufOut with nByte bytes of
 // random data.
 func rbuVfsRandomness(tls *libc.TLS, pVfs uintptr, nByte int32, zBufOut uintptr) int32 { /* sqlite3.c:205226:12: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pRealVfs + 104 /* &.xRandomness */))))(tls, pRealVfs, nByte, zBufOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxRandomness})).f(tls, pRealVfs, nByte, zBufOut)
 }
 
 // Sleep for nMicro microseconds. Return the number of microseconds
 // actually slept.
 func rbuVfsSleep(tls *libc.TLS, pVfs uintptr, nMicro int32) int32 { /* sqlite3.c:205235:12: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((pRealVfs + 112 /* &.xSleep */))))(tls, pRealVfs, nMicro)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxSleep})).f(tls, pRealVfs, nMicro)
 }
 
 // Return the current time as a Julian Day number in *pTimeOut.
 func rbuVfsCurrentTime(tls *libc.TLS, pVfs uintptr, pTimeOut uintptr) int32 { /* sqlite3.c:205243:12: */
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
-	return (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pRealVfs + 120 /* &.xCurrentTime */))))(tls, pRealVfs, pTimeOut)
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxCurrentTime})).f(tls, pRealVfs, pTimeOut)
 }
 
 // No-op.
@@ -210197,14 +211118,14 @@ type SessionTable1 = struct {
 
 type SessionTable = SessionTable1 /* sqlite3.c:206655:29 */
 type SessionChange1 = struct {
-	Fop        U8
-	FbIndirect U8
-	_          [2]byte
-	FnMaxSize  int32
-	FnRecord   int32
-	_          [4]byte
-	FaRecord   uintptr
-	FpNext     uintptr
+	Fop          U8
+	FbIndirect   U8
+	F__ccgo_pad1 [2]byte
+	FnMaxSize    int32
+	FnRecord     int32
+	F__ccgo_pad2 [4]byte
+	FaRecord     uintptr
+	FpNext       uintptr
 } /* sqlite3.c:11155:9 */
 
 type SessionChange = SessionChange1 /* sqlite3.c:206656:30 */
@@ -210216,18 +211137,18 @@ type SessionBuffer1 = struct {
 
 type SessionBuffer = SessionBuffer1 /* sqlite3.c:206657:30 */
 type SessionInput1 = struct {
-	FbNoDiscard int32
-	FiCurrent   int32
-	FiNext      int32
-	_           [4]byte
-	FaData      uintptr
-	FnData      int32
-	_           [4]byte
-	Fbuf        SessionBuffer
-	FxInput     uintptr
-	FpIn        uintptr
-	FbEof       int32
-	_           [4]byte
+	FbNoDiscard  int32
+	FiCurrent    int32
+	FiNext       int32
+	F__ccgo_pad1 [4]byte
+	FaData       uintptr
+	FnData       int32
+	F__ccgo_pad2 [4]byte
+	Fbuf         SessionBuffer
+	FxInput      uintptr
+	FpIn         uintptr
+	FbEof        int32
+	F__ccgo_pad3 [4]byte
 } /* sqlite3.c:11163:9 */
 
 type SessionInput = SessionInput1 /* sqlite3.c:206658:29 */
@@ -210473,9 +211394,13 @@ func sessionPreupdateHash(tls *libc.TLS, pSession uintptr, pTab uintptr, bNew in
 			// var pVal uintptr at bp, 8
 
 			if bNew != 0 {
-				rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp /* &pVal */)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp /* &pVal */)
 			} else {
-				rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 8 /* &.xOld */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp /* &pVal */)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxOld})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp /* &pVal */)
 			}
 			if rc != SQLITE_OK {
 				return rc
@@ -210794,10 +211719,14 @@ func sessionPreupdateEqual(tls *libc.TLS, pSession uintptr, pTab uintptr, pChang
 			// this (that the method has already been called).
 			if op == SQLITE_INSERT {
 				// assert( db->pPreUpdate->pNewUnpacked || db->pPreUpdate->aNew );
-				rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, iCol, bp /* &pVal */)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, iCol, bp /* &pVal */)
 			} else {
 				// assert( db->pPreUpdate->pUnpacked );
-				rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 8 /* &.xOld */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, iCol, bp /* &pVal */)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxOld})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, iCol, bp /* &pVal */)
 			}
 
 			if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp /* pVal */))) != eType {
@@ -211081,7 +212010,9 @@ func sessionStat1Old(tls *libc.TLS, pCtx uintptr, iCol int32, ppVal uintptr) int
 
 	var p uintptr = pCtx
 	*(*uintptr)(unsafe.Pointer(bp /* pVal */)) = uintptr(0)
-	var rc int32 = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((p /* &.hook */ + 8 /* &.xOld */))))(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx, iCol, bp /* &pVal */)
+	var rc int32 = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FxOld})).f(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx, iCol, bp /* &pVal */)
 	if ((rc == SQLITE_OK) && (iCol == 1)) && (Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp /* pVal */))) == SQLITE_NULL) {
 		*(*uintptr)(unsafe.Pointer(bp /* pVal */)) = (*Sqlite3_session)(unsafe.Pointer((*SessionStat1Ctx)(unsafe.Pointer(p)).FpSession)).FpZeroBlob
 	}
@@ -211095,7 +212026,9 @@ func sessionStat1New(tls *libc.TLS, pCtx uintptr, iCol int32, ppVal uintptr) int
 
 	var p uintptr = pCtx
 	*(*uintptr)(unsafe.Pointer(bp /* pVal */)) = uintptr(0)
-	var rc int32 = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((p /* &.hook */ + 16 /* &.xNew */))))(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx, iCol, bp /* &pVal */)
+	var rc int32 = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FxNew})).f(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx, iCol, bp /* &pVal */)
 	if ((rc == SQLITE_OK) && (iCol == 1)) && (Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp /* pVal */))) == SQLITE_NULL) {
 		*(*uintptr)(unsafe.Pointer(bp /* pVal */)) = (*Sqlite3_session)(unsafe.Pointer((*SessionStat1Ctx)(unsafe.Pointer(p)).FpSession)).FpZeroBlob
 	}
@@ -211105,12 +212038,16 @@ func sessionStat1New(tls *libc.TLS, pCtx uintptr, iCol int32, ppVal uintptr) int
 
 func sessionStat1Count(tls *libc.TLS, pCtx uintptr) int32 { /* sqlite3.c:207812:12: */
 	var p uintptr = pCtx
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((p /* &.hook */ + 24 /* &.xCount */))))(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FxCount})).f(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx)
 }
 
 func sessionStat1Depth(tls *libc.TLS, pCtx uintptr) int32 { /* sqlite3.c:207816:12: */
 	var p uintptr = pCtx
-	return (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((p /* &.hook */ + 32 /* &.xDepth */))))(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx)
+	return (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FxDepth})).f(tls, (*SessionStat1Ctx)(unsafe.Pointer(p)).Fhook.FpCtx)
 }
 
 func sessionUpdateMaxSize(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr, pC uintptr) int32 { /* sqlite3.c:207821:12: */
@@ -211123,7 +212060,9 @@ func sessionUpdateMaxSize(tls *libc.TLS, op int32, pSession uintptr, pTab uintpt
 			var ii int32
 			for ii = 0; ii < (*SessionTable)(unsafe.Pointer(pTab)).FnCol; ii++ {
 				*(*uintptr)(unsafe.Pointer(bp /* p */)) = uintptr(0)
-				(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, ii, bp /* &p */)
+				(*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, ii, bp /* &p */)
 				sessionSerializeValue(tls, uintptr(0), *(*uintptr)(unsafe.Pointer(bp /* p */)), bp+8 /* &nNew */)
 			}
 		}
@@ -211140,7 +212079,9 @@ func sessionUpdateMaxSize(tls *libc.TLS, op int32, pSession uintptr, pTab uintpt
 			var nOld int32 = 0
 			var eType int32
 			*(*uintptr)(unsafe.Pointer(bp + 16 /* p */)) = uintptr(0)
-			(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, ii, bp+16 /* &p */)
+			(*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, ii, bp+16 /* &p */)
 			if *(*uintptr)(unsafe.Pointer(bp + 16 /* p */)) == uintptr(0) {
 				return SQLITE_NOMEM
 			}
@@ -211268,7 +212209,9 @@ __2:
 
 	// Check the number of columns in this xPreUpdate call matches the
 	// number of columns in the table.
-	if !((*SessionTable)(unsafe.Pointer(pTab)).FnCol != (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 24 /* &.xCount */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx)) {
+	if !((*SessionTable)(unsafe.Pointer(pTab)).FnCol != (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxCount})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx)) {
 		goto __3
 	}
 	(*Sqlite3_session)(unsafe.Pointer(pSession)).Frc = SQLITE_SCHEMA
@@ -211371,14 +212314,18 @@ __16:
 	if !(op != SQLITE_INSERT) {
 		goto __19
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 8 /* &.xOld */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+56 /* &p1 */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxOld})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+56 /* &p1 */)
 
 	goto __20
 __19:
 	if !(*(*U8)(unsafe.Pointer((*SessionTable)(unsafe.Pointer(pTab)).FabPK + uintptr(i))) != 0) {
 		goto __21
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+56 /* &p1 */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+56 /* &p1 */)
 
 __21:
 	;
@@ -211430,13 +212377,17 @@ __25:
 	if !(op != SQLITE_INSERT) {
 		goto __28
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 8 /* &.xOld */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+72 /* &p2 */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxOld})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+72 /* &p2 */)
 	goto __29
 __28:
 	if !(*(*U8)(unsafe.Pointer((*SessionTable)(unsafe.Pointer(pTab)).FabPK + uintptr(i))) != 0) {
 		goto __30
 	}
-	(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 16 /* &.xNew */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+72 /* &p2 */)
+	(*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxNew})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx, i, bp+72 /* &p2 */)
 __30:
 	;
 __29:
@@ -211451,7 +212402,9 @@ __27:
 	;
 
 	// Add the change to the hash-table
-	if !(((*Sqlite3_session)(unsafe.Pointer(pSession)).FbIndirect != 0) || ((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 32 /* &.xDepth */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx) != 0)) {
+	if !(((*Sqlite3_session)(unsafe.Pointer(pSession)).FbIndirect != 0) || ((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxDepth})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx) != 0)) {
 		goto __31
 	}
 	(*SessionChange)(unsafe.Pointer(pC)).FbIndirect = U8(1)
@@ -211469,7 +212422,9 @@ __14:
 	}
 	// If the existing change is considered "indirect", but this current
 	// change is "direct", mark the change object as direct.
-	if !(((*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pSession + 96 /* &.hook */ + 32 /* &.xDepth */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx) == 0) &&
+	if !(((*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FxDepth})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fhook.FpCtx) == 0) &&
 		((*Sqlite3_session)(unsafe.Pointer(pSession)).FbIndirect == 0)) {
 		goto __33
 	}
@@ -211521,7 +212476,9 @@ func sessionFindTable(tls *libc.TLS, pSession uintptr, zName uintptr, ppTab uint
 		// If there is a table-filter configured, invoke it. If it returns 0,
 		// do not automatically add the new table.
 		if ((*Sqlite3_session)(unsafe.Pointer(pSession)).FxTableFilter == uintptr(0)) ||
-			((*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pSession + 48 /* &.xTableFilter */))))(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).FpFilterCtx, zName) != 0) {
+			((*struct {
+				f func(*libc.TLS, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_session)(unsafe.Pointer(pSession)).FxTableFilter})).f(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).FpFilterCtx, zName) != 0) {
 			rc = Xsqlite3session_attach(tls, pSession, zName)
 			if rc == SQLITE_OK {
 				for pRet = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpTable; (*SessionTable)(unsafe.Pointer(pRet)).FpNext != 0; pRet = (*SessionTable)(unsafe.Pointer(pRet)).FpNext {
@@ -211606,9 +212563,9 @@ func sessionPreupdateHooks(tls *libc.TLS, pSession uintptr) { /* sqlite3.c:20816
 }
 
 type SessionDiffCtx1 = struct {
-	FpStmt   uintptr
-	FnOldOff int32
-	_        [4]byte
+	FpStmt       uintptr
+	FnOldOff     int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:208177:9 */
 
 type SessionDiffCtx = SessionDiffCtx1 /* sqlite3.c:208177:31 */
@@ -212733,7 +213690,9 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 						(*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) == SQLITE_OK)) &&
 						((*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf > nNoop)) &&
 						((*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf > sessions_strm_chunk_size) {
-						*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf)
+						*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*struct {
+							f func(*libc.TLS, uintptr, uintptr, int32) int32
+						})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf)
 						nNoop = -1
 						(*SessionBuffer)(unsafe.Pointer(bp + 24 /* &buf */)).FnBuf = 0
 					}
@@ -212755,7 +213714,9 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 			*(*uintptr)(unsafe.Pointer(ppChangeset)) = (*SessionBuffer)(unsafe.Pointer(bp + 24 /* &buf */)).FaBuf
 			(*SessionBuffer)(unsafe.Pointer(bp + 24 /* &buf */)).FaBuf = uintptr(0)
 		} else if (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf > 0 {
-			*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf)
+			*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+24 /* &buf */)).FnBuf)
 		}
 	}
 
@@ -212956,7 +213917,9 @@ func sessionInputBuffer(tls *libc.TLS, pIn uintptr, nByte int32) int32 { /* sqli
 				sessionDiscardData(tls, pIn)
 			}
 			if SQLITE_OK == sessionBufferGrow(tls, (pIn+32 /* &.buf */), int64(*(*int32)(unsafe.Pointer(bp + 4 /* nNew */))), bp /* &rc */) {
-				*(*int32)(unsafe.Pointer(bp /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pIn + 48 /* &.xInput */))))(tls, (*SessionInput)(unsafe.Pointer(pIn)).FpIn, ((*SessionInput)(unsafe.Pointer(pIn)).Fbuf.FaBuf + uintptr((*SessionInput)(unsafe.Pointer(pIn)).Fbuf.FnBuf)), bp+4 /* &nNew */)
+				*(*int32)(unsafe.Pointer(bp /* rc */)) = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*SessionInput)(unsafe.Pointer(pIn)).FxInput})).f(tls, (*SessionInput)(unsafe.Pointer(pIn)).FpIn, ((*SessionInput)(unsafe.Pointer(pIn)).Fbuf.FaBuf + uintptr((*SessionInput)(unsafe.Pointer(pIn)).Fbuf.FnBuf)), bp+4 /* &nNew */)
 				if *(*int32)(unsafe.Pointer(bp + 4 /* nNew */)) == 0 {
 					(*SessionInput)(unsafe.Pointer(pIn)).FbEof = 1
 				} else {
@@ -213823,7 +214786,9 @@ __6:
 	if !((xOutput != 0) && ((*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf >= sessions_strm_chunk_size)) {
 		goto __28
 	}
-	*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf)
+	*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf)
 	(*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf = 0
 	if !(*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) != SQLITE_OK) {
 		goto __29
@@ -213848,7 +214813,9 @@ __30:
 	if !((*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf > 0) {
 		goto __32
 	}
-	*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf)
+	*(*int32)(unsafe.Pointer(bp + 40 /* rc */)) = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &sOut */)).FnBuf)
 __32:
 	;
 __31:
@@ -213909,7 +214876,7 @@ type SessionApplyCtx1 = struct {
 	FpInsert            uintptr
 	FpSelect            uintptr
 	FnCol               int32
-	_                   [4]byte
+	F__ccgo_pad1        [4]byte
 	FazCol              uintptr
 	FabPK               uintptr
 	FaUpdateMask        uintptr
@@ -213917,12 +214884,12 @@ type SessionApplyCtx1 = struct {
 	FbStat1             int32
 	FbDeferConstraints  int32
 	FbInvertConstraints int32
-	_                   [4]byte
+	F__ccgo_pad2        [4]byte
 	Fconstraints        SessionBuffer
 	Frebase             SessionBuffer
 	FbRebaseStarted     U8
 	FbRebase            U8
-	_                   [6]byte
+	F__ccgo_pad3        [6]byte
 } /* sqlite3.c:210362:9 */
 
 type SessionApplyCtx = SessionApplyCtx1 /* sqlite3.c:210362:32 */
@@ -214268,7 +215235,9 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 		if !(abPK != 0) || (*(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0) {
 			// var pVal uintptr at bp, 8
 
-			(*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xValue)))(tls, pIter, i, bp /* &pVal */)
+			(*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp /* &pVal */)
 			if *(*uintptr)(unsafe.Pointer(bp /* pVal */)) == uintptr(0) {
 				// The value in the changeset was "undefined". This indicates a
 				// corrupt changeset blob.
@@ -214437,7 +215406,9 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	if *(*int32)(unsafe.Pointer(bp + 16 /* rc */)) == SQLITE_ROW {
 		// There exists another row with the new.* primary key.
 		(*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FpConflict = (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect
-		res = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xConflict)))(tls, pCtx, eType, pIter)
+		res = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xConflict})).f(tls, pCtx, eType, pIter)
 		(*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FpConflict = uintptr(0)
 		*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else if *(*int32)(unsafe.Pointer(bp + 16 /* rc */)) == SQLITE_OK {
@@ -214450,7 +215421,9 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 			return SQLITE_OK
 		} else {
 			// No other row with the new.* primary key.
-			res = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xConflict)))(tls, pCtx, (eType + 1), pIter)
+			res = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xConflict})).f(tls, pCtx, (eType + 1), pIter)
 			if res == SQLITE_CHANGESET_REPLACE {
 				*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = SQLITE_MISUSE
 			}
@@ -214805,7 +215778,9 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			// If an xFilter() callback was specified, invoke it now. If the
 			// xFilter callback returns zero, skip this table. If it returns
 			// non-zero, proceed.
-			schemaMismatch = (libc.Bool32((xFilter != 0) && (0 == (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(&xFilter)))(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176 /* zNew */))))))
+			schemaMismatch = (libc.Bool32((xFilter != 0) && (0 == (*struct {
+				f func(*libc.TLS, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xFilter})).f(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 176 /* zNew */))))))
 			if schemaMismatch != 0 {
 				*(*uintptr)(unsafe.Pointer(bp + 200 /* zTab */)) = Xsqlite3_mprintf(tls, ts+3630 /* "%s" */, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 176 /* zNew */))))
 				if *(*uintptr)(unsafe.Pointer(bp + 200 /* zTab */)) == uintptr(0) {
@@ -214896,7 +215871,9 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 			libc.Xmemset(tls, bp+216 /* &sIter */, 0, uint64(unsafe.Sizeof(Sqlite3_changeset_iter{})))
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(bp + 216 /* &sIter */)).FnCol = *(*int32)(unsafe.Pointer(bp + 208 /* nFk */))
-			res = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(&xConflict)))(tls, pCtx, SQLITE_CHANGESET_FOREIGN_KEY, bp+216 /* &sIter */)
+			res = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xConflict})).f(tls, pCtx, SQLITE_CHANGESET_FOREIGN_KEY, bp+216 /* &sIter */)
 			if res != SQLITE_CHANGESET_OMIT {
 				rc = SQLITE_CONSTRAINT
 			}
@@ -215307,7 +216284,9 @@ func sessionChangegroupOutput(tls *libc.TLS, pGrp uintptr, xOutput uintptr, pOut
 				sessionAppendByte(tls, bp /* &buf */, (*SessionChange)(unsafe.Pointer(p)).FbIndirect, bp+16 /* &rc */)
 				sessionAppendBlob(tls, bp /* &buf */, (*SessionChange)(unsafe.Pointer(p)).FaRecord, (*SessionChange)(unsafe.Pointer(p)).FnRecord, bp+16 /* &rc */)
 				if ((*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) == SQLITE_OK) && (xOutput != 0)) && ((*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf >= sessions_strm_chunk_size) {
-					*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf)
+					*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = (*struct {
+						f func(*libc.TLS, uintptr, uintptr, int32) int32
+					})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf)
 					(*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf = 0
 				}
 			}
@@ -215317,7 +216296,9 @@ func sessionChangegroupOutput(tls *libc.TLS, pGrp uintptr, xOutput uintptr, pOut
 	if *(*int32)(unsafe.Pointer(bp + 16 /* rc */)) == SQLITE_OK {
 		if xOutput != 0 {
 			if (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf > 0 {
-				*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf)
+				*(*int32)(unsafe.Pointer(bp + 16 /* rc */)) = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FnBuf)
 			}
 		} else {
 			*(*uintptr)(unsafe.Pointer(ppOut)) = (*SessionBuffer)(unsafe.Pointer(bp /* &buf */)).FaBuf
@@ -215658,7 +216639,9 @@ func sessionRebase(tls *libc.TLS, p uintptr, pIter uintptr, xOutput uintptr, pOu
 			sessionAppendBlob(tls, bp+16 /* &sOut */, *(*uintptr)(unsafe.Pointer(bp /* aRec */)), *(*int32)(unsafe.Pointer(bp + 8 /* nRec */)), bp+32 /* &rc */)
 		}
 		if ((*(*int32)(unsafe.Pointer(bp + 32 /* rc */)) == SQLITE_OK) && (xOutput != 0)) && ((*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf > sessions_strm_chunk_size) {
-			*(*int32)(unsafe.Pointer(bp + 32 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf)
+			*(*int32)(unsafe.Pointer(bp + 32 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf)
 			(*SessionBuffer)(unsafe.Pointer(bp + 16 /* &sOut */)).FnBuf = 0
 		}
 		if *(*int32)(unsafe.Pointer(bp + 32 /* rc */)) != 0 {
@@ -215674,7 +216657,9 @@ func sessionRebase(tls *libc.TLS, p uintptr, pIter uintptr, xOutput uintptr, pOu
 	if *(*int32)(unsafe.Pointer(bp + 32 /* rc */)) == SQLITE_OK {
 		if xOutput != 0 {
 			if (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf > 0 {
-				*(*int32)(unsafe.Pointer(bp + 32 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32) int32)(unsafe.Pointer(&xOutput)))(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf)
+				*(*int32)(unsafe.Pointer(bp + 32 /* rc */)) = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{xOutput})).f(tls, pOut, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FaBuf, (*SessionBuffer)(unsafe.Pointer(bp+16 /* &sOut */)).FnBuf)
 			}
 		} else {
 			*(*uintptr)(unsafe.Pointer(ppOut)) = (*SessionBuffer)(unsafe.Pointer(bp + 16 /* &sOut */)).FaBuf
@@ -215925,14 +216910,14 @@ type Fts5Config1 = struct {
 	FzDb              uintptr
 	FzName            uintptr
 	FnCol             int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FazCol            uintptr
 	FabUnindexed      uintptr
 	FnPrefix          int32
-	_                 [4]byte
+	F__ccgo_pad2      [4]byte
 	FaPrefix          uintptr
 	FeContent         int32
-	_                 [4]byte
+	F__ccgo_pad3      [4]byte
 	FzContent         uintptr
 	FzContentRowid    uintptr
 	FbColumnsize      int32
@@ -215987,13 +216972,13 @@ type Fts5Buffer1 = struct {
 type Fts5Buffer = Fts5Buffer1 /* sqlite3.c:213265:27 */
 
 type Fts5PoslistReader1 = struct {
-	Fa     uintptr
-	Fn     int32
-	Fi     int32
-	FbFlag U8
-	FbEof  U8
-	_      [6]byte
-	FiPos  I64
+	Fa           uintptr
+	Fn           int32
+	Fi           int32
+	FbFlag       U8
+	FbEof        U8
+	F__ccgo_pad1 [6]byte
+	FiPos        I64
 } /* sqlite3.c:213118:9 */
 
 type Fts5PoslistReader = Fts5PoslistReader1 /* sqlite3.c:213301:34 */
@@ -216021,10 +217006,10 @@ type Fts5Index1 = struct {
 	FpConfig        uintptr
 	FzDataTbl       uintptr
 	FnWorkUnit      int32
-	_               [4]byte
+	F__ccgo_pad1    [4]byte
 	FpHash          uintptr
 	FnPendingData   int32
-	_               [4]byte
+	F__ccgo_pad2    [4]byte
 	FiWriteRowid    I64
 	FbDelete        int32
 	Frc             int32
@@ -216035,7 +217020,7 @@ type Fts5Index1 = struct {
 	FpIdxDeleter    uintptr
 	FpIdxSelect     uintptr
 	FnRead          int32
-	_               [4]byte
+	F__ccgo_pad3    [4]byte
 	FpDataVersion   uintptr
 	FiStructVersion I64
 	FpStruct        uintptr
@@ -216052,11 +217037,11 @@ type Fts5Index1 = struct {
 
 type Fts5Index = Fts5Index1 /* sqlite3.c:213356:26 */
 type Fts5IndexIter1 = struct {
-	FiRowid I64
-	FpData  uintptr
-	FnData  int32
-	FbEof   U8
-	_       [3]byte
+	FiRowid      I64
+	FpData       uintptr
+	FnData       int32
+	FbEof        U8
+	F__ccgo_pad1 [3]byte
 } /* sqlite3.c:213118:9 */
 
 type Fts5IndexIter = Fts5IndexIter1 /* sqlite3.c:213357:30 */
@@ -216095,13 +217080,13 @@ type Fts5Table = Fts5Table1 /* sqlite3.c:213556:26 */
 //
 // Interface to code in fts5_hash.c.
 type Fts5Hash1 = struct {
-	FeDetail int32
-	_        [4]byte
-	FpnByte  uintptr
-	FnEntry  int32
-	FnSlot   int32
-	FpScan   uintptr
-	FaSlot   uintptr
+	FeDetail     int32
+	F__ccgo_pad1 [4]byte
+	FpnByte      uintptr
+	FnEntry      int32
+	FnSlot       int32
+	FpScan       uintptr
+	FaSlot       uintptr
 } /* sqlite3.c:213118:9 */
 
 //
@@ -216126,7 +217111,7 @@ type Fts5Storage1 = struct {
 	FpConfig      uintptr
 	FpIndex       uintptr
 	FbTotalsValid int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FnTotalRow    I64
 	FaTotalSize   uintptr
 	FaStmt        [11]uintptr
@@ -216168,16 +217153,16 @@ type Fts5Expr1 = struct {
 // Interface to code in fts5_expr.c.
 type Fts5Expr = Fts5Expr1 /* sqlite3.c:213681:25 */
 type Fts5ExprNode1 = struct {
-	FeType    int32
-	FbEof     int32
-	FbNomatch int32
-	_         [4]byte
-	FxNext    uintptr
-	FiRowid   I64
-	FpNear    uintptr
-	FnChild   int32
-	_         [4]byte
-	FapChild  [1]uintptr
+	FeType       int32
+	FbEof        int32
+	FbNomatch    int32
+	F__ccgo_pad1 [4]byte
+	FxNext       uintptr
+	FiRowid      I64
+	FpNear       uintptr
+	FnChild      int32
+	F__ccgo_pad2 [4]byte
+	FapChild     [1]uintptr
 } /* sqlite3.c:213118:9 */
 
 type Fts5ExprNode = Fts5ExprNode1 /* sqlite3.c:213682:29 */
@@ -216189,33 +217174,33 @@ type Fts5Parse1 = struct {
 	FapPhrase     uintptr
 	FpExpr        uintptr
 	FbPhraseToAnd int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 } /* sqlite3.c:213683:9 */
 
 type Fts5Parse = Fts5Parse1 /* sqlite3.c:213683:26 */
 type Fts5Token1 = struct {
-	Fp uintptr
-	Fn int32
-	_  [4]byte
+	Fp           uintptr
+	Fn           int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:213684:9 */
 
 type Fts5Token = Fts5Token1 /* sqlite3.c:213684:26 */
 type Fts5ExprPhrase1 = struct {
-	FpNode   uintptr
-	Fposlist Fts5Buffer
-	FnTerm   int32
-	_        [4]byte
-	FaTerm   [1]Fts5ExprTerm
+	FpNode       uintptr
+	Fposlist     Fts5Buffer
+	FnTerm       int32
+	F__ccgo_pad1 [4]byte
+	FaTerm       [1]Fts5ExprTerm
 } /* sqlite3.c:213118:9 */
 
 type Fts5ExprPhrase = Fts5ExprPhrase1 /* sqlite3.c:213685:31 */
 type Fts5ExprNearset1 = struct {
-	FnNear    int32
-	_         [4]byte
-	FpColset  uintptr
-	FnPhrase  int32
-	_         [4]byte
-	FapPhrase [1]uintptr
+	FnNear       int32
+	F__ccgo_pad1 [4]byte
+	FpColset     uintptr
+	FnPhrase     int32
+	F__ccgo_pad2 [4]byte
+	FapPhrase    [1]uintptr
 } /* sqlite3.c:213118:9 */
 
 type Fts5ExprNearset = Fts5ExprNearset1 /* sqlite3.c:213686:32 */
@@ -216328,9 +217313,9 @@ type Fts5PoslistPopulator = Fts5PoslistPopulator1 /* sqlite3.c:213734:37 */
 //    fts5YY_MAX_REDUCE      Maximum value for reduce actions
 //************ Begin control #defines ****************************************
 type Fts5YYMINORTYPE = struct {
-	_           [0]uint64
-	Ffts5yyinit int32
-	_           [12]byte
+	F__ccgo_pad1 [0]uint64
+	Ffts5yyinit  int32
+	F__ccgo_pad2 [12]byte
 } /* sqlite3.c:214010:3 */
 //************ End control #defines ******************************************
 
@@ -216468,10 +217453,10 @@ var fts5yy_default = [35]uint8{
 // actually contains the reduce action for the second half of the
 // SHIFTREDUCE.
 type fts5yyStackEntry = struct {
-	Fstateno uint8
-	Fmajor   uint8
-	_        [6]byte
-	Fminor   Fts5YYMINORTYPE
+	Fstateno     uint8
+	Fmajor       uint8
+	F__ccgo_pad1 [6]byte
+	Fminor       Fts5YYMINORTYPE
 } /* sqlite3.c:214190:1 */
 
 type Fts5yyStackEntry = fts5yyStackEntry /* sqlite3.c:214197:33 */
@@ -216514,7 +217499,7 @@ func sqlite3Fts5ParserInit(tls *libc.TLS, fts5yypRawParser uintptr) { /* sqlite3
 // to sqlite3Fts5Parser and sqlite3Fts5ParserFree.
 func sqlite3Fts5ParserAlloc(tls *libc.TLS, mallocProc uintptr) uintptr { /* sqlite3.c:214408:13: */
 	var fts5yypParser uintptr
-	fts5yypParser = (*(*func(*libc.TLS, U64) uintptr)(unsafe.Pointer(&mallocProc)))(tls, U64(unsafe.Sizeof(Fts5yyParser{})))
+	fts5yypParser = (*struct{ f func(*libc.TLS, U64) uintptr })(unsafe.Pointer(&struct{ uintptr }{mallocProc})).f(tls, U64(unsafe.Sizeof(Fts5yyParser{})))
 	if fts5yypParser != 0 {
 
 		sqlite3Fts5ParserInit(tls, fts5yypParser)
@@ -216612,7 +217597,7 @@ func sqlite3Fts5ParserFree(tls *libc.TLS, p uintptr, freeProc uintptr) { /* sqli
 		return
 	}
 	sqlite3Fts5ParserFinalize(tls, p)
-	(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&freeProc)))(tls, p)
+	(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{freeProc})).f(tls, p)
 }
 
 // Return the peak depth of the stack for a parser.
@@ -217130,14 +218115,14 @@ func sqlite3Fts5ParserFallback(tls *libc.TLS, iToken int32) int32 { /* sqlite3.c
 //   }
 //
 type CInstIter1 = struct {
-	FpApi   uintptr
-	FpFts   uintptr
-	FiCol   int32
-	FiInst  int32
-	FnInst  int32
-	FiStart int32
-	FiEnd   int32
-	_       [4]byte
+	FpApi        uintptr
+	FpFts        uintptr
+	FiCol        int32
+	FiInst       int32
+	FnInst       int32
+	FiStart      int32
+	FiEnd        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:215383:9 */
 
 // 2014 May 31
@@ -217193,10 +218178,14 @@ func fts5CInstIterNext(tls *libc.TLS, pIter uintptr) int32 { /* sqlite3.c:215400
 
 		// var io int32 at bp+8, 4
 
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(((*CInstIter)(unsafe.Pointer(pIter)).FpApi + 72 /* &.xInst */))))(tls, (*CInstIter)(unsafe.Pointer(pIter)).FpFts, (*CInstIter)(unsafe.Pointer(pIter)).FiInst, bp /* &ip */, bp+4 /* &ic */, bp+8 /* &io */)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer((*CInstIter)(unsafe.Pointer(pIter)).FpApi)).FxInst})).f(tls, (*CInstIter)(unsafe.Pointer(pIter)).FpFts, (*CInstIter)(unsafe.Pointer(pIter)).FiInst, bp /* &ip */, bp+4 /* &ic */, bp+8 /* &io */)
 		if rc == SQLITE_OK {
 			if *(*int32)(unsafe.Pointer(bp + 4 /* ic */)) == (*CInstIter)(unsafe.Pointer(pIter)).FiCol {
-				var iEnd int32 = ((*(*int32)(unsafe.Pointer(bp + 8 /* io */)) - 1) + (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(((*CInstIter)(unsafe.Pointer(pIter)).FpApi + 56 /* &.xPhraseSize */))))(tls, (*CInstIter)(unsafe.Pointer(pIter)).FpFts, *(*int32)(unsafe.Pointer(bp /* ip */))))
+				var iEnd int32 = ((*(*int32)(unsafe.Pointer(bp + 8 /* io */)) - 1) + (*struct {
+					f func(*libc.TLS, uintptr, int32) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer((*CInstIter)(unsafe.Pointer(pIter)).FpApi)).FxPhraseSize})).f(tls, (*CInstIter)(unsafe.Pointer(pIter)).FpFts, *(*int32)(unsafe.Pointer(bp /* ip */))))
 				if (*CInstIter)(unsafe.Pointer(pIter)).FiStart < 0 {
 					(*CInstIter)(unsafe.Pointer(pIter)).FiStart = *(*int32)(unsafe.Pointer(bp + 8 /* io */))
 					(*CInstIter)(unsafe.Pointer(pIter)).FiEnd = iEnd
@@ -217224,7 +218213,9 @@ func fts5CInstIterInit(tls *libc.TLS, pApi uintptr, pFts uintptr, iCol int32, pI
 	(*CInstIter)(unsafe.Pointer(pIter)).FpApi = pApi
 	(*CInstIter)(unsafe.Pointer(pIter)).FpFts = pFts
 	(*CInstIter)(unsafe.Pointer(pIter)).FiCol = iCol
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 64 /* &.xInstCount */))))(tls, pFts, (pIter + 24 /* &.nInst */))
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInstCount})).f(tls, pFts, (pIter + 24 /* &.nInst */))
 
 	if rc == SQLITE_OK {
 		rc = fts5CInstIterNext(tls, pIter)
@@ -217241,7 +218232,7 @@ type HighlightContext1 = struct {
 	FiPos        int32
 	FiRangeStart int32
 	FiRangeEnd   int32
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FzOpen       uintptr
 	FzClose      uintptr
 	FzIn         uintptr
@@ -217353,7 +218344,9 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	libc.Xmemset(tls, bp /* &ctx */, 0, uint64(unsafe.Sizeof(HighlightContext{})))
 	(*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzOpen = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + 1*8)))
 	(*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzClose = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + 2*8)))
-	*(*int32)(unsafe.Pointer(bp + 96 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 88 /* &.xColumnText */))))(tls, pFts, iCol, (bp /* &ctx */ + 72 /* &.zIn */), (bp /* &ctx */ + 80 /* &.nIn */))
+	*(*int32)(unsafe.Pointer(bp + 96 /* rc */)) = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnText})).f(tls, pFts, iCol, (bp /* &ctx */ + 72 /* &.zIn */), (bp /* &ctx */ + 80 /* &.nIn */))
 
 	if (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 96 /* rc */)) == SQLITE_OK {
@@ -217361,7 +218354,9 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 96 /* rc */)) == SQLITE_OK {
-			*(*int32)(unsafe.Pointer(bp + 96 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 40 /* &.xTokenize */))))(tls, pFts, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FnIn, bp /* &ctx */, *(*uintptr)(unsafe.Pointer(&struct {
+			*(*int32)(unsafe.Pointer(bp + 96 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxTokenize})).f(tls, pFts, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FnIn, bp /* &ctx */, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
 			}{fts5HighlightCb})))
 		}
@@ -217386,7 +218381,7 @@ type Fts5SFinder1 = struct {
 	FiPos        int32
 	FnFirstAlloc int32
 	FnFirst      int32
-	_            [4]byte
+	F__ccgo_pad1 [4]byte
 	FaFirst      uintptr
 	FzDoc        uintptr
 } /* sqlite3.c:215598:9 */
@@ -217470,9 +218465,13 @@ func fts5SnippetScore(tls *libc.TLS, pApi uintptr, pFts uintptr, nDocsize int32,
 	var iLast int32 = 0
 	var iEnd Sqlite3_int64 = (Sqlite3_int64(iPos) + Sqlite3_int64(nToken))
 
-	rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 64 /* &.xInstCount */))))(tls, pFts, bp /* &nInst */)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInstCount})).f(tls, pFts, bp /* &nInst */)
 	for i = 0; (i < *(*int32)(unsafe.Pointer(bp /* nInst */))) && (rc == SQLITE_OK); i++ {
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 72 /* &.xInst */))))(tls, pFts, i, bp+4 /* &ip */, bp+8 /* &ic */, bp+12 /* &iOff */)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInst})).f(tls, pFts, i, bp+4 /* &ip */, bp+8 /* &ic */, bp+12 /* &iOff */)
 		if (((rc == SQLITE_OK) && (*(*int32)(unsafe.Pointer(bp + 8 /* ic */)) == iCol)) && (*(*int32)(unsafe.Pointer(bp + 12 /* iOff */)) >= iPos)) && (Sqlite3_int64(*(*int32)(unsafe.Pointer(bp + 12 /* iOff */))) < iEnd) {
 			nScore = nScore + (func() int32 {
 				if *(*uint8)(unsafe.Pointer(aSeen + uintptr(*(*int32)(unsafe.Pointer(bp + 4 /* ip */))))) != 0 {
@@ -217484,7 +218483,9 @@ func fts5SnippetScore(tls *libc.TLS, pApi uintptr, pFts uintptr, nDocsize int32,
 			if iFirst < 0 {
 				iFirst = *(*int32)(unsafe.Pointer(bp + 12 /* iOff */))
 			}
-			iLast = (*(*int32)(unsafe.Pointer(bp + 12 /* iOff */)) + (*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer((pApi + 56 /* &.xPhraseSize */))))(tls, pFts, *(*int32)(unsafe.Pointer(bp + 4 /* ip */))))
+			iLast = (*(*int32)(unsafe.Pointer(bp + 12 /* iOff */)) + (*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxPhraseSize})).f(tls, pFts, *(*int32)(unsafe.Pointer(bp + 4 /* ip */))))
 		}
 	}
 
@@ -217543,7 +218544,9 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 		return
 	}
 
-	nCol = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pApi + 16 /* &.xColumnCount */))))(tls, pFts)
+	nCol = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnCount})).f(tls, pFts)
 	libc.Xmemset(tls, bp /* &ctx */, 0, uint64(unsafe.Sizeof(HighlightContext{})))
 	iCol = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(apVal)))
 	(*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzOpen = fts5ValueToText(tls, *(*uintptr)(unsafe.Pointer(apVal + 1*8)))
@@ -217557,13 +218560,17 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 		}
 		return 0
 	}()
-	nPhrase = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pApi + 48 /* &.xPhraseCount */))))(tls, pFts)
+	nPhrase = (*struct {
+		f func(*libc.TLS, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxPhraseCount})).f(tls, pFts)
 	aSeen = Xsqlite3_malloc(tls, nPhrase)
 	if aSeen == uintptr(0) {
 		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = SQLITE_NOMEM
 	}
 	if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) == SQLITE_OK {
-		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 64 /* &.xInstCount */))))(tls, pFts, bp+96 /* &nInst */)
+		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInstCount})).f(tls, pFts, bp+96 /* &nInst */)
 	}
 
 	libc.Xmemset(tls, bp+104 /* &sFinder */, 0, uint64(unsafe.Sizeof(Fts5SFinder{})))
@@ -217576,18 +218583,24 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 			var ii int32
 			(*Fts5SFinder)(unsafe.Pointer(bp + 104 /* &sFinder */)).FiPos = 0
 			(*Fts5SFinder)(unsafe.Pointer(bp + 104 /* &sFinder */)).FnFirst = 0
-			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 88 /* &.xColumnText */))))(tls, pFts, i, (bp + 104 /* &sFinder */ + 24 /* &.zDoc */), bp+136 /* &nDoc */)
+			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnText})).f(tls, pFts, i, (bp + 104 /* &sFinder */ + 24 /* &.zDoc */), bp+136 /* &nDoc */)
 			if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) != SQLITE_OK {
 				break
 			}
-			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 40 /* &.xTokenize */))))(tls, pFts,
+			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxTokenize})).f(tls, pFts,
 				(*Fts5SFinder)(unsafe.Pointer(bp+104 /* &sFinder */)).FzDoc, *(*int32)(unsafe.Pointer(bp + 136 /* nDoc */)), bp+104 /* &sFinder */, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
 				}{fts5SentenceFinderCb})))
 			if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) != SQLITE_OK {
 				break
 			}
-			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pApi + 96 /* &.xColumnSize */))))(tls, pFts, i, bp+140 /* &nDocsize */)
+			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnSize})).f(tls, pFts, i, bp+140 /* &nDocsize */)
 			if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) != SQLITE_OK {
 				break
 			}
@@ -217605,7 +218618,9 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 
 				var jj int32
 
-				*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 72 /* &.xInst */))))(tls, pFts, ii, bp+144 /* &ip */, bp+148 /* &ic */, bp+152 /* &io */)
+				*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+					f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInst})).f(tls, pFts, ii, bp+144 /* &ip */, bp+148 /* &ic */, bp+152 /* &io */)
 				if *(*int32)(unsafe.Pointer(bp + 148 /* ic */)) != i {
 					continue
 				}
@@ -217656,10 +218671,14 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) == SQLITE_OK {
-		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 88 /* &.xColumnText */))))(tls, pFts, iBestCol, (bp /* &ctx */ + 72 /* &.zIn */), (bp /* &ctx */ + 80 /* &.nIn */))
+		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnText})).f(tls, pFts, iBestCol, (bp /* &ctx */ + 72 /* &.zIn */), (bp /* &ctx */ + 80 /* &.nIn */))
 	}
 	if (*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) == SQLITE_OK) && (*(*int32)(unsafe.Pointer(bp + 164 /* nColSize */)) == 0) {
-		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pApi + 96 /* &.xColumnSize */))))(tls, pFts, iBestCol, bp+164 /* &nColSize */)
+		*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnSize})).f(tls, pFts, iBestCol, bp+164 /* &nColSize */)
 	}
 	if (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) == SQLITE_OK {
@@ -217680,7 +218699,9 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 168 /* rc */)) == SQLITE_OK {
-			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 40 /* &.xTokenize */))))(tls, pFts, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FnIn, bp /* &ctx */, *(*uintptr)(unsafe.Pointer(&struct {
+			*(*int32)(unsafe.Pointer(bp + 168 /* rc */)) = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxTokenize})).f(tls, pFts, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FzIn, (*HighlightContext)(unsafe.Pointer(bp /* &ctx */)).FnIn, bp /* &ctx */, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
 			}{fts5HighlightCb})))
 		}
@@ -217705,11 +218726,11 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 // The first time the bm25() function is called for a query, an instance
 // of the following structure is allocated and populated.
 type Fts5Bm25Data1 = struct {
-	FnPhrase int32
-	_        [4]byte
-	Favgdl   float64
-	FaIDF    uintptr
-	FaFreq   uintptr
+	FnPhrase     int32
+	F__ccgo_pad1 [4]byte
+	Favgdl       float64
+	FaIDF        uintptr
+	FaFreq       uintptr
 } /* sqlite3.c:215879:9 */
 
 //**********************************************************************
@@ -217738,7 +218759,9 @@ func fts5Bm25GetData(tls *libc.TLS, pApi uintptr, pFts uintptr, ppData uintptr)
 	var rc int32 = SQLITE_OK // Return code
 	var p uintptr            // Object to return
 
-	p = (*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer((pApi + 120 /* &.xGetAuxdata */))))(tls, pFts, 0)
+	p = (*struct {
+		f func(*libc.TLS, uintptr, int32) uintptr
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxGetAuxdata})).f(tls, pFts, 0)
 	if p == uintptr(0) {
 		var nPhrase int32                                                 // Number of phrases in query
 		*(*Sqlite3_int64)(unsafe.Pointer(bp /* nRow */)) = int64(0)       // Number of rows in table
@@ -217747,7 +218770,9 @@ func fts5Bm25GetData(tls *libc.TLS, pApi uintptr, pFts uintptr, ppData uintptr)
 		var i int32
 
 		// Allocate the Fts5Bm25Data object
-		nPhrase = (*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer((pApi + 48 /* &.xPhraseCount */))))(tls, pFts)
+		nPhrase = (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxPhraseCount})).f(tls, pFts)
 		nByte = (Sqlite3_int64(uint64(unsafe.Sizeof(Fts5Bm25Data{})) + ((uint64(nPhrase * 2)) * uint64(unsafe.Sizeof(float64(0))))))
 		p = Xsqlite3_malloc64(tls, uint64(nByte))
 		if p == uintptr(0) {
@@ -217761,11 +218786,15 @@ func fts5Bm25GetData(tls *libc.TLS, pApi uintptr, pFts uintptr, ppData uintptr)
 
 		// Calculate the average document length for this FTS5 table
 		if rc == SQLITE_OK {
-			rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 24 /* &.xRowCount */))))(tls, pFts, bp /* &nRow */)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxRowCount})).f(tls, pFts, bp /* &nRow */)
 		}
 
 		if rc == SQLITE_OK {
-			rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pApi + 32 /* &.xColumnTotalSize */))))(tls, pFts, -1, bp+8 /* &nToken */)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnTotalSize})).f(tls, pFts, -1, bp+8 /* &nToken */)
 		}
 		if rc == SQLITE_OK {
 			(*Fts5Bm25Data)(unsafe.Pointer(p)).Favgdl = (float64(*(*Sqlite3_int64)(unsafe.Pointer(bp + 8 /* nToken */))) / float64(*(*Sqlite3_int64)(unsafe.Pointer(bp /* nRow */))))
@@ -217774,7 +218803,9 @@ func fts5Bm25GetData(tls *libc.TLS, pApi uintptr, pFts uintptr, ppData uintptr)
 		// Calculate an IDF for each phrase in the query
 		for i = 0; (rc == SQLITE_OK) && (i < nPhrase); i++ {
 			*(*Sqlite3_int64)(unsafe.Pointer(bp + 16 /* nHit */)) = int64(0)
-			rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 104 /* &.xQueryPhrase */))))(tls, pFts, i, bp+16 /* &nHit */, *(*uintptr)(unsafe.Pointer(&struct {
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxQueryPhrase})).f(tls, pFts, i, bp+16 /* &nHit */, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 			}{fts5CountCb})))
 			if rc == SQLITE_OK {
@@ -217802,7 +218833,9 @@ func fts5Bm25GetData(tls *libc.TLS, pApi uintptr, pFts uintptr, ppData uintptr)
 		if rc != SQLITE_OK {
 			Xsqlite3_free(tls, p)
 		} else {
-			rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 112 /* &.xSetAuxdata */))))(tls, pFts, p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxSetAuxdata})).f(tls, pFts, p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
 		if rc != SQLITE_OK {
 			p = uintptr(0)
@@ -217834,7 +218867,9 @@ func fts5Bm25Function(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, n
 	if rc == SQLITE_OK {
 		aFreq = (*Fts5Bm25Data)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp /* pData */)))).FaFreq
 		libc.Xmemset(tls, aFreq, 0, (uint64(unsafe.Sizeof(float64(0))) * uint64((*Fts5Bm25Data)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp /* pData */)))).FnPhrase)))
-		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 64 /* &.xInstCount */))))(tls, pFts, bp+8 /* &nInst */)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInstCount})).f(tls, pFts, bp+8 /* &nInst */)
 	}
 	for i = 0; (rc == SQLITE_OK) && (i < *(*int32)(unsafe.Pointer(bp + 8 /* nInst */))); i++ {
 		// var ip int32 at bp+12, 4
@@ -217843,7 +218878,9 @@ func fts5Bm25Function(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, n
 
 		// var io int32 at bp+20, 4
 
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 72 /* &.xInst */))))(tls, pFts, i, bp+12 /* &ip */, bp+16 /* &ic */, bp+20 /* &io */)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxInst})).f(tls, pFts, i, bp+12 /* &ip */, bp+16 /* &ic */, bp+20 /* &io */)
 		if rc == SQLITE_OK {
 			var w float64
 			if nVal > *(*int32)(unsafe.Pointer(bp + 16 /* ic */)) {
@@ -217859,7 +218896,9 @@ func fts5Bm25Function(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr, n
 	if rc == SQLITE_OK {
 		// var nTok int32 at bp+24, 4
 
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer((pApi + 96 /* &.xColumnSize */))))(tls, pFts, -1, bp+24 /* &nTok */)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExtensionApi)(unsafe.Pointer(pApi)).FxColumnSize})).f(tls, pFts, -1, bp+24 /* &nTok */)
 		D = float64(*(*int32)(unsafe.Pointer(bp + 24 /* nTok */)))
 	}
 
@@ -217894,7 +218933,9 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 { /* sqlite3.c:216036
 	var i int32              // To iterate through builtin functions
 
 	for i = 0; (rc == SQLITE_OK) && (i < (int32(uint64(unsafe.Sizeof([3]Builtin{})) / uint64(unsafe.Sizeof(Builtin{}))))); i++ {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, Fts5_extension_function, uintptr) int32)(unsafe.Pointer((pApi + 24 /* &.xCreateFunction */))))(tls, pApi,
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, Fts5_extension_function, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5_api)(unsafe.Pointer(pApi)).FxCreateFunction})).f(tls, pApi,
 			(*Builtin)(unsafe.Pointer(bp /* &aBuiltin */ +uintptr(i)*32)).FzFunc,
 			(*Builtin)(unsafe.Pointer(bp /* &aBuiltin */ +uintptr(i)*32)).FpUserData,
 			(*Builtin)(unsafe.Pointer(bp /* &aBuiltin */ +uintptr(i)*32)).FxFunc,
@@ -218518,9 +219559,9 @@ func sqlite3Fts5Dequote(tls *libc.TLS, z uintptr) { /* sqlite3.c:216659:13: */
 }
 
 type Fts5Enum1 = struct {
-	FzName uintptr
-	FeVal  int32
-	_      [4]byte
+	FzName       uintptr
+	FeVal        int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:216670:1 */
 
 type Fts5Enum = Fts5Enum1 /* sqlite3.c:216674:25 */
@@ -218952,7 +219993,7 @@ func sqlite3Fts5ConfigFree(tls *libc.TLS, pConfig uintptr) { /* sqlite3.c:217109
 	if pConfig != 0 {
 		var i int32
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(((*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi + 8 /* &.xDelete */))))(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Fts5_tokenizer)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi)).FxDelete})).f(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok)
 		}
 		Xsqlite3_free(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb)
 		Xsqlite3_free(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)
@@ -219027,7 +220068,9 @@ func sqlite3Fts5Tokenize(tls *libc.TLS, pConfig uintptr, flags int32, pText uint
 	if pText == uintptr(0) {
 		return SQLITE_OK
 	}
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer(((*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi + 16 /* &.xTokenize */))))(tls,
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5_tokenizer)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi)).FxTokenize})).f(tls,
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTok, pCtx, flags, pText, nText, xToken)
 }
 
@@ -219285,12 +220328,12 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 // All token types in the generated fts5parse.h file are greater than 0.
 
 type Fts5ExprTerm1 = struct {
-	FbPrefix  U8
-	FbFirst   U8
-	_         [6]byte
-	FzTerm    uintptr
-	FpIter    uintptr
-	FpSynonym uintptr
+	FbPrefix     U8
+	FbFirst      U8
+	F__ccgo_pad1 [6]byte
+	FzTerm       uintptr
+	FpIter       uintptr
+	FpSynonym    uintptr
 } /* sqlite3.c:213118:9 */
 
 // 2014 May 31
@@ -220736,7 +221779,9 @@ func fts5ExprNodeNext_OR(tls *libc.TLS, pExpr uintptr, pNode uintptr, bFromValid
 		if (*Fts5ExprNode)(unsafe.Pointer(p1)).FbEof == 0 {
 			if ((*Fts5ExprNode)(unsafe.Pointer(p1)).FiRowid == iLast) ||
 				((bFromValid != 0) && (fts5RowidCmp(tls, pExpr, (*Fts5ExprNode)(unsafe.Pointer(p1)).FiRowid, iFrom) < 0)) {
-				var rc int32 = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((p1 + 16 /* &.xNext */))))(tls, pExpr, p1, bFromValid, iFrom)
+				var rc int32 = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((p1))).FxNext})).f(tls, pExpr, p1, bFromValid, iFrom)
 				if rc != SQLITE_OK {
 					(*Fts5ExprNode)(unsafe.Pointer(pNode)).FbNomatch = 0
 					return rc
@@ -220764,7 +221809,9 @@ func fts5ExprNodeTest_AND(tls *libc.TLS, pExpr uintptr, pAnd uintptr) int32 { /*
 			var cmp int32 = fts5RowidCmp(tls, pExpr, iLast, (*Fts5ExprNode)(unsafe.Pointer(pChild)).FiRowid)
 			if cmp > 0 {
 				// Advance pChild until it points to iLast or laster
-				rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((pChild + 16 /* &.xNext */))))(tls, pExpr, pChild, 1, iLast)
+				rc = (*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+				})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((pChild))).FxNext})).f(tls, pExpr, pChild, 1, iLast)
 				if rc != SQLITE_OK {
 					(*Fts5ExprNode)(unsafe.Pointer(pAnd)).FbNomatch = 0
 					return rc
@@ -220799,7 +221846,9 @@ func fts5ExprNodeTest_AND(tls *libc.TLS, pExpr uintptr, pAnd uintptr) int32 { /*
 }
 
 func fts5ExprNodeNext_AND(tls *libc.TLS, pExpr uintptr, pNode uintptr, bFromValid int32, iFrom I64) int32 { /* sqlite3.c:218749:12: */
-	var rc int32 = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))) + 16 /* &.xNext */))))(tls, pExpr, *(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))), bFromValid, iFrom)
+	var rc int32 = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */)))))).FxNext})).f(tls, pExpr, *(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))), bFromValid, iFrom)
 	if rc == SQLITE_OK {
 		rc = fts5ExprNodeTest_AND(tls, pExpr, pNode)
 	} else {
@@ -220816,14 +221865,18 @@ func fts5ExprNodeTest_NOT(tls *libc.TLS, pExpr uintptr, pNode uintptr) int32 { /
 	for (rc == SQLITE_OK) && ((*Fts5ExprNode)(unsafe.Pointer(p1)).FbEof == 0) {
 		var cmp int32 = fts5NodeCompare(tls, pExpr, p1, p2)
 		if cmp > 0 {
-			rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((p2 + 16 /* &.xNext */))))(tls, pExpr, p2, 1, (*Fts5ExprNode)(unsafe.Pointer(p1)).FiRowid)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((p2))).FxNext})).f(tls, pExpr, p2, 1, (*Fts5ExprNode)(unsafe.Pointer(p1)).FiRowid)
 			cmp = fts5NodeCompare(tls, pExpr, p1, p2)
 		}
 
 		if (cmp != 0) || ((*Fts5ExprNode)(unsafe.Pointer(p2)).FbNomatch != 0) {
 			break
 		}
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((p1 + 16 /* &.xNext */))))(tls, pExpr, p1, 0, int64(0))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((p1))).FxNext})).f(tls, pExpr, p1, 0, int64(0))
 	}
 	(*Fts5ExprNode)(unsafe.Pointer(pNode)).FbEof = (*Fts5ExprNode)(unsafe.Pointer(p1)).FbEof
 	(*Fts5ExprNode)(unsafe.Pointer(pNode)).FbNomatch = (*Fts5ExprNode)(unsafe.Pointer(p1)).FbNomatch
@@ -220835,7 +221888,9 @@ func fts5ExprNodeTest_NOT(tls *libc.TLS, pExpr uintptr, pNode uintptr) int32 { /
 }
 
 func fts5ExprNodeNext_NOT(tls *libc.TLS, pExpr uintptr, pNode uintptr, bFromValid int32, iFrom I64) int32 { /* sqlite3.c:218792:12: */
-	var rc int32 = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))) + 16 /* &.xNext */))))(tls, pExpr, *(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))), bFromValid, iFrom)
+	var rc int32 = (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */)))))).FxNext})).f(tls, pExpr, *(*uintptr)(unsafe.Pointer((pNode + 48 /* &.apChild */))), bFromValid, iFrom)
 	if rc == SQLITE_OK {
 		rc = fts5ExprNodeTest_NOT(tls, pExpr, pNode)
 	}
@@ -220976,13 +222031,17 @@ func sqlite3Fts5ExprFirst(tls *libc.TLS, p uintptr, pIdx uintptr, iFirst I64, bD
 	if ((rc == SQLITE_OK) &&
 		(0 == (*Fts5ExprNode)(unsafe.Pointer(pRoot)).FbEof)) &&
 		(fts5RowidCmp(tls, p, (*Fts5ExprNode)(unsafe.Pointer(pRoot)).FiRowid, iFirst) < 0) {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((pRoot + 16 /* &.xNext */))))(tls, p, pRoot, 1, iFirst)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((pRoot))).FxNext})).f(tls, p, pRoot, 1, iFirst)
 	}
 
 	// If the iterator is not at a real match, skip forward until it is.
 	for ((*Fts5ExprNode)(unsafe.Pointer(pRoot)).FbNomatch != 0) && (rc == SQLITE_OK) {
 
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((pRoot + 16 /* &.xNext */))))(tls, p, pRoot, 0, int64(0))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((pRoot))).FxNext})).f(tls, p, pRoot, 0, int64(0))
 	}
 	return rc
 }
@@ -220996,7 +222055,9 @@ func sqlite3Fts5ExprNext(tls *libc.TLS, p uintptr, iLast I64) int32 { /* sqlite3
 	var pRoot uintptr = (*Fts5Expr)(unsafe.Pointer(p)).FpRoot
 
 	for ok := true; ok; ok = (*Fts5ExprNode)(unsafe.Pointer(pRoot)).FbNomatch != 0 {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, I64) int32)(unsafe.Pointer((pRoot + 16 /* &.xNext */))))(tls, p, pRoot, 0, int64(0))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, I64) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5ExprNode)(unsafe.Pointer((pRoot))).FxNext})).f(tls, p, pRoot, 0, int64(0))
 
 	}
 	if fts5RowidCmp(tls, p, (*Fts5ExprNode)(unsafe.Pointer(pRoot)).FiRowid, iLast) > 0 {
@@ -221117,9 +222178,9 @@ func sqlite3Fts5ParseNearset(tls *libc.TLS, pParse uintptr, pNear uintptr, pPhra
 }
 
 type TokenCtx1 = struct {
-	FpPhrase uintptr
-	Frc      int32
-	_        [4]byte
+	FpPhrase     uintptr
+	Frc          int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:219078:9 */
 
 type TokenCtx = TokenCtx1 /* sqlite3.c:219078:25 */
@@ -223059,7 +224120,7 @@ type Fts5Iter1 = struct {
 	FnSeg         int32
 	FbRev         int32
 	FbSkipEmpty   U8
-	_             [7]byte
+	F__ccgo_pad1  [7]byte
 	FiSwitchRowid I64
 	FaFirst       uintptr
 	FaSeg         [1]Fts5SegIter
@@ -223095,7 +224156,7 @@ type Fts5SegIter1 = struct {
 	FiRowid          I64
 	FnPos            int32
 	FbDel            U8
-	_                [3]byte
+	F__ccgo_pad1     [3]byte
 } /* sqlite3.c:221314:9 */
 
 type Fts5SegIter = Fts5SegIter1 /* sqlite3.c:221316:28 */
@@ -223110,26 +224171,26 @@ type Fts5DoclistIter1 = struct {
 type Fts5DoclistIter = Fts5DoclistIter1 /* sqlite3.c:221317:32 */
 type Fts5SegWriter1 = struct {
 	FiSegid               int32
-	_                     [4]byte
+	F__ccgo_pad1          [4]byte
 	Fwriter               Fts5PageWriter
 	FiPrevRowid           I64
 	FbFirstRowidInDoclist U8
 	FbFirstRowidInPage    U8
 	FbFirstTermInPage     U8
-	_                     [1]byte
+	F__ccgo_pad2          [1]byte
 	FnLeafWritten         int32
 	FnEmpty               int32
 	FnDlidx               int32
 	FaDlidx               uintptr
 	Fbtterm               Fts5Buffer
 	FiBtPage              int32
-	_                     [4]byte
+	F__ccgo_pad3          [4]byte
 } /* sqlite3.c:221318:9 */
 
 type Fts5SegWriter = Fts5SegWriter1 /* sqlite3.c:221318:30 */
 type Fts5Structure1 = struct {
 	FnRef          int32
-	_              [4]byte
+	F__ccgo_pad1   [4]byte
 	FnWriteCounter U64
 	FnSegment      int32
 	FnLevel        int32
@@ -223153,9 +224214,9 @@ type Fts5StructureSegment1 = struct {
 type Fts5StructureSegment = Fts5StructureSegment1 /* sqlite3.c:221321:37 */
 
 type Fts5CResult1 = struct {
-	FiFirst  U16
-	FbTermEq U8
-	_        [1]byte
+	FiFirst      U16
+	FbTermEq     U8
+	F__ccgo_pad1 [1]byte
 } /* sqlite3.c:221314:9 */
 
 type Fts5CResult = Fts5CResult1 /* sqlite3.c:221431:28 */
@@ -225311,7 +226372,9 @@ func fts5SegIterNextFrom(tls *libc.TLS, p uintptr, pIter uintptr, iMatch I64) {
 
 	for ok := true; ok; ok = ((*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		if (bMove != 0) && ((*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-			(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pIter + 40 /* &.xNext */))))(tls, p, pIter, uintptr(0))
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5SegIter)(unsafe.Pointer(pIter)).FxNext})).f(tls, p, pIter, uintptr(0))
 		}
 		if (*Fts5SegIter)(unsafe.Pointer(pIter)).FpLeaf == uintptr(0) {
 			break
@@ -225345,7 +226408,9 @@ func fts5MultiIterAdvanced(tls *libc.TLS, p uintptr, pIter uintptr, iChanged int
 		if libc.AssignInt32(&iEq, fts5MultiIterDoCompare(tls, pIter, i)) != 0 {
 			var pSeg uintptr = ((pIter + 96 /* &.aSeg */) + uintptr(iEq)*120)
 
-			(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pSeg + 40 /* &.xNext */))))(tls, p, pSeg, uintptr(0))
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5SegIter)(unsafe.Pointer(pSeg)).FxNext})).f(tls, p, pSeg, uintptr(0))
 			i = ((*Fts5Iter)(unsafe.Pointer(pIter)).FnSeg + iEq)
 		}
 	}
@@ -225424,7 +226489,9 @@ func fts5MultiIterNext(tls *libc.TLS, p uintptr, pIter uintptr, bFrom int32, iFr
 		if (bUseFrom != 0) && ((*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FpDlidx != 0) {
 			fts5SegIterNextFrom(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)), iFrom)
 		} else {
-			(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)) + 40 /* &.xNext */))))(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)), bp /* &bNewTerm */)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FxNext})).f(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)), bp /* &bNewTerm */)
 		}
 
 		if (((*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FpLeaf == uintptr(0)) || (*(*int32)(unsafe.Pointer(bp /* bNewTerm */)) != 0)) ||
@@ -225438,7 +226505,9 @@ func fts5MultiIterNext(tls *libc.TLS, p uintptr, pIter uintptr, bFrom int32, iFr
 		}
 
 		if (int32((*Fts5Iter)(unsafe.Pointer(pIter)).FbSkipEmpty) == 0) || ((*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FnPos != 0) {
-			(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pIter + 56 /* &.xSetOutputs */))))(tls, pIter, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Iter)(unsafe.Pointer(pIter)).FxSetOutputs})).f(tls, pIter, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))
 			return
 		}
 		bUseFrom = 0
@@ -225456,7 +226525,9 @@ func fts5MultiIterNext2(tls *libc.TLS, p uintptr, pIter uintptr, pbNewTerm uintp
 			*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)) = ((pIter + 96 /* &.aSeg */) + uintptr(iFirst)*120)
 			*(*int32)(unsafe.Pointer(bp /* bNewTerm */)) = 0
 
-			(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)) + 40 /* &.xNext */))))(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)), bp /* &bNewTerm */)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FxNext})).f(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)), bp /* &bNewTerm */)
 			if (((*Fts5SegIter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8 /* pSeg */)))).FpLeaf == uintptr(0)) || (*(*int32)(unsafe.Pointer(bp /* bNewTerm */)) != 0)) ||
 				(fts5MultiIterAdvanceRowid(tls, pIter, iFirst, bp+8 /* &pSeg */) != 0) {
 				fts5MultiIterAdvanced(tls, p, pIter, iFirst, 1)
@@ -225505,10 +226576,10 @@ func fts5PoslistCallback(tls *libc.TLS, pUnused uintptr, pContext uintptr, pChun
 }
 
 type PoslistCallbackCtx1 = struct {
-	FpBuf    uintptr
-	FpColset uintptr
-	FeState  int32
-	_        [4]byte
+	FpBuf        uintptr
+	FpColset     uintptr
+	FeState      int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:224008:9 */
 
 type PoslistCallbackCtx = PoslistCallbackCtx1 /* sqlite3.c:224008:35 */
@@ -225659,7 +226730,9 @@ func fts5ChunkIterate(tls *libc.TLS, p uintptr, pSeg uintptr, pCtx uintptr, xChu
 	}
 
 	for 1 != 0 {
-		(*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32))(unsafe.Pointer(&xChunk)))(tls, p, pCtx, pChunk, nChunk)
+		(*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, int32)
+		})(unsafe.Pointer(&struct{ uintptr }{xChunk})).f(tls, p, pCtx, pChunk, nChunk)
 		nRem = nRem - (nChunk)
 		fts5DataRelease(tls, pData)
 		if nRem <= 0 {
@@ -226061,7 +227134,9 @@ func fts5MultiIterNew(tls *libc.TLS, p uintptr, pStruct uintptr, flags int32, pC
 			if libc.AssignInt32(&iEq, fts5MultiIterDoCompare(tls, pNew, iIter)) != 0 {
 				var pSeg uintptr = ((pNew + 96 /* &.aSeg */) + uintptr(iEq)*120)
 				if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-					(*(*func(*libc.TLS, uintptr, uintptr, uintptr))(unsafe.Pointer((pSeg + 40 /* &.xNext */))))(tls, p, pSeg, uintptr(0))
+					(*struct {
+						f func(*libc.TLS, uintptr, uintptr, uintptr)
+					})(unsafe.Pointer(&struct{ uintptr }{(*Fts5SegIter)(unsafe.Pointer(pSeg)).FxNext})).f(tls, p, pSeg, uintptr(0))
 				}
 				fts5MultiIterAdvanced(tls, p, pNew, iEq, iIter)
 			}
@@ -226072,7 +227147,9 @@ func fts5MultiIterNew(tls *libc.TLS, p uintptr, pStruct uintptr, flags int32, pC
 			fts5MultiIterNext(tls, p, pNew, 0, int64(0))
 		} else if int32((*Fts5Iter)(unsafe.Pointer(pNew)).Fbase.FbEof) == 0 {
 			var pSeg uintptr = ((pNew + 96 /* &.aSeg */) + uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(pNew)).FaFirst+1*4)).FiFirst)*120)
-			(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((pNew + 56 /* &.xSetOutputs */))))(tls, pNew, pSeg)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Iter)(unsafe.Pointer(pNew)).FxSetOutputs})).f(tls, pNew, pSeg)
 		}
 
 	} else {
@@ -227475,12 +228552,12 @@ func fts5MergeRowidLists(tls *libc.TLS, p uintptr, p1 uintptr, nBuf int32, aBuf
 }
 
 type PrefixMerger1 = struct {
-	Fiter  Fts5DoclistIter
-	FiPos  I64
-	FiOff  int32
-	_      [4]byte
-	FaPos  uintptr
-	FpNext uintptr
+	Fiter        Fts5DoclistIter
+	FiPos        I64
+	FiOff        int32
+	F__ccgo_pad1 [4]byte
+	FaPos        uintptr
+	FpNext       uintptr
 } /* sqlite3.c:225988:9 */
 
 type PrefixMerger = PrefixMerger1 /* sqlite3.c:225988:29 */
@@ -227726,9 +228803,13 @@ func fts5SetupPrefixIter(tls *libc.TLS, p uintptr, bDesc int32, iIdx int32, pTok
 			fts5IterSetOutputCb(tls, (p + 52 /* &.rc */), *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))
 			for ; fts5MultiIterEof(tls, p, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */))) == 0; fts5MultiIterNext2(tls, p, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), bp+24 /* &dummy */) {
 				var pSeg uintptr = ((*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)) + 96 /* &.aSeg */) + uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).FaFirst+1*4)).FiFirst)*120)
-				(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)) + 56 /* &.xSetOutputs */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), pSeg)
+				(*struct {
+					f func(*libc.TLS, uintptr, uintptr)
+				})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).FxSetOutputs})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), pSeg)
 				if (*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FnData != 0 {
-					(*(*func(*libc.TLS, uintptr, I64, uintptr, uintptr))(unsafe.Pointer(&xAppend)))(tls, p, ((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid - iLastRowid), *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), bp /* &doclist */)
+					(*struct {
+						f func(*libc.TLS, uintptr, I64, uintptr, uintptr)
+					})(unsafe.Pointer(&struct{ uintptr }{xAppend})).f(tls, p, ((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid - iLastRowid), *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), bp /* &doclist */)
 					iLastRowid = (*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid
 				}
 			}
@@ -227742,7 +228823,9 @@ func fts5SetupPrefixIter(tls *libc.TLS, p uintptr, bDesc int32, iIdx int32, pTok
 			var pSeg uintptr = ((*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)) + 96 /* &.aSeg */) + uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).FaFirst+1*4)).FiFirst)*120)
 			var nTerm int32 = (*Fts5SegIter)(unsafe.Pointer(pSeg)).Fterm.Fn
 			var pTerm uintptr = (*Fts5SegIter)(unsafe.Pointer(pSeg)).Fterm.Fp
-			(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)) + 56 /* &.xSetOutputs */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), pSeg)
+			(*struct {
+				f func(*libc.TLS, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).FxSetOutputs})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), pSeg)
 
 			if *(*int32)(unsafe.Pointer(bp + 28 /* bNewTerm */)) != 0 {
 				if (nTerm < nToken) || (libc.Xmemcmp(tls, pToken, pTerm, uint64(nToken)) != 0) {
@@ -227767,7 +228850,9 @@ func fts5SetupPrefixIter(tls *libc.TLS, p uintptr, bDesc int32, iIdx int32, pTok
 						}
 					}
 					if iStore == (i1 + nMerge) {
-						(*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr))(unsafe.Pointer(&xMerge)))(tls, p, bp /* &doclist */, nMerge, (aBuf + uintptr(i1)*16))
+						(*struct {
+							f func(*libc.TLS, uintptr, uintptr, int32, uintptr)
+						})(unsafe.Pointer(&struct{ uintptr }{xMerge})).f(tls, p, bp /* &doclist */, nMerge, (aBuf + uintptr(i1)*16))
 						for iStore = i1; iStore < (i1 + nMerge); iStore++ {
 							sqlite3Fts5BufferZero(tls, (aBuf + uintptr(iStore)*16))
 						}
@@ -227776,14 +228861,18 @@ func fts5SetupPrefixIter(tls *libc.TLS, p uintptr, bDesc int32, iIdx int32, pTok
 				iLastRowid = int64(0)
 			}
 
-			(*(*func(*libc.TLS, uintptr, I64, uintptr, uintptr))(unsafe.Pointer(&xAppend)))(tls, p, ((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid - iLastRowid), *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), bp /* &doclist */)
+			(*struct {
+				f func(*libc.TLS, uintptr, I64, uintptr, uintptr)
+			})(unsafe.Pointer(&struct{ uintptr }{xAppend})).f(tls, p, ((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid - iLastRowid), *(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)), bp /* &doclist */)
 			iLastRowid = (*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* p1 */)))).Fbase.FiRowid
 		}
 
 		for i = 0; i < nBuf; i = i + (nMerge) {
 			var iFree int32
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-				(*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr))(unsafe.Pointer(&xMerge)))(tls, p, bp /* &doclist */, nMerge, (aBuf + uintptr(i)*16))
+				(*struct {
+					f func(*libc.TLS, uintptr, uintptr, int32, uintptr)
+				})(unsafe.Pointer(&struct{ uintptr }{xMerge})).f(tls, p, bp /* &doclist */, nMerge, (aBuf + uintptr(i)*16))
 			}
 			for iFree = i; iFree < (i + nMerge); iFree++ {
 				sqlite3Fts5BufferFree(tls, (aBuf + uintptr(iFree)*16))
@@ -228056,7 +229145,9 @@ func sqlite3Fts5IndexQuery(tls *libc.TLS, p uintptr, pToken uintptr, nToken int3
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				var pSeg uintptr = ((*(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)) + 96 /* &.aSeg */) + uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)))).FaFirst+1*4)).FiFirst)*120)
 				if (*Fts5SegIter)(unsafe.Pointer(pSeg)).FpLeaf != 0 {
-					(*(*func(*libc.TLS, uintptr, uintptr))(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)) + 56 /* &.xSetOutputs */))))(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)), pSeg)
+					(*struct {
+						f func(*libc.TLS, uintptr, uintptr)
+					})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)))).FxSetOutputs})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 16 /* pRet */)), pSeg)
 				}
 			}
 		}
@@ -228656,13 +229747,13 @@ type Fts5Cursor1 = struct {
 	FpExpr        uintptr
 	FpSorter      uintptr
 	Fcsrflags     int32
-	_             [4]byte
+	F__ccgo_pad1  [4]byte
 	FiSpecial     I64
 	FzRank        uintptr
 	FzRankArgs    uintptr
 	FpRank        uintptr
 	FnRankArg     int32
-	_             [4]byte
+	F__ccgo_pad2  [4]byte
 	FapRankArg    uintptr
 	FpRankArgStmt uintptr
 	FpAux         uintptr
@@ -228736,9 +229827,9 @@ type Fts5TransactionState = struct {
 } /* sqlite3.c:227858:1 */
 
 type Fts5MatchPhrase = struct {
-	FpPoslist uintptr
-	FnTerm    int32
-	_         [4]byte
+	FpPoslist    uintptr
+	FnTerm       int32
+	F__ccgo_pad1 [4]byte
 } /* sqlite3.c:227915:1 */
 
 // Return true if pTab is a contentless table.
@@ -229170,7 +230261,7 @@ func fts5FreeCursorComponents(tls *libc.TLS, pCsr uintptr) { /* sqlite3.c:228530
 	for pData = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FpAuxdata; pData != 0; pData = pNext {
 		pNext = (*Fts5Auxdata)(unsafe.Pointer(pData)).FpNext
 		if (*Fts5Auxdata)(unsafe.Pointer(pData)).FxDelete != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pData + 16 /* &.xDelete */))))(tls, (*Fts5Auxdata)(unsafe.Pointer(pData)).FpPtr)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Fts5Auxdata)(unsafe.Pointer(pData)).FxDelete})).f(tls, (*Fts5Auxdata)(unsafe.Pointer(pData)).FpPtr)
 		}
 		Xsqlite3_free(tls, pData)
 	}
@@ -230598,14 +231689,14 @@ func fts5ApiSetAuxdata(tls *libc.TLS, pCtx uintptr, pPtr uintptr, xDelete uintpt
 
 	if pData != 0 {
 		if (*Fts5Auxdata)(unsafe.Pointer(pData)).FxDelete != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pData + 16 /* &.xDelete */))))(tls, (*Fts5Auxdata)(unsafe.Pointer(pData)).FpPtr)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Fts5Auxdata)(unsafe.Pointer(pData)).FxDelete})).f(tls, (*Fts5Auxdata)(unsafe.Pointer(pData)).FpPtr)
 		}
 	} else {
 		*(*int32)(unsafe.Pointer(bp /* rc */)) = SQLITE_OK
 		pData = sqlite3Fts5MallocZero(tls, bp /* &rc */, int64(unsafe.Sizeof(Fts5Auxdata{})))
 		if pData == uintptr(0) {
 			if xDelete != 0 {
-				(*(*func(*libc.TLS, uintptr))(unsafe.Pointer(&xDelete)))(tls, pPtr)
+				(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{xDelete})).f(tls, pPtr)
 			}
 			return *(*int32)(unsafe.Pointer(bp /* rc */))
 		}
@@ -230823,7 +231914,9 @@ func fts5ApiQueryPhrase(tls *libc.TLS, pCtx uintptr, iPhrase int32, pUserData ui
 
 	if rc == SQLITE_OK {
 		for rc = fts5CursorFirst(tls, pTab, *(*uintptr)(unsafe.Pointer(bp /* pNew */)), 0); (rc == SQLITE_OK) && (((*Fts5Cursor)(unsafe.Pointer((*(*uintptr)(unsafe.Pointer(bp /* pNew */))))).Fcsrflags & (FTS5CSR_EOF)) == 0); rc = fts5NextMethod(tls, *(*uintptr)(unsafe.Pointer(bp /* pNew */))) {
-			rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(&xCallback)))(tls, uintptr(unsafe.Pointer(&sFts5Api)), *(*uintptr)(unsafe.Pointer(bp /* pNew */)), pUserData)
+			rc = (*struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{xCallback})).f(tls, uintptr(unsafe.Pointer(&sFts5Api)), *(*uintptr)(unsafe.Pointer(bp /* pNew */)), pUserData)
 			if rc != SQLITE_OK {
 				if rc == SQLITE_DONE {
 					rc = SQLITE_OK
@@ -230840,7 +231933,9 @@ func fts5ApiQueryPhrase(tls *libc.TLS, pCtx uintptr, iPhrase int32, pUserData ui
 func fts5ApiInvoke(tls *libc.TLS, pAux uintptr, pCsr uintptr, context uintptr, argc int32, argv uintptr) { /* sqlite3.c:230126:13: */
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpAux = pAux
-	(*(*func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr))(unsafe.Pointer((pAux + 24 /* &.xFunc */))))(tls, uintptr(unsafe.Pointer(&sFts5Api)), pCsr, context, argc, argv)
+	(*struct {
+		f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Fts5Auxiliary)(unsafe.Pointer(pAux)).FxFunc})).f(tls, uintptr(unsafe.Pointer(&sFts5Api)), pCsr, context, argc, argv)
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpAux = uintptr(0)
 }
 
@@ -231174,7 +232269,9 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		rc = SQLITE_ERROR
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35383 /* "no such tokenize..." */, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pMod + 16 /* &.x */ /* &.xCreate */))))(tls,
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5TokenizerModule)(unsafe.Pointer(pMod)).Fx.FxCreate})).f(tls,
 			(*Fts5TokenizerModule)(unsafe.Pointer(pMod)).FpUserData, func() uintptr {
 				if azArg != 0 {
 					return (azArg + 1*8)
@@ -231215,7 +232312,7 @@ func fts5ModuleDestroy(tls *libc.TLS, pCtx uintptr) { /* sqlite3.c:230542:13: */
 	for pAux = (*Fts5Global)(unsafe.Pointer(pGlobal)).FpAux; pAux != 0; pAux = pNextAux {
 		pNextAux = (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpNext
 		if (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FxDestroy != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pAux + 32 /* &.xDestroy */))))(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpUserData)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Fts5Auxiliary)(unsafe.Pointer(pAux)).FxDestroy})).f(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpUserData)
 		}
 		Xsqlite3_free(tls, pAux)
 	}
@@ -231223,7 +232320,7 @@ func fts5ModuleDestroy(tls *libc.TLS, pCtx uintptr) { /* sqlite3.c:230542:13: */
 	for pTok = (*Fts5Global)(unsafe.Pointer(pGlobal)).FpTok; pTok != 0; pTok = pNextTok {
 		pNextTok = (*Fts5TokenizerModule)(unsafe.Pointer(pTok)).FpNext
 		if (*Fts5TokenizerModule)(unsafe.Pointer(pTok)).FxDestroy != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((pTok + 40 /* &.xDestroy */))))(tls, (*Fts5TokenizerModule)(unsafe.Pointer(pTok)).FpUserData)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*Fts5TokenizerModule)(unsafe.Pointer(pTok)).FxDestroy})).f(tls, (*Fts5TokenizerModule)(unsafe.Pointer(pTok)).FpUserData)
 		}
 		Xsqlite3_free(tls, pTok)
 	}
@@ -232590,7 +233687,9 @@ func fts5AsciiTokenize(tls *libc.TLS, pTokenizer uintptr, pCtx uintptr, iUnused
 		asciiFold(tls, pFold, (pText + uintptr(is)), nByte)
 
 		// Invoke the token callback
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32)(unsafe.Pointer(&xToken)))(tls, pCtx, 0, pFold, nByte, is, ie)
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xToken})).f(tls, pCtx, 0, pFold, nByte, is, ie)
 		is = (ie + 1)
 	}
 
@@ -232617,7 +233716,7 @@ type Unicode61Tokenizer1 = struct {
 	FnFold            int32
 	FeRemoveDiacritic int32
 	FnException       int32
-	_                 [4]byte
+	F__ccgo_pad1      [4]byte
 	FaiException      uintptr
 	FaCategory        [32]uint8
 } /* sqlite3.c:232110:9 */
@@ -233042,7 +234141,9 @@ __15:
 	;
 
 	// Invoke the token callback
-	rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32)(unsafe.Pointer(&xToken)))(tls, pCtx, 0, aFold, (int32((int64(zOut) - int64(aFold)) / 1)), is, ie)
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{xToken})).f(tls, pCtx, 0, aFold, (int32((int64(zOut) - int64(aFold)) / 1)), is, ie)
 	goto __1
 __2:
 	;
@@ -233084,7 +234185,7 @@ func fts5PorterDelete(tls *libc.TLS, pTok uintptr) { /* sqlite3.c:232438:13: */
 	if pTok != 0 {
 		var p uintptr = pTok
 		if (*PorterTokenizer)(unsafe.Pointer(p)).FpTokenizer != 0 {
-			(*(*func(*libc.TLS, uintptr))(unsafe.Pointer((p /* &.tokenizer */ + 8 /* &.xDelete */))))(tls, (*PorterTokenizer)(unsafe.Pointer(p)).FpTokenizer)
+			(*struct{ f func(*libc.TLS, uintptr) })(unsafe.Pointer(&struct{ uintptr }{(*PorterTokenizer)(unsafe.Pointer(p)).Ftokenizer.FxDelete})).f(tls, (*PorterTokenizer)(unsafe.Pointer(p)).FpTokenizer)
 		}
 		Xsqlite3_free(tls, p)
 	}
@@ -233108,7 +234209,9 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	pRet = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(PorterTokenizer{})))
 	if pRet != 0 {
 		libc.Xmemset(tls, pRet, 0, uint64(unsafe.Sizeof(PorterTokenizer{})))
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 16 /* &.xFindTokenizer */))))(tls, pApi, zBase, bp /* &pUserdata */, (pRet /* &.tokenizer */))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5_api)(unsafe.Pointer(pApi)).FxFindTokenizer})).f(tls, pApi, zBase, bp /* &pUserdata */, (pRet /* &.tokenizer */))
 	} else {
 		rc = SQLITE_NOMEM
 	}
@@ -233125,7 +234228,9 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 			}
 			return uintptr(0)
 		}()
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32)(unsafe.Pointer((pRet /* &.tokenizer */ /* &.xCreate */))))(tls, *(*uintptr)(unsafe.Pointer(bp /* pUserdata */)), azArg2, nArg2, (pRet + 24 /* &.pTokenizer */))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*PorterTokenizer)(unsafe.Pointer(pRet)).Ftokenizer.FxCreate})).f(tls, *(*uintptr)(unsafe.Pointer(bp /* pUserdata */)), azArg2, nArg2, (pRet + 24 /* &.pTokenizer */))
 	}
 
 	if rc != SQLITE_OK {
@@ -233145,13 +234250,13 @@ type PorterContext1 = struct {
 type PorterContext = PorterContext1 /* sqlite3.c:232487:30 */
 
 type PorterRule1 = struct {
-	FzSuffix uintptr
-	FnSuffix int32
-	_        [4]byte
-	FxCond   uintptr
-	FzOutput uintptr
-	FnOutput int32
-	_        [4]byte
+	FzSuffix     uintptr
+	FnSuffix     int32
+	F__ccgo_pad1 [4]byte
+	FxCond       uintptr
+	FzOutput     uintptr
+	FnOutput     int32
+	F__ccgo_pad2 [4]byte
 } /* sqlite3.c:232494:9 */
 
 type PorterRule = PorterRule1 /* sqlite3.c:232494:27 */
@@ -233763,10 +234868,14 @@ __8:
 __10:
 	;
 
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32)(unsafe.Pointer((p + 8 /* &.xToken */))))(tls, (*PorterContext)(unsafe.Pointer(p)).FpCtx, tflags, aBuf, *(*int32)(unsafe.Pointer(bp /* nBuf */)), iStart, iEnd)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*PorterContext)(unsafe.Pointer(p)).FxToken})).f(tls, (*PorterContext)(unsafe.Pointer(p)).FpCtx, tflags, aBuf, *(*int32)(unsafe.Pointer(bp /* nBuf */)), iStart, iEnd)
 
 pass_through:
-	return (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32)(unsafe.Pointer((p + 8 /* &.xToken */))))(tls, (*PorterContext)(unsafe.Pointer(p)).FpCtx, tflags, pToken, nToken, iStart, iEnd)
+	return (*struct {
+		f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*PorterContext)(unsafe.Pointer(p)).FxToken})).f(tls, (*PorterContext)(unsafe.Pointer(p)).FpCtx, tflags, pToken, nToken, iStart, iEnd)
 }
 
 // Tokenize using the porter tokenizer.
@@ -233780,7 +234889,9 @@ func fts5PorterTokenize(tls *libc.TLS, pTokenizer uintptr, pCtx uintptr, flags i
 	(*PorterContext)(unsafe.Pointer(bp /* &sCtx */)).FxToken = xToken
 	(*PorterContext)(unsafe.Pointer(bp /* &sCtx */)).FpCtx = pCtx
 	(*PorterContext)(unsafe.Pointer(bp /* &sCtx */)).FaBuf = p + 32 /* &.aBuf */
-	return (*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32)(unsafe.Pointer((p /* &.tokenizer */ + 16 /* &.xTokenize */))))(tls,
+	return (*struct {
+		f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*PorterTokenizer)(unsafe.Pointer(p)).Ftokenizer.FxTokenize})).f(tls,
 		(*PorterTokenizer)(unsafe.Pointer(p)).FpTokenizer, bp /* &sCtx */, flags, pText, nText, *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
 		}{fts5PorterCb})))
@@ -233965,7 +235076,9 @@ func fts5TriTokenize(tls *libc.TLS, pTok uintptr, pCtx uintptr, unusedFlags int3
 		} else {
 			break
 		}
-		rc = (*(*func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32)(unsafe.Pointer(&xToken)))(tls, pCtx, 0, bp /* &aBuf[0] */, (int32(int64((zOut - bp /* &aBuf[0] */) / 1))), iStart, (int32(int64(((uintptr(iStart) + zOut) - bp /* &aBuf[0] */) / 1))))
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, int32, uintptr, int32, int32, int32) int32
+		})(unsafe.Pointer(&struct{ uintptr }{xToken})).f(tls, pCtx, 0, bp /* &aBuf[0] */, (int32(int64((zOut - bp /* &aBuf[0] */) / 1))), iStart, (int32(int64(((uintptr(iStart) + zOut) - bp /* &aBuf[0] */) / 1))))
 		if rc != SQLITE_OK {
 			break
 		}
@@ -234029,7 +235142,9 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 { /* sqlite3.c:
 	var i int32              // To iterate through builtin functions
 
 	for i = 0; (rc == SQLITE_OK) && (i < (int32(uint64(unsafe.Sizeof([4]BuiltinTokenizer{})) / uint64(unsafe.Sizeof(BuiltinTokenizer{}))))); i++ {
-		rc = (*(*func(*libc.TLS, uintptr, uintptr, uintptr, uintptr, uintptr) int32)(unsafe.Pointer((pApi + 8 /* &.xCreateTokenizer */))))(tls, pApi,
+		rc = (*struct {
+			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Fts5_api)(unsafe.Pointer(pApi)).FxCreateTokenizer})).f(tls, pApi,
 			(*BuiltinTokenizer)(unsafe.Pointer(bp /* &aBuiltin */ +uintptr(i)*32)).FzName,
 			pApi,
 			(bp /* &aBuiltin */ + uintptr(i)*32 + 8 /* &.x */),
@@ -235329,24 +236444,24 @@ type Fts5VocabTable1 = struct {
 
 type Fts5VocabTable = Fts5VocabTable1 /* sqlite3.c:234461:31 */
 type Fts5VocabCursor1 = struct {
-	Fbase     Sqlite3_vtab_cursor
-	FpStmt    uintptr
-	FpFts5    uintptr
-	FbEof     int32
-	_         [4]byte
-	FpIter    uintptr
-	FnLeTerm  int32
-	_         [4]byte
-	FzLeTerm  uintptr
-	FiCol     int32
-	_         [4]byte
-	FaCnt     uintptr
-	FaDoc     uintptr
-	Frowid    I64
-	Fterm     Fts5Buffer
-	FiInstPos I64
-	FiInstOff int32
-	_         [4]byte
+	Fbase        Sqlite3_vtab_cursor
+	FpStmt       uintptr
+	FpFts5       uintptr
+	FbEof        int32
+	F__ccgo_pad1 [4]byte
+	FpIter       uintptr
+	FnLeTerm     int32
+	F__ccgo_pad2 [4]byte
+	FzLeTerm     uintptr
+	FiCol        int32
+	F__ccgo_pad3 [4]byte
+	FaCnt        uintptr
+	FaDoc        uintptr
+	Frowid       I64
+	Fterm        Fts5Buffer
+	FiInstPos    I64
+	FiInstOff    int32
+	F__ccgo_pad4 [4]byte
 } /* sqlite3.c:234462:9 */
 
 type Fts5VocabCursor = Fts5VocabCursor1 /* sqlite3.c:234462:32 */
-- 
cgit v1.2.3