Ros-diffs August 2024

ros-diffs@reactos.org

26 participants
139 discussions

[reactos] 01/01: [MODEMUI] Update Romanian (ro-RO) translation (#6775)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be1121d9cc9db9aea62eb… commit be1121d9cc9db9aea62eb11a2e28bf40e0bfe590 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Aug 16 22:29:08 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 16 21:29:08 2024 +0200 [MODEMUI] Update Romanian (ro-RO) translation (#6775) --- dll/win32/modemui/lang/ro-RO.rc | 334 ++++++++++++++++++++-------------------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/dll/win32/modemui/lang/ro-RO.rc b/dll/win32/modemui/lang/ro-RO.rc index 4af90115d87..222c5d483b5 100644 --- a/dll/win32/modemui/lang/ro-RO.rc +++ b/dll/win32/modemui/lang/ro-RO.rc @@ -12,109 +12,109 @@ IDM_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Duplicare…", 0 + MENUITEM "&Dublare…", 0 MENUITEM "&Eliminare", 1 - MENUITEM "&Afișează jurnal", 2 + MENUITEM "&Vizualizare jurnal", 2 MENUITEM SEPARATOR - MENUITEM "P&roprietăți", 3 - MENUITEM "C&opie proprietăți", 4 - MENUITEM "&Aplică proprietăți", 5 + MENUITEM "&Proprietăţi", 3 + MENUITEM "Pr&oprietăţi la Copiere", 4 + MENUITEM "P&roprietăţi la Se aplică", 5 END END IDD_ADVANCED DIALOGEX 17, 12, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Avansate" +CAPTION "Complex" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Setări suplimentare", 1018, 6, 6, 225, 70 - LTEXT "&Setări suplimentare de inițializare:", 1011, 16, 20, 143, 8 + LTEXT "&Comenzi suplimentare de iniţializare:", 1011, 16, 20, 143, 8 EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL - LTEXT "&Așteptare ton:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + LTEXT "&Aşteptare ton pentru carte de credit:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 LTEXT "secunde", 1010, 173, 54, 40, 8, NOT WS_VISIBLE - GROUPBOX "Sele&ctare țară/regiune", 1012, 6, 80, 225, 75 + GROUPBOX "&Selectare ţară/regiune", 1012, 6, 80, 225, 75 COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "&Setări avansate pentru porturi…", 1100, 107, 170, 125, 14 - DEFPUSHBUTTON "Schimbare opțiuni i&mplicite…", 3, 107, 188, 125, 14 + PUSHBUTTON "Setări comple&xe port…", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "&Modificare preferinţe implicite…", 3, 107, 188, 125, 14 END IDD_GENERAL DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Generale" +CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Port:", 1018, 9, 8, 32, 10 - LTEXT "Port com", 1095, 48, 8, 181, 10 + LTEXT "Port Com", 1095, 48, 8, 181, 10 GROUPBOX "&Volum difuzor", 1029, 10, 21, 218, 48 CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 - RTEXT "Oprit", 1045, 56, 40, 22, 8 - LTEXT "Înalt", 1001, 155, 40, 25, 11 - GROUPBOX "Viteză &maximă port", 1031, 10, 78, 218, 46 + RTEXT "Dezactivat", 1045, 56, 40, 22, 8 + LTEXT "Maxim", 1001, 155, 40, 25, 11 + GROUPBOX "Viteză ma&ximă a port-ului", 1031, 10, 78, 218, 46 COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Controlul apelului", 1060, 10, 133, 218, 51 - AUTOCHECKBOX "&Așteaptă tonul înainte de a apela", 1003, 27, 157, 174, 10 + GROUPBOX "Control formare număr", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&Aşteptare ton de apel înainte de formare număr", 1003, 27, 157, 174, 10 END IDD_DISTINCTIVE_RING DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Sunete distinctive" +CAPTION "Semnal specific de apel" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", 1068, 10, 7, 218, 145 - AUTOCHECKBOX "&Acest telefon are servicii de Sunete distinctive", 1069, 20, 7, 184, 10 - CTEXT "Șablon de sunet", -1, 84, 21, 70, 8 - CTEXT "Tipul de apel", -1, 159, 21, 63, 8 - LTEXT "Adresă p&rimară:", 1070, 20, 41, 62, 8 + AUTOCHECKBOX "&Linia telefonică are Servicii de apel specific", 1069, 20, 7, 184, 10 + CTEXT "Model semnal de apel", -1, 84, 21, 70, 8 + CTEXT "Tip de apel", -1, 159, 21, 63, 8 + LTEXT "Adresă &principală:", 1070, 20, 41, 62, 8 COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Addresă &1:", 1071, 20, 59, 62, 8 + LTEXT "Adresă &1:", 1071, 20, 59, 62, 8 COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Addresă &2:", 1072, 20, 77, 62, 8 + LTEXT "Adresă &2:", 1072, 20, 77, 62, 8 COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Addresă &3:", 1076, 20, 95, 62, 8 + LTEXT "Adresă &3:", 1076, 20, 95, 62, 8 COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Apelanți pri&velegiați:", 1078, 20, 112, 62, 8 + LTEXT "&Apelanţi prioritari:", 1078, 20, 112, 62, 8 COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Retr&oapel:", 1080, 20, 131, 62, 8 + LTEXT "Apelare in&versă:", 1080, 20, 131, 62, 8 COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_DISTINCTIVE_RING_2 DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Sunet distinctiv" +CAPTION "Semnal specific de apel" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", 1068, 10, 7, 218, 87 - AUTOCHECKBOX "&Acest telefon are servicii de Sunete distinctive.", 1069, 19, 7, 177, 10 - CTEXT "Șablon de sunet", -1, 20, 21, 74, 8 - CTEXT "Tipul de apel", -1, 96, 21, 65, 8 - LTEXT "Sunet si&mplu:", 1088, 20, 37, 53, 8 + AUTOCHECKBOX "&Linia telefonică are Servicii de apel specific", 1069, 19, 7, 177, 10 + CTEXT "Model semnal de apel", -1, 20, 21, 74, 8 + CTEXT "Tip de apel", -1, 96, 21, 65, 8 + LTEXT "&Un semnal de apel:", 1088, 20, 37, 53, 8 COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Sunet &dublu:", 1089, 20, 57, 53, 8 + LTEXT "&Două semnale de apel:", 1089, 20, 57, 53, 8 COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Sunet t&riplu:", 1090, 20, 76, 53, 8 + LTEXT "&Trei semnale de apel:", 1090, 20, 76, 53, 8 COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_DIAGNOSTICS DIALOGEX 0, 0, 238, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Diagnostic" +CAPTION "Diagnostice" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 - PUSHBUTTON "Înregistrare &modem", 1096, 138, 149, 75, 14 - AUTOCHECKBOX "Activează j&urnal de apeluri", 1020, 18, 187, 158, 10 - PUSHBUTTON "&Afișare jurnal", 1094, 138, 184, 75, 14, WS_DISABLED - GROUPBOX "Informații modem", 1047, 10, 6, 217, 164 - GROUPBOX "Jurnal de apeluri", -1, 10, 173, 217, 32 + PUSHBUTTON "&Interogare modem", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Înregistrare în &jurnal", 1020, 18, 187, 158, 10 + PUSHBUTTON "&Vizualizare jurnal", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Informaţii despre modem", 1047, 10, 6, 217, 164 + GROUPBOX "Scriere în jurnal", -1, 10, 173, 217, 32 END IDD_PLEASE_WAIT DIALOGEX 0, 0, 195, 72 @@ -123,48 +123,48 @@ CAPTION "Așteptați…" FONT 8, "MS Shell Dlg" BEGIN ICON 5100, -1, 9, 7, 20, 20 - LTEXT "Comunicarea cu modemul. Aceasta poate dura câteva secunde.", -1, 42, 7, 146, 28 - DEFPUSHBUTTON "A&nulează", 2, 72, 52, 50, 14 + LTEXT "Comunicare cu modemul. Durează câteva secunde.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Revocare", 2, 72, 52, 50, 14 END IDD_GENERAL_2 DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Generale" +CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - AUTOCHECKBOX "Apelează (manual) asistat de &operator", 1002, 19, 22, 150, 10 - AUTOCHECKBOX "&Deconectează legăturile inactive timp de", 1042, 19, 38, 143, 10 + AUTOCHECKBOX "&Formare număr asistată de operator (manuală)", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "&Deconectare apel inactiv mai mult de", 1042, 19, 38, 143, 10 EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER - LTEXT "An&ulează apelurile neconectate în timp de", -1, 19, 56, 147, 10 + LTEXT "&Revocare apel neconectat după", -1, 19, 56, 147, 10 EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER RTEXT "&Viteză port:", 1034, 16, 102, 93, 8 COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Protocol d&ate:", 1032, 16, 122, 93, 8 + RTEXT "&Protocol date:", 1032, 16, 122, 93, 8 COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Comp&resie:", 1035, 16, 139, 93, 8 + RTEXT "&Compresie:", 1035, 16, 139, 93, 8 COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "&Control flux:", 1027, 16, 157, 93, 8 + RTEXT "C&ontrol flux:", 1027, 16, 157, 93, 8 COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Preferințe apel", 1060, 11, 7, 217, 66 + GROUPBOX "Preferinţe la apelare", 1060, 11, 7, 217, 66 LTEXT "min", 1044, 195, 38, 22, 8 LTEXT "sec", 1041, 194, 56, 22, 8 - GROUPBOX "Perferințe date conexiune", -1, 11, 82, 217, 94 + GROUPBOX "Preferinţe pentru conexiunea de date", -1, 11, 82, 217, 94 END IDD_ADVANCED_2 DIALOGEX 17, 12, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Avansate" +CAPTION "Complex" FONT 8, "MS Shell Dlg" BEGIN - AUTOCHECKBOX "Afișează fereastra terminal în&aintea apelării", 1000, 20, 21, 200, 10 - AUTOCHECKBOX "Afișează fereastra terminal &după apelare", 1001, 20, 38, 200, 10 - RTEXT "&Biți de date:", 1024, 18, 79, 93, 8 + AUTOCHECKBOX "&Afişare fereastră terminal înaintea apelării", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "A&fişare fereastră terminal după apelare", 1001, 20, 38, 200, 10 + RTEXT "&Biţi de date:", 1024, 18, 79, 93, 8 COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP RTEXT "&Paritate:", 1026, 18, 97, 93, 8 COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Biți &oprire:", 1029, 18, 115, 93, 8 + RTEXT "Biţi de &stop:", 1029, 18, 115, 93, 8 COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "&Modulare:", 1045, 18, 133, 93, 8 + RTEXT "&Modulaţie:", 1045, 18, 133, 93, 8 COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP GROUPBOX "Fereastră terminal", 1004, 10, 7, 217, 49 GROUPBOX "Setări hardware", 1005, 10, 64, 217, 89 @@ -175,13 +175,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ISDN" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "S&chimbare tip", -1, 11, 6, 217, 39 + GROUPBOX "&Tip comutare", -1, 11, 6, 217, 39 COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "P&rimul număr:", -1, 11, 50, 217, 50 + GROUPBOX "P&rimul număr", -1, 11, 50, 217, 50 EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "Al d&oilea număr:", -1, 11, 105, 217, 49 + GROUPBOX "&Al doilea număr", -1, 11, 105, 217, 49 EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER @@ -189,11 +189,11 @@ END IDD_PLEASE_WAIT_2 DIALOGEX 0, 0, 195, 72 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Așteptați…" +CAPTION "Aşteptaţi" FONT 8, "MS Shell Dlg" BEGIN ICON 5100, -1, 9, 7, 20, 20 - LTEXT "Transmiterea de informații țară/regiune către modem.", -1, 42, 7, 146, 28 + LTEXT "Se trimit la modem informaţii despre ţară/regiune.", -1, 42, 7, 146, 28 END IDD_WARNING DIALOGEX 0, 0, 360, 105 @@ -201,12 +201,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Avertisment" FONT 8, "MS Shell Dlg" BEGIN - AUTOCHECKBOX "N&u doresc recurența acestui mesaj", 1109, 17, 73, 118, 10 - DEFPUSHBUTTON "Î&nchide", 1, 302, 84, 50, 14 - LTEXT "Unele modemuri nu funcționează corect cu șiruri de inițializare atât de lungi.", -1, 50, 27, 304, 8 - LTEXT "Informațiile despre aceste limite le puteți afla de la producătorul modemului.", -1, 50, 41, 304, 8 + AUTOCHECKBOX "Nu se mai afişează acest mesaj", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Unele modemuri nu tratează corect şirurile de iniţializare de o asemenea lungime.", -1, 50, 27, 304, 8 + LTEXT "Informaţii despre această limitare se obţin de la producătorul modemului.", -1, 50, 41, 304, 8 ICON 5100, -1, 15, 14, 20, 20 - LTEXT "Ați scris un șir de inițializare mai lung de 57 de caractere.", -1, 50, 14, 304, 8 + LTEXT "Aţi introdus un şir de iniţializare a modemului mai lung de 57 de caractere.", -1, 50, 14, 304, 8 END IDD_MODEMS DIALOGEX 0, 0, 252, 218 @@ -215,16 +215,16 @@ CAPTION "Modemuri" FONT 8, "MS Shell Dlg" BEGIN ICON 5100, 1057, 6, 7, 20, 20 - LTEXT "Următoarele modemuri sunt instalate: ", -1, 44, 12, 203, 9 + LTEXT "&Sunt instalate următoarele modemuri:", -1, 44, 12, 203, 9 CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE PUSHBUTTON "A&dăugare", 110, 56, 198, 60, 14 PUSHBUTTON "&Eliminare", 112, 121, 198, 60, 14 - PUSHBUTTON "&Proprietăți", 109, 185, 198, 60, 14 + PUSHBUTTON "&Proprietăţi", 109, 185, 198, 60, 14 END IDD_PLEASE_WAIT_3 DIALOGEX 0, 0, 195, 72 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Așteptați…" +CAPTION "Aşteptaţii…" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Oprire", 2, 74, 53, 50, 14 @@ -259,40 +259,40 @@ BEGIN 242 "6" 243 "7" 244 "8" - 250 "Par" - 251 "Impar" - 252 "Nimic" + 250 "Pare" + 251 "Impare" + 252 "Fără" 253 "Marcare" 254 "Spațiu" 255 "1" 256 "1.5" 257 "2" - 260 "Xpornit / Xoprit" - 261 "Dispozitiv" - 262 "Nimic" - 263 "Pornit" - 264 "Scăzut" + 260 "Xon / Xoff" + 261 "Hardware" + 262 "Fără" + 263 "Pe" + 264 "Minim" 265 "V.23 (Minitel)" 266 "Standard" - 267 "Ne-standard (Bell, HST)" - 270 "Adaugă la jurnal" + 267 "Nestandard (Bell, HST)" + 270 "Adăugare la &Jurnal" 300 "Nespecificat" 301 "Date" 302 "Fax" 303 "Voce" - 304 "Nimic" - 320 "Setări pentru țară/regiune actualizate" + 304 "Fără" + 320 "Setare ţară/regiune actualizată" 340 "Modem" - 341 "Setări pentru modem" + 341 "Setări modem" 342 "Adresă modem" - 400 "Setări pentru țară/regiune neactualizate" - 401 "Unele modemuri nu funcționează corect cu șiruri de inițializare peste 57 de caractere.\n\nCereți mai multe informații de la producător." + 400 "Setare ţară/regiune neactualizată" + 401 "Unele modemuri nu acceptă comenzi de iniţializare de la utilizator mai mari de 57 de caractere.\n\nInformaţii despre această limitare se obţin de la producătorul modemului" 402 "Avertisment" - 460 "Nu există suficientă memorie pentru a afișa caseta de dialog General.\nMai închideți din aplicații apoi reîncercați." - 461 "Nu există suficientă memorie pentru a afișa caseta de dialog Setări pentru modem.\nMai închideți din aplicații apoi reîncercați." - 463 "Fiecare adresă de apelare trebuie stabilită pe „Automat” sau pe un model de apel unic.\n\nSchimbați dublura apoi reîncercați." - 465 "C.Erori Standard" - 466 "C.Erori Forțat" + 460 "Memorie insuficientă pentru a vizualiza caseta de dialog Generale.\nÎnchideţi unele fişiere şi programe, apoi încercaţi din nou." + 461 "Memorie insuficientă pentru a vizualiza caseta de dialog Setări modem.\nÎnchideţi unele fişiere şi programe, apoi încercaţi din nou." + 463 "Este necesar ca fiecare adresă de apelare să fie stabilită pe 'Automat' sau cu un model unic al semnalului de apel.\n\nModificaţi modelul dublat al semnalului de apel cu unul diferit." + 465 "EC standard" + 466 "EC forţat" 467 "Celular" 468 "Dezactivat" 469 "Activat" @@ -327,19 +327,19 @@ BEGIN 515 "V.110 (28.8k)" 516 "V.110 (38.4k)" 517 "V.110 (57.6k)" - 518 "Analog (V.34/V.90)" + 518 "Analogic (V.34/V.90)" 550 "ESS5 (AT&T) (America de Nord)" 551 "AT&T Punct la Multipunct" 552 "National ISDN 1 (NI-1)" 553 "Northern Telecom DMS 100 (NT1)" 554 "NTT INS64 (Japonia)" 555 "ISDN European (DSS1)" - 556 "Național German (1TR6) (rar)" - 557 "Național Francez (VN3) (rar)" - 558 "Național Belgian (rar)" - 559 "Național Australian (rar)" - 560 "Comutație necunoscută" - 570 "Configurația ISDN pentru acest modem\neste incompletă.\n\nIntroduceți datele\nîn compartimentul ISDN apoi reîncercați." + 556 "Național Germania (1TR6) (rar utilizat)" + 557 "Național Franță (VN3) (rar utilizat)" + 558 "Național Belgia (rar utilizat)" + 559 "Național Australia (rar utilizat)" + 560 "Argument necunoscut" + 570 "Configurarea ISDN pentru acest modem\nneterminată.\n\nCompletaţi informaţiile din fila\nISDN înainte de a utiliza acest modem." 600 "PPP (56k,GSM)" 601 "PPP (64k,GSM)" 602 "V.120 (64k,GSM)" @@ -353,32 +353,32 @@ BEGIN 611 "V.110 (28.8k,GSM)" 612 "V.110 (38.4k,GSM)" 613 "V.110 (57.6k,GSM)" - 614 "Analog RLP" - 615 "Analog NRLP" + 614 "RLP analogic" + 615 "NRLP analogic" 616 "GPRS" - 617 "PIAFS - dinspre" - 618 "PIAFS - spre" - 700 "Folosește locația TAPI curentă" + 617 "PIAFS - dinspre exterior" + 618 "PIAFS - dinspre interior" + 700 "Utilizaţi amplasarea TAPI curentă" 2006 "Atașat la" - 2007 "Absent" - 2008 "Inactiv" + 2007 "Nu există" + 2008 "Nefuncţional" 2009 "Necesită repornire" - 2010 "#Pentru a termina configura modemului, trebuie să reporniți calculatorul.\n\nDoriți să reporniți calculatorul acum?" - 2011 "Modem instalat incorect" + 2010 "#Pentru terminarea instalării modemului, este necesar să reporniţi computerul.\n\nReporniţi computerul acum?" + 2011 "Modem instalat necorespunzător" 2012 "Port necunoscut" 3000 "Instalare modem" 3018 "Modemuri" - 3019 "Instalează modemuri și editează proprietăți ale acestora." - 3053 "Proprietățile modemului nu pot fi afișate deoarce modemul e indisponibil.\n\nReporniți sistemul apoi reîncercați." - 3054 "Properietăți pentru Modemuri" - 3060 "Sigur vreți să eliminați acest(e) modem(uri) din sistem?" - 3061 "Nu a pututu fi eliminat modemul „%1” din %2." + 3019 "Instalează un nou modem şi modifică proprietăţile modemului." + 3053 "Imposibil de afişat proprietăţile modemului deoarece modemul nu este disponibil.\n\nReporniţi sistemul şi încercaţi din nou." + 3054 "Proprietăţi pentru modemuri" + 3060 "Sigur eliminaţi din sistem modemurile selectate?" + 3061 "ReactOS nu a reuşit să elimine modemul '%1' din %2." 3062 "Modem" - 3069 "Nu există suficientă memorie pentru a afișa Panoul de control.\n\nMai închideți din programe apoi reîncercați." - 3073 "Trebuie să fiți administrator de sistem pentru a instala un modem." - 3074 "Niciun modem instalat. Trebuie să fiți administrator de sistem pentru a instala un modem." - 3076 "Trebuie să închideți și să reporniți calculatorul pentru ca noile setări să poată fi aplicate.\n\nDoriți să reporniți calculatorul acum?" - 3077 "Schimbarea setărilorr de rețea" + 3069 "Memorie insuficientă pentru a deschide panoul de control al modemului.\n\nÎnchideţi unele programe şi încercaţi din nou." + 3073 "Pentru a instala un modem trebuie să fiţi administrator al sistemului." + 3074 "Nici un modem instalat. Pentru a instala un modem trebuie să fiţi administrator al sistemului." + 3076 "Este necesar să închideţi şi să reporniţi computerul înainte ca noile setări să devină efective.\n\nReporniţi computerul acum?" + 3077 "Modificare setări reţea" 3200 "300 Baud" 3201 "1200 Baud" 3202 "2400 Baud" @@ -386,26 +386,26 @@ BEGIN 3204 "19.2k Baud" 3205 "38.4k Baud" 3206 "57.6k Baud" - 3207 "Niciun răspuns" + 3207 "Fără răspuns" 3212 "Comandă" 3213 "Răspuns" - 3214 "Portul la care este conectat modemul nu poate fi deschis. Acest lucru ar putea fi rezultatul unui conflict între dispozitive. Utilizați Gestionarul de dispozitive pentru a investiga posibilele probleme." - 3215 "Portul care este folosit de modem este folosit în acest moment de o altă aplicație. Închideți toate aplicațiile care ar putea folosi portul." + 3214 "Imposibil de deschis portul la care este ataşat modemul. Poate fi rezultatul unui conflict hardware. Selectaţi ca managerul de dispozitive să controleze că toate dispozitivele sunt funcţionale." + 3215 "Portul pe care îl utilizează modemul este deschis în acest moment de altă aplicaţie. Ieşiţi din orice aplicaţie care ar putea utiliza portul." 3218 "OpenComm" 3221 "115k Baud" - 3222 "Actualizare" + 3222 "Se actualizează" 3223 "Eroare" 3233 "Succes" - 3236 "Modemul nu a putut răspunde. Asigurați-vă că este conectat corect și că este pornit. Dacă este un modem intern sau este conectat deja, verificați dacă întreruperea alocată este configurată corect." - 3237 "COMANDĂ INCOMPATIBILĂ" + 3236 "Modemul nu a reuşit să răspundă. Asiguraţi-vă că este conectat corect şi pornit. Dacă este un modem intern sau este conectat, verificaţi că întreruperea pentru port este stabilită corespunzător." + 3237 "COMANDĂ NEACCEPTATĂ" 3238 "Câmp" 3239 "Valoare" - 3240 " Opțiuni implicite" + 3240 " Preferinţe implicite" 3241 " Preferințe conexiune" 6144 "Japonia" 6145 "Albania" 6146 "Algeria" - 6147 "American Samoa" + 6147 "Samoa Americană" 6148 "Germania (Cod țară/regiune 04)" 6149 "Anguilla" 6150 "Antigua și Barbuda" @@ -415,7 +415,7 @@ BEGIN 6154 "Austria" 6155 "Bahamas" 6156 "Bahrain" - 6157 "Bangladeș" + 6157 "Bangladesh" 6158 "Barbados" 6159 "Belgia" 6160 "Belize" @@ -425,50 +425,50 @@ BEGIN 6164 "Bolivia" 6165 "Botswana" 6166 "Brazilia" - 6167 "Cod regiune/țară (23)" - 6168 "Britanice din Oceanul Indian, Teritoriile" - 6169 "Britanice, Insulele Virgine" + 6167 "Cod ţară/regiune (23)" + 6168 "Teritoriile Britanice din Oceanul Indian" + 6169 "Insulele Virgine Britanice" 6170 "Brunei" 6171 "Bulgaria" 6172 "Myanmar" 6173 "Burundi" 6174 "Belarus" - 6175 "Cameroon" + 6175 "Camerun" 6176 "Canada" - 6177 "Capului Verde, Republica" - 6178 "Cayman, Insulele" - 6179 "Centrafricană Republica" + 6177 "Capul Verde" + 6178 "Insulele Cayman" + 6179 "Republica Centrafricană" 6180 "Ciad" 6181 "Chile" 6182 "China" 6183 "Columbia" 6184 "Comore" 6185 "Congo" - 6186 "Cook, Insulele" + 6186 "Insulele Cook" 6187 "Costa Rica" 6188 "Cuba" 6189 "Cipru" - 6190 "Cehă, Republica" + 6190 "Cehia" 6191 "Cambodgia" 6192 "Coreea de Nord" 6193 "Danemarca" 6194 "Djibouti" - 6195 "Dominicană, Republica" + 6195 "Republica Dominicană" 6196 "Dominica" 6197 "Ecuador" 6198 "Egipt" 6199 "El Salvador" - 6200 "Ecuatorială, Guineea" + 6200 "Guineea Ecuatorială" 6201 "Etiopia" - 6202 "Falkland, Insulele (Malvine)" - 6203 "Fiji, Insulele" + 6202 "Insulele Falkland (Insulele Malvine)" + 6203 "Insulele Fiji" 6204 "Finlanda" 6205 "Franța" - 6206 "Franceză Polinezia" - 6207 "Cod țară/regiune (63)" + 6206 "Polinezia franceză" + 6207 "Cod ţară/regiune (63)" 6208 "Gabon" 6209 "Gambia" - 6210 "Germania (Cod țară/regiune 66)" + 6210 "Germania (Cod ţară/regiune 66)" 6211 "Angola" 6212 "Ghana" 6213 "Gibraltar" @@ -482,7 +482,7 @@ BEGIN 6221 "Guyana" 6222 "Haiti" 6223 "Honduras" - 6224 "Hong Kong, RAS" + 6224 "Hong Kong SAR" 6225 "Ungaria" 6226 "Islanda" 6227 "India" @@ -508,7 +508,7 @@ BEGIN 6247 "Libia" 6248 "Liechtenstein" 6249 "Luxemburg" - 6250 "Macao, RAS" + 6250 "Macao SAR" 6251 "Madagascar" 6252 "Malaezia" 6253 "Malawi" @@ -526,7 +526,7 @@ BEGIN 6265 "Nauru" 6266 "Nepal" 6267 "Olanda" - 6268 "Olandeze, Antilele" + 6268 "Antilele Olandeze" 6269 "Noua Caledonie" 6270 "Noua Zeelandă" 6271 "Nicaragua" @@ -545,23 +545,23 @@ BEGIN 6284 "Puerto Rico" 6285 "Qatar" 6286 "România" - 6287 "Ruanda" - 6288 "St. Cristofor și Nevis" - 6289 "Cod țară/regiune (145)" - 6290 "St. Elena" - 6291 "St. Lucia" + 6287 "Rwanda" + 6288 "Sfântul Cristofor şi Nevis" + 6289 "Cod ţară/regiune (145)" + 6290 "Sfânta Elena" + 6291 "Sfânta Lucia" 6292 "San Marino" - 6293 "Cod țară/regiune (148)" + 6293 "Cod ţară/regiune (148)" 6294 "São Tomé și Príncipe" - 6295 "St. Vincențiu și Grenadine" - 6296 "Saudită, Arabia" + 6295 "Sfântul Vincențiu și Grenadine" + 6296 "Arabia Saudită" 6297 "Senegal" 6298 "Seychelles" 6299 "Sierra Leone" 6300 "Singapore" - 6301 "Solomon, Insulele" + 6301 "Insulele Solomon" 6302 "Somalia" - 6303 "Sud, Africa de" + 6303 "Africa de Sud" 6304 "Spania" 6305 "Sri Lanka" 6306 "Sudan" @@ -571,31 +571,31 @@ BEGIN 6310 "Elveția" 6311 "Siria" 6312 "Tanzania" - 6313 "Tailanda" + 6313 "Thailanda" 6314 "Togo" 6315 "Tonga" - 6316 "Trinidad și Tobago" + 6316 "Trinidad Tobago" 6317 "Tunisia" 6318 "Turcia" - 6319 "Turks și Caicos, Insulele" + 6319 "Insulele Turks şi Caicos" 6320 "Tuvalu" 6321 "Uganda" 6322 "Ucraina" - 6323 "Unite, Emiratele Arabe" - 6324 "Unit al Marii Britanii, Regatul" - 6325 "Unite ale Americii, Statele" + 6323 "Emiratele Arabe Unite" + 6324 "Marea Britanie" + 6325 "Statele Unite" 6326 "Burkina Faso" 6327 "Uruguay" - 6328 "Cod țară/regiune (184)" + 6328 "Cod ţară/regiune (184)" 6329 "Vanuatu" 6330 "Vatican" 6331 "Venezuela" 6332 "Vietnam" - 6333 "Wallis and Futuna" + 6333 "Insulele Wallis şi Futuna" 6334 "Samoa" 6335 "Yemen" 6336 "Yemen" - 6337 "Cod țară/regiune (193)" + 6337 "Cod ţară/regiune (193)" 6338 "Congo (RDC)" 6339 "Zambia" 6340 "Zimbabwe" @@ -609,13 +609,13 @@ BEGIN 6508 "Uzbekistan" 6509 "Kazahstan" 6510 "Tadjikistan" - 6511 "Kîrgîzstan" + 6511 "Kirghizstan" 6512 "Letonia" 6513 "Rusia" 6600 "Croația" 6601 "Slovenia" - 6602 "Macedonia" + 6602 "Macedonia, FRI" 6603 "Bosnia și Herțegovina" 6604 "Iugoslavia" - 20013 "ID dispozitiv" + 20013 "ID hardware" END

4 months, 1 week

[reactos] 01/01: [REGEDIT] *.rc: Dedupe ID_HELP_HELPTOPICS & ID_HELP_ABOUT (#7198)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e86daa703537b9307991… commit 6e86daa703537b93079912060b22c1fb2cd51af7 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Aug 16 18:37:23 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 16 18:37:23 2024 +0200 [REGEDIT] *.rc: Dedupe ID_HELP_HELPTOPICS & ID_HELP_ABOUT (#7198) ID_HELP_HELPTOPICS & ID_HELP_ABOUT are statusbar helptexts, and they do exist twice for no good reason since 10+ years. Dedupe that. Also add a few missing accelerators for it-IT.rc Also strip the trailing dots for some languages for the statusbar helptexts (5 langs: ja-JP,tr-TR,zh-*) Vast majority of languages did not have them at all (24 languages). Also en-US was such a good role-model. Some had it just for some of those texts, but for others not (e.g. pt-PT). Inconsistent. All statusbar helptexts are within those exact 3 STRINGTABLEs now. --- base/applications/regedit/lang/bg-BG.rc | 11 +---- base/applications/regedit/lang/cs-CZ.rc | 11 +---- base/applications/regedit/lang/de-DE.rc | 13 +----- base/applications/regedit/lang/el-GR.rc | 11 +---- base/applications/regedit/lang/en-US.rc | 11 +---- base/applications/regedit/lang/es-ES.rc | 13 +----- base/applications/regedit/lang/fr-FR.rc | 11 +---- base/applications/regedit/lang/he-IL.rc | 11 +---- base/applications/regedit/lang/hu-HU.rc | 11 +---- base/applications/regedit/lang/id-ID.rc | 11 +---- base/applications/regedit/lang/it-IT.rc | 17 ++------ base/applications/regedit/lang/ja-JP.rc | 71 ++++++++++++++------------------- base/applications/regedit/lang/ko-KR.rc | 11 +---- base/applications/regedit/lang/nl-NL.rc | 11 +---- base/applications/regedit/lang/no-NO.rc | 11 +---- base/applications/regedit/lang/pl-PL.rc | 13 +----- base/applications/regedit/lang/pt-BR.rc | 13 +----- base/applications/regedit/lang/pt-PT.rc | 63 +++++++++++++---------------- base/applications/regedit/lang/ro-RO.rc | 11 +---- base/applications/regedit/lang/ru-RU.rc | 11 +---- base/applications/regedit/lang/sk-SK.rc | 13 +----- base/applications/regedit/lang/sl-SI.rc | 11 +---- base/applications/regedit/lang/sq-AL.rc | 11 +---- base/applications/regedit/lang/sv-SE.rc | 11 +---- base/applications/regedit/lang/th-TH.rc | 11 +---- base/applications/regedit/lang/tr-TR.rc | 71 ++++++++++++++------------------- base/applications/regedit/lang/uk-UA.rc | 11 +---- base/applications/regedit/lang/zh-CN.rc | 71 ++++++++++++++------------------- base/applications/regedit/lang/zh-HK.rc | 71 ++++++++++++++------------------- base/applications/regedit/lang/zh-TW.rc | 71 ++++++++++++++------------------- 30 files changed, 214 insertions(+), 484 deletions(-) diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index 388c91ee254..15c35429cfe 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -442,7 +442,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Свързва се с регистъра на далечен компютър" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Разкача се от регистъра на отдалечен компютър" ID_REGISTRY_PRINT "Разпечатва регистъра или част от него" -/* ID_HELP_HELPTOPICS "Отваря помощта за регистърен обработчик" */ +// ID_HELP_HELPTOPICS "Отваря помощта за регистърен обработчик" ID_HELP_ABOUT "Показва сведения за приложението, версия и възпроизводствени права" END @@ -717,12 +717,3 @@ BEGIN DEFPUSHBUTTON "Отказ", IDCANCEL, 93, 29, 45, 14 LTEXT "Претърсване на регистъра...", IDC_STATIC, 33, 12, 105, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Отваря помощта за Регистърния обработчик." - * ID_HELP_ABOUT "Показва сведения за приложението, версията и възпроизводственото право." - *END - */ diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc index 3a1f0924e39..0bc5a3a1fa0 100644 --- a/base/applications/regedit/lang/cs-CZ.rc +++ b/base/applications/regedit/lang/cs-CZ.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Připojí se ke vzdálenému registru jiného počítače" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Odpojí se od vzdálenému registru jiného počítače" ID_REGISTRY_PRINT "Vytiskne všechny části registru" -/* ID_HELP_HELPTOPICS "Otevře témata nápovědy pro editor registru" */ +// ID_HELP_HELPTOPICS "Otevře nápovědu pro editor registru" ID_HELP_ABOUT "Zobrazí informace o aplikaci, verzi a copyright" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Storno", IDCANCEL, 93, 29, 45, 14 LTEXT "Probíhá prohledávání registru...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Otevře nápovědu pro editor registru." - * ID_HELP_ABOUT "Zobrazí informace o aplikaci, verzi a copyright." - *END - */ diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index b957bb97b77..860817100ec 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -439,8 +439,8 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Verbindet zu einer Registry eines Fremdcomputers" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Trennt die Verbindung zu der Registry eines Fremdcomputers" ID_REGISTRY_PRINT "Druckt die gesamte Registry oder Teile davon aus" -/* ID_HELP_HELPTOPICS "Öffnet die Hilfe" */ - ID_HELP_ABOUT "Zeigt Versions- und Copyright-Informationen an" +// ID_HELP_HELPTOPICS "Öffnet die Hilfe" + ID_HELP_ABOUT "Zeigt Programmname, Version und Copyright an" END STRINGTABLE @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Abbrechen", IDCANCEL, 93, 29, 45, 14 LTEXT "Durchsuche die Registry...", IDC_STATIC, 33, 12, 85, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Öffnet die Hilfe." - * ID_HELP_ABOUT "Zeigt Programmname, Version und Copyright an" - *END - */ diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index c220d56128a..07fe0ca866b 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Συνδέεεται στη registry ενός απομακρυσμένου υπολογιστή" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Αποσυνδέεεται από τη registry ενός απομακρυσμένου υπολογιστή" ID_REGISTRY_PRINT "Εκτυπώνει όλο το κομμάτι της registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Εμφανίζει τις πληροφορίες προγράμματος, τον αριθμό έκδοσης και τα δικαιώματα" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Ακύρωση", IDCANCEL, 93, 29, 45, 14 LTEXT "Γίνεται αναζήτηση στη registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index de9efdde58e..1eaceef9de3 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry" ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Displays program information, version number and copyright" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index 5906d6a9000..eae1cd91852 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -442,8 +442,8 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Se conecta al Registro de un ordenador remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Se desconecta del Registro de un ordenador remoto" ID_REGISTRY_PRINT "Imprime todo o parte del Registro" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ - ID_HELP_ABOUT "Muestra información del programa, número de versión y derechos de autor" +// ID_HELP_HELPTOPICS "Abre la ayuda del Editor de registro" + ID_HELP_ABOUT "Despliega información del programa, versión y licencia" END STRINGTABLE @@ -717,12 +717,3 @@ BEGIN DEFPUSHBUTTON "Cancelar", IDCANCEL, 93, 29, 45, 14 LTEXT "Buscando en el Registro...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Abre la ayuda del Editor de registro." - * ID_HELP_ABOUT "Despliega información del programa, versión y licencia." - *END - */ diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index ea4451e52f1..1acb1b5c38c 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connecte aux registres d'un ordinateur distant" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Déconnecte des registres d'un ordinateur distant" ID_REGISTRY_PRINT "Imprime tout ou une partie des registres" -/* ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres" */ +// ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres" ID_HELP_ABOUT "Affiche de l'information sur le programme, le numéro de version et le copyright" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Annuler", IDCANCEL, 93, 29, 45, 14 LTEXT "Recherche dans le registre...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres." - * ID_HELP_ABOUT "Affiche de l'information sur le programme, le numéro de version et le copyright." - *END - */ diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc index ba61a060353..5e329a11996 100644 --- a/base/applications/regedit/lang/he-IL.rc +++ b/base/applications/regedit/lang/he-IL.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry" ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Displays program information, version number and copyright" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "ביטול", IDCANCEL, 93, 29, 45, 14 LTEXT "מחפש ברשום...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index f38c7c3a6c1..305076c3fa7 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry" ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Displays program information, version number and copyright" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index e80691d1e1e..a43faf4de8a 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Menyambungkan ke registri komputer lain" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Memutuskan dari registri komputer lain" ID_REGISTRY_PRINT "Mecetak semua atau sebagian registri" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Menampilkan informasi program, nomor versi, dan hak cipta" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Batal", IDCANCEL, 93, 29, 45, 14 LTEXT "Mencari registri...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 3322a7ff463..bc735c37017 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -97,7 +97,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Nuovo" BEGIN - MENUITEM "Chiave", ID_EDIT_NEW_KEY + MENUITEM "&Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE @@ -209,9 +209,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | CAPTION "Edit String" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nome:", IDC_STATIC, 5, 5, 119, 8 + LTEXT "&Nome:", IDC_STATIC, 5, 5, 119, 8 EDITTEXT IDC_VALUE_NAME, 5, 15, 239, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "Dati:", IDC_STATIC, 5, 30, 119, 8 + LTEXT "&Dati:", IDC_STATIC, 5, 30, 119, 8 EDITTEXT IDC_VALUE_DATA, 5, 40, 239, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 142, 64, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 196, 64, 50, 14 @@ -447,7 +447,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Si connette al Registro di un computer remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Si disconnette dal Registro di un computer remoto" ID_REGISTRY_PRINT "Stampa tutto o parte del Registro" -/* ID_HELP_HELPTOPICS "Apre l'aiuto dell'Editor del Registro" */ +// ID_HELP_HELPTOPICS "Apre l'aiuto dell'Editor del Registro" ID_HELP_ABOUT "Visualizza informazioni sul programma, numero di versione e copyright" END @@ -722,12 +722,3 @@ BEGIN DEFPUSHBUTTON "Annulla", IDCANCEL, 93, 29, 45, 14 LTEXT "Ricerca in corso nel registro...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index 87678d3c719..1f595fb61f6 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -417,45 +417,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "レジストリ全体で使用するコマンドです。" - ID_EDIT_MENU "値やキーを編集するコマンドです。" - ID_VIEW_MENU "レジストリウィンドウをカスタマイズするコマンドです。" - ID_FAVOURITES_MENU "頻繁に使用されるキーにアクセスするコマンドです。" - ID_HELP_MENU "ヘルプとレジストリエディタのバージョン情報を表示するコマンドです。" - ID_EDIT_NEW_MENU "新しいキーや値を作成するコマンドです。" + ID_REGISTRY_MENU "レジストリ全体で使用するコマンドです" + ID_EDIT_MENU "値やキーを編集するコマンドです" + ID_VIEW_MENU "レジストリウィンドウをカスタマイズするコマンドです" + ID_FAVOURITES_MENU "頻繁に使用されるキーにアクセスするコマンドです" + ID_HELP_MENU "ヘルプとレジストリエディタのバージョン情報を表示するコマンドです" + ID_EDIT_NEW_MENU "新しいキーや値を作成するコマンドです" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "値のデータを変更します。" - ID_EDIT_NEW_KEY "新しいキーを追加します。" - ID_EDIT_NEW_STRINGVALUE "新しい文字列値を追加します。" - ID_EDIT_NEW_BINARYVALUE "新しいバイナリ値を追加します。" - ID_EDIT_NEW_DWORDVALUE "新しい DWORD 値を追加します。" - ID_REGISTRY_IMPORTREGISTRYFILE "テキストファイルをレジストリにインポートします。" - ID_REGISTRY_EXPORTREGISTRYFILE "レジストリの一部または全体をテキストファイルにエクスポートします。" - ID_REGISTRY_LOADHIVE "ハイブファイルをレジストリに読み込みます。" - ID_REGISTRY_UNLOADHIVE "レジストリからハイブをアンロードします。" - ID_REGISTRY_CONNECTNETWORKREGISTRY "リモートコンピュータのレジストリに接続します。" - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "リモートコンピュータのレジストリを切断します。" - ID_REGISTRY_PRINT "レジストリの一部または全体を印刷します。" -/* ID_HELP_HELPTOPICS "レジストリエディタのヘルプを開きます。" */ - ID_HELP_ABOUT "プログラムの情報、バージョン番号および著作権を表示します。" + ID_EDIT_MODIFY "値のデータを変更します" + ID_EDIT_NEW_KEY "新しいキーを追加します" + ID_EDIT_NEW_STRINGVALUE "新しい文字列値を追加します" + ID_EDIT_NEW_BINARYVALUE "新しいバイナリ値を追加します" + ID_EDIT_NEW_DWORDVALUE "新しい DWORD 値を追加します" + ID_REGISTRY_IMPORTREGISTRYFILE "テキストファイルをレジストリにインポートします" + ID_REGISTRY_EXPORTREGISTRYFILE "レジストリの一部または全体をテキストファイルにエクスポートします" + ID_REGISTRY_LOADHIVE "ハイブファイルをレジストリに読み込みます" + ID_REGISTRY_UNLOADHIVE "レジストリからハイブをアンロードします" + ID_REGISTRY_CONNECTNETWORKREGISTRY "リモートコンピュータのレジストリに接続します" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "リモートコンピュータのレジストリを切断します" + ID_REGISTRY_PRINT "レジストリの一部または全体を印刷します" +// ID_HELP_HELPTOPICS "レジストリエディタのヘルプを開きます" + ID_HELP_ABOUT "プログラムの情報、バージョン番号および著作権を表示します" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "レジストリエディタを終了します。" - ID_FAVOURITES_ADDTOFAVOURITES "お気に入りの一覧にキーを追加します。" - ID_FAVOURITES_REMOVEFAVOURITE "お気に入りの一覧からキーを削除します。" - ID_VIEW_STATUSBAR "ステータスバーの表示/非表示を切り替えます。" - ID_VIEW_SPLIT "2つのパネルの境界の位置を変更します。" - ID_VIEW_REFRESH "ウィンドウの内容を最新の情報に更新します。" - ID_EDIT_DELETE "選択範囲を削除します。" - ID_EDIT_RENAME "名前を変更します。" - ID_EDIT_COPYKEYNAME "選択されたキー名をクリップボードにコピーします。" - ID_EDIT_FIND "キー、値、データの中のテキストを検索します。" - ID_EDIT_FINDNEXT "前回と同じ条件で次の項目を検索します。" + ID_REGISTRY_EXIT "レジストリエディタを終了します" + ID_FAVOURITES_ADDTOFAVOURITES "お気に入りの一覧にキーを追加します" + ID_FAVOURITES_REMOVEFAVOURITE "お気に入りの一覧からキーを削除します" + ID_VIEW_STATUSBAR "ステータスバーの表示/非表示を切り替えます" + ID_VIEW_SPLIT "2つのパネルの境界の位置を変更します" + ID_VIEW_REFRESH "ウィンドウの内容を最新の情報に更新します" + ID_EDIT_DELETE "選択範囲を削除します" + ID_EDIT_RENAME "名前を変更します" + ID_EDIT_COPYKEYNAME "選択されたキー名をクリップボードにコピーします" + ID_EDIT_FIND "キー、値、データの中のテキストを検索します" + ID_EDIT_FINDNEXT "前回と同じ条件で次の項目を検索します" END STRINGTABLE @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "キャンセル", IDCANCEL, 93, 29, 45, 14 LTEXT "レジストリの検索中...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "レジストリエディタのヘルプを開きます。" - * ID_HELP_ABOUT "プログラムの情報、バージョン番号および著作権を表示します。" - *END - */ diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index 08a5ac6aa30..897d9a15d1f 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -441,7 +441,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "원격 컴퓨터의 레지스트리로 접속합니다" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "원격 컴퓨터의 레지스트리로의 접속을 끊습니다" ID_REGISTRY_PRINT "레지스트리의 전체나 일부를 인쇄합니다" -/* ID_HELP_HELPTOPICS "레지스트리 편집기의 도움말을 표시합니다" */ +// ID_HELP_HELPTOPICS "레지스트리 편집기의 도움말을 표시합니다" ID_HELP_ABOUT "프로그램 정보, 벼젼과 라이센스를 표시합니다" END @@ -716,12 +716,3 @@ BEGIN DEFPUSHBUTTON "취소", IDCANCEL, 93, 29, 45, 14 LTEXT "레지스트리를 검색중...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc index 5f8233430f6..3e6e5b6ae1d 100644 --- a/base/applications/regedit/lang/nl-NL.rc +++ b/base/applications/regedit/lang/nl-NL.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Een verbinding maken met het register van een externe computer" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "De verbinding met het register van een externe computer verbreken" ID_REGISTRY_PRINT "Het register of een gedeelte ervan afdrukken" -/* ID_HELP_HELPTOPICS "Help voor de Register-editor openen" */ +// ID_HELP_HELPTOPICS "Help voor de Register-editor openen" ID_HELP_ABOUT "Programmagegevens, versienummer en copyrightgegevens weergeven" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index 86058a6dafd..5963a685901 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Kobler til Registret på en annen datamaskin" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Kobler fra Registret på en annen datamaskin" ID_REGISTRY_PRINT "Skriver ut hele eller deler av Registret" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Åpne registerredigering hjelpen" ID_HELP_ABOUT "Viser informasjon om program, version og opphavsrett" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Avbryt", IDCANCEL, 93, 29, 45, 14 LTEXT "Søker i registret...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Åpne registerredigering hjelpen." - * ID_HELP_ABOUT "Vis program informasjon, versjon nummer, og enerett." - *END - */ diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index 57432c1803d..1b5a53f4f0a 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -447,8 +447,8 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Połączenie z rejestrem zdalnego komputera" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Odłącza od rejestru zdalnego komputera" ID_REGISTRY_PRINT "Drukuje całość lub część rejestru" -/* ID_HELP_HELPTOPICS "Otwiera Pomoc Edytora rejestru" */ - ID_HELP_ABOUT "Wyświetla informacje o programie, numerze wersji i prawach autorskich" +// ID_HELP_HELPTOPICS "Otwiera Pomoc Edytora rejestru" + ID_HELP_ABOUT "Wyświetla informacje o programie, numerze wersji, licencji" END STRINGTABLE @@ -722,12 +722,3 @@ BEGIN DEFPUSHBUTTON "Anuluj", IDCANCEL, 93, 29, 45, 14 LTEXT "Przeszukiwanie rejestru...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Otwiera pomoc Edytora Rejestru." - * ID_HELP_ABOUT "Wyświetla informacje o programie, numerze wersji, licencji." - *END - */ diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc index b68bcda8164..67c3ab9b561 100644 --- a/base/applications/regedit/lang/pt-BR.rc +++ b/base/applications/regedit/lang/pt-BR.rc @@ -439,8 +439,8 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Conecta-se ao Registro de um computador remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Desconecta-se do Registro de um computador remoto" ID_REGISTRY_PRINT "Imprime parte ou todo registro" -/* ID_HELP_HELPTOPICS "Abre ajuda do Editor do Registro" */ - ID_HELP_ABOUT "Exibe informações sobre o programa, número da versão e direitos autorais." +// ID_HELP_HELPTOPICS "Abre ajuda do Editor do Registro" + ID_HELP_ABOUT "Exibe informações sobre o programa, número da versão e direitos autorais" END STRINGTABLE @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Cancelar", IDCANCEL, 93, 29, 45, 14 LTEXT "Pesquisando o registro...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Abre ajuda do Editor do Registro." - * ID_HELP_ABOUT "Exibe informações sobre o programa, número da versão e direitos autorais." - *END - */ diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 7ad43e83c1a..7b7b2eb3015 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -427,45 +427,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "Contém comandos para trabalhar com o Registo inteiro." - ID_EDIT_MENU "Contém comandos para edição de valores ou chaves." - ID_VIEW_MENU "Contém comandos para personalização da janela do Registo." - ID_FAVOURITES_MENU "Contém comandos para acessar chaves frequentemente usadas." - ID_HELP_MENU "Contém comandos para exibição da ajuda e informações sobre o Editor do Registo." + ID_REGISTRY_MENU "Contém comandos para trabalhar com o Registo inteiro" + ID_EDIT_MENU "Contém comandos para edição de valores ou chaves" + ID_VIEW_MENU "Contém comandos para personalização da janela do Registo" + ID_FAVOURITES_MENU "Contém comandos para acessar chaves frequentemente usadas" + ID_HELP_MENU "Contém comandos para exibição da ajuda e informações sobre o Editor do Registo" ID_EDIT_NEW_MENU "Contém comandos para criação de novas chaves ou valores" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "Modifica os dados do valor." + ID_EDIT_MODIFY "Modifica os dados do valor" ID_EDIT_NEW_KEY "Adiciona uma nova chave" - ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto." - ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário." - ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD." - ID_REGISTRY_IMPORTREGISTRYFILE "Importa um ficheiro de texto para o registo." - ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um ficheiro de texto." + ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto" + ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário" + ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD" + ID_REGISTRY_IMPORTREGISTRYFILE "Importa um ficheiro de texto para o registo" + ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um ficheiro de texto" ID_REGISTRY_LOADHIVE "Carrega um ficheiro de secção no registo" ID_REGISTRY_UNLOADHIVE "Descarrega um ficheiro de secção no registo" - ID_REGISTRY_CONNECTNETWORKREGISTRY "Liga a um registo num computador remoto." - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Desliga um registo de um computador remoto." - ID_REGISTRY_PRINT "Imprime todo ou parte do registo." -/* ID_HELP_HELPTOPICS "Abre a ajuda do Editor do Registo." */ - ID_HELP_ABOUT "Mostra informações do programa, número da versão e copyright." + ID_REGISTRY_CONNECTNETWORKREGISTRY "Liga a um registo num computador remoto" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Desliga um registo de um computador remoto" + ID_REGISTRY_PRINT "Imprime todo ou parte do registo" +// ID_HELP_HELPTOPICS "Abre a ajuda do Editor do Registo" + ID_HELP_ABOUT "Mostra informações do programa, número da versão e copyright" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "Encerra o Editor do Registo." - ID_FAVOURITES_ADDTOFAVOURITES "Adiciona chaves na lista de favoritos." - ID_FAVOURITES_REMOVEFAVOURITE "Remove chaves da lista de favoritos." - ID_VIEW_STATUSBAR "Mostra ou oculta a barra de estado." - ID_VIEW_SPLIT "Altera a posição da divisão entre os painéis." - ID_VIEW_REFRESH "Actualiza a janela." - ID_EDIT_DELETE "Exclui a seleccão." - ID_EDIT_RENAME "Renomeia a seleccão." - ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a área de transferência." - ID_EDIT_FIND "Localiza um texto numa chave, valor ou dado." - ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto especificado na pesquisa anterior." + ID_REGISTRY_EXIT "Encerra o Editor do Registo" + ID_FAVOURITES_ADDTOFAVOURITES "Adiciona chaves na lista de favoritos" + ID_FAVOURITES_REMOVEFAVOURITE "Remove chaves da lista de favoritos" + ID_VIEW_STATUSBAR "Mostra ou oculta a barra de estado" + ID_VIEW_SPLIT "Altera a posição da divisão entre os painéis" + ID_VIEW_REFRESH "Actualiza a janela" + ID_EDIT_DELETE "Exclui a seleccão" + ID_EDIT_RENAME "Renomeia a seleccão" + ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a área de transferência" + ID_EDIT_FIND "Localiza um texto numa chave, valor ou dado" + ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto especificado na pesquisa anterior" END STRINGTABLE @@ -724,12 +724,3 @@ BEGIN DEFPUSHBUTTON "Cancelar", IDCANCEL, 93, 29, 45, 14 LTEXT "Procurar no registo...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index 4e306a87217..94b02e5a547 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -449,7 +449,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Conectare la registrul unui calculator din rețea" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Deconectare de la registrul calculatorului din rețea" ID_REGISTRY_PRINT "Imprimă toate părțile unui registru" -/* ID_HELP_HELPTOPICS "Deschide manualul editorului de registru" */ +// ID_HELP_HELPTOPICS "Deschide manualul editorului de registru" ID_HELP_ABOUT "Prezintă informații despre program, numărul versiunii și drepturi de autor" END @@ -724,12 +724,3 @@ BEGIN DEFPUSHBUTTON "Anulare", IDCANCEL, 93, 29, 45, 14 LTEXT "Căutare în registru…", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de registru." - * ID_HELP_ABOUT "Afișează informații despre program, numărul versiunii și marca înregistrată." - *END - */ diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index d5a2d03686d..d176fc117c9 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -452,7 +452,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Подключается к реестру удалённого компьютера" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Отключается от реестра удалённого компьютера" ID_REGISTRY_PRINT "Печатает весь реестр или его часть" -/* ID_HELP_HELPTOPICS "Открывает справку редактора реестра" */ +// ID_HELP_HELPTOPICS "Открывает справку редактора реестра" ID_HELP_ABOUT "Отображает информацию о программе, номер версии и авторские права" END @@ -727,12 +727,3 @@ BEGIN DEFPUSHBUTTON "Отмена", IDCANCEL, 93, 29, 45, 14 LTEXT "Поиск в реестре...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Открывает справку редактора реестра." - * ID_HELP_ABOUT "Отображает информацию о программе, номер версии и авторские права." - *END - */ diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc index f51f344125b..7b961423989 100644 --- a/base/applications/regedit/lang/sk-SK.rc +++ b/base/applications/regedit/lang/sk-SK.rc @@ -442,8 +442,8 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry" ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ - ID_HELP_ABOUT "Displays program information, version number and copyright" +// ID_HELP_HELPTOPICS "Otvorí pomocníka pre Editor registrov" + ID_HELP_ABOUT "Zobrazuje informácie programu, číslo verzie a autorské práva" END STRINGTABLE @@ -717,12 +717,3 @@ BEGIN DEFPUSHBUTTON "Zrušiť", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Otvorí pomocníka pre Editor registrov." - * ID_HELP_ABOUT "Zobrazuje informácie programu, číslo verzie a autorské práva." - *END - */ diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 657fbecde42..ad9107c05f9 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Vzpostavi povezavo z registrom oddaljenega raèunalnika" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Prekine povezavo z registrom oddaljenega raèunalnika" ID_REGISTRY_PRINT "Natisne registrsko datoteko ali njen del" -/* ID_HELP_HELPTOPICS "Odpre pomoC" */ +// ID_HELP_HELPTOPICS "Odpre pomoC" ID_HELP_ABOUT "Informacije o programu, številki razlièice in avtorskih pravicah" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Odpre pomoè." - * ID_HELP_ABOUT "Informacije o programu, številki razlièice in avtorskih pravicah." - *END - */ diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index 7f72d080d1c..4aaac351dbe 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -442,7 +442,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Lidhet me regjistrin e një kompjuteri largët" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Shkëputet nga regjistri një kompjuter në distancë të" ID_REGISTRY_PRINT "Shtyp tërë ose pjesë të regjistrit" -/* ID_HELP_HELPTOPICS "Hap editor regjistrit ndihmë" */ +// ID_HELP_HELPTOPICS "Hap editor regjistrit ndihmë" ID_HELP_ABOUT "Displays informacion rreth programit, versionin dhe të drejtat e autorit" END @@ -717,12 +717,3 @@ BEGIN DEFPUSHBUTTON "Anulo", IDCANCEL, 93, 29, 45, 14 LTEXT "Kerko ne regjister...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc index 874062d5025..7a56b260004 100644 --- a/base/applications/regedit/lang/sv-SE.rc +++ b/base/applications/regedit/lang/sv-SE.rc @@ -439,7 +439,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Ansluter till en annan dators register" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Kopplar ifrån en annan dators register" ID_REGISTRY_PRINT "Skriver ut hela eller en del av registret" -/* ID_HELP_HELPTOPICS "Öppnar hjälpen för Registereditorn" */ +// ID_HELP_HELPTOPICS "Öppnar hjälpen för Registereditorn" ID_HELP_ABOUT "Visar programinformation, versionsnummer, och upphovsrätt" END @@ -714,12 +714,3 @@ BEGIN DEFPUSHBUTTON "Avbryt", IDCANCEL, 93, 29, 45, 14 LTEXT "Sök i registret...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Öppnar hjälpen för Registereditorn." - * ID_HELP_ABOUT "Visar programinformation, versionsnummer, och upphovsrätt." - *END - */ diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc index 4dc426ad181..47816ceb0bb 100644 --- a/base/applications/regedit/lang/th-TH.rc +++ b/base/applications/regedit/lang/th-TH.rc @@ -441,7 +441,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry" ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ +// ID_HELP_HELPTOPICS "Opens registry editor help" ID_HELP_ABOUT "Displays program information, version number and copyright" END @@ -716,12 +716,3 @@ BEGIN DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14 LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index 344e89bf8f1..a8c542fc705 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -419,45 +419,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "Bütün Kayıt Defteri ile çalışma komutlarını içerir." - ID_EDIT_MENU "Anahtar veya değerleri düzenleme komutlarını içerir." - ID_VIEW_MENU "Kayıt Defteri penceresinin özelleştirme komutlarını içerir." - ID_FAVOURITES_MENU "Sık kullanılan anahtarları kullanma komutlarını içerir." - ID_HELP_MENU "Kayıt Defteri Düzenleyicisi ile ilgili bilgiyi ya da yardımı görüntüleme komutlarını içerir." - ID_EDIT_NEW_MENU "Yeni bir anahtar ya da yeni bir değer oluşturma komutlarını içerir." + ID_REGISTRY_MENU "Bütün Kayıt Defteri ile çalışma komutlarını içerir" + ID_EDIT_MENU "Anahtar veya değerleri düzenleme komutlarını içerir" + ID_VIEW_MENU "Kayıt Defteri penceresinin özelleştirme komutlarını içerir" + ID_FAVOURITES_MENU "Sık kullanılan anahtarları kullanma komutlarını içerir" + ID_HELP_MENU "Kayıt Defteri Düzenleyicisi ile ilgili bilgiyi ya da yardımı görüntüleme komutlarını içerir" + ID_EDIT_NEW_MENU "Yeni bir anahtar ya da yeni bir değer oluşturma komutlarını içerir" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "Değerin verisini değiştirir." - ID_EDIT_NEW_KEY "Yeni bir anahtar ekler." - ID_EDIT_NEW_STRINGVALUE "Yeni bir dizi değeri ekler." - ID_EDIT_NEW_BINARYVALUE "Yeni bir ikili değer ekler." - ID_EDIT_NEW_DWORDVALUE "Yeni bir DWORD değeri ekler." - ID_REGISTRY_IMPORTREGISTRYFILE "Bir metin dosyasını Kayıt Defteri'ne alır." - ID_REGISTRY_EXPORTREGISTRYFILE "Kayıt Defteri'nin tümünü ya da bir bölümünü bir metin dosyasına verir." - ID_REGISTRY_LOADHIVE "Kayıt Defteri'ne bir yığın dosyasını yükler." - ID_REGISTRY_UNLOADHIVE "Kayıt Defteri'nden bir yığın kaldırır." - ID_REGISTRY_CONNECTNETWORKREGISTRY "Uzaktaki bir bilgisayarın Kayıt Defteri'ne bağlanır." - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Uzaktaki bir bilgisayarın Kayıt Defteri'ne olan bağlantıyı keser." - ID_REGISTRY_PRINT "Kayıt Defteri'nin tümünü ya da bir bölümünü yazdırır." -/* ID_HELP_HELPTOPICS "Kayıt Defteri Düzenleyicisi Yardımı'nı açar." */ - ID_HELP_ABOUT "Programla ilgili bilgi, sürüm numarası ve telif hakkı görüntüler." + ID_EDIT_MODIFY "Değerin verisini değiştirir" + ID_EDIT_NEW_KEY "Yeni bir anahtar ekler" + ID_EDIT_NEW_STRINGVALUE "Yeni bir dizi değeri ekler" + ID_EDIT_NEW_BINARYVALUE "Yeni bir ikili değer ekler" + ID_EDIT_NEW_DWORDVALUE "Yeni bir DWORD değeri ekler" + ID_REGISTRY_IMPORTREGISTRYFILE "Bir metin dosyasını Kayıt Defteri'ne alır" + ID_REGISTRY_EXPORTREGISTRYFILE "Kayıt Defteri'nin tümünü ya da bir bölümünü bir metin dosyasına verir" + ID_REGISTRY_LOADHIVE "Kayıt Defteri'ne bir yığın dosyasını yükler" + ID_REGISTRY_UNLOADHIVE "Kayıt Defteri'nden bir yığın kaldırır" + ID_REGISTRY_CONNECTNETWORKREGISTRY "Uzaktaki bir bilgisayarın Kayıt Defteri'ne bağlanır" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Uzaktaki bir bilgisayarın Kayıt Defteri'ne olan bağlantıyı keser" + ID_REGISTRY_PRINT "Kayıt Defteri'nin tümünü ya da bir bölümünü yazdırır" +// ID_HELP_HELPTOPICS "Kayıt Defteri Düzenleyicisi Yardımı'nı açar" + ID_HELP_ABOUT "Programla ilgili bilgi, sürüm numarası ve telif hakkı görüntüler" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "Kayıt Defteri Düzenleyicisi'nden çıkar." - ID_FAVOURITES_ADDTOFAVOURITES "Anahtarları yer imleri listesine ekler." - ID_FAVOURITES_REMOVEFAVOURITE "Anahtarları yer imleri listesinden kaldırır." - ID_VIEW_STATUSBAR "Durum çubuğunu gösterir ya da gizler." - ID_VIEW_SPLIT "İki levha arasındaki ayırıcının konumunu değiştirir." - ID_VIEW_REFRESH "Pencereyi yeniler." - ID_EDIT_DELETE "Seçileni siler." - ID_EDIT_RENAME "Seçilenin adını değiştirir." - ID_EDIT_COPYKEYNAME "Seçilen anahtarın adını panoya çoğaltır." - ID_EDIT_FIND "Bir dizeyi anahtarların adlarında, değer adlarında veya değer verilerinde arar." - ID_EDIT_FINDNEXT "Önceki aramada belirtilmiş metni sonraki aramada arar." + ID_REGISTRY_EXIT "Kayıt Defteri Düzenleyicisi'nden çıkar" + ID_FAVOURITES_ADDTOFAVOURITES "Anahtarları yer imleri listesine ekler" + ID_FAVOURITES_REMOVEFAVOURITE "Anahtarları yer imleri listesinden kaldırır" + ID_VIEW_STATUSBAR "Durum çubuğunu gösterir ya da gizler" + ID_VIEW_SPLIT "İki levha arasındaki ayırıcının konumunu değiştirir" + ID_VIEW_REFRESH "Pencereyi yeniler" + ID_EDIT_DELETE "Seçileni siler" + ID_EDIT_RENAME "Seçilenin adını değiştirir" + ID_EDIT_COPYKEYNAME "Seçilen anahtarın adını panoya çoğaltır" + ID_EDIT_FIND "Bir dizeyi anahtarların adlarında, değer adlarında veya değer verilerinde arar" + ID_EDIT_FINDNEXT "Önceki aramada belirtilmiş metni sonraki aramada arar" END STRINGTABLE @@ -716,12 +716,3 @@ BEGIN DEFPUSHBUTTON "İptal", IDCANCEL, 93, 29, 45, 14 LTEXT "Kayıt Defteri Aranıyor...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Kayıt Defteri Düzenleyicisi Yardımı'nı açar." - * ID_HELP_ABOUT "İzlenceyle ilgili bilgi, sürüm numarası ve telif hakkı görüntüler." - *END - */ diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc index 7b380e2cf7f..0369cdbd3f3 100644 --- a/base/applications/regedit/lang/uk-UA.rc +++ b/base/applications/regedit/lang/uk-UA.rc @@ -441,7 +441,7 @@ BEGIN ID_REGISTRY_CONNECTNETWORKREGISTRY "Підключається до реєстру віддаленого комп'ютера" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Відключається від реєстру віддаленого комп'ютера" ID_REGISTRY_PRINT "Друкує весь реєстр або його частину" -/* ID_HELP_HELPTOPICS "Відкриває довідку редактора реєстра" */ +// ID_HELP_HELPTOPICS "Відкриває довідку редактора реєстра" ID_HELP_ABOUT "Відображає інформацію про програму, номер версії та авторство" END @@ -716,12 +716,3 @@ BEGIN DEFPUSHBUTTON "Скасувати", IDCANCEL, 93, 29, 45, 14 LTEXT "Пошук у реєстрі...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Відкриває довідку редактора реєстра." - * ID_HELP_ABOUT "Відображає інформацію про програму, номер версії, та авторські права." - *END - */ diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc index 450f1c8f59f..b7b81cd2217 100644 --- a/base/applications/regedit/lang/zh-CN.rc +++ b/base/applications/regedit/lang/zh-CN.rc @@ -427,45 +427,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "包含操作整个注册表的命令。" - ID_EDIT_MENU "包含编辑值或键的命令。" - ID_VIEW_MENU "包含定制注册表窗口的命令。" - ID_FAVOURITES_MENU "包含访问常用键时所用的命令。" - ID_HELP_MENU "包含显示帮助以及注册表编辑器有关信息的命令。" - ID_EDIT_NEW_MENU "包含创建新键或值的命令。" + ID_REGISTRY_MENU "包含操作整个注册表的命令" + ID_EDIT_MENU "包含编辑值或键的命令" + ID_VIEW_MENU "包含定制注册表窗口的命令" + ID_FAVOURITES_MENU "包含访问常用键时所用的命令" + ID_HELP_MENU "包含显示帮助以及注册表编辑器有关信息的命令" + ID_EDIT_NEW_MENU "包含创建新键或值的命令" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "修改该值的数据。" - ID_EDIT_NEW_KEY "添加新键。" - ID_EDIT_NEW_STRINGVALUE "添加新字符串值。" - ID_EDIT_NEW_BINARYVALUE "添加新二进制值。" - ID_EDIT_NEW_DWORDVALUE "添加新 DWORD 值。" - ID_REGISTRY_IMPORTREGISTRYFILE "将文本文件导入到注册表中。" - ID_REGISTRY_EXPORTREGISTRYFILE "将注册表全部或部分导出到文件中。" - ID_REGISTRY_LOADHIVE "加載配置单元到注册表中。" - ID_REGISTRY_UNLOADHIVE "从注册表中卸載配置单元。" - ID_REGISTRY_CONNECTNETWORKREGISTRY "连接到远程计算机的注册表。" - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "与远程计算机注册表断开连接。" - ID_REGISTRY_PRINT "打印所有或部分注册表。" -/* ID_HELP_HELPTOPICS "打开注册表编辑器帮助。" */ - ID_HELP_ABOUT "显示程序信息、版本和版权。" + ID_EDIT_MODIFY "修改该值的数据" + ID_EDIT_NEW_KEY "添加新键" + ID_EDIT_NEW_STRINGVALUE "添加新字符串值" + ID_EDIT_NEW_BINARYVALUE "添加新二进制值" + ID_EDIT_NEW_DWORDVALUE "添加新 DWORD 值" + ID_REGISTRY_IMPORTREGISTRYFILE "将文本文件导入到注册表中" + ID_REGISTRY_EXPORTREGISTRYFILE "将注册表全部或部分导出到文件中" + ID_REGISTRY_LOADHIVE "加載配置单元到注册表中" + ID_REGISTRY_UNLOADHIVE "从注册表中卸載配置单元" + ID_REGISTRY_CONNECTNETWORKREGISTRY "连接到远程计算机的注册表" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "与远程计算机注册表断开连接" + ID_REGISTRY_PRINT "打印所有或部分注册表" +// ID_HELP_HELPTOPICS "打开注册表编辑器帮助" + ID_HELP_ABOUT "显示程序信息、版本和版权" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "退出注册表编辑器。" - ID_FAVOURITES_ADDTOFAVOURITES "将键添加到收藏夹列表中。" - ID_FAVOURITES_REMOVEFAVOURITE "将键从收藏夹列表中删除。" - ID_VIEW_STATUSBAR "显示或隐藏状态栏。" - ID_VIEW_SPLIT "改变两个面板的拆分位置。" - ID_VIEW_REFRESH "刷新窗口。" - ID_EDIT_DELETE "删除所选内容。" - ID_EDIT_RENAME "重命名选定内容。" - ID_EDIT_COPYKEYNAME "将选定键的名称复制到剪贴板上。" - ID_EDIT_FIND "在键、值或数据里找到文本字符串。" - ID_EDIT_FINDNEXT "继续查找上次搜索的文本。" + ID_REGISTRY_EXIT "退出注册表编辑器" + ID_FAVOURITES_ADDTOFAVOURITES "将键添加到收藏夹列表中" + ID_FAVOURITES_REMOVEFAVOURITE "将键从收藏夹列表中删除" + ID_VIEW_STATUSBAR "显示或隐藏状态栏" + ID_VIEW_SPLIT "改变两个面板的拆分位置" + ID_VIEW_REFRESH "刷新窗口" + ID_EDIT_DELETE "删除所选内容" + ID_EDIT_RENAME "重命名选定内容" + ID_EDIT_COPYKEYNAME "将选定键的名称复制到剪贴板上" + ID_EDIT_FIND "在键、值或数据里找到文本字符串" + ID_EDIT_FINDNEXT "继续查找上次搜索的文本" END STRINGTABLE @@ -724,12 +724,3 @@ BEGIN DEFPUSHBUTTON "取消", IDCANCEL, 93, 29, 45, 14 LTEXT "正在搜索注册表...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." - *END - */ diff --git a/base/applications/regedit/lang/zh-HK.rc b/base/applications/regedit/lang/zh-HK.rc index 8b835473c9a..ca994c90bb1 100644 --- a/base/applications/regedit/lang/zh-HK.rc +++ b/base/applications/regedit/lang/zh-HK.rc @@ -437,45 +437,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "包含與整個登錄工作相關的命令。" - ID_EDIT_MENU "包含編輯值或機碼的命令。" - ID_VIEW_MENU "包含自訂登錄視窗的命令。" - ID_FAVOURITES_MENU "包含訪問常用機碼時所用的命令。" - ID_HELP_MENU "包含顯示説明以及登錄編輯程式有關資訊的命令。" - ID_EDIT_NEW_MENU "包含新增機碼或值的命令。" + ID_REGISTRY_MENU "包含與整個登錄工作相關的命令" + ID_EDIT_MENU "包含編輯值或機碼的命令" + ID_VIEW_MENU "包含自訂登錄視窗的命令" + ID_FAVOURITES_MENU "包含訪問常用機碼時所用的命令" + ID_HELP_MENU "包含顯示説明以及登錄編輯程式有關資訊的命令" + ID_EDIT_NEW_MENU "包含新增機碼或值的命令" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "修改該值的資料。" - ID_EDIT_NEW_KEY "新增新機碼。" - ID_EDIT_NEW_STRINGVALUE "新增新的字串值。" - ID_EDIT_NEW_BINARYVALUE "新增新二進制值。" - ID_EDIT_NEW_DWORDVALUE "新增新 DWORD 值。" - ID_REGISTRY_IMPORTREGISTRYFILE "將檔案匯入到登錄中。" - ID_REGISTRY_EXPORTREGISTRYFILE "將登錄全部或部分匯出到檔案中。" - ID_REGISTRY_LOADHIVE "載入 Hive 控制檔到登錄中。" - ID_REGISTRY_UNLOADHIVE "從登錄中解除載入 Hive 控制檔。" - ID_REGISTRY_CONNECTNETWORKREGISTRY "連線到遠端電腦的登錄。" - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "斷開與遠端電腦登錄的連線。" - ID_REGISTRY_PRINT "列印所有或部分登錄。" -/* ID_HELP_HELPTOPICS "開啟登錄編輯程式説明。" */ - ID_HELP_ABOUT "顯示程式資訊、版本號和版權。" + ID_EDIT_MODIFY "修改該值的資料" + ID_EDIT_NEW_KEY "新增新機碼" + ID_EDIT_NEW_STRINGVALUE "新增新的字串值" + ID_EDIT_NEW_BINARYVALUE "新增新二進制值" + ID_EDIT_NEW_DWORDVALUE "新增新 DWORD 值" + ID_REGISTRY_IMPORTREGISTRYFILE "將檔案匯入到登錄中" + ID_REGISTRY_EXPORTREGISTRYFILE "將登錄全部或部分匯出到檔案中" + ID_REGISTRY_LOADHIVE "載入 Hive 控制檔到登錄中" + ID_REGISTRY_UNLOADHIVE "從登錄中解除載入 Hive 控制檔" + ID_REGISTRY_CONNECTNETWORKREGISTRY "連線到遠端電腦的登錄" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "斷開與遠端電腦登錄的連線" + ID_REGISTRY_PRINT "列印所有或部分登錄" +// ID_HELP_HELPTOPICS "開啟登錄編輯程式説明" + ID_HELP_ABOUT "顯示程式資訊、版本號和版權" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "結束登錄編輯程式。" - ID_FAVOURITES_ADDTOFAVOURITES "將機碼新增到我的最愛列表中。" - ID_FAVOURITES_REMOVEFAVOURITE "將機碼從我的最愛列表中刪除。" - ID_VIEW_STATUSBAR "顯示或隱藏狀態列。" - ID_VIEW_SPLIT "變更兩個窗格之間的分隔線位置。" - ID_VIEW_REFRESH "重新整理視窗。" - ID_EDIT_DELETE "刪除已選取內容。" - ID_EDIT_RENAME "重新命名已選取內容。" - ID_EDIT_COPYKEYNAME "將已選取機碼的名稱複製到剪貼簿。" - ID_EDIT_FIND "在機碼、值或資料裡找到文字字串。" - ID_EDIT_FINDNEXT "繼續搜尋上次搜尋的文字。" + ID_REGISTRY_EXIT "結束登錄編輯程式" + ID_FAVOURITES_ADDTOFAVOURITES "將機碼新增到我的最愛列表中" + ID_FAVOURITES_REMOVEFAVOURITE "將機碼從我的最愛列表中刪除" + ID_VIEW_STATUSBAR "顯示或隱藏狀態列" + ID_VIEW_SPLIT "變更兩個窗格之間的分隔線位置" + ID_VIEW_REFRESH "重新整理視窗" + ID_EDIT_DELETE "刪除已選取內容" + ID_EDIT_RENAME "重新命名已選取內容" + ID_EDIT_COPYKEYNAME "將已選取機碼的名稱複製到剪貼簿" + ID_EDIT_FIND "在機碼、值或資料裡找到文字字串" + ID_EDIT_FINDNEXT "繼續搜尋上次搜尋的文字" END STRINGTABLE @@ -734,12 +734,3 @@ BEGIN DEFPUSHBUTTON "取消", IDCANCEL, 93, 29, 45, 14 LTEXT "正在搜尋登錄...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "開啟登錄編輯程式説明。" - * ID_HELP_ABOUT "顯示程式資訊、版本號碼和版權。" - *END - */ diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index c461edb2809..6a9c3c5fbe4 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -426,45 +426,45 @@ END STRINGTABLE BEGIN - ID_REGISTRY_MENU "包含與整個登錄工作相關的命令。" - ID_EDIT_MENU "包含編輯值或機碼的命令。" - ID_VIEW_MENU "包含自訂登錄視窗的命令。" - ID_FAVOURITES_MENU "包含訪問常用機碼時所用的命令。" - ID_HELP_MENU "包含顯示說明以及登錄編輯程式有關資訊的命令。" - ID_EDIT_NEW_MENU "包含新增機碼或值的命令。" + ID_REGISTRY_MENU "包含與整個登錄工作相關的命令" + ID_EDIT_MENU "包含編輯值或機碼的命令" + ID_VIEW_MENU "包含自訂登錄視窗的命令" + ID_FAVOURITES_MENU "包含訪問常用機碼時所用的命令" + ID_HELP_MENU "包含顯示說明以及登錄編輯程式有關資訊的命令" + ID_EDIT_NEW_MENU "包含新增機碼或值的命令" END STRINGTABLE BEGIN - ID_EDIT_MODIFY "修改該值的資料。" - ID_EDIT_NEW_KEY "新增新的機碼。" - ID_EDIT_NEW_STRINGVALUE "新增新的字元串值。" - ID_EDIT_NEW_BINARYVALUE "新增新的二進制值。" - ID_EDIT_NEW_DWORDVALUE "新增新的 DWORD 值。" - ID_REGISTRY_IMPORTREGISTRYFILE "將檔案匯入到登錄中。" - ID_REGISTRY_EXPORTREGISTRYFILE "將登錄全部或部分匯出到檔案中。" - ID_REGISTRY_LOADHIVE "載入 Hive 控制檔到登錄中。" - ID_REGISTRY_UNLOADHIVE "從登錄中卸載 Hive 控制檔。" - ID_REGISTRY_CONNECTNETWORKREGISTRY "連線到遠端電腦的登錄。" - ID_REGISTRY_DISCONNECTNETWORKREGISTRY "斷開與遠端電腦登錄的連線。" - ID_REGISTRY_PRINT "列印所有或部分登錄。" -/* ID_HELP_HELPTOPICS "開啟登錄編輯程式說明。" */ - ID_HELP_ABOUT "顯示程式資訊、版本號和著作權。" + ID_EDIT_MODIFY "修改該值的資料" + ID_EDIT_NEW_KEY "新增新的機碼" + ID_EDIT_NEW_STRINGVALUE "新增新的字元串值" + ID_EDIT_NEW_BINARYVALUE "新增新的二進制值" + ID_EDIT_NEW_DWORDVALUE "新增新的 DWORD 值" + ID_REGISTRY_IMPORTREGISTRYFILE "將檔案匯入到登錄中" + ID_REGISTRY_EXPORTREGISTRYFILE "將登錄全部或部分匯出到檔案中" + ID_REGISTRY_LOADHIVE "載入 Hive 控制檔到登錄中" + ID_REGISTRY_UNLOADHIVE "從登錄中卸載 Hive 控制檔" + ID_REGISTRY_CONNECTNETWORKREGISTRY "連線到遠端電腦的登錄" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "斷開與遠端電腦登錄的連線" + ID_REGISTRY_PRINT "列印所有或部分登錄" +// ID_HELP_HELPTOPICS "開啟登錄編輯程式說明" + ID_HELP_ABOUT "顯示程式資訊、版本號和著作權" END STRINGTABLE BEGIN - ID_REGISTRY_EXIT "結束登錄編輯程式。" - ID_FAVOURITES_ADDTOFAVOURITES "將機碼新增到我的最愛列表中。" - ID_FAVOURITES_REMOVEFAVOURITE "將機碼從我的最愛列表中刪除。" - ID_VIEW_STATUSBAR "顯示或隱藏狀態列。" - ID_VIEW_SPLIT "變更兩個窗格之間的分隔線位置。" - ID_VIEW_REFRESH "重新整理視窗。" - ID_EDIT_DELETE "刪除已選取內容。" - ID_EDIT_RENAME "重新命名已選取內容。" - ID_EDIT_COPYKEYNAME "將已選取機碼的名稱複製到剪貼簿。" - ID_EDIT_FIND "在機碼、值或資料裡找到文字字串。" - ID_EDIT_FINDNEXT "繼續搜尋上次搜尋的文字。" + ID_REGISTRY_EXIT "結束登錄編輯程式" + ID_FAVOURITES_ADDTOFAVOURITES "將機碼新增到我的最愛列表中" + ID_FAVOURITES_REMOVEFAVOURITE "將機碼從我的最愛列表中刪除" + ID_VIEW_STATUSBAR "顯示或隱藏狀態列" + ID_VIEW_SPLIT "變更兩個窗格之間的分隔線位置" + ID_VIEW_REFRESH "重新整理視窗" + ID_EDIT_DELETE "刪除已選取內容" + ID_EDIT_RENAME "重新命名已選取內容" + ID_EDIT_COPYKEYNAME "將已選取機碼的名稱複製到剪貼簿" + ID_EDIT_FIND "在機碼、值或資料裡找到文字字串" + ID_EDIT_FINDNEXT "繼續搜尋上次搜尋的文字" END STRINGTABLE @@ -723,12 +723,3 @@ BEGIN DEFPUSHBUTTON "取消", IDCANCEL, 93, 29, 45, 14 LTEXT "正在搜尋登錄...", IDC_STATIC, 33, 12, 83, 8 END - -/* String Table */ -/* - *STRINGTABLE - *BEGIN - * ID_HELP_HELPTOPICS "開啟登錄編輯程式說明。" - * ID_HELP_ABOUT "顯示程式資訊、版本號碼和著作權。" - *END - */

4 months, 1 week

[reactos] 01/01: [SHELL32] Implement the Select verb in CommDlgBrowser (#7225)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5f6b8c50b433ab1edfd5… commit d5f6b8c50b433ab1edfd5f33fa9919bd2255bfc1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 15 18:40:32 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 15 18:40:32 2024 +0200 [SHELL32] Implement the Select verb in CommDlgBrowser (#7225) - Use Select instead of Open default menu item. - Support CDB2GVF_NOSELECTVERB, CDB2GVF_NOINCLUDEITEM and CDB2GVF_SHOWALLFILES flags. --- dll/win32/shell32/CDefView.cpp | 51 ++++++++++++++++++++++++------- dll/win32/shell32/CDefaultContextMenu.cpp | 9 +++++- dll/win32/shell32/lang/bg-BG.rc | 8 +++++ dll/win32/shell32/lang/ca-ES.rc | 8 +++++ dll/win32/shell32/lang/cs-CZ.rc | 8 +++++ dll/win32/shell32/lang/da-DK.rc | 8 +++++ dll/win32/shell32/lang/de-DE.rc | 8 +++++ dll/win32/shell32/lang/el-GR.rc | 8 +++++ dll/win32/shell32/lang/en-GB.rc | 8 +++++ dll/win32/shell32/lang/en-US.rc | 8 +++++ dll/win32/shell32/lang/es-ES.rc | 8 +++++ dll/win32/shell32/lang/et-EE.rc | 8 +++++ dll/win32/shell32/lang/eu-ES.rc | 8 +++++ dll/win32/shell32/lang/fi-FI.rc | 8 +++++ dll/win32/shell32/lang/fr-FR.rc | 8 +++++ dll/win32/shell32/lang/he-IL.rc | 8 +++++ dll/win32/shell32/lang/hi-IN.rc | 8 +++++ dll/win32/shell32/lang/hu-HU.rc | 8 +++++ dll/win32/shell32/lang/id-ID.rc | 8 +++++ dll/win32/shell32/lang/it-IT.rc | 8 +++++ dll/win32/shell32/lang/ja-JP.rc | 8 +++++ dll/win32/shell32/lang/ko-KR.rc | 8 +++++ dll/win32/shell32/lang/nl-NL.rc | 8 +++++ dll/win32/shell32/lang/no-NO.rc | 8 +++++ dll/win32/shell32/lang/pl-PL.rc | 8 +++++ dll/win32/shell32/lang/pt-BR.rc | 8 +++++ dll/win32/shell32/lang/pt-PT.rc | 8 +++++ dll/win32/shell32/lang/ro-RO.rc | 8 +++++ dll/win32/shell32/lang/ru-RU.rc | 8 +++++ dll/win32/shell32/lang/sk-SK.rc | 8 +++++ dll/win32/shell32/lang/sl-SI.rc | 8 +++++ dll/win32/shell32/lang/sq-AL.rc | 8 +++++ dll/win32/shell32/lang/sv-SE.rc | 8 +++++ dll/win32/shell32/lang/tr-TR.rc | 8 +++++ dll/win32/shell32/lang/uk-UA.rc | 8 +++++ dll/win32/shell32/lang/zh-CN.rc | 8 +++++ dll/win32/shell32/lang/zh-HK.rc | 8 +++++ dll/win32/shell32/lang/zh-TW.rc | 8 +++++ dll/win32/shell32/shresdef.h | 1 + sdk/include/psdk/shobjidl.idl | 5 +++ 40 files changed, 342 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index ad9317d0a39..3ada8ae10b7 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -48,8 +48,9 @@ enum { DEFVIEW_ARRANGESORT_MAX = DEFVIEW_ARRANGESORT_MAXENUM + 1, // Reserve one extra for the current sort-by column DVIDM_ARRANGESORT_LAST = FCIDM_SHVIEWLAST, DVIDM_ARRANGESORT_FIRST = DVIDM_ARRANGESORT_LAST - (DEFVIEW_ARRANGESORT_MAX - 1), + DVIDM_COMMDLG_SELECT = DVIDM_ARRANGESORT_FIRST - 1, - DVIDM_CONTEXTMENU_LAST = DVIDM_ARRANGESORT_FIRST - 1, + DVIDM_CONTEXTMENU_LAST = DVIDM_COMMDLG_SELECT - 1, // FIXME: FCIDM_SHVIEWFIRST is 0 and using that with QueryContextMenu is a // bad idea because it hides bugs related to the ids in ici.lpVerb. // CONTEXT_MENU_BASE_ID acknowledges this but failed to apply the fix everywhere. @@ -336,6 +337,18 @@ public: HRESULT SaveViewState(IStream *pStream); void UpdateFolderViewFlags(); + DWORD GetCommDlgViewFlags() + { + CComPtr<ICommDlgBrowser2> pcdb2; + if (m_pCommDlgBrowser && SUCCEEDED(m_pCommDlgBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser2, &pcdb2)))) + { + DWORD flags; + if (SUCCEEDED(pcdb2->GetViewFlags(&flags))) + return flags; + } + return 0; + } + // *** IOleWindow methods *** STDMETHOD(GetWindow)(HWND *lphwnd) override; STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode) override; @@ -624,7 +637,7 @@ HRESULT CDefView::IncludeObject(PCUITEMID_CHILD pidl) { HRESULT ret = S_OK; - if (m_pCommDlgBrowser.p != NULL) + if (m_pCommDlgBrowser && !(GetCommDlgViewFlags() & CDB2GVF_NOINCLUDEITEM)) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = m_pCommDlgBrowser->IncludeObject(this, pidl); @@ -1477,6 +1490,9 @@ HRESULT CDefView::FillList(BOOL IsRefreshCommand) SHELLSTATE shellstate; SHGetSetSettings(&shellstate, SSF_SHOWALLOBJECTS | SSF_SHOWSUPERHIDDEN, FALSE); + if (GetCommDlgViewFlags() & CDB2GVF_SHOWALLFILES) + shellstate.fShowAllObjects = shellstate.fShowSuperHidden = TRUE; + if (shellstate.fShowAllObjects) { dFlags |= SHCONTF_INCLUDEHIDDEN; @@ -2182,6 +2198,15 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (FAILED_UNEXPECTEDLY(hResult)) return 0; + if (m_pCommDlgBrowser && !(GetCommDlgViewFlags() & CDB2GVF_NOSELECTVERB)) + { + HMENU hMenuSource = LoadMenuW(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDM_DVSELECT)); + Shell_MergeMenus(m_hContextMenu, GetSubMenu(hMenuSource, 0), 0, DVIDM_COMMDLG_SELECT, 0xffff, MM_ADDSEPARATOR | MM_DONTREMOVESEPS); + DestroyMenu(hMenuSource); + SetMenuDefaultItem(m_hContextMenu, DVIDM_COMMDLG_SELECT, MF_BYCOMMAND); + // TODO: ICommDlgBrowser2::GetDefaultMenuText == S_OK + } + // There is no position requested, so try to find one if (lParam == ~0) { @@ -2215,21 +2240,25 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b m_ListView.ClientToScreen(&pt); } + CComPtr<ICommDlgBrowser2> pcdb2; + if (m_pCommDlgBrowser && SUCCEEDED(m_pCommDlgBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser2, &pcdb2)))) + pcdb2->Notify(static_cast<IShellView*>(this), CDB2N_CONTEXTMENU_START); + // This runs the message loop, calling back to us with f.e. WM_INITPOPUP (hence why m_hContextMenu and m_pCM exist) uCommand = TrackPopupMenu(m_hContextMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hWnd, NULL); - if (uCommand == 0) - return 0; - if (uCommand >= DVIDM_ARRANGESORT_FIRST && uCommand <= DVIDM_ARRANGESORT_LAST) - return SendMessage(WM_COMMAND, uCommand, 0); - - if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) - return 0; - - InvokeContextMenuCommand(m_pCM, MAKEINTRESOURCEA(uCommand - CONTEXT_MENU_BASE_ID), &pt); + { + SendMessage(WM_COMMAND, uCommand, 0); + } + else if (uCommand != 0 && !(uCommand == DVIDM_COMMDLG_SELECT && OnDefaultCommand() == S_OK)) + { + InvokeContextMenuCommand(m_pCM, MAKEINTRESOURCEA(uCommand - CONTEXT_MENU_BASE_ID), &pt); + } + if (pcdb2) + pcdb2->Notify(static_cast<IShellView*>(this), CDB2N_CONTEXTMENU_DONE); return 0; } diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index f55ed72dc3c..ed2e95bb1c7 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -876,7 +876,7 @@ CDefaultContextMenu::QueryContextMenu( return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds); /* Add the default part of the menu */ - HMENU hmenuDefault = LoadMenu(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE"); + HMENU hmenuDefault = LoadMenuW(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE"); /* Remove uneeded entries */ if (!(rfg & SFGAO_CANMOVE)) @@ -1260,6 +1260,13 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFOEX lpcmi, PStatic else FlagsName = L"BrowserFlags"; + CComPtr<ICommDlgBrowser> pcdb; + if (SUCCEEDED(psb->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &pcdb)))) + { + if (LOBYTE(GetVersion()) < 6 || FlagsName[0] == 'E') + return 0; // Don't browse in-place + } + /* Try to get the flag from the verb */ hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->Verb.GetString()); if (FAILED_UNEXPECTEDLY(hr)) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 3c84e8d5b69..3f6ca3fdc89 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Търсене на папка" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 6feb6846e71..adb698a148d 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index b00c2827d8c..95ad5dcc8f7 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -96,6 +96,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procházet..." diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index b8b17b2a898..e7b84e57701 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Søg efter Mappe" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index f4749e2fba7..3f558834d2a 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Verzeichnis auswählen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index e6290b69f2d..0fd46399191 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Αναζήτηση φακέλου" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 732adf7b38d..0a191cbc16b 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 2c385b912a4..83f1245ea5f 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 9f00de189ba..ed20a44cdcd 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -97,6 +97,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Explorar carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 01bfb8a93f1..056706f257f 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Vali kaust" diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index d2bc6c84741..a94192b88ca 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Karpeta esploratu" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 5be429d66c0..cb68d3b4682 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Valitse Kansio" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index a43ab75d30f..8304728dffa 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Sé&lectionner", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Parcourir" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 074835d39ce..c56e94f7f9d 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "בחירת תיקיה" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 1080b805d21..5029f8f50c4 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "फोल्डर खोंजे" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 830f3c46f04..b7e3dd8dc69 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Mappák böngészése" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 6360884ee19..0a3ce0c2e23 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Jelajah Folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 69e0d5ae594..5cc05d35a9a 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Sfoglia Cartella" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 84cb86c57df..5eaa0bac54f 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "フォルダの参照" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 4f0f3a5b315..721a9433616 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "폴더 찾아보기" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 5b39ea455c3..85fe4161723 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 47ee261927d..85d13ec384e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bla etter mappe" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 827346d2605..1a9f21e4ad8 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -97,6 +97,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz folder" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index a30fb7aad52..8aaf2f5b722 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pasta" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index cf1a7ec8687..9fe1d302376 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -98,6 +98,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3d801cec428..02d56b8673d 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -96,6 +96,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Specificare folder" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 6f853297466..44d9255511c 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -97,6 +97,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Обзор" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 22057697c15..b05b408be0e 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index f85da030386..bc1b6d1c70d 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 5dcf7277f28..c1f0973b65d 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -95,6 +95,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Shfleto për Dosje" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index fb0e8d23639..929bbd914b7 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bläddra efter mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 140aeb7a933..c8bbcc708a8 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -97,6 +97,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dizin İçin Göz At" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index daa8ba822be..b382287c6b8 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -88,6 +88,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Огляд папок" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 6b5c75b2d23..501eda39614 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -98,6 +98,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "浏览文件夹" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 92327829346..b67aae92952 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -96,6 +96,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "瀏覽資料夾" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index ed2c1c2d7fb..c4e5ec18405 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -97,6 +97,14 @@ BEGIN END END +IDM_DVSELECT MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Se&lect", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "瀏覽資料夾" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 283e4f3d8d3..ca9a02e7cf6 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -878,6 +878,7 @@ #define IDM_COPYHERE 0x7 #define IDM_MOVEHERE 0x8 #define IDM_LINKHERE 0xB +#define IDM_DVSELECT 0x104 #define IDM_MYDOCUMENTS 516 #define IDM_MYPICTURES 518 diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index f137d474de4..a31a145190b 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -1442,6 +1442,11 @@ cpp_quote("#define CDBOSC_STATECHANGE 0x00000004") ] interface ICommDlgBrowser2 : ICommDlgBrowser { +cpp_quote("#define CDB2N_CONTEXTMENU_DONE 1") +cpp_quote("#define CDB2N_CONTEXTMENU_START 2") +cpp_quote("#define CDB2GVF_SHOWALLFILES 0x00000001") +cpp_quote("#define CDB2GVF_NOSELECTVERB 0x00000008") +cpp_quote("#define CDB2GVF_NOINCLUDEITEM 0x00000010 /* IncludeObject should not be called */") HRESULT Notify( [in] IShellView *ppshv,

4 months, 1 week

[reactos] 02/02: [SOUND] mmebuddy_debug.h: Match WCHAR type

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d532f87924ee4276f77f… commit 7d532f87924ee4276f77fc9bd39541cf4909700c Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> CommitDate: Thu Aug 15 17:50:12 2024 +0200 [SOUND] mmebuddy_debug.h: Match WCHAR type --- sdk/include/reactos/libs/sound/mmebuddy_debug.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/libs/sound/mmebuddy_debug.h b/sdk/include/reactos/libs/sound/mmebuddy_debug.h index 31f85c4dd34..0c6d7f8d77b 100644 --- a/sdk/include/reactos/libs/sound/mmebuddy_debug.h +++ b/sdk/include/reactos/libs/sound/mmebuddy_debug.h @@ -4,8 +4,9 @@ /* Hacky debug macro */ +// TODO: Use a string-safe function instead of wsprintf(). -// FIXME: sdk\lib\...\mmebuddy compilation would fail: wsprintf() and MessageBox() are undefined! +// FIXME: sdk\lib\...\mmebuddy compilation would fail: wsprintf() and MessageBoxW() are undefined! #if DBG && !defined(NDEBUG) // #if DBG // Helper for SND_ASSERT(). @@ -14,14 +15,14 @@ WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \ wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ - MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \ + MessageBoxW(NULL, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \ } #define SND_ERR(...) \ { \ WCHAR dbg_popup_msg[1024]; \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ - OutputDebugString(dbg_popup_msg); \ + OutputDebugStringW(dbg_popup_msg); \ } #define SND_ASSERT(condition) \ @@ -47,14 +48,14 @@ { \ WCHAR dbg_popup_msg[1024]; \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ - OutputDebugString(dbg_popup_msg); \ + OutputDebugStringW(dbg_popup_msg); \ } #define SND_TRACE(...) \ { \ WCHAR dbg_popup_msg[1024]; \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ - OutputDebugString(dbg_popup_msg); \ + OutputDebugStringW(dbg_popup_msg); \ } #define DUMP_WAVEHDR_QUEUE(sound_device_instance) \ @@ -74,7 +75,7 @@ #define SND_WARN(...) do {} while ( 0 ) #define SND_TRACE(...) do {} while ( 0 ) - #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 ) + #define DUMP_WAVEHDR_QUEUE(sound_device_instance) do {} while ( 0 ) #endif // DBG && !defined(NDEBUG)

4 months, 1 week

[reactos] 01/02: [SOUND] mmebuddy_debug.h: Sort out macro inclusions

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b30fde37977c0a323f5c6… commit b30fde37977c0a323f5c6739dc7fafdeca953b10 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> CommitDate: Thu Aug 15 17:50:12 2024 +0200 [SOUND] mmebuddy_debug.h: Sort out macro inclusions - POPUP() is used on DBG only. - SND_ERR() and SND_ASSERT() are wanted even when defined(NDEBUG). - Add a FIXME as !defined(NDEBUG) code compilation remains broken. Follow-up of c7a4984 (0.4.15-dev-8414). --- sdk/include/reactos/libs/sound/mmebuddy_debug.h | 59 ++++++++++++++++--------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/sdk/include/reactos/libs/sound/mmebuddy_debug.h b/sdk/include/reactos/libs/sound/mmebuddy_debug.h index 92d72009db5..31f85c4dd34 100644 --- a/sdk/include/reactos/libs/sound/mmebuddy_debug.h +++ b/sdk/include/reactos/libs/sound/mmebuddy_debug.h @@ -5,28 +5,19 @@ Hacky debug macro */ -#define POPUP(...) \ - { \ - WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \ - wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \ - wsprintf(dbg_popup_msg, __VA_ARGS__); \ - MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \ - } +// FIXME: sdk\lib\...\mmebuddy compilation would fail: wsprintf() and MessageBox() are undefined! +#if DBG && !defined(NDEBUG) // #if DBG -#if DBG && !defined(NDEBUG) - #define SND_ERR(...) \ - { \ - WCHAR dbg_popup_msg[1024]; \ - wsprintf(dbg_popup_msg, __VA_ARGS__); \ - OutputDebugString(dbg_popup_msg); \ - } - #define SND_WARN(...) \ + // Helper for SND_ASSERT(). + #define POPUP(...) \ { \ - WCHAR dbg_popup_msg[1024]; \ + WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \ + wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ - OutputDebugString(dbg_popup_msg); \ + MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \ } - #define SND_TRACE(...) \ + + #define SND_ERR(...) \ { \ WCHAR dbg_popup_msg[1024]; \ wsprintf(dbg_popup_msg, __VA_ARGS__); \ @@ -43,6 +34,29 @@ } \ } +#else // DBG + + #define SND_ERR(...) do {} while ( 0 ) + #define SND_ASSERT(condition) do {(void)(condition);} while ( 0 ) + +#endif // DBG + +#if DBG && !defined(NDEBUG) + + #define SND_WARN(...) \ + { \ + WCHAR dbg_popup_msg[1024]; \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + OutputDebugString(dbg_popup_msg); \ + } + + #define SND_TRACE(...) \ + { \ + WCHAR dbg_popup_msg[1024]; \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + OutputDebugString(dbg_popup_msg); \ + } + #define DUMP_WAVEHDR_QUEUE(sound_device_instance) \ { \ PWAVEHDR CurrDumpHdr = sound_device_instance->HeadWaveHeader; \ @@ -55,12 +69,13 @@ CurrDumpHdr = CurrDumpHdr->lpNext; \ } \ } -#else - #define SND_ERR(...) do {} while ( 0 ) + +#else // DBG && !defined(NDEBUG) + #define SND_WARN(...) do {} while ( 0 ) #define SND_TRACE(...) do {} while ( 0 ) - #define SND_ASSERT(condition) do {(void)(condition);} while ( 0 ) #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 ) -#endif + +#endif // DBG && !defined(NDEBUG) #endif /* ROS_AUDIO_MMEBUDDY_DEBUG_H */

4 months, 1 week

[reactos] 01/01: [NTUSER] Correctly store original unsnap position (#7244)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82a45262bfe07a461a51d… commit 82a45262bfe07a461a51d63eb4e3e7173a16ace8 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 15 12:33:17 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 15 12:33:17 2024 +0200 [NTUSER] Correctly store original unsnap position (#7244) A small change before PR #5705 was merged caused a severe downgrade in the snap/unsnap handling. Win key handling should work correctly now. CORE-19165 CORE-19166 --- win32ss/user/ntuser/winpos.c | 6 +++--- win32ss/user/ntuser/winpos.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 9c55ef7c0d9..f69f39bd7ed 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -3937,7 +3937,7 @@ co_IntSnapWindow(PWND Wnd, UINT Edge) co_IntSendMessage(UserHMGetHandle(Wnd), WM_SYSCOMMAND, SC_MAXIMIZE, 0); return; } - else if (Edge) + else if (Edge != HTNOWHERE) { UserRefObjectCo(Wnd, &ref); hasRef = TRUE; @@ -3951,7 +3951,7 @@ co_IntSnapWindow(PWND Wnd, UINT Edge) IntSetSnapEdge(Wnd, HTNOWHERE); return; } - newPos = Wnd->InternalPos.NormalRect; + newPos = Wnd->InternalPos.NormalRect; /* Copy RECT now before it is lost */ IntSetSnapInfo(Wnd, HTNOWHERE, NULL); } else @@ -4000,7 +4000,7 @@ IntSetSnapInfo(PWND Wnd, UINT Edge, IN const RECT *Pos OPTIONAL) { RECT r; IntSetSnapEdge(Wnd, Edge); - if (Edge != HTNOWHERE) + if (Edge == HTNOWHERE) { RECTL_vSetEmptyRect(&r); Pos = (Wnd->style & WS_MINIMIZE) ? NULL : &r; diff --git a/win32ss/user/ntuser/winpos.h b/win32ss/user/ntuser/winpos.h index 17d1c49cf33..d57e985f272 100644 --- a/win32ss/user/ntuser/winpos.h +++ b/win32ss/user/ntuser/winpos.h @@ -81,7 +81,7 @@ VOID FASTCALL IntSetSnapInfo(PWND Wnd, UINT Edge, IN const RECT *Pos OPTIONAL); FORCEINLINE VOID co_IntUnsnapWindow(PWND Wnd) { - co_IntSnapWindow(Wnd, 0); + co_IntSnapWindow(Wnd, HTNOWHERE); } FORCEINLINE BOOLEAN

4 months, 1 week

[reactos] 01/01: [SHDOCVW][SDK] Support Favorites bar Part 2 (#7223)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ede53491013e6db1ac85… commit 7ede53491013e6db1ac85dcfaa683dee3ef56084 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 14 12:00:47 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 14 12:00:47 2024 +0900 [SHDOCVW][SDK] Support Favorites bar Part 2 (#7223) Implement Favorites bar. JIRA issue: CORE-19686 - Introduce CNSCBand class to commonize some code of CFavBand and CExplorerBand classes. - Implement Favorites bar. - Fix IBandNavigate and INamespaceProxy interfaces. --- dll/win32/shdocvw/CExplorerBand.cpp | 1625 ++++------------------------------- dll/win32/shdocvw/CExplorerBand.h | 230 +---- dll/win32/shdocvw/CFavBand.cpp | 567 ++---------- dll/win32/shdocvw/CFavBand.h | 156 +--- dll/win32/shdocvw/CMakeLists.txt | 1 + dll/win32/shdocvw/CNSCBand.cpp | 1487 ++++++++++++++++++++++++++++++++ dll/win32/shdocvw/CNSCBand.h | 231 +++++ sdk/include/reactos/shlobj_undoc.h | 4 +- 8 files changed, 2051 insertions(+), 2250 deletions(-) diff --git a/dll/win32/shdocvw/CExplorerBand.cpp b/dll/win32/shdocvw/CExplorerBand.cpp index 8a60321a706..aa70c06c5c2 100644 --- a/dll/win32/shdocvw/CExplorerBand.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -7,8 +7,6 @@ */ #include "objects.h" -#include <commoncontrols.h> -#include <undocshell.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -21,1545 +19,298 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); */ CExplorerBand::CExplorerBand() - : m_pSite(NULL) - , m_fVisible(FALSE) - , m_mtxBlockNavigate(0) - , m_dwBandID(0) - , m_isEditing(FALSE) - , m_pidlCurrent(NULL) { } CExplorerBand::~CExplorerBand() { - if (m_pidlCurrent) - { - ILFree(m_pidlCurrent); - } -} - -void CExplorerBand::InitializeExplorerBand() -{ - // Init the treeview here - HRESULT hr = SHGetDesktopFolder(&m_pDesktop); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - LPITEMIDLIST pidl; - hr = SHGetFolderLocation(m_hWnd, CSIDL_DESKTOP, NULL, 0, &pidl); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - IImageList * piml; - hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - TreeView_SetImageList(m_hWnd, (HIMAGELIST)piml, TVSIL_NORMAL); - - // Insert the root node - m_hRoot = InsertItem(NULL, m_pDesktop, pidl, pidl, FALSE); - if (!m_hRoot) - { - ERR("Failed to create root item\n"); - return; - } - - NodeInfo* pNodeInfo = GetNodeInfo(m_hRoot); - - // Insert child nodes - InsertSubitems(m_hRoot, pNodeInfo); - TreeView_Expand(m_hWnd, m_hRoot, TVE_EXPAND); - - // Navigate to current folder position - NavigateToCurrentFolder(); - -#define TARGET_EVENTS ( \ - SHCNE_DRIVEADD | SHCNE_MKDIR | SHCNE_CREATE | SHCNE_DRIVEREMOVED | SHCNE_RMDIR | \ - SHCNE_DELETE | SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEDIR | \ - SHCNE_UPDATEITEM | SHCNE_ASSOCCHANGED \ -) - // Register shell notification - SHChangeNotifyEntry shcne = { pidl, TRUE }; - m_shellRegID = SHChangeNotifyRegister(m_hWnd, - SHCNRF_NewDelivery | SHCNRF_ShellLevel, - TARGET_EVENTS, - WM_USER_SHELLEVENT, - 1, &shcne); - if (!m_shellRegID) - { - ERR("Something went wrong, error %08x\n", GetLastError()); - } - - // Register browser connection endpoint - CComPtr<IWebBrowser2> browserService; - hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - hr = AtlAdvise(browserService, dynamic_cast<IDispatch*>(this), DIID_DWebBrowserEvents, &m_adviseCookie); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - ILFree(pidl); -} - -void CExplorerBand::DestroyExplorerBand() -{ - HRESULT hr; - CComPtr <IWebBrowser2> browserService; - - TRACE("Cleaning up explorer band ...\n"); - - hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); - if (FAILED_UNEXPECTEDLY(hr)) - return; - - hr = AtlUnadvise(browserService, DIID_DWebBrowserEvents, m_adviseCookie); - /* Remove all items of the treeview */ - RevokeDragDrop(m_hWnd); - TreeView_DeleteAllItems(m_hWnd); - m_pDesktop = NULL; - m_hRoot = NULL; - TRACE("Cleanup done !\n"); -} - -CExplorerBand::NodeInfo* CExplorerBand::GetNodeInfo(HTREEITEM hItem) -{ - TVITEM tvItem; - - tvItem.mask = TVIF_PARAM; - tvItem.hItem = hItem; - - if (!TreeView_GetItem(m_hWnd, &tvItem)) - return 0; - - return reinterpret_cast<NodeInfo*>(tvItem.lParam); -} - -static HRESULT GetCurrentLocationFromView(IShellView &View, PIDLIST_ABSOLUTE &pidl) -{ - CComPtr<IFolderView> pfv; - CComPtr<IShellFolder> psf; - HRESULT hr = View.QueryInterface(IID_PPV_ARG(IFolderView, &pfv)); - if (SUCCEEDED(hr) && SUCCEEDED(hr = pfv->GetFolder(IID_PPV_ARG(IShellFolder, &psf)))) - hr = SHELL_GetIDListFromObject(psf, &pidl); - return hr; -} - -HRESULT CExplorerBand::GetCurrentLocation(PIDLIST_ABSOLUTE &pidl) -{ - pidl = NULL; - CComPtr<IShellBrowser> psb; - HRESULT hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &psb)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - CComPtr<IBrowserService> pbs; - if (SUCCEEDED(hr = psb->QueryInterface(IID_PPV_ARG(IBrowserService, &pbs)))) - if (SUCCEEDED(hr = pbs->GetPidl(&pidl)) && pidl) - return hr; - - CComPtr<IShellView> psv; - if (!FAILED_UNEXPECTEDLY(hr = psb->QueryActiveShellView(&psv))) - if (SUCCEEDED(hr = psv.p ? GetCurrentLocationFromView(*psv.p, pidl) : E_FAIL)) - return hr; - return hr; -} - -HRESULT CExplorerBand::IsCurrentLocation(PCIDLIST_ABSOLUTE pidl) -{ - if (!pidl) - return E_INVALIDARG; - HRESULT hr = E_FAIL; - PIDLIST_ABSOLUTE location = m_pidlCurrent; - if (location || SUCCEEDED(hr = GetCurrentLocation(location))) - hr = SHELL_IsEqualAbsoluteID(location, pidl) ? S_OK : S_FALSE; - if (location != m_pidlCurrent) - ILFree(location); - return hr; -} - -HRESULT CExplorerBand::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd) -{ - CComPtr<IOleWindow> pBrowserOleWnd; - CMINVOKECOMMANDINFO cmi; - HWND browserWnd; - HRESULT hr; - - hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = pBrowserOleWnd->GetWindow(&browserWnd); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(nCmd); - cmi.hwnd = browserWnd; - if (GetKeyState(VK_SHIFT) & 0x8000) - cmi.fMask |= CMIC_MASK_SHIFT_DOWN; - if (GetKeyState(VK_CONTROL) & 0x8000) - cmi.fMask |= CMIC_MASK_CONTROL_DOWN; - - return menu->InvokeCommand(&cmi); -} - -HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto) -{ - CComPtr<IShellBrowser> pBrowserService; - HRESULT hr; - - hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &pBrowserService)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = pBrowserService->BrowseObject(pidlGoto, SBSP_SAMEBROWSER | SBSP_ABSOLUTE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - ILFree(m_pidlCurrent); - return SHILClone(pidlGoto, &m_pidlCurrent); -} - -// *** notifications handling *** -BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv) -{ - NodeInfo *pNodeInfo; - - if (pnmtv->action == TVE_COLLAPSE) { - if (pnmtv->itemNew.hItem == m_hRoot) - { - // Prenvent root from collapsing - pnmtv->itemNew.mask |= TVIF_STATE; - pnmtv->itemNew.stateMask |= TVIS_EXPANDED; - pnmtv->itemNew.state &= ~TVIS_EXPANDED; - pnmtv->action = TVE_EXPAND; - return TRUE; - } - } - if (pnmtv->action == TVE_EXPAND) { - // Grab our directory PIDL - pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); - // We have it, let's try - if (pNodeInfo && !pNodeInfo->expanded) - if (!InsertSubitems(pnmtv->itemNew.hItem, pNodeInfo)) { - // remove subitem "+" since we failed to add subitems - TV_ITEM tvItem; - - tvItem.mask = TVIF_CHILDREN; - tvItem.hItem = pnmtv->itemNew.hItem; - tvItem.cChildren = 0; - - TreeView_SetItem(m_hWnd, &tvItem); - } - } - return FALSE; -} - -BOOL CExplorerBand::OnTreeItemDeleted(LPNMTREEVIEW pnmtv) -{ - // Navigate to parent when deleting selected item - HTREEITEM hItem = pnmtv->itemOld.hItem; - HTREEITEM hParent = TreeView_GetParent(m_hWnd, hItem); - if (hParent && TreeView_GetSelection(m_hWnd) == hItem) - TreeView_SelectItem(m_hWnd, hParent); - - /* Destroy memory associated to our node */ - NodeInfo* pNode = GetNodeInfo(hItem); - if (!pNode) - return FALSE; - - ILFree(pNode->relativePidl); - ILFree(pNode->absolutePidl); - delete pNode; - - return TRUE; -} - -void CExplorerBand::OnSelectionChanged(LPNMTREEVIEW pnmtv) -{ - NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); - - /* Prevents navigation if selection is initiated inside the band */ - if (m_mtxBlockNavigate) - return; - - UpdateBrowser(pNodeInfo->absolutePidl); - - SetFocus(); - // Expand the node - //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND); -} - -void CExplorerBand::OnTreeItemDragging(LPNMTREEVIEW pnmtv, BOOL isRightClick) -{ - if (!pnmtv->itemNew.lParam) - return; - - NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); - - HRESULT hr; - CComPtr<IShellFolder> pSrcFolder; - LPCITEMIDLIST pLast; - hr = SHBindToParent(pNodeInfo->absolutePidl, IID_PPV_ARG(IShellFolder, &pSrcFolder), &pLast); - if (!SUCCEEDED(hr)) - return; - - SFGAOF attrs = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK; - pSrcFolder->GetAttributesOf(1, &pLast, &attrs); - - DWORD dwEffect = 0; - if (attrs & SFGAO_CANCOPY) - dwEffect |= DROPEFFECT_COPY; - if (attrs & SFGAO_CANMOVE) - dwEffect |= DROPEFFECT_MOVE; - if (attrs & SFGAO_CANLINK) - dwEffect |= DROPEFFECT_LINK; - - CComPtr<IDataObject> pObj; - hr = pSrcFolder->GetUIObjectOf(m_hWnd, 1, &pLast, IID_IDataObject, 0, (LPVOID*)&pObj); - if (!SUCCEEDED(hr)) - return; - - DoDragDrop(pObj, this, dwEffect, &dwEffect); -} - -// *** ATL event handlers *** -LRESULT CExplorerBand::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - HTREEITEM item; - NodeInfo *info; - HMENU treeMenu; - POINT pt; - CComPtr<IShellFolder> pFolder; - CComPtr<IContextMenu> contextMenu; - HRESULT hr; - UINT uCommand; - LPITEMIDLIST pidlChild; - UINT cmdBase = max(FCIDM_SHVIEWFIRST, 1); - UINT cmf = CMF_EXPLORE; - SFGAOF attr = SFGAO_CANRENAME; - BOOL startedRename = FALSE; - - treeMenu = NULL; - item = TreeView_GetSelection(m_hWnd); - bHandled = TRUE; - if (!item) - { - goto Cleanup; - } - - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - if ((UINT)lParam == (UINT)-1) - { - RECT r; - if (TreeView_GetItemRect(m_hWnd, item, &r, TRUE)) - { - pt.x = (r.left + r.right) / 2; // Center of - pt.y = (r.top + r.bottom) / 2; // item rectangle - } - ClientToScreen(&pt); - } - - info = GetNodeInfo(item); - if (!info) - { - ERR("No node data, something has gone wrong !\n"); - goto Cleanup; - } - hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pFolder), - (LPCITEMIDLIST*)&pidlChild); - if (!SUCCEEDED(hr)) - { - ERR("Can't bind to folder!\n"); - goto Cleanup; - } - hr = pFolder->GetUIObjectOf(m_hWnd, 1, (LPCITEMIDLIST*)&pidlChild, IID_IContextMenu, - NULL, reinterpret_cast<void**>(&contextMenu)); - if (!SUCCEEDED(hr)) - { - ERR("Can't get IContextMenu interface\n"); - goto Cleanup; - } - - IUnknown_SetSite(contextMenu, (IDeskBand *)this); - - if (SUCCEEDED(pFolder->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlChild, &attr)) && (attr & SFGAO_CANRENAME)) - cmf |= CMF_CANRENAME; - - treeMenu = CreatePopupMenu(); - hr = contextMenu->QueryContextMenu(treeMenu, 0, cmdBase, FCIDM_SHVIEWLAST, cmf); - if (!SUCCEEDED(hr)) - { - WARN("Can't get context menu for item\n"); - DestroyMenu(treeMenu); - goto Cleanup; - } - - uCommand = TrackPopupMenu(treeMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, - pt.x, pt.y, 0, m_hWnd, NULL); - if (uCommand) - { - uCommand -= cmdBase; - - // Do DFM_CMD_RENAME in the treeview - if ((cmf & CMF_CANRENAME) && SHELL_IsVerb(contextMenu, uCommand, L"rename")) - { - HTREEITEM oldSelected = m_oldSelected; - SetFocus(); - startedRename = TreeView_EditLabel(m_hWnd, item) != NULL; - m_oldSelected = oldSelected; // Restore after TVN_BEGINLABELEDIT - goto Cleanup; - } - - hr = ExecuteCommand(contextMenu, uCommand); - } - -Cleanup: - if (contextMenu) - IUnknown_SetSite(contextMenu, NULL); - if (treeMenu) - DestroyMenu(treeMenu); - if (startedRename) - { - // The treeview disables drawing of the edited item so we must make sure - // the correct item is selected (on right-click -> rename on not-current folder). - // TVN_ENDLABELEDIT becomes responsible for restoring the selection. - } - else - { - ++m_mtxBlockNavigate; - TreeView_SelectItem(m_hWnd, m_oldSelected); - --m_mtxBlockNavigate; - } - return TRUE; -} - -LRESULT CExplorerBand::ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - bHandled = FALSE; - if (uMsg == WM_RBUTTONDOWN) - { - TVHITTESTINFO info; - info.pt.x = LOWORD(lParam); - info.pt.y = HIWORD(lParam); - info.flags = TVHT_ONITEM; - info.hItem = NULL; - - // Save the current location - m_oldSelected = TreeView_GetSelection(m_hWnd); - - // Move to the item selected by the treeview (don't change right pane) - TreeView_HitTest(m_hWnd, &info); - ++m_mtxBlockNavigate; - TreeView_SelectItem(m_hWnd, info.hItem); - --m_mtxBlockNavigate; - } - return FALSE; /* let the wndproc process the message */ -} - -// WM_USER_SHELLEVENT -LRESULT CExplorerBand::OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - // We use SHCNRF_NewDelivery method - HANDLE hChange = (HANDLE)wParam; - DWORD dwProcID = (DWORD)lParam; - - PIDLIST_ABSOLUTE *ppidl = NULL; - LONG lEvent; - HANDLE hLock = SHChangeNotification_Lock(hChange, dwProcID, &ppidl, &lEvent); - if (hLock == NULL) - { - ERR("hLock == NULL\n"); - return 0; - } - - OnChangeNotify(ppidl[0], ppidl[1], (lEvent & ~SHCNE_INTERRUPT)); - - SHChangeNotification_Unlock(hLock); - return 0; -} - -BOOL -CExplorerBand::IsTreeItemInEnum( - _In_ HTREEITEM hItem, - _In_ IEnumIDList *pEnum) -{ - NodeInfo* pNodeInfo = GetNodeInfo(hItem); - if (!pNodeInfo) - return FALSE; - - pEnum->Reset(); - - CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; - while (pEnum->Next(1, &pidlTemp, NULL) == S_OK) - { - if (ILIsEqual(pidlTemp, pNodeInfo->relativePidl)) - return TRUE; - - pidlTemp.Free(); - } - - return FALSE; -} - -BOOL -CExplorerBand::TreeItemHasThisChild( - _In_ HTREEITEM hItem, - _In_ PCITEMID_CHILD pidlChild) -{ - for (hItem = TreeView_GetChild(m_hWnd, hItem); hItem; - hItem = TreeView_GetNextSibling(m_hWnd, hItem)) - { - NodeInfo* pNodeInfo = GetNodeInfo(hItem); - if (ILIsEqual(pNodeInfo->relativePidl, pidlChild)) - return TRUE; - } - - return FALSE; -} - -HRESULT -CExplorerBand::GetItemEnum( - _Out_ CComPtr<IEnumIDList>& pEnum, - _In_ HTREEITEM hItem) -{ - NodeInfo* pNodeInfo = GetNodeInfo(hItem); - - CComPtr<IShellFolder> psfDesktop; - HRESULT hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - return hr; - - CComPtr<IShellFolder> pFolder; - hr = psfDesktop->BindToObject(pNodeInfo->absolutePidl, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); - if (FAILED(hr)) - return hr; - - return pFolder->EnumObjects(NULL, SHCONTF_FOLDERS, &pEnum); -} - -BOOL CExplorerBand::ItemHasAnyChild(_In_ HTREEITEM hItem) -{ - CComPtr<IEnumIDList> pEnum; - HRESULT hr = GetItemEnum(pEnum, hItem); - if (FAILED(hr)) - return FALSE; - - CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; - hr = pEnum->Next(1, &pidlTemp, NULL); - return SUCCEEDED(hr); -} - -void CExplorerBand::RefreshRecurse(_In_ HTREEITEM hTarget) -{ - NodeInfo* pNodeInfo = GetNodeInfo(hTarget); - - CComPtr<IEnumIDList> pEnum; - HRESULT hrEnum = GetItemEnum(pEnum, hTarget); - - // Delete zombie items - HTREEITEM hItem, hNextItem; - for (hItem = TreeView_GetChild(m_hWnd, hTarget); hItem; hItem = hNextItem) - { - hNextItem = TreeView_GetNextSibling(m_hWnd, hItem); - - if (SUCCEEDED(hrEnum) && !IsTreeItemInEnum(hItem, pEnum)) - TreeView_DeleteItem(m_hWnd, hItem); - } - - pEnum = NULL; - hrEnum = GetItemEnum(pEnum, hTarget); - - // Insert new items and update items - if (SUCCEEDED(hrEnum)) - { - CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; - while (pEnum->Next(1, &pidlTemp, NULL) == S_OK) - { - if (!TreeItemHasThisChild(hTarget, pidlTemp)) - { - CComHeapPtr<ITEMIDLIST> pidlAbsolute(ILCombine(pNodeInfo->absolutePidl, pidlTemp)); - InsertItem(hTarget, pidlAbsolute, pidlTemp, TRUE); - } - pidlTemp.Free(); - } - } - - // Update children and recurse - for (hItem = TreeView_GetChild(m_hWnd, hTarget); hItem; hItem = hNextItem) - { - hNextItem = TreeView_GetNextSibling(m_hWnd, hItem); - - TV_ITEMW item = { TVIF_HANDLE | TVIF_CHILDREN }; - item.hItem = hItem; - item.cChildren = ItemHasAnyChild(hItem); - TreeView_SetItem(m_hWnd, &item); - - if (TreeView_GetItemState(m_hWnd, hItem, TVIS_EXPANDEDONCE) & TVIS_EXPANDEDONCE) - RefreshRecurse(hItem); - } -} - -void CExplorerBand::Refresh() -{ - SendMessage(WM_SETREDRAW, FALSE, 0); - RefreshRecurse(m_hRoot); - SendMessage(WM_SETREDRAW, TRUE, 0); - InvalidateRect(NULL, TRUE); -} - -#define TIMER_ID_REFRESH 9999 - -LRESULT CExplorerBand::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - if (wParam != TIMER_ID_REFRESH) - return 0; - - KillTimer(TIMER_ID_REFRESH); - - // FIXME: Avoid full refresh and optimize for speed - Refresh(); - - return 0; -} - -void -CExplorerBand::OnChangeNotify( - _In_opt_ LPCITEMIDLIST pidl0, - _In_opt_ LPCITEMIDLIST pidl1, - _In_ LONG lEvent) -{ - switch (lEvent) - { - case SHCNE_DRIVEADD: - case SHCNE_MKDIR: - case SHCNE_CREATE: - case SHCNE_DRIVEREMOVED: - case SHCNE_RMDIR: - case SHCNE_DELETE: - case SHCNE_RENAMEFOLDER: - case SHCNE_RENAMEITEM: - case SHCNE_UPDATEDIR: - case SHCNE_UPDATEITEM: - case SHCNE_ASSOCCHANGED: - { - KillTimer(TIMER_ID_REFRESH); - SetTimer(TIMER_ID_REFRESH, 500, NULL); - break; - } - default: - { - TRACE("lEvent: 0x%08lX\n", lEvent); - break; - } - } -} - -LRESULT CExplorerBand::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - m_bFocused = TRUE; - IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), TRUE); - bHandled = FALSE; - return TRUE; -} - -LRESULT CExplorerBand::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), FALSE); - bHandled = FALSE; - return TRUE; -} - -// *** Helper functions *** -HTREEITEM -CExplorerBand::InsertItem( - _In_opt_ HTREEITEM hParent, - _Inout_ IShellFolder *psfParent, - _In_ LPCITEMIDLIST pElt, - _In_ LPCITEMIDLIST pEltRelative, - _In_ BOOL bSort) -{ - TV_INSERTSTRUCT tvInsert; - HTREEITEM htiCreated; - - /* Get the attributes of the node */ - SFGAOF attrs = SFGAO_STREAM | SFGAO_HASSUBFOLDER; - HRESULT hr = psfParent->GetAttributesOf(1, &pEltRelative, &attrs); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - - /* Ignore streams */ - if (attrs & SFGAO_STREAM) - { - TRACE("Ignoring stream\n"); - return NULL; - } - - /* Get the name of the node */ - WCHAR wszDisplayName[MAX_PATH]; - STRRET strret; - hr = psfParent->GetDisplayNameOf(pEltRelative, SHGDN_INFOLDER, &strret); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - - hr = StrRetToBufW(&strret, pEltRelative, wszDisplayName, MAX_PATH); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - - /* Get the icon of the node */ - INT iIcon = SHMapPIDLToSystemImageListIndex(psfParent, pEltRelative, NULL); - - NodeInfo* pChildInfo = new NodeInfo; - if (!pChildInfo) - { - ERR("Failed to allocate NodeInfo\n"); - return FALSE; - } - - // Store our node info - pChildInfo->absolutePidl = ILClone(pElt); - pChildInfo->relativePidl = ILClone(pEltRelative); - pChildInfo->expanded = FALSE; - - // Set up our treeview template - tvInsert.hParent = hParent; - tvInsert.hInsertAfter = TVI_LAST; - tvInsert.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN; - tvInsert.item.cchTextMax = MAX_PATH; - tvInsert.item.pszText = wszDisplayName; - tvInsert.item.iImage = tvInsert.item.iSelectedImage = iIcon; - tvInsert.item.cChildren = (attrs & SFGAO_HASSUBFOLDER) ? 1 : 0; - tvInsert.item.lParam = (LPARAM)pChildInfo; - - htiCreated = TreeView_InsertItem(m_hWnd, &tvInsert); - - if (bSort) - { - TVSORTCB sortCallback; - sortCallback.hParent = hParent; - sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; - SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); - } - - return htiCreated; -} - -/* This is the slow version of the above method */ -HTREEITEM -CExplorerBand::InsertItem( - _In_opt_ HTREEITEM hParent, - _In_ LPCITEMIDLIST pElt, - _In_ LPCITEMIDLIST pEltRelative, - _In_ BOOL bSort) -{ - CComPtr<IShellFolder> psfFolder; - HRESULT hr = SHBindToParent(pElt, IID_PPV_ARG(IShellFolder, &psfFolder), NULL); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - - return InsertItem(hParent, psfFolder, pElt, pEltRelative, bSort); -} - -BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) -{ - CComPtr<IEnumIDList> pEnumIDList; - LPITEMIDLIST pidlSub; - LPITEMIDLIST entry; - SHCONTF EnumFlags; - HRESULT hr; - ULONG fetched; - ULONG uItemCount; - CComPtr<IShellFolder> pFolder; - TVSORTCB sortCallback; - - entry = pNodeInfo->absolutePidl; - fetched = 1; - uItemCount = 0; - EnumFlags = SHCONTF_FOLDERS; - - hr = SHGetFolderLocation(m_hWnd, CSIDL_DESKTOP, NULL, 0, &pidlSub); - if (!SUCCEEDED(hr)) - { - ERR("Can't get desktop PIDL !\n"); - return FALSE; - } - - if (!m_pDesktop->CompareIDs(NULL, pidlSub, entry)) - { - // We are the desktop, so use pDesktop as pFolder - pFolder = m_pDesktop; - } - else - { - // Get an IShellFolder of our pidl - hr = m_pDesktop->BindToObject(entry, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); - if (!SUCCEEDED(hr)) - { - ILFree(pidlSub); - ERR("Can't bind folder to desktop !\n"); - return FALSE; - } - } - ILFree(pidlSub); - - // TODO: handle hidden folders according to settings ! - EnumFlags |= SHCONTF_INCLUDEHIDDEN; - - // Enum through objects - hr = pFolder->EnumObjects(NULL,EnumFlags,&pEnumIDList); - - // avoid broken IShellFolder implementations that return null pointer with success - if (!SUCCEEDED(hr) || !pEnumIDList) - { - ERR("Can't enum the folder !\n"); - return FALSE; - } - - /* Don't redraw while we add stuff into the tree */ - SendMessage(WM_SETREDRAW, FALSE, 0); - while(SUCCEEDED(pEnumIDList->Next(1, &pidlSub, &fetched)) && pidlSub && fetched) - { - LPITEMIDLIST pidlSubComplete; - pidlSubComplete = ILCombine(entry, pidlSub); - - if (InsertItem(hItem, pFolder, pidlSubComplete, pidlSub, FALSE)) - uItemCount++; - ILFree(pidlSubComplete); - ILFree(pidlSub); - } - pNodeInfo->expanded = TRUE; - /* Let's do sorting */ - sortCallback.hParent = hItem; - sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; - SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); - - /* Now we can redraw */ - SendMessage(WM_SETREDRAW, TRUE, 0); - - return (uItemCount > 0) ? TRUE : FALSE; -} - -/** - * Navigate to a given PIDL in the treeview, and return matching tree item handle - * - dest: The absolute PIDL we should navigate in the treeview - * - item: Handle of the tree item matching the PIDL - * - bExpand: expand collapsed nodes in order to find the right element - * - bInsert: insert the element at the right place if we don't find it - * - bSelect: select the item after we found it - */ -BOOL CExplorerBand::NavigateToPIDL(LPCITEMIDLIST dest, HTREEITEM *item, BOOL bExpand, BOOL bInsert, - BOOL bSelect) -{ - HTREEITEM current; - HTREEITEM tmp; - HTREEITEM parent; - NodeInfo *nodeData; - LPITEMIDLIST relativeChild; - TVITEM tvItem; - - if (!item) - return FALSE; - - current = m_hRoot; - parent = NULL; - while (TRUE) - { - nodeData = GetNodeInfo(current); - if (!nodeData) - { - ERR("Something has gone wrong, no data associated to node !\n"); - *item = NULL; - return FALSE; - } - // If we found our node, give it back - if (!m_pDesktop->CompareIDs(0, nodeData->absolutePidl, dest)) - { - if (bSelect) - TreeView_SelectItem(m_hWnd, current); - *item = current; - return TRUE; - } - - // Check if we are a parent of the requested item - relativeChild = ILFindChild(nodeData->absolutePidl, dest); - if (relativeChild != 0) - { - // Notify treeview we have children - tvItem.mask = TVIF_CHILDREN; - tvItem.hItem = current; - tvItem.cChildren = 1; - TreeView_SetItem(m_hWnd, &tvItem); - - // If we can expand and the node isn't expanded yet, do it - if (bExpand) - { - if (!nodeData->expanded) - InsertSubitems(current, nodeData); - TreeView_Expand(m_hWnd, current, TVE_EXPAND); - } - - // Try to get a child - tmp = TreeView_GetChild(m_hWnd, current); - if (tmp) - { - // We have a child, let's continue with it - parent = current; - current = tmp; - continue; - } - - if (bInsert && nodeData->expanded) - { - // Happens when we have to create a subchild inside a child - current = InsertItem(current, dest, relativeChild, TRUE); - } - // We end up here, without any children, so we found nothing - // Tell the parent node it has children - ZeroMemory(&tvItem, sizeof(tvItem)); - *item = NULL; - return FALSE; - } - - // Find sibling - tmp = TreeView_GetNextSibling(m_hWnd, current); - if (tmp) - { - current = tmp; - continue; - } - if (bInsert) - { - current = InsertItem(parent, dest, ILFindLastID(dest), TRUE); - *item = current; - return TRUE; - } - *item = NULL; - return FALSE; - } - UNREACHABLE; -} - -BOOL CExplorerBand::NavigateToCurrentFolder() -{ - LPITEMIDLIST explorerPidl; - HTREEITEM dummy; - BOOL result; - - HRESULT hr = GetCurrentLocation(explorerPidl); - if (FAILED_UNEXPECTEDLY(hr)) - { - ERR("Unable to get browser PIDL !\n"); - return FALSE; - } - ++m_mtxBlockNavigate; - /* find PIDL into our explorer */ - result = NavigateToPIDL(explorerPidl, &dummy, TRUE, FALSE, TRUE); - --m_mtxBlockNavigate; - ILFree(explorerPidl); - return result; -} - -// *** Tree item sorting callback *** -int CALLBACK CExplorerBand::CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) -{ - NodeInfo *info1 = (NodeInfo*)p1; - NodeInfo *info2 = (NodeInfo*)p2; - IShellFolder *pDesktop = (IShellFolder *)p3; - - HRESULT hr = pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); - if (FAILED(hr)) - return 0; - - return (SHORT)HRESULT_CODE(hr); -} - -// *** IOleWindow methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::GetWindow(HWND *lphwnd) -{ - if (!lphwnd) - return E_INVALIDARG; - *lphwnd = m_hWnd; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - - -// *** IDockingWindow methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::CloseDW(DWORD dwReserved) -{ - // We do nothing, we don't have anything to save yet - TRACE("CloseDW called\n"); - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) -{ - /* Must return E_NOTIMPL according to MSDN */ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::ShowDW(BOOL fShow) -{ - m_fVisible = fShow; - ShowWindow(fShow); - return S_OK; } - -// *** IDeskBand methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +STDMETHODIMP CExplorerBand::GetClassID(CLSID *pClassID) { - if (!pdbi) - { - return E_INVALIDARG; - } - this->m_dwBandID = dwBandID; - - if (pdbi->dwMask & DBIM_MINSIZE) - { - pdbi->ptMinSize.x = 200; - pdbi->ptMinSize.y = 30; - } - - if (pdbi->dwMask & DBIM_MAXSIZE) - { - pdbi->ptMaxSize.y = -1; - } - - if (pdbi->dwMask & DBIM_INTEGRAL) - { - pdbi->ptIntegral.y = 1; - } - - if (pdbi->dwMask & DBIM_ACTUAL) - { - pdbi->ptActual.x = 200; - pdbi->ptActual.y = 30; - } - - if (pdbi->dwMask & DBIM_TITLE) - { - if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_FOLDERSLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) - return HRESULT_FROM_WIN32(GetLastError()); - } - - if (pdbi->dwMask & DBIM_MODEFLAGS) - { - pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; - } - - if (pdbi->dwMask & DBIM_BKCOLOR) - { - pdbi->dwMask &= ~DBIM_BKCOLOR; - } + if (!pClassID) + return E_POINTER; + *pClassID = CLSID_ExplorerBand; return S_OK; } - -// *** IObjectWithSite methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) +INT CExplorerBand::_GetRootCsidl() { - HRESULT hr; - HWND parentWnd; - - if (pUnkSite == m_pSite) - return S_OK; - - TRACE("SetSite called \n"); - if (!pUnkSite) - { - DestroyExplorerBand(); - DestroyWindow(); - m_hWnd = NULL; - } - - if (pUnkSite != m_pSite) - { - m_pSite = NULL; - } - - if(!pUnkSite) - return S_OK; - - hr = IUnknown_GetWindow(pUnkSite, &parentWnd); - if (!SUCCEEDED(hr)) - { - ERR("Could not get parent's window ! Status: %08lx\n", hr); - return E_INVALIDARG; - } - - m_pSite = pUnkSite; - - if (m_hWnd) - { - // Change its parent - SetParent(parentWnd); - } - else - { - HWND wnd = CreateWindow(WC_TREEVIEW, NULL, - WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TVS_HASLINES | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS /* | TVS_SINGLEEXPAND*/ , // remove TVS_SINGLEEXPAND for now since it has strange behaviour - 0, 0, 0, 0, parentWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); - - // Subclass the window - SubclassWindow(wnd); - - // Initialize our treeview now - InitializeExplorerBand(); - RegisterDragDrop(m_hWnd, dynamic_cast<IDropTarget*>(this)); - } - return S_OK; + return CSIDL_DESKTOP; } -HRESULT STDMETHODCALLTYPE CExplorerBand::GetSite(REFIID riid, void **ppvSite) +DWORD CExplorerBand::_GetTVStyle() { - if (!ppvSite) - return E_POINTER; - *ppvSite = m_pSite; - return S_OK; + // Remove TVS_SINGLEEXPAND for now since it has strange behaviour + return WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TVS_HASLINES | + TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS /* | TVS_SINGLEEXPAND*/; } - -// *** IOleCommandTarget methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +DWORD CExplorerBand::_GetTVExStyle() { - UNIMPLEMENTED; - return E_NOTIMPL; + return 0; } -HRESULT STDMETHODCALLTYPE CExplorerBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +DWORD CExplorerBand::_GetEnumFlags() { - UNIMPLEMENTED; - return E_NOTIMPL; + return SHCONTF_FOLDERS; } - -// *** IServiceProvider methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +BOOL CExplorerBand::_GetTitle(LPWSTR pszTitle, INT cchTitle) { - /* FIXME: we probably want to handle more services here */ - return IUnknown_QueryService(m_pSite, SID_SShellBrowser, riid, ppvObject); + return ::LoadStringW(instance, IDS_FOLDERSLABEL, pszTitle, cchTitle); } - -// *** IInputObject methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +BOOL CExplorerBand::_WantsRootItem() { - if (fActivate) - { - //SetFocus(); - SetActiveWindow(); - } - // TODO: handle message - if(lpMsg) - { - TranslateMessage(lpMsg); - DispatchMessage(lpMsg); - } - return S_OK; + return TRUE; } -HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() +// Called when the user has selected an item. +STDMETHODIMP CExplorerBand::OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) { - return m_bFocused ? S_OK : S_FALSE; + return Invoke(pidl); } -HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) +// Handles a user action on an item. +STDMETHODIMP CExplorerBand::Invoke(_In_ PCIDLIST_ABSOLUTE pidl) { - if (lpMsg->hwnd == m_hWnd || - (m_isEditing && IsChild(lpMsg->hwnd))) - { - TranslateMessage(lpMsg); - DispatchMessage(lpMsg); + /* Prevents navigation if selection is initiated inside the band */ + if (m_mtxBlockNavigate) return S_OK; - } - - return S_FALSE; -} -// *** IPersist methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::GetClassID(CLSID *pClassID) -{ - if (!pClassID) - return E_POINTER; - memcpy(pClassID, &CLSID_ExplorerBand, sizeof(CLSID)); + _UpdateBrowser(pidl); + m_hwndTreeView.SetFocus(); return S_OK; } - -// *** IPersistStream methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::IsDirty() -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::Load(IStream *pStm) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::Save(IStream *pStm, BOOL fClearDirty) +void CExplorerBand::_SortItems(HTREEITEM hParent) { - UNIMPLEMENTED; - return E_NOTIMPL; + TVSORTCB sortCallback; + sortCallback.hParent = hParent; + sortCallback.lpfnCompare = _CompareTreeItems; + sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; // m_pDesktop is not a pointer + TreeView_SortChildrenCB(m_hwndTreeView, &sortCallback, 0); } -HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +INT CALLBACK CExplorerBand::_CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) { - // TODO: calculate max size - UNIMPLEMENTED; - return E_NOTIMPL; + CItemData *info1 = (CItemData*)p1; + CItemData *info2 = (CItemData*)p2; + IShellFolder *pDesktop = (IShellFolder *)p3; + HRESULT hr = pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); + if (FAILED(hr)) + return 0; + return (SHORT)HRESULT_CODE(hr); } -// *** IWinEventHandler methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT CExplorerBand::_CreateTreeView(HWND hwndParent) { - BOOL bHandled; - LRESULT result; + HRESULT hr = CNSCBand::_CreateTreeView(hwndParent); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - if (uMsg == WM_NOTIFY) + // Insert the root node + m_hRoot = _InsertItem(NULL, m_pDesktop, m_pidlRoot, m_pidlRoot, FALSE); + if (!m_hRoot) { - NMHDR *pNotifyHeader = (NMHDR*)lParam; - switch (pNotifyHeader->code) - { - case TVN_ITEMEXPANDING: - result = OnTreeItemExpanding((LPNMTREEVIEW)lParam); - if (theResult) - *theResult = result; - break; - case TVN_SELCHANGED: - OnSelectionChanged((LPNMTREEVIEW)lParam); - break; - case TVN_DELETEITEM: - OnTreeItemDeleted((LPNMTREEVIEW)lParam); - break; - case NM_RCLICK: - OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled); - if (theResult) - *theResult = 1; - break; - case TVN_BEGINDRAG: - case TVN_BEGINRDRAG: - OnTreeItemDragging((LPNMTREEVIEW)lParam, pNotifyHeader->code == TVN_BEGINRDRAG); - break; - case TVN_BEGINLABELEDITW: - { - // TODO: put this in a function ? (mostly copypasta from CDefView) - DWORD dwAttr = SFGAO_CANRENAME; - LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; - CComPtr<IShellFolder> pParent; - LPCITEMIDLIST pChild; - HRESULT hr; - - if (theResult) - *theResult = 1; - NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); - if (!info) - return E_FAIL; - hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pChild); - if (!SUCCEEDED(hr) || !pParent.p) - return E_FAIL; - - hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); - if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) - { - if (theResult) - *theResult = 0; - m_isEditing = TRUE; - m_oldSelected = NULL; - } - return S_OK; - } - case TVN_ENDLABELEDITW: - { - LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; - NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); - HRESULT hr; - - m_isEditing = FALSE; - if (m_oldSelected) - { - ++m_mtxBlockNavigate; - TreeView_SelectItem(m_hWnd, m_oldSelected); - --m_mtxBlockNavigate; - } - - if (theResult) - *theResult = 0; - if (dispInfo->item.pszText) - { - LPITEMIDLIST pidlNew; - CComPtr<IShellFolder> pParent; - LPCITEMIDLIST pidlChild; - BOOL RenamedCurrent = IsCurrentLocation(info->absolutePidl) == S_OK; - - hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pidlChild); - if (!SUCCEEDED(hr) || !pParent.p) - return E_FAIL; - - hr = pParent->SetNameOf(m_hWnd, pidlChild, dispInfo->item.pszText, SHGDN_INFOLDER, &pidlNew); - if(SUCCEEDED(hr) && pidlNew) - { - CComPtr<IPersistFolder2> pPersist; - LPITEMIDLIST pidlParent, pidlNewAbs; - - hr = pParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pPersist)); - if(!SUCCEEDED(hr)) - return E_FAIL; - - hr = pPersist->GetCurFolder(&pidlParent); - if(!SUCCEEDED(hr)) - return E_FAIL; - pidlNewAbs = ILCombine(pidlParent, pidlNew); - - if (RenamedCurrent) - { - // Navigate to our new location - UpdateBrowser(pidlNewAbs); - } - else - { - // Tell everyone in case SetNameOf forgot, this causes IShellView to update itself when we renamed a child - SHChangeNotify(SHCNE_RENAMEFOLDER, SHCNF_IDLIST, info->absolutePidl, pidlNewAbs); - } - - ILFree(pidlParent); - ILFree(pidlNewAbs); - ILFree(pidlNew); - if (theResult) - *theResult = 1; - } - return S_OK; - } - } - default: - break; - } + ERR("Failed to create root item\n"); + return E_FAIL; } - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::IsWindowOwner(HWND hWnd) -{ - return (hWnd == m_hWnd) ? S_OK : S_FALSE; -} + TreeView_Expand(m_hwndTreeView, m_hRoot, TVE_EXPAND); -// *** IBandNavigate methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::Select(long paramC) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} + // Navigate to current folder position + _NavigateToCurrentFolder(); -// *** INamespaceProxy *** + // Register browser connection endpoint + CComPtr<IWebBrowser2> browserService; + hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -/// Returns the ITEMIDLIST that should be navigated when an item is invoked. -STDMETHODIMP CExplorerBand::GetNavigateTarget( - _In_ PCIDLIST_ABSOLUTE pidl, - _Out_ PIDLIST_ABSOLUTE ppidlTarget, - _Out_ ULONG *pulAttrib) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} + // Communicate via IDispatch + hr = AtlAdvise(browserService, dynamic_cast<IDispatch*>(this), DIID_DWebBrowserEvents, &m_adviseCookie); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -/// Handles a user action on an item. -STDMETHODIMP CExplorerBand::Invoke(_In_ PCIDLIST_ABSOLUTE pidl) -{ - UNIMPLEMENTED; - return E_NOTIMPL; + return hr; } -/// Called when the user has selected an item. -STDMETHODIMP CExplorerBand::OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) +void CExplorerBand::_DestroyTreeView() { - UNIMPLEMENTED; - return E_NOTIMPL; -} + CComPtr<IWebBrowser2> browserService; + HRESULT hr = IUnknown_QueryService(m_pSite, SID_SWebBrowserApp, + IID_PPV_ARG(IWebBrowser2, &browserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return; -/// Returns flags used to update the tree control. -STDMETHODIMP CExplorerBand::RefreshFlags( - _Out_ DWORD *pdwStyle, - _Out_ DWORD *pdwExStyle, - _Out_ DWORD *dwEnum) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} + AtlUnadvise(browserService, DIID_DWebBrowserEvents, m_adviseCookie); -STDMETHODIMP CExplorerBand::CacheItem(_In_ PCIDLIST_ABSOLUTE pidl) -{ - UNIMPLEMENTED; - return E_NOTIMPL; + CNSCBand::_DestroyTreeView(); } // *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfoCount(UINT *pctinfo) + +STDMETHODIMP CExplorerBand::GetTypeInfoCount(UINT *pctinfo) { UNIMPLEMENTED; return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CExplorerBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +STDMETHODIMP CExplorerBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { UNIMPLEMENTED; return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CExplorerBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +STDMETHODIMP CExplorerBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { UNIMPLEMENTED; return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +STDMETHODIMP +CExplorerBand::Invoke( + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) { switch (dispIdMember) { case DISPID_DOWNLOADCOMPLETE: case DISPID_NAVIGATECOMPLETE2: - TRACE("DISPID_NAVIGATECOMPLETE2 received\n"); - NavigateToCurrentFolder(); - return S_OK; + { + TRACE("dispId %d received\n", dispIdMember); + _NavigateToCurrentFolder(); + return S_OK; + } } TRACE("Unknown dispid requested: %08x\n", dispIdMember); return E_INVALIDARG; } -// *** IDropTarget methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +BOOL CExplorerBand::_NavigateToCurrentFolder() { - ERR("Entering drag\n"); - m_pCurObject = pObj; - m_oldSelected = TreeView_GetSelection(m_hWnd); - return DragOver(glfKeyState, pt, pdwEffect); -} + CComHeapPtr<ITEMIDLIST> pidl; + HRESULT hr = _GetCurrentLocation(&pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; -HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) -{ - TVHITTESTINFO info; - CComPtr<IShellFolder> pShellFldr; - NodeInfo *nodeInfo; - //LPCITEMIDLIST pChild; - HRESULT hr; + // Find PIDL into our explorer + ++m_mtxBlockNavigate; + HTREEITEM hItem; + BOOL result = _NavigateToPIDL(pidl, &hItem, TRUE, FALSE, TRUE); + --m_mtxBlockNavigate; + + return result; +} - info.pt.x = pt.x; - info.pt.y = pt.y; - info.flags = TVHT_ONITEM; - info.hItem = NULL; - ScreenToClient(&info.pt); +/** + * Navigate to a given PIDL in the treeview, and return matching tree item handle + * - dest: The absolute PIDL we should navigate in the treeview + * - item: Handle of the tree item matching the PIDL + * - bExpand: expand collapsed nodes in order to find the right element + * - bInsert: insert the element at the right place if we don't find it + * - bSelect: select the item after we found it + */ +BOOL +CExplorerBand::_NavigateToPIDL( + _In_ LPCITEMIDLIST dest, + _Out_ HTREEITEM *phItem, + _In_ BOOL bExpand, + _In_ BOOL bInsert, + _In_ BOOL bSelect) +{ + if (!phItem) + return FALSE; - // Move to the item selected by the treeview (don't change right pane) - TreeView_HitTest(m_hWnd, &info); + *phItem = NULL; - if (info.hItem) + HTREEITEM hItem = TreeView_GetFirstVisible(m_hwndTreeView); + HTREEITEM hParent = NULL, tmp; + while (TRUE) { - ++m_mtxBlockNavigate; - TreeView_SelectItem(m_hWnd, info.hItem); - --m_mtxBlockNavigate; - // Delegate to shell folder - if (m_pDropTarget && info.hItem != m_childTargetNode) + CItemData *pItemData = GetItemData(hItem); + if (!pItemData) + { + ERR("Something has gone wrong, no data associated to node\n"); + return FALSE; + } + + // If we found our node, give it back + if (!m_pDesktop->CompareIDs(0, pItemData->absolutePidl, dest)) { - m_pDropTarget = NULL; + if (bSelect) + TreeView_SelectItem(m_hwndTreeView, hItem); + *phItem = hItem; + return TRUE; } - if (info.hItem != m_childTargetNode) + + // Check if we are a parent of the requested item + TVITEMW tvItem; + LPITEMIDLIST relativeChild = ILFindChild(pItemData->absolutePidl, dest); + if (relativeChild) { - nodeInfo = GetNodeInfo(info.hItem); - if (!nodeInfo) - return E_FAIL; -#if 0 - hr = SHBindToParent(nodeInfo->absolutePidl, IID_PPV_ARG(IShellFolder, &pShellFldr), &pChild); - if (!SUCCEEDED(hr)) - return E_FAIL; - hr = pShellFldr->GetUIObjectOf(m_hWnd, 1, &pChild, IID_IDropTarget, NULL, reinterpret_cast<void**>(&pDropTarget)); - if (!SUCCEEDED(hr)) - return E_FAIL; -#endif - if(_ILIsDesktop(nodeInfo->absolutePidl)) - pShellFldr = m_pDesktop; - else + // Notify treeview we have children + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = hItem; + tvItem.cChildren = 1; + TreeView_SetItem(m_hwndTreeView, &tvItem); + + // If we can expand and the node isn't expanded yet, do it + if (bExpand) { - hr = m_pDesktop->BindToObject(nodeInfo->absolutePidl, 0, IID_PPV_ARG(IShellFolder, &pShellFldr)); - if (!SUCCEEDED(hr)) + if (!pItemData->expanded) { - /* Don't allow dnd since we couldn't get our folder object */ - ERR("Can't bind to folder object\n"); - *pdwEffect = DROPEFFECT_NONE; - return E_FAIL; + _InsertSubitems(hItem, pItemData->absolutePidl); + pItemData->expanded = TRUE; } + TreeView_Expand(m_hwndTreeView, hItem, TVE_EXPAND); + } + + // Try to get a child + tmp = TreeView_GetChild(m_hwndTreeView, hItem); + if (tmp) + { + // We have a child, let's continue with it + hParent = hItem; + hItem = tmp; + continue; } - hr = pShellFldr->CreateViewObject(m_hWnd, IID_PPV_ARG(IDropTarget, &m_pDropTarget)); - if (!SUCCEEDED(hr)) + + if (bInsert && pItemData->expanded) { - /* Don't allow dnd since we couldn't get our drop target */ - ERR("Can't get drop target for folder object\n"); - *pdwEffect = DROPEFFECT_NONE; - return E_FAIL; + // Happens when we have to create a subchild inside a child + hItem = _InsertItem(hItem, dest, relativeChild, TRUE); } - hr = m_pDropTarget->DragEnter(m_pCurObject, glfKeyState, pt, pdwEffect); - m_childTargetNode = info.hItem; + + // We end up here, without any children, so we found nothing + // Tell the parent node it has children + ZeroMemory(&tvItem, sizeof(tvItem)); + return FALSE; } - if (m_pDropTarget) + + // Find sibling + tmp = TreeView_GetNextSibling(m_hwndTreeView, hItem); + if (tmp) { - hr = m_pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + hItem = tmp; + continue; } - } - else - { - m_childTargetNode = NULL; - m_pDropTarget = NULL; - *pdwEffect = DROPEFFECT_NONE; - } - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CExplorerBand::DragLeave() -{ - ++m_mtxBlockNavigate; - TreeView_SelectItem(m_hWnd, m_oldSelected); - --m_mtxBlockNavigate; - m_childTargetNode = NULL; - if (m_pCurObject) - { - m_pCurObject = NULL; - } - return S_OK; -} -HRESULT STDMETHODCALLTYPE CExplorerBand::Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) -{ - if (!m_pDropTarget) - return E_FAIL; - m_pDropTarget->Drop(pObj, glfKeyState, pt, pdwEffect); - DragLeave(); - return S_OK; -} + if (bInsert) + { + *phItem = hItem = _InsertItem(hParent, dest, ILFindLastID(dest), TRUE); + return TRUE; + } -// *** IDropSource methods *** -HRESULT STDMETHODCALLTYPE CExplorerBand::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) -{ - if (fEscapePressed) - return DRAGDROP_S_CANCEL; - if ((grfKeyState & MK_LBUTTON) || (grfKeyState & MK_RBUTTON)) - return S_OK; - return DRAGDROP_S_DROP; -} + return FALSE; + } -HRESULT STDMETHODCALLTYPE CExplorerBand::GiveFeedback(DWORD dwEffect) -{ - return DRAGDROP_S_USEDEFAULTCURSORS; + UNREACHABLE; } diff --git a/dll/win32/shdocvw/CExplorerBand.h b/dll/win32/shdocvw/CExplorerBand.h index 5c307deacce..6a2597605f8 100644 --- a/dll/win32/shdocvw/CExplorerBand.h +++ b/dll/win32/shdocvw/CExplorerBand.h @@ -8,185 +8,27 @@ #pragma once -#define WM_USER_SHELLEVENT (WM_USER + 88) +#include "CNSCBand.h" -class CExplorerBand : - public CComCoClass<CExplorerBand, &CLSID_ExplorerBand>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDeskBand, - public IObjectWithSite, - public IInputObject, - public IPersistStream, - public IOleCommandTarget, - public IServiceProvider, - public IBandNavigate, - public IWinEventHandler, - public INamespaceProxy, - public IDispatch, - public IDropSource, - public IDropTarget, - public CWindowImpl<CExplorerBand, CWindow, CControlWinTraits> +class CExplorerBand + : public CNSCBand + , public CComCoClass<CExplorerBand, &CLSID_ExplorerBand> + , public CComObjectRootEx<CComMultiThreadModelNoCS> + , public IDispatch { -private: - class NodeInfo - { - public: - LPITEMIDLIST absolutePidl; - LPITEMIDLIST relativePidl; - BOOL expanded; - }; - - // *** BaseBarSite information *** - CComPtr<IUnknown> m_pSite; - CComPtr<IShellFolder> m_pDesktop; - - // *** tree explorer band stuff *** - BOOL m_fVisible; - BYTE m_mtxBlockNavigate; // A "lock" that prevents internal selection changes to initiate a navigation to the newly selected item. - BOOL m_bFocused; - DWORD m_dwBandID; - BOOL m_isEditing; - HIMAGELIST m_hImageList; - HTREEITEM m_hRoot; - HTREEITEM m_oldSelected; - LPITEMIDLIST m_pidlCurrent; // Note: This is NULL until the first user navigation! - - // *** notification cookies *** - DWORD m_adviseCookie; - ULONG m_shellRegID; - - // *** Drop target information *** - CComPtr<IDropTarget> m_pDropTarget; - HTREEITEM m_childTargetNode; - CComPtr<IDataObject> m_pCurObject; - - void InitializeExplorerBand(); - void DestroyExplorerBand(); - HRESULT ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd); - - // *** notifications handling *** - BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv); - void OnSelectionChanged(LPNMTREEVIEW pnmtv); - BOOL OnTreeItemDeleted(LPNMTREEVIEW pnmtv); - void OnTreeItemDragging(LPNMTREEVIEW pnmtv, BOOL isRightClick); - - // *** ATL event handlers *** - LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - - // *** Helper functions *** - NodeInfo* GetNodeInfo(HTREEITEM hItem); - HRESULT UpdateBrowser(LPITEMIDLIST pidlGoto); - HTREEITEM InsertItem( - _In_opt_ HTREEITEM hParent, - _Inout_ IShellFolder *psfParent, - _In_ LPCITEMIDLIST pElt, - _In_ LPCITEMIDLIST pEltRelative, - _In_ BOOL bSort); - HTREEITEM InsertItem( - _In_opt_ HTREEITEM hParent, - _In_ LPCITEMIDLIST pElt, - _In_ LPCITEMIDLIST pEltRelative, - _In_ BOOL bSort); - BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo); - BOOL NavigateToPIDL(LPCITEMIDLIST dest, HTREEITEM *item, BOOL bExpand, BOOL bInsert, BOOL bSelect); - BOOL NavigateToCurrentFolder(); - HRESULT GetCurrentLocation(PIDLIST_ABSOLUTE &pidl); - HRESULT IsCurrentLocation(PCIDLIST_ABSOLUTE pidl); - void OnChangeNotify( - _In_opt_ LPCITEMIDLIST pidl0, - _In_opt_ LPCITEMIDLIST pidl1, - _In_ LONG lEvent); - void Refresh(); - void RefreshRecurse(_In_ HTREEITEM hItem); - BOOL IsTreeItemInEnum(_In_ HTREEITEM hItem, _In_ IEnumIDList *pEnum); - BOOL TreeItemHasThisChild(_In_ HTREEITEM hItem, _In_ PCITEMID_CHILD pidlChild); - HRESULT GetItemEnum(_Out_ CComPtr<IEnumIDList>& pEnum, _In_ HTREEITEM hItem); - BOOL ItemHasAnyChild(_In_ HTREEITEM hItem); - - // *** Tree item sorting callback *** - static int CALLBACK CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3); - public: CExplorerBand(); virtual ~CExplorerBand(); - // *** IOleWindow methods *** - STDMETHOD(GetWindow)(HWND *lphwnd) override; - STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode) override; - - // *** IDockingWindow methods *** - STDMETHOD(CloseDW)(DWORD dwReserved) override; - STDMETHOD(ResizeBorderDW)(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) override; - STDMETHOD(ShowDW)(BOOL fShow) override; - - // *** IDeskBand methods *** - STDMETHOD(GetBandInfo)(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) override; - - // *** IObjectWithSite methods *** - STDMETHOD(SetSite)(IUnknown *pUnkSite) override; - STDMETHOD(GetSite)(REFIID riid, void **ppvSite) override; - - // *** IOleCommandTarget methods *** - STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) override; - STDMETHOD(Exec)(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override; - - // *** IServiceProvider methods *** - STDMETHOD(QueryService)(REFGUID guidService, REFIID riid, void **ppvObject) override; - - // *** IInputObject methods *** - STDMETHOD(UIActivateIO)(BOOL fActivate, LPMSG lpMsg) override; - STDMETHOD(HasFocusIO)() override; - STDMETHOD(TranslateAcceleratorIO)(LPMSG lpMsg) override; - - // *** IPersist methods *** - STDMETHOD(GetClassID)(CLSID *pClassID) override; - - // *** IPersistStream methods *** - STDMETHOD(IsDirty)() override; - STDMETHOD(Load)(IStream *pStm) override; - STDMETHOD(Save)(IStream *pStm, BOOL fClearDirty) override; - STDMETHOD(GetSizeMax)(ULARGE_INTEGER *pcbSize) override; - - // *** IWinEventHandler methods *** - STDMETHOD(OnWinEvent)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) override; - STDMETHOD(IsWindowOwner)(HWND hWnd) override; - - // *** IBandNavigate methods *** - STDMETHOD(Select)(long paramC) override; - - // *** INamespaceProxy *** - STDMETHOD(GetNavigateTarget)( - _In_ PCIDLIST_ABSOLUTE pidl, - _Out_ PIDLIST_ABSOLUTE ppidlTarget, - _Out_ ULONG *pulAttrib) override; - STDMETHOD(Invoke)(_In_ PCIDLIST_ABSOLUTE pidl) override; - STDMETHOD(OnSelectionChanged)(_In_ PCIDLIST_ABSOLUTE pidl) override; - STDMETHOD(RefreshFlags)( - _Out_ DWORD *pdwStyle, - _Out_ DWORD *pdwExStyle, - _Out_ DWORD *dwEnum) override; - STDMETHOD(CacheItem)(_In_ PCIDLIST_ABSOLUTE pidl) override; + STDMETHODIMP GetClassID(CLSID *pClassID) override; + STDMETHODIMP OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) override; + STDMETHODIMP Invoke(_In_ PCIDLIST_ABSOLUTE pidl) override; // *** IDispatch methods *** - STDMETHOD(GetTypeInfoCount)(UINT *pctinfo) override; - STDMETHOD(GetTypeInfo)(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) override; - STDMETHOD(GetIDsOfNames)(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) override; - STDMETHOD(Invoke)(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) override; - - // *** IDropTarget methods *** - STDMETHOD(DragEnter)(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; - STDMETHOD(DragOver)(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; - STDMETHOD(DragLeave)() override; - STDMETHOD(Drop)(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; - - // *** IDropSource methods *** - STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState) override; - STDMETHOD(GiveFeedback)(DWORD dwEffect) override; + STDMETHODIMP GetTypeInfoCount(UINT *pctinfo) override; + STDMETHODIMP GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) override; + STDMETHODIMP GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) override; + STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) override; DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND) DECLARE_NOT_AGGREGATABLE(CExplorerBand) @@ -194,27 +36,39 @@ public: DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CExplorerBand) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IBandNavigate, IBandNavigate) - COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) - COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) - COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IBandNavigate, IBandNavigate) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY2_IID(IID_IUnknown, IUnknown, IDispatch) END_COM_MAP() - BEGIN_MSG_MAP(CExplorerBand) - MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) - MESSAGE_HANDLER(WM_USER_SHELLEVENT, OnShellEvent) - MESSAGE_HANDLER(WM_RBUTTONDOWN, ContextMenuHack) - MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) - MESSAGE_HANDLER(WM_TIMER, OnTimer) - // MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) - END_MSG_MAP() +protected: + INT _GetRootCsidl() override; + DWORD _GetTVStyle() override; + DWORD _GetTVExStyle() override; + DWORD _GetEnumFlags() override; + HRESULT _CreateTreeView(HWND hwndParent) override; + void _DestroyTreeView() override; + BOOL _WantsRootItem() override; + BOOL _GetTitle(LPWSTR pszTitle, INT cchTitle) override; + void _SortItems(HTREEITEM hParent) override; + BOOL _NavigateToCurrentFolder(); + BOOL _NavigateToPIDL( + _In_ LPCITEMIDLIST dest, + _Out_ HTREEITEM *phItem, + _In_ BOOL bExpand, + _In_ BOOL bInsert, + _In_ BOOL bSelect); + static INT CALLBACK _CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3); // Used by _SortItems }; diff --git a/dll/win32/shdocvw/CFavBand.cpp b/dll/win32/shdocvw/CFavBand.cpp index bc00c3943bb..b79f2e27be2 100644 --- a/dll/win32/shdocvw/CFavBand.cpp +++ b/dll/win32/shdocvw/CFavBand.cpp @@ -11,40 +11,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); CFavBand::CFavBand() - : m_fVisible(FALSE) - , m_bFocused(FALSE) - , m_dwBandID(0) - , m_hToolbarImageList(NULL) - , m_hTreeViewImageList(NULL) { - SHDOCVW_LockModule(); - SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &m_pidlFav); } CFavBand::~CFavBand() { - if (m_hToolbarImageList) - { - ImageList_Destroy(m_hToolbarImageList); - m_hToolbarImageList = NULL; - } - if (m_hTreeViewImageList) +} + +STDMETHODIMP CFavBand::GetClassID(CLSID *pClassID) +{ + if (!pClassID) + return E_POINTER; + *pClassID = CLSID_SH_FavBand; + return S_OK; +} + +INT CFavBand::_GetRootCsidl() +{ + return CSIDL_FAVORITES; +} + +DWORD CFavBand::_GetTVStyle() +{ + // Remove TVS_SINGLEEXPAND for now since it has strange behaviour + return TVS_NOHSCROLL | TVS_NONEVENHEIGHT | TVS_FULLROWSELECT | TVS_INFOTIP | + /*TVS_SINGLEEXPAND | TVS_TRACKSELECT |*/ TVS_SHOWSELALWAYS | TVS_EDITLABELS | + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP; +} + +DWORD CFavBand::_GetTVExStyle() +{ + return WS_EX_CLIENTEDGE; +} + +DWORD CFavBand::_GetEnumFlags() +{ + return SHCONTF_FOLDERS | SHCONTF_NONFOLDERS; +} + +BOOL CFavBand::_GetTitle(LPWSTR pszTitle, INT cchTitle) +{ +#define IDS_FAVORITES 47 // Borrowed from shell32.dll + HINSTANCE hShell32 = ::LoadLibraryExW(L"shell32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hShell32) { - ImageList_Destroy(m_hTreeViewImageList); - m_hTreeViewImageList = NULL; + ::LoadStringW(hShell32, IDS_FAVORITES, pszTitle, cchTitle); + ::FreeLibrary(hShell32); + return TRUE; } - SHDOCVW_UnlockModule(); + return FALSE; +#undef IDS_FAVORITES } -VOID CFavBand::OnFinalMessage(HWND) +BOOL CFavBand::_WantsRootItem() { - // The message loop is finished, now we can safely destruct! - Release(); + return FALSE; } -// *** helper methods *** - -BOOL CFavBand::CreateToolbar() +HRESULT CFavBand::_CreateToolbar(HWND hwndParent) { #define IDB_SHELL_EXPLORER_SM 216 // Borrowed from browseui.dll HINSTANCE hinstBrowseUI = LoadLibraryExW(L"browseui.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -58,23 +82,23 @@ BOOL CFavBand::CreateToolbar() #undef IDB_SHELL_EXPLORER_SM ATLASSERT(hbmToolbar); if (!hbmToolbar) - return FALSE; + return E_FAIL; m_hToolbarImageList = ImageList_Create(16, 16, ILC_COLOR32, 0, 8); ATLASSERT(m_hToolbarImageList); if (!m_hToolbarImageList) - return FALSE; + return E_FAIL; ImageList_Add(m_hToolbarImageList, hbmToolbar, NULL); DeleteObject(hbmToolbar); DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NODIVIDER | TBSTYLE_WRAPABLE; - HWND hwndTB = ::CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, 0, 0, 0, 0, m_hWnd, - (HMENU)(LONG_PTR)IDW_TOOLBAR, instance, NULL); + HWND hwndTB = ::CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, 0, 0, 0, 0, hwndParent, + (HMENU)UlongToHandle(IDW_TOOLBAR), instance, NULL); ATLASSERT(hwndTB); if (!hwndTB) - return FALSE; + return E_FAIL; m_hwndToolbar.Attach(hwndTB); m_hwndToolbar.SendMessage(TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); @@ -102,480 +126,57 @@ BOOL CFavBand::CreateToolbar() tbb[iButton].iString = (INT)m_hwndToolbar.SendMessage(TB_ADDSTRING, 0, (LPARAM)szzOrganize); ++iButton; ATLASSERT(iButton == _countof(tbb)); + m_hwndToolbar.SendMessage(TB_ADDBUTTONS, iButton, (LPARAM)&tbb); - LRESULT ret = m_hwndToolbar.SendMessage(TB_ADDBUTTONS, iButton, (LPARAM)&tbb); - ATLASSERT(ret); - - return ret; -} - -BOOL CFavBand::CreateTreeView() -{ - m_hTreeViewImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 64, 0); - ATLASSERT(m_hTreeViewImageList); - if (!m_hTreeViewImageList) - return FALSE; - - DWORD style = TVS_NOHSCROLL | TVS_NONEVENHEIGHT | TVS_FULLROWSELECT | TVS_INFOTIP | - TVS_SINGLEEXPAND | TVS_TRACKSELECT | TVS_SHOWSELALWAYS | TVS_EDITLABELS | - WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP; - HWND hwndTV = ::CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, NULL, style, 0, 0, 0, 0, - m_hWnd, (HMENU)(ULONG_PTR)IDW_TREEVIEW, instance, NULL); - ATLASSERT(hwndTV); - if (!hwndTV) - return FALSE; - - m_hwndTreeView.Attach(hwndTV); - TreeView_SetImageList(m_hwndTreeView, m_hTreeViewImageList, TVSIL_NORMAL); - - return TRUE; -} - -// *** message handlers *** - -LRESULT CFavBand::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - INITCOMMONCONTROLSEX iccx = { sizeof(iccx), ICC_TREEVIEW_CLASSES | ICC_BAR_CLASSES }; - if (!::InitCommonControlsEx(&iccx) || !CreateToolbar() || !CreateTreeView()) - return -1; - - return 0; -} - -LRESULT CFavBand::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - m_hwndTreeView.DestroyWindow(); - m_hwndToolbar.DestroyWindow(); - return 0; -} - -LRESULT CFavBand::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (!m_hwndTreeView) - return 0; - - RECT rc; - GetClientRect(&rc); - LONG cx = rc.right, cy = rc.bottom; - - RECT rcTB; - m_hwndToolbar.SendMessage(TB_AUTOSIZE, 0, 0); - m_hwndToolbar.GetWindowRect(&rcTB); - - LONG cyTB = rcTB.bottom - rcTB.top; - m_hwndTreeView.MoveWindow(0, cyTB, cx, cy - cyTB); - - return 0; -} - -LRESULT CFavBand::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - m_bFocused = TRUE; - IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), TRUE); - return 0; -} - -LRESULT CFavBand::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), FALSE); - m_bFocused = FALSE; - return 0; -} - -LRESULT CFavBand::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - switch (LOWORD(wParam)) - { - case ID_ADD: - { - UNIMPLEMENTED; - SHELL_ErrorBox(m_hWnd, ERROR_NOT_SUPPORTED); - break; - } - case ID_ORGANIZE: - { - SHELLEXECUTEINFOW sei = { sizeof(sei), SEE_MASK_IDLIST }; - sei.hwnd = m_hWnd; - sei.nShow = SW_SHOWNORMAL; - sei.lpIDList = m_pidlFav; - ::ShellExecuteExW(&sei); - break; - } - } - return 0; -} - -// *** IOleWindow *** - -STDMETHODIMP CFavBand::GetWindow(HWND *lphwnd) -{ - if (!lphwnd) - return E_INVALIDARG; - *lphwnd = m_hWnd; return S_OK; } -STDMETHODIMP CFavBand::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IDockingWindow *** - -STDMETHODIMP CFavBand::CloseDW(DWORD dwReserved) -{ - // We do nothing, we don't have anything to save yet - TRACE("CloseDW called\n"); - return S_OK; -} - -STDMETHODIMP CFavBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) -{ - /* Must return E_NOTIMPL according to MSDN */ - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::ShowDW(BOOL fShow) -{ - m_fVisible = fShow; - ShowWindow(fShow ? SW_SHOW : SW_HIDE); - return S_OK; -} - -// *** IDeskBand *** - -STDMETHODIMP CFavBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +// Called when the user has selected an item. +STDMETHODIMP CFavBand::OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) { - if (!pdbi) - return E_INVALIDARG; + CComHeapPtr<ITEMIDLIST> pidlTarget; + DWORD attrs = SFGAO_FOLDER | SFGAO_LINK; + HRESULT hr = GetNavigateTarget(pidl, &pidlTarget, &attrs); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - m_dwBandID = dwBandID; + if ((attrs & (SFGAO_FOLDER | SFGAO_LINK)) == (SFGAO_FOLDER | SFGAO_LINK)) + return _UpdateBrowser(pidlTarget); - if (pdbi->dwMask & DBIM_MINSIZE) + if (attrs & SFGAO_FOLDER) { - pdbi->ptMinSize.x = 200; - pdbi->ptMinSize.y = 30; - } - - if (pdbi->dwMask & DBIM_MAXSIZE) - pdbi->ptMaxSize.y = -1; - - if (pdbi->dwMask & DBIM_INTEGRAL) - pdbi->ptIntegral.y = 1; - - if (pdbi->dwMask & DBIM_ACTUAL) - { - pdbi->ptActual.x = 200; - pdbi->ptActual.y = 30; - } - - if (pdbi->dwMask & DBIM_TITLE) - { -#define IDS_FAVORITES 47 // Borrowed from shell32.dll - HINSTANCE hShell32 = LoadLibraryExW(L"shell32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); - if (hShell32) + HTREEITEM hItem = TreeView_GetSelection(m_hwndTreeView); + CItemData *pItemData = GetItemData(hItem); + if (pItemData && !pItemData->expanded) { - LoadStringW(hShell32, IDS_FAVORITES, pdbi->wszTitle, _countof(pdbi->wszTitle)); - FreeLibrary(hShell32); + _InsertSubitems(hItem, pItemData->absolutePidl); + pItemData->expanded = TRUE; } -#undef IDS_FAVORITES - } - - if (pdbi->dwMask & DBIM_MODEFLAGS) - pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; - - if (pdbi->dwMask & DBIM_BKCOLOR) - pdbi->dwMask &= ~DBIM_BKCOLOR; - - return S_OK; -} - -// *** IObjectWithSite *** - -STDMETHODIMP CFavBand::SetSite(IUnknown *pUnkSite) -{ - HRESULT hr; - - if (pUnkSite == m_pSite) - return S_OK; - - TRACE("SetSite called\n"); - - if (!pUnkSite) - { - DestroyWindow(); - m_hWnd = NULL; - } - - if (pUnkSite != m_pSite) - m_pSite = NULL; - - if (!pUnkSite) - return S_OK; - - HWND hwndParent; - hr = IUnknown_GetWindow(pUnkSite, &hwndParent); - if (!SUCCEEDED(hr)) - { - ERR("Could not get parent's window! 0x%08lX\n", hr); - return E_INVALIDARG; - } - - m_pSite = pUnkSite; - - if (m_hWnd) - { - SetParent(hwndParent); // Change its parent - } - else - { - this->Create(hwndParent, NULL, NULL, WS_CHILD | WS_VISIBLE, 0, (UINT)0, NULL); - } - - return S_OK; -} - -STDMETHODIMP CFavBand::GetSite(REFIID riid, void **ppvSite) -{ - if (!ppvSite) - return E_POINTER; - *ppvSite = m_pSite; - return S_OK; -} - -// *** IOleCommandTarget *** - -STDMETHODIMP CFavBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IServiceProvider *** - -STDMETHODIMP CFavBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IServiceProvider *** - -STDMETHODIMP CFavBand::QueryContextMenu( - HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::InvokeCommand( - LPCMINVOKECOMMANDINFO lpici) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::GetCommandString( - UINT_PTR idCmd, - UINT uType, - UINT *pwReserved, - LPSTR pszName, - UINT cchMax) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IInputObject *** - -STDMETHODIMP CFavBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) -{ - if (fActivate) - { - //SetFocus(); - SetActiveWindow(); - } - - if (lpMsg) - { - TranslateMessage(lpMsg); - DispatchMessage(lpMsg); - } - - return S_OK; -} - -STDMETHODIMP CFavBand::HasFocusIO() -{ - return m_bFocused ? S_OK : S_FALSE; -} - -STDMETHODIMP CFavBand::TranslateAcceleratorIO(LPMSG lpMsg) -{ - if (lpMsg->hwnd == m_hWnd) - { - TranslateMessage(lpMsg); - DispatchMessage(lpMsg); + TreeView_Expand(m_hwndTreeView, hItem, TVE_EXPAND); return S_OK; } - return S_FALSE; -} - -// *** IPersist *** - -STDMETHODIMP CFavBand::GetClassID(CLSID *pClassID) -{ - if (!pClassID) - return E_POINTER; - *pClassID = CLSID_SH_FavBand; - return S_OK; + SHELLEXECUTEINFOW info = { sizeof(info) }; + info.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_IDLIST; + info.hwnd = m_hWnd; + info.nShow = SW_SHOWNORMAL; + info.lpIDList = pidlTarget; + ShellExecuteExW(&info); + return hr; } - -// *** IPersistStream *** - -STDMETHODIMP CFavBand::IsDirty() +void CFavBand::_SortItems(HTREEITEM hParent) { - UNIMPLEMENTED; - return E_NOTIMPL; + TreeView_SortChildren(m_hwndTreeView, hParent, 0); // Sort by name } -STDMETHODIMP CFavBand::Load(IStream *pStm) +HRESULT CFavBand::_CreateTreeView(HWND hwndParent) { - UNIMPLEMENTED; - return E_NOTIMPL; -} + HRESULT hr = CNSCBand::_CreateTreeView(hwndParent); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -STDMETHODIMP CFavBand::Save(IStream *pStm, BOOL fClearDirty) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::GetSizeMax(ULARGE_INTEGER *pcbSize) -{ - // TODO: calculate max size - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IWinEventHandler *** - -STDMETHODIMP CFavBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::IsWindowOwner(HWND hWnd) -{ - return (hWnd == m_hWnd) ? S_OK : S_FALSE; -} - -// *** IBandNavigate *** - -STDMETHODIMP CFavBand::Select(long paramC) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** INamespaceProxy *** - -/// Returns the ITEMIDLIST that should be navigated when an item is invoked. -STDMETHODIMP CFavBand::GetNavigateTarget( - _In_ PCIDLIST_ABSOLUTE pidl, - _Out_ PIDLIST_ABSOLUTE ppidlTarget, - _Out_ ULONG *pulAttrib) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -/// Handles a user action on an item. -STDMETHODIMP CFavBand::Invoke(_In_ PCIDLIST_ABSOLUTE pidl) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -/// Called when the user has selected an item. -STDMETHODIMP CFavBand::OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -/// Returns flags used to update the tree control. -STDMETHODIMP CFavBand::RefreshFlags( - _Out_ DWORD *pdwStyle, - _Out_ DWORD *pdwExStyle, - _Out_ DWORD *dwEnum) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::CacheItem( - _In_ PCIDLIST_ABSOLUTE pidl) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -// *** IDispatch *** - -STDMETHODIMP CFavBand::GetTypeInfoCount(UINT *pctinfo) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::GetIDsOfNames( - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -STDMETHODIMP CFavBand::Invoke( - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) -{ - switch (dispIdMember) - { - case DISPID_DOWNLOADCOMPLETE: - case DISPID_NAVIGATECOMPLETE2: - // FIXME: Update current location - return S_OK; - } - return E_INVALIDARG; + TreeView_SetItemHeight(m_hwndTreeView, 24); + _InsertSubitems(TVI_ROOT, m_pidlRoot); + return hr; } diff --git a/dll/win32/shdocvw/CFavBand.h b/dll/win32/shdocvw/CFavBand.h index 1b91e04779c..62619096491 100644 --- a/dll/win32/shdocvw/CFavBand.h +++ b/dll/win32/shdocvw/CFavBand.h @@ -7,129 +7,27 @@ #pragma once -#define FAVBANDCLASSNAME L"ReactOS Favorites Band" - #ifdef __cplusplus + +#include "CNSCBand.h" + class CFavBand - : public CComCoClass<CFavBand, &CLSID_SH_FavBand> + : public CNSCBand + , public CComCoClass<CFavBand, &CLSID_SH_FavBand> , public CComObjectRootEx<CComMultiThreadModelNoCS> - , public CWindowImpl<CFavBand> - , public IDispatch - , public IDeskBand - , public IObjectWithSite - , public IInputObject - , public IPersistStream - , public IOleCommandTarget - , public IServiceProvider - , public IContextMenu - , public IBandNavigate - , public IWinEventHandler - , public INamespaceProxy { public: - DECLARE_WND_CLASS_EX(FAVBANDCLASSNAME, 0, COLOR_3DFACE) - static LPCWSTR GetWndClassName() { return FAVBANDCLASSNAME; } - CFavBand(); virtual ~CFavBand(); - // *** IOleWindow methods *** - STDMETHODIMP GetWindow(HWND *lphwnd) override; - STDMETHODIMP ContextSensitiveHelp(BOOL fEnterMode) override; - - // *** IDockingWindow methods *** - STDMETHODIMP CloseDW(DWORD dwReserved) override; - STDMETHODIMP ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) override; - STDMETHODIMP ShowDW(BOOL fShow) override; - - // *** IDeskBand methods *** - STDMETHODIMP GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) override; - - // *** IObjectWithSite methods *** - STDMETHODIMP SetSite(IUnknown *pUnkSite) override; - STDMETHODIMP GetSite(REFIID riid, void **ppvSite) override; - - // *** IOleCommandTarget methods *** - STDMETHODIMP QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) override; - STDMETHODIMP Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override; - - // *** IServiceProvider methods *** - STDMETHODIMP QueryService(REFGUID guidService, REFIID riid, void **ppvObject) override; - - // *** IContextMenu methods *** - STDMETHODIMP QueryContextMenu( - HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) override; - STDMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpici) override; - STDMETHODIMP GetCommandString( - UINT_PTR idCmd, - UINT uType, - UINT *pwReserved, - LPSTR pszName, - UINT cchMax) override; - - // *** IInputObject methods *** - STDMETHODIMP UIActivateIO(BOOL fActivate, LPMSG lpMsg) override; - STDMETHODIMP HasFocusIO() override; - STDMETHODIMP TranslateAcceleratorIO(LPMSG lpMsg) override; - - // *** IPersist methods *** STDMETHODIMP GetClassID(CLSID *pClassID) override; - - // *** IPersistStream methods *** - STDMETHODIMP IsDirty() override; - STDMETHODIMP Load(IStream *pStm) override; - STDMETHODIMP Save(IStream *pStm, BOOL fClearDirty) override; - STDMETHODIMP GetSizeMax(ULARGE_INTEGER *pcbSize) override; - - // *** IWinEventHandler methods *** - STDMETHODIMP OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) override; - STDMETHODIMP IsWindowOwner(HWND hWnd) override; - - // *** IBandNavigate methods *** - STDMETHODIMP Select(long paramC) override; - - // *** INamespaceProxy methods *** - STDMETHODIMP GetNavigateTarget( - _In_ PCIDLIST_ABSOLUTE pidl, - _Out_ PIDLIST_ABSOLUTE ppidlTarget, - _Out_ ULONG *pulAttrib) override; - STDMETHODIMP Invoke(_In_ PCIDLIST_ABSOLUTE pidl) override; - STDMETHODIMP OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) override; - STDMETHODIMP RefreshFlags( - _Out_ DWORD *pdwStyle, - _Out_ DWORD *pdwExStyle, - _Out_ DWORD *dwEnum) override; - STDMETHODIMP CacheItem(_In_ PCIDLIST_ABSOLUTE pidl) override; - - // *** IDispatch methods *** - STDMETHODIMP GetTypeInfoCount(UINT *pctinfo) override; - STDMETHODIMP GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) override; - STDMETHODIMP GetIDsOfNames( - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId) override; - STDMETHODIMP Invoke( - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) override; + STDMETHODIMP OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl); DECLARE_REGISTRY_RESOURCEID(IDR_FAVBAND) DECLARE_NOT_AGGREGATABLE(CFavBand) DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CFavBand) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) @@ -146,38 +44,16 @@ public: COM_INTERFACE_ENTRY_IID(IID_INamespaceProxy, INamespaceProxy) END_COM_MAP() - BEGIN_MSG_MAP(CFavBand) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) - MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) - MESSAGE_HANDLER(WM_COMMAND, OnCommand) - END_MSG_MAP() - protected: - BOOL m_fVisible; - BOOL m_bFocused; - DWORD m_dwBandID; - CComPtr<IUnknown> m_pSite; - CComHeapPtr<ITEMIDLIST> m_pidlFav; - HIMAGELIST m_hToolbarImageList; - HIMAGELIST m_hTreeViewImageList; - CToolbar<> m_hwndToolbar; - CTreeView m_hwndTreeView; - - VOID OnFinalMessage(HWND) override; - - // *** helper methods *** - BOOL CreateToolbar(); - BOOL CreateTreeView(); - - // *** message handlers *** - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + INT _GetRootCsidl() override; + DWORD _GetTVStyle() override; + DWORD _GetTVExStyle() override; + DWORD _GetEnumFlags() override; + BOOL _GetTitle(LPWSTR pszTitle, INT cchTitle) override; + HRESULT _CreateTreeView(HWND hwndParent) override; + HRESULT _CreateToolbar(HWND hwndParent) override; + BOOL _WantsRootItem() override; + void _SortItems(HTREEITEM hParent) override; }; + #endif // def __cplusplus diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 71ab7e8ddb3..764663a42ed 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -34,6 +34,7 @@ add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) add_library(shdocvw_sublib OBJECT CExplorerBand.cpp CFavBand.cpp + CNSCBand.cpp mrulist.cpp objects.cpp utility.cpp) diff --git a/dll/win32/shdocvw/CNSCBand.cpp b/dll/win32/shdocvw/CNSCBand.cpp new file mode 100644 index 00000000000..976acb50a7d --- /dev/null +++ b/dll/win32/shdocvw/CNSCBand.cpp @@ -0,0 +1,1487 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: NameSpace Control Band + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "objects.h" +#include <shlobj.h> +#include <commoncontrols.h> +#include <undocshell.h> + +#define TIMER_ID_REFRESH 9999 + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +HRESULT +SHDOCVW_GetPathOfShortcut( + _In_opt_ HWND hWnd, + _In_ LPCWSTR pszLnkFile, + _Out_ LPWSTR pszPath) +{ + *pszPath = UNICODE_NULL; + CComPtr<IShellLink> pShellLink; + HRESULT hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellLink, &pShellLink)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IPersistFile> pPersistFile; + hr = pShellLink->QueryInterface(IID_PPV_ARG(IPersistFile, &pPersistFile)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pPersistFile->Load(pszLnkFile, STGM_READ); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + WIN32_FIND_DATA find; + hr = pShellLink->GetPath(pszPath, MAX_PATH, &find, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +HRESULT +SHDOCVW_CreateShortcut( + _In_ LPCWSTR pszLnkFileName, + _In_ PCIDLIST_ABSOLUTE pidlTarget, + _In_opt_ LPCWSTR pszDescription) +{ + HRESULT hr; + + CComPtr<IShellLink> psl; + hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellLink, &psl)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + psl->SetIDList(pidlTarget); + + if (pszDescription) + psl->SetDescription(pszDescription); + + CComPtr<IPersistFile> ppf; + hr = psl->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return ppf->Save(pszLnkFileName, TRUE); +} + +CNSCBand::CNSCBand() +{ + SHDOCVW_LockModule(); + + INITCOMMONCONTROLSEX iccx = { sizeof(iccx), ICC_TREEVIEW_CLASSES | ICC_BAR_CLASSES }; + ::InitCommonControlsEx(&iccx); +} + +CNSCBand::~CNSCBand() +{ + if (m_hToolbarImageList) + { + ImageList_Destroy(m_hToolbarImageList); + m_hToolbarImageList = NULL; + } + SHDOCVW_UnlockModule(); +} + +VOID CNSCBand::OnFinalMessage(HWND) +{ + // The message loop is finished, now we can safely destruct! + static_cast<IDeskBand *>(this)->Release(); +} + +// *** helper methods *** + +CNSCBand::CItemData* CNSCBand::GetItemData(_In_ HTREEITEM hItem) +{ + if (hItem == TVI_ROOT) + return NULL; + + TVITEMW tvItem = { TVIF_PARAM, hItem }; + if (!TreeView_GetItem(m_hwndTreeView, &tvItem)) + return NULL; + + return reinterpret_cast<CItemData*>(tvItem.lParam); +} + +static HRESULT +SHDOCVW_GetCurrentLocationFromView(_In_ IShellView& View, _In_ PIDLIST_ABSOLUTE *ppidl) +{ + CComPtr<IFolderView> pfv; + CComPtr<IShellFolder> psf; + HRESULT hr = View.QueryInterface(IID_PPV_ARG(IFolderView, &pfv)); + if (SUCCEEDED(hr) && SUCCEEDED(hr = pfv->GetFolder(IID_PPV_ARG(IShellFolder, &psf)))) + hr = SHELL_GetIDListFromObject(psf, ppidl); + return hr; +} + +HRESULT CNSCBand::_GetCurrentLocation(_Out_ PIDLIST_ABSOLUTE *ppidl) +{ + *ppidl = NULL; + CComPtr<IShellBrowser> psb; + HRESULT hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IBrowserService> pbs; + if (SUCCEEDED(hr = psb->QueryInterface(IID_PPV_ARG(IBrowserService, &pbs)))) + if (SUCCEEDED(hr = pbs->GetPidl(ppidl)) && *ppidl) + return hr; + + CComPtr<IShellView> psv; + if (!FAILED_UNEXPECTEDLY(hr = psb->QueryActiveShellView(&psv))) + if (SUCCEEDED(hr = psv.p ? SHDOCVW_GetCurrentLocationFromView(*psv.p, ppidl) : E_FAIL)) + return hr; + return hr; +} + +HRESULT CNSCBand::_IsCurrentLocation(_In_ PCIDLIST_ABSOLUTE pidl) +{ + if (!pidl) + return E_INVALIDARG; + HRESULT hr = E_FAIL; + PIDLIST_ABSOLUTE location = NULL; + hr = _GetCurrentLocation(&location); + if (SUCCEEDED(hr)) + hr = SHELL_IsEqualAbsoluteID(location, pidl) ? S_OK : S_FALSE; + ILFree(location); + return hr; +} + +HRESULT CNSCBand::_ExecuteCommand(_In_ CComPtr<IContextMenu>& menu, _In_ UINT nCmd) +{ + CComPtr<IOleWindow> pBrowserOleWnd; + HRESULT hr = IUnknown_QueryService(m_pSite, SID_SShellBrowser, + IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + HWND browserWnd; + hr = pBrowserOleWnd->GetWindow(&browserWnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CMINVOKECOMMANDINFO cmi = { sizeof(cmi) }; + cmi.lpVerb = MAKEINTRESOURCEA(nCmd); + cmi.hwnd = browserWnd; + if (::GetKeyState(VK_SHIFT) < 0) + cmi.fMask |= CMIC_MASK_SHIFT_DOWN; + if (::GetKeyState(VK_CONTROL) < 0) + cmi.fMask |= CMIC_MASK_CONTROL_DOWN; + + return menu->InvokeCommand(&cmi); +} + +void CNSCBand::_RegisterChangeNotify() +{ +#define TARGET_EVENTS ( \ + SHCNE_DRIVEADD | SHCNE_MKDIR | SHCNE_CREATE | SHCNE_DRIVEREMOVED | SHCNE_RMDIR | \ + SHCNE_DELETE | SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEDIR | \ + SHCNE_UPDATEITEM | SHCNE_ASSOCCHANGED \ +) + // Register shell notification + SHChangeNotifyEntry shcne = { m_pidlRoot, TRUE }; + m_shellRegID = SHChangeNotifyRegister(m_hWnd, + SHCNRF_NewDelivery | SHCNRF_ShellLevel, + TARGET_EVENTS, + WM_USER_SHELLEVENT, + 1, &shcne); + if (!m_shellRegID) + { + ERR("Something went wrong, error %08x\n", GetLastError()); + } +} + +void CNSCBand::_UnregisterChangeNotify() +{ + SHChangeNotifyDeregister(m_shellRegID); + m_shellRegID = 0; +} + +void CNSCBand::_DestroyTreeView() +{ + TRACE("Cleaning up treeview...\n"); + /* Remove all items of the treeview */ + ::RevokeDragDrop(m_hwndTreeView); + TreeView_DeleteAllItems(m_hwndTreeView); + m_hwndTreeView.DestroyWindow(); + m_pDesktop = NULL; + m_hRoot = NULL; + TRACE("Cleanup ok\n"); +} + +void CNSCBand::_DestroyToolbar() +{ + m_hwndToolbar.DestroyWindow(); +} + +HRESULT CNSCBand::_CreateTreeView(HWND hwndParent) +{ + RefreshFlags(&m_dwTVStyle, &m_dwTVExStyle, &m_dwEnumFlags); + HWND hwndTV = ::CreateWindowExW(m_dwTVExStyle, WC_TREEVIEWW, NULL, m_dwTVStyle, 0, 0, 0, 0, + hwndParent, (HMENU)UlongToHandle(IDW_TREEVIEW), instance, NULL); + ATLASSERT(hwndTV); + if (!hwndTV) + return E_FAIL; + + m_hwndTreeView.Attach(hwndTV); + ::RegisterDragDrop(m_hwndTreeView, dynamic_cast<IDropTarget*>(this)); + + // Init the treeview here + HRESULT hr = SHGetDesktopFolder(&m_pDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + m_pidlRoot.Free(); + hr = SHGetFolderLocation(m_hWnd, _GetRootCsidl(), NULL, 0, &m_pidlRoot); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + // Create image list and set + IImageList *piml; + hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + TreeView_SetImageList(m_hwndTreeView, (HIMAGELIST)piml, TVSIL_NORMAL); + return S_OK; +} + +BOOL +CNSCBand::_IsTreeItemInEnum( + _In_ HTREEITEM hItem, + _In_ IEnumIDList *pEnum) +{ + CItemData* pItemData = GetItemData(hItem); + if (!pItemData) + return FALSE; + + pEnum->Reset(); + + CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; + while (pEnum->Next(1, &pidlTemp, NULL) == S_OK) + { + if (ILIsEqual(pidlTemp, pItemData->relativePidl)) + return TRUE; + + pidlTemp.Free(); + } + + return FALSE; +} + +BOOL +CNSCBand::_TreeItemHasThisChild( + _In_ HTREEITEM hItem, + _In_ PCITEMID_CHILD pidlChild) +{ + for (hItem = TreeView_GetChild(m_hwndTreeView, hItem); hItem; + hItem = TreeView_GetNextSibling(m_hwndTreeView, hItem)) + { + CItemData* pItemData = GetItemData(hItem); + if (ILIsEqual(pItemData->relativePidl, pidlChild)) + return TRUE; + } + + return FALSE; +} + +HRESULT +CNSCBand::_GetItemEnum( + _Out_ CComPtr<IEnumIDList>& pEnum, + _In_ HTREEITEM hItem, + _Out_opt_ IShellFolder **ppFolder) +{ + CComPtr<IShellFolder> psfDesktop; + HRESULT hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolder> pFolder; + if (!ppFolder) + ppFolder = &pFolder; + + if (hItem == m_hRoot && hItem) + { + *ppFolder = psfDesktop; + (*ppFolder)->AddRef(); + } + else + { + CItemData* pItemData = GetItemData(hItem); + if (!pItemData && hItem == TVI_ROOT && !_WantsRootItem()) + hr = psfDesktop->BindToObject(m_pidlRoot, NULL, IID_PPV_ARG(IShellFolder, ppFolder)); + else + hr = psfDesktop->BindToObject(pItemData->absolutePidl, NULL, IID_PPV_ARG(IShellFolder, ppFolder)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + + return (*ppFolder)->EnumObjects(NULL, _GetEnumFlags(), &pEnum); +} + +BOOL CNSCBand::_ItemHasAnyChild(_In_ HTREEITEM hItem) +{ + CComPtr<IEnumIDList> pEnum; + HRESULT hr = _GetItemEnum(pEnum, hItem); + if (FAILED(hr)) + return FALSE; + + CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; + hr = pEnum->Next(1, &pidlTemp, NULL); + return SUCCEEDED(hr); +} + +void CNSCBand::_RefreshRecurse(_In_ HTREEITEM hTarget) +{ + CComPtr<IEnumIDList> pEnum; + HRESULT hrEnum = _GetItemEnum(pEnum, hTarget); + + // Delete zombie items + HTREEITEM hItem, hNextItem; + for (hItem = TreeView_GetChild(m_hwndTreeView, hTarget); hItem; hItem = hNextItem) + { + hNextItem = TreeView_GetNextSibling(m_hwndTreeView, hItem); + + if (SUCCEEDED(hrEnum) && !_IsTreeItemInEnum(hItem, pEnum)) + TreeView_DeleteItem(m_hwndTreeView, hItem); + } + + pEnum = NULL; + hrEnum = _GetItemEnum(pEnum, hTarget); + + CItemData* pItemData = ((hTarget == TVI_ROOT) ? NULL : GetItemData(hTarget)); + + // Insert new items and update items + if (SUCCEEDED(hrEnum)) + { + CComHeapPtr<ITEMIDLIST_RELATIVE> pidlTemp; + while (pEnum->Next(1, &pidlTemp, NULL) == S_OK) + { + if (!_TreeItemHasThisChild(hTarget, pidlTemp)) + { + if (pItemData) + { + CComHeapPtr<ITEMIDLIST> pidlAbsolute(ILCombine(pItemData->absolutePidl, pidlTemp)); + _InsertItem(hTarget, pidlAbsolute, pidlTemp, TRUE); + } + else + { + CComHeapPtr<ITEMIDLIST> pidlAbsolute(ILCombine(m_pidlRoot, pidlTemp)); + _InsertItem(hTarget, pidlAbsolute, pidlTemp, TRUE); + } + } + pidlTemp.Free(); + } + } + + // Update children and recurse + for (hItem = TreeView_GetChild(m_hwndTreeView, hTarget); hItem; hItem = hNextItem) + { + hNextItem = TreeView_GetNextSibling(m_hwndTreeView, hItem); + + TV_ITEMW item = { TVIF_HANDLE | TVIF_CHILDREN }; + item.hItem = hItem; + item.cChildren = _ItemHasAnyChild(hItem); + TreeView_SetItem(m_hwndTreeView, &item); + + if (TreeView_GetItemState(m_hwndTreeView, hItem, TVIS_EXPANDEDONCE) & TVIS_EXPANDEDONCE) + _RefreshRecurse(hItem); + } +} + +void CNSCBand::_Refresh() +{ + m_hwndTreeView.SendMessage(WM_SETREDRAW, FALSE, 0); + _RefreshRecurse(_WantsRootItem() ? m_hRoot : TVI_ROOT); + m_hwndTreeView.SendMessage(WM_SETREDRAW, TRUE, 0); +} + +LRESULT CNSCBand::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + KillTimer(wParam); + + if (wParam == TIMER_ID_REFRESH) + _Refresh(); + + return 0; +} + +void +CNSCBand::OnChangeNotify( + _In_opt_ LPCITEMIDLIST pidl0, + _In_opt_ LPCITEMIDLIST pidl1, + _In_ LONG lEvent) +{ + switch (lEvent) + { + case SHCNE_DRIVEADD: + case SHCNE_MKDIR: + case SHCNE_CREATE: + case SHCNE_DRIVEREMOVED: + case SHCNE_RMDIR: + case SHCNE_DELETE: + case SHCNE_RENAMEFOLDER: + case SHCNE_RENAMEITEM: + case SHCNE_UPDATEDIR: + case SHCNE_UPDATEITEM: + case SHCNE_ASSOCCHANGED: + { + KillTimer(TIMER_ID_REFRESH); + SetTimer(TIMER_ID_REFRESH, 500, NULL); + break; + } + default: + { + TRACE("lEvent: 0x%08lX\n", lEvent); + break; + } + } +} + +HTREEITEM +CNSCBand::_InsertItem( + _In_opt_ HTREEITEM hParent, + _Inout_ IShellFolder *psfParent, + _In_ LPCITEMIDLIST pElt, + _In_ LPCITEMIDLIST pEltRelative, + _In_ BOOL bSort) +{ + /* Get the attributes of the node */ + SFGAOF attrs = SFGAO_STREAM | SFGAO_HASSUBFOLDER; + HRESULT hr = psfParent->GetAttributesOf(1, &pEltRelative, &attrs); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + /* Get the name of the node */ + WCHAR wszDisplayName[MAX_PATH]; + STRRET strret; + hr = psfParent->GetDisplayNameOf(pEltRelative, SHGDN_INFOLDER, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + hr = StrRetToBufW(&strret, pEltRelative, wszDisplayName, MAX_PATH); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + /* Get the icon of the node */ + INT iIcon = SHMapPIDLToSystemImageListIndex(psfParent, pEltRelative, NULL); + + CItemData* pChildInfo = new CItemData; + if (!pChildInfo) + { + ERR("Failed to allocate CItemData\n"); + return NULL; + } + pChildInfo->absolutePidl.Attach(ILClone(pElt)); + pChildInfo->relativePidl.Attach(ILClone(pEltRelative)); + + // Set up our treeview template + TV_INSERTSTRUCT tvInsert = { hParent, TVI_LAST }; + tvInsert.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN; + tvInsert.item.cchTextMax = MAX_PATH; + tvInsert.item.pszText = wszDisplayName; + tvInsert.item.iImage = tvInsert.item.iSelectedImage = iIcon; + tvInsert.item.lParam = (LPARAM)pChildInfo; + + if (!(attrs & SFGAO_STREAM) && (attrs & SFGAO_HASSUBFOLDER)) + tvInsert.item.cChildren = 1; + + HTREEITEM htiCreated = TreeView_InsertItem(m_hwndTreeView, &tvInsert); + + if (bSort) + _SortItems(hParent); + + return htiCreated; +} + +/* This is the slow version of the above method */ +HTREEITEM +CNSCBand::_InsertItem( + _In_opt_ HTREEITEM hParent, + _In_ LPCITEMIDLIST pElt, + _In_ LPCITEMIDLIST pEltRelative, + _In_ BOOL bSort) +{ + CComPtr<IShellFolder> psfFolder; + HRESULT hr = SHBindToParent(pElt, IID_PPV_ARG(IShellFolder, &psfFolder), NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + return _InsertItem(hParent, psfFolder, pElt, pEltRelative, bSort); +} + +BOOL CNSCBand::_InsertSubitems(HTREEITEM hItem, LPCITEMIDLIST entry) +{ + ULONG fetched = 1, uItemCount = 0; + + CComPtr<IEnumIDList> pEnum; + CComPtr<IShellFolder> pFolder; + HRESULT hr = _GetItemEnum(pEnum, hItem, &pFolder); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + /* Don't redraw while we add stuff into the tree */ + m_hwndTreeView.SendMessage(WM_SETREDRAW, FALSE, 0); + + LPITEMIDLIST pidlSub; + while (SUCCEEDED(pEnum->Next(1, &pidlSub, &fetched)) && pidlSub && fetched) + { + LPITEMIDLIST pidlSubComplete; + pidlSubComplete = ILCombine(entry, pidlSub); + + if (_InsertItem(hItem, pFolder, pidlSubComplete, pidlSub, FALSE)) + ++uItemCount; + + ILFree(pidlSubComplete); + ILFree(pidlSub); + } + + /* Let's do sorting */ + _SortItems(hItem); + + /* Now we can redraw */ + m_hwndTreeView.SendMessage(WM_SETREDRAW, TRUE, 0); + + return (uItemCount > 0); +} + +// *** message handlers *** + +LRESULT CNSCBand::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (FAILED_UNEXPECTEDLY(_CreateToolbar(m_hWnd))) + return -1; + if (FAILED_UNEXPECTEDLY(_CreateTreeView(m_hWnd))) + return -1; + return 0; +} + +LRESULT CNSCBand::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + _DestroyTreeView(); + _DestroyToolbar(); + _UnregisterChangeNotify(); + return 0; +} + +LRESULT CNSCBand::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (!m_hwndTreeView) + return 0; + + RECT rc; + GetClientRect(&rc); + LONG cx = rc.right, cy = rc.bottom; + + RECT rcTB; + LONG cyTB = 0; + if (m_hwndToolbar) + { + m_hwndToolbar.SendMessage(TB_AUTOSIZE, 0, 0); + m_hwndToolbar.GetWindowRect(&rcTB); + cyTB = rcTB.bottom - rcTB.top; + } + + m_hwndTreeView.MoveWindow(0, cyTB, cx, cy - cyTB); + return 0; +} + +LRESULT CNSCBand::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + m_bFocused = TRUE; + IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), TRUE); + bHandled = FALSE; + return 0; +} + +LRESULT CNSCBand::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + IUnknown_OnFocusChangeIS(m_pSite, reinterpret_cast<IUnknown*>(this), FALSE); + m_bFocused = FALSE; + return 0; +} + +HRESULT CNSCBand::_AddFavorite() +{ + CComHeapPtr<ITEMIDLIST> pidlCurrent; + _GetCurrentLocation(&pidlCurrent); + + WCHAR szCurDir[MAX_PATH]; + if (!ILGetDisplayName(pidlCurrent, szCurDir)) + { + FIXME("\n"); + return E_FAIL; + } + + WCHAR szPath[MAX_PATH], szSuffix[32]; + SHGetSpecialFolderPathW(m_hWnd, szPath, CSIDL_FAVORITES, TRUE); + PathAppendW(szPath, PathFindFileNameW(szCurDir)); + + const INT ich = lstrlenW(szPath); + for (INT iTry = 2; iTry <= 9999; ++iTry) + { + PathAddExtensionW(szPath, L".lnk"); + if (!PathFileExistsW(szPath)) + break; + szPath[ich] = UNICODE_NULL; + wsprintfW(szSuffix, L" (%d)", iTry); + lstrcatW(szPath, szSuffix); + } + + TRACE("%S, %S\n", szCurDir, szPath); + + return SHDOCVW_CreateShortcut(szPath, pidlCurrent, NULL); +} + +LRESULT CNSCBand::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + switch (LOWORD(wParam)) + { + case ID_ADD: + { + _AddFavorite(); + break; + } + case ID_ORGANIZE: + { + SHELLEXECUTEINFOW sei = { sizeof(sei), SEE_MASK_INVOKEIDLIST }; + sei.hwnd = m_hWnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpIDList = m_pidlRoot; + ::ShellExecuteExW(&sei); + break; + } + } + return 0; +} + +BOOL CNSCBand::OnTreeItemExpanding(_In_ LPNMTREEVIEW pnmtv) +{ + CItemData *pItemData; + + if (pnmtv->action == TVE_COLLAPSE) + { + if (pnmtv->itemNew.hItem == m_hRoot) + { + // Prenvent root from collapsing + pnmtv->itemNew.mask |= TVIF_STATE; + pnmtv->itemNew.stateMask |= TVIS_EXPANDED; + pnmtv->itemNew.state &= ~TVIS_EXPANDED; + pnmtv->action = TVE_EXPAND; + return TRUE; + } + } + + if (pnmtv->action == TVE_EXPAND) + { + // Grab our directory PIDL + pItemData = GetItemData(pnmtv->itemNew.hItem); + // We have it, let's try + if (pItemData && !pItemData->expanded) + { + if (_InsertSubitems(pnmtv->itemNew.hItem, pItemData->absolutePidl)) + { + pItemData->expanded = TRUE; + } + else + { + // remove subitem "+" since we failed to add subitems + TVITEMW tvItem = { TVIF_CHILDREN, pnmtv->itemNew.hItem }; + tvItem.cChildren = 0; + TreeView_SetItem(m_hwndTreeView, &tvItem); + } + } + } + return FALSE; +} + +BOOL CNSCBand::OnTreeItemDeleted(_In_ LPNMTREEVIEW pnmtv) +{ + // Navigate to parent when deleting selected item + HTREEITEM hItem = pnmtv->itemOld.hItem; + HTREEITEM hParent = TreeView_GetParent(m_hwndTreeView, hItem); + if (hParent && TreeView_GetSelection(m_hwndTreeView) == hItem) + TreeView_SelectItem(m_hwndTreeView, hParent); + + /* Destroy memory associated to our node */ + CItemData* pItemData = GetItemData(hItem); + if (!pItemData) + return FALSE; + + delete pItemData; + + return TRUE; +} + +void CNSCBand::_OnSelectionChanged(_In_ LPNMTREEVIEW pnmtv) +{ + HTREEITEM hItem = pnmtv->itemNew.hItem; + if (!hItem) + return; + CItemData* pItemData = GetItemData(hItem); + if (pItemData) + OnSelectionChanged(pItemData->absolutePidl); +} + +void CNSCBand::OnTreeItemDragging(_In_ LPNMTREEVIEW pnmtv, _In_ BOOL isRightClick) +{ + CItemData* pItemData = GetItemData(pnmtv->itemNew.hItem); + if (!pItemData) + return; + + HRESULT hr; + CComPtr<IShellFolder> pSrcFolder; + LPCITEMIDLIST pLast; + hr = SHBindToParent(pItemData->absolutePidl, IID_PPV_ARG(IShellFolder, &pSrcFolder), &pLast); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + SFGAOF attrs = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK; + pSrcFolder->GetAttributesOf(1, &pLast, &attrs); + + DWORD dwEffect = 0; + if (attrs & SFGAO_CANCOPY) + dwEffect |= DROPEFFECT_COPY; + if (attrs & SFGAO_CANMOVE) + dwEffect |= DROPEFFECT_MOVE; + if (attrs & SFGAO_CANLINK) + dwEffect |= DROPEFFECT_LINK; + + CComPtr<IDataObject> pObj; + hr = pSrcFolder->GetUIObjectOf(m_hWnd, 1, &pLast, IID_IDataObject, 0, (LPVOID*)&pObj); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + DoDragDrop(pObj, this, dwEffect, &dwEffect); +} + +LRESULT CNSCBand::OnBeginLabelEdit(_In_ LPNMTVDISPINFO dispInfo) +{ + // TODO: put this in a function ? (mostly copypasta from CDefView) + DWORD dwAttr = SFGAO_CANRENAME; + CComPtr<IShellFolder> pParent; + LPCITEMIDLIST pChild; + HRESULT hr; + + CItemData *info = GetItemData(dispInfo->item.hItem); + if (!info) + return FALSE; + + hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pChild); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); + if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) + { + m_isEditing = TRUE; + m_oldSelected = NULL; + return FALSE; + } + + return TRUE; +} + +HRESULT CNSCBand::_UpdateBrowser(LPCITEMIDLIST pidlGoto) +{ + CComPtr<IShellBrowser> pBrowserService; + HRESULT hr = IUnknown_QueryService(m_pSite, SID_STopLevelBrowser, + IID_PPV_ARG(IShellBrowser, &pBrowserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pBrowserService->BrowseObject(pidlGoto, SBSP_SAMEBROWSER | SBSP_ABSOLUTE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +LRESULT CNSCBand::OnEndLabelEdit(_In_ LPNMTVDISPINFO dispInfo) +{ + CItemData *info = GetItemData(dispInfo->item.hItem); + HRESULT hr; + + m_isEditing = FALSE; + if (m_oldSelected) + { + ++m_mtxBlockNavigate; + TreeView_SelectItem(m_hwndTreeView, m_oldSelected); + --m_mtxBlockNavigate; + } + + if (!dispInfo->item.pszText) + return FALSE; + + CComPtr<IShellFolder> pParent; + LPCITEMIDLIST pidlChild; + BOOL RenamedCurrent = _IsCurrentLocation(info->absolutePidl) == S_OK; + + hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + CComHeapPtr<ITEMIDLIST> pidlNew; + hr = pParent->SetNameOf(m_hWnd, pidlChild, dispInfo->item.pszText, SHGDN_INFOLDER, &pidlNew); + if (SUCCEEDED(hr) && pidlNew) + { + CComPtr<IPersistFolder2> pPersist; + hr = pParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pPersist)); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + CComHeapPtr<ITEMIDLIST> pidlParent; + hr = pPersist->GetCurFolder(&pidlParent); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + CComHeapPtr<ITEMIDLIST> pidlNewAbs(ILCombine(pidlParent, pidlNew)); + if (RenamedCurrent) + { + _UpdateBrowser(pidlNewAbs); + } + else + { + // Tell everyone if SetNameOf forgot, this causes IShellView to update itself when we rename a child + SHChangeNotify(SHCNE_RENAMEFOLDER, SHCNF_IDLIST, info->absolutePidl, pidlNewAbs); + } + + return TRUE; + } + + return FALSE; +} + +LRESULT CNSCBand::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + NMHDR *pnmhdr = (NMHDR*)lParam; + switch (pnmhdr->code) + { + case TVN_ITEMEXPANDING: + return OnTreeItemExpanding((LPNMTREEVIEW)lParam); + //case TVN_SINGLEEXPAND: + case TVN_SELCHANGED: + if (pnmhdr->hwndFrom == m_hwndTreeView) + _OnSelectionChanged((LPNMTREEVIEW)lParam); + break; + case TVN_DELETEITEM: + OnTreeItemDeleted((LPNMTREEVIEW)lParam); + break; + case NM_CLICK: + case NM_RCLICK: + if (pnmhdr->hwndFrom == m_hwndTreeView) + { + TVHITTESTINFO HitTest; + ::GetCursorPos(&HitTest.pt); + ::ScreenToClient(m_hwndTreeView, &HitTest.pt); + TreeView_HitTest(m_hwndTreeView, &HitTest); + + if (HitTest.flags & (TVHT_ABOVE | TVHT_BELOW | TVHT_NOWHERE)) + return TRUE; // Prevents click processing + + if (HitTest.flags & TVHT_ONITEMBUTTON) // [+] / [-] + break; // Do default processing + + // Generate selection notification even if same item + m_hwndTreeView.SendMessage(WM_SETREDRAW, FALSE, 0); + TreeView_SelectItem(m_hwndTreeView, NULL); + TreeView_SelectItem(m_hwndTreeView, HitTest.hItem); + m_hwndTreeView.SendMessage(WM_SETREDRAW, TRUE, 0); + + if (pnmhdr->code == NM_CLICK) + return TRUE; // Prevents click processing + } + break; + case TVN_BEGINDRAG: + case TVN_BEGINRDRAG: + OnTreeItemDragging((LPNMTREEVIEW)lParam, pnmhdr->code == TVN_BEGINRDRAG); + break; + case TVN_BEGINLABELEDITW: + return OnBeginLabelEdit((LPNMTVDISPINFO)lParam); + case TVN_ENDLABELEDITW: + return OnEndLabelEdit((LPNMTVDISPINFO)lParam); + default: + break; + } + + return 0; +} + +// Temporary menu +struct CMenuTemp +{ + HMENU m_hMenu = NULL; + CMenuTemp(HMENU hMenu) : m_hMenu(hMenu) + { + } + ~CMenuTemp() + { + if (m_hMenu) + ::DestroyMenu(m_hMenu); + } + operator HMENU() const + { + return m_hMenu; + } +}; + +// *** ATL event handlers *** +LRESULT CNSCBand::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HWND hwndTarget = reinterpret_cast<HWND>(wParam); + if (hwndTarget && (hwndTarget == m_hwndToolbar || hwndTarget == m_hWnd)) + { + FIXME("Show 'Close Toolbar' menu\n"); + return 0; + } + + HTREEITEM hItem = TreeView_GetSelection(m_hwndTreeView); + if (!hItem) + return 0; + + POINT pt = { (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam) }; + if ((UINT)lParam == (UINT)-1) + { + RECT rc; + if (TreeView_GetItemRect(m_hwndTreeView, hItem, &rc, TRUE)) + { + // Center of item rectangle + pt.x = (rc.left + rc.right) / 2; + pt.y = (rc.top + rc.bottom) / 2; + } + ClientToScreen(&pt); + } + + CItemData *info = GetItemData(hItem); + if (!info) + { + ERR("No node data, something has gone wrong\n"); + return 0; + } + + CComPtr<IShellFolder> pFolder; + LPCITEMIDLIST pidlChild; + HRESULT hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pFolder), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + CComPtr<IContextMenu> contextMenu; + hr = pFolder->GetUIObjectOf(m_hWnd, 1, &pidlChild, IID_NULL_PPV_ARG(IContextMenu, &contextMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + IUnknown_SetSite(contextMenu, (IDeskBand *)this); + + UINT cmf = CMF_EXPLORE; + SFGAOF attr = SFGAO_CANRENAME; + hr = pFolder->GetAttributesOf(1, &pidlChild, &attr); + if (SUCCEEDED(hr) && (attr & SFGAO_CANRENAME)) + cmf |= CMF_CANRENAME; + + CMenuTemp menuTemp(::CreatePopupMenu()); + UINT idCmdFirst = max(FCIDM_SHVIEWFIRST, 1); + hr = contextMenu->QueryContextMenu(menuTemp, 0, idCmdFirst, FCIDM_SHVIEWLAST, cmf); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + enum { flags = TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON }; + UINT uCommand = ::TrackPopupMenu(menuTemp, flags, pt.x, pt.y, 0, m_hWnd, NULL); + if (uCommand) + { + uCommand -= idCmdFirst; + + // Do DFM_CMD_RENAME in the treeview + if ((cmf & CMF_CANRENAME) && SHELL_IsVerb(contextMenu, uCommand, L"rename")) + { + m_hwndTreeView.SetFocus(); + if (TreeView_EditLabel(m_hwndTreeView, hItem)) + m_oldSelected = hItem; + return 0; + } + + hr = _ExecuteCommand(contextMenu, uCommand); + } + + return TRUE; +} + +// WM_USER_SHELLEVENT +LRESULT CNSCBand::OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + // We use SHCNRF_NewDelivery method + HANDLE hChange = (HANDLE)wParam; + DWORD dwProcID = (DWORD)lParam; + + PIDLIST_ABSOLUTE *ppidl = NULL; + LONG lEvent; + HANDLE hLock = SHChangeNotification_Lock(hChange, dwProcID, &ppidl, &lEvent); + if (!hLock) + { + ERR("!hLock\n"); + return 0; + } + + OnChangeNotify(ppidl[0], ppidl[1], (lEvent & ~SHCNE_INTERRUPT)); + + SHChangeNotification_Unlock(hLock); + return 0; +} + +// *** IOleWindow *** + +STDMETHODIMP CNSCBand::GetWindow(HWND *lphwnd) +{ + if (!lphwnd) + return E_INVALIDARG; + *lphwnd = m_hWnd; + return S_OK; +} + +STDMETHODIMP CNSCBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IDockingWindow *** + +STDMETHODIMP CNSCBand::CloseDW(DWORD dwReserved) +{ + // We do nothing, we don't have anything to save yet + TRACE("CloseDW called\n"); + return S_OK; +} + +STDMETHODIMP CNSCBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + /* Must return E_NOTIMPL according to MSDN */ + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::ShowDW(BOOL fShow) +{ + m_fVisible = fShow; + ShowWindow(fShow ? SW_SHOW : SW_HIDE); + return S_OK; +} + +// *** IDeskBand *** + +STDMETHODIMP CNSCBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +{ + if (!pdbi) + return E_INVALIDARG; + + m_dwBandID = dwBandID; + + if (pdbi->dwMask & DBIM_MINSIZE) + { + pdbi->ptMinSize.x = 200; + pdbi->ptMinSize.y = 30; + } + + if (pdbi->dwMask & DBIM_MAXSIZE) + pdbi->ptMaxSize.y = -1; + + if (pdbi->dwMask & DBIM_INTEGRAL) + pdbi->ptIntegral.y = 1; + + if (pdbi->dwMask & DBIM_ACTUAL) + { + pdbi->ptActual.x = 200; + pdbi->ptActual.y = 30; + } + + if (pdbi->dwMask & DBIM_TITLE) + { + _GetTitle(pdbi->wszTitle, _countof(pdbi->wszTitle)); + } + + if (pdbi->dwMask & DBIM_MODEFLAGS) + pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; + + if (pdbi->dwMask & DBIM_BKCOLOR) + pdbi->dwMask &= ~DBIM_BKCOLOR; + + return S_OK; +} + +// *** IObjectWithSite *** + +STDMETHODIMP CNSCBand::SetSite(IUnknown *pUnkSite) +{ + HRESULT hr; + + if (pUnkSite == m_pSite) + return S_OK; + + TRACE("SetSite called\n"); + + if (!pUnkSite) + { + DestroyWindow(); + m_hWnd = NULL; + } + + if (pUnkSite != m_pSite) + m_pSite = NULL; + + if (!pUnkSite) + return S_OK; + + HWND hwndParent; + hr = IUnknown_GetWindow(pUnkSite, &hwndParent); + if (FAILED_UNEXPECTEDLY(hr)) + return E_INVALIDARG; + + m_pSite = pUnkSite; + + if (m_hWnd) + { + SetParent(hwndParent); // Change its parent + } + else + { + enum { style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN }; + this->Create(hwndParent, NULL, NULL, style, 0, 0U, NULL); + } + + _RegisterChangeNotify(); + + return S_OK; +} + +STDMETHODIMP CNSCBand::GetSite(REFIID riid, void **ppvSite) +{ + if (!ppvSite) + return E_POINTER; + *ppvSite = m_pSite; + return S_OK; +} + +// *** IOleCommandTarget *** + +STDMETHODIMP CNSCBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IServiceProvider *** + +STDMETHODIMP CNSCBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + return IUnknown_QueryService(m_pSite, guidService, riid, ppvObject); +} + +// *** IContextMenu *** + +STDMETHODIMP CNSCBand::QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::InvokeCommand( + LPCMINVOKECOMMANDINFO lpici) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::GetCommandString( + UINT_PTR idCmd, + UINT uType, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IInputObject *** + +STDMETHODIMP CNSCBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + if (fActivate) + { + m_hwndTreeView.SetFocus(); + } + + if (lpMsg) + { + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + } + + return S_OK; +} + +STDMETHODIMP CNSCBand::HasFocusIO() +{ + return m_bFocused ? S_OK : S_FALSE; +} + +STDMETHODIMP CNSCBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + if (lpMsg->hwnd == m_hWnd || + (m_isEditing && IsChild(lpMsg->hwnd))) + { + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + return S_OK; + } + + return S_FALSE; +} + +// *** IPersist *** + +STDMETHODIMP CNSCBand::GetClassID(CLSID *pClassID) +{ + return E_NOTIMPL; +} + +// *** IPersistStream *** + +STDMETHODIMP CNSCBand::IsDirty() +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::Load(IStream *pStm) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::Save(IStream *pStm, BOOL fClearDirty) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +STDMETHODIMP CNSCBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IWinEventHandler *** + +STDMETHODIMP CNSCBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + return S_OK; +} + +STDMETHODIMP CNSCBand::IsWindowOwner(HWND hWnd) +{ + return SHIsChildOrSelf(m_hWnd, hWnd); +} + +// *** IBandNavigate *** + +STDMETHODIMP CNSCBand::Select(LPCITEMIDLIST pidl) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** INamespaceProxy *** + +// Returns the ITEMIDLIST that should be navigated when an item is invoked. +STDMETHODIMP CNSCBand::GetNavigateTarget( + _In_ PCIDLIST_ABSOLUTE pidl, + _Out_ PIDLIST_ABSOLUTE *ppidlTarget, + _Out_ ULONG *pulAttrib) +{ + *pulAttrib = 0; + WCHAR szPath[MAX_PATH]; + if (!SHGetPathFromIDListW(pidl, szPath)) + return E_FAIL; + + if (lstrcmpiW(PathFindExtensionW(szPath), L".lnk") == 0) // shortcut file? + { + WCHAR szTarget[MAX_PATH]; + HRESULT hr = SHDOCVW_GetPathOfShortcut(m_hWnd, szPath, szTarget); + if (SUCCEEDED(hr)) + { + lstrcpynW(szPath, szTarget, _countof(szPath)); + *pulAttrib |= SFGAO_LINK; + } + } + + if (PathIsDirectoryW(szPath) || PathIsRootW(szPath)) + *pulAttrib |= SFGAO_FOLDER; + + *ppidlTarget = ILCreateFromPathW(szPath); + return S_OK; +} + +// Handles a user action on an item. +STDMETHODIMP CNSCBand::Invoke(_In_ PCIDLIST_ABSOLUTE pidl) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// Called when the user has selected an item. +STDMETHODIMP CNSCBand::OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) +{ + return S_OK; +} + +// Returns flags used to update the tree control. +STDMETHODIMP CNSCBand::RefreshFlags( + _Out_ DWORD *pdwStyle, + _Out_ DWORD *pdwExStyle, + _Out_ DWORD *dwEnum) +{ + *pdwStyle = _GetTVStyle(); + *pdwExStyle = _GetTVExStyle(); + *dwEnum = _GetEnumFlags(); + return S_OK; +} + +STDMETHODIMP CNSCBand::CacheItem( + _In_ PCIDLIST_ABSOLUTE pidl) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// *** IDropTarget methods *** +STDMETHODIMP CNSCBand::DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + ERR("Entering drag\n"); + m_pCurObject = pObj; + m_oldSelected = TreeView_GetSelection(m_hwndTreeView); + return DragOver(glfKeyState, pt, pdwEffect); +} + +STDMETHODIMP CNSCBand::DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + TVHITTESTINFO info; + info.pt.x = pt.x; + info.pt.y = pt.y; + info.flags = TVHT_ONITEM; + info.hItem = NULL; + ScreenToClient(&info.pt); + + // Move to the item selected by the treeview (don't change right pane) + TreeView_HitTest(m_hwndTreeView, &info); + + HRESULT hr; + if (!info.hItem) + { + m_childTargetNode = NULL; + m_pDropTarget = NULL; + *pdwEffect = DROPEFFECT_NONE; + return S_OK; + } + + ++m_mtxBlockNavigate; + TreeView_SelectItem(m_hwndTreeView, info.hItem); + --m_mtxBlockNavigate; + + // Delegate to shell folder + if (m_pDropTarget && info.hItem != m_childTargetNode) + m_pDropTarget = NULL; + + if (info.hItem != m_childTargetNode) + { + CItemData *pItemData = GetItemData(info.hItem); + if (!pItemData) + return E_FAIL; + + CComPtr<IShellFolder> pFolder; + if (_ILIsDesktop(pItemData->absolutePidl)) + { + pFolder = m_pDesktop; + } + else + { + hr = m_pDesktop->BindToObject(pItemData->absolutePidl, 0, IID_PPV_ARG(IShellFolder, &pFolder)); + if (!SUCCEEDED(hr)) + { + /* Don't allow dnd since we couldn't get our folder object */ + ERR("Can't bind to folder object\n"); + *pdwEffect = DROPEFFECT_NONE; + return E_FAIL; + } + } + + hr = pFolder->CreateViewObject(m_hWnd, IID_PPV_ARG(IDropTarget, &m_pDropTarget)); + if (!SUCCEEDED(hr)) + { + /* Don't allow dnd since we couldn't get our drop target */ + ERR("Can't get drop target for folder object\n"); + *pdwEffect = DROPEFFECT_NONE; + return E_FAIL; + } + + hr = m_pDropTarget->DragEnter(m_pCurObject, glfKeyState, pt, pdwEffect); + m_childTargetNode = info.hItem; + } + + if (m_pDropTarget) + hr = m_pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + + return S_OK; +} + +STDMETHODIMP CNSCBand::DragLeave() +{ + ++m_mtxBlockNavigate; + TreeView_SelectItem(m_hwndTreeView, m_oldSelected); + --m_mtxBlockNavigate; + m_childTargetNode = NULL; + if (m_pCurObject) + m_pCurObject = NULL; + return S_OK; +} + +STDMETHODIMP CNSCBand::Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) +{ + if (!m_pDropTarget) + return E_FAIL; + m_pDropTarget->Drop(pObj, glfKeyState, pt, pdwEffect); + DragLeave(); + return S_OK; +} + +// *** IDropSource methods *** + +STDMETHODIMP CNSCBand::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) +{ + if (fEscapePressed) + return DRAGDROP_S_CANCEL; + if ((grfKeyState & MK_LBUTTON) || (grfKeyState & MK_RBUTTON)) + return S_OK; + return DRAGDROP_S_DROP; +} + +STDMETHODIMP CNSCBand::GiveFeedback(DWORD dwEffect) +{ + return DRAGDROP_S_USEDEFAULTCURSORS; +} diff --git a/dll/win32/shdocvw/CNSCBand.h b/dll/win32/shdocvw/CNSCBand.h new file mode 100644 index 00000000000..f6c06afeb98 --- /dev/null +++ b/dll/win32/shdocvw/CNSCBand.h @@ -0,0 +1,231 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: NameSpace Control Band + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#define NSCBANDCLASSNAME L"ReactOS NameSpace Control Band" + +#define WM_USER_SHELLEVENT (WM_USER + 88) + +#ifdef __cplusplus +class CNSCBand + : public CWindowImpl<CNSCBand> + , public IDeskBand + , public IObjectWithSite + , public IInputObject + , public IPersistStream + , public IOleCommandTarget + , public IServiceProvider + , public IContextMenu + , public IBandNavigate + , public IWinEventHandler + , public INamespaceProxy + , public IDropTarget + , public IDropSource +{ +public: + DECLARE_WND_CLASS_EX(NSCBANDCLASSNAME, 0, COLOR_3DFACE) + static LPCWSTR GetWndClassName() { return NSCBANDCLASSNAME; } + + CNSCBand(); + virtual ~CNSCBand(); + + // The node of TreeView + struct CItemData + { + CComHeapPtr<ITEMIDLIST> absolutePidl; + CComHeapPtr<ITEMIDLIST> relativePidl; + BOOL expanded = FALSE; + }; + CItemData* GetItemData(_In_ HTREEITEM hItem); + + // *** IOleWindow methods *** + STDMETHODIMP GetWindow(HWND *lphwnd) override; + STDMETHODIMP ContextSensitiveHelp(BOOL fEnterMode) override; + + // *** IDockingWindow methods *** + STDMETHODIMP CloseDW(DWORD dwReserved) override; + STDMETHODIMP ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) override; + STDMETHODIMP ShowDW(BOOL fShow) override; + + // *** IDeskBand methods *** + STDMETHODIMP GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) override; + + // *** IObjectWithSite methods *** + STDMETHODIMP SetSite(IUnknown *pUnkSite) override; + STDMETHODIMP GetSite(REFIID riid, void **ppvSite) override; + + // *** IOleCommandTarget methods *** + STDMETHODIMP QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) override; + STDMETHODIMP Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override; + + // *** IServiceProvider methods *** + STDMETHODIMP QueryService(REFGUID guidService, REFIID riid, void **ppvObject) override; + + // *** IContextMenu methods *** + STDMETHODIMP QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) override; + STDMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpici) override; + STDMETHODIMP GetCommandString( + UINT_PTR idCmd, + UINT uType, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax) override; + + // *** IInputObject methods *** + STDMETHODIMP UIActivateIO(BOOL fActivate, LPMSG lpMsg) override; + STDMETHODIMP HasFocusIO() override; + STDMETHODIMP TranslateAcceleratorIO(LPMSG lpMsg) override; + + // *** IPersist methods *** + STDMETHODIMP GetClassID(CLSID *pClassID) override; + + // *** IPersistStream methods *** + STDMETHODIMP IsDirty() override; + STDMETHODIMP Load(IStream *pStm) override; + STDMETHODIMP Save(IStream *pStm, BOOL fClearDirty) override; + STDMETHODIMP GetSizeMax(ULARGE_INTEGER *pcbSize) override; + + // *** IWinEventHandler methods *** + STDMETHODIMP OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) override; + STDMETHODIMP IsWindowOwner(HWND hWnd) override; + + // *** IBandNavigate methods *** + STDMETHODIMP Select(LPCITEMIDLIST pidl) override; + + // *** INamespaceProxy methods *** + STDMETHODIMP GetNavigateTarget( + _In_ PCIDLIST_ABSOLUTE pidl, + _Out_ PIDLIST_ABSOLUTE *ppidlTarget, + _Out_ ULONG *pulAttrib) override; + STDMETHODIMP Invoke(_In_ PCIDLIST_ABSOLUTE pidl) override; + STDMETHODIMP OnSelectionChanged(_In_ PCIDLIST_ABSOLUTE pidl) override; + STDMETHODIMP RefreshFlags( + _Out_ DWORD *pdwStyle, + _Out_ DWORD *pdwExStyle, + _Out_ DWORD *dwEnum) override; + STDMETHODIMP CacheItem(_In_ PCIDLIST_ABSOLUTE pidl) override; + + // *** IDropTarget methods *** + STDMETHODIMP DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; + STDMETHODIMP DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; + STDMETHODIMP DragLeave() override; + STDMETHODIMP Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) override; + + // *** IDropSource methods *** + STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) override; + STDMETHODIMP GiveFeedback(DWORD dwEffect) override; + +protected: + DWORD m_dwTVStyle = 0; + DWORD m_dwTVExStyle = 0; + DWORD m_dwEnumFlags = 0; + BOOL m_fVisible = FALSE; + BOOL m_bFocused = FALSE; + DWORD m_dwBandID = 0; + CComPtr<IUnknown> m_pSite; + CComPtr<IShellFolder> m_pDesktop; + CComHeapPtr<ITEMIDLIST> m_pidlRoot; + HIMAGELIST m_hToolbarImageList = NULL; + CToolbar<> m_hwndToolbar; + CTreeView m_hwndTreeView; + LONG m_mtxBlockNavigate = 0; // A "lock" that prevents internal selection changes to initiate a navigation to the newly selected item. + BOOL m_isEditing = FALSE; + HTREEITEM m_hRoot = NULL; + HTREEITEM m_oldSelected = NULL; + DWORD m_adviseCookie = 0; + ULONG m_shellRegID = 0; + + // *** Drop target information *** + CComPtr<IDropTarget> m_pDropTarget; + HTREEITEM m_childTargetNode = NULL; + CComPtr<IDataObject> m_pCurObject; + + VOID OnFinalMessage(HWND) override; + + // *** helper methods *** + virtual INT _GetRootCsidl() = 0; + virtual HRESULT _CreateTreeView(HWND hwndParent); + virtual HRESULT _CreateToolbar(HWND hwndParent) { return S_OK; } + virtual void _DestroyTreeView(); + virtual void _DestroyToolbar(); + virtual DWORD _GetTVStyle() = 0; + virtual DWORD _GetTVExStyle() = 0; + virtual DWORD _GetEnumFlags() = 0; + virtual BOOL _GetTitle(LPWSTR pszTitle, INT cchTitle) = 0; + virtual BOOL _WantsRootItem() = 0; + virtual void _SortItems(HTREEITEM hParent) = 0; + void _RegisterChangeNotify(); + void _UnregisterChangeNotify(); + BOOL OnTreeItemExpanding(_In_ LPNMTREEVIEW pnmtv); + BOOL OnTreeItemDeleted(_In_ LPNMTREEVIEW pnmtv); + void _OnSelectionChanged(_In_ LPNMTREEVIEW pnmtv); + void OnTreeItemDragging(_In_ LPNMTREEVIEW pnmtv, _In_ BOOL isRightClick); + LRESULT OnBeginLabelEdit(_In_ LPNMTVDISPINFO dispInfo); + LRESULT OnEndLabelEdit(_In_ LPNMTVDISPINFO dispInfo); + void OnChangeNotify( + _In_opt_ LPCITEMIDLIST pidl0, + _In_opt_ LPCITEMIDLIST pidl1, + _In_ LONG lEvent); + HRESULT _ExecuteCommand(_In_ CComPtr<IContextMenu>& menu, _In_ UINT nCmd); + HTREEITEM _InsertItem( + _In_opt_ HTREEITEM hParent, + _Inout_ IShellFolder *psfParent, + _In_ LPCITEMIDLIST pElt, + _In_ LPCITEMIDLIST pEltRelative, + _In_ BOOL bSort); + HTREEITEM _InsertItem( + _In_opt_ HTREEITEM hParent, + _In_ LPCITEMIDLIST pElt, + _In_ LPCITEMIDLIST pEltRelative, + _In_ BOOL bSort); + BOOL _InsertSubitems(HTREEITEM hItem, LPCITEMIDLIST entry); + HRESULT _UpdateBrowser(LPCITEMIDLIST pidlGoto); + HRESULT _GetCurrentLocation(_Out_ PIDLIST_ABSOLUTE *ppidl); + HRESULT _IsCurrentLocation(_In_ PCIDLIST_ABSOLUTE pidl); + void _Refresh(); + void _RefreshRecurse(_In_ HTREEITEM hItem); + BOOL _IsTreeItemInEnum(_In_ HTREEITEM hItem, _In_ IEnumIDList *pEnum); + BOOL _TreeItemHasThisChild(_In_ HTREEITEM hItem, _In_ PCITEMID_CHILD pidlChild); + HRESULT _GetItemEnum( + _Out_ CComPtr<IEnumIDList>& pEnum, + _In_ HTREEITEM hItem, + _Out_opt_ IShellFolder **ppFolder = NULL); + BOOL _ItemHasAnyChild(_In_ HTREEITEM hItem); + HRESULT _AddFavorite(); + + // *** ATL message handlers *** + LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + + BEGIN_MSG_MAP(CNSCBand) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) + MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) + MESSAGE_HANDLER(WM_USER_SHELLEVENT, OnShellEvent) + END_MSG_MAP() +}; +#endif // def __cplusplus diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index c572dc36930..c9796909aa1 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -506,7 +506,7 @@ DECLARE_INTERFACE_(IBandNavigate, IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IBandNavigate ***/ - STDMETHOD(Select)(THIS_ long paramC) PURE; + STDMETHOD(Select)(THIS_ LPCITEMIDLIST pidl) PURE; }; #undef INTERFACE @@ -528,7 +528,7 @@ DECLARE_INTERFACE_(INamespaceProxy, IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** INamespaceProxy ***/ - STDMETHOD(GetNavigateTarget)(THIS_ _In_ PCIDLIST_ABSOLUTE pidl, _Out_ PIDLIST_ABSOLUTE ppidlTarget, _Out_ ULONG *pulAttrib) PURE; + STDMETHOD(GetNavigateTarget)(THIS_ _In_ PCIDLIST_ABSOLUTE pidl, _Out_ PIDLIST_ABSOLUTE *ppidlTarget, _Out_ ULONG *pulAttrib) PURE; STDMETHOD(Invoke)(THIS_ _In_ PCIDLIST_ABSOLUTE pidl) PURE; STDMETHOD(OnSelectionChanged)(THIS_ _In_ PCIDLIST_ABSOLUTE pidl) PURE; STDMETHOD(RefreshFlags)(THIS_ _Out_ DWORD *pdwStyle, _Out_ DWORD *pdwExStyle, _Out_ DWORD *dwEnum) PURE;

4 months, 1 week

[reactos] 01/01: [BROWSEUI] Don't access callers invalid PIDL during browse (#7242)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1061e7f7db44b73711ae7… commit 1061e7f7db44b73711ae7fe05a53cc77e672b861 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Tue Aug 13 20:57:58 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 13 20:57:58 2024 +0200 [BROWSEUI] Don't access callers invalid PIDL during browse (#7242) The interaction between the shell browser and its address bar causes the browser to read from a freed PIDL, sometimes causing a crash. CORE-19697 --- dll/win32/browseui/shellbrowser.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 00fbb06e07b..219767387cb 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -1034,6 +1034,10 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + if (FAILED_UNEXPECTEDLY(hResult = SHILClone(absolutePIDL, &absolutePIDL))) + return hResult; + CComHeapPtr<ITEMIDLIST> pidlAbsoluteClone(const_cast<LPITEMIDLIST>(absolutePIDL)); + // update history if (flags & BTP_UPDATE_CUR_HISTORY) { @@ -1078,7 +1082,14 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, // update current pidl ILFree(fCurrentDirectoryPIDL); - fCurrentDirectoryPIDL = ILClone(absolutePIDL); + fCurrentDirectoryPIDL = pidlAbsoluteClone.Detach(); + /* CORE-19697: CAddressEditBox::OnWinEvent(CBN_SELCHANGE) causes CAddressEditBox to + * call BrowseObject(pidlLastParsed). As part of our browsing we call FireNavigateComplete + * and this in turn causes CAddressEditBox::Invoke to ILFree(pidlLastParsed)! + * We then call SHBindToParent on absolutePIDL (which is really (the now invalid) pidlLastParsed) and we + * end up accessing invalid memory! We therefore set absolutePIDL to be our cloned PIDL here. + */ + absolutePIDL = fCurrentDirectoryPIDL; // create view window hResult = newShellView->CreateViewWindow(saveCurrentShellView, folderSettings,

4 months, 1 week

[reactos] 01/01: [STOBJECT] Do not report the remaining battery capacity if it is unknown

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07a76b3dec662f32f883a… commit 07a76b3dec662f32f883a119a339333c523f7eb1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Aug 12 14:08:12 2024 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Aug 13 14:17:04 2024 +0200 [STOBJECT] Do not report the remaining battery capacity if it is unknown Support for system batteries in ReactOS is really minimal to the point of non-existing. We are detecting the presence of any upcoming battery but since there's lacking in critical code that deals with communication between PO and the battery class driver as the battery systray icon uses GetSystemPowerStatus to gather battery info which in turn inquires the power manager via NtPowerInformation(SystemBatteryState), we have to report to the user that the remaining capacity is unknown rather than returning a pseudo capacity value. Technically this so called "pesudo" value is just a construct denoted as BATTERY_PERCENTAGE_UNKNOWN. Not reporting the actual remaining capacity makes sense, as there could be a scenario where the battery may not properly report its real datum, therefore it's best to be honest to the user what's really going on. CORE-19452 CORE-18969 --- dll/shellext/stobject/power.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 9d80665dc87..ecae456b66e 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -90,6 +90,12 @@ static HICON DynamicLoadIcon(HINSTANCE hinst) } if (((PowerStatus.BatteryFlag & BATTERY_FLAG_NO_BATTERY) == 0) && + (PowerStatus.BatteryLifePercent == BATTERY_PERCENTAGE_UNKNOWN)) + { + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_BATTCAP_ERR)); + g_strTooltip.LoadStringW(IDS_PWR_UNKNOWN_REMAINING); + } + else if (((PowerStatus.BatteryFlag & BATTERY_FLAG_NO_BATTERY) == 0) && ((PowerStatus.BatteryFlag & BATTERY_FLAG_CHARGING) == BATTERY_FLAG_CHARGING)) { index = Quantize(PowerStatus.BatteryLifePercent);

4 months, 2 weeks

[reactos] 01/01: [SETUP:REACTOS] Fix advanced installation options dialog style.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fae7c0f70e2d80540a560… commit fae7c0f70e2d80540a56020c111eeec899262f59 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 13 13:30:58 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 13 13:30:58 2024 +0200 [SETUP:REACTOS] Fix advanced installation options dialog style. --- base/setup/reactos/lang/bg-BG.rc | 2 +- base/setup/reactos/lang/cs-CZ.rc | 2 +- base/setup/reactos/lang/de-DE.rc | 2 +- base/setup/reactos/lang/el-GR.rc | 2 +- base/setup/reactos/lang/en-US.rc | 2 +- base/setup/reactos/lang/es-ES.rc | 2 +- base/setup/reactos/lang/et-EE.rc | 2 +- base/setup/reactos/lang/eu-ES.rc | 2 +- base/setup/reactos/lang/fi-FI.rc | 2 +- base/setup/reactos/lang/fr-FR.rc | 2 +- base/setup/reactos/lang/he-IL.rc | 2 +- base/setup/reactos/lang/hi-IN.rc | 2 +- base/setup/reactos/lang/hu-HU.rc | 2 +- base/setup/reactos/lang/id-ID.rc | 2 +- base/setup/reactos/lang/it-IT.rc | 2 +- base/setup/reactos/lang/ja-JP.rc | 2 +- base/setup/reactos/lang/ms-MY.rc | 2 +- base/setup/reactos/lang/no-NO.rc | 2 +- base/setup/reactos/lang/pl-PL.rc | 2 +- base/setup/reactos/lang/pt-BR.rc | 2 +- base/setup/reactos/lang/pt-PT.rc | 2 +- base/setup/reactos/lang/ro-RO.rc | 2 +- base/setup/reactos/lang/ru-RU.rc | 2 +- base/setup/reactos/lang/sk-SK.rc | 2 +- base/setup/reactos/lang/sq-AL.rc | 2 +- base/setup/reactos/lang/tr-TR.rc | 2 +- base/setup/reactos/lang/uk-UA.rc | 2 +- base/setup/reactos/lang/vi-VN.rc | 2 +- base/setup/reactos/lang/zh-CN.rc | 2 +- base/setup/reactos/lang/zh-HK.rc | 2 +- base/setup/reactos/lang/zh-TW.rc | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index cde5d823099..1b7a166b42f 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 1c8bcd68ec4..e1086e727ef 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -85,7 +85,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 0a76599772f..d360cf75027 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Erweiterte Installationseinstellungen" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index 8348a9b228f..0950302332f 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index b6ae3997385..71e8bfc02a9 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 96d5468de4d..50d9e6629b9 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -88,7 +88,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index c0ee1855144..3439a95a272 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 812d2d2d26e..e4920a947b0 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -86,7 +86,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 55e67edafea..4f6ec76096f 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index a6d6a7f5957..1317b545f77 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètres d'installation avancés" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index f8a1f9f4efa..daa367cb314 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -81,7 +81,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 5508057de90..a7bf1eaad7a 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -75,7 +75,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 2721b9976a4..ca71160468d 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -81,7 +81,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 297baa680c9..a9aa9ad1304 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index a5600a36ac1..710591ef1f4 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index fa99cb5920f..f8ecbc3cd37 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 9, "MS UI Gothic" BEGIN diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 8f9fa05cf93..30ba678c20e 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -81,7 +81,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 532c69978c8..703cc2054ed 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index 4da8e183ba1..b359f7a75ed 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -90,7 +90,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index df377f37d10..b20113bb5cc 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 751d706b438..794eb73c788 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index ef91e785bb8..76eeaa4e034 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -88,7 +88,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index 04217686a9c..f5b032c9e04 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 54e8d573ced..5119c2f82a8 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -84,7 +84,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 4d15c901b4a..420057f0072 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -81,7 +81,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 493d081789b..b3b4ece21d8 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -86,7 +86,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 7f0cb5977c3..d9c23070c3e 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -87,7 +87,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index e12feda590e..5a2fd535023 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 57a8675061c..ea75186b6b5 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -79,7 +79,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 9, "宋体" BEGIN diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index dfdde50e38b..f34cc38c15d 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -87,7 +87,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 9, "新細明體" BEGIN diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 26f9362eda8..73e910dc0da 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -88,7 +88,7 @@ BEGIN END IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 -STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Installation Options" FONT 9, "新細明體" BEGIN

4 months, 2 weeks

← Newer
1
...
5
6
7
8
9
10
11
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2024