Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65706: [USRMGR] Italian translation update by Nicolò Altamura. CORE-8857
by akhaldi＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: akhaldi Date: Wed Dec 17 17:59:02 2014 New Revision: 65706 URL: http://svn.reactos.org/svn/reactos?rev=65706&view=rev Log: [USRMGR] Italian translation update by Nicolò Altamura. CORE-8857 Modified: trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] Wed Dec 17 17:59:02 2014 @@ -4,7 +4,7 @@ IDD_USERS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Users" +CAPTION "Utenti" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | @@ -12,7 +12,7 @@ PUSHBUTTON "N&uovo...", IDC_USERS_ADD, 87, 98, 50, 14 PUSHBUTTON "&Rimuovi", IDC_USERS_REMOVE, 141, 98, 50, 14 PUSHBUTTON "Pr&oprietÃ ", IDC_USERS_PROPERTIES, 195, 98, 50, 14 - AUTOCHECKBOX "Richiesta la passwod all'avvio del sistema'.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + AUTOCHECKBOX "Richiesta la passwod all'avvio del sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED PUSHBUTTON "Resetta Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END @@ -24,7 +24,7 @@ CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE PUSHBUTTON "N&uovo...", IDC_GROUPS_ADD, 87, 98, 50, 14 - PUSHBUTTON "&Rimuobi", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "&Rimuovi", IDC_GROUPS_REMOVE, 141, 98, 50, 14 PUSHBUTTON "Pr&oprietÃ ", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END @@ -33,7 +33,7 @@ CAPTION "Extra" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This space is intentionally left blank", IDC_STATIC, 66, 90, 112, 8 + LTEXT "Questo spazio Ã¨ vuoto", IDC_STATIC, 66, 90, 112, 8 END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 @@ -47,7 +47,7 @@ LTEXT "Descrizione:", -1, 7, 64, 63, 8 EDITTEXT IDC_USER_GENERAL_DESCRIPTION, 77, 61, 168, 13, ES_AUTOHSCROLL AUTOCHECKBOX "L'utente deve cambiare password ad ogni avvio del sistema", IDC_USER_GENERAL_FORCE_CHANGE, 7, 82, 210, 10 - AUTOCHECKBOX "L'utente non deve cambiare la password'", IDC_USER_GENERAL_CANNOT_CHANGE, 7, 95, 210, 10 + AUTOCHECKBOX "L'utente non deve cambiare la password", IDC_USER_GENERAL_CANNOT_CHANGE, 7, 95, 210, 10 AUTOCHECKBOX "Password mai richiesta", IDC_USER_GENERAL_NEVER_EXPIRES, 7, 108, 210, 10 AUTOCHECKBOX "L'account Ã¨ disabilitato ", IDC_USER_GENERAL_DISABLED, 7, 121, 210, 10 AUTOCHECKBOX "L'account Ã¨ bloccato", IDC_USER_GENERAL_LOCKED, 7, 134, 210, 10 @@ -128,8 +128,8 @@ RTEXT "Password:", -1, 7, 70, 96, 8 EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "Ripeti Password:", -1, 7, 88, 96, 8 - AUTOCHECKBOX "L'utente deve cambiare password ad ogni avvio del sistema'", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 - AUTOCHECKBOX "L'utente non deve cambiare la password'", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED + AUTOCHECKBOX "L'utente deve cambiare password ad ogni avvio del sistema", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 + AUTOCHECKBOX "L'utente non deve cambiare la password", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED AUTOCHECKBOX "Password mai richiesta", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED AUTOCHECKBOX "Account Ã¨ disabilitato", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 DEFPUSHBUTTON "OK", IDOK, 156, 179, 50, 14, WS_DISABLED @@ -201,7 +201,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Account utenti:" + IDS_CPLNAME "Utenti:" IDS_CPLDESCRIPTION "Gestisci utenti e gruppi." END

1 0

