Cleanup after first check-in.

svn path=/trunk/; revision=3174

diff --git a/rosapps/regedit/StdAfx.cpp b/rosapps/regedit/StdAfx.cpp
index 6c7578e..93e2748 100644 (file)
--- a/rosapps/regedit/StdAfx.cpp
+++ b/rosapps/regedit/StdAfx.cpp
@@ -1,6 +1,6 @@
 // stdafx.cpp : source file that includes just the standard includes
 // stdafx.cpp : source file that includes just the standard includes

-//     regedit.pch will be the pre-compiled header
-//     stdafx.obj will contain the pre-compiled type information
+//  regedit.pch will be the pre-compiled header
+//  stdafx.obj will contain the pre-compiled type information

 
 #include "stdafx.h"
 
 
 #include "stdafx.h"
 

diff --git a/rosapps/regedit/StdAfx.h b/rosapps/regedit/StdAfx.h
index d1cb567..273cb9d 100644 (file)
--- a/rosapps/regedit/StdAfx.h
+++ b/rosapps/regedit/StdAfx.h
@@ -10,7 +10,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
 #pragma once
 #endif // _MSC_VER > 1000
 

-#define WIN32_LEAN_AND_MEAN            // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers

 
 
 // Windows Header Files:
 
 
 // Windows Header Files:

diff --git a/rosapps/regedit/about.h b/rosapps/regedit/about.h
index a12f2b1..fabcfb3 100644 (file)
--- a/rosapps/regedit/about.h
+++ b/rosapps/regedit/about.h
@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-       
+    

 #ifndef __ABOUT_H__
 #define __ABOUT_H__
 
 #ifndef __ABOUT_H__
 #define __ABOUT_H__
 

diff --git a/rosapps/regedit/debug.cpp b/rosapps/regedit/debug.cpp
index f2bd341..2ea2b54 100644 (file)
--- a/rosapps/regedit/debug.cpp
+++ b/rosapps/regedit/debug.cpp
@@ -23,7 +23,7 @@
 #ifdef _MSC_VER
 #include "stdafx.h"
 #else
 #ifdef _MSC_VER
 #include "stdafx.h"
 #else

-#define WIN32_LEAN_AND_MEAN            // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers

 #include <windows.h>
 #include <commctrl.h>
 #include <stdlib.h>
 #include <windows.h>
 #include <commctrl.h>
 #include <stdlib.h>


@@ -33,7 +33,7 @@
 #include <process.h>
 #include <stdio.h>
 #endif
 #include <process.h>
 #include <stdio.h>
 #endif

-       
+    

 #include "regedit.h"
 #include "debug.h"
 
 #include "regedit.h"
 #include "debug.h"
 

diff --git a/rosapps/regedit/debug.h b/rosapps/regedit/debug.h
index 39d1562..f9f96e6 100644 (file)
--- a/rosapps/regedit/debug.h
+++ b/rosapps/regedit/debug.h
@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-       
+    

 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 

diff --git a/rosapps/regedit/regedit.cpp b/rosapps/regedit/regedit.cpp
index adc4607..3b60edb 100644 (file)
--- a/rosapps/regedit/regedit.cpp
+++ b/rosapps/regedit/regedit.cpp
@@ -23,7 +23,7 @@
 #ifdef _MSC_VER
 #include "stdafx.h"
 #else
 #ifdef _MSC_VER
 #include "stdafx.h"
 #else

-#define WIN32_LEAN_AND_MEAN            // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers

 #include <windows.h>
 #include <commctrl.h>
 #include <stdlib.h>
 #include <windows.h>
 #include <commctrl.h>
 #include <stdlib.h>


@@ -33,7 +33,7 @@
 #include <process.h>
 #include <stdio.h>
 #endif
 #include <process.h>
 #include <stdio.h>
 #endif

-       
+    

 #include "regedit.h"
 #include "regtree.h"
 #include "reglist.h"
 #include "regedit.h"
 #include "regtree.h"
 #include "reglist.h"


@@ -189,7 +189,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 
     // Create the status bar
     hStatusWnd = CreateStatusWindow(WS_VISIBLE|WS_CHILD|WS_CLIPSIBLINGS|SBT_NOBORDERS, 
 
     // Create the status bar
     hStatusWnd = CreateStatusWindow(WS_VISIBLE|WS_CHILD|WS_CLIPSIBLINGS|SBT_NOBORDERS, 

-                                           "", hMainWnd, STATUS_WINDOW);
+                                    "", hMainWnd, STATUS_WINDOW);

     if (!hStatusWnd)
         return FALSE;
 
     if (!hStatusWnd)
         return FALSE;
 


@@ -202,18 +202,18 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 /*
     hSplitWnd = CreateWindow(szFrameClass, "splitter window", WS_VISIBLE|WS_CHILD,
                             CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 
 /*
     hSplitWnd = CreateWindow(szFrameClass, "splitter window", WS_VISIBLE|WS_CHILD,
                             CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 

-                                                       hMainWnd, (HMENU)SPLIT_WINDOW, hInstance, NULL);
+                            hMainWnd, (HMENU)SPLIT_WINDOW, hInstance, NULL);

     if (!hSplitWnd)
         return FALSE;
  */
     if (!hSplitWnd)
         return FALSE;
  */

