NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commita6ec29b

committed

Fix for default manifest test. Turns out LoadLibrary chokes sometimes on x86 when loading Debug assemblies. Switch to LoadLibraryEx, loading binaries as pure data files. (changeset 1236335)

1 parentd6b2bf8 commita6ec29bCopy full SHA for a6ec29b

File tree

1 file changed

+10

-3

lines changed

tests/fsharpqa/Source/Misc
- DefaultManifest.fs

1 file changed

+10

-3

lines changed

`‎tests/fsharpqa/Source/Misc/DefaultManifest.fs‎`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ module NativeMethods =`
`12`	`12`	`typeEnumResourceNamesCallback=delegateofIntPtrIntPtrIntPtr*IntPtr->bool`
`13`	`13`
`14`	`14`	`[<DllImport("kernel32.dll")>]`
`15`		`-extern IntPtrLoadLibrary(char[] lpFileName)`
	`15`	`+extern IntPtrLoadLibraryEx(string lpFileName, IntPtr hReservedNull, uint32 dwFlags)`
`16`	`16`
`17`	`17`	`[<DllImport("kernel32.dll")>]`
`18`	`18`	`extern bool EnumResourceNames(IntPtr hModule, int dwID, EnumResourceNamesCallback lpEnumFunc, IntPtr lParam)`
`@@ -31,6 +31,9 @@ module NativeMethods =`
`31`	`31`
`32`	`32`	`// ID of the manifest win32 resource type`
`33`	`33`	`letRT_MANIFEST=24`
	`34`	`+`
	`35`	`+// dwFlags to indicate that we are only loading binaries to read data, not to execute`
	`36`	`+letLOAD_LIBRARY_AS_DATAFILE=2u`
`34`	`37`
`35`	`38`	`/// extracts the win32 manifest of the specified assembly`
`36`	`39`	`letgetManifest(path:string)=`
`@@ -51,8 +54,12 @@ let getManifest (path:string) =`
`51`	`54`	`true`
`52`	`55`	`)`
`53`	`56`
`54`		`-lethLib= NativeMethods.LoadLibrary(path.ToCharArray())`
`55`		`- NativeMethods.EnumResourceNames(hLib, NativeMethods.RT_MANIFEST, callback, IntPtr.Zero)\|> ignore`
	`57`	`+lethLib= NativeMethods.LoadLibraryEx(path, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE)`
	`58`	`+if hLib= IntPtr.Zerothen`
	`59`	`+ printfn"Error loading library%s" path`
	`60`	`+ exit1`
	`61`	`+else`
	`62`	`+ NativeMethods.EnumResourceNames(hLib, NativeMethods.RT_MANIFEST, callback, IntPtr.Zero)\|> ignore`
`56`	`63`	`!manifest`
`57`	`64`
`58`	`65`	`letexePath= System.Reflection.Assembly.GetExecutingAssembly().Location`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita6ec29b

File tree

1 file changed

1 file changed

`‎tests/fsharpqa/Source/Misc/DefaultManifest.fs‎`

0 commit comments