diff options
-rw-r--r-- | src/classlibnative/bcltype/system.cpp | 43 | ||||
-rw-r--r-- | src/classlibnative/bcltype/system.h | 2 | ||||
-rw-r--r-- | src/inc/CrstTypes.def | 3 | ||||
-rw-r--r-- | src/inc/assemblyusagelog.idl | 51 | ||||
-rw-r--r-- | src/inc/assemblyusagelogmanager.h | 53 | ||||
-rw-r--r-- | src/inc/clrconfigvalues.h | 13 | ||||
-rw-r--r-- | src/inc/compatibilityflags.h | 17 | ||||
-rw-r--r-- | src/inc/compatibilityflagsdef.h | 48 | ||||
-rw-r--r-- | src/inc/mscorcfg.h | 34 | ||||
-rw-r--r-- | src/inc/winsqmevents.h | 84 | ||||
-rw-r--r-- | src/inc/xmlparser.h | 1385 | ||||
-rw-r--r-- | src/inc/xmlparser_i.cpp | 86 | ||||
-rw-r--r-- | src/strongname/api/common.h | 4 | ||||
-rw-r--r-- | src/vm/appdomain.cpp | 20 | ||||
-rw-r--r-- | src/vm/appdomainconfigfactory.hpp | 240 | ||||
-rw-r--r-- | src/vm/common.h | 26 | ||||
-rw-r--r-- | src/vm/excep.cpp | 3 | ||||
-rw-r--r-- | src/vm/excep.h | 3 | ||||
-rw-r--r-- | src/vm/vars.cpp | 45 | ||||
-rw-r--r-- | src/vm/vars.hpp | 19 |
20 files changed, 18 insertions, 2161 deletions
diff --git a/src/classlibnative/bcltype/system.cpp b/src/classlibnative/bcltype/system.cpp index 6577ffcb4a..bb06ceceeb 100644 --- a/src/classlibnative/bcltype/system.cpp +++ b/src/classlibnative/bcltype/system.cpp @@ -229,49 +229,6 @@ FCIMPL0(Object*, SystemNative::GetCommandLineArgs) } FCIMPLEND - -FCIMPL1(FC_BOOL_RET, SystemNative::_GetCompatibilityFlag, int flag) -{ - FCALL_CONTRACT; - - FC_RETURN_BOOL(GetCompatibilityFlag((CompatibilityFlag)flag)); -} -FCIMPLEND - -// Note: Arguments checked in IL. -FCIMPL1(Object*, SystemNative::_GetEnvironmentVariable, StringObject* strVarUNSAFE) -{ - FCALL_CONTRACT; - - STRINGREF refRetVal; - STRINGREF strVar; - - refRetVal = NULL; - strVar = ObjectToSTRINGREF(strVarUNSAFE); - - HELPER_METHOD_FRAME_BEGIN_RET_2(refRetVal, strVar); - - int len; - - // Get the length of the environment variable. - PathString envPath; // prefix complains if pass a null ptr in, so rely on the final length parm instead - len = WszGetEnvironmentVariable(strVar->GetBuffer(), envPath); - - if (len != 0) - { - // Allocate the string. - refRetVal = StringObject::NewString(len); - - wcscpy_s(refRetVal->GetBuffer(), len + 1, envPath); - - } - - HELPER_METHOD_FRAME_END(); - - return OBJECTREFToObject(refRetVal); -} -FCIMPLEND - // Return a method info for the method were the exception was thrown FCIMPL1(ReflectMethodObject*, SystemNative::GetMethodFromStackTrace, ArrayBase* pStackTraceUNSAFE) { diff --git a/src/classlibnative/bcltype/system.h b/src/classlibnative/bcltype/system.h index da5674f4f1..87dde89bcd 100644 --- a/src/classlibnative/bcltype/system.h +++ b/src/classlibnative/bcltype/system.h @@ -52,12 +52,10 @@ public: void QCALLTYPE _GetCommandLine(QCall::StringHandleOnStack retString); static FCDECL0(Object*, GetCommandLineArgs); - static FCDECL1(FC_BOOL_RET, _GetCompatibilityFlag, int flag); static FCDECL1(VOID, FailFast, StringObject* refMessageUNSAFE); static FCDECL2(VOID, FailFastWithExitCode, StringObject* refMessageUNSAFE, UINT exitCode); static FCDECL2(VOID, FailFastWithException, StringObject* refMessageUNSAFE, ExceptionObject* refExceptionUNSAFE); - static FCDECL1(Object*, _GetEnvironmentVariable, StringObject* strVar); static FCDECL0(StringObject*, _GetModuleFileName); static FCDECL0(StringObject*, GetRuntimeDirectory); diff --git a/src/inc/CrstTypes.def b/src/inc/CrstTypes.def index 8dc0d26785..5afc1ed949 100644 --- a/src/inc/CrstTypes.def +++ b/src/inc/CrstTypes.def @@ -752,9 +752,6 @@ End Crst PinnedByrefValidation End -Crst AssemblyUsageLog -End - Crst VSDIndirectionCellLock AcquiredBefore LoaderHeap End diff --git a/src/inc/assemblyusagelog.idl b/src/inc/assemblyusagelog.idl deleted file mode 100644 index b942d59148..0000000000 --- a/src/inc/assemblyusagelog.idl +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -//+--------------------------------------------------------------------------- -// -// File: assemblyusageloginterface.idl -// -// Contents: COM interface for assembly usage log. -// -// Classes: -// -// Functions: -// -// -//---------------------------------------------------------------------------- - -cpp_quote("") -cpp_quote("#ifdef _MSC_VER") -cpp_quote("#pragma comment(lib,\"uuid.lib\")") -cpp_quote("#endif") -cpp_quote("") -cpp_quote("//---------------------------------------------------------------------------=") -cpp_quote("// Assembly Usage Log Interfaces") -cpp_quote("") - -import "objidl.idl"; - -cpp_quote("#ifdef _MSC_VER") -cpp_quote("#pragma once") -cpp_quote("#endif") - -cpp_quote("// {ec2b5f70-d576-4d33-876f-6e3caeb0a7ba}") -cpp_quote("EXTERN_GUID(IID_IAssemblyUsageLog, 0xec2b5f70, 0xd576, 0x4d33, 0x87, 0x6f, 0x6e, 0x3c, 0xae, 0xb0, 0xa7, 0xba);") - -typedef enum -{ - ASSEMBLY_USAGE_LOG_FLAGS_NI = 1, - ASSEMBLY_USAGE_LOG_FLAGS_IL = 2, -} ASSEMBLY_USAGE_LOG_FLAGS; - -[ - local, - object, - uuid(ec2b5f70-d576-4d33-876f-6e3caeb0a7ba), - pointer_default(unique) -] -interface IAssemblyUsageLog : IUnknown -{ - HRESULT LogFile(LPCWSTR pwszILFile, LPCWSTR pwszNIFile, ASSEMBLY_USAGE_LOG_FLAGS flags); -}; - diff --git a/src/inc/assemblyusagelogmanager.h b/src/inc/assemblyusagelogmanager.h deleted file mode 100644 index 5fae606f56..0000000000 --- a/src/inc/assemblyusagelogmanager.h +++ /dev/null @@ -1,53 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// - -#ifndef ASSEMBLY_USAGE_LOG_MANAGER_H -#define ASSEMBLY_USAGE_LOG_MANAGER_H - -#include "assemblyusagelog.h" -#include "daccess.h" - -class AssemblyUsageLogManager -{ -public: - - class Config - { - public: - LPCWSTR wszLogDir; - unsigned int cLogBufferSize; -#ifdef FEATURE_APPX - unsigned int uiLogRefreshInterval; -#endif - }; - - enum GENERATE_LOG_FLAGS - { - GENERATE_LOG_FLAGS_NONE = 0, - }; - - // we depend on static PODs being initialized to 0 which is why ASSEMBLY_USAGE_LOG_FLAGS_NONE is 0 - enum ASSEMBLY_USAGE_LOG_FLAGS : DWORD - { - ASSEMBLY_USAGE_LOG_FLAGS_NONE = 0, - ASSEMBLY_USAGE_LOG_FLAGS_INITTED = 1, - ASSEMBLY_USAGE_LOG_FLAGS_APPLOCALNGENDISABLED = 2, - }; - - static HRESULT Init(const Config *pConfig); - static HRESULT GenerateLog(GENERATE_LOG_FLAGS flags); - static HRESULT GetUsageLogForContext(LPCWSTR binder, LPCWSTR binderParameter, IAssemblyUsageLog **ppUsageLog); - static HRESULT RegisterBinderWithUsageLog(UINT_PTR binderId, IAssemblyUsageLog *pUsageLog); - static HRESULT UnRegisterBinderFromUsageLog(UINT_PTR binderId); - static IAssemblyUsageLog *GetUsageLogForBinder(UINT_PTR binderId); - static ASSEMBLY_USAGE_LOG_FLAGS GetUsageLogFlags(); - static HRESULT SetUsageLogFlag(ASSEMBLY_USAGE_LOG_FLAGS flag, BOOL); - -private: - SVAL_DECL(ASSEMBLY_USAGE_LOG_FLAGS, s_UsageLogFlags); -}; - -#endif /* ASSEMBLY_USAGE_LOG_MANAGER_H */ - diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h index c28f01118c..2b8026e283 100644 --- a/src/inc/clrconfigvalues.h +++ b/src/inc/clrconfigvalues.h @@ -725,21 +725,8 @@ CONFIG_DWORD_INFO_EX(INTERNAL_NgenForceFailureCount, W("NgenForceFailureCount"), CONFIG_DWORD_INFO_EX(INTERNAL_NgenForceFailureKind, W("NgenForceFailureKind"), 1, "If set to 1, We will throw a TypeLoad exception; If set to 2, We will cause an A/V", CLRConfig::REGUTIL_default) RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_NGenEnableCreatePdb, W("NGenEnableCreatePdb"), 0, "If set to >0 ngen.exe displays help on, recognizes createpdb in the command line") RETAIL_CONFIG_DWORD_INFO(INTERNAL_NGenSimulateDiskFull, W("NGenSimulateDiskFull"), 0, "If set to 1, ngen will throw a Disk full exception in ZapWriter.cpp:Save()") -RETAIL_CONFIG_STRING_INFO(INTERNAL_NGenAssemblyUsageLog, W("NGenAssemblyUsageLog"), "Directory to store ngen usage logs in.") -#ifdef FEATURE_APPX -RETAIL_CONFIG_DWORD_INFO(INTERNAL_NGenAssemblyUsageLogRefreshInterval, W("NGenAssemblyUsageLogRefreshInterval"), 24 * 60 * 60, "Interval to update usage log timestamp (seconds)"); -#endif -RETAIL_CONFIG_DWORD_INFO(INTERNAL_AppLocalAutongenNGenDisabled, W("AppLocalAutongenNGenDisabled"), 0, "Autongen disable flag.") RETAIL_CONFIG_DWORD_INFO(INTERNAL_PartialNGen, W("PartialNGen"), -1, "Generate partial NGen images") RETAIL_CONFIG_DWORD_INFO(INTERNAL_NgenAllowMscorlibSoftbind, W("NgenAllowMscorlibSoftbind"), 0, "Disable forced hard-binding to mscorlib") -RETAIL_CONFIG_STRING_INFO_EX(UNSUPPORTED_RegistryRoot, W("RegistryRoot"), "Redirects all registry access under HKLM\Software to a specified alternative", CLRConfig::REGUTIL_default) -RETAIL_CONFIG_STRING_INFO_EX(UNSUPPORTED_AssemblyPath, W("AssemblyPath"), "Redirects v2 GAC access to a specified alternative path", CLRConfig::REGUTIL_default) -RETAIL_CONFIG_STRING_INFO_EX(UNSUPPORTED_AssemblyPath2, W("AssemblyPath2"), "Redirects v4 GAC access to a specified alternative path", CLRConfig::REGUTIL_default) -RETAIL_CONFIG_STRING_INFO_EX(UNSUPPORTED_NicPath, W("NicPath"), "Redirects NIC access to a specified alternative", CLRConfig::REGUTIL_default) -RETAIL_CONFIG_DWORD_INFO(INTERNAL_NGenTaskDelayStart, W("NGenTaskDelayStart"), 0, "Use NGen Task delay start trigger, instead of critical idle task") - -// Flag for cross-platform ngen: Removes all execution of managed or third-party code in the ngen compilation process. -RETAIL_CONFIG_DWORD_INFO(INTERNAL_Ningen, W("Ningen"), 1, "Enable no-impact ngen") CONFIG_DWORD_INFO(INTERNAL_NoASLRForNgen, W("NoASLRForNgen"), 0, "Turn off IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE bit in generated ngen images. Makes nidump output repeatable from run to run.") RETAIL_CONFIG_DWORD_INFO_EX(EXTERNAL_NgenAllowOutput, W("NgenAllowOutput"), 0, "If set to 1, the NGEN worker will bind to the parent console, thus allowing stdout output to work", CLRConfig::REGUTIL_default) diff --git a/src/inc/compatibilityflags.h b/src/inc/compatibilityflags.h deleted file mode 100644 index c52e6084f3..0000000000 --- a/src/inc/compatibilityflags.h +++ /dev/null @@ -1,17 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -// Unmanaged enum with compatibility flags. See compatibilityflagsdef.h for more details. - - -#ifndef __COMPATIBILITYFLAGS_H__ -#define __COMPATIBILITYFLAGS_H__ - -enum CompatibilityFlag { -#define COMPATFLAGDEF(name) compat##name, -#include "compatibilityflagsdef.h" - compatCount, -}; - -#endif // __COMPATIBILITYFLAGS_H__ diff --git a/src/inc/compatibilityflagsdef.h b/src/inc/compatibilityflagsdef.h deleted file mode 100644 index 611a043f2c..0000000000 --- a/src/inc/compatibilityflagsdef.h +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -// This file contains list of the CLR compatibility flags. The compatibility flags -// are used to mitigate breaking changes in the platform code. They are used to trigger the legacy -// behavior. - -// The general usage pattern is: - -// if (GetCompatibilityFlag(CompatibilityFlag.Foo)) { -// // the legacy behavior -// } -// else { -// // the new behavior -// } - -// Add your own compatibility flags to the end of the list. You should go through the breaking -// change approval process before adding it. -// -// Do not remove definitions for deprecated compatibility flags. Once the value is -// assigned to the compatibility flag, it has to be kept forever. - -// This file is compiled twice: once to generate managed enum in clr\src\bcl, and second time -// to generate the unmanaged enum in clr\src\vm. - - -#ifndef COMPATFLAGDEF -#error You must define COMPATFLAGDEF macro before including compatibilityflagsdef.h -#endif - -COMPATFLAGDEF(SwallowUnhandledExceptions) // Legacy exception handling policy - swallow unhandled exceptions - -COMPATFLAGDEF(NullReferenceExceptionOnAV) // Legacy null reference exception policy - throw NullReferenceExceptions for access violations - -COMPATFLAGDEF(EagerlyGenerateRandomAsymmKeys) // Legacy mode for DSACryptoServiceProvider/RSACryptoServiceProvider - create a random key in the constructor eagerly - -COMPATFLAGDEF(FullTrustListAssembliesInGac) // Legacy mode for not requiring FT list assemblies to be in the GAC - if set, the requirement to be in the GAC would not be enforced. - -COMPATFLAGDEF(DateTimeParseIgnorePunctuation) // Through to V1.1, DateTime parse would ignore any unrecognized punctuation. - // This flag restores that behavior. - -COMPATFLAGDEF(OnlyGACDomainNeutral) // This allows late setting of app domain security and - // assembly evidence, even when LoaderOptimization=MultiDomain - -COMPATFLAGDEF(DisableReplacementCustomCulture) // This allow disabling replacement custom cultures. will always get the shipped framework culture. - -#undef COMPATFLAGDEF diff --git a/src/inc/mscorcfg.h b/src/inc/mscorcfg.h deleted file mode 100644 index c90cfe8b0a..0000000000 --- a/src/inc/mscorcfg.h +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/***************************************************************************** - ** ** - ** Cor.h - general header for the Runtime. ** - ** ** - *****************************************************************************/ - - -#ifndef _MSCORCFG_H_ -#define _MSCORCFG_H_ -#include <ole2.h> // Definitions of OLE types. -#include <xmlparser.h> -#include <specstrings.h> - -#ifdef __cplusplus -extern "C" { -#endif - -// ----------------------------------------------------------------------- -// Returns an XMLParsr object. This can be used to parse any XML file. -STDAPI GetXMLElementAttribute(LPCWSTR pwszAttributeName, __out_ecount(cchBuffer) LPWSTR pbuffer, DWORD cchBuffer, DWORD* dwLen); -STDAPI GetXMLElement(LPCWSTR wszFileName, LPCWSTR pwszTag); - -STDAPI GetXMLObject(IXMLParser **ppv); -STDAPI CreateConfigStream(LPCWSTR pszFileName, IStream** ppStream); - -#ifdef __cplusplus -} -#endif // __cplusplus - -#endif diff --git a/src/inc/winsqmevents.h b/src/inc/winsqmevents.h deleted file mode 100644 index 2394c84a8a..0000000000 --- a/src/inc/winsqmevents.h +++ /dev/null @@ -1,84 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//**********************************************************************` -//* This is an include file generated by Message Compiler. *` -//* *` - -//**********************************************************************` -#pragma once -//+ -// Provider Microsoft-Windows-CEIP Event Count 7 -//+ -EXTERN_C __declspec(selectany) const GUID S_Microsoft_Windows_CEIP = {0xa402fe09, 0xda6e, 0x45f2, {0x82, 0xaf, 0x3c, 0xb3, 0x71, 0x70, 0xee, 0x0c}}; - -// -// Event Descriptors -// -#define WSQMCONS_CONSOLIDATION_SUCCESS 0x400003EDL -#define WSQMCONS_CONSOLIDATION_ERROR 0xC00003EEL -#define WSQMCONS_UPLOAD_SUCCESS 0x400003EFL -#define WSQMCONS_UPLOAD_ERROR 0xC00003F0L -#define WSQMCONS_NOTIFY_SUCCESS 0x400003F1L -#define WSQMCONS_NOTIFY_ERROR 0xC00003F2L -#define WSQMCONS_MANIFEST_DOWNLOAD 0xC00003F3L -//+ -// Provider Microsoft-Windows-SQM-Events Event Count 26 -//+ -EXTERN_C __declspec(selectany) const GUID Microsoft_Windows_SQM_Provider = {0xa97524f6, 0x064c, 0x4c4e, {0xb7, 0x4b, 0x1a, 0xcc, 0x87, 0xc3, 0x70, 0x0d}}; - -// -// Event Descriptors -// -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR Microsoft_Windows_SQM_Provider_EVENT_0x3_0_0_4_0_0_8000000000000 = {0x3, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define Microsoft_Windows_SQM_Provider_EVENT_0x3_0_0_4_0_0_8000000000000_value 0x3 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR Microsoft_Windows_SQM_Provider_EVENT_0x4_0_0_4_0_0_8000000000000 = {0x4, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define Microsoft_Windows_SQM_Provider_EVENT_0x4_0_0_4_0_0_8000000000000_value 0x4 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SET_DWORD_V0 = {0x5, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SET_DWORD_V0_value 0x5 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_INCREMENT_DWORD_V0 = {0x6, 0x0, 0x0, 0x4, 0x2, 0x0, 0x8000000000000}; -#define SQM_INCREMENT_DWORD_V0_value 0x6 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_ADDTOAVERAGE_DWORD_V0 = {0x7, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_ADDTOAVERAGE_DWORD_V0_value 0x7 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SETIFMAX_DWORD_V0 = {0x8, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SETIFMAX_DWORD_V0_value 0x8 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SETIFMIN_DWORD_V0 = {0x9, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SETIFMIN_DWORD_V0_value 0x9 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR Microsoft_Windows_SQM_Provider_EVENT_0xb_0_0_4_0_0_8000000000000 = {0xb, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define Microsoft_Windows_SQM_Provider_EVENT_0xb_0_0_4_0_0_8000000000000_value 0xb -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_INIT = {0x1, 0x0, 0x0, 0x4, 0x1, 0x0, 0x8000000000000}; -#define SQM_INIT_value 0x1 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_CLEANUP = {0x2, 0x0, 0x0, 0x4, 0x2, 0x0, 0x8000000000000}; -#define SQM_CLEANUP_value 0x2 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_START_SESSION = {0x3, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_START_SESSION_value 0x3 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_END_SESSION = {0x4, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_END_SESSION_value 0x4 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SET_DWORD = {0x5, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SET_DWORD_value 0x5 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_INCREMENT_DWORD = {0x6, 0x1, 0x0, 0x4, 0x2, 0x0, 0x8000000000000}; -#define SQM_INCREMENT_DWORD_value 0x6 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_ADDTOAVERAGE_DWORD = {0x7, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_ADDTOAVERAGE_DWORD_value 0x7 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SETIFMAX_DWORD = {0x8, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SETIFMAX_DWORD_value 0x8 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SETIFMIN_DWORD = {0x9, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SETIFMIN_DWORD_value 0x9 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SET_STRING = {0xa, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SET_STRING_value 0xa -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_ADD_LEGACYSTREAMROW = {0xb, 0x1, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_ADD_LEGACYSTREAMROW_value 0xb -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_LOGON_USER = {0xc, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_LOGON_USER_value 0xc -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_LOGOFF_USER = {0xd, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_LOGOFF_USER_value 0xd -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_OPTIN_NOTIFICATION_SHOWN = {0xe, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_OPTIN_NOTIFICATION_SHOWN_value 0xe -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_OPTIN_NOTIFICATION_RESPONSE = {0xf, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_OPTIN_NOTIFICATION_RESPONSE_value 0xf -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_SET_DWORD64 = {0x10, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_SET_DWORD64_value 0x10 -EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR SQM_ADD_STREAMROW = {0x11, 0x0, 0x0, 0x4, 0x0, 0x0, 0x8000000000000}; -#define SQM_ADD_STREAMROW_value 0x11 -#define MSG_event_CEIP_EVENT_SOURCE 0x90000001L diff --git a/src/inc/xmlparser.h b/src/inc/xmlparser.h deleted file mode 100644 index 70bf380e58..0000000000 --- a/src/inc/xmlparser.h +++ /dev/null @@ -1,1385 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - - -#ifdef _MSC_VER -#pragma warning( disable: 4049 ) /* more than 64k source lines */ -#endif - -/* this ALWAYS GENERATED file contains the definitions for the interfaces */ - - - /* File created by MIDL compiler version 6.00.0328 */ -/* Compiler settings for xmlparser.idl: - Oicf (OptLev=i2), W1, Zp8, env=Win32 (32b run) - protocol : dce , ms_ext, c_ext - error checks: allocation ref bounds_check enum stub_data - VC __declspec() decoration level: - __declspec(uuid()), __declspec(selectany), __declspec(novtable) - DECLSPEC_UUID(), MIDL_INTERFACE() -*/ -//@@MIDL_FILE_HEADING( ) - - -/* verify that the <rpcndr.h> version is high enough to compile this file*/ -#ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 440 -#endif - -#include "rpc.h" -#include "rpcndr.h" - -#ifndef __xmlparser_h__ -#define __xmlparser_h__ - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) -#pragma once -#endif - -/* Forward Declarations */ - -#ifndef __IXMLNodeSource_FWD_DEFINED__ -#define __IXMLNodeSource_FWD_DEFINED__ -typedef interface IXMLNodeSource IXMLNodeSource; -#endif /* __IXMLNodeSource_FWD_DEFINED__ */ - - -#ifndef __IXMLParser_FWD_DEFINED__ -#define __IXMLParser_FWD_DEFINED__ -typedef interface IXMLParser IXMLParser; -#endif /* __IXMLParser_FWD_DEFINED__ */ - - -#ifndef __IXMLNodeFactory_FWD_DEFINED__ -#define __IXMLNodeFactory_FWD_DEFINED__ -typedef interface IXMLNodeFactory IXMLNodeFactory; -#endif /* __IXMLNodeFactory_FWD_DEFINED__ */ - - -#ifndef __XMLParser_FWD_DEFINED__ -#define __XMLParser_FWD_DEFINED__ - -#ifdef __cplusplus -typedef class XMLParser XMLParser; -#else -typedef struct XMLParser XMLParser; -#endif /* __cplusplus */ - -#endif /* __XMLParser_FWD_DEFINED__ */ - - -/* header files for imported files */ -#include "unknwn.h" -#include "objidl.h" -#include "oaidl.h" - -#ifdef __cplusplus -extern "C"{ -#endif - -void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void __RPC_FAR * ); - -/* interface __MIDL_itf_xmlparser_0000 */ -/* [local] */ - -typedef /* [public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0001 - { XML_ELEMENT = 1, - XML_ATTRIBUTE = XML_ELEMENT + 1, - XML_PI = XML_ATTRIBUTE + 1, - XML_XMLDECL = XML_PI + 1, - XML_DOCTYPE = XML_XMLDECL + 1, - XML_DTDATTRIBUTE = XML_DOCTYPE + 1, - XML_ENTITYDECL = XML_DTDATTRIBUTE + 1, - XML_ELEMENTDECL = XML_ENTITYDECL + 1, - XML_ATTLISTDECL = XML_ELEMENTDECL + 1, - XML_NOTATION = XML_ATTLISTDECL + 1, - XML_GROUP = XML_NOTATION + 1, - XML_INCLUDESECT = XML_GROUP + 1, - XML_PCDATA = XML_INCLUDESECT + 1, - XML_CDATA = XML_PCDATA + 1, - XML_IGNORESECT = XML_CDATA + 1, - XML_COMMENT = XML_IGNORESECT + 1, - XML_ENTITYREF = XML_COMMENT + 1, - XML_WHITESPACE = XML_ENTITYREF + 1, - XML_NAME = XML_WHITESPACE + 1, - XML_NMTOKEN = XML_NAME + 1, - XML_STRING = XML_NMTOKEN + 1, - XML_PEREF = XML_STRING + 1, - XML_MODEL = XML_PEREF + 1, - XML_ATTDEF = XML_MODEL + 1, - XML_ATTTYPE = XML_ATTDEF + 1, - XML_ATTPRESENCE = XML_ATTTYPE + 1, - XML_DTDSUBSET = XML_ATTPRESENCE + 1, - XML_LASTNODETYPE = XML_DTDSUBSET + 1 - } XML_NODE_TYPE; - -typedef /* [public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0002 - { XML_VERSION = XML_LASTNODETYPE, - XML_ENCODING = XML_VERSION + 1, - XML_STANDALONE = XML_ENCODING + 1, - XML_NS = XML_STANDALONE + 1, - XML_XMLSPACE = XML_NS + 1, - XML_XMLLANG = XML_XMLSPACE + 1, - XML_SYSTEM = XML_XMLLANG + 1, - XML_PUBLIC = XML_SYSTEM + 1, - XML_NDATA = XML_PUBLIC + 1, - XML_AT_CDATA = XML_NDATA + 1, - XML_AT_ID = XML_AT_CDATA + 1, - XML_AT_IDREF = XML_AT_ID + 1, - XML_AT_IDREFS = XML_AT_IDREF + 1, - XML_AT_ENTITY = XML_AT_IDREFS + 1, - XML_AT_ENTITIES = XML_AT_ENTITY + 1, - XML_AT_NMTOKEN = XML_AT_ENTITIES + 1, - XML_AT_NMTOKENS = XML_AT_NMTOKEN + 1, - XML_AT_NOTATION = XML_AT_NMTOKENS + 1, - XML_AT_REQUIRED = XML_AT_NOTATION + 1, - XML_AT_IMPLIED = XML_AT_REQUIRED + 1, - XML_AT_FIXED = XML_AT_IMPLIED + 1, - XML_PENTITYDECL = XML_AT_FIXED + 1, - XML_EMPTY = XML_PENTITYDECL + 1, - XML_ANY = XML_EMPTY + 1, - XML_MIXED = XML_ANY + 1, - XML_SEQUENCE = XML_MIXED + 1, - XML_CHOICE = XML_SEQUENCE + 1, - XML_STAR = XML_CHOICE + 1, - XML_PLUS = XML_STAR + 1, - XML_QUESTIONMARK = XML_PLUS + 1, - XML_LASTSUBNODETYPE = XML_QUESTIONMARK + 1 - } XML_NODE_SUBTYPE; - -typedef /* [public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0003 - { XML_E_PARSEERRORBASE = 0xc00ce500L, - XML_E_ENDOFINPUT = XML_E_PARSEERRORBASE, - XML_E_MISSINGEQUALS = XML_E_ENDOFINPUT + 1, - XML_E_MISSINGQUOTE = XML_E_MISSINGEQUALS + 1, - XML_E_COMMENTSYNTAX = XML_E_MISSINGQUOTE + 1, - XML_E_BADSTARTNAMECHAR = XML_E_COMMENTSYNTAX + 1, - XML_E_BADNAMECHAR = XML_E_BADSTARTNAMECHAR + 1, - XML_E_BADCHARINSTRING = XML_E_BADNAMECHAR + 1, - XML_E_XMLDECLSYNTAX = XML_E_BADCHARINSTRING + 1, - XML_E_BADCHARDATA = XML_E_XMLDECLSYNTAX + 1, - XML_E_MISSINGWHITESPACE = XML_E_BADCHARDATA + 1, - XML_E_EXPECTINGTAGEND = XML_E_MISSINGWHITESPACE + 1, - XML_E_BADCHARINDTD = XML_E_EXPECTINGTAGEND + 1, - XML_E_BADCHARINDECL = XML_E_BADCHARINDTD + 1, - XML_E_MISSINGSEMICOLON = XML_E_BADCHARINDECL + 1, - XML_E_BADCHARINENTREF = XML_E_MISSINGSEMICOLON + 1, - XML_E_UNBALANCEDPAREN = XML_E_BADCHARINENTREF + 1, - XML_E_EXPECTINGOPENBRACKET = XML_E_UNBALANCEDPAREN + 1, - XML_E_BADENDCONDSECT = XML_E_EXPECTINGOPENBRACKET + 1, - XML_E_INTERNALERROR = XML_E_BADENDCONDSECT + 1, - XML_E_UNEXPECTED_WHITESPACE = XML_E_INTERNALERROR + 1, - XML_E_INCOMPLETE_ENCODING = XML_E_UNEXPECTED_WHITESPACE + 1, - XML_E_BADCHARINMIXEDMODEL = XML_E_INCOMPLETE_ENCODING + 1, - XML_E_MISSING_STAR = XML_E_BADCHARINMIXEDMODEL + 1, - XML_E_BADCHARINMODEL = XML_E_MISSING_STAR + 1, - XML_E_MISSING_PAREN = XML_E_BADCHARINMODEL + 1, - XML_E_BADCHARINENUMERATION = XML_E_MISSING_PAREN + 1, - XML_E_PIDECLSYNTAX = XML_E_BADCHARINENUMERATION + 1, - XML_E_EXPECTINGCLOSEQUOTE = XML_E_PIDECLSYNTAX + 1, - XML_E_MULTIPLE_COLONS = XML_E_EXPECTINGCLOSEQUOTE + 1, - XML_E_INVALID_DECIMAL = XML_E_MULTIPLE_COLONS + 1, - XML_E_INVALID_HEXIDECIMAL = XML_E_INVALID_DECIMAL + 1, - XML_E_INVALID_UNICODE = XML_E_INVALID_HEXIDECIMAL + 1, - XML_E_WHITESPACEORQUESTIONMARK = XML_E_INVALID_UNICODE + 1, - XML_E_TOKEN_ERROR = XML_E_PARSEERRORBASE + 0x50, - XML_E_SUSPENDED = XML_E_TOKEN_ERROR, - XML_E_STOPPED = XML_E_SUSPENDED + 1, - XML_E_UNEXPECTEDENDTAG = XML_E_STOPPED + 1, - XML_E_UNCLOSEDTAG = XML_E_UNEXPECTEDENDTAG + 1, - XML_E_DUPLICATEATTRIBUTE = XML_E_UNCLOSEDTAG + 1, - XML_E_MULTIPLEROOTS = XML_E_DUPLICATEATTRIBUTE + 1, - XML_E_INVALIDATROOTLEVEL = XML_E_MULTIPLEROOTS + 1, - XML_E_BADXMLDECL = XML_E_INVALIDATROOTLEVEL + 1, - XML_E_MISSINGROOT = XML_E_BADXMLDECL + 1, - XML_E_UNEXPECTEDEOF = XML_E_MISSINGROOT + 1, - XML_E_BADPEREFINSUBSET = XML_E_UNEXPECTEDEOF + 1, - XML_E_PE_NESTING = XML_E_BADPEREFINSUBSET + 1, - XML_E_INVALID_CDATACLOSINGTAG = XML_E_PE_NESTING + 1, - XML_E_UNCLOSEDPI = XML_E_INVALID_CDATACLOSINGTAG + 1, - XML_E_UNCLOSEDSTARTTAG = XML_E_UNCLOSEDPI + 1, - XML_E_UNCLOSEDENDTAG = XML_E_UNCLOSEDSTARTTAG + 1, - XML_E_UNCLOSEDSTRING = XML_E_UNCLOSEDENDTAG + 1, - XML_E_UNCLOSEDCOMMENT = XML_E_UNCLOSEDSTRING + 1, - XML_E_UNCLOSEDDECL = XML_E_UNCLOSEDCOMMENT + 1, - XML_E_UNCLOSEDMARKUPDECL = XML_E_UNCLOSEDDECL + 1, - XML_E_UNCLOSEDCDATA = XML_E_UNCLOSEDMARKUPDECL + 1, - XML_E_BADDECLNAME = XML_E_UNCLOSEDCDATA + 1, - XML_E_BADEXTERNALID = XML_E_BADDECLNAME + 1, - XML_E_BADELEMENTINDTD = XML_E_BADEXTERNALID + 1, - XML_E_RESERVEDNAMESPACE = XML_E_BADELEMENTINDTD + 1, - XML_E_EXPECTING_VERSION = XML_E_RESERVEDNAMESPACE + 1, - XML_E_EXPECTING_ENCODING = XML_E_EXPECTING_VERSION + 1, - XML_E_EXPECTING_NAME = XML_E_EXPECTING_ENCODING + 1, - XML_E_UNEXPECTED_ATTRIBUTE = XML_E_EXPECTING_NAME + 1, - XML_E_ENDTAGMISMATCH = XML_E_UNEXPECTED_ATTRIBUTE + 1, - XML_E_INVALIDENCODING = XML_E_ENDTAGMISMATCH + 1, - XML_E_INVALIDSWITCH = XML_E_INVALIDENCODING + 1, - XML_E_EXPECTING_NDATA = XML_E_INVALIDSWITCH + 1, - XML_E_INVALID_MODEL = XML_E_EXPECTING_NDATA + 1, - XML_E_INVALID_TYPE = XML_E_INVALID_MODEL + 1, - XML_E_INVALIDXMLSPACE = XML_E_INVALID_TYPE + 1, - XML_E_MULTI_ATTR_VALUE = XML_E_INVALIDXMLSPACE + 1, - XML_E_INVALID_PRESENCE = XML_E_MULTI_ATTR_VALUE + 1, - XML_E_BADXMLCASE = XML_E_INVALID_PRESENCE + 1, - XML_E_CONDSECTINSUBSET = XML_E_BADXMLCASE + 1, - XML_E_CDATAINVALID = XML_E_CONDSECTINSUBSET + 1, - XML_E_INVALID_STANDALONE = XML_E_CDATAINVALID + 1, - XML_E_UNEXPECTED_STANDALONE = XML_E_INVALID_STANDALONE + 1, - XML_E_DOCTYPE_IN_DTD = XML_E_UNEXPECTED_STANDALONE + 1, - XML_E_MISSING_ENTITY = XML_E_DOCTYPE_IN_DTD + 1, - XML_E_ENTITYREF_INNAME = XML_E_MISSING_ENTITY + 1, - XML_E_DOCTYPE_OUTSIDE_PROLOG = XML_E_ENTITYREF_INNAME + 1, - XML_E_INVALID_VERSION = XML_E_DOCTYPE_OUTSIDE_PROLOG + 1, - XML_E_DTDELEMENT_OUTSIDE_DTD = XML_E_INVALID_VERSION + 1, - XML_E_DUPLICATEDOCTYPE = XML_E_DTDELEMENT_OUTSIDE_DTD + 1, - XML_E_RESOURCE = XML_E_DUPLICATEDOCTYPE + 1, - XML_E_LASTERROR = XML_E_RESOURCE + 1 - } XML_ERROR_CODE; - -typedef /* [public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0004 - { XMLPARSER_IDLE = 0, - XMLPARSER_WAITING = XMLPARSER_IDLE + 1, - XMLPARSER_BUSY = XMLPARSER_WAITING + 1, - XMLPARSER_ERROR = XMLPARSER_BUSY + 1, - XMLPARSER_STOPPED = XMLPARSER_ERROR + 1, - XMLPARSER_SUSPENDED = XMLPARSER_STOPPED + 1 - } XML_PARSER_STATE; - -typedef /* [public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0005 - { XMLFLAG_FLOATINGAMP = 1, - XMLFLAG_SHORTENDTAGS = 2, - XMLFLAG_CASEINSENSITIVE = 4, - XMLFLAG_NONAMESPACES = 8, - XMLFLAG_NOWHITESPACE = 16, - XMLFLAG_IE4QUIRKS = 32, - XMLFLAG_NODTDNODES = 64, - XMLFLAG_IE4COMPATIBILITY = 255 - } XML_PARSER_FLAGS; - -typedef /* [public][public] */ -enum __MIDL___MIDL_itf_xmlparser_0000_0006 - { XMLNF_STARTDOCUMENT = 0, - XMLNF_STARTDTD = XMLNF_STARTDOCUMENT + 1, - XMLNF_ENDDTD = XMLNF_STARTDTD + 1, - XMLNF_STARTDTDSUBSET = XMLNF_ENDDTD + 1, - XMLNF_ENDDTDSUBSET = XMLNF_STARTDTDSUBSET + 1, - XMLNF_ENDPROLOG = XMLNF_ENDDTDSUBSET + 1, - XMLNF_STARTENTITY = XMLNF_ENDPROLOG + 1, - XMLNF_ENDENTITY = XMLNF_STARTENTITY + 1, - XMLNF_ENDDOCUMENT = XMLNF_ENDENTITY + 1, - XMLNF_DATAAVAILABLE = XMLNF_ENDDOCUMENT + 1, - XMLNF_LASTEVENT = XMLNF_DATAAVAILABLE - } XML_NODEFACTORY_EVENT; - -typedef struct _XML_NODE_INFO - { - DWORD dwSize; - DWORD dwType; - DWORD dwSubType; - BOOL fTerminal; - const WCHAR __RPC_FAR *pwcText; - ULONG ulLen; - ULONG ulNsPrefixLen; - PVOID pNode; - PVOID pReserved; - } XML_NODE_INFO; - - - -extern RPC_IF_HANDLE __MIDL_itf_xmlparser_0000_v0_0_c_ifspec; -extern RPC_IF_HANDLE __MIDL_itf_xmlparser_0000_v0_0_s_ifspec; - - -#ifndef __XMLPSR_LIBRARY_DEFINED__ -#define __XMLPSR_LIBRARY_DEFINED__ - -/* library XMLPSR */ -/* [version][lcid][helpstring][uuid] */ - - -EXTERN_C const IID LIBID_XMLPSR; - -#ifndef __IXMLNodeSource_INTERFACE_DEFINED__ -#define __IXMLNodeSource_INTERFACE_DEFINED__ - -/* interface IXMLNodeSource */ -/* [unique][helpstring][uuid][local][object] */ - - -EXTERN_C const IID IID_IXMLNodeSource; - -#if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("d242361d-51a0-11d2-9caf-0060b0ec3d39") - IXMLNodeSource : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE SetFactory( - /* [in] */ IXMLNodeFactory __RPC_FAR *pNodeFactory) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFactory( - /* [out] */ IXMLNodeFactory __RPC_FAR *__RPC_FAR *ppNodeFactory) = 0; - - virtual HRESULT STDMETHODCALLTYPE Abort( - /* [in] */ BSTR bstrErrorInfo) = 0; - - virtual ULONG STDMETHODCALLTYPE GetLineNumber( void) = 0; - - virtual ULONG STDMETHODCALLTYPE GetLinePosition( void) = 0; - - virtual ULONG STDMETHODCALLTYPE GetAbsolutePosition( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetLineBuffer( - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf, - /* [out] */ ULONG __RPC_FAR *pulLen, - /* [out] */ ULONG __RPC_FAR *pulStartPos) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetLastError( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetErrorInfo( - /* [out] */ BSTR __RPC_FAR *pbstrErrorInfo) = 0; - - virtual ULONG STDMETHODCALLTYPE GetFlags( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetURL( - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf) = 0; - - }; - -#else /* C style interface */ - - typedef struct IXMLNodeSourceVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - IXMLNodeSource __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - IXMLNodeSource __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - IXMLNodeSource __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetFactory )( - IXMLNodeSource __RPC_FAR * This, - /* [in] */ IXMLNodeFactory __RPC_FAR *pNodeFactory); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetFactory )( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ IXMLNodeFactory __RPC_FAR *__RPC_FAR *ppNodeFactory); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Abort )( - IXMLNodeSource __RPC_FAR * This, - /* [in] */ BSTR bstrErrorInfo); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetLineNumber )( - IXMLNodeSource __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetLinePosition )( - IXMLNodeSource __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetAbsolutePosition )( - IXMLNodeSource __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLineBuffer )( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf, - /* [out] */ ULONG __RPC_FAR *pulLen, - /* [out] */ ULONG __RPC_FAR *pulStartPos); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLastError )( - IXMLNodeSource __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetErrorInfo )( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ BSTR __RPC_FAR *pbstrErrorInfo); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetFlags )( - IXMLNodeSource __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetURL )( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf); - - END_INTERFACE - } IXMLNodeSourceVtbl; - - interface IXMLNodeSource - { - CONST_VTBL struct IXMLNodeSourceVtbl __RPC_FAR *lpVtbl; - }; - - - -#ifdef COBJMACROS - - -#define IXMLNodeSource_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - -#define IXMLNodeSource_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - -#define IXMLNodeSource_Release(This) \ - (This)->lpVtbl -> Release(This) - - -#define IXMLNodeSource_SetFactory(This,pNodeFactory) \ - (This)->lpVtbl -> SetFactory(This,pNodeFactory) - -#define IXMLNodeSource_GetFactory(This,ppNodeFactory) \ - (This)->lpVtbl -> GetFactory(This,ppNodeFactory) - -#define IXMLNodeSource_Abort(This,bstrErrorInfo) \ - (This)->lpVtbl -> Abort(This,bstrErrorInfo) - -#define IXMLNodeSource_GetLineNumber(This) \ - (This)->lpVtbl -> GetLineNumber(This) - -#define IXMLNodeSource_GetLinePosition(This) \ - (This)->lpVtbl -> GetLinePosition(This) - -#define IXMLNodeSource_GetAbsolutePosition(This) \ - (This)->lpVtbl -> GetAbsolutePosition(This) - -#define IXMLNodeSource_GetLineBuffer(This,ppwcBuf,pulLen,pulStartPos) \ - (This)->lpVtbl -> GetLineBuffer(This,ppwcBuf,pulLen,pulStartPos) - -#define IXMLNodeSource_GetLastError(This) \ - (This)->lpVtbl -> GetLastError(This) - -#define IXMLNodeSource_GetErrorInfo(This,pbstrErrorInfo) \ - (This)->lpVtbl -> GetErrorInfo(This,pbstrErrorInfo) - -#define IXMLNodeSource_GetFlags(This) \ - (This)->lpVtbl -> GetFlags(This) - -#define IXMLNodeSource_GetURL(This,ppwcBuf) \ - (This)->lpVtbl -> GetURL(This,ppwcBuf) - -#endif /* COBJMACROS */ - - -#endif /* C style interface */ - - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_SetFactory_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [in] */ IXMLNodeFactory __RPC_FAR *pNodeFactory); - - -void __RPC_STUB IXMLNodeSource_SetFactory_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_GetFactory_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ IXMLNodeFactory __RPC_FAR *__RPC_FAR *ppNodeFactory); - - -void __RPC_STUB IXMLNodeSource_GetFactory_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_Abort_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [in] */ BSTR bstrErrorInfo); - - -void __RPC_STUB IXMLNodeSource_Abort_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -ULONG STDMETHODCALLTYPE IXMLNodeSource_GetLineNumber_Proxy( - IXMLNodeSource __RPC_FAR * This); - - -void __RPC_STUB IXMLNodeSource_GetLineNumber_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -ULONG STDMETHODCALLTYPE IXMLNodeSource_GetLinePosition_Proxy( - IXMLNodeSource __RPC_FAR * This); - - -void __RPC_STUB IXMLNodeSource_GetLinePosition_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -ULONG STDMETHODCALLTYPE IXMLNodeSource_GetAbsolutePosition_Proxy( - IXMLNodeSource __RPC_FAR * This); - - -void __RPC_STUB IXMLNodeSource_GetAbsolutePosition_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_GetLineBuffer_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf, - /* [out] */ ULONG __RPC_FAR *pulLen, - /* [out] */ ULONG __RPC_FAR *pulStartPos); - - -void __RPC_STUB IXMLNodeSource_GetLineBuffer_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_GetLastError_Proxy( - IXMLNodeSource __RPC_FAR * This); - - -void __RPC_STUB IXMLNodeSource_GetLastError_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_GetErrorInfo_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ BSTR __RPC_FAR *pbstrErrorInfo); - - -void __RPC_STUB IXMLNodeSource_GetErrorInfo_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -ULONG STDMETHODCALLTYPE IXMLNodeSource_GetFlags_Proxy( - IXMLNodeSource __RPC_FAR * This); - - -void __RPC_STUB IXMLNodeSource_GetFlags_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeSource_GetURL_Proxy( - IXMLNodeSource __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf); - - -void __RPC_STUB IXMLNodeSource_GetURL_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - -#endif /* __IXMLNodeSource_INTERFACE_DEFINED__ */ - - -#ifndef __IXMLParser_INTERFACE_DEFINED__ -#define __IXMLParser_INTERFACE_DEFINED__ - -/* interface IXMLParser */ -/* [unique][helpstring][uuid][local][object] */ - - -EXTERN_C const IID IID_IXMLParser; - -#if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("d242361e-51a0-11d2-9caf-0060b0ec3d39") - IXMLParser : public IXMLNodeSource - { - public: - virtual HRESULT STDMETHODCALLTYPE SetURL( - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fAsync) = 0; - - virtual HRESULT STDMETHODCALLTYPE Load( - /* [in] */ BOOL fFullyAvailable, - /* [in] */ IMoniker __RPC_FAR *pimkName, - /* [in] */ LPBC pibc, - /* [in] */ DWORD grfMode) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetInput( - /* [in] */ IUnknown __RPC_FAR *pStm) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushData( - /* [in] */ const char __RPC_FAR *pData, - /* [in] */ ULONG ulChars, - /* [in] */ BOOL fLastBuffer) = 0; - - virtual HRESULT STDMETHODCALLTYPE LoadDTD( - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl) = 0; - - virtual HRESULT STDMETHODCALLTYPE LoadEntity( - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fpe) = 0; - - virtual HRESULT STDMETHODCALLTYPE ParseEntity( - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen, - /* [in] */ BOOL fpe) = 0; - - virtual HRESULT STDMETHODCALLTYPE ExpandEntity( - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetRoot( - /* [in] */ PVOID pRoot) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRoot( - /* [in] */ PVOID __RPC_FAR *ppRoot) = 0; - - virtual HRESULT STDMETHODCALLTYPE Run( - /* [in] */ long lChars) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetParserState( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Suspend( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFlags( - /* [in] */ ULONG iFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSecureBaseURL( - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSecureBaseURL( - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf) = 0; - - }; - -#else /* C style interface */ - - typedef struct IXMLParserVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - IXMLParser __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - IXMLParser __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetFactory )( - IXMLParser __RPC_FAR * This, - /* [in] */ IXMLNodeFactory __RPC_FAR *pNodeFactory); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetFactory )( - IXMLParser __RPC_FAR * This, - /* [out] */ IXMLNodeFactory __RPC_FAR *__RPC_FAR *ppNodeFactory); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Abort )( - IXMLParser __RPC_FAR * This, - /* [in] */ BSTR bstrErrorInfo); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetLineNumber )( - IXMLParser __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetLinePosition )( - IXMLParser __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetAbsolutePosition )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLineBuffer )( - IXMLParser __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf, - /* [out] */ ULONG __RPC_FAR *pulLen, - /* [out] */ ULONG __RPC_FAR *pulStartPos); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLastError )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetErrorInfo )( - IXMLParser __RPC_FAR * This, - /* [out] */ BSTR __RPC_FAR *pbstrErrorInfo); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *GetFlags )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetURL )( - IXMLParser __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetURL )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fAsync); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Load )( - IXMLParser __RPC_FAR * This, - /* [in] */ BOOL fFullyAvailable, - /* [in] */ IMoniker __RPC_FAR *pimkName, - /* [in] */ LPBC pibc, - /* [in] */ DWORD grfMode); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetInput )( - IXMLParser __RPC_FAR * This, - /* [in] */ IUnknown __RPC_FAR *pStm); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PushData )( - IXMLParser __RPC_FAR * This, - /* [in] */ const char __RPC_FAR *pData, - /* [in] */ ULONG ulChars, - /* [in] */ BOOL fLastBuffer); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *LoadDTD )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *LoadEntity )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fpe); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *ParseEntity )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen, - /* [in] */ BOOL fpe); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *ExpandEntity )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetRoot )( - IXMLParser __RPC_FAR * This, - /* [in] */ PVOID pRoot); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetRoot )( - IXMLParser __RPC_FAR * This, - /* [in] */ PVOID __RPC_FAR *ppRoot); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Run )( - IXMLParser __RPC_FAR * This, - /* [in] */ long lChars); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetParserState )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Suspend )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Reset )( - IXMLParser __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetFlags )( - IXMLParser __RPC_FAR * This, - /* [in] */ ULONG iFlags); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetSecureBaseURL )( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetSecureBaseURL )( - IXMLParser __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf); - - END_INTERFACE - } IXMLParserVtbl; - - interface IXMLParser - { - CONST_VTBL struct IXMLParserVtbl __RPC_FAR *lpVtbl; - }; - - - -#ifdef COBJMACROS - - -#define IXMLParser_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - -#define IXMLParser_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - -#define IXMLParser_Release(This) \ - (This)->lpVtbl -> Release(This) - - -#define IXMLParser_SetFactory(This,pNodeFactory) \ - (This)->lpVtbl -> SetFactory(This,pNodeFactory) - -#define IXMLParser_GetFactory(This,ppNodeFactory) \ - (This)->lpVtbl -> GetFactory(This,ppNodeFactory) - -#define IXMLParser_Abort(This,bstrErrorInfo) \ - (This)->lpVtbl -> Abort(This,bstrErrorInfo) - -#define IXMLParser_GetLineNumber(This) \ - (This)->lpVtbl -> GetLineNumber(This) - -#define IXMLParser_GetLinePosition(This) \ - (This)->lpVtbl -> GetLinePosition(This) - -#define IXMLParser_GetAbsolutePosition(This) \ - (This)->lpVtbl -> GetAbsolutePosition(This) - -#define IXMLParser_GetLineBuffer(This,ppwcBuf,pulLen,pulStartPos) \ - (This)->lpVtbl -> GetLineBuffer(This,ppwcBuf,pulLen,pulStartPos) - -#define IXMLParser_GetLastError(This) \ - (This)->lpVtbl -> GetLastError(This) - -#define IXMLParser_GetErrorInfo(This,pbstrErrorInfo) \ - (This)->lpVtbl -> GetErrorInfo(This,pbstrErrorInfo) - -#define IXMLParser_GetFlags(This) \ - (This)->lpVtbl -> GetFlags(This) - -#define IXMLParser_GetURL(This,ppwcBuf) \ - (This)->lpVtbl -> GetURL(This,ppwcBuf) - - -#define IXMLParser_SetURL(This,pszBaseUrl,pszRelativeUrl,fAsync) \ - (This)->lpVtbl -> SetURL(This,pszBaseUrl,pszRelativeUrl,fAsync) - -#define IXMLParser_Load(This,fFullyAvailable,pimkName,pibc,grfMode) \ - (This)->lpVtbl -> Load(This,fFullyAvailable,pimkName,pibc,grfMode) - -#define IXMLParser_SetInput(This,pStm) \ - (This)->lpVtbl -> SetInput(This,pStm) - -#define IXMLParser_PushData(This,pData,ulChars,fLastBuffer) \ - (This)->lpVtbl -> PushData(This,pData,ulChars,fLastBuffer) - -#define IXMLParser_LoadDTD(This,pszBaseUrl,pszRelativeUrl) \ - (This)->lpVtbl -> LoadDTD(This,pszBaseUrl,pszRelativeUrl) - -#define IXMLParser_LoadEntity(This,pszBaseUrl,pszRelativeUrl,fpe) \ - (This)->lpVtbl -> LoadEntity(This,pszBaseUrl,pszRelativeUrl,fpe) - -#define IXMLParser_ParseEntity(This,pwcText,ulLen,fpe) \ - (This)->lpVtbl -> ParseEntity(This,pwcText,ulLen,fpe) - -#define IXMLParser_ExpandEntity(This,pwcText,ulLen) \ - (This)->lpVtbl -> ExpandEntity(This,pwcText,ulLen) - -#define IXMLParser_SetRoot(This,pRoot) \ - (This)->lpVtbl -> SetRoot(This,pRoot) - -#define IXMLParser_GetRoot(This,ppRoot) \ - (This)->lpVtbl -> GetRoot(This,ppRoot) - -#define IXMLParser_Run(This,lChars) \ - (This)->lpVtbl -> Run(This,lChars) - -#define IXMLParser_GetParserState(This) \ - (This)->lpVtbl -> GetParserState(This) - -#define IXMLParser_Suspend(This) \ - (This)->lpVtbl -> Suspend(This) - -#define IXMLParser_Reset(This) \ - (This)->lpVtbl -> Reset(This) - -#define IXMLParser_SetFlags(This,iFlags) \ - (This)->lpVtbl -> SetFlags(This,iFlags) - -#define IXMLParser_SetSecureBaseURL(This,pszBaseUrl) \ - (This)->lpVtbl -> SetSecureBaseURL(This,pszBaseUrl) - -#define IXMLParser_GetSecureBaseURL(This,ppwcBuf) \ - (This)->lpVtbl -> GetSecureBaseURL(This,ppwcBuf) - -#endif /* COBJMACROS */ - - -#endif /* C style interface */ - - - -HRESULT STDMETHODCALLTYPE IXMLParser_SetURL_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fAsync); - - -void __RPC_STUB IXMLParser_SetURL_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_Load_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ BOOL fFullyAvailable, - /* [in] */ IMoniker __RPC_FAR *pimkName, - /* [in] */ LPBC pibc, - /* [in] */ DWORD grfMode); - - -void __RPC_STUB IXMLParser_Load_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_SetInput_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ IUnknown __RPC_FAR *pStm); - - -void __RPC_STUB IXMLParser_SetInput_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_PushData_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const char __RPC_FAR *pData, - /* [in] */ ULONG ulChars, - /* [in] */ BOOL fLastBuffer); - - -void __RPC_STUB IXMLParser_PushData_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_LoadDTD_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl); - - -void __RPC_STUB IXMLParser_LoadDTD_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_LoadEntity_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl, - /* [in] */ const WCHAR __RPC_FAR *pszRelativeUrl, - /* [in] */ BOOL fpe); - - -void __RPC_STUB IXMLParser_LoadEntity_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_ParseEntity_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen, - /* [in] */ BOOL fpe); - - -void __RPC_STUB IXMLParser_ParseEntity_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_ExpandEntity_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pwcText, - /* [in] */ ULONG ulLen); - - -void __RPC_STUB IXMLParser_ExpandEntity_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_SetRoot_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ PVOID pRoot); - - -void __RPC_STUB IXMLParser_SetRoot_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_GetRoot_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ PVOID __RPC_FAR *ppRoot); - - -void __RPC_STUB IXMLParser_GetRoot_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_Run_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ long lChars); - - -void __RPC_STUB IXMLParser_Run_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_GetParserState_Proxy( - IXMLParser __RPC_FAR * This); - - -void __RPC_STUB IXMLParser_GetParserState_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_Suspend_Proxy( - IXMLParser __RPC_FAR * This); - - -void __RPC_STUB IXMLParser_Suspend_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_Reset_Proxy( - IXMLParser __RPC_FAR * This); - - -void __RPC_STUB IXMLParser_Reset_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_SetFlags_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ ULONG iFlags); - - -void __RPC_STUB IXMLParser_SetFlags_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_SetSecureBaseURL_Proxy( - IXMLParser __RPC_FAR * This, - /* [in] */ const WCHAR __RPC_FAR *pszBaseUrl); - - -void __RPC_STUB IXMLParser_SetSecureBaseURL_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLParser_GetSecureBaseURL_Proxy( - IXMLParser __RPC_FAR * This, - /* [out] */ const WCHAR __RPC_FAR *__RPC_FAR *ppwcBuf); - - -void __RPC_STUB IXMLParser_GetSecureBaseURL_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - -#endif /* __IXMLParser_INTERFACE_DEFINED__ */ - - -#ifndef __IXMLNodeFactory_INTERFACE_DEFINED__ -#define __IXMLNodeFactory_INTERFACE_DEFINED__ - -/* interface IXMLNodeFactory */ -/* [unique][helpstring][uuid][local][object] */ - - -EXTERN_C const IID IID_IXMLNodeFactory; - -#if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("d242361f-51a0-11d2-9caf-0060b0ec3d39") - IXMLNodeFactory : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE NotifyEvent( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODEFACTORY_EVENT iEvt) = 0; - - virtual HRESULT STDMETHODCALLTYPE BeginChildren( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE EndChildren( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ BOOL fEmpty, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE Error( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ HRESULT hrErrorCode, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateNode( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ PVOID pNodeParent, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo) = 0; - - }; - -#else /* C style interface */ - - typedef struct IXMLNodeFactoryVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - IXMLNodeFactory __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - IXMLNodeFactory __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *NotifyEvent )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODEFACTORY_EVENT iEvt); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *BeginChildren )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *EndChildren )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ BOOL fEmpty, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Error )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ HRESULT hrErrorCode, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *CreateNode )( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ PVOID pNodeParent, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo); - - END_INTERFACE - } IXMLNodeFactoryVtbl; - - interface IXMLNodeFactory - { - CONST_VTBL struct IXMLNodeFactoryVtbl __RPC_FAR *lpVtbl; - }; - - - -#ifdef COBJMACROS - - -#define IXMLNodeFactory_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - -#define IXMLNodeFactory_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - -#define IXMLNodeFactory_Release(This) \ - (This)->lpVtbl -> Release(This) - - -#define IXMLNodeFactory_NotifyEvent(This,pSource,iEvt) \ - (This)->lpVtbl -> NotifyEvent(This,pSource,iEvt) - -#define IXMLNodeFactory_BeginChildren(This,pSource,pNodeInfo) \ - (This)->lpVtbl -> BeginChildren(This,pSource,pNodeInfo) - -#define IXMLNodeFactory_EndChildren(This,pSource,fEmpty,pNodeInfo) \ - (This)->lpVtbl -> EndChildren(This,pSource,fEmpty,pNodeInfo) - -#define IXMLNodeFactory_Error(This,pSource,hrErrorCode,cNumRecs,apNodeInfo) \ - (This)->lpVtbl -> Error(This,pSource,hrErrorCode,cNumRecs,apNodeInfo) - -#define IXMLNodeFactory_CreateNode(This,pSource,pNodeParent,cNumRecs,apNodeInfo) \ - (This)->lpVtbl -> CreateNode(This,pSource,pNodeParent,cNumRecs,apNodeInfo) - -#endif /* COBJMACROS */ - - -#endif /* C style interface */ - - - -HRESULT STDMETHODCALLTYPE IXMLNodeFactory_NotifyEvent_Proxy( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODEFACTORY_EVENT iEvt); - - -void __RPC_STUB IXMLNodeFactory_NotifyEvent_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeFactory_BeginChildren_Proxy( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo); - - -void __RPC_STUB IXMLNodeFactory_BeginChildren_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeFactory_EndChildren_Proxy( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ BOOL fEmpty, - /* [in] */ XML_NODE_INFO __RPC_FAR *pNodeInfo); - - -void __RPC_STUB IXMLNodeFactory_EndChildren_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeFactory_Error_Proxy( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ HRESULT hrErrorCode, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo); - - -void __RPC_STUB IXMLNodeFactory_Error_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -HRESULT STDMETHODCALLTYPE IXMLNodeFactory_CreateNode_Proxy( - IXMLNodeFactory __RPC_FAR * This, - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ PVOID pNodeParent, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO __RPC_FAR *__RPC_FAR *apNodeInfo); - - -void __RPC_STUB IXMLNodeFactory_CreateNode_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - -#endif /* __IXMLNodeFactory_INTERFACE_DEFINED__ */ - - -EXTERN_C const CLSID CLSID_XMLParser; - -#ifdef __cplusplus - -class DECLSPEC_UUID("d2423620-51a0-11d2-9caf-0060b0ec3d39") -XMLParser; -#endif -#endif /* __XMLPSR_LIBRARY_DEFINED__ */ - -/* Additional Prototypes for ALL interfaces */ - -/* end of Additional Prototypes */ - -#ifdef __cplusplus -} -#endif - -#endif - - diff --git a/src/inc/xmlparser_i.cpp b/src/inc/xmlparser_i.cpp deleted file mode 100644 index 33927f651f..0000000000 --- a/src/inc/xmlparser_i.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/* This was a created file from a newer version of xmlparser.idl than - what made xmlparser.h in ndp/clr/src/inc, and then with extra - GUIDs expurgated. */ - -/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */ - -/* link this file in with the server and any clients */ - - - /* File created by MIDL compiler version 8.00.0571 */ -/* @@MIDL_FILE_HEADING( ) */ - -#ifdef _MSC_VER -#pragma warning( disable: 4049 ) /* more than 64k source lines */ -#endif - - -#ifdef __cplusplus -extern "C"{ -#endif - - -#include <rpc.h> -#include <rpcndr.h> - -#ifdef _MIDL_USE_GUIDDEF_ - -#ifndef INITGUID -#define INITGUID -#include <guiddef.h> -#undef INITGUID -#else -#include <guiddef.h> -#endif - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ - DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) - -#else // !_MIDL_USE_GUIDDEF_ - -#ifndef __IID_DEFINED__ -#define __IID_DEFINED__ - -typedef struct _IID -{ - unsigned long x; - unsigned short s1; - unsigned short s2; - unsigned char c[8]; -} IID; - -#endif // __IID_DEFINED__ - -#ifndef CLSID_DEFINED -#define CLSID_DEFINED -typedef IID CLSID; -#endif // CLSID_DEFINED - -#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ - const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} - -#endif // !_MIDL_USE_GUIDDEF_ - -MIDL_DEFINE_GUID(IID, LIBID_XMLPSR,0xd242361c,0x51a0,0x11d2,0x9c,0xaf,0x00,0x60,0xb0,0xec,0x3d,0x39); - - -MIDL_DEFINE_GUID(IID, IID_IXMLNodeSource,0xd242361d,0x51a0,0x11d2,0x9c,0xaf,0x00,0x60,0xb0,0xec,0x3d,0x39); - - -MIDL_DEFINE_GUID(IID, IID_IXMLParser,0xd242361e,0x51a0,0x11d2,0x9c,0xaf,0x00,0x60,0xb0,0xec,0x3d,0x39); - - -MIDL_DEFINE_GUID(IID, IID_IXMLNodeFactory,0xd242361f,0x51a0,0x11d2,0x9c,0xaf,0x00,0x60,0xb0,0xec,0x3d,0x39); - -#undef MIDL_DEFINE_GUID - -#ifdef __cplusplus -} -#endif - - - diff --git a/src/strongname/api/common.h b/src/strongname/api/common.h index 92fb5b49d5..7cea2ec795 100644 --- a/src/strongname/api/common.h +++ b/src/strongname/api/common.h @@ -72,10 +72,6 @@ #include "lazycow.h" -#include "compatibilityflags.h" -extern BOOL GetCompatibilityFlag(CompatibilityFlag flag); -extern DWORD* GetGlobalCompatibilityFlags(); - #include "strongname.h" #include "stdmacros.h" diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 1fe8a96b80..9a7c652c56 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -64,8 +64,6 @@ #include "nativeoverlapped.h" -#include "compatibilityflags.h" - #ifndef FEATURE_PAL #include "dwreport.h" #endif // !FEATURE_PAL @@ -2062,8 +2060,6 @@ BOOL AppDomain::GetPreferComInsteadOfManagedRemoting() return (GetComOrRemotingFlag() == COMorRemoting_COM); } -STDAPI GetXMLObjectEx(IXMLParser **ppv); - COMorRemotingFlag AppDomain::GetPreferComInsteadOfManagedRemotingFromConfigFile() { CONTRACTL @@ -10938,22 +10934,6 @@ PTR_MethodTable BaseDomain::LookupType(UINT32 id) { return pMT; } -#ifndef DACCESS_COMPILE - - -//------------------------------------------------------------------------ -BOOL GetCompatibilityFlag(CompatibilityFlag flag) -{ - CONTRACTL { - NOTHROW; - GC_NOTRIGGER; - SO_TOLERANT; - } CONTRACTL_END; - - return FALSE; -} -#endif // !DACCESS_COMPILE - //--------------------------------------------------------------------------------------- // BOOL diff --git a/src/vm/appdomainconfigfactory.hpp b/src/vm/appdomainconfigfactory.hpp deleted file mode 100644 index b443797c0d..0000000000 --- a/src/vm/appdomainconfigfactory.hpp +++ /dev/null @@ -1,240 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - - -#ifndef APPDOMAINCONFIGFACTORY_H -#define APPDOMAINCONFIGFACTORY_H - -#include <xmlparser.h> -#include <objbase.h> -#include "unknwn.h" -#include "../xmlparser/_reference.h" -#include "../xmlparser/_unknown.h" - -#include "appdomain.hpp" - -#define ISWHITE(ch) ((ch) >= 0x09 && (ch) <= 0x0D || (ch) == 0x20) - -#define CONST_STRING_AND_LEN(str) str, NumItems(str)-1 - - -extern int EEXMLStringCompare(const WCHAR *pStr1, - DWORD cchStr1, - const WCHAR *pStr2, - DWORD cchStr2); - - -enum APPDOMAINPARSESTATE -{ - APPDOMAINPARSESTATE_INITIALIZED, - APPDOMAINPARSESTATE_RUNTIME, - APPDOMAINPARSESTATE_PREFERCOMINSTEADOFREMOTING, - APPDOMAINPARSESTATE_ENABLED, - APPDOMAINPARSESTATE_LEGACYMODE -}; - - - -class AppDomainConfigFactory : public _unknown<IXMLNodeFactory, &IID_IXMLNodeFactory> -{ - -public: - AppDomainConfigFactory() : m_dwDepth(0), comorRemotingFlag(COMorRemoting_NotInitialized), m_appdomainParseState(APPDOMAINPARSESTATE_INITIALIZED) - { - LIMITED_METHOD_CONTRACT; - } - - ~AppDomainConfigFactory() - { - LIMITED_METHOD_CONTRACT; - } - - HRESULT STDMETHODCALLTYPE NotifyEvent( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODEFACTORY_EVENT iEvt) - { - LIMITED_METHOD_CONTRACT; - return S_OK; - } - - HRESULT STDMETHODCALLTYPE BeginChildren( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ XML_NODE_INFO* __RPC_FAR pNodeInfo) - { - LIMITED_METHOD_CONTRACT; - - m_dwDepth++; - return S_OK; - } - - HRESULT STDMETHODCALLTYPE EndChildren( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ BOOL fEmptyNode, - /* [in] */ XML_NODE_INFO* __RPC_FAR pNodeInfo) - { - LIMITED_METHOD_CONTRACT; - - if (!fEmptyNode) - m_dwDepth--; - return S_OK; - } - - HRESULT STDMETHODCALLTYPE Error( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ HRESULT hrErrorCode, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO* __RPC_FAR * __RPC_FAR apNodeInfo) - { - LIMITED_METHOD_CONTRACT; - /* - UNUSED(pSource); - UNUSED(hrErrorCode); - UNUSED(cNumRecs); - UNUSED(apNodeInfo); - */ - return hrErrorCode; - } - - HRESULT STDMETHODCALLTYPE CreateNode( - /* [in] */ IXMLNodeSource __RPC_FAR *pSource, - /* [in] */ PVOID pNodeParent, - /* [in] */ USHORT cNumRecs, - /* [in] */ XML_NODE_INFO* __RPC_FAR * __RPC_FAR apNodeInfo) - { - CONTRACTL - { - NOTHROW; - GC_TRIGGERS; - MODE_ANY; - INJECT_FAULT(return E_OUTOFMEMORY;); - } - CONTRACTL_END; - - if(m_dwDepth > 2) - { - return S_OK; - } - - HRESULT hr = S_OK; - DWORD dwStringSize = 0; - WCHAR* pszString = NULL; - DWORD i; - BOOL fRuntimeKey = FALSE; - BOOL fVersion = FALSE; - - for( i = 0; i < cNumRecs; i++) { - - if(apNodeInfo[i]->dwType == XML_ELEMENT || - apNodeInfo[i]->dwType == XML_ATTRIBUTE || - apNodeInfo[i]->dwType == XML_PCDATA) { - - dwStringSize = apNodeInfo[i]->ulLen; - pszString = (WCHAR*) apNodeInfo[i]->pwcText; - // Trim the value - - // we should never decrement lgth if it's 0, because it's unsigned - - for(;*pszString && ISWHITE(*pszString) && dwStringSize>0; pszString++, dwStringSize--); - while( dwStringSize > 0 && ISWHITE(pszString[dwStringSize-1])) - dwStringSize--; - - if (m_appdomainParseState == APPDOMAINPARSESTATE_INITIALIZED) - { - //look forward to <runtime> - if (m_dwDepth == 1 && - apNodeInfo[i]->dwType == XML_ELEMENT && - EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("runtime"))) == 0) - { - m_appdomainParseState = APPDOMAINPARSESTATE_RUNTIME; - } - return S_OK; - } - else if (m_appdomainParseState == APPDOMAINPARSESTATE_RUNTIME) - { - // look forward to <PreferComInsteadOfManagedRemoting enabled="true"/> - if (m_dwDepth == 2 && - apNodeInfo[i]->dwType == XML_ELEMENT && - EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("PreferComInsteadOfManagedRemoting"))) == 0) - { - m_appdomainParseState = APPDOMAINPARSESTATE_PREFERCOMINSTEADOFREMOTING; - continue; - } - // if we ended parsing <Runtime>, we abort it - if (m_dwDepth <= 1) - pSource->Abort(NULL); - return S_OK; - } - else if (m_appdomainParseState == APPDOMAINPARSESTATE_PREFERCOMINSTEADOFREMOTING) - { - // require enabled="true"/> or legacyMode="true"/> - if (m_dwDepth == 2 && - apNodeInfo[i]->dwType == XML_ATTRIBUTE) - { - if (EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("enabled"))) == 0) - { - m_appdomainParseState = APPDOMAINPARSESTATE_ENABLED; - } - if (EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("legacyMode"))) == 0) - { - m_appdomainParseState = APPDOMAINPARSESTATE_LEGACYMODE; - } - } - - // ignore unrecognized attributes (forward compat) - continue; - } - else if (m_appdomainParseState == APPDOMAINPARSESTATE_ENABLED || m_appdomainParseState == APPDOMAINPARSESTATE_LEGACYMODE) - { - // require "true" /> or "false" /> - if (m_dwDepth == 2 && - apNodeInfo[i]->dwType == XML_PCDATA) - { - if (EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("true"))) == 0) - { - if (m_appdomainParseState == APPDOMAINPARSESTATE_LEGACYMODE) - { - // LegacyMode does not override the "master switch" - if (comorRemotingFlag != COMorRemoting_COM) - comorRemotingFlag = COMorRemoting_LegacyMode; - } - else - { - comorRemotingFlag = COMorRemoting_COM; - } - } - else if (EEXMLStringCompare(pszString, dwStringSize, CONST_STRING_AND_LEN(W("false"))) == 0) - { - if (m_appdomainParseState == APPDOMAINPARSESTATE_ENABLED) - { - // we do report that the "master switch" is explictly false - if (comorRemotingFlag == COMorRemoting_NotInitialized) - comorRemotingFlag = COMorRemoting_Remoting; - } - } - - m_appdomainParseState = APPDOMAINPARSESTATE_PREFERCOMINSTEADOFREMOTING; - continue; - } - pSource->Abort(NULL); - return S_OK; - } - } - } - return hr; - } - - COMorRemotingFlag GetCOMorRemotingFlag() - { - LIMITED_METHOD_CONTRACT; - return comorRemotingFlag; - } - -private: - DWORD m_dwDepth; - COMorRemotingFlag comorRemotingFlag; - APPDOMAINPARSESTATE m_appdomainParseState; - -}; - -#endif APPDOMAINCONFIGFACTORY_H diff --git a/src/vm/common.h b/src/vm/common.h index a52566d55e..8f37574027 100644 --- a/src/vm/common.h +++ b/src/vm/common.h @@ -97,9 +97,6 @@ //----------------------------------------------------------------------------------------------------------- -#include "compatibilityflags.h" -extern BOOL GetCompatibilityFlag(CompatibilityFlag flag); - #include "strongname.h" #include "stdmacros.h" @@ -475,34 +472,11 @@ extern DummyGlobalContract ___contract; #include "syncblk.inl" #include "threads.inl" #include "eehash.inl" -#include "mscorcfg.h" #ifdef FEATURE_COMINTEROP #include "WinRTRedirector.h" #include "winrtredirector.inl" #endif // FEATURE_COMINTEROP -inline HRESULT CreateConfigStreamHelper(LPCWSTR filename, IStream** pOutStream) -{ - CONTRACTL - { - NOTHROW; - GC_NOTRIGGER; - MODE_ANY; - } - CONTRACTL_END - - HRESULT hr =S_OK; - - EX_TRY - { - hr = CreateConfigStream( filename, pOutStream); - } - EX_CATCH_HRESULT(hr); - - return hr; -} - - #if defined(COMMON_TURNED_FPO_ON) #pragma optimize("", on) // Go back to command line default optimizations #undef COMMON_TURNED_FPO_ON diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp index af2554e324..17ad686c81 100644 --- a/src/vm/excep.cpp +++ b/src/vm/excep.cpp @@ -3462,8 +3462,7 @@ DWORD MapWin32FaultToCOMPlusException(EXCEPTION_RECORD *pExceptionRecord) { // We have a config key, InsecurelyTreatAVsAsNullReference, that ensures we always translate to // NullReferenceException instead of doing the new AV translation logic. - if ((g_pConfig != NULL) && !g_pConfig->LegacyNullReferenceExceptionPolicy() && - !GetCompatibilityFlag(compatNullReferenceExceptionOnAV) ) + if ((g_pConfig != NULL) && !g_pConfig->LegacyNullReferenceExceptionPolicy()) { #if defined(FEATURE_HIJACK) && !defined(PLATFORM_UNIX) // If we got the exception on a redirect function it means the original exception happened in managed code: diff --git a/src/vm/excep.h b/src/vm/excep.h index 4c752932fd..4261c3cff3 100644 --- a/src/vm/excep.h +++ b/src/vm/excep.h @@ -55,8 +55,7 @@ BOOL IsWin32IOError(SCODE scode); inline bool SwallowUnhandledExceptions() { return (eHostDeterminedPolicy == GetEEPolicy()->GetUnhandledExceptionPolicy()) || - g_pConfig->LegacyUnhandledExceptionPolicy() || - GetCompatibilityFlag(compatSwallowUnhandledExceptions); + g_pConfig->LegacyUnhandledExceptionPolicy(); } // Enums diff --git a/src/vm/vars.cpp b/src/vm/vars.cpp index 464560c3a6..343f1545c8 100644 --- a/src/vm/vars.cpp +++ b/src/vm/vars.cpp @@ -291,50 +291,5 @@ extern "C" RAW_KEYWORD(volatile) const GSCookie s_gsCookie = 0; __GlobalVal< GSCookie > s_gsCookie(&g_dacGlobals.dac__s_gsCookie); #endif //!DACCESS_COMPILE -BOOL IsCompilationProcess() -{ - LIMITED_METHOD_DAC_CONTRACT; -#if defined(FEATURE_NATIVE_IMAGE_GENERATION) && !defined(DACCESS_COMPILE) - return g_pCEECompileInfo != NULL; -#else - return FALSE; -#endif -} - //============================================================================== -enum NingenState -{ - kNotInitialized = 0, - kNingenEnabled = 1, - kNingenDisabled = 2, -}; - -extern int g_ningenState; -int g_ningenState = kNotInitialized; - -// Removes all execution of managed or third-party code in the ngen compilation process. -BOOL NingenEnabled() -{ - LIMITED_METHOD_CONTRACT; - -#ifdef CROSSGEN_COMPILE - // Always enable ningen for cross-compile - return TRUE; -#else // CROSSGEN_COMPILE - -#ifdef FEATURE_NATIVE_IMAGE_GENERATION - // Note that ningen is enabled by default to get byte-to-byte identical NGen images between native compile and cross-compile - if (g_ningenState == kNotInitialized) - { - // This code must be idempotent as we don't have a lock to prevent a race to initialize g_ningenState. - g_ningenState = (IsCompilationProcess() && (0 != CLRConfig::GetConfigValue(CLRConfig::INTERNAL_Ningen))) ? kNingenEnabled : kNingenDisabled; - } - - return g_ningenState == kNingenEnabled; -#else - return FALSE; -#endif - -#endif // CROSSGEN_COMPILE -} diff --git a/src/vm/vars.hpp b/src/vm/vars.hpp index a7b6fb6173..820260a0f2 100644 --- a/src/vm/vars.hpp +++ b/src/vm/vars.hpp @@ -97,7 +97,6 @@ class Crst; class RCWCleanupList; #endif // FEATURE_COMINTEROP class BBSweep; -struct IAssemblyUsageLog; // // loader handles are opaque types that track object pointers that have a lifetime @@ -843,10 +842,24 @@ extern bool g_fReadyToRunCompilation; // Returns true if this is NGen compilation process. // This is a superset of CompilationDomain::IsCompilationDomain() as there is more // than one AppDomain in ngen (the DefaultDomain) -BOOL IsCompilationProcess(); +inline BOOL IsCompilationProcess() +{ +#ifdef CROSSGEN_COMPILE + return TRUE; +#else + return FALSE; +#endif +} // Flag for cross-platform ngen: Removes all execution of managed or third-party code in the ngen compilation process. -BOOL NingenEnabled(); +inline BOOL NingenEnabled() +{ +#ifdef CROSSGEN_COMPILE + return TRUE; +#else + return FALSE; +#endif +} // Passed to JitManager APIs to determine whether to avoid calling into the host. // The profiling API stackwalking uses this to ensure to avoid re-entering the host |