summaryrefslogtreecommitdiff
path: root/src/dlls/mscordac
diff options
context:
space:
mode:
Diffstat (limited to 'src/dlls/mscordac')
-rw-r--r--src/dlls/mscordac/dirs.proj21
-rw-r--r--src/dlls/mscordac/mscordac.targets142
-rw-r--r--src/dlls/mscordac/mscordac.vrg10
-rw-r--r--src/dlls/mscordac/mscordac_unixexports.src4
4 files changed, 2 insertions, 175 deletions
diff --git a/src/dlls/mscordac/dirs.proj b/src/dlls/mscordac/dirs.proj
deleted file mode 100644
index 46a2052403..0000000000
--- a/src/dlls/mscordac/dirs.proj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Include="HostLocal\mscordac.nativeproj" />
- <ProjectFile Condition="'$(FeatureXPlatDacDebugging_HostWindowsx86)'=='true'" Include="HostWinx86\mscordac.nativeproj" />
- <ProjectFile Condition="'$(FeatureXPlatDacDebugging_HostWindowsAMD64)' == 'true'" Include="HostWinAMD64\mscordac.nativeproj" />
- <ProjectFile Condition="'$(FeatureXPlatDacDebugging_HostOneCorex86)'=='true'" Include="HostOneCorex86\mscordac.nativeproj" />
- <ProjectFile Condition="'$(FeatureXPlatDacDebugging_HostOneCoreAMD64)' == 'true'" Include="HostOneCoreAMD64\mscordac.nativeproj" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/dlls/mscordac/mscordac.targets b/src/dlls/mscordac/mscordac.targets
deleted file mode 100644
index 3e0474f9a8..0000000000
--- a/src/dlls/mscordac/mscordac.targets
+++ /dev/null
@@ -1,142 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
-
- <UsingTask TaskName="GetFileVersionTask" AssemblyFile="GetFileVersion.dll"/>
- <Import Project="..\..\debug\XPlatCommon.props" />
-
- <PropertyGroup>
- <CDefines>$(CDefines);UNICODE;_UNICODE;$(USER_SPECIFIC_C_DEFINES);FEATURE_NO_HOST</CDefines>
- <OutputName Condition="'$(BuildForCoreSystem)'!='true'">mscordacwks$(XPlatHostSuffix)</OutputName>
- <OutputName Condition="'$(BuildForCoreSystem)'=='true'">mscordaccore</OutputName>
- <TargetType>DYNLINK</TargetType>
- <LinkSubsystem>windows</LinkSubsystem>
- <DllDef>$(IntermediateOutputDirectory)\mscordac.def</DllDef>
- <DllEntryPoint>_DllMainCRTStartup</DllEntryPoint>
- <GenerateBrowserFile>false</GenerateBrowserFile>
- <CDefines Condition="'$(_BuildType)' == 'dbg'">$(CDefines);SPECIAL_BUILD</CDefines>
- <UseMsvcrt>false</UseMsvcrt>
- <ExtDelayImpLib>true</ExtDelayImpLib>
- <DoNotAddCrtLibPath>true</DoNotAddCrtLibPath>
- <LinkUseDefaultLib>false</LinkUseDefaultLib>
- <LinkLibIgnore>$(LinkLibIgnore);4198</LinkLibIgnore>
- <UseStl>true</UseStl>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(BuildForCoreSystem)' != 'true'">
- <LinkDelayLoad Condition="'$(LinkDelayLoad)'!=''">$(LinkDelayLoad);</LinkDelayLoad>
- <LinkDelayLoad>$(LinkDelayLoad)user32.dll;advapi32.dll;ole32.dll;oleaut32.dll</LinkDelayLoad>
- </PropertyGroup>
-
- <ItemGroup>
- <RCResourceFile Include="..\native.rc">
- <IncludeInLib>true</IncludeInLib>
- </RCResourceFile >
- </ItemGroup>
- <ItemGroup>
- <CppCompile Include="..\mscordac.cpp" />
- </ItemGroup>
-
- <ItemGroup>
- <CppPreprocess Include="..\mscordac.src">
- <Defines>@(CommonPreprocessDefines);$(CDefines);$(TargetDefines)</Defines>
- <FinalOutput>$(IntermediateOutputDirectory)\mscordac.def</FinalOutput>
- <AdditionalOptions>/TC</AdditionalOptions>
- </CppPreprocess>
- </ItemGroup>
- <ItemGroup>
- <ImportLib Include="$(ClrLibPath)\dac_wks$(XPlatHostLibSuffix).lib"/>
- <LinkPreCrtLibs Include="$(ClrLibPath)\dac_wks$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)debug\daccess\$(XPlatHostLibBuildDir)\daccess.nativeproj</ProjectReference>
- </LinkPreCrtLibs>
- <LinkPreCrtLibs Include="$(ClrLibPath)\utilcode_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)utilcode\dac\$(XPlatHostLibBuildDir)\dac.nativeproj</ProjectReference>
- </LinkPreCrtLibs>
- <TargetLib Include="$(ClrLibPath)\cee_wks_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)vm\dac\$(XPlatHostLibBuildDir)\dacwks.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\cordbee_wks_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)debug\ee\dac\$(XPlatHostLibBuildDir)\dacwks.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\MDCompiler_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)md\compiler\dac\$(XPlatHostLibBuildDir)\mdcompiler_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\MDRuntime_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)md\runtime\dac\$(XPlatHostLibBuildDir)\mdruntime_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\MDRuntimeRW_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)md\enc\dac\$(XPlatHostLibBuildDir)\mdruntimerw_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\MDWinMD_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)md\winmd\dac\$(XPlatHostLibBuildDir)\mdwinmd_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\MDHotData_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)md\hotdata\dac\$(XPlatHostLibBuildDir)\mdhotdata_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\ipcmanager_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)ipcman\ipcman_dac\$(XPlatHostLibBuildDir)\ipcman_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\strongname_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)StrongName\api\dac\$(XPlatHostLibBuildDir)\strongname_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Condition="'$(TargetArch)' != 'i386'" Include="$(ClrLibPath)\unwinder_dac$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)unwinder\dac\$(XPlatHostLibBuildDir)\unwinder_dac.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(ClrLibPath)\dbgutil$(XPlatHostLibSuffix).lib">
- <ProjectReference>$(ClrSrcDirectory)debug\dbgutil\$(XPlatHostLibBuildDir)\dbgutil.nativeproj</ProjectReference>
- </TargetLib>
- </ItemGroup>
- <ItemGroup Condition="'$(HostMachineOS)' != 'mac'">
- <TargetLib Include="$(ClrLibPath)\CorGUIDS$(XPlatHostLibSuffix).lib">
- <!-- This project isn't factored like the others above... there are many projects pointing to the current path of corguids -->
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostLocal'">$(ClrSrcDirectory)inc\corguids.nativeproj</ProjectReference>
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinx86'">$(ClrSrcDirectory)incx86\corguids.nativeproj</ProjectReference>
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinAMD64'">$(ClrSrcDirectory)incamd64\corguids.nativeproj</ProjectReference>
- </TargetLib>
- </ItemGroup>
- <ItemGroup Condition="'$(HostMachineOS)' == 'windows'">
- <TargetLib Include="$(ClrLibPath)\delayimp$(XPlatHostLibSuffix).lib">
- <!-- This project isn't factored like the others above... there are many projects pointing to the current path of delayimp -->
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostLocal'">$(ClrSrcDirectory)delayimp\delayimp.nativeproj</ProjectReference>
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinx86'">$(ClrSrcDirectory)delayimpx86\delayimp.nativeproj</ProjectReference>
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinAMD64'">$(ClrSrcDirectory)delayimpamd64\delayimp.nativeproj</ProjectReference>
- </TargetLib>
- <TargetLib Include="$(CrtLibPath)\libcmt$(BuildSuffix).lib" />
- <TargetLib Include="$(SdkLibPath)\kernel32.lib" />
- <TargetLib Include="$(SdkLibPath)\advapi32.lib" />
- <TargetLib Include="$(SdkLibPath)\user32.lib" />
- <TargetLib Include="$(SdkLibPath)\ole32.lib" />
- <TargetLib Include="$(SdkLibPath)\oleaut32.lib" />
- <TargetLib Include="$(SdkLibPath)\uuid.lib" />
- <TargetLib Include="$(SdkLibPath)\wtsapi32.lib" />
- <TargetLib Include="$(CrtLibPath)\delayimp.lib" />
- <TargetLib Include="$(SdkLibPath)\ntdll.lib" />
- </ItemGroup>
- <ItemGroup Condition="'$(HostMachineOS)' == 'OneCore' or '$(HostMachineOS)'=='OneCoreWin7Compat'">
- <TargetLib Include="$(CoreSystemCrt)" />
- <TargetLib Include="$(SdkLibPath)\uuid.lib" />
- </ItemGroup>
- <ItemGroup Condition="'$(HostMachineOS)' == 'OneCoreWin7Compat'">
- <TargetLib Include="$(SdkLibPath)\bcrypt.lib" />
- <TargetLib Include="$(SdkLibPath)\crypt32.lib" />
- <TargetLib Include="$(SdkLibPath)\oleaut32.lib" />
- <TargetLib Include="$(SdkLibPath)\mincore_fw.lib" />
- </ItemGroup>
- <ItemGroup Condition="'$(HostMachineOS)' == 'OneCore'">
- <TargetLib Include="$(SdkLibPath)\mincore.lib" />
- <TargetLib Include="$(SdkLibPath)\mincore_legacy.lib" />
- <TargetLib Include="$(SdkLibPath)\mincore_private.lib" />
- <TargetLib Include="$(SdkLibPath)\mincore_obsolete.lib" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-
-
- <Target Name="CreateLongNameDacForWindbg"
- Condition="'$(HostMachineOS)'=='windows'"
- AfterTargets="Link">
- <GetFileVersionTask FilePath="$(ProductOutputFile)">
- <Output TaskParameter="FileVersion" PropertyName="DacFileVersion"/>
- </GetFileVersionTask>
- <Exec Command="$(PerlCommand) -I$(DevDivToolsPath) $(ClrSrcDirectory)\dlls\mscordac\Update.pl $(ProductOutputFile) $(MainDacMouleName) $(XPlatHostMachineOSSuffix)$(HostMachineArch) $(TargetMachineArch) $(DacFileVersion) $(BinariesDirectory)"
- StandardOutputImportance="Normal" />
- </Target>
-</Project>
diff --git a/src/dlls/mscordac/mscordac.vrg b/src/dlls/mscordac/mscordac.vrg
deleted file mode 100644
index b8cb17547e..0000000000
--- a/src/dlls/mscordac/mscordac.vrg
+++ /dev/null
@@ -1,10 +0,0 @@
-VSREG 7
-
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\KnownFunctionTableDlls]
-"[#FilePath]"=dword:0
-
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\KnownManagedDebuggingDlls]
-"[#FilePath]"=dword:0
-
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\Windows Error Reporting\RuntimeExceptionHelperModules]
-"[#FilePath]"=dword:0
diff --git a/src/dlls/mscordac/mscordac_unixexports.src b/src/dlls/mscordac/mscordac_unixexports.src
index 7d60c1ed4b..ab73c4fcb8 100644
--- a/src/dlls/mscordac/mscordac_unixexports.src
+++ b/src/dlls/mscordac/mscordac_unixexports.src
@@ -17,7 +17,6 @@ PAL_fflush
PAL__flushall
PAL_free
PAL_fwprintf
-PAL_swprintf
PAL_GetPALDirectoryW
PAL_GetResourceString
PAL_get_stdout
@@ -35,7 +34,6 @@ PAL_printf
PAL_qsort
PAL_Reenter
PAL_fprintf
-PAL__vsnprintf
PAL__wcstoui64
PAL_wcstoul
PAL_iswprint
@@ -52,6 +50,8 @@ _wcsicmp
_stricmp
sprintf_s
swprintf_s
+vsprintf_s
+_snprintf_s
_snwprintf_s
_vsnprintf_s
_vsnwprintf_s