Remove FX_NO_LINKED_RESOURCES (#7480)

Author: KevinRansom

FSharp.Profiles.props

@@ -20,7 +20,6 @@
     <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -35,7 +35,6 @@
     <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
@@ -228,17 +227,11 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="$(FSharpSourcesRoot)/absil/writenativeres.fsi">
-      <Link>AbsIL/writenativeres.fsi</Link>
+    <Compile Include="$(FSharpSourcesRoot)/absil/ilnativeres.fsi">
+      <Link>AbsIL/ilnativeres.fsi</Link>
     </Compile>
-    <Compile Include="$(FSharpSourcesRoot)/absil/writenativeres.fs">
-      <Link>AbsIL/writenativeres.fs</Link>
-    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)/absil/cvtres.fsi">
-      <Link>AbsIL/cvtres.fsi</Link>
-    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)/absil/cvtres.fs">
-      <Link>AbsIL/cvtres.fs</Link>
+    <Compile Include="$(FSharpSourcesRoot)/absil/ilnativeres.fs">
+      <Link>AbsIL/ilnativeres.fs</Link>
     </Compile>
     <Compile Include="$(FSharpSourcesRoot)/absil/ilsupp.fsi">
       <Link>AbsIL/ilsupp.fsi</Link>

src/absil/cvtres.fs src/absil/ilnativeres.fssrc/absil/cvtres.fs renamed to src/absil/ilnativeres.fs

@@ -1,7 +1,12 @@
-module internal FSharp.Compiler.AbstractIL.Internal.CVTres
+
+module internal FSharp.Compiler.AbstractIL.Internal.NativeRes
 
 open System
+open System.Collections.Generic
+open System.Linq
+open System.Diagnostics
 open System.IO
+open System.Reflection.Metadata
 
 type BYTE = System.Byte
 type DWORD = System.UInt32
@@ -26,12 +31,32 @@ type RESOURCE =
     member Characteristics : DWORD with get, set
     member data : byte[] with get, set
 
+type Win32Resource =
+    new : data:byte [] * codePage: DWORD * languageId: DWORD * id: int *
+          name: string * typeId:int * typeName : string -> Win32Resource
+    member CodePage: DWORD
+    member Data: byte []
+    member Id: int
+    member LanguageId : DWORD
+    member Name: string
+    member TypeId: int
+    member TypeName: string
+
 [<Class>]
 type CvtResFile =
     static member ReadResFile : stream:Stream -> System.Collections.Generic.List<RESOURCE>
 
 [<Class>]
 type Win32ResourceConversions =
     static member AppendIconToResourceStream : resStream:Stream * iconStream:Stream -> unit
-    static member AppendVersionToResourceStream : resStream:Stream * isDll:System.Boolean * fileVersion:string * originalFileName:string * internalName:string * productVersion:string * assemblyVersion:Version * ?fileDescription:string * ?legalCopyright:string * ?legalTrademarks:string * ?productName:string * ?comments:string * ?companyName:string -> unit 
-    static member AppendManifestToResourceStream : resStream:Stream * manifestStream:Stream * isDll:System.Boolean -> unit 
+    static member AppendVersionToResourceStream : resStream:Stream * isDll:System.Boolean * fileVersion:string * originalFileName:string * internalName:string * productVersion:string * assemblyVersion:Version * ?fileDescription:string * ?legalCopyright:string * ?legalTrademarks:string * ?productName:string * ?comments:string * ?companyName:string -> unit
+    static member AppendManifestToResourceStream : resStream:Stream * manifestStream:Stream * isDll:System.Boolean -> unit
+
+// Write native resources
+[<Class>]
+type NativeResourceWriter =
+    static member SortResources: resources: IEnumerable<Win32Resource> -> IEnumerable<Win32Resource>
+    static member SerializeWin32Resources: builder:BlobBuilder * theResources: IEnumerable<Win32Resource> * resourcesRva: int -> unit
+    (*
+    static member SerializeWin32Resources (builder : BlobBuilder, resourceSections : ResourceSection, resourcesRva : int) -> unit
+        ()*)

src/absil/cvtres.fsi src/absil/ilnativeres.fsisrc/absil/cvtres.fsi renamed to src/absil/ilnativeres.fsi

@@ -8,9 +8,11 @@ open FSharp.Compiler.AbstractIL.Internal
 open FSharp.Compiler.AbstractIL.Internal.Bytes
 open FSharp.Compiler.AbstractIL.Diagnostics
 open FSharp.Compiler.AbstractIL.Internal.Library
+open FSharp.Compiler.AbstractIL.Internal.NativeRes
 #if FX_NO_CORHOST_SIGNER
 open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
 #endif
+
 open System
 open System.IO
 open System.Text
