Author: hbelusca
Date: Sat Jun 29 23:18:27 2013
New Revision: 59377
URL: http://svn.reactos.org/svn/reactos?rev=59377&view=rev
Log:
[CMD]
Fix some whitespace and misspellings (part 1/x)
Modified:
trunk/reactos/base/shell/cmd/cmd.rc
trunk/reactos/base/shell/cmd/readme.txt
trunk/reactos/base/shell/cmd/ren.txt
trunk/reactos/base/shell/cmd/todo.txt
Modified: trunk/reactos/base/shell/cmd/cmd.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] Sat Jun 29 23:18:27 2013
@@ -3,28 +3,28 @@
#include "resource.h"
#include "cmdver.h"
-#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0"
-#define REACTOS_STR_INTERNAL_NAME "cmd\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0"
-#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0"
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0"
+#define REACTOS_STR_INTERNAL_NAME "cmd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0"
#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0"
#include <reactos/version.rc>
STRINGTABLE DISCARDABLE
BEGIN
- STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\
- Evan Jeffrey Steffen Kaiser\n\
- Svante Frey Oliver Mueller\n\
- Aaron Kaufman Marc Desrochers\n\
- Rob Lake John P Price\n\
- Hans B Pufal\n"
+ STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\
+ Evan Jeffrey Steffen Kaiser\n\
+ Svante Frey Oliver Mueller\n\
+ Aaron Kaufman Marc Desrochers\n\
+ Rob Lake John P Price\n\
+ Hans B Pufal\n"
- STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\
- Paolo Pantaleo Phillip Susi\n\
- Sylvain Petreolle\n"
+ STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\
+ Paolo Pantaleo Phillip Susi\n\
+ Sylvain Petreolle\n"
END
-1 ICON DISCARDABLE res/terminal.ico
+1 ICON DISCARDABLE res/terminal.ico
#include "rsrc.rc"
Modified: trunk/reactos/base/shell/cmd/readme.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme.txt?…
==============================================================================
--- trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] Sat Jun 29 23:18:27 2013
@@ -47,9 +47,7 @@
Brandon Turner <turnerb7(a)msu.edu>
-
Bugs
~~~~
-There is still many bugs ;)
+There are still many bugs ;)
Please report bugs to ReactOS team <ros-dev(a)reactos.org> or to JIRA at www.reactos.org
-
Modified: trunk/reactos/base/shell/cmd/ren.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev…
==============================================================================
--- trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] Sat Jun 29 23:18:27 2013
@@ -47,16 +47,16 @@
2)If srcPattern contains "\" then:
- -we activate bPath, since srcPattern has a path inside of it.
- -we explit the srcPattern to srcFile and srcPath.
- -Now we check the dstPattern ¿does it contain a Path?:
- -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error.
- -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile.
+ -we activate bPath, since srcPattern has a path inside of it.
+ -we explit the srcPattern to srcFile and srcPath.
+ -Now we check the dstPattern ¿does it contain a Path?:
+ -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error.
+ -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile.
3)If srcPattern doesnt contain "\" then:
- -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name)
- -Now we check the dstPattern ¿does it contains a Path?
- -If does: we launch an error (see syntax error 2)
- -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name)
+ -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name)
+ -Now we check the dstPattern ¿does it contains a Path?
+ -If does: we launch an error (see syntax error 2)
+ -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name)
4)Now we are entering in the do...while:
@@ -74,11 +74,11 @@
5)Now we have to check our Boolean.
bPath==TRUE means that Source Argument was a Path so now we have to Join again the Path with the Name File:
- -srcFINAL: srcPath+f.cFileName
- -dstFINAL: dstPath+dstFile
+ -srcFINAL: srcPath+f.cFileName
+ -dstFINAL: dstPath+dstFile
bPath==False then Souce wasn a Path an we dont need to join anything.
- -srcFINAL:f.cFileName
- -dstFINAL:dstFile
+ -srcFINAL:f.cFileName
+ -dstFINAL:dstFile
At last we just make a MoveFile(srcFinal, dstFinal)):
Modified: trunk/reactos/base/shell/cmd/todo.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/todo.txt?re…
==============================================================================
--- trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] Sat Jun 29 23:18:27 2013
@@ -1,21 +1,21 @@
Things to do
~~~~~~~~~~~~
-*Implmenet Set /P
-This is pretty straight forward. When doing this make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5".
+*Implement Set /P
+This is pretty straightforward. When doing this, make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5".
*Compile as unicode
-Not sure what is wrong with it, put probably more then just one thing blocking this. For sure pipes break when it is compiled as unicode.
+Not sure what is wrong with it, but probably more than just one thing blocking this. For sure pipes break when it is compiled as unicode.
*Move.c code clean up
-It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore.
+It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore.
*If rewrite
-It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on.
+It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on.
*Remove Hardcoded buffers
-This is mostly done thanks to Greatlord(cmd.c is the hardest spot that is left). ANytime when you are handling a string that is taken from the commandline there should be no limit to the size.
+This is mostly done thanks to Greatlord (cmd.c is the hardest spot that is left). Anytime when you are handling a string that is taken from the commandline there should be no limit to the size.
-*Implment & and &&
+*Implement & and &&
& runs two commands no matter what.
&& runs the 2nd command only if the first was a success
Not sure where to put this code even
Author: hbelusca
Date: Sat Jun 29 20:22:36 2013
New Revision: 59373
URL: http://svn.reactos.org/svn/reactos?rev=59373&view=rev
Log:
[FREELDR]
Fix extended and control characters handling in text-boxes. We don't show anymore strange characters when pressing on, e.g. up or down arrows anymore.
Also, fix uppercase 'o' character (which has the same scan code but is not an extended key, as the End key).
The culprit revision which introduced this bug is r58658.
CORE-7323 #resolve #comment The uppercase 'o' problem is fixed in revision r59373. Thanks for your report :)
Modified:
trunk/reactos/boot/freeldr/freeldr/ui/tui.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Jun 29 20:22:36 2013
@@ -952,29 +952,29 @@
MachBeep();
}
}
- else if (key == KEY_HOME) // Go to the start of the buffer
+ else if (Extended && key == KEY_HOME) // Go to the start of the buffer
{
EditBoxTextPosition = 0;
}
- else if (key == KEY_END) // Go to the end of the buffer
+ else if (Extended && key == KEY_END) // Go to the end of the buffer
{
EditBoxTextPosition = EditBoxTextLength;
}
- else if (key == KEY_RIGHT) // Go right
+ else if (Extended && key == KEY_RIGHT) // Go right
{
if (EditBoxTextPosition < EditBoxTextLength)
EditBoxTextPosition++;
else
MachBeep();
}
- else if (key == KEY_LEFT) // Go left
+ else if (Extended && key == KEY_LEFT) // Go left
{
if (EditBoxTextPosition > 0)
EditBoxTextPosition--;
else
MachBeep();
}
- else // Add this key to the buffer
+ else if (!Extended) // Add this key to the buffer
{
if ( (EditBoxTextLength < Length - 1) &&
(EditBoxTextPosition < Length - 1) )
@@ -991,6 +991,10 @@
{
MachBeep();
}
+ }
+ else
+ {
+ MachBeep();
}
}
Author: hbelusca
Date: Sat Jun 29 19:22:00 2013
New Revision: 59371
URL: http://svn.reactos.org/svn/reactos?rev=59371&view=rev
Log:
[REGEDIT]
Fix tree-view's image-list handle leakage when application quits.
Loosely based on a patch by Edijs Kolesnicovičs and Grégory Macário Harbs
NOTE: Always cleanup / destroy (or, try to) things in the reverse way they are created / initialized (i.e. in a symmetrical way). Therefore, destry the associated tree-view's image-list in the DestroyTreeView function, which is the opposite of CreateTreeView (which calls InitTreeViewImageLists). The same mechanism is already used by the list-view. For completeness, add a parameter to the DestroyTreeView function (a handle to a tree-view) so that we can pass to it the global tree-view's handle (see what's done in WM_DESTROY message handling in ChildWndProc).
CORE-6856 #resolve #comment Should be fixed in revision r59371. See the commit log for more details. Thanks :)
Modified:
trunk/reactos/base/applications/regedit/childwnd.c
trunk/reactos/base/applications/regedit/main.h
trunk/reactos/base/applications/regedit/treeview.c
Modified: trunk/reactos/base/applications/regedit/childwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Sat Jun 29 19:22:00 2013
@@ -439,8 +439,8 @@
}
goto def;
case WM_DESTROY:
- DestroyTreeView();
DestroyListView(g_pChildWnd->hListWnd);
+ DestroyTreeView(g_pChildWnd->hTreeWnd);
DestroyMainMenu();
HeapFree(GetProcessHeap(), 0, g_pChildWnd);
g_pChildWnd = NULL;
Modified: trunk/reactos/base/applications/regedit/main.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Sat Jun 29 19:22:00 2013
@@ -129,9 +129,9 @@
extern HWND StartKeyRename(HWND hwndTV);
extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem);
extern BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath);
-extern void DestroyTreeView( void );
-extern void DestroyListView( HWND hwndLV );
-extern void DestroyMainMenu( void );
+extern void DestroyTreeView(HWND hwndTV);
+extern void DestroyListView(HWND hwndLV);
+extern void DestroyMainMenu(void);
/* edit.c */
extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin);
Modified: trunk/reactos/base/applications/regedit/treeview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Sat Jun 29 19:22:00 2013
@@ -651,10 +651,15 @@
return hwndTV;
}
-void DestroyTreeView()
-{
- if (pathBuffer)
- HeapFree(GetProcessHeap(), 0, pathBuffer);
+void DestroyTreeView(HWND hwndTV)
+{
+ HIMAGELIST himl;
+
+ if (pathBuffer) HeapFree(GetProcessHeap(), 0, pathBuffer);
+
+ /* Destroy the image list associated with the tree view control */
+ himl = TreeView_GetImageList(hwndTV, TVSIL_NORMAL);
+ if (himl) ImageList_Destroy(himl);
}
BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath)