[CONSRV][CONSOLE.DLL]

- Correctly retrieve/set the default console properties.
- (for console.dll only): split ApplyConsoleInfo so that it only deals with displaying the confirmation dialog (and set the correct return value for the PSN_APPLY notification message); the code that really sets console properties and save them in the registry is done in the main CPL function, after the property dialog is destroyed and before the CPL returns.

svn path=/trunk/; revision=67068

Author: HBelusca

reactos/dll/cpl/console/colors.c

@@ -81,17 +81,8 @@ ColorsProc(HWND hwndDlg,
             {
                 case PSN_APPLY:
                 {
-                    if (!AppliedConfig)
-                    {
-                        return ApplyConsoleInfo(hwndDlg, ConInfo);
-                    }
-                    else
-                    {
-                        /* Options have already been applied */
-                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
-                        return TRUE;
-                    }
-                    break;
+                    ApplyConsoleInfo(hwndDlg);
+                    return TRUE;
                 }
 
                 case UDN_DELTAPOS:

reactos/dll/cpl/console/console.c

@@ -18,10 +18,12 @@ INT_PTR CALLBACK LayoutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 INT_PTR CALLBACK ColorsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 HINSTANCE hApplet = NULL;
-BOOLEAN AppliedConfig = FALSE;
 
-/* Local copy of the console informations */
+/* Local copy of the console information */
 PCONSOLE_STATE_INFO ConInfo = NULL;
+/* What to do with the console information */
+static BOOL SetConsoleInfo  = FALSE;
+static BOOL SaveConsoleInfo = FALSE;
 
 static VOID
 InitPropSheetPage(PROPSHEETPAGEW *psp,
@@ -40,8 +42,8 @@ InitPropSheetPage(PROPSHEETPAGEW *psp,
 static VOID
 InitDefaultConsoleInfo(PCONSOLE_STATE_INFO pConInfo)
 {
-    /* FIXME: Get also the defaults from the registry */
-    ConCfgInitDefaultSettings(pConInfo);
+    // FIXME: Also retrieve the value of REG_DWORD CurrentPage.
+    ConCfgGetDefaultSettings(pConInfo);
 }
 
 static INT_PTR
@@ -82,90 +84,53 @@ ApplyProc(HWND hwndDlg,
     return FALSE;
 }
 
-BOOL
-ApplyConsoleInfo(HWND hwndDlg,
-                 PCONSOLE_STATE_INFO pConInfo)
+VOID
+ApplyConsoleInfo(HWND hwndDlg)
 {
-    BOOL SetParams  = FALSE;
-    BOOL SaveParams = FALSE;
+    static BOOL ConsoleInfoAlreadySaved = FALSE;
+    
+    /*
+     * We alread applied all the console properties (and saved if needed).
+     * Nothing more needs to be done.
+     */
+    if (ConsoleInfoAlreadySaved)
+        goto Done;
 
     /*
      * If we are setting the default parameters, just save them,
-     * otherwise display the save-confirmation dialog.
+     * otherwise display the confirmation & apply dialog.
      */
-    if (pConInfo->hWnd == NULL)
+    if (ConInfo->hWnd == NULL)
     {
-        SetParams  = FALSE;
-        SaveParams = TRUE; // FIXME: What happens if one clicks on CANCEL??
+        SetConsoleInfo  = FALSE;
+        SaveConsoleInfo = TRUE;
     }
     else
     {
         INT_PTR res = DialogBoxW(hApplet, MAKEINTRESOURCEW(IDD_APPLYOPTIONS), hwndDlg, ApplyProc);
 
-        SetParams  = (res != IDCANCEL);
-        SaveParams = (res == IDC_RADIO_APPLY_ALL);
+        SetConsoleInfo  = (res != IDCANCEL);
+        SaveConsoleInfo = (res == IDC_RADIO_APPLY_ALL);
 
-        if (SetParams == FALSE)
+        if (SetConsoleInfo == FALSE)
         {
-            /* Don't destroy when user presses cancel */
+            /* Don't destroy when the user presses cancel */
             SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
-            // return TRUE;
+            return;
         }
     }
 
-    if (SetParams)
-    {
-        HANDLE hSection;
-        PCONSOLE_STATE_INFO pSharedInfo;
-
-        /*
-         * Create a memory section to share with CONSRV, and map it.
-         */
-        hSection = CreateFileMappingW(INVALID_HANDLE_VALUE,
-                                      NULL,
-                                      PAGE_READWRITE,
-                                      0,
-                                      pConInfo->cbSize,
-                                      NULL);
-        if (!hSection)
-        {
-            DPRINT1("Error when creating file mapping, error = %d\n", GetLastError());
-            return FALSE;
-        }
-
-        pSharedInfo = MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS, 0, 0, 0);
-        if (!pSharedInfo)
-        {
-            DPRINT1("Error when mapping view of file, error = %d\n", GetLastError());
-            CloseHandle(hSection);
-            return FALSE;
-        }
-
-        /* We are applying the chosen configuration */
-        AppliedConfig = TRUE;
-
-        /* Copy the console information into the section */
-        RtlCopyMemory(pSharedInfo, pConInfo, pConInfo->cbSize);
-
-        /* Unmap it */
-        UnmapViewOfFile(pSharedInfo);
-
-        /* Signal to CONSRV that it can apply the new configuration */
-        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
-        SendMessage(pConInfo->hWnd,
-                    WM_SETCONSOLEINFO,
-                    (WPARAM)hSection, 0);
-
-        /* Close the section and return */
-        CloseHandle(hSection);
-    }
-
-    if (SaveParams)
-    {
-        ConCfgWriteUserSettings(pConInfo);
-    }
+    /*
+     * We applied all the console properties (and saved if needed).
+     * Set the flag so that if this function is called again, we won't
+     * need to redo everything again.
+     */
+    ConsoleInfoAlreadySaved = TRUE;
 
-    return TRUE;
+Done:
+    /* Options have been applied */
+    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
+    return;
 }
 
 /* First Applet */
@@ -286,7 +251,56 @@ InitApplet(HANDLE hSectionOrWnd)
     InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS , ColorsProc );
 
     Result = PropertySheetW(&psh);
+    
+    if (SetConsoleInfo)
+    {
+        HANDLE hSection;
+
+        /*
+         * Create a memory section to share with CONSRV, and map it.
+         */
+        hSection = CreateFileMappingW(INVALID_HANDLE_VALUE,
+                                      NULL,
+                                      PAGE_READWRITE,
+                                      0,
+                                      ConInfo->cbSize,
+                                      NULL);
+        if (!hSection)
+        {
+            DPRINT1("Error when creating file mapping, error = %d\n", GetLastError());
+            goto Quit;
+        }
+
+        pSharedInfo = MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS, 0, 0, 0);
+        if (!pSharedInfo)
+        {
+            DPRINT1("Error when mapping view of file, error = %d\n", GetLastError());
+            CloseHandle(hSection);
+            goto Quit;
+        }
+
+        /* Copy the console information into the section */
+        RtlCopyMemory(pSharedInfo, ConInfo, ConInfo->cbSize);
+
+        /* Unmap it */
+        UnmapViewOfFile(pSharedInfo);
 
+        /* Signal to CONSRV that it can apply the new configuration */
+        SendMessage(ConInfo->hWnd,
+                    WM_SETCONSOLEINFO,
+                    (WPARAM)hSection, 0);
+
+        /* Close the section and return */
+        CloseHandle(hSection);
+    }
+
+    if (SaveConsoleInfo)
+    {
+        /* Default settings saved when ConInfo->hWnd == NULL */
+        ConCfgWriteUserSettings(ConInfo, ConInfo->hWnd == NULL);
+    }
+    
+Quit:
     /* Cleanup */
     HeapFree(GetProcessHeap(), 0, ConInfo);
     ConInfo = NULL;

reactos/dll/cpl/console/console.h

@@ -29,10 +29,9 @@ typedef enum _TEXT_TYPE
 } TEXT_TYPE;
 
 /* Globals */
-extern BOOLEAN AppliedConfig;
 extern PCONSOLE_STATE_INFO ConInfo;
 
-BOOL ApplyConsoleInfo(HWND hwndDlg, PCONSOLE_STATE_INFO pConInfo);
+VOID ApplyConsoleInfo(HWND hwndDlg);
 VOID PaintConsole(LPDRAWITEMSTRUCT drawItem, PCONSOLE_STATE_INFO pConInfo);
 BOOL PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_STATE_INFO pConInfo, TEXT_TYPE TextMode);
 

reactos/dll/cpl/console/font.c

@@ -421,17 +421,8 @@ FontProc(HWND hwndDlg,
             {
                 case PSN_APPLY:
                 {
-                    if (!AppliedConfig)
-                    {
-                        return ApplyConsoleInfo(hwndDlg, ConInfo);
-                    }
-                    else
-                    {
-                        /* Options have already been applied */
-                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
-                        return TRUE;
-                    }
-                    break;
+                    ApplyConsoleInfo(hwndDlg);
+                    return TRUE;
                 }
             }
 

reactos/dll/cpl/console/options.c

@@ -127,16 +127,8 @@ OptionsProc(HWND hwndDlg,
             }
             else if (lppsn->hdr.code == PSN_APPLY)
             {
-                if (!AppliedConfig)
-                {
-                    return ApplyConsoleInfo(hwndDlg, ConInfo);
-                }
-                else
-                {
-                    /* Options have already been applied */
-                    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
-                    return TRUE;
-                }
+                ApplyConsoleInfo(hwndDlg);
+                return TRUE;
             }
             break;
         }