[ros-diffs] [ekohl] 70600: [MMC] - Prepare the 'file open', 'file save' and 'file save as' actions. - Store the file name in the console struncture.

Author: ekohl
Date: Sat Jan 16 15:17:12 2016
New Revision: 70600

URL: http://svn.reactos.org/svn/reactos?rev=70600&view=rev
Log:
[MMC]
- Prepare the 'file open', 'file save' and 'file save as'
actions.
- Store the file name in the console struncture.

Modified:
    trunk/reactos/base/applications/mmc/CMakeLists.txt
    trunk/reactos/base/applications/mmc/console.c
    trunk/reactos/base/applications/mmc/lang/bg-BG.rc
    trunk/reactos/base/applications/mmc/lang/ca-ES.rc
    trunk/reactos/base/applications/mmc/lang/cs-CZ.rc
    trunk/reactos/base/applications/mmc/lang/de-DE.rc
    trunk/reactos/base/applications/mmc/lang/el-GR.rc
    trunk/reactos/base/applications/mmc/lang/en-US.rc
    trunk/reactos/base/applications/mmc/lang/es-ES.rc
    trunk/reactos/base/applications/mmc/lang/fr-FR.rc
    trunk/reactos/base/applications/mmc/lang/he-IL.rc
    trunk/reactos/base/applications/mmc/lang/it-IT.rc
    trunk/reactos/base/applications/mmc/lang/ko-KR.rc
    trunk/reactos/base/applications/mmc/lang/lt-LT.rc
    trunk/reactos/base/applications/mmc/lang/ms-MY.rc
    trunk/reactos/base/applications/mmc/lang/no-NO.rc
    trunk/reactos/base/applications/mmc/lang/pl-PL.rc
    trunk/reactos/base/applications/mmc/lang/pt-BR.rc
    trunk/reactos/base/applications/mmc/lang/ro-RO.rc
    trunk/reactos/base/applications/mmc/lang/ru-RU.rc
    trunk/reactos/base/applications/mmc/lang/sk-SK.rc
    trunk/reactos/base/applications/mmc/lang/sq-AL.rc
    trunk/reactos/base/applications/mmc/lang/sv-SE.rc
    trunk/reactos/base/applications/mmc/lang/tr-TR.rc
    trunk/reactos/base/applications/mmc/lang/uk-UA.rc
    trunk/reactos/base/applications/mmc/lang/zh-CN.rc
    trunk/reactos/base/applications/mmc/lang/zh-TW.rc
    trunk/reactos/base/applications/mmc/mmc.c
    trunk/reactos/base/applications/mmc/precomp.h
    trunk/reactos/base/applications/mmc/resource.h

Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak…
==============================================================================
--- trunk/reactos/base/applications/mmc/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/CMakeLists.txt	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -6,7 +6,8 @@
     precomp.h)
 
 add_rc_deps(mmc.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/mmc.ico)
-add_executable(mmcclient ${SOURCE} mmc.rc)
-set_module_type(mmcclient win32gui UNICODE)
-add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt
kernel32)
-add_pch(mmcclient precomp.h SOURCE)
+add_executable(mmc ${SOURCE} mmc.rc)
+set_module_type(mmc win32gui UNICODE)
+add_importlibs(mmc user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32
ntdll)
+add_pch(mmc precomp.h SOURCE)
+add_cd_file(TARGET mmc DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/mmc/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/cons…
==============================================================================
--- trunk/reactos/base/applications/mmc/console.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/console.c	[iso-8859-1] Sat Jan 16 15:17:12 2016
@@ -21,34 +21,14 @@
 
 #include "resource.h"
 
-static const TCHAR szMMCMainFrame[] = TEXT("MMCMainFrame");
-static const TCHAR szMMCChildFrm[] = TEXT("MMCChildFrm");
-
-static ULONG NewConsoleCount = 0;
-
-static LPTSTR
-CreateNewConsoleTitle(VOID)
-{
-    LPTSTR lpTitle;
-
-    if (LoadAndFormatString(hAppInstance,
-                            IDS_CONSOLETITLE,
-                            &lpTitle,
-                            ++NewConsoleCount) == 0)
-    {
-        lpTitle = NULL;
-    }
-
-    return lpTitle;
-}
-
+#define NDEBUG
+#include <debug.h>
 
 typedef struct _CONSOLE_MAINFRAME_WND
 {
     HWND hwnd;
     HWND hwndMDIClient;
 
-    LPCTSTR lpConsoleTitle;
     HMENU hMenuConsoleSmall;
     HMENU hMenuConsoleLarge;
     INT nConsoleCount;
@@ -62,6 +42,46 @@
     };
 } CONSOLE_MAINFRAME_WND, *PCONSOLE_MAINFRAME_WND;
 
