damnit. sorry about that, that's what I get for trying to amend. Here is the correct patch, try 3
On Tue, Dec 29, 2009 at 12:34 PM, Steven Edwards <winehac...@gmail.com> wrote: > I don't know why this didn't get through, resending from gmail. > > This time incorporating (most of) the feedback from Dmitry Timoshkov > and Paul Vriens and attempting to better match the coding style of the > rest of the file which is inconsistent as hell. > > -- > Steven Edwards > > "There is one thing stronger than all the armies in the world, and > that is an idea whose time has come." - Victor Hugo > -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo
From f9a2429f5b1049309623042e8519ee438cd40ce3 Mon Sep 17 00:00:00 2001 From: Steven Edwards <sedwa...@bordeauxgroup.com> Date: Mon, 28 Dec 2009 11:44:20 -0500 Subject: [PATCH] Replace builtin WineFile Execute Dialog with standard RunFile Dialog --- programs/winefile/Cs.rc | 17 +------------- programs/winefile/Da.rc | 17 +------------- programs/winefile/De.rc | 17 +------------- programs/winefile/En.rc | 17 +------------- programs/winefile/Es.rc | 17 +------------- programs/winefile/Fr.rc | 17 +------------- programs/winefile/Hu.rc | 16 +------------ programs/winefile/It.rc | 17 +------------- programs/winefile/Ja.rc | 17 +------------- programs/winefile/Ko.rc | 17 +------------- programs/winefile/Lt.rc | 17 +------------- programs/winefile/Nl.rc | 17 +------------- programs/winefile/No.rc | 17 +------------- programs/winefile/Pl.rc | 17 +------------- programs/winefile/Pt.rc | 22 +---------------- programs/winefile/Ru.rc | 16 +------------ programs/winefile/Si.rc | 17 +------------- programs/winefile/Sv.rc | 17 +------------- programs/winefile/Tr.rc | 17 +------------- programs/winefile/Zh.rc | 33 +-------------------------- programs/winefile/resource.h | 3 +- programs/winefile/winefile.c | 50 +++++++++++------------------------------- 22 files changed, 36 insertions(+), 376 deletions(-) diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc index ad71863..80ddc1b 100644 --- a/programs/winefile/Cs.rc +++ b/programs/winefile/Cs.rc @@ -45,7 +45,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Komprese...", 119 MENUITEM "&Dekomprese...", 120 MENUITEM SEPARATOR - MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM "&Spustit...", ID_RUN MENUITEM "&Tisknout...", 102 MENUITEM "Asociovat...", 103 MENUITEM SEPARATOR @@ -150,21 +150,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Spustit" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Pøíkaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Zrušit", 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zvolte cíl" diff --git a/programs/winefile/Da.rc b/programs/winefile/Da.rc index ffc7415..385333c 100644 --- a/programs/winefile/Da.rc +++ b/programs/winefile/Da.rc @@ -39,7 +39,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "K&omprimer...", 119 MENUITEM "De&komprimer...", 120 MENUITEM SEPARATOR - MENUITEM "Kø&r...", ID_EXECUTE + MENUITEM "Kø&r...", ID_RUN MENUITEM "&Udskriv...", 102 MENUITEM "Associer...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kør" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuller", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjælp", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vælg destination" diff --git a/programs/winefile/De.rc b/programs/winefile/De.rc index e30c5c1..83e9f36 100644 --- a/programs/winefile/De.rc +++ b/programs/winefile/De.rc @@ -43,7 +43,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "K&omprimieren...", 119 MENUITEM "Deko&mprimieren...", 120 MENUITEM SEPARATOR - MENUITEM "&Ausführen...", ID_EXECUTE + MENUITEM "&Ausführen...", ID_RUN MENUITEM "&Drucken...", 102 MENUITEM "Zuord&nen...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ausführen" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "Befehls&zeile:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Als &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Abbrechen", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hilfe", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ziel auswählen" diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index 644cf2f..06405aa 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -41,7 +41,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "C&ompress...", 119 MENUITEM "Dec&ompress...", 120 MENUITEM SEPARATOR - MENUITEM "&Run...", ID_EXECUTE + MENUITEM "&Run...", ID_RUN MENUITEM "&Print...", 102 MENUITEM "Associate...", 103 MENUITEM SEPARATOR @@ -146,21 +146,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Command:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancel", 2, 158, 23, 47, 14 - PUSHBUTTON "&Help", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select destination" diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc index 7e445ee..a531d97 100644 --- a/programs/winefile/Es.rc +++ b/programs/winefile/Es.rc @@ -39,7 +39,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "C&omprimir...", 119 MENUITEM "&Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "E&jecutar...", ID_EXECUTE + MENUITEM "E&jecutar...", ID_RUN MENUITEM "I&mprimir...", 102 MENUITEM "Asoc&iar...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ejecutar" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Como &símbolo", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Aceptar", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ayuda", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccione destino" diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 1b39edc..63eaeba 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -46,7 +46,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Co&mpresser...", 119 MENUITEM "Décompre&sser...", 120 MENUITEM SEPARATOR - MENUITEM "E&xécuter...", ID_EXECUTE + MENUITEM "E&xécuter...", ID_RUN MENUITEM "&Imprimer...", 102 MENUITEM "&Associer...", 103 MENUITEM SEPARATOR @@ -151,21 +151,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Exécuter" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Commande :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Sous forme d'icône", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 75, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 - PUSHBUTTON "Aid&e", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sélectionner la destination" diff --git a/programs/winefile/Hu.rc b/programs/winefile/Hu.rc index f7ca49a..df9c748 100644 --- a/programs/winefile/Hu.rc +++ b/programs/winefile/Hu.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Becsomagolás...", 119 MENUITEM "K&icsomagolás...", 120 MENUITEM SEPARATOR - MENUITEM "&Futtatás...", ID_EXECUTE + MENUITEM "&Futtatás...", ID_RUN MENUITEM "&Nyomtatás...", 102 MENUITEM "Társítás...", 103 MENUITEM SEPARATOR @@ -147,17 +147,3 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Futtatás" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Parancs:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Szimbólumként", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Mégse", 2, 158, 23, 47, 14 - PUSHBUTTON "&Súgó", 254, 158, 43, 47, 14 -} diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index f201230..42fea06 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "C&omprimi...", 119 MENUITEM "Dec&omprimi...", 120 MENUITEM SEPARATOR - MENUITEM "&Esegui...", ID_EXECUTE + MENUITEM "&Esegui...", ID_RUN MENUITEM "&Stampa...", 102 MENUITEM "Associa...", 103 MENUITEM SEPARATOR @@ -147,21 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Esegui" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Come &Simbolo", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annulla", 2, 158, 23, 47, 14 - PUSHBUTTON "&Aiuto", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleziona destinazione" diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc index b73486a..a66eb1b 100644 --- a/programs/winefile/Ja.rc +++ b/programs/winefile/Ja.rc @@ -44,7 +44,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "圧縮(&O)...", 119 MENUITEM "解å‡�(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "実行(&R)...", ID_EXECUTE + MENUITEM "実行(&R)...", ID_RUN MENUITEM "å�°åˆ·(&P)...", 102 MENUITEM "関連付ã�‘...", 103 MENUITEM SEPARATOR @@ -149,21 +149,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "実行" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "コマンド(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "ã‚ャンセル", 2, 158, 23, 47, 14 - PUSHBUTTON "ヘルプ(&H)", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "移動先をé�¸æŠž" diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 0a6207a..7f12583 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "¾ÐÃà(&O)...", 119 MENUITEM "¾ÐÃà Ç®±â(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "½ÇÇà(&R)...", ID_EXECUTE + MENUITEM "½ÇÇà(&R)...", ID_RUN MENUITEM "Àμâ(&P)...", 102 MENUITEM "¿¬°á...", 103 MENUITEM SEPARATOR @@ -147,21 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "½ÇÇà" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "¸í·É(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "½É¹ú·Î(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "È®ÀÎ", 1, 158, 6, 47, 14 - PUSHBUTTON "Ãë¼Ò", 2, 158, 23, 47, 14 - PUSHBUTTON "µµ¿ò¸»(&H)", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¸ñÀûÁö ¼±ÅÃ" diff --git a/programs/winefile/Lt.rc b/programs/winefile/Lt.rc index 32cec0e..a5c2eb6 100644 --- a/programs/winefile/Lt.rc +++ b/programs/winefile/Lt.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Glaudinti...", 119 MENUITEM "IÅ¡sk&leisti...", 120 MENUITEM SEPARATOR - MENUITEM "&Vykdyti...", ID_EXECUTE + MENUITEM "&Vykdyti...", ID_RUN MENUITEM "&Spausdinti...", 102 MENUITEM "Susieti...", 103 MENUITEM SEPARATOR @@ -147,21 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Vykdyti" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Komanda:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Kaip &simbolį", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Gerai", 1, 158, 6, 47, 14 - PUSHBUTTON "Atsisakyti", 2, 158, 23, 47, 14 - PUSHBUTTON "&Žinynas", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IÅ¡rinkite paskirtį" diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index 8f6f7f1..e6ea1db 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -38,7 +38,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Comprimeren...", 119 MENUITEM "&Dec&omprimeren...", 120 MENUITEM SEPARATOR - MENUITEM "&Starten...", ID_EXECUTE + MENUITEM "&Starten...", ID_RUN MENUITEM "Af&drukken...", 102 MENUITEM "Koppelen...", 103 MENUITEM SEPARATOR @@ -143,21 +143,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Uitvoeren" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Opdracht:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Als &pictogram", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuleren", 2, 158, 23, 47, 14 - PUSHBUTTON "&Help", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecteer bestemming" diff --git a/programs/winefile/No.rc b/programs/winefile/No.rc index eec8b82..f1317e8 100644 --- a/programs/winefile/No.rc +++ b/programs/winefile/No.rc @@ -39,7 +39,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "K&omprimer...", 119 MENUITEM "De&komprimer...", 120 MENUITEM SEPARATOR - MENUITEM "Kjø&r...", ID_EXECUTE + MENUITEM "Kjø&r...", ID_RUN MENUITEM "Skriv &ut...", 102 MENUITEM "Tilknytt...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kjør" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjelp", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Velg plasserings" diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index 50247e3..8bc3a77 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Ko&mpresja...", 119 MENUITEM "D&ekompresja...", 120 MENUITEM SEPARATOR - MENUITEM "U&ruchom...", ID_EXECUTE + MENUITEM "U&ruchom...", ID_RUN MENUITEM "&Drukuj...", 102 MENUITEM "Skojarz...", 103 MENUITEM SEPARATOR @@ -147,21 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Uruchom" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Polecenie:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Anuluj", 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wybór celu" diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index d95b0d5..6c4ad68 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "C&omprimir...", 119 MENUITEM "Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "Execu&tar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR @@ -163,7 +163,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "C&omprimir...", 119 MENUITEM "&Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "Execu&tar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR @@ -268,24 +268,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Executar" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Minimizado", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ajuda", 254, 158, 43, 47, 14 -} - - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc index 6969f36..340f58b 100644 --- a/programs/winefile/Ru.rc +++ b/programs/winefile/Ru.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Ð�рхивировать...", 119 MENUITEM "РаÑ�паковать...", 120 MENUITEM SEPARATOR - MENUITEM "&ЗапуÑ�тить...", ID_EXECUTE + MENUITEM "&ЗапуÑ�тить...", ID_RUN MENUITEM "&Печатать...", 102 MENUITEM "Ð�Ñ�Ñ�оциировать...", 103 MENUITEM SEPARATOR @@ -147,20 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Выполнить" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Команда:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Как &Ñ�имвол", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Отмена", 2, 158, 23, 47, 14 - PUSHBUTTON "&Справка", 254, 158, 43, 47, 14 -} IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Выберите путь назначениÑ�" diff --git a/programs/winefile/Si.rc b/programs/winefile/Si.rc index 2010f59..08e495c 100644 --- a/programs/winefile/Si.rc +++ b/programs/winefile/Si.rc @@ -41,7 +41,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Stisni ...", 119 MENUITEM "Ra&zÅ¡iri ...", 120 MENUITEM SEPARATOR - MENUITEM "Zaž&eni ...", ID_EXECUTE + MENUITEM "Zaž&eni ...", ID_RUN MENUITEM "&Tiskaj ...", 102 MENUITEM "Poveži s programom ...", 103 MENUITEM SEPARATOR @@ -146,21 +146,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zagon" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Ukaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Kot &simbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "V redu", 1, 158, 6, 47, 14 - PUSHBUTTON "PrekliÄ�i", 2, 158, 23, 47, 14 - PUSHBUTTON "&PomoÄ�", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Izbira ciljne poti" diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 4deddd9..45202b2 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -42,7 +42,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Komprimera...", 119 MENUITEM "Packa &upp...", 120 MENUITEM SEPARATOR - MENUITEM "&Kör...", ID_EXECUTE + MENUITEM "&Kör...", ID_RUN MENUITEM "&Skriv ut...", 102 MENUITEM "Associera...", 103 MENUITEM SEPARATOR @@ -146,21 +146,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kör" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjälp", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Välj mål" diff --git a/programs/winefile/Tr.rc b/programs/winefile/Tr.rc index 8735264..48d5063 100644 --- a/programs/winefile/Tr.rc +++ b/programs/winefile/Tr.rc @@ -39,7 +39,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "S&ýkýþtýr...", 119 MENUITEM "Geni&þlet...", 120 MENUITEM SEPARATOR - MENUITEM "&Çalýþtýr...", ID_EXECUTE + MENUITEM "&Çalýþtýr...", ID_RUN MENUITEM "Ya&zdýr...", 102 MENUITEM "Ýliþkilendir...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Çalýþtýr" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Komut:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Simge Olarak", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Tamam", 1, 158, 6, 47, 14 - PUSHBUTTON "Ýptal", 2, 158, 23, 47, 14 - PUSHBUTTON "&Yardým", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hedefi seç" diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index 8eb3300..9e36308 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -43,7 +43,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "压缩(&O)...", 119 MENUITEM "解压缩(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "è¿�è¡Œ(&R)...", ID_EXECUTE + MENUITEM "è¿�è¡Œ(&R)...", ID_RUN MENUITEM "打å�°(&P)...", 102 MENUITEM "é…�置文件相关...", 103 MENUITEM SEPARATOR @@ -148,21 +148,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "è¿�è¡Œ" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "命令(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "作为连接(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "确定", 1, 158, 6, 47, 14 - PUSHBUTTON "å�–消", 2, 158, 23, 47, 14 - PUSHBUTTON "帮助(&H)", 254, 158, 43, 47, 14 -} - LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* Menu */ @@ -181,7 +166,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "壓縮(&O)...", 119 MENUITEM "解壓縮(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "執行(&R)...", ID_EXECUTE + MENUITEM "執行(&R)...", ID_RUN MENUITEM "列å�°(&P)...", 102 MENUITEM "é…�置檔案相關...", 103 MENUITEM SEPARATOR @@ -286,17 +271,3 @@ IDM_WINEFILE MENU FIXED IMPURE } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "執行" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "指令(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "作為連接(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "確定", 1, 158, 6, 47, 14 - PUSHBUTTON "å�–消", 2, 158, 23, 47, 14 - PUSHBUTTON "幫助(&H)", 254, 158, 43, 47, 14 -} diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 7c14871..004a8e8 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -35,7 +35,6 @@ /* dialogs */ -#define IDD_EXECUTE 103 #define IDD_SELECT_DESTINATION 104 #define IDD_DIALOG_VIEW_TYPE 105 #define IDD_DIALOG_PROPERTIES 106 @@ -44,7 +43,7 @@ /* control ids */ #define ID_ACTIVATE 101 -#define ID_EXECUTE 105 +#define ID_RUN 105 #define ID_FILE_MOVE 106 #define ID_FILE_COPY 107 #define ID_FILE_DELETE 108 diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 856430d..60bb910 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1688,38 +1688,23 @@ static HWND create_child_window(ChildWnd* child) return child->hwnd; } +static void (WINAPI *pRunFileDlgAW )(HWND, HICON, LPWSTR, LPWSTR, LPWSTR, DWORD); +#define RFF_NODEFAULT 0x02 /* No default item selected. */ -struct ExecuteDialog { - WCHAR cmd[MAX_PATH]; - int cmdshow; -}; - -static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +static void WineFile_OnRun(void) { - static struct ExecuteDialog* dlg; - - switch(nmsg) { - case WM_INITDIALOG: - dlg = (struct ExecuteDialog*) lparam; - return 1; + static const WCHAR shell32_dll[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; + HMODULE hshell = GetModuleHandleW( shell32_dll ); - case WM_COMMAND: { - int id = (int)wparam; - - if (id == IDOK) { - GetWindowTextW(GetDlgItem(hwnd, 201), dlg->cmd, MAX_PATH); - dlg->cmdshow = get_check(hwnd,214) ? SW_SHOWMINIMIZED : SW_SHOWNORMAL; - EndDialog(hwnd, id); - } else if (id == IDCANCEL) - EndDialog(hwnd, id); + pRunFileDlgAW = (void*)GetProcAddress(hshell, (LPCSTR)61); - return 1;} + /* Show "Run..." dialog */ + if (pRunFileDlgAW != NULL ) + { + pRunFileDlgAW( NULL, 0, NULL, NULL, NULL, RFF_NODEFAULT); } - - return 0; } - static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { WCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; @@ -2268,18 +2253,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM Globals.saveSettings ? MF_CHECKED : MF_UNCHECKED ); break; - case ID_EXECUTE: { - struct ExecuteDialog dlg; - - memset(&dlg, 0, sizeof(struct ExecuteDialog)); - - if (DialogBoxParamW(Globals.hInstance, MAKEINTRESOURCEW(IDD_EXECUTE), hwnd, ExecuteDialogDlgProc, (LPARAM)&dlg) == IDOK) { - HINSTANCE hinst = ShellExecuteW(hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); - - if (PtrToUlong(hinst) <= 32) - display_error(hwnd, GetLastError()); - } - break;} + case ID_RUN: + WineFile_OnRun(); + break; case ID_CONNECT_NETWORK_DRIVE: { DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK); -- 1.6.3.3