From 393fd51f79784149bfe84613079523dd715a1bc5 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Tue, 19 Aug 2008 21:12:21 +0100 Subject: [PATCH] uninstaller: Remove GUI portion of Wine uninstaller. --- programs/uninstaller/Bg.rc | 18 ---- programs/uninstaller/Da.rc | 18 ---- programs/uninstaller/De.rc | 17 ---- programs/uninstaller/En.rc | 18 ---- programs/uninstaller/Eo.rc | 18 ---- programs/uninstaller/Es.rc | 18 ---- programs/uninstaller/Fi.rc | 18 ---- programs/uninstaller/Fr.rc | 18 ---- programs/uninstaller/Hu.rc | 18 ---- programs/uninstaller/It.rc | 18 ---- programs/uninstaller/Ko.rc | 18 ---- programs/uninstaller/Makefile.in | 2 +- programs/uninstaller/Nl.rc | 18 ---- programs/uninstaller/No.rc | 18 ---- programs/uninstaller/Pl.rc | 18 ---- programs/uninstaller/Pt.rc | 17 ---- programs/uninstaller/Ru.rc | 18 ---- programs/uninstaller/Si.rc | 18 ---- programs/uninstaller/Sv.rc | 18 ---- programs/uninstaller/Tr.rc | 18 ---- programs/uninstaller/main.c | 126 ++------------------------- programs/uninstaller/resource.h | 14 +-- programs/uninstaller/rsrc.rc | 5 -- programs/uninstaller/uninstaller.ico | Bin 766 -> 0 bytes 24 files changed, 8 insertions(+), 479 deletions(-) delete mode 100644 programs/uninstaller/uninstaller.ico diff --git a/programs/uninstaller/Bg.rc b/programs/uninstaller/Bg.rc index 957f4407f7b..45705148187 100644 --- a/programs/uninstaller/Bg.rc +++ b/programs/uninstaller/Bg.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION " Wine" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT ", :",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Application Uninstaller" - IDS_ABOUT, "Wine Application Uninstaller (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, " " - IDS_REGISTRYKEYNOTAVAILABLE, " ( ) , !" IDS_UNINSTALLFAILED, " '%s' , .\r\n ?" } diff --git a/programs/uninstaller/Da.rc b/programs/uninstaller/Da.rc index d6f6bb69ae4..1c928d72240 100644 --- a/programs/uninstaller/Da.rc +++ b/programs/uninstaller/Da.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Afinstaller programmer" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Vlg det program du nsker at afinstallere:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "A&finstaller",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Om",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Luk",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Afinstaller programmer" - IDS_ABOUT, "Oversat af Jens Albretsen\nOphavsret 2005 for afinstalleringsvrktjet tilhrer Andreas Mohr, Hannu Valtonen og Jonathan Ernst." - IDS_ABOUTTITLE, "Om" - IDS_REGISTRYKEYNOTAVAILABLE, "Afinstaller registeringsdatabase vrdi er ikke tilgngelig (endnu); ingenting at gre." IDS_UNINSTALLFAILED, "Kring af afinstallerings kommandoen '%s' fejlede, mske er det p grund af en manglende programfil.\r\nVil du fjerne afinstallerings opfrselen fra registeringsdatabasen?" } diff --git a/programs/uninstaller/De.rc b/programs/uninstaller/De.rc index 83b17f221c0..a01bd7a8d65 100644 --- a/programs/uninstaller/De.rc +++ b/programs/uninstaller/De.rc @@ -20,24 +20,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Anwendungsentferner" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Bitte whlen Sie die Anwendung aus, die Sie entfernen mchten:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Entfernen",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&ber",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "E&nde",IDC_EXIT,270,81,50,14 -END - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Anwendungsentferner" - IDS_ABOUT, "Wine Anwendungsentferner (C) 2005 durch Andreas Mohr, Hannu Valtonen und Jonathan Ernst." - IDS_ABOUTTITLE, "ber den Anwendungsentferner" - IDS_REGISTRYKEYNOTAVAILABLE, "Der Registry-Schlssel fr zu entfernende Anwendung(en) ist (noch) nicht verfgbar, es kann nichts gemacht werden." IDS_UNINSTALLFAILED, "Die Ausfhrung des Entfernungsbefehls '%s' ist fehlgeschlagen, wahrscheinlich durch eine fehlende, ausfhrbare Datei.\r\nMchten Sie, dass der Anwendungseintrag aus der Registry entfernt wird?" } diff --git a/programs/uninstaller/En.rc b/programs/uninstaller/En.rc index 6d24fbb4580..f6ce7b2aa0b 100644 --- a/programs/uninstaller/En.rc +++ b/programs/uninstaller/En.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Application Uninstaller" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Please select the application you wish to uninstall:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Uninstall",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&About",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Exit",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Application Uninstaller" - IDS_ABOUT, "Wine Application Uninstaller (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, "About Uninstaller" - IDS_REGISTRYKEYNOTAVAILABLE, "Uninstall registry key not available (yet), nothing to do !" IDS_UNINSTALLFAILED, "Execution of uninstall command '%s' failed, perhaps due to missing executable.\r\nDo you want to remove the uninstall entry from the registry ?" } diff --git a/programs/uninstaller/Eo.rc b/programs/uninstaller/Eo.rc index de48057962f..52153620c1f 100644 --- a/programs/uninstaller/Eo.rc +++ b/programs/uninstaller/Eo.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Programa Malinstalilo" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Elektu la programon kion vi desiras forigi:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Forigi",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Pri..",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Fermu",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Programa Malinstalilo" - IDS_ABOUT, "Wine Application Uninstaller (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst. Esperanta traduko: Antonio Codazzi" - IDS_ABOUTTITLE, "Pri Malinstalilo" - IDS_REGISTRYKEYNOTAVAILABLE, "Registrlosilo ne estas je dispono. Nenio estas farebla !" IDS_UNINSTALLFAILED, "Malinstalad-komando '%s' malsukcesis, eble ar mankas programo.\r\nu vi volas forigi la malinstalada 'entry' de la registro ?" } diff --git a/programs/uninstaller/Es.rc b/programs/uninstaller/Es.rc index 998134df3a0..0fe7d14763d 100644 --- a/programs/uninstaller/Es.rc +++ b/programs/uninstaller/Es.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Desinstalador de aplicaciones de Wine" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Por favor, elija la aplicacin que desee desinstalar:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Desinstalar",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Acerca de",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Salir",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Desinstalador de aplicaciones de Wine" - IDS_ABOUT, "Desinstalador de aplicaciones de Wine (C) 2005 por Andreas Mohr, Hannu Valtonen y Jonathan Ernst." - IDS_ABOUTTITLE, "Acerca del desinstalador" - IDS_REGISTRYKEYNOTAVAILABLE, "Clave de desinstalacin del registro no disponible (todava), nada que hacer!" IDS_UNINSTALLFAILED, "Ejecucin del comando de desinstalacin '%s' ha fallado, tal vez se deba a que no exista el ejecutable.\r\nDesea eliminar la entrada de desinstalacin de esta aplicacin del registro?" } diff --git a/programs/uninstaller/Fi.rc b/programs/uninstaller/Fi.rc index e6dc77d5b7e..0114990bdb0 100644 --- a/programs/uninstaller/Fi.rc +++ b/programs/uninstaller/Fi.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Sovelluksen Poistaja" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Valitse poistettava sovellus:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Poista",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Tietoja",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Sulje",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Sovelluksen Poistaja" - IDS_ABOUT, "Wine Sovelluksen Poistaja (C) 2005 Andreas Mohr, Hannu Valtonen ja Jonathan Ernst." - IDS_ABOUTTITLE, "Tietoja Ohjelmasta" - IDS_REGISTRYKEYNOTAVAILABLE, "Rekisteriavainta asennuksen poistoon ei ole (viel) olemassa, mitn ei ole tehtviss !" IDS_UNINSTALLFAILED, "Poistokomento '%s' eponnistui, johtuen ehk puuttuvasta tiedostosta.\r\nHaluatko poistaa ohjelman rekisterist?" } diff --git a/programs/uninstaller/Fr.rc b/programs/uninstaller/Fr.rc index 8c9c02b007c..d9ec2a86cc5 100644 --- a/programs/uninstaller/Fr.rc +++ b/programs/uninstaller/Fr.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Dsinstalleur d'applications de Wine" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Veuillez slectionner l'application dsinstaller:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Supprimer",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON " &propos",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Quitter",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Dsinstalleur d'applications de Wine" - IDS_ABOUT, "Dsinstalleur d'applications de Wine (C) 2005 par Andreas Mohr, Hannu Valtonen et Jonathan Ernst." - IDS_ABOUTTITLE, " propos du dsinstalleur" - IDS_REGISTRYKEYNOTAVAILABLE, "Cl de dsinstallation non disponible dans la base de registre (actuellement). Il n'y a rien faire !" IDS_UNINSTALLFAILED, "Erreur lors de l'excution de la commande de dsinstallation %s . L'excutable ne peut peut tre pas tre trouv.\r\nSouhaitez-vous supprimmer l'entre de la base de registre ?" } diff --git a/programs/uninstaller/Hu.rc b/programs/uninstaller/Hu.rc index 7d869ea18e5..bfd689ca577 100644 --- a/programs/uninstaller/Hu.rc +++ b/programs/uninstaller/Hu.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Alkalmazs eltvolt" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Krem vlasszon alkalmazst az eltvoltshoz:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Eltvolts",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Nvjegy",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Kilps",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Alkalamazs eltvolt" - IDS_ABOUT, "Wine Alkalmazs eltvolt (C) 2005 by Andreas Mohr, Hannu Valtonen s Jonathan Ernst." - IDS_ABOUTTITLE, "Az Eltvolt nvjegye" - IDS_REGISTRYKEYNOTAVAILABLE, "Az eltvoltsi regisztrcis kulcs nem elrhet (mg), nem lehet semmit sem tenni !" IDS_UNINSTALLFAILED, "Az eltvoltsi parancs '%s' vgrehajtsa sikertelen, feltehetleg a hinyz futtathat llomny miatt.\r\nEl szeretn tvoltani az eltvoltsi bejegyzst a regisztrcis adatbzisbl ?" } diff --git a/programs/uninstaller/It.rc b/programs/uninstaller/It.rc index b61dd96fc20..af21f6cbc49 100644 --- a/programs/uninstaller/It.rc +++ b/programs/uninstaller/It.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "WINE Disinstallazione Applicazioni" -FONT 10, "MS Sans Serif" -BEGIN -LTEXT "Selezionare dall'elenco l'applicazione che si desidera rimuovere",IDC_PLEASESELECT,10,10,250,14 -EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL -LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | -LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP -PUSHBUTTON "&Rimuovi",IDC_UNINSTALL,270,48,50,14 -PUSHBUTTON "&Info",IDC_ABOUT,270,65,50,14 -PUSHBUTTON "&Esci",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Disinstallazione Applicazioni" -IDS_ABOUT, "Wine Application Uninstaller (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst. Traduzione italiana: Antonio Codazzi" -IDS_ABOUTTITLE, "Informazioni" -IDS_REGISTRYKEYNOTAVAILABLE, "Chiave del registro non disponibile, nulla da fare !" IDS_UNINSTALLFAILED, "Esecuzione del comando di disinstallazione '%s' fallita, forse a causa di un eseguibile mancante.\r\nVuoi rimuovere dal registro la entry di disinstallazione?" } diff --git a/programs/uninstaller/Ko.rc b/programs/uninstaller/Ko.rc index fbbbb9208db..a7cb3e90928 100644 --- a/programs/uninstaller/Ko.rc +++ b/programs/uninstaller/Ko.rc @@ -21,25 +21,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Ǯ׸ ϱ" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT " νϰ Ǯ׸ Ͻÿ:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "(&U)",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "(&A)",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "(&E)",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Application ϱ" - IDS_ABOUT, "Wine Application Uninstaller (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, " Uninstaller " - IDS_REGISTRYKEYNOTAVAILABLE, "Ʈ Ű ν ʽϴ, ƹϵ ̴ϴ!" IDS_UNINSTALLFAILED, "ν '%s' , ϴ.\r\n Ʈ ν Ű ϰڽϱ ?" } diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 7694c6aae4e..7783efaa9ce 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = uninstaller.exe APPMODE = -mconsole -municode -IMPORTS = shlwapi user32 gdi32 advapi32 kernel32 +IMPORTS = shlwapi shell32 user32 gdi32 advapi32 kernel32 C_SRCS = \ main.c diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc index ca3679fc270..8c645b707eb 100644 --- a/programs/uninstaller/Nl.rc +++ b/programs/uninstaller/Nl.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Programma verwijderen" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Kies het programma dat u wenst te verwijderen:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Verwijderen",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Info",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Afsluiten",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Programma verwijderen" - IDS_ABOUT, "Programma verwijderen (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, "Info" - IDS_REGISTRYKEYNOTAVAILABLE, "Verwijdersleutel in de registry is (nog) niet beschikbaar, niets te doen!" IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit de registry?" } diff --git a/programs/uninstaller/No.rc b/programs/uninstaller/No.rc index a88196fdf4f..2aaa1ecd2f3 100644 --- a/programs/uninstaller/No.rc +++ b/programs/uninstaller/No.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Avinstaller programmer" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Velg programmet du nsker avinstallere:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "A&vinstaller",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Om",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Lukk",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Avinstaller programmer" - IDS_ABOUT, "Oversatt av Alexander N. Srnes\nKopirett 2005 for avinstalleringsverktyet tilhrer Andreas Mohr, Hannu Valtonen og Jonathan Ernst." - IDS_ABOUTTITLE, "Om avinstallereren" - IDS_REGISTRYKEYNOTAVAILABLE, "Avinstaller registerverdi er ikke tilgjengelig (enn); ingenting gjre." IDS_UNINSTALLFAILED, "Kjring av avinstalleringskommandoen '%s' feilet, kanskje p grunn av en manglende programfil.\r\nFjerne avinstalleringsoppfringen fra registeret?" } diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc index 4b5937d8ce6..7451e63da0f 100644 --- a/programs/uninstaller/Pl.rc +++ b/programs/uninstaller/Pl.rc @@ -21,25 +21,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine - usuwanie programw" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Prosz wybra program, ktrych chcesz usun:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Usu",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&O progamie",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Zakocz",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine - usuwanie programw" - IDS_ABOUT, "Wine - usuwanie programw (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, "O narzdziu do usuwania programw" - IDS_REGISTRYKEYNOTAVAILABLE, "Nie ma (jeszcze) informacji o programach do usunicia w rejestrze. Nie ma nic do zrobienia!" IDS_UNINSTALLFAILED, "Nie udao si wykona polecenia '%s', ktre powinno usun progam. By moe ju by usunity.\r\nCzy chcesz usun jego wpis z tej listy?" } diff --git a/programs/uninstaller/Pt.rc b/programs/uninstaller/Pt.rc index 4df2abd0652..14c7867133b 100644 --- a/programs/uninstaller/Pt.rc +++ b/programs/uninstaller/Pt.rc @@ -20,24 +20,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Desinstalador de Aplicaes Wine" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Por favor seleccione a aplicao que deseja desinstalar:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Desinstalar",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Acerca",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&Sair",IDC_EXIT,270,81,50,14 -END - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Desinstalador de Aplicaes Wine" - IDS_ABOUT, "Desinstalador de Aplicaes Wine (C) 2005 por Andreas Mohr, Hannu Valtonen e Jonathan Ernst." - IDS_ABOUTTITLE, "Acerca do Desinstalador" - IDS_REGISTRYKEYNOTAVAILABLE, "Chave de registo de desinstalao no disponvel (ainda), nada a fazer !" IDS_UNINSTALLFAILED, "Execuo do comando de desinstalao '%s' falhado, talvez devido a faltar o executvel.\r\nDeseja remover a entrada de desinstalao do registo ?" } diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc index e1f182e1eb8..bada09cafa1 100644 --- a/programs/uninstaller/Ru.rc +++ b/programs/uninstaller/Ru.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION " WINE" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT ", :",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "& ",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, " WINE" - IDS_ABOUT, " WINE (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, " " - IDS_REGISTRYKEYNOTAVAILABLE, " !" IDS_UNINSTALLFAILED, " '%s', - .\r\n ?" } diff --git a/programs/uninstaller/Si.rc b/programs/uninstaller/Si.rc index 4a7a8f0af80..a971ae35b3a 100644 --- a/programs/uninstaller/Si.rc +++ b/programs/uninstaller/Si.rc @@ -22,26 +22,8 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Odstranjevalec programov" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Izberite program, ki ga želite odstraniti:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "O&dstrani",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&O programu",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "Iz&hod",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Odstranjevalec programov" - IDS_ABOUT, "Wine Odstranjevalec programov (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." - IDS_ABOUTTITLE, "O Odstranjevalcu" - IDS_REGISTRYKEYNOTAVAILABLE, "Odstranitveni ključ ni (še) na voljo. Ničesar nimam za storiti!" IDS_UNINSTALLFAILED, "Izvedba odstranitvenega ukaza '%s' ni uspela, morda zaradi manjkajoče izvršljive datoteke.\r\nAli želite odstraniti odstranitveni ključ iz registra?" } diff --git a/programs/uninstaller/Sv.rc b/programs/uninstaller/Sv.rc index 13537cffc71..00d08103dee 100644 --- a/programs/uninstaller/Sv.rc +++ b/programs/uninstaller/Sv.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Avinstallera Wine-program" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Vlj programmet som du vill avinstallera:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Avinstallera",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Om",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "A&vsluta",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Avinstallera Wine-program" - IDS_ABOUT, "Wine Application Uninstaller (C) 2005 Andreas Mohr, Hannu Valtonen och Jonathan Ernst." - IDS_ABOUTTITLE, "Om Uninstaller" - IDS_REGISTRYKEYNOTAVAILABLE, "Uninstall registry key not available (yet), nothing to do !" IDS_UNINSTALLFAILED, "Execution of uninstall command '%s' failed, perhaps due to missing executable.\r\nDo you want to remove the uninstall entry from the registry ?" } diff --git a/programs/uninstaller/Tr.rc b/programs/uninstaller/Tr.rc index eea501d1e1f..5a46812552a 100644 --- a/programs/uninstaller/Tr.rc +++ b/programs/uninstaller/Tr.rc @@ -20,25 +20,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Uygulama Kaldrc" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Ltfen kaldrmak istediiniz uygulamay sein:",IDC_PLEASESELECT,10,10,250,14 - EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL - LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Kaldr",IDC_UNINSTALL,270,48,50,14 - PUSHBUTTON "&Hakknda",IDC_ABOUT,270,65,50,14 - PUSHBUTTON "&k",IDC_EXIT,270,81,50,14 -END - - STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Uygulama Kaldrc" - IDS_ABOUT, "Wine Uygulama Kaldrc (C) 2005 Andreas Mohr, Hannu Valtonen ve Jonathan Ernst." - IDS_ABOUTTITLE, "About Kaldrc" - IDS_REGISTRYKEYNOTAVAILABLE, "Sistem kaydnda kurulu program bilgisi bulunmuyor. Yaplacak birey yok!" IDS_UNINSTALLFAILED, "'%s' kaldrma komutu altrlamad, altrbilir dosya var olmayabilir.\r\nSistem kaydndan bu kaldrma giriini silmek ister misiniz?" } diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index d731de46f55..1eaa3f30bf4 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uninstaller); +extern void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow); + typedef struct { HKEY root; WCHAR *key; @@ -44,17 +46,11 @@ static int list_need_update = 1; static int oldsel = -1; static WCHAR *sFilter; static WCHAR sAppName[MAX_STRING_LEN]; -static WCHAR sAboutTitle[MAX_STRING_LEN]; -static WCHAR sAbout[MAX_STRING_LEN]; -static WCHAR sRegistryKeyNotAvailable[MAX_STRING_LEN]; static WCHAR sUninstallFailed[MAX_STRING_LEN]; static int FetchUninstallInformation(void); static void UninstallProgram(void); -static void UpdateList(HWND hList); static int cmp_by_name(const void *a, const void *b); -static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); - static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; @@ -162,12 +158,11 @@ int wmain(int argc, WCHAR *argv[]) /* Load MessageBox's strings */ LoadStringW(hInst, IDS_APPNAME, sAppName, sizeof(sAppName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_ABOUTTITLE, sAboutTitle, sizeof(sAboutTitle)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_ABOUT, sAbout, sizeof(sAbout)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_REGISTRYKEYNOTAVAILABLE, sRegistryKeyNotAvailable, sizeof(sRegistryKeyNotAvailable)/sizeof(WCHAR)); LoadStringW(hInst, IDS_UNINSTALLFAILED, sUninstallFailed, sizeof(sUninstallFailed)/sizeof(WCHAR)); - return DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_UNINSTALLER), NULL, DlgProc); + /* Start the GUI control panel */ + Control_RunDLL(GetDesktopWindow(), 0, "appwiz.cpl", SW_SHOW); + return 1; } @@ -285,114 +280,3 @@ static void UninstallProgram(void) WINE_TRACE("finished uninstall phase.\n"); list_need_update = 1; } - -static void UpdateButtons(HWND hDlg, HWND hList) -{ - EnableWindow(GetDlgItem(hDlg, IDC_UNINSTALL), SendMessageW(hList, LB_GETSELCOUNT, 0, 0) > 0); -} - -static INT_PTR CALLBACK DlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) -{ - TEXTMETRICW tm; - HDC hdc; - HWND hList = GetDlgItem(hwnd, IDC_LIST); - switch(Message) - { - case WM_INITDIALOG: - hdc = GetDC(hwnd); - GetTextMetricsW(hdc, &tm); - UpdateList(hList); - ReleaseDC(hwnd, hdc); - UpdateButtons(hwnd, hList); - break; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_FILTER: - { - if (HIWORD(wParam) == EN_CHANGE) - { - int len = GetWindowTextLengthW(GetDlgItem(hwnd, IDC_FILTER)); - list_need_update = 1; - if(len > 0) - { - sFilter = (WCHAR*)GlobalAlloc(GPTR, (len + 1)*sizeof(WCHAR)); - GetDlgItemTextW(hwnd, IDC_FILTER, sFilter, len + 1); - } - else sFilter = NULL; - UpdateList(hList); - UpdateButtons(hwnd, hList); - } - break; - } - case IDC_UNINSTALL: - { - int count = SendMessageW(hList, LB_GETSELCOUNT, 0, 0); - if(count != 0) - { - UninstallProgram(); - UpdateList(hList); - UpdateButtons(hwnd, hList); - } - break; - } - case IDC_LIST: - if (HIWORD(wParam) == LBN_SELCHANGE) - { - int sel = SendMessageW(hList, LB_GETCURSEL, 0, 0); - if (oldsel != -1) - { - entries[oldsel].active ^= 1; /* toggle */ - WINE_TRACE("toggling %d old %s\n", entries[oldsel].active, - wine_dbgstr_w(entries[oldsel].descr)); - } - entries[sel].active ^= 1; /* toggle */ - WINE_TRACE("toggling %d %s\n", entries[sel].active, - wine_dbgstr_w(entries[sel].descr)); - oldsel = sel; - } - UpdateButtons(hwnd, hList); - break; - case IDC_ABOUT: - MessageBoxW(0, sAbout, sAboutTitle, MB_OK); - break; - case IDCANCEL: - case IDC_EXIT: - EndDialog(hwnd, 0); - break; - } - break; - default: - return FALSE; - } - return TRUE; -} - - -static void UpdateList(HWND hList) -{ - unsigned int i; - if (list_need_update) - { - int prevsel; - prevsel = SendMessageW(hList, LB_GETCURSEL, 0, 0); - if (!(FetchUninstallInformation())) - { - MessageBoxW(0, sRegistryKeyNotAvailable, sAppName, MB_OK); - PostQuitMessage(0); - return; - } - SendMessageW(hList, LB_RESETCONTENT, 0, 0); - SendMessageW(hList, WM_SETREDRAW, FALSE, 0); - for (i=0; i < numentries; i++) - { - WINE_TRACE("adding %s\n", wine_dbgstr_w(entries[i].descr)); - SendMessageW(hList, LB_ADDSTRING, 0, (LPARAM)entries[i].descr); - } - WINE_TRACE("setting prevsel %d\n", prevsel); - if (prevsel != -1) - SendMessageW(hList, LB_SETCURSEL, prevsel, 0 ); - SendMessageW(hList, WM_SETREDRAW, TRUE, 0); - list_need_update = 0; - } -} diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h index fbb17925afc..b30be4ecba3 100644 --- a/programs/uninstaller/resource.h +++ b/programs/uninstaller/resource.h @@ -18,16 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define IDD_UNINSTALLER 101 -#define IDC_FILTER 1001 -#define IDC_LIST 1002 -#define IDC_UNINSTALL 1003 -#define IDC_ABOUT 1004 -#define IDC_EXIT 1005 -#define IDC_PLEASESELECT 1006 -#define IDS_APPNAME 1007 -#define IDS_ABOUT 1008 -#define IDS_ABOUTTITLE 1009 -#define IDS_REGISTRYKEYNOTAVAILABLE 1010 -#define IDS_UNINSTALLFAILED 1011 +#define IDS_APPNAME 1000 +#define IDS_UNINSTALLFAILED 1001 #define MAX_STRING_LEN 255 diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 5913ca5758f..72bcc9a6538 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -46,8 +46,3 @@ #include "Si.rc" #include "Sv.rc" #include "Tr.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* @makedep: uninstaller.ico */ -UNINSTALLER ICON MOVEABLE uninstaller.ico diff --git a/programs/uninstaller/uninstaller.ico b/programs/uninstaller/uninstaller.ico deleted file mode 100644 index fcc5894c69cb0de40227d44089dedfd8b8cc579d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmcJMJx;_h5QQh;h>{>hNK{1L6tpDU<+1$-MCo$yQWMG)X?c z=kd>oRD8Ow5sl9qkw<=Cm>ttGD=~aCsFg@=k?@p8=6RM70wKtY=YAD;sDQnQM hg8tzxgl}!=g`4{jx&6nyXYD(!e-U|o4&h7J{sGSoYDxeA