-       hTreeWnd = CreateTreeView(hMainWnd, "c:\\foobar.txt");
+    hTreeWnd = CreateTreeView(hMainWnd, "c:\\foobar.txt");

     if (!hTreeWnd)
         return FALSE;
 
     hListWnd = CreateListView(hMainWnd, "");
     if (!hListWnd)
         return FALSE;
     if (!hTreeWnd)
         return FALSE;
 
     hListWnd = CreateListView(hMainWnd, "");
     if (!hListWnd)
         return FALSE;

-               
+        

     ShowWindow(hMainWnd, nCmdShow);
     UpdateWindow(hMainWnd);
     return TRUE;
     ShowWindow(hMainWnd, nCmdShow);
     UpdateWindow(hMainWnd);
     return TRUE;


@@ -250,8 +250,8 @@ void OnSize(UINT nType, int cx, int cy)
 
     GetWindowRect(hStatusWnd, &rc);
 
 
     GetWindowRect(hStatusWnd, &rc);
 

-       MoveWindow(hTreeWnd,0,0,cx/2,cy-(rc.bottom - rc.top),TRUE);
-       MoveWindow(hListWnd,cx/2,0,cx,cy-(rc.bottom - rc.top),TRUE);
+    MoveWindow(hTreeWnd,0,0,cx/2,cy-(rc.bottom - rc.top),TRUE);
+    MoveWindow(hListWnd,cx/2,0,cx,cy-(rc.bottom - rc.top),TRUE);

 
 }
 
 
 }
 


@@ -291,11 +291,11 @@ void OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu)
     TCHAR str[100];
 
     strcpy(str, TEXT(""));
     TCHAR str[100];
 
     strcpy(str, TEXT(""));