@@ -37,8 +39,6 @@ let check _action (hresult) =
     System.Runtime.InteropServices.Marshal.ThrowExceptionForHR hresult
   //printf "action = %s, hresult = 0x%nx \n" action hresult
 
-type PEFileType = X86 | X64
-
 let MAX_PATH = 260
 
 let E_FAIL = 0x80004005
@@ -570,207 +570,24 @@ type ResFormatNode(tid: int32, nid: int32, lid: int32, dataOffset: int32, pbLink
 
         !size
 
-let linkNativeResourcesViaCVTres (unlinkedResources: byte[] list)  (ulLinkedResourceBaseRVA: int32) (fileType: PEFileType) (outputFilePath: string) = 
-    let nPEFileType = match fileType with X86  -> 0 | X64 -> 2
-    let mutable tempResFiles: string list = []
-    let mutable objBytes: byte[] = [||]
-
-    let unlinkedResources = unlinkedResources |> List.filter (fun arr -> arr.Length > 0)
-    if isNil unlinkedResources then // bail if there's nothing to link
-        objBytes
-    else
-        // Part 1: Write unlinked resources to an object file for linking
-        // check if the first dword is 0x0
-        let firstDWord = bytesToDWord(unlinkedResources.[0].[0], unlinkedResources.[0].[1], unlinkedResources.[0].[2], unlinkedResources.[0].[3])
-        if firstDWord = 0 then
-            // build the command line invocation string for cvtres.exe
-            let corSystemDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
-            // We'll use the current dir and a random file name rather than System.IO.Path.GetTempFileName
-            // to try and prevent the command line invocation string from being > MAX_PATH
-
-            let outputFilePaths =
-                if outputFilePath = "" then
-                    [ FileSystem.GetTempPathShim() ]
-                else
-                    [ FileSystem.GetTempPathShim() ; (outputFilePath + "\\") ]
-
-            // Get a unique random file
-            let rec GetUniqueRandomFileName path =
-                let tfn =  path + System.IO.Path.GetRandomFileName()
-                if FileSystem.SafeExists tfn then
-                    GetUniqueRandomFileName path
-                else
-                    tfn
-
-
-            let machine = if 2 = nPEFileType then "X64" else "X86"
-            let cmdLineArgsPreamble = sprintf "/NOLOGO /READONLY /MACHINE:%s" machine
-
-            let cvtres = corSystemDir + "cvtres.exe "
-
-            let createCvtresArgs path =
-                let tempObjFileName = GetUniqueRandomFileName path
-                let mutable cmdLineArgs = sprintf "%s \"/Out:%s\"" cmdLineArgsPreamble tempObjFileName
-                let mutable resFiles: string list = []
-
-                for _ulr in unlinkedResources do
-                    let tempResFileName = GetUniqueRandomFileName path
-                    resFiles <- tempResFileName :: resFiles
-                    cmdLineArgs <- cmdLineArgs + " \"" + tempResFileName + "\""
-                let trf = resFiles
-                let cmd = cmdLineArgs
-                cmd, tempObjFileName, trf
-
-            let cmdLineArgs, tempObjFileName, tempResFileNames =
-                let attempts =
-                    outputFilePaths |>
-                    List.map (fun path -> createCvtresArgs path) |>
-                    List.filter (fun ((argstring: string), (_t: string), (_f: string list)) -> (cvtres.Length + argstring.Length) < MAX_PATH)
-                let invoc, tmp, files =
-                    match attempts with
-                    | [] -> createCvtresArgs ".\\" // hope for the best...
-                    | (i, t, f) :: _rest -> i, t, f // use the first one, since they're listed in order of precedence
-                tempResFiles <- files
-                (invoc, tmp, files)
-
-            let cvtresInvocation = cvtres + cmdLineArgs
-
-            try
-                let mutable iFiles = 0
-
-                for ulr in unlinkedResources do
-                    // REVIEW: What can go wrong here?  What happens when the various file calls fail
-                    // dump the unlinked resource bytes into the temp file
-                    System.IO.File.WriteAllBytes(tempResFileNames.[iFiles], ulr)
-                    iFiles <- iFiles + 1
-
-                // call cvtres.exe using the full cmd line string we've generated
-
-                // check to see if the generated string is too long - if it is, fail with E_FAIL
-                if cvtresInvocation.Length >= MAX_PATH then
-                    System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-                // REVIEW: We really shouldn't be calling out to cvtres
-                let mutable psi = System.Diagnostics.ProcessStartInfo cvtres
-                psi.Arguments <- cmdLineArgs
-                psi.CreateNoWindow <- true ; // REVIEW: For some reason, this still creates a window unless WindowStyle is set to hidden
-                psi.WindowStyle <- System.Diagnostics.ProcessWindowStyle.Hidden
-                let p = System.Diagnostics.Process.Start psi
-
-                // Wait for the process to finish
-                p.WaitForExit()
-
-                check "Process.Start" p.ExitCode // TODO: really need to check against 0
-
-                // Conversion was successful, so read the object file
-                objBytes <- FileSystem.ReadAllBytesShim tempObjFileName
-                //Array.Copy(objBytes, pbUnlinkedResource, pbUnlinkedResource.Length)
-                FileSystem.FileDelete tempObjFileName
-            finally
-                // clean up the temp files
-                List.iter (fun tempResFileName -> FileSystem.FileDelete tempResFileName) tempResFiles
-
-        // Part 2: Read the COFF file held in pbUnlinkedResource, spit it out into pResBuffer and apply the COFF fixups
-        // pResBuffer will become  the .rsrc section of the PE file
-        if (objBytes = Unchecked.defaultof<byte[]>) then
-            System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-        let hMod = bytesToIFH objBytes 0
-
-        if hMod.SizeOfOptionalHeader <> 0s then
-            System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-        let rsrc01Name = 0x313024637273722eL // ".rsrc$01"
-        let rsrc02Name = 0x323024637273722eL // ".rsrc$02"
-        let nullHdr = Unchecked.defaultof<IMAGE_SECTION_HEADER>
-        let mutable rsrc01 = nullHdr
-        let mutable rsrc02 = nullHdr
-
-        for i = 0 to int hMod.NumberOfSections do
-            let pSection = bytesToISH objBytes (IMAGE_FILE_HEADER.Width + (IMAGE_SECTION_HEADER.Width * i))
-            if pSection.Name = rsrc01Name then
-                rsrc01 <- pSection
-            else if pSection.Name = rsrc02Name then
-                rsrc02 <- pSection
-
-        if (nullHdr = rsrc01) || (nullHdr = rsrc02) then
-            // One of the rsrc sections wasn't found
-            System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-        let size = rsrc01.SizeOfRawData + rsrc02.SizeOfRawData
-
-        let pResBuffer = Bytes.zeroCreate size
-
-        // Copy over the raw data
-        Bytes.blit objBytes rsrc01.PointerToRawData pResBuffer 0 rsrc01.SizeOfRawData
-
-        // map all the relocs in .rsrc$01 using the reloc and symbol tables in the COFF object
-        let symbolTableHead = hMod.PointerToSymbolTable
-        let IMAGE_SYM_CLASS_STATIC = 0x3uy
-        let IMAGE_SYM_TYPE_NULL = 0x0s
-
-        let GetSymbolEntry (buffer: byte[]) (idx: int) =
-            bytesToIS buffer (symbolTableHead + (idx * IMAGE_SYMBOL.Width) )
-
-        for iReloc = 0 to int (rsrc01.NumberOfRelocations - 1s) do
-            let pReloc = bytesToIR objBytes (rsrc01.PointerToRelocations + (iReloc * IMAGE_RELOCATION.Width))
-            let IdxSymbol = pReloc.SymbolTableIndex
-            let pSymbolEntry = GetSymbolEntry objBytes IdxSymbol
-
-            // Ensure the symbol entry is valid for a resource
-            if ((pSymbolEntry.StorageClass <> IMAGE_SYM_CLASS_STATIC) ||
-                (pSymbolEntry.Type <> IMAGE_SYM_TYPE_NULL) ||
-                (pSymbolEntry.SectionNumber <> 3s)) then
-                System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-            // Ensure that RVA is a valid address inside rsrc02
-            if pSymbolEntry.Value >= rsrc02.SizeOfRawData then
-                // pSymbolEntry.Value is too big
-                System.Runtime.InteropServices.Marshal.ThrowExceptionForHR(E_FAIL)
-
-            // store the value
-            let vBuff, vSize = dwToBytes (ulLinkedResourceBaseRVA + rsrc01.SizeOfRawData + pSymbolEntry.Value)
-            //Bytes.blit objBytes rsrc02.PointerToRawData pResBuffer pReloc.VirtualAddress rsrc02.SizeOfRawData
-            Bytes.blit vBuff 0 pResBuffer pReloc.VirtualAddress vSize
-        // Copy $02 (resource raw into pResBuffer
-        Bytes.blit objBytes rsrc02.PointerToRawData pResBuffer rsrc01.SizeOfRawData  rsrc02.SizeOfRawData
-
-        // return the buffer
-        pResBuffer
-
-let linkNativeResourcesManaged (unlinkedResources: byte[] list)  (ulLinkedResourceBaseRVA: int32) (fileType: PEFileType) (outputFilePath: string) =
-   ignore fileType
-   ignore outputFilePath
-   
+let linkNativeResources (unlinkedResources: byte[] list)  (ulLinkedResourceBaseRVA: int32) =
    let resources =
        unlinkedResources
        |> Seq.map (fun s -> new MemoryStream(s))
        |> Seq.map (fun s -> 
-           let res = CVTres.CvtResFile.ReadResFile s
+           let res = CvtResFile.ReadResFile s
            s.Dispose()
            res)
        |> Seq.collect id
        // See MakeWin32ResourceList https://github.com/dotnet/roslyn/blob/f40b89234db51da1e1153c14af184e618504be41/src/Compilers/Core/Portable/Compilation/Compilation.cs
        |> Seq.map (fun r -> 
-           WriteNativeRes.Win32Resource(data = r.data, codePage = 0u, languageId = uint32 r.LanguageId, 
+           Win32Resource(data = r.data, codePage = 0u, languageId = uint32 r.LanguageId, 
                                id = int (int16 r.pstringName.Ordinal), name = r.pstringName.theString,
                                typeId = int (int16 r.pstringType.Ordinal), typeName = r.pstringType.theString))
    let bb = new System.Reflection.Metadata.BlobBuilder()
-   WriteNativeRes.NativeResourceWriter.SerializeWin32Resources(bb, resources, ulLinkedResourceBaseRVA)
+   NativeResourceWriter.SerializeWin32Resources(bb, resources, ulLinkedResourceBaseRVA)
    bb.ToArray()
 
-let linkNativeResources (unlinkedResources: byte[] list)  (ulLinkedResourceBaseRVA: int32) (fileType: PEFileType) (outputFilePath: string) =
-#if ENABLE_MONO_SUPPORT
-    if IL.runningOnMono then
-        linkNativeResourcesManaged unlinkedResources ulLinkedResourceBaseRVA fileType outputFilePath
-    else
-#endif
-#if !FX_NO_LINKEDRESOURCES
-        linkNativeResourcesViaCVTres unlinkedResources ulLinkedResourceBaseRVA fileType outputFilePath
-#else
-        linkNativeResourcesManaged unlinkedResources ulLinkedResourceBaseRVA fileType outputFilePath
-#endif
-
 let unlinkResource (ulLinkedResourceBaseRVA: int32) (pbLinkedResource: byte[]) =
     let mutable nResNodes = 0
 

src/absil/ilsupp.fs

@@ -35,9 +35,7 @@ type IStream = System.Runtime.InteropServices.ComTypes.IStream
 /// The function may be called twice, once with a zero-RVA and
 /// arbitrary buffer, and once with the real buffer.  The size of the
 /// required buffer is returned.
-type PEFileType = X86 | X64
-
-val linkNativeResources: unlinkedResources:byte[] list ->  rva:int32 -> PEFileType -> tempFilePath:string -> byte[]
+val linkNativeResources: unlinkedResources:byte[] list ->  rva:int32 -> byte[]
 val unlinkResource: int32 -> byte[] -> byte[]
 
 #if !FX_NO_PDB_WRITER

src/absil/ilsupp.fsi

@@ -3732,27 +3732,24 @@ let writeBinaryAndReportMappings (outfile,
           let nextPhys = align alignPhys (textSectionPhysLoc + textSectionSize)
           let textSectionPhysSize = nextPhys - textSectionPhysLoc
           let next = align alignVirt (textSectionAddr + textSectionSize)
-          
-          // .RSRC SECTION (DATA) 
+
+          // .RSRC SECTION (DATA)
           let dataSectionPhysLoc = nextPhys
           let dataSectionAddr = next
           let dataSectionVirtToPhys v = v - dataSectionAddr + dataSectionPhysLoc
-          
-          let resourceFormat = if modul.Is64Bit then Support.X64 else Support.X86
-          
-          let nativeResources = 
+          let nativeResources =
             match modul.NativeResources with
             | [] -> [||]
             | resources ->
-                let unlinkedResources = 
-                    resources |> List.map (function 
+                let unlinkedResources =
+                    resources |> List.map (function
                         | ILNativeResource.Out bytes -> bytes
-                        | ILNativeResource.In (fileName, linkedResourceBase, start, len) -> 
+                        | ILNativeResource.In (fileName, linkedResourceBase, start, len) ->
                              let linkedResource = File.ReadBinaryChunk (fileName, start, len)
                              unlinkResource linkedResourceBase linkedResource)
-                             
+
                 begin
-                  try linkNativeResources unlinkedResources next resourceFormat (Path.GetDirectoryName outfile)
+                  try linkNativeResources unlinkedResources next
                   with e -> failwith ("Linking a native resource failed: "+e.Message+"")
                 end