[akhaldi] 65705: [MPLAY32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8918
by akhaldi＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: akhaldi Date: Wed Dec 17 17:51:10 2014 New Revision: 65705 URL: http://svn.reactos.org/svn/reactos?rev=65705&view=rev Log: [MPLAY32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8918 Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Wed Dec 17 17:51:10 2014 @@ -11,22 +11,22 @@ MENUITEM SEPARATOR MENUITEM "éåº(&E)", IDM_EXIT END - POPUP "&Play" + POPUP "&ææ¾" BEGIN - MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY - MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM "ææ¾/&æå\tCtrl+P", IDC_PLAY + MENUITEM "å&æ¢\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + MENUITEM "é&å¤\tCtrl+T", IDM_REPEAT END - POPUP "&View" + POPUP "&è§å¾" BEGIN - MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW + MENUITEM "åçª &æ¨¡å¼", IDM_SWITCHVIEW END - POPUP "&Device" + POPUP "&è®¾å¤" BEGIN - MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM "&å±æ§", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&Volume Control", IDM_VOLUMECTL + MENUITEM "&é³éæ§å¶", IDM_VOLUMECTL END POPUP "å¸®å©(&H)" BEGIN @@ -55,6 +55,6 @@ IDS_TOOLTIP_FORWARD "ååè·³è¿" IDS_APPTITLE "ReactOS å¤åªä½ææ¾å¨" IDS_PLAY "ææ¾" - IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." + IDS_DEFAULTMCIERRMSG "è¯¥éè¯¯æ²¡æå¯ç¨çæè¿°." + IDS_UNKNOWNFILEEXT "è¯¥è®¾å¤ç±»åä»ç»å®çæä»¶æ©å±åæ æ³æå®." END

1 0

[akhaldi] 65704: [SYSDM] Minor changes to the Startup and Recovery options dialog resource. Brought to you by Ricardo Hanke. CORE-8924
by akhaldi＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: akhaldi Date: Wed Dec 17 17:47:54 2014 New Revision: 65704 URL: http://svn.reactos.org/svn/reactos?rev=65704&view=rev Log: [SYSDM] Minor changes to the Startup and Recovery options dialog resource. Brought to you by Ricardo Hanke. CORE-8924 Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°", IDC_STATIC, 7, 12, 238, 95 LTEXT "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð° ÑÐ°Ð±Ð¾ÑÐ½Ð° &ÑÐ¸ÑÑÐµÐ¼Ð°", IDC_STATIC, 14, 26, 160, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¿Ð¸ÑÑÐºÐ° Ñ &ÑÐ°Ð±Ð¾ÑÐ½Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð¸:", IDC_STRECLIST, 14, 56, 165, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "ÐÐ°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° ÑÐ¸ÑÑÐµÐ½Ðµ Ð½Ð° Ð½ÐµÐ´ÑÐ·Ð¸", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "ÐÑÑÐµÑÐµÐ½ &ÑÐ°Ð¹Ð»:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "ÐÐ°&Ð¼ÑÐ½Ð° Ð½Ð° ÑÑÑÐµÑÑÐ²ÑÐ²Ð°ÑÐ¸ÑÐµ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ", IDC_STRRECOVERWRITE, 17, 228, 210, 10 DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 141, 259, 50, 14 PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -155,7 +155,7 @@ BEGIN GROUPBOX "SpuÅ¡tÄnÃ systÃ©mu", IDC_STATIC, 7, 12, 238, 95 LTEXT "VÃ½chozÃ operaÄnÃ s&ystÃ©m:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "Dob&a zobrazenÃ seznamu operaÄnÃch systÃ©mÅ¯:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -175,7 +175,7 @@ GROUPBOX "Zapsat ladicÃ informace", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "VÃ½pis ze &souboru:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "PÅepsat &existujÃcÃ soubor", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overwrite any existing file", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Fortryd", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -159,7 +159,7 @@ BEGIN GROUPBOX "Systemstart", IDC_STATIC, 7, 12, 238, 95 LTEXT "Standard-Betriebs&system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Anzeigedauer der Betriebssystem-Liste:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -179,7 +179,7 @@ GROUPBOX "Debuginformationen schreiben", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump-&Datei:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Vorhandene Dateien &Ã¼berschreiben", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "ÎÎºÎºÎ¯Î½Î·ÏÎ· ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï", IDC_STATIC, 7, 12, 238, 95 LTEXT "Î ÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏ &ÏÏÏÏÎ·Î¼Î±:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "ÎÎ¹Î¬ÏÎºÎµÎ¹Î± ÏÏÎ¿Î²Î¿&Î»Î®Ï Î»Î¯ÏÏÎ±Ï :", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "ÎÎ³Î³ÏÎ±ÏÎ® ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎ½ ÎµÎ½ÏÎ¿ÏÎ¹ÏÎ¼Î¿Ï ÏÏÎ±Î»Î¼Î¬ÏÏÎ½", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "ÎÏÏÎµÎ¯Î¿ ÎÎ½&Î´ÎµÎ¹Î¾Î·Ï ÏÏÎ±Î»Î¼Î¬ÏÏÎ½:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Î&Î½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÎºÎ¬Î¸Îµ Î±ÏÏÎµÎ¯Î¿Ï", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "ÎÎºÏÏÎ¿", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overwrite any existing file", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "Inicio del sistema ", IDC_STATIC, 7, 12, 238, 95 LTEXT "&Sistema operativo predeterminado:", IDC_STATIC, 14, 26, 180, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Mostrar la lista de sistemas operativos durante:", IDC_STRECLIST, 14, 56, 165, 8 EDITTEXT IDC_STRRECLISTEDIT, 180, 54, 29, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "Escribir informaciÃ³n de depuraciÃ³n ", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "&Volcado de descarga pequeÃ±a:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "So&brescribir cualquier archivo existente", IDC_STRRECOVERWRITE, 17, 228, 150, 10 DEFPUSHBUTTON "Aceptar", IDOK, 141, 259, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "DÃ©marrage du systÃ¨me", IDC_STATIC, 7, 12, 238, 95 LTEXT "SystÃ¨me d'exploitation par dÃ©faut :", IDC_STATIC, 14, 26, 110, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Affiche la liste des systÃ¨mes pendant :", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Ãcrire les informations de dÃ©bogage", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Fichier ClichÃ© :", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Ãcraser tout fichier existant", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "××ª××× ×××¢×¨××ª", IDC_STATIC, 7, 12, 238, 95 LTEXT "××¢×¨××ª ×××¤×¢×× ×××××× ××¨××¨×ª ××××:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "××× ×××¦××ª ×¨×©×××ª ××¢×¨×××ª ××¤×¢××:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "××ª×××ª ××××¢ ×× ××¤×× ×©×××××ª", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "×§×××¥ DUMP:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "×©××ª× ×§×××¥ ×§×××", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "×××©××¨", IDOK, 141, 259, 50, 14 PUSHBUTTON "×××××", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overwrite any existing file", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "Rendben", IDOK, 141, 259, 50, 14 PUSHBUTTON "MÃ©gsem", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overwrite any existing file", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "Avvio del sistema", IDC_STATIC, 7, 12, 238, 95 LTEXT "Sistema operativo predefinito:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Tempo per la visualizzazione dell'elenco dei sistemi operativi:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Scrivi le informazioni di debug", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "&File di Dump:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Sovrascrivi i file se esistenti", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "ã·ã¹ãã ã®èµ·å", IDC_STATIC, 7, 12, 238, 95 LTEXT "æ¢å®ã®ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã (&S):", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã ã®ä¸è¦§ãè¡¨ç¤ºããæé(&T):", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "ãããã°æå ±ã®æ¸ãè¾¼ã¿", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "ãã³ã ãã¡ã¤ã«(&F):", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "æ¢åã®ãã¡ã¤ã«ã«ä¸æ¸ããã(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overwrite any existing file", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Annuleren", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "Systemoppstart", IDC_STATIC, 7, 12, 238, 95 LTEXT "Standard operativ&system:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Tiden operativsystemlisten skal vises:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Skriv feilsÃ¸kingsinformasjon", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump &fil:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Overskriv eksisterende filer", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -159,7 +159,7 @@ BEGIN GROUPBOX "Uruchamianie systemu", IDC_STATIC, 7, 12, 238, 95 LTEXT "&DomyÅlny system operacyjny:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Czas wyÅwietlania listy systemÃ³w operacyjnych:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -179,7 +179,7 @@ GROUPBOX "Zapisywanie informacji o debugowaniu", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "&Plik zrzutu:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Z&astÄp wszystkie istniejÄce pliki", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -159,7 +159,7 @@ BEGIN GROUPBOX "Pornirea sistemului", IDC_STATIC, 7, 12, 238, 95 LTEXT "Sistemul de operare implicit:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Perioada de afiÈare a sistemelor de operare:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 178, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -179,7 +179,7 @@ GROUPBOX "Scriere informaÈii de depanare", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 180, 151, 49, CBS_DROPDOWNLIST LTEXT "FiÈierul de &depanare (âcutie neagrÄâ):", IDC_STATIC, 17, 198, 190, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Suprascrie fiÈierul de depanare", IDC_STRRECOVERWRITE, 17, 228, 155, 10 DEFPUSHBUTTON "Con&firmÄ", IDOK, 141, 259, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_STATIC, 7, 12, 238, 95 LTEXT "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ:", IDC_STATIC, 14, 26, 145, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "Ð&ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼:", IDC_STRECLIST, 14, 56, 161, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "ÐÐ°Ð¿Ð¸ÑÑ Ð¾ÑÐ»Ð°Ð´Ð¾ÑÐ½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Ð¤Ð°Ð¹Ð» Ð´Ð°Ð¼Ð¿Ð° Ð¿Ð°Ð¼ÑÑÐ¸:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "ÐÐ°Ð¼ÐµÐ½ÑÑÑ &ÑÑÑÐµÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ°Ð¹Ð» Ð´Ð°Ð¼Ð¿Ð°", IDC_STRRECOVERWRITE, 17, 228, 145, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -158,7 +158,7 @@ BEGIN GROUPBOX "Spustenie systÃ©mu", IDC_STATIC, 7, 12, 238, 95 LTEXT "PredvolenÃ½ operaÄnÃ½ &systÃ©m:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&ZobraziÅ¥ zoznam operaÄnÃ½ch systÃ©mov na:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 183, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -178,7 +178,7 @@ GROUPBOX "ZÃ¡pis informÃ¡ciÃ pre ladenie", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "SÃºbor &vÃ½pisu z pamÃ¤te:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Pr&episovaÅ¥ existujÃºci sÃºbor", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -150,7 +150,7 @@ BEGIN GROUPBOX "Fillimi Sistemit", IDC_STATIC, 7, 12, 238, 95 LTEXT "&Sistemi Operativ ParapÃ«rzgjedhur:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Koha pÃ«r tÃ« shfaqur listÃ«n e sistemeve operative:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -170,7 +170,7 @@ GROUPBOX "Shkruaj informacionet e rregullimit", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Hedh &dokumentat:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Mbishkruaj njÃ« dokument ekzistues", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "Systemstart", IDC_STATIC, 7, 12, 238, 95 LTEXT "&Standardoperativsystem:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&Tid att visa listan av operativsystem:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "Skriv information fÃ¶r debugging", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "Dump&fil:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Skriv &Ã¶ver om filen finns", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "Dizge BaÅlangÄ±cÄ±", IDC_STATIC, 7, 12, 238, 95 LTEXT "&Ãn TanÄ±mlÄ± Ä°Åletim Dizgesi:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "Ä°&Åletim Dizgeleri Dizelgesini GÃ¶rÃ¼ntÃ¼leme SÃ¼resi:", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "YanlÄ±ÅlÄ±k AyÄ±klama Bilgisi Yazma", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "DÃ¶&kÃ¼m KÃ¼tÃ¼ÄÃ¼:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "&Var Olan Bir KÃ¼tÃ¼ÄÃ¼n Ãzerine Yaz", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "Tamam", IDOK, 141, 259, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -158,7 +158,7 @@ BEGIN GROUPBOX "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð¿ÐµÑÐ°ÑÑÐ¹Ð½Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸", IDC_STATIC, 7, 12, 238, 95 LTEXT "&ÐÐ¿ÐµÑÐ°ÑÑÐ¹Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð° Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼:", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¾Ð¿ÐµÑÐ°ÑÑÐ¹Ð½Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼:", IDC_STRECLIST, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -178,7 +178,7 @@ GROUPBOX "ÐÐ°Ð¿Ð¸ÑÐ°ÑÐ¸ Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÑÐ²Ð°Ð»ÑÐ½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "&Ð¤Ð°Ð¹Ð» Ð´Ð°Ð¼Ð¿Ð° Ð¿Ð°Ð¼'ÑÑÑ:", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "ÐÐ°&Ð¼ÑÐ½ÑÐ²Ð°ÑÐ¸ Ð½Ð°ÑÐ²Ð½Ð¸Ð¹ ÑÐ°Ð¹Ð»", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 195, 259, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Wed Dec 17 17:47:54 2014 @@ -152,7 +152,7 @@ BEGIN GROUPBOX "ç³»ç»å¯å¨", IDC_STATIC, 7, 12, 238, 95 LTEXT "é»è®¤æä½ç³»ç»(&S):", IDC_STATIC, 14, 26, 100, 8 - COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "æ¾ç¤ºæä½ç³»ç»åè¡¨çæ¶é´(&T):", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | @@ -172,7 +172,7 @@ GROUPBOX "åå¥è°è¯ä¿¡æ¯", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "è½¬å¨æä»¶(&F):", IDC_STATIC, 17, 202, 150, 8 - EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL AUTOCHECKBOX "è¦çä»»ä½ç°ææä»¶(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 141, 259, 50, 14 PUSHBUTTON "åæ¶", IDCANCEL, 195, 259, 50, 14

1 0

[gadamopoulos] 65703: [EXPLORER] * Remove internal IStartMenuSite interface that didn't serve any purpose. * Stop using global instances of some core classes.
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 12:44:58 2014 New Revision: 65703 URL: http://svn.reactos.org/svn/reactos?rev=65703&view=rev Log: [EXPLORER] * Remove internal IStartMenuSite interface that didn't serve any purpose. * Stop using global instances of some core classes. Modified: trunk/reactos/base/shell/explorer/desktop.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/startmnusite.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -23,7 +23,6 @@ class CDesktopThread { HANDLE m_hEvent; - HANDLE m_hDesktop; CComPtr<ITrayWindow> m_Tray; DWORD DesktopThreadProc() @@ -65,12 +64,11 @@ public: CDesktopThread() : m_hEvent(NULL), - m_hDesktop(NULL), m_Tray(NULL) { } - HANDLE Initialize(IN OUT ITrayWindow *pTray) + HRESULT Initialize(IN OUT ITrayWindow *pTray) { HANDLE hThread; HANDLE Handles[2]; @@ -79,13 +77,13 @@ m_hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); if (!m_hEvent) - return NULL; + return E_FAIL; hThread = CreateThread(NULL, 0, s_DesktopThreadProc, (PVOID)this, 0, NULL); if (!hThread) { CloseHandle(m_hEvent); - return NULL; + return E_FAIL; } Handles[0] = hThread; @@ -107,36 +105,33 @@ CloseHandle(hThread); CloseHandle(m_hEvent); - // FIXME: Never assigned, will always return default value (NULL). - return m_hDesktop; + return S_OK; } void Destroy() { return; } - -} * g_pDesktopWindowInstance; +}; HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray) { - if (!g_pDesktopWindowInstance) + CDesktopThread* pDesktopThread = new CDesktopThread(); + + HRESULT hres = pDesktopThread->Initialize(Tray); + if(FAILED_UNEXPECTEDLY(hres)) { - g_pDesktopWindowInstance = new CDesktopThread(); + delete pDesktopThread; + return NULL; } - - if (!g_pDesktopWindowInstance) - return NULL; - return g_pDesktopWindowInstance->Initialize(Tray); + return pDesktopThread; } VOID DesktopDestroyShellWindow(IN HANDLE hDesktop) { - if (g_pDesktopWindowInstance) - { - g_pDesktopWindowInstance->Destroy(); - } + CDesktopThread* pDesktopThread = reinterpret_cast<CDesktopThread*>(hDesktop); + pDesktopThread->Destroy(); } Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -296,33 +296,9 @@ HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); -#define INTERFACE IStartMenuSite -DECLARE_INTERFACE_(IStartMenuSite, IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT, QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG, AddRef) (THIS) PURE; - STDMETHOD_(ULONG, Release) (THIS) PURE; - /*** IStartMenuSite ***/ -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define IStartMenuSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IStartMenuSite_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IStartMenuSite_Release(p) (p)->lpVtbl->Release(p) -/*** IStartMenuSite methods ***/ -#endif - IMenuPopup* CreateStartMenu(IN ITrayWindow *Tray, OUT IMenuBand **ppMenuBand, -IN HBITMAP hbmBanner OPTIONAL, -IN BOOL bSmallIcons); - -HRESULT -UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, IN HBITMAP hbmBanner OPTIONAL, IN BOOL bSmallIcons); @@ -350,6 +326,8 @@ #define NTNWM_REALIGN (0x1) +class CTrayNotifyWnd; + BOOL RegisterTrayNotifyWndClass(VOID); @@ -357,15 +335,14 @@ UnregisterTrayNotifyWndClass(VOID); HWND -CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, -IN BOOL bHideClock); - -VOID -TrayNotify_NotifyMsg(IN WPARAM wParam, +CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock, CTrayNotifyWnd** ppTrayNotify); + +VOID +TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); BOOL -TrayNotify_GetClockRect(OUT PRECT rcClock); +TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock); /* * taskswnd.c @@ -385,7 +362,7 @@ IN OUT ITrayWindow *Tray); HRESULT -Tray_OnStartMenuDismissed(); +Tray_OnStartMenuDismissed(ITrayWindow* Tray); HRESULT IsSameObject(IN IUnknown *punk1, IN IUnknown *punk2); Modified: trunk/reactos/base/shell/explorer/startmnusite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -20,14 +20,9 @@ #include "precomp.h" -/***************************************************************************** - ** IStartMenuSite *********************************************************** - *****************************************************************************/ - class CStartMenuSite : public CComCoClass<CStartMenuSite>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IStartMenuSite, public IServiceProvider, public ITrayPriv, public IOleCommandTarget, @@ -364,7 +359,7 @@ { if (!fSet) { - return Tray_OnStartMenuDismissed(); + return Tray_OnStartMenuDismissed(m_Tray); } return S_OK; Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -1561,25 +1561,24 @@ } }; -static CTrayNotifyWnd * g_Instance; - -HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, BOOL bHideClock) +HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, BOOL bHideClock, CTrayNotifyWnd** ppinstance) { + CTrayNotifyWnd * pTrayNotify = new CTrayNotifyWnd(); // TODO: Destroy after the window is destroyed - g_Instance = new CTrayNotifyWnd(); - - return g_Instance->_Init(Tray, bHideClock); + *ppinstance = pTrayNotify; + + return pTrayNotify->_Init(Tray, bHideClock); } VOID -TrayNotify_NotifyMsg(WPARAM wParam, LPARAM lParam) +TrayNotify_NotifyMsg(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) { BOOL bDummy; - g_Instance->NotifyMsg(0, wParam, lParam, bDummy); + pTrayNotify->NotifyMsg(0, wParam, lParam, bDummy); } BOOL -TrayNotify_GetClockRect(OUT PRECT rcClock) +TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock) { - return g_Instance->GetClockRect(rcClock); + return pTrayNotify->GetClockRect(rcClock); } Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Dec 17 12:44:58 2014 @@ -370,6 +370,8 @@ HWND m_Rebar; HWND m_TaskSwitch; HWND m_TrayNotify; + + CTrayNotifyWnd* m_TrayNotifyInstance; DWORD m_Position; HMONITOR m_Monitor; @@ -1524,7 +1526,7 @@ SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(this, HideClock); + m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); if (UpdateNonClientMetrics()) { @@ -2170,7 +2172,7 @@ { if (m_TrayNotify) { - TrayNotify_NotifyMsg(wParam, lParam); + TrayNotify_NotifyMsg(m_TrayNotifyInstance, wParam, lParam); } return TRUE; } @@ -2541,7 +2543,7 @@ /* We should forward mouse messages to child windows here. Right now, this is only clock double-click */ RECT rcClock; - if (TrayNotify_GetClockRect(&rcClock)) + if (TrayNotify_GetClockRect(m_TrayNotifyInstance, &rcClock)) { POINT ptClick; ptClick.x = MAKEPOINTS(lParam).x; @@ -3091,15 +3093,6 @@ return S_OK; } -CTrayWindow * g_TrayWindow; - -HRESULT -Tray_OnStartMenuDismissed() -{ - return g_TrayWindow->RaiseStartButton(); -} - - HRESULT CreateTrayWindow(ITrayWindow ** ppTray) { CComPtr<CTrayWindow> Tray = new CComObject<CTrayWindow>(); @@ -3108,19 +3101,27 @@ Tray->_Init(); Tray->Open(); - g_TrayWindow = Tray; *ppTray = (ITrayWindow *) Tray; return S_OK; } -VOID TrayProcessMessages(ITrayWindow *) +HRESULT +Tray_OnStartMenuDismissed(ITrayWindow* Tray) { - g_TrayWindow->TrayProcessMessages(); + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + return TrayWindow->RaiseStartButton(); } -VOID TrayMessageLoop(ITrayWindow *) +VOID TrayProcessMessages(ITrayWindow *Tray) { - g_TrayWindow->TrayMessageLoop(); + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + TrayWindow->TrayProcessMessages(); } + +VOID TrayMessageLoop(ITrayWindow *Tray) +{ + CTrayWindow * TrayWindow = static_cast<CTrayWindow *>(Tray); + TrayWindow->TrayMessageLoop(); +}

1 0

[gadamopoulos] 65702: [RSHELL] * Disable themes for the toolbars used for shell menus * See issue CORE-8922 for details
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 12:38:19 2014 New Revision: 65702 URL: http://svn.reactos.org/svn/reactos?rev=65702&view=rev Log: [RSHELL] * Disable themes for the toolbars used for shell menus * See issue CORE-8922 for details Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Dec 17 12:38:19 2014 @@ -384,6 +384,8 @@ SubclassWindow(Create(hwndParent, tbStyles, tbExStyles)); + SetWindowTheme(m_hWnd, L"", L""); + // If needed, create the pager. if (m_usePager) {

1 0

[gadamopoulos] 65701: [RSHELL] - Remove definition for an undocumented function that already exists in our headers - See issue CORE-8920
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 12:28:35 2014 New Revision: 65701 URL: http://svn.reactos.org/svn/reactos?rev=65701&view=rev Log: [RSHELL] - Remove definition for an undocumented function that already exists in our headers - See issue CORE-8920 Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Dec 17 12:28:35 2014 @@ -32,13 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuToolbars); -extern "C" -HRESULT WINAPI SHGetImageList( - _In_ int iImageList, - _In_ REFIID riid, - _Out_ void **ppv - ); - // FIXME: Enable if/when wine comctl supports this flag properly #define USE_TBSTYLE_EX_VERTICAL 0

1 0

[gadamopoulos] 65700: [RSHELL] - Simplify some code by using shlwapi helpers - See issue CORE-8919
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 12:11:31 2014 New Revision: 65700 URL: http://svn.reactos.org/svn/reactos?rev=65700&view=rev Log: [RSHELL] - Simplify some code by using shlwapi helpers - See issue CORE-8919 Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Wed Dec 17 12:11:31 2014 @@ -89,13 +89,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) { - CComPtr<IInputObjectSite> ios; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return ios->OnFocusChangeIS(punkObj, fSetFocus); + return IUnknown_OnFocusChangeIS(m_Client, punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, @@ -177,24 +171,12 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO() { - CComPtr<IInputObject> io; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return io->HasFocusIO(); + return IUnknown_HasFocusIO(m_Client); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) { - CComPtr<IInputObject> io; - - HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return io->TranslateAcceleratorIO(lpMsg); + return IUnknown_TranslateAcceleratorIO(m_Client, lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) @@ -564,20 +546,15 @@ while (popup) { HRESULT hr; - CComPtr<IOleWindow> window; - - hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window)); + HWND parent; + + hr = IUnknown_GetWindow(popup, &parent); if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - - HWND parent; - - hr = window->GetWindow(&parent); - if (SUCCEEDED(hr) && hwnd == parent) + if (hwnd == parent) return TRUE; - popup = NULL; - hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup)); + hr = IUnknown_GetSite(popup, IID_PPV_ARG(IMenuPopup, &popup)); if (FAILED(hr)) return FALSE; }

1 0

[gadamopoulos] 65699: Try to fix build
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 11:46:19 2014 New Revision: 65699 URL: http://svn.reactos.org/svn/reactos?rev=65699&view=rev Log: Try to fix build Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h trunk/reactos/base/shell/rshell/CStartMenu.cpp trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… ============================================================================== --- trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #pragma once - -extern IID IID_IAugmentedShellFolder; -extern IID IID_IAugmentedShellFolder2; -extern IID IID_IAugmentedShellFolder3; -extern CLSID CLSID_MergedFolder; interface IAugmentedShellFolder : public IShellFolder { Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… ============================================================================== --- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -22,12 +22,6 @@ #include "CMergedFolder.h" WINE_DEFAULT_DEBUG_CHANNEL(CStartMenu); - -// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) -IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; -IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; -IID IID_IAugmentedShellFolder3 = { 0x4F755EA8, 0x247D, 0x479B, { 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01 } }; -CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; //#define TEST_TRACKPOPUPMENU_SUBMENUS Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Wed Dec 17 11:46:19 2014 @@ -107,9 +107,10 @@ DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); -DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); - +DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8DB3B3F4, 0x6CFE, 0x11D1, 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); +DEFINE_GUID(IID_IAugmentedShellFolder3, 0x4F755EA8, 0x247D, 0x479B, 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01); #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar

1 0

[gadamopoulos] 65698: [BROWSEUI] * Simplify a lot of methods my using helpers from shlwapi. * Remove declarations for undocumented functions that are already declared in our headers. * Move definit...
by gadamopoulos＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: gadamopoulos Date: Wed Dec 17 11:35:07 2014 New Revision: 65698 URL: http://svn.reactos.org/svn/reactos?rev=65698&view=rev Log: [BROWSEUI] * Simplify a lot of methods my using helpers from shlwapi. * Remove declarations for undocumented functions that are already declared in our headers. * Move definitions of IID_IAugmentedShellFolder and CLSID_MergedFolder to our headers. * Remove definitions of functions that are already implemented in shlwapi. * Add CreateMergedFolder and CreateMenuBand functions in precomp.h in order to simplify creating these objects when using rshell. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/bandproxy.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/include/reactos/shlguid_undoc.h trunk/reactos/include/reactos/shlwapi_undoc.h trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -29,13 +29,6 @@ HRESULT CreateAddressEditBox(REFIID riid, void **ppv); -extern "C" -HRESULT WINAPI SHGetImageList( - _In_ int iImageList, - _In_ REFIID riid, - _Out_ void **ppv - ); - /* TODO: ****Add command handler for show/hide Go button to OnWinEvent @@ -283,13 +276,7 @@ HRESULT STDMETHODCALLTYPE CAddressBand::QueryStatus( const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - return oleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + return IUnknown_QueryStatus(fAddressEditBox, *pguidCmdGroup, cCmds, prgCmds, pCmdText); } HRESULT STDMETHODCALLTYPE CAddressBand::Exec(const GUID *pguidCmdGroup, @@ -329,15 +316,9 @@ HRESULT STDMETHODCALLTYPE CAddressBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - CComPtr<IInputObjectSite> inputObjectSite; - HRESULT hResult; - if (fActivate) { - hResult = fSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &inputObjectSite)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = inputObjectSite->OnFocusChangeIS(static_cast<IDeskBand *>(this), fActivate); + IUnknown_OnFocusChangeIS(fSite, static_cast<IDeskBand *>(this), fActivate); SetFocus(); } return S_OK; Modified: trunk/reactos/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -37,20 +37,15 @@ HRESULT CBandProxy::FindBrowserWindow(IUnknown **browser) { - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IWebBrowser2> webBrowser; - HRESULT hResult; + IWebBrowser2* webBrowser; + HRESULT hResult; if (browser == NULL) return E_POINTER; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); + hResult = IUnknown_QueryService(fSite, SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = serviceProvider->QueryService( - SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - *browser = webBrowser.Detach(); + *browser = webBrowser; return S_OK; } Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -43,17 +43,6 @@ ::ExtTextOut(dc, 0, 0, ETO_OPAQUE, bounds, NULL, 0, NULL); } -long GetScreenDepth() -{ - HDC tempDC; - long depth; - - tempDC = GetDC(NULL); - depth = GetDeviceCaps(tempDC, BITSPIXEL) * GetDeviceCaps(tempDC, PLANES); - ReleaseDC(NULL, tempDC); - return depth; -} - static const int gSmallImageSize = 22; static const int gMediumImageSize = 26; static const int gLargeImageSize = 38; @@ -100,7 +89,7 @@ BITMAP bitmapInfo; int resourceID; - screenDepth = GetScreenDepth(); + screenDepth = SHGetCurColorRes(); GetClientRect(&clientRect); clientWidth = clientRect.right - clientRect.left; clientHeight = clientRect.bottom - clientRect.top; Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -29,14 +29,7 @@ #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -#define USE_CUSTOM_MENUBAND 1 -HMODULE g_hRShell = NULL; - #if 1 -// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) - -IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; -CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; interface IAugmentedShellFolder : public IShellFolder { @@ -89,35 +82,6 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv); extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); - -typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); - -HMODULE hRShell = NULL; -PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = NULL; -PMENUBAND_CONSTRUCTOR pCMenuBand_Constructor = NULL; - -HRESULT IUnknown_HasFocusIO(IUnknown * punk) -{ - CComPtr<IInputObject> pio; - HRESULT hr; - hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - return pio->HasFocusIO(); -} - -HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg) -{ - CComPtr<IInputObject> pio; - HRESULT hr; - if (!punk) - return E_FAIL; - hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - return pio->TranslateAcceleratorIO(pmsg); -} HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { @@ -478,28 +442,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 1 - if (!hRShell) - { - hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - } - - if (!pCMergedFolder_Constructor) - pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hRShell, "CMergedFolder_Constructor"); - - if (pCMergedFolder_Constructor) - { - hr = pCMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); - } - else - { - hr = E_FAIL; - } -#else - hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); -#endif + hr = CreateMergedFolder(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { *ppsfFavorites = psfUserFavorites.Detach(); @@ -560,30 +503,7 @@ if (fFavoritesMenu.p == NULL) { -#if USE_CUSTOM_MENUBAND - if (!hRShell) - { - hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - } - - if (!pCMenuBand_Constructor) - pCMenuBand_Constructor = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); - - if (pCMenuBand_Constructor) - { - hResult = pCMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &newMenu)); - } - else - { - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &newMenu)); - } -#else - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &newMenu)); -#endif + hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &newMenu)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -751,29 +671,9 @@ *pMenuBar = NULL; - hResult = E_FAIL; -#if USE_CUSTOM_MENUBAND - if (!g_hRShell) g_hRShell = GetModuleHandleW(L"rshell.dll"); - - if (!g_hRShell) g_hRShell = LoadLibraryW(L"rshell.dll"); - - if (g_hRShell) - { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(g_hRShell, "CMenuBand_Constructor"); - if (func) - { - hResult = func(IID_PPV_ARG(IShellMenu, &menubar)); - } - } -#endif - - if (FAILED_UNEXPECTEDLY(hResult)) - { - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &menubar)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } + hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &menubar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; hResult = fMenuCallback->QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -1403,8 +1303,6 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::SetSite(IUnknown *pUnkSite) { CComPtr<IBrowserService> browserService; - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IOleWindow> oleWindow; HWND ownerWindow; HWND dockContainer; HRESULT hResult; @@ -1419,10 +1317,7 @@ else { // get window handle of owner - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&ownerWindow); + hResult = IUnknown_GetWindow(pUnkSite, &ownerWindow); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (ownerWindow == NULL) @@ -1447,9 +1342,7 @@ return E_FAIL; // take advice to watch events - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); } return S_OK; @@ -1467,7 +1360,6 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - CComPtr<IServiceProvider> serviceProvider; HRESULT hResult; if (IsEqualIID(guidService, IID_IBandSite)) @@ -1577,15 +1469,10 @@ LRESULT CInternetToolbar::OnTravelBack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = serviceProvider->QueryService(SID_SShellBrowser, - IID_PPV_ARG(IWebBrowser, &webBrowser)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoBack(); @@ -1594,15 +1481,10 @@ LRESULT CInternetToolbar::OnTravelForward(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoForward(); @@ -1611,13 +1493,7 @@ LRESULT CInternetToolbar::OnUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleCommandTarget->Exec(&CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); + IUnknown_Exec(fSite, CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); return 1; } @@ -1654,13 +1530,7 @@ LRESULT CInternetToolbar::OnFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IOleCommandTarget> oleCommandTarget; - HRESULT hResult; - - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleCommandTarget->Exec(&CGID_Explorer, 0x23, 0, NULL, NULL); + IUnknown_Exec(fSite, CGID_Explorer, 0x23, 0, NULL, NULL); return 1; } @@ -1677,7 +1547,6 @@ LRESULT CInternetToolbar::OnMenuDropDown(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled) { - CComPtr<IServiceProvider> serviceProvider; CComPtr<IBrowserService> browserService; CComPtr<IOleCommandTarget> commandTarget; CComPtr<ITravelLog> travelLog; @@ -1703,14 +1572,11 @@ { case IDM_GOTO_BACK: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_BACK); - hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; - hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); + hResult = IUnknown_QueryStatus(browserService, CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { @@ -1733,13 +1599,11 @@ break; case IDM_GOTO_FORWARD: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); - hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; - hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); + hResult = IUnknown_QueryStatus(browserService, CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) { Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -46,4 +46,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +#define USE_CUSTOM_MENUBAND 1 + +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +static inline +HRESULT CreateMergedFolder(REFIID riid, void **ppv) +{ +#if 1 + HMODULE hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + + PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) + GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + return pCMergedFolder_Constructor(riid, ppv); + } +#endif + return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +} + +static inline +HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv) +{ +#if USE_CUSTOM_MENUBAND + HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); + + if (!hRShell) + hRShell = LoadLibraryW(L"rshell.dll"); + + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + if (func) + { + return func(iid , ppv); + } +#endif + return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} + #endif /* _BROWSEUI_PCH_ */ Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -25,11 +25,6 @@ #include <strsafe.h> #define USE_CUSTOM_EXPLORERBAND 1 - -extern "C" -BOOL WINAPI Shell_GetImageLists( - _Out_ HIMAGELIST *phiml, - _Out_ HIMAGELIST *phimlSmall); extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -148,34 +143,6 @@ // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); - - -HMENU SHGetMenuFromID(HMENU topMenu, int theID) -{ - MENUITEMINFO menuItemInfo; - - menuItemInfo.cbSize = sizeof(menuItemInfo); - menuItemInfo.fMask = MIIM_SUBMENU; - if (!GetMenuItemInfo(topMenu, theID, FALSE, &menuItemInfo)) - return NULL; - return menuItemInfo.hSubMenu; -} - -void SHCheckMenuItem(HMENU theMenu, int theID, BOOL checked) -{ - MENUITEMINFO menuItemInfo; - - menuItemInfo.cbSize = sizeof(menuItemInfo); - menuItemInfo.fMask = MIIM_STATE; - if (GetMenuItemInfo(theMenu, theID, FALSE, &menuItemInfo)) - { - if (checked) - menuItemInfo.fState |= MF_CHECKED; - else - menuItemInfo.fState &= ~MF_CHECKED; - SetMenuItemInfo(theMenu, theID, FALSE, &menuItemInfo); - } -} void DeleteMenuItems(HMENU theMenu, unsigned int firstIDToDelete, unsigned int lastIDToDelete) { @@ -985,9 +952,7 @@ ::SendMessage(fCurrentShellViewWindow, WM_SETREDRAW, 0, 0); // set site - hResult = newShellView->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (SUCCEEDED(hResult) && objectWithSite.p != NULL) - hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); + hResult = IUnknown_SetSite(newShellView, static_cast<IDropTarget *>(this)); // update folder and view saveCurrentShellFolder = fCurrentShellFolder; @@ -2582,8 +2547,6 @@ return E_NOTIMPL; } -extern HRESULT IUnknown_HasFocusIO(IUnknown * punk); -extern HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg); HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayTranslateAccelerator(MSG *pmsg) { for (int i = 0; i < 3; i++) Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -261,7 +261,6 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){ HWND parentWindow; - IOleWindow *oleWindow; HWND toolbar; HRESULT hResult; @@ -273,13 +272,8 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (SUCCEEDED(hResult)) - { - oleWindow->GetWindow(&parentWindow); - oleWindow->Release(); - } - if (!::IsWindow(parentWindow)) + hResult = IUnknown_GetWindow(pUnkSite, &parentWindow); + if (FAILED(hResult) || !::IsWindow(parentWindow)) return E_FAIL; toolbar = CreateWindowEx( Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -107,6 +107,10 @@ DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); +DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); + + #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2 Modified: trunk/reactos/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlwapi_un… ============================================================================== --- trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -33,13 +33,6 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); HRESULT WINAPI ConnectToConnectionPoint(IUnknown *lpUnkSink, REFIID riid, BOOL bAdviseOnly, IUnknown *lpUnknown, LPDWORD lpCookie, IConnectionPoint **lppCP); BOOL WINAPI SHIsSameObject(IUnknown *lpInt1, IUnknown *lpInt2); -HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd); -HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); -HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site); -HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); -HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID riid, LPVOID *lppOut); -HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); -HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName); void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend); DWORD WINAPI SHRemoveAllSubMenus(HMENU hMenu); @@ -47,9 +40,6 @@ DWORD WINAPI SHCheckMenuItem(HMENU hMenu, UINT uID, BOOL bCheck); DWORD WINAPI SHRegisterClassA(WNDCLASSA *wndclass); BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, DWORD grfKeyState, PPOINTL lpPt, DWORD* pdwEffect); -HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers); -HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus); -HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, PVOID lpArg2, PVOID lpArg3, PVOID lpArg4); HMENU WINAPI SHGetMenuFromID(HMENU hMenu, UINT uID); DWORD WINAPI SHGetCurColorRes(void); DWORD WINAPI SHWaitForSendMessageThread(HANDLE hand, DWORD dwTimeout); @@ -84,6 +74,17 @@ #define SHCreateWorkerWindow SHCreateWorkerWindowA #endif +HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); +HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); +HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); +HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); +HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers); +HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus); +HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, PVOID lpArg2, PVOID lpArg3, PVOID lpArg4); +HRESULT WINAPI IUnknown_HasFocusIO(IUnknown * punk); +HRESULT WINAPI IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg); +HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObject, BOOL bFocus); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Wed Dec 17 11:35:07 2014 @@ -539,6 +539,8 @@ #define SMC_EXEC 4 INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); + +HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv); static inline ULONG Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)

1 0

[dquintana] 65697: [SEHLL32] * Implement handling of file associations marked as "NoOpen". Patch by Lee Schroeder, with a few tweaks. CORE-8855 #resolve #comment Commited in trunk r65697. Thanks.
by dquintana＠svn.reactos.org 17 Dec '14

17 Dec '14

Author: dquintana Date: Wed Dec 17 00:46:30 2014 New Revision: 65697 URL: http://svn.reactos.org/svn/reactos?rev=65697&view=rev Log: [SEHLL32] * Implement handling of file associations marked as "NoOpen". Patch by Lee Schroeder, with a few tweaks. CORE-8855 #resolve #comment Commited in trunk r65697. Thanks. Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.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/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.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/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -37,6 +37,7 @@ HKCR,".386","",0x00000000,"vxdfile" HKCR,".vxd","",0x00000000,"vxdfile" HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" +HKCR,"vxdfile","NoOpen",0x00000000,"" HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" ; Animated Cursors @@ -86,6 +87,7 @@ ; Dynamic Link Libraries HKCR,".dll","",0x00000000,"dllfile" HKCR,"dllfile","",0x00000000,"Dynamic Link Library" +HKCR,"dllfile","NoOpen",0x00000000,"" HKCR,"dllfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-163" HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" @@ -260,6 +262,7 @@ ; System-Files HKCR,".sys","",0x00000000,"sysfile" HKCR,"sysfile","",0x00000000,"System File" +HKCR,"sysfile","NoOpen",0x00000000,"" HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -57,6 +57,7 @@ static HICON GetIcon(SApp *pApp); static BOOL Execute(SApp *pApp, LPCWSTR pwszFilePath); static BOOL IsHidden(SApp *pApp); + inline BOOL IsNoOpen(VOID) { return m_bNoOpen; } BOOL LoadRecommended(LPCWSTR pwszFilePath); BOOL SetDefaultHandler(SApp *pApp, LPCWSTR pwszFilename); @@ -775,12 +776,14 @@ COpenWithDialog(const OPENASINFO *pInfo, COpenWithList *pAppList); ~COpenWithDialog(); static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + BOOL IsNoOpen(HWND hwnd); private: VOID Init(HWND hwnd); VOID AddApp(COpenWithList::SApp *pApp, BOOL bSelected); VOID Browse(); VOID Accept(); + static BOOL CALLBACK NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); COpenWithList::SApp *GetCurrentApp(); const OPENASINFO *m_pInfo; @@ -790,10 +793,11 @@ HTREEITEM m_hRecommend; HTREEITEM m_hOther; HIMAGELIST m_hImgList; + BOOL m_bNoOpen; }; COpenWithDialog::COpenWithDialog(const OPENASINFO *pInfo, COpenWithList *pAppList = NULL): - m_pInfo(pInfo), m_pAppList(pAppList), m_hImgList(NULL) + m_pInfo(pInfo), m_pAppList(pAppList), m_hImgList(NULL), m_bNoOpen(FALSE) { if (!m_pAppList) { @@ -810,6 +814,53 @@ delete m_pAppList; if (m_hImgList) ImageList_Destroy(m_hImgList); +} + +BOOL CALLBACK COpenWithDialog::NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + { + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, IDNO); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDYES: + EndDialog(hwnd, IDYES); + break; + case IDNO: + EndDialog(hwnd, IDNO); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + +BOOL COpenWithDialog::IsNoOpen(HWND hwnd) +{ + /* Only do the actual check if the file type has the 'NoOpen' flag. */ + if (m_bNoOpen) + { + int dReturnValue = DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_NOOPEN), hwnd, NoOpenDlgProc); + + if (dReturnValue == IDNO) + return TRUE; + else if (dReturnValue == -1) + { + ERR("IsNoOpen failed to load the dialog box."); + return TRUE; + } + } + + return FALSE; } VOID COpenWithDialog::AddApp(COpenWithList::SApp *pApp, BOOL bSelected) @@ -923,6 +974,10 @@ /* Load applications from registry */ m_pAppList->Load(); m_pAppList->LoadRecommended(m_pInfo->pcszFile); + + /* Determine if the type of file can be opened directly from the shell */ + if (m_pAppList->IsNoOpen() != FALSE) + m_bNoOpen = TRUE; /* Init treeview */ m_hTreeView = GetDlgItem(hwnd, 14002); @@ -1395,6 +1450,9 @@ return E_FAIL; } + if (pDialog.IsNoOpen(hwndParent)) + return S_OK; + ShowWindow(hwnd, SW_SHOWNORMAL); while (GetMessage(&msg, NULL, 0, 0) && IsWindow(hwnd)) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -612,6 +612,20 @@ PUSHBUTTON "Storno", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -612,6 +612,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -623,6 +623,20 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -623,6 +623,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Annuler", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Annulla", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Avbryt", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Anuluj", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -608,6 +608,20 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -608,6 +608,20 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -610,6 +610,20 @@ PUSHBUTTON "Anulo", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -606,6 +606,20 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -615,6 +615,20 @@ PUSHBUTTON "åæ¶", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ 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] Wed Dec 17 00:46:30 2014 @@ -614,6 +614,20 @@ PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 END +IDD_NOOPEN DIALOGEX 0, 0, 240, 75 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Caution" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 + LTEXT "This file could either be used by the operating system or by\n\ +another application. Modifying this file might damage your\n\ +system or make it less functional.\n\n\ +Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 + PUSHBUTTON "No", IDNO, 180, 55, 50, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Dec 17 00:46:30 2014 @@ -288,16 +288,17 @@ #define IDD_OPEN_WITH 24 #define IDD_FORMAT_DRIVE 25 #define IDD_CHECK_DISK 26 +#define IDD_NOOPEN 27 /* Not used dialogs */ -#define IDD_FILE_COPY 27 -#define IDD_SHUTDOWN 28 -#define IDD_LOG_OFF 29 -#define IDD_DISCONNECT 30 -#define IDD_CONFIRM_FILE_REPLACE 31 -#define IDD_AUTOPLAY1 32 -#define IDD_MIXED_CONTENT1 33 -#define IDD_MIXED_CONTENT2 34 +#define IDD_FILE_COPY 28 +#define IDD_SHUTDOWN 29 +#define IDD_LOG_OFF 30 +#define IDD_DISCONNECT 31 +#define IDD_CONFIRM_FILE_REPLACE 32 +#define IDD_AUTOPLAY1 33 +#define IDD_MIXED_CONTENT1 34 +#define IDD_MIXED_CONTENT2 35 /* Icons */ #define IDI_SHELL_DOCUMENT 1

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