Commit 1bd0690e authored by Alexandre Julliard's avatar Alexandre Julliard

uninstaller: Only load error strings when needed.

parent 52e415f7
...@@ -45,8 +45,6 @@ static unsigned int numentries = 0; ...@@ -45,8 +45,6 @@ static unsigned int numentries = 0;
static int list_need_update = 1; static int list_need_update = 1;
static int oldsel = -1; static int oldsel = -1;
static WCHAR *sFilter; static WCHAR *sFilter;
static WCHAR sAppName[MAX_STRING_LEN];
static WCHAR sUninstallFailed[MAX_STRING_LEN];
static int FetchUninstallInformation(void); static int FetchUninstallInformation(void);
static void UninstallProgram(void); static void UninstallProgram(void);
...@@ -123,7 +121,6 @@ static void RemoveSpecificProgram(WCHAR *nameW) ...@@ -123,7 +121,6 @@ static void RemoveSpecificProgram(WCHAR *nameW)
int wmain(int argc, WCHAR *argv[]) int wmain(int argc, WCHAR *argv[])
{ {
LPCWSTR token = NULL; LPCWSTR token = NULL;
HINSTANCE hInst = GetModuleHandleW(0);
static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; static const WCHAR listW[] = { '-','-','l','i','s','t',0 };
static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 };
int i = 1; int i = 1;
...@@ -156,10 +153,6 @@ int wmain(int argc, WCHAR *argv[]) ...@@ -156,10 +153,6 @@ int wmain(int argc, WCHAR *argv[])
} }
} }
/* Load MessageBox's strings */
LoadStringW(hInst, IDS_APPNAME, sAppName, sizeof(sAppName)/sizeof(WCHAR));
LoadStringW(hInst, IDS_UNINSTALLFAILED, sUninstallFailed, sizeof(sUninstallFailed)/sizeof(WCHAR));
/* Start the GUI control panel */ /* Start the GUI control panel */
Control_RunDLL(GetDesktopWindow(), 0, "appwiz.cpl", SW_SHOW); Control_RunDLL(GetDesktopWindow(), 0, "appwiz.cpl", SW_SHOW);
return 1; return 1;
...@@ -267,6 +260,12 @@ static void UninstallProgram(void) ...@@ -267,6 +260,12 @@ static void UninstallProgram(void)
} }
else else
{ {
WCHAR sAppName[MAX_STRING_LEN];
WCHAR sUninstallFailed[MAX_STRING_LEN];
HINSTANCE hInst = GetModuleHandleW(0);
LoadStringW(hInst, IDS_APPNAME, sAppName, sizeof(sAppName)/sizeof(WCHAR));
LoadStringW(hInst, IDS_UNINSTALLFAILED, sUninstallFailed, sizeof(sUninstallFailed)/sizeof(WCHAR));
wsprintfW(errormsg, sUninstallFailed, entries[i].command); wsprintfW(errormsg, sUninstallFailed, entries[i].command);
if(MessageBoxW(0, errormsg, sAppName, MB_YESNO | MB_ICONQUESTION)==IDYES) if(MessageBoxW(0, errormsg, sAppName, MB_YESNO | MB_ICONQUESTION)==IDYES)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment