Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 31001: the 'trash' americanism drives me mad
by gedmurphy＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: gedmurphy Date: Tue Dec 4 20:00:09 2007 New Revision: 31001 URL: http://svn.reactos.org/svn/reactos?rev=31001&view=rev Log: the 'trash' americanism drives me mad Added: trunk/reactos/dll/win32/shell32/lang/en-GB.rc (with props) Modified: trunk/reactos/dll/win32/shell32/shell32.rc Added: 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 (added) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Tue Dec 4 20:00:09 2007 @@ -1,0 +1,451 @@ +/* + * Copyright 1998 Juergen Schmied + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK + +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW +END + +/* shellview background menu */ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View" + BEGIN + MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Arrange &Icons" + BEGIN + MENUITEM "By &Name", 0x30 /* column 0 */ + MENUITEM "By &Type", 0x32 /* column 2 */ + MENUITEM "By &Size", 0x31 /* ... */ + MENUITEM "By &Date", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Paste", FCIDM_SHVIEW_INSERT + MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES + END +END + +/* shellview item menu */ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "C&ut", FCIDM_SHVIEW_CUT + MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Delete", FCIDM_SHVIEW_DELETE + MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Browse for Folder" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 +END + +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Browse for Folder" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Folder:", IDD_FOLDER, 10, 152, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +END + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Message" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +END + +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About %s" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 +END + +SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "&Open:", 12305, 7, 39, 24, 10 + CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP +END + +SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE + LTEXT "Target type:", 14004, 8, 38, 64, 10 + LTEXT "", 14005, 78, 38, 142, 10 + LTEXT "Target location:", 14006, 8, 58, 64, 10 + LTEXT "", 14007, 79, 58, 141, 10 + LTEXT "Target:", 14008, 8, 77, 45, 10 + EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL + LTEXT "&Start in:", 14010, 8, 96, 57, 10 + EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", 14014, 8, 115, 57, 10 + EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT + LTEXT "Run:", 14016, 8, 134, 57, 10 + EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL + LTEXT "C&omment:", 14018, 8, 152, 57, 10 + EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT +END + +SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Extended Properties" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 + CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "File", 14005, 68, 35, 160, 10 + LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 160, 10 + LTEXT "Location:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Size:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + LTEXT "Modified:", 14016, 8, 140, 45, 10 + LTEXT "", 14017, 68, 140, 160, 10 + LTEXT "Accessed:", 14018, 8, 160, 45, 10 + LTEXT "", 14019, 68, 160, 160, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 + CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 + CHECKBOX "&Archive", 14023, 181, 189, 49, 10 +END + +SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 235, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Version" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "File version: ", 14000, 10, 10, 55, 10 + LTEXT "", 14001, 77, 10, 152, 10 + LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "", 14003, 77, 27, 152, 10 + LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "", 14005, 77, 46, 152, 10 + GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 + LTEXT "Item name: ", 14007, 13, 82, 50, 10 + LTEXT "Value: ", 14008, 112, 82, 45, 10 + LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY + EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY +END + +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +END + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +END + +DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +END + +RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Run As" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 + CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "The following user:", 14002, 10, 100, 90, 10 + LTEXT "User name:", -1, 20, 118, 54, 10 + COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP + LTEXT "Password:", -1, 20, 143, 53, 10 + EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP + PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP +END + +BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Recycle Bin Properties" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 + GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 + RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP + EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER + LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 + RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP +END + +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Open With" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 + LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 + LTEXT "File: ", 14001, 44, 25, 188, 10 + GROUPBOX "&Programs", -1, 7, 42, 249, 187 + CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 16, 57, 230, 130 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 + PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + PUSHBUTTON "OK", 14005, 150, 236, 50, 14 + PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + /* columns in the shellview */ + IDS_SHV_COLUMN1 "File" + IDS_SHV_COLUMN2 "Size" + IDS_SHV_COLUMN3 "Type" + IDS_SHV_COLUMN4 "Modified" + IDS_SHV_COLUMN5 "Attributes" + IDS_SHV_COLUMN6 "Size" + IDS_SHV_COLUMN7 "Size available" + IDS_SHV_COLUMN8 "Name" + IDS_SHV_COLUMN9 "Comments" + IDS_SHV_COLUMN10 "Owner" + IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN_DELFROM "Original location" + IDS_SHV_COLUMN_DELDATE "Date deleted" + + /* special folders */ + IDS_DESKTOP "Desktop" + IDS_MYCOMPUTER "My Computer" + IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" + IDS_CONTROLPANEL "Control Panel" + + /* context menus */ + IDS_VIEW_LARGE "Lar&ge Icons" + IDS_VIEW_SMALL "S&mall Icons" + IDS_VIEW_LIST "&List" + IDS_VIEW_DETAILS "&Details" + IDS_SELECT "Select" + IDS_OPEN "Open" + + 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_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)?" + IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" + IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" + IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ + "If the files in the destination folder have the same names as files in the\n"\ + "selected folder they will be replaced. Do you still want to move or copy\n"\ + "the folder?" + + /* message box strings */ + IDS_RESTART_TITLE "Restart" + IDS_RESTART_PROMPT "Do you want to restart the system?" + IDS_SHUTDOWN_TITLE "Shutdown" + IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + + /* shell folder path default values */ + IDS_PROGRAMS "Start Menu\\Programs" + IDS_PERSONAL "My Documents" + IDS_FAVORITES "Favorites" + IDS_STARTUP "Start Menu\\Programs\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "My Music" + IDS_MYVIDEO "My Video" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "My Pictures" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "Documents\\My Music" + IDS_COMMON_PICTURES "Documents\\My Pictures" + IDS_COMMON_VIDEO "Documents\\My Video" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Propchange: trunk/reactos/dll/win32/shell32/lang/en-GB.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc Tue Dec 4 20:00:09 2007 @@ -53,6 +53,7 @@ #include "lang/da-DK.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" +#include "lang/en-GB.rc" #include "lang/en-US.rc" #include "lang/eo-EO.rc" #include "lang/es-ES.rc"

1 0

[hpoussin] 31000: Use win types when possible
by hpoussin＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: hpoussin Date: Tue Dec 4 19:40:12 2007 New Revision: 31000 URL: http://svn.reactos.org/svn/reactos?rev=31000&view=rev Log: Use win types when possible Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Tue Dec 4 19:40:12 2007 @@ -194,14 +194,14 @@ /* Function 5 */ CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, - unsigned long Admin, - unsigned long ProcessId) + BOOL Admin, + DWORD ProcessId) { HANDLE hProcess; UNREFERENCED_PARAMETER(BindingHandle); - DPRINT1("PNP_ReportLogOn(%lu, %lu) called\n", Admin, ProcessId); + DPRINT1("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); /* Get the users token */ hProcess = OpenProcess(PROCESS_ALL_ACCESS, @@ -233,7 +233,7 @@ CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, wchar_t *DeviceInstance, - unsigned long Flags) + DWORD Flags) { CONFIGRET ret = CR_SUCCESS; HKEY hDeviceKey = NULL; @@ -270,7 +270,7 @@ CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, wchar_t *DeviceInstance, - unsigned long Length) + DWORD Length) { CONFIGRET ret = CR_SUCCESS; @@ -297,11 +297,11 @@ /* Function 8 */ CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, - unsigned long Relationship, + DWORD Relationship, wchar_t *DeviceId, wchar_t *RelatedDeviceId, - unsigned long Length, - unsigned long Flags) + DWORD Length, + DWORD Flags) { PLUGPLAY_CONTROL_RELATED_DEVICE_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; @@ -343,11 +343,11 @@ /* Function 9 */ CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, - unsigned long Branch, - unsigned long Index, + DWORD Branch, + DWORD Index, wchar_t *Buffer, - unsigned long Length, - unsigned long *RequiredLength, + DWORD Length, + DWORD *RequiredLength, DWORD Flags) { CONFIGRET ret = CR_SUCCESS; @@ -458,11 +458,11 @@ CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, wchar_t *DeviceInstance, - unsigned long Property, - unsigned long *DataType, + DWORD Property, + DWORD *DataType, char *Buffer, - unsigned long *TransferLen, - unsigned long *Length, + DWORD *TransferLen, + DWORD *Length, DWORD Flags) { PLUGPLAY_CONTROL_PROPERTY_DATA PlugPlayData; @@ -1316,11 +1316,11 @@ /* Function 40 */ CONFIGRET PNP_HwProfFlags(handle_t BindingHandle, - unsigned long Action, + DWORD Action, wchar_t *DeviceId, - unsigned long ProfileId, - unsigned long *Value, // out - unsigned long Flags) + DWORD ProfileId, + DWORD *Value, // out + DWORD Flags) { CONFIGRET ret = CR_SUCCESS;

1 0

[dreimer] 30999: FIx the fix. (comdlg was hit, too)
by dreimer＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: dreimer Date: Tue Dec 4 19:37:34 2007 New Revision: 30999 URL: http://svn.reactos.org/svn/reactos?rev=30999&view=rev Log: FIx the fix. (comdlg was hit, too) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Tue Dec 4 19:37:34 2007 @@ -12,6 +12,7 @@ - Set the working directory for the "Options" shortcut correctly (see above bullet). (Colin Fink) - Add back detection of previous versions of RosBE (versions 0.3.5b2 and before). (Peter Ward) - Fix the uninstall previous routine. (Peter Ward) +- Fix a bug in Clean.cmd. It accidently killed some not anymore Autogenerated Resources. (Daniel Reimer) - Fix a bug in TimeDate.cmd. (Peter Ward) - Fix a bug in reladdr2line.cmd. (Peter Ward) - Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Tue Dec 4 19:37:34 2007 @@ -46,19 +46,6 @@ del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\network.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL - del /f "dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL - del /f "dll\ntdll\napi.S" 1> NUL 2> NUL del /f "dll\ntdll\i386\napi.S" 1> NUL 2> NUL rmdir /q "dll\ntdll\i386" 1> NUL 2> NUL

1 0

[dreimer] 30998: Leave COMCTL's Resources alone!!
by dreimer＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: dreimer Date: Tue Dec 4 19:25:42 2007 New Revision: 30998 URL: http://svn.reactos.org/svn/reactos?rev=30998&view=rev Log: Leave COMCTL's Resources alone!! Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Tue Dec 4 19:25:42 2007 @@ -43,21 +43,6 @@ del /f "dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL del /f "dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL del /f "dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL

1 0

[cwittich] 30997: check for a valid dc before accessing Dc_Attr
by cwittich＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: cwittich Date: Tue Dec 4 18:31:11 2007 New Revision: 30997 URL: http://svn.reactos.org/svn/reactos?rev=30997&view=rev Log: check for a valid dc before accessing Dc_Attr Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Dec 4 18:31:11 2007 @@ -88,6 +88,7 @@ case GdiBCSetBrushOrg: { PGDIBSSETBRHORG pgSBO; + if(!dc) break; pgSBO = (PGDIBSSETBRHORG) pHdr; Dc_Attr->ptlBrushOrigin = pgSBO->ptlBrushOrigin; break;

1 0

[hpoussin] 30996: CTRL+SCROLL LOCK+SCROLL LOCK should only work with right control key
by hpoussin＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: hpoussin Date: Tue Dec 4 17:55:49 2007 New Revision: 30996 URL: http://svn.reactos.org/svn/reactos?rev=30996&view=rev Log: CTRL+SCROLL LOCK+SCROLL LOCK should only work with right control key Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Tue Dec 4 17:55:49 2007 @@ -785,21 +785,18 @@ if (PortDeviceExtension->Settings.CrashOnCtrlScroll) { /* Test for CTRL + SCROLL LOCK twice */ - static const UCHAR ScanCodes[] = { 0x1d, 0x46, 0x46, 0 }; - - if (!(Output & 0x80)) - { - if ((Output & 0x7f) == ScanCodes[DeviceExtension->ComboPosition]) - { - DeviceExtension->ComboPosition++; - if (ScanCodes[DeviceExtension->ComboPosition] == 0) - KeBugCheck(MANUALLY_INITIATED_CRASH); - } - else if ((Output & 0x7f) == ScanCodes[0]) - DeviceExtension->ComboPosition = 1; - else - DeviceExtension->ComboPosition = 0; - } + static const UCHAR ScanCodes[] = { 0xe0, 0x1d, 0x46, 0xc6, 0x46, 0 }; + + if (Output == ScanCodes[DeviceExtension->ComboPosition]) + { + DeviceExtension->ComboPosition++; + if (ScanCodes[DeviceExtension->ComboPosition] == 0) + KeBugCheck(MANUALLY_INITIATED_CRASH); + } + else if (Output == ScanCodes[0]) + DeviceExtension->ComboPosition = 1; + else + DeviceExtension->ComboPosition = 0; } if (i8042KbdCallIsrHook(DeviceExtension, PortStatus, Output, &ToReturn))

1 0

[greatlrd] 30995: remove wrong fixme comment from win32k
by greatlrd＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: greatlrd Date: Tue Dec 4 12:42:05 2007 New Revision: 30995 URL: http://svn.reactos.org/svn/reactos?rev=30995&view=rev Log: remove wrong fixme comment from win32k Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 4 12:42:05 2007 @@ -805,7 +805,6 @@ } NewDC = DC_LockDc( hNewDC ); - /* FIXME - NewDC can be NULL!!! Don't assert here! */ if ( !NewDC ) { DC_FreeDC( hNewDC );

1 0

[jimtabor] 30994: Fix NtGdiFlush so it will not spam the debug list. Add changes and fixups.
by jimtabor＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: jimtabor Date: Tue Dec 4 10:51:03 2007 New Revision: 30994 URL: http://svn.reactos.org/svn/reactos?rev=30994&view=rev Log: Fix NtGdiFlush so it will not spam the debug list. Add changes and fixups. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Dec 4 10:51:03 2007 @@ -51,7 +51,7 @@ typedef struct { - HANDLE Handle; + HANDLE Handle; // HSURF PVOID pvEntry; ULONG lucExcLock; ULONG Tid; @@ -60,7 +60,6 @@ PERESOURCE hsemDevLock; PVOID pvGammaRamp; - PVOID pfnSync; DHPDEV PDev; DEVMODEW DMW; @@ -94,6 +93,7 @@ NTSTATUS FASTCALL InitDcImpl(VOID); HDC FASTCALL RetrieveDisplayHDC(VOID); +PGDIDEVICE FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 4 10:51:03 2007 @@ -541,7 +541,7 @@ PrimarySurface.PreparedDriver = TRUE; PrimarySurface.DisplayNumber = DisplayNumber; - + PrimarySurface.flFlags = PDEV_DISPLAY; // Hard set,, add more flags. PrimarySurface.hsemDevLock = (PERESOURCE)EngCreateSemaphore(); ret = TRUE; @@ -826,6 +826,9 @@ NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); + + NewDC->flGraphics = PrimarySurface.DevInfo.flGraphicsCaps; + NewDC->flGraphics2 = PrimarySurface.DevInfo.flGraphicsCaps2; if (!CreateAsIC) { @@ -2678,6 +2681,17 @@ return SurfObj->hsurf == PrimarySurface.Handle; } +// +// Enumerate HDev +// +PGDIDEVICE FASTCALL +IntEnumHDev(VOID) +{ +// I guess we will soon have more than one primary surface. +// This will do for now. + return &PrimarySurface; +} + #define SIZEOF_DEVMODEW_300 188 #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Dec 4 10:51:03 2007 @@ -10,6 +10,51 @@ // Gdi Batch Flush support functions. // +// +// DoDeviceSync +// +// based on IntEngEnter from eng/engmisc.c +// +VOID +FASTCALL +DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl) +{ + PGDIDEVICE Device = (GDIDEVICE*)Surface->hdev; +// No punting and "Handle to a surface, provided that the surface is device-managed. +// Otherwise, dhsurf is zero". + if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) && (Surface->dhsurf)) + { + if (Device->DriverFunctions.SynchronizeSurface) + return Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl); + else + { + if (Device->DriverFunctions.Synchronize) + return Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect); + } + } + return; +} + +VOID +FASTCALL +SynchonizeDriver(FLONG Flags) +{ + SURFOBJ *SurfObj; + PGDIDEVICE Device; + + if (Flags & GCAPS2_SYNCFLUSH) + Flags = DSS_FLUSH_EVENT; + if (Flags & GCAPS2_SYNCTIMER) + Flags = DSS_TIMER_EVENT; + + Device = IntEnumHDev(); + + SurfObj = EngLockSurface((HSURF)Device->Handle); + if(!SurfObj) return; + DoDeviceSync( SurfObj, NULL, Flags); + EngUnlockSurface(SurfObj); + return; +} // // Process the batch. @@ -80,7 +125,7 @@ APIENTRY NtGdiFlush(VOID) { - UNIMPLEMENTED; + SynchonizeDriver(GCAPS2_SYNCFLUSH); } /*

1 0

[jimtabor] 30993: Fix zero bug.
by jimtabor＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: jimtabor Date: Tue Dec 4 05:52:46 2007 New Revision: 30993 URL: http://svn.reactos.org/svn/reactos?rev=30993&view=rev Log: Fix zero bug. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Tue Dec 4 05:52:46 2007 @@ -141,6 +141,8 @@ } _SEH_END } + else + Result = FALSE; // Can not be zero. if (Result) *UserData = Entry->UserData; return Result; }

1 0

[janderwald] 30992: - show nice display name when full path for executable is available - enumerate default open verb too - look in HKCR progid for default verbs/file associations - fix a bug in SHEOW_LoadOpenWithItems
by janderwald＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: janderwald Date: Tue Dec 4 02:33:36 2007 New Revision: 30992 URL: http://svn.reactos.org/svn/reactos?rev=30992&view=rev Log: - show nice display name when full path for executable is available - enumerate default open verb too - look in HKCR progid for default verbs/file associations - fix a bug in SHEOW_LoadOpenWithItems Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Tue Dec 4 02:33:36 2007 @@ -164,6 +164,7 @@ MENUITEMINFOW mii; WCHAR szBuffer[MAX_PATH]; UINT index; + WCHAR * szPtr; static const WCHAR szChoose[] = { 'C','h','o','o','s','e',' ','P','r','o','g','r','a','m','.','.','.',0 }; ZeroMemory(&mii, sizeof(mii)); @@ -175,7 +176,26 @@ for (index = 0; index < This->count; index++) { mii.wID = idCmdFirst; - mii.dwTypeData = (LPWSTR)This->szArray[index]; + szPtr = wcsrchr(This->szArray[index], L'\\'); + if (!szPtr) + { + szPtr = This->szArray[index]; + } + else + { + /* remove backslash from path */ + szPtr++; + } + + wcscpy(szBuffer, szPtr); + szPtr = wcsrchr(szBuffer, L'.'); + if (szPtr) + { + /* remove .exe part from display list */ + szPtr[0] = 0; + } + + mii.dwTypeData = szBuffer; if (InsertMenuItemW(hMenu, -1, TRUE, &mii)) { idCmdFirst++; @@ -1013,6 +1033,31 @@ return NumKeys; result = RegOpenKeyExW(hKey, + L"shell\\open\\command", + 0, + KEY_READ | KEY_QUERY_VALUE, + &hSubKey); + + if (result == ERROR_SUCCESS) + { + WCHAR szBuffer[MAX_PATH+10]; + WCHAR * ptr; + DWORD dwBuffer = sizeof(szBuffer); + + if (RegGetValueW(hSubKey, NULL, NULL, RRF_RT_REG_SZ, NULL, (PVOID)szBuffer, &dwBuffer) == ERROR_SUCCESS) + { + ptr = wcsrchr(szBuffer, L' '); + if (ptr) + { + /* erase %1 or extra arguments */ + ptr[0] = 0; + } + SHEOW_AddOWItem(This, szBuffer); + } + RegCloseKey(hSubKey); + } + + result = RegOpenKeyExW(hKey, szCROW, 0, KEY_READ | KEY_QUERY_VALUE, @@ -1196,13 +1241,17 @@ } SHEOW_LoadItemFromHKCU(This, szPtr); + if (RegGetValueW(HKEY_CURRENT_USER, szPtr, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) + { + SHEOW_LoadItemFromHKCU(This, szPath); + } + SHEOW_LoadItemFromHKCR(This, szPtr); dwPath = sizeof(szPath); if (RegGetValueW(HKEY_CLASSES_ROOT, szPtr, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) { - SHEOW_LoadItemFromHKCU(This, szPath); - } - + SHEOW_LoadItemFromHKCR(This, szPath); + } } TRACE("count %u\n", This->count); return S_OK;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs