Get last error when LoadLibrary fails (#225)

David-Engel · cheenamalhotra · commit 33bad3aac421 · 2019-09-27T10:03:50.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Interop/SNINativeMethodWrapper.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Interop/SNINativeMethodWrapper.cs
@@ -61,7 +61,8 @@ static SNINativeMethodWrapper()
             IntPtr pDll = LoadLibrary(localFolder + subfolder + SNI);
             if (pDll == IntPtr.Zero)
             {
-                throw new System.ComponentModel.Win32Exception("Failed to load " + localFolder + subfolder + SNI);
+                throw new System.ComponentModel.Win32Exception("Failed to load " + localFolder + subfolder + SNI,
+                    new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error()));
             }
         }
 
@@ -389,7 +390,7 @@ internal struct SNI_Error
         #endregion
 
         #region DLL Imports
-        [DllImport("kernel32.dll")]
+        [DllImport("kernel32.dll", SetLastError=true)]
         public static extern IntPtr LoadLibrary(string dllToLoad);
 
         [DllImport("secur32.dll", ExactSpelling = true, SetLastError = true)]

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ static SNINativeMethodWrapper()`
`61`	`61`	`IntPtr pDll = LoadLibrary(localFolder + subfolder + SNI);`
`62`	`62`	`if (pDll == IntPtr.Zero)`
`63`	`63`	`{`
`64`		`- throw new System.ComponentModel.Win32Exception("Failed to load " + localFolder + subfolder + SNI);`
	`64`	`+ throw new System.ComponentModel.Win32Exception("Failed to load " + localFolder + subfolder + SNI,`
	`65`	`+ new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error()));`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
`@@ -389,7 +390,7 @@ internal struct SNI_Error`
`389`	`390`	`#endregion`
`390`	`391`
`391`	`392`	`#region DLL Imports`
`392`		`- [DllImport("kernel32.dll")]`
	`393`	`+ [DllImport("kernel32.dll", SetLastError=true)]`
`393`	`394`	`public static extern IntPtr LoadLibrary(string dllToLoad);`
`394`	`395`
`395`	`396`	`[DllImport("secur32.dll", ExactSpelling = true, SetLastError = true)]`