-       if (nFlags & MF_POPUP) {
-               if (hSysMenu != GetMenu(hWnd)) {
-                       if (nItemID == 2) nItemID = 5;
-               }
-       }
+    if (nFlags & MF_POPUP) {
+        if (hSysMenu != GetMenu(hWnd)) {
+            if (nItemID == 2) nItemID = 5;
+        }
+    }

     if (LoadString(hInst, nItemID, str, 100)) {
         // load appropriate string
         LPTSTR lpsz = str;
     if (LoadString(hInst, nItemID, str, 100)) {
         // load appropriate string
         LPTSTR lpsz = str;


@@ -324,7 +324,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         switch (wmId) {
             case IDM_ABOUT:
 //                ShowAboutBox(hWnd);
         switch (wmId) {
             case IDM_ABOUT:
 //                ShowAboutBox(hWnd);

-                               {
+                {

                 HICON hIcon = LoadIcon(hInst, (LPCTSTR)IDI_REGEDIT);
                 ShellAbout(hWnd, szTitle, "FrameWndProc", hIcon);
                 //if (hIcon) DestroyIcon(hIcon); // NOT REQUIRED
                 HICON hIcon = LoadIcon(hInst, (LPCTSTR)IDI_REGEDIT);
                 ShellAbout(hWnd, szTitle, "FrameWndProc", hIcon);
                 //if (hIcon) DestroyIcon(hIcon); // NOT REQUIRED


@@ -386,16 +386,16 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             //PageSetupDlg(&psd);
             break;
         case ID_REGISTRY_OPENLOCAL:
             //PageSetupDlg(&psd);
             break;
         case ID_REGISTRY_OPENLOCAL:

-                       {
+            {

             HWND hChildWnd;
 //            hChildWnd = CreateWindow(szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_CHILD,
 //                                   CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hWnd, NULL, hInst, NULL);
             hChildWnd = CreateWindow(szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_CHILD,
                                      0, 0, 150, 170, hWnd, NULL, hInst, NULL);
             HWND hChildWnd;
 //            hChildWnd = CreateWindow(szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_CHILD,
 //                                   CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hWnd, NULL, hInst, NULL);
             hChildWnd = CreateWindow(szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_CHILD,
                                      0, 0, 150, 170, hWnd, NULL, hInst, NULL);

-                       if (hChildWnd) {
-                               ShowWindow(hChildWnd, 1);
-                               UpdateWindow(hChildWnd);
-                       }
+            if (hChildWnd) {
+                ShowWindow(hChildWnd, 1);
+                UpdateWindow(hChildWnd);
+            }

             }
             break;
         case IDM_ABOUT:
             }
             break;
         case IDM_ABOUT:

diff --git a/rosapps/regedit/regedit.rc b/rosapps/regedit/regedit.rc
index 0746237..0d898d1 100644 (file)
--- a/rosapps/regedit/regedit.rc
+++ b/rosapps/regedit/regedit.rc
@@ -130,7 +130,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "System"
 BEGIN
 CAPTION "About"
 FONT 8, "System"
 BEGIN

-    ICON            IDI_REGEDIT,IDC_MYICON,14,9,16,16
+    ICON            IDI_REGEDIT,IDI_REGEDIT,14,9,16,16

     LTEXT           "ReactOS regedit Version 1.0",IDC_STATIC,49,10,119,8,
                     SS_NOPREFIX
     LTEXT           "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8
     LTEXT           "ReactOS regedit Version 1.0",IDC_STATIC,49,10,119,8,
                     SS_NOPREFIX
     LTEXT           "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8

diff --git a/rosapps/regedit/regtree.cpp b/rosapps/regedit/regtree.cpp
index b11f942..4ec81e4 100644 (file)
--- a/rosapps/regedit/regtree.cpp
+++ b/rosapps/regedit/regtree.cpp
@@ -128,8 +128,8 @@ HTREEITEM AddItemToTree(HWND hwndTV, LPSTR lpszItem, int nLevel)
 
 BOOL InitTreeViewItems(HWND hwndTV, LPSTR lpszFileName) 
 { 
 
 BOOL InitTreeViewItems(HWND hwndTV, LPSTR lpszFileName) 
 { 

-       HTREEITEM hItem;
-       
+    HTREEITEM hItem;
+    

     hItem = AddItemToTree(hwndTV, "My Computer", 1); 
     AddItemToTree(hwndTV, "HKEY_CLASSES_ROOT", 2); 
     AddItemToTree(hwndTV, "HKEY_CURRENT_USER", 2); 
     hItem = AddItemToTree(hwndTV, "My Computer", 1); 
     AddItemToTree(hwndTV, "HKEY_CLASSES_ROOT", 2); 
     AddItemToTree(hwndTV, "HKEY_CURRENT_USER", 2); 


@@ -137,7 +137,7 @@ BOOL InitTreeViewItems(HWND hwndTV, LPSTR lpszFileName)
     AddItemToTree(hwndTV, "HKEY_USERS", 2); 
     AddItemToTree(hwndTV, "HKEY_CURRENT_CONFIG", 2); 
 
     AddItemToTree(hwndTV, "HKEY_USERS", 2); 
     AddItemToTree(hwndTV, "HKEY_CURRENT_CONFIG", 2); 
 

-       TreeView_Expand(hwndTV, hItem, TVE_EXPAND);
+    TreeView_Expand(hwndTV, hItem, TVE_EXPAND);

     return TRUE; 
 } 
  
     return TRUE; 
 } 
  

diff --git a/rosapps/regedit/resource.h b/rosapps/regedit/resource.h
index b207e34..d59591b 100644 (file)
--- a/rosapps/regedit/resource.h
+++ b/rosapps/regedit/resource.h
@@ -2,8 +2,13 @@
 // Microsoft Developer Studio generated include file.
 // Used by regedit.rc
 //
 // Microsoft Developer Studio generated include file.
 // Used by regedit.rc
 //

-#define IDC_MYICON                      2
-#define IDD_REGED_DIALOG                102
+#define ID_REGISTRY_MENU                0
+#define ID_EDIT_MENU                    1
+#define ID_FILE_MENU                    2
+#define ID_VIEW_MENU                    3
+#define ID_FAVOURITES_MENU              4
+#define ID_EDIT_NEW_MENU                5
+

 #define IDD_ABOUTBOX                    103
 #define IDS_APP_TITLE                   103
 #define IDM_ABOUT                       104
 #define IDD_ABOUTBOX                    103
 #define IDS_APP_TITLE                   103
 #define IDM_ABOUT                       104


@@ -13,20 +18,11 @@
 #define IDI_SMALL                       108
 #define IDC_REGEDIT                     109
 #define IDC_REGEDIT_FRAME               110
 #define IDI_SMALL                       108
 #define IDC_REGEDIT                     109
 #define IDC_REGEDIT_FRAME               110

-#define IDR_MAINFRAME                   128

 #define IDR_REGEDIT_MENU                130
 #define IDD_DIALOG1                     131
 #define IDR_REGEDIT_MENU                130
 #define IDD_DIALOG1                     131

-
-#define ID_REGISTRY_MENU                0
-#define ID_EDIT_MENU                    1
-#define ID_FILE_MENU                    2
-#define ID_VIEW_MENU                    3
-#define ID_FAVOURITES_MENU              4
-#define ID_EDIT_NEW_MENU                5
-
-#define IDB_OPEN_FILE                  97
-#define IDB_CLOSED_FILE                 98
-#define IDB_ROOT                        99
+#define IDB_OPEN_FILE                   132
+#define IDB_CLOSED_FILE                 133
+#define IDB_ROOT                        134

 
 #define ID_HELP_HELPTOPICS              32771
 #define ID_FAVOURITES_ADDTOFAVOURITES   32772
 
 #define ID_HELP_HELPTOPICS              32771
 #define ID_FAVOURITES_ADDTOFAVOURITES   32772