From 9544179424222a4aa9469963c5f2b6a988c4fc93 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@masterindexing.com>
Date: Tue, 4 Feb 2014 18:15:39 +1100
Subject: Convert printf calls to format_string

---
 programs/regsvr32/regsvr32.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c
index 2ea2117..b9a5af7 100644
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -51,7 +51,6 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <stdio.h>
 #include <string.h>
 #include <windows.h>
 #include <ole2.h>
@@ -68,18 +67,6 @@ typedef HRESULT (*DLLINSTALL)           (BOOL,LPCWSTR);
 
 static BOOL Silent = FALSE;
 
-static int Usage(void)
-{
-    printf("regsvr32 [/u] [/s] [/n] [/i[:cmdline]] dllname ...\n");
-    printf("\t[/u]  unregister server\n");
-    printf("\t[/s]  silent (no message boxes)\n");
-    printf("\t[/i]  Call DllInstall passing it an optional [cmdline];\n");
-    printf("\t      when used with /u calls dll uninstall\n");
-    printf("\t[/n]  Do not call DllRegisterServer; this option "
-           "must be used with [/i]\n");
-    return 0;
-}
-
 static void output_write(const WCHAR* str, DWORD len)
 {
     DWORD nOut = 0, ret = 0;
@@ -153,7 +140,7 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand
     if(!*DllHandle)
     {
         if(!Silent)
-            printf("Failed to load DLL %s\n", strDll);
+            format_string(load_message(STRING_DLL_LOAD_FAILED), strDll);
 
         ExitProcess(1);
     }
@@ -161,7 +148,7 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand
     if(!proc)
     {
         if(!Silent)
-            printf("%s not implemented in DLL %s\n", procName, strDll);
+            format_string(load_message(STRING_PROC_NOT_IMPLEMENTED), procName, strDll);
         FreeLibrary(*DllHandle);
         return NULL;
     }
@@ -182,12 +169,12 @@ static int RegisterDll(const char* strDll)
     if(FAILED(hr))
     {
         if(!Silent)
-            printf("Failed to register DLL %s\n", strDll);
+            format_string(load_message(STRING_REGISTER_FAILED), strDll);
 
         return -1;
     }
     if(!Silent)
-        printf("Successfully registered DLL %s\n", strDll);
+        format_string(load_message(STRING_REGISTER_SUCCESSFUL), strDll);
 
     if(DllHandle)
         FreeLibrary(DllHandle);
@@ -208,12 +195,12 @@ static int UnregisterDll(char* strDll)
     if(FAILED(hr))
     {
         if(!Silent)
-            printf("Failed to unregister DLL %s\n", strDll);
+            format_string(load_message(STRING_UNREGISTER_FAILED), strDll);
 
         return -1;
     }
     if(!Silent)
-        printf("Successfully unregistered DLL %s\n", strDll);
+        format_string(load_message(STRING_UNREGISTER_SUCCESSFUL), strDll);
 
     if(DllHandle)
         FreeLibrary(DllHandle);
@@ -234,13 +221,13 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line)
     if(FAILED(hr))
     {
         if(!Silent)
-            printf("Failed to %s DLL %s\n", install ? "install" : "uninstall",
-                   strDll);
+            format_string(load_message(STRING_INSTALL_UNINSTALL_FAILED),
+                          install ? "install" : "uninstall", strDll);
         return -1;
     }
     if(!Silent)
-        printf("Successfully %s DLL %s\n",  install ? "installed" : "uninstalled",
-               strDll);
+        format_string(load_message(STRING_INSTALLED_UNINSTALLED),
+                      install ? "installed" : "uninstalled", strDll);
 
     if(DllHandle)
         FreeLibrary(DllHandle);
@@ -317,7 +304,7 @@ int main(int argc, char* argv[])
         else if((!strcasecmp(argv[i], "/c"))||(!strcasecmp(argv[i], "-c")))
             /* console output */;
         else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':'))
-            printf("Unrecognized switch %s\n", argv[i]);
+            format_string(load_message(STRING_UNRECOGNIZED_SWITCH), argv[i]);
         else
         {
             char *DllName = argv[i];
@@ -349,7 +336,7 @@ int main(int argc, char* argv[])
     if (!DllFound)
     {
         if(!Silent)
-            return Usage();
+            return format_string(load_message(STRING_USAGE));
         else
             return -1;
     }
-- 
1.8.3.2