Author: rnaumann
Date: Sun Nov 8 13:06:39 2015
New Revision: 69848
URL: http://svn.reactos.org/svn/reactos?rev=69848&view=rev
Log:
[SHELL32] improve file delete dialogs. Patch by Jared Smudde. CORE-10398
*fix some strings
*change the used icons to more aappropriate
Modified:
trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
trunk/reactos/dll/win32/shell32/lang/en-GB.rc
trunk/reactos/dll/win32/shell32/lang/en-US.rc
trunk/reactos/dll/win32/shell32/lang/he-IL.rc
trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
trunk/reactos/dll/win32/shell32/res/icons/161.ico
trunk/reactos/dll/win32/shell32/res/icons/16710.ico
trunk/reactos/dll/win32/shell32/res/icons/16715.ico
trunk/reactos/dll/win32/shell32/res/icons/16717.ico
trunk/reactos/dll/win32/shell32/res/icons/16718.ico
trunk/reactos/dll/win32/shell32/res/icons/16721.ico
Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -684,8 +684,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sun Nov 8 13:06:39 2015
@@ -692,8 +692,8 @@
IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied."
IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
- IDS_DELETEITEM_CAPTION "Confirm file deletion"
- IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
+ IDS_DELETEITEM_CAPTION "Confirm File Deletion"
+ IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
Modified: trunk/reactos/dll/win32/shell32/res/icons/161.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/16710.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/16715.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/16717.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/16718.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/16721.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon…
==============================================================================
Binary files - no diff available.
Author: hbelusca
Date: Sun Nov 8 02:42:17 2015
New Revision: 69845
URL: http://svn.reactos.org/svn/reactos?rev=69845&view=rev
Log:
[NTVDM]: Fix a bug I've introduced in r69838.
Modified:
trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Nov 8 02:42:17 2015
@@ -674,7 +674,8 @@
VgaConsoleDestroyTextScreen();
/* Cleanup the video data */
- TextFramebuffer = NULL;
+ // TextFramebuffer = NULL;
+ // NEVER SET the ALWAYS-SET TextFramebuffer pointer to NULL!!
}
/* Reset the active framebuffer */