+typedef struct _CONSOLE_CHILDFRM_WND
+{
+    HWND hwnd;
+    PCONSOLE_MAINFRAME_WND MainFrame;
+    PTSTR pFileName;
+} CONSOLE_CHILDFRM_WND, *PCONSOLE_CHILDFRM_WND;
+
+static const TCHAR szMMCMainFrame[] = TEXT("MMCMainFrame");
+static const TCHAR szMMCChildFrm[] = TEXT("MMCChildFrm");
+
+static ULONG NewConsoleCount = 0;
+
+PCONSOLE_CHILDFRM_WND
+GetActiveChildInfo(VOID)
+{
+    HWND hWndMDIChild;
+
+    hWndMDIChild = (HWND)SendMessageW(hwndMDIClient, WM_MDIGETACTIVE, 0, 0);
+    if (hWndMDIChild == NULL)
+        return NULL;
+
+    return (PCONSOLE_CHILDFRM_WND)GetWindowLongPtr(hWndMDIChild, 0);
+}
+
+
+static LPTSTR
+CreateNewConsoleTitle(VOID)
+{
+    LPTSTR lpTitle;
+
+    if (LoadAndFormatString(hAppInstance,
+                            IDS_CONSOLETITLE,
+                            &lpTitle,
+                            ++NewConsoleCount) == 0)
+    {
+        lpTitle = NULL;
+    }
+
+    return lpTitle;
+}
 
 HWND
 CreateNewMDIChild(PCONSOLE_MAINFRAME_WND Info,
@@ -96,14 +116,11 @@
     LPCTSTR lpFileName = (LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams);
 
     Info = HeapAlloc(hAppHeap,
-                     0,
+                     HEAP_ZERO_MEMORY,
                      sizeof(CONSOLE_MAINFRAME_WND));
     if (Info == NULL)
         return -1;
 
-    ZeroMemory(Info,
-               sizeof(CONSOLE_MAINFRAME_WND));
-
     Info->hwnd = hwnd;
 
     SetWindowLongPtr(hwnd,
@@ -120,19 +137,18 @@
     {
         /* FIXME */
         Info->AppAuthorMode = TRUE;
-        Info->lpConsoleTitle = TEXT("ReactOS Management Console");
+//        Info->lpConsoleTitle = TEXT("ReactOS Management Console");
     }
     else
     {
         Info->AppAuthorMode = TRUE;
-        Info->lpConsoleTitle = CreateNewConsoleTitle();
+//        Info->lpConsoleTitle = CreateNewConsoleTitle();
     }
 
     SetMenu(Info->hwnd,
             Info->hMenuConsoleSmall);
 
-    SetWindowText(Info->hwnd,
-                  Info->lpConsoleTitle);
+    SetWindowText(Info->hwnd, TEXT("ReactOS Management Console"));
 
     ccs.hWindowMenu = GetSubMenu(Info->hMenuConsoleLarge, 1);
     ccs.idFirstChild = IDM_MDI_FIRSTCHILD;
@@ -158,6 +174,134 @@
 
 
 static VOID
+SetFileName(
+    PCONSOLE_CHILDFRM_WND Info,
+    PWSTR pFileName)
+{
+    DPRINT1("SetFileName(&p \'%S\')\n", Info, pFileName);
+
+    if (Info->pFileName != NULL)
+    {
+        HeapFree(GetProcessHeap(), 0, Info->pFileName);
+        Info->pFileName = NULL;
+    }
+
+    if (pFileName != NULL)
+    {
+        Info->pFileName = HeapAlloc(GetProcessHeap(),
+                                    0,
+                                    (_tcslen(pFileName) + 1) * sizeof(TCHAR));
+        if (Info->pFileName != NULL)
+            _tcscpy(Info->pFileName, pFileName);
+    }
+}
+
+static BOOL
+DoSaveFileAs(
+    HWND hWnd,
+    PCONSOLE_CHILDFRM_WND pChildInfo);
+
+static BOOL
+DoSaveFile(
+    HWND hWnd,
+    PCONSOLE_CHILDFRM_WND pChildInfo)
+{
+    DPRINT1("pChildInfo %p\n", pChildInfo);
+
+    DPRINT1("FileName %S\n", pChildInfo->pFileName);
+
+    if (pChildInfo->pFileName == NULL)
+        return DoSaveFileAs(hWnd, pChildInfo);
+
+    /* FIXME: Save the console here! */
+
+    return TRUE;
+}
+
+static BOOL
+DoSaveFileAs(
+    HWND hWnd,
+    PCONSOLE_CHILDFRM_WND pChildInfo)
+{
+    OPENFILENAME saveas;
+    TCHAR szPath[MAX_PATH];
+
+    DPRINT1("pChildInfo %p\n", pChildInfo);
+    DPRINT1("FileName %S\n", pChildInfo->pFileName);
+
+    ZeroMemory(&saveas, sizeof(saveas));
+
+    if (pChildInfo->pFileName != NULL)
+    {
+        _tcscpy(szPath, pChildInfo->pFileName);
+    }
+    else
+    {
+        GetWindowText(pChildInfo->hwnd, szPath, MAX_PATH);
+        _tcscat(szPath, TEXT(".msc"));
+    }
+
+    saveas.lStructSize = sizeof(OPENFILENAME);
+    saveas.hwndOwner = hWnd;
+    saveas.hInstance = hAppInstance;
+    saveas.lpstrFilter = L"MSC Files\0*.msc\0";
+    saveas.lpstrFile = szPath;
+    saveas.nMaxFile = MAX_PATH;
+    saveas.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT;
+    saveas.lpstrDefExt = L"msc";
+
+    if (GetSaveFileName(&saveas))
+    {
+        /* HACK: Because in ROS, Save-As boxes don't check the validity
+         * of file names and thus, here, szPath can be invalid !! We only
+         * see its validity when we call DoSaveFile()... */
+        SetFileName(pChildInfo, szPath);
+
+        if (DoSaveFile(hWnd, pChildInfo))
+        {
+//            UpdateWindowCaption();
+            return TRUE;
+        }
+        else
+        {
+            SetFileName(pChildInfo, NULL);
+            return FALSE;
+        }
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+static BOOL
+FrameOnSave(
+    HWND hWnd)
+{
+    PCONSOLE_CHILDFRM_WND pChildInfo;
+
+    pChildInfo = GetActiveChildInfo();
+    if (pChildInfo == NULL)
+        return FALSE;
+
+    return DoSaveFile(hWnd, pChildInfo);
+}
+
+
+static BOOL
+FrameOnSaveAs(
+    HWND hWnd)
+{
+    PCONSOLE_CHILDFRM_WND pChildInfo;
+
+    pChildInfo = GetActiveChildInfo();
+    if (pChildInfo == NULL)
+        return FALSE;
+
+    return DoSaveFileAs(hWnd, pChildInfo);
+}
+
+static VOID
 FrameOnCommand(HWND hwnd,
                UINT uMsg,
                WPARAM wParam,
@@ -174,6 +318,14 @@
             CreateNewMDIChild(Info, hwndMDIClient);
             SetMenu(Info->hwnd,
                     Info->hMenuConsoleLarge);
+            break;
+
+        case IDM_FILE_SAVE:
+            FrameOnSave(hwnd);
+            break;
+
+        case IDM_FILE_SAVEAS:
+            FrameOnSaveAs(hwnd);
             break;
 
         case IDM_FILE_EXIT:
@@ -310,12 +462,6 @@
 }
 
 
-typedef struct _CONSOLE_CHILDFRM_WND
-{
-    HWND hwnd;
-    PCONSOLE_MAINFRAME_WND MainFrame;
-} CONSOLE_CHILDFRM_WND, *PCONSOLE_CHILDFRM_WND;
-
 static LRESULT CALLBACK
 ConsoleChildFrmProc(IN HWND hwnd,
                     IN UINT uMsg,
@@ -331,13 +477,10 @@
     {
         case WM_CREATE:
             Info = HeapAlloc(hAppHeap,
-                             0,
+                             HEAP_ZERO_MEMORY,
                              sizeof(CONSOLE_CHILDFRM_WND));
             if (Info != NULL)
             {
-                ZeroMemory(Info,
-                           sizeof(CONSOLE_CHILDFRM_WND));
-
                 Info->hwnd = hwnd;
 
                 SetWindowLongPtr(hwnd,
@@ -348,7 +491,12 @@
 
        case WM_DESTROY:
            if (Info != NULL)
-                HeapFree(hAppHeap, 0, Info);
+           {
+               if (Info->pFileName)
+                   HeapFree(hAppHeap, 0, Info->pFileName);
+
+               HeapFree(hAppHeap, 0, Info);
+           }
 
            PostMessage(hwndMainConsole, WM_USER_CLOSE_CHILD, 0, 0);
            break;

Modified: trunk/reactos/base/applications/mmc/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/bg-BG.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Из&ход\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Из&ход\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ca-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ca-ES.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Fitxer"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Fitxer"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/cs-CZ.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -10,6 +10,7 @@
     POPUP "&Soubor"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Uk&ončit\tAlt+F4", IDM_FILE_EXIT
     END
@@ -24,6 +25,9 @@
     POPUP "&Soubor"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Uk&ončit\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/de-DE.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Datei"
     BEGIN
         MENUITEM "Neu\tStrg+N", IDM_FILE_NEW
+        MENUITEM "Öffnen\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Datei"
     BEGIN
         MENUITEM "Neu\tStrg+N", IDM_FILE_NEW
+        MENUITEM "Öffnen\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Speichern", IDM_FILE_SAVE
+        MENUITEM "Speichern unter...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/el-GR.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Αρχείο"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Έ&ξοδος\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Αρχείο"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Έ&ξοδος\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/en-US.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&File"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&File"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/es-ES.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -11,6 +11,7 @@
     POPUP "&Archivo"
     BEGIN
         MENUITEM "Nuevo\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT
     END
@@ -25,6 +26,9 @@
     POPUP "&Archivo"
     BEGIN
         MENUITEM "Nuevo\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/fr-FR.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Fichier"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Fichier"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/he-IL.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&קובץ"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&יציאה\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&קובץ"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&יציאה\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/it-IT.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&File"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&File"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ko-KR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ko-KR.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "파일(&F)"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "종료(&E)\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "파일(&F)"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "종료(&E)\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "&Byla"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "&Byla"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/ms-MY.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ms-MY.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ms-MY.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "&Fail"
     BEGIN
         MENUITEM "Baru\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Keluar(&X)\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "&Fail"
     BEGIN
         MENUITEM "Baru\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Keluar(&X)\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/no-NO.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Fil"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Fil"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/pl-PL.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -12,6 +12,7 @@
     POPUP "Pl&ik"
     BEGIN
         MENUITEM "Nowa\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Za&kończ\tAlt+F4", IDM_FILE_EXIT
     END
@@ -26,6 +27,9 @@
     POPUP "Pl&ik"
     BEGIN
         MENUITEM "Nowa\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Za&kończ\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/pt-BR.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -5,6 +5,7 @@
     POPUP "&Arquivo"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT
     END
@@ -19,6 +20,9 @@
     POPUP "&Arquivo"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -11,6 +11,7 @@
     POPUP "&Fișier"
     BEGIN
         MENUITEM "&Nou\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "I&eșire\tAlt+F4", IDM_FILE_EXIT
     END
@@ -25,6 +26,9 @@
     POPUP "&Fișier"
     BEGIN
         MENUITEM "&Nou\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "I&eșire\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "&Создать\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Выход\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "&Создать\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Выход\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/sk-SK.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -13,6 +13,7 @@
     POPUP "&Súbor"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Skončiť\tAlt+F4", IDM_FILE_EXIT
     END
@@ -27,6 +28,9 @@
     POPUP "&Súbor"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Skončiť\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/sq-AL.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -9,6 +9,7 @@
     POPUP "&File"
     BEGIN
         MENUITEM "I Ri\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "D&il\tAlt+F4", IDM_FILE_EXIT
     END
@@ -23,6 +24,9 @@
     POPUP "&File"
     BEGIN
         MENUITEM "I Ri\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "D&il\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/sv-SE.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "&Arkiv"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "&Arkiv"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -7,6 +7,7 @@
     POPUP "&Kütük"
     BEGIN
         MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış\tAlt+F4", IDM_FILE_EXIT
     END
@@ -21,6 +22,9 @@
     POPUP "&Kütük"
     BEGIN
         MENUITEM "&Yeni\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -13,6 +13,7 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "В&ихід\tAlt+F4", IDM_FILE_EXIT
     END
@@ -27,6 +28,9 @@
     POPUP "&Файл"
     BEGIN
         MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "В&ихід\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/zh-CN.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -13,6 +13,7 @@
     POPUP "档案(&F)"
     BEGIN
         MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "结束(&X)\tAlt+F4", IDM_FILE_EXIT
     END
@@ -27,6 +28,9 @@
     POPUP "档案(&F)"
     BEGIN
         MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "结束(&X)\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/zh-TW.rc	[iso-8859-1] Sat Jan 16 15:17:12
2016
@@ -13,6 +13,7 @@
     POPUP "檔案(&F)"
     BEGIN
         MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "結束(&X)\tAlt+F4", IDM_FILE_EXIT
     END
@@ -27,6 +28,9 @@
     POPUP "檔案(&F)"
     BEGIN
         MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Open\tStrg+O", IDM_FILE_OPEN
+        MENUITEM "Save", IDM_FILE_SAVE
+        MENUITEM "Save as...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "結束(&X)\tAlt+F4", IDM_FILE_EXIT
     END

Modified: trunk/reactos/base/applications/mmc/mmc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.…
==============================================================================
--- trunk/reactos/base/applications/mmc/mmc.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/mmc.c	[iso-8859-1] Sat Jan 16 15:17:12 2016
@@ -19,8 +19,6 @@
 
 #include "precomp.h"
 
-#include <tchar.h>
-#include <commctrl.h>
 
 HINSTANCE hAppInstance;
 HANDLE hAppHeap;

Modified: trunk/reactos/base/applications/mmc/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec…
==============================================================================
--- trunk/reactos/base/applications/mmc/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/precomp.h	[iso-8859-1] Sat Jan 16 15:17:12 2016
@@ -5,7 +5,11 @@
 
 #include <windef.h>
 #include <winbase.h>
+#include <wingdi.h>
 #include <winuser.h>
+#include <commctrl.h>
+#include <commdlg.h>
+#include <tchar.h>
 
 #define WM_USER_CLOSE_CHILD (WM_USER + 1)
 

Modified: trunk/reactos/base/applications/mmc/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso…
==============================================================================
--- trunk/reactos/base/applications/mmc/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/resource.h	[iso-8859-1] Sat Jan 16 15:17:12 2016
@@ -10,6 +10,8 @@
 
 #define IDM_FILE_NEW     1002
 #define IDM_FILE_OPEN    1003
+#define IDM_FILE_SAVE    1004
+#define IDM_FILE_SAVEAS  1005
 #define IDM_FILE_EXIT    1010
 #define IDM_WINDOWS_LIST 2001
 #define IDM_HELP_ABOUT   9001