0.9.0.46: New universal message passing system for printing text output to the Results pane

Author: nfinit

src/sqlite-ce-edit/fileops.c

@@ -1588,19 +1588,11 @@ void DoRestoreDatabase(void) {
 
     /* Reset UI to clean state */
     ClearEditMode();
-    g_lastResultRows = 0;  /* No rowset - prevents grid toggle until next query */
-    SendMessage(g_hwndMain, WM_COMMAND, IDM_VIEWRESULT, 0);  /* Switch to results view */
-    /* Show text view without changing grid preference (like no-rowset queries) */
-    if (g_gridView && g_hwndGrid) {
-        ShowWindow(g_hwndGrid, SW_HIDE);
-        ShowWindow(g_hwndResult, SW_SHOW);
-    }
-    SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, FALSE);
     if (ok) {
-        SetWindowTextW(g_hwndResult, L"Database restored successfully.");
+        ShowResultMessage(L"Database restored successfully.", 1);
         SendMessageW(g_hwndStatus, SB_SETTEXTW, 1, (LPARAM)L"Database restored");
     } else {
-        SetWindowTextW(g_hwndResult, L"Restore failed.");
+        ShowResultMessage(L"Restore failed.", 1);
         MessageBoxW(g_hwndMain, L"Restore failed", L"Error", MB_OK | MB_ICONERROR);
         SendMessageW(g_hwndStatus, SB_SETTEXTW, 1, (LPARAM)L"Restore failed");
     }

src/sqlite-ce-edit/globals.h

@@ -78,11 +78,16 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 #define VIEW_DETAILS 3
 #endif
 
+/* Application view modes for SwitchView() */
+#define VIEW_QUERY   0
+#define VIEW_RESULT  1
+#define VIEW_SCHEMA  2
+
 /*============================================================================
 ** Version
 **============================================================================*/
 
-#define SQLITECEDIT_VERSION L"0.9.0.42"
+#define SQLITECEDIT_VERSION L"0.9.0.46"
 
 /*============================================================================
 ** Menu IDs
@@ -260,6 +265,7 @@ void ClearOutput(void);
 void Output(const char *sz);
 void OutputLine(const char *sz);
 void FlushOutput(void);
+void ShowResultMessage(LPCWSTR msg, int clear);
 
 /*============================================================================
 ** Function Declarations - Editor (editor.c)

src/sqlite-ce-edit/output.c

@@ -29,3 +29,35 @@ void FlushOutput(void) {
         LocalFree(wz);
     }
 }
+
+void ShowResultMessage(LPCWSTR msg, int clear) {
+    if (clear) {
+        g_lastResultRows = 0;
+        SetWindowTextW(g_hwndResult, msg);
+    } else {
+        /* Append to existing text */
+        int existingLen = GetWindowTextLengthW(g_hwndResult);
+        int msgLen = lstrlenW(msg);
+        wchar_t *buf = (wchar_t *)LocalAlloc(LMEM_FIXED, (existingLen + msgLen + 3) * sizeof(wchar_t));
+        if (buf) {
+            GetWindowTextW(g_hwndResult, buf, existingLen + 1);
+            if (existingLen > 0) {
+                buf[existingLen++] = '\r';
+                buf[existingLen++] = '\n';
+            }
+            lstrcpyW(buf + existingLen, msg);
+            SetWindowTextW(g_hwndResult, buf);
+            LocalFree(buf);
+        }
+    }
+    /* Switch to text results view */
+    SwitchView(VIEW_RESULT);
+    SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
+    SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
+    SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+    if (g_gridView && g_hwndGrid) {
+        ShowWindow(g_hwndGrid, SW_HIDE);
+        ShowWindow(g_hwndResult, SW_SHOW);
+    }
+    SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, FALSE);
+}