Bugfix/rdmp 162 Fix Error Msg Being Swallowed

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.1.6] - Unreleased
+
+## Changed
+
+- Improve error messages for Multi-ExtractionIdentifier extractions
+
 ## [8.1.5] - 2024-04-03
 
 ## Changed

Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs

@@ -137,7 +137,7 @@ public void Check(ICheckNotifier notifier)
         {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Could not generate valid extraction SQL for dataset {ds} in configuration {config}",
+                    $"Could not generate valid extraction SQL for dataset {ds} in configuration {config}. {e.Message}",
                     CheckResult.Fail, e));
             return;
         }

Rdmp.UI.Tests/UITimeoutAttribute.cs

@@ -42,14 +42,14 @@
             _timeout = timeout;
         }
 
-        [LibraryImport("user32.dll")]
-        private static partial IntPtr SendMessage(IntPtr hWnd, uint Msg, int wParam, IntPtr lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, int wParam, IntPtr lParam);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
 
-        [LibraryImport("user32.dll")]
-        private static partial IntPtr GetDlgItem(IntPtr hDlg, int nIDDlgItem);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr GetDlgItem(IntPtr hDlg, int nIDDlgItem);
 
         private string YesNoDialog = "#32770";
 

Rdmp.UI/RichTextBoxEx.cs

@@ -47,13 +47,13 @@
         public byte bReserved1;
     }
 
-    [LibraryImport("user32.dll")]
-    private static partial IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
     private const int WM_USER = 0x0400;
     private const int EM_GETCHARFORMAT = WM_USER + 58;
     private const int EM_SETCHARFORMAT = WM_USER + 68;
-
+    
     private const int SCF_SELECTION = 0x0001;
     private const int SCF_WORD = 0x0002;
     private const int SCF_ALL = 0x0004;

Rdmp.UI/SimpleDialogs/ConfigurePrimaryKeyCollisionResolverUI.cs

@@ -362,6 +362,6 @@
                 .Count() == 1; //if count of distinct directions is 1 then they are all in the same direction
     }
 
-    [LibraryImport("user32.dll")]
-    private static partial int GetScrollPos(IntPtr hWnd, Orientation nBar);
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    private static extern int GetScrollPos(IntPtr hWnd, Orientation nBar);
 }

Rdmp.UI/TransparentHelpSystem/TransparentHelpForm.cs

@@ -22,9 +22,9 @@
     private readonly Control _host;
     private Control _highlight;
 
-    [LibraryImport("user32.dll", SetLastError = true)]
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
     [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool ShowWindow(IntPtr hWnd, int nCmdShow);
+    private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
     private const uint SW_SHOWNOACTIVATE = 4;
     private const uint WM_NCHITTEST = 0x0084;