net: Convert to Unicode.

po/ar.po

@@ -8317,7 +8317,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/bg.po

@@ -8487,7 +8487,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/ca.po

@@ -8233,7 +8233,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/cs.po

@@ -8857,7 +8857,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/da.po

@@ -8920,8 +8920,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Åbne resourser: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Åbne resourser: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/de.po

@@ -8906,8 +8906,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Offene Ressourcen: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Offene Ressourcen: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/el.po

@@ -8366,7 +8366,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/en.po

@@ -8546,8 +8546,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Open resources: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/en_US.po

@@ -8654,8 +8654,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Open resources: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/eo.po

@@ -8491,7 +8491,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/es.po

@@ -9085,7 +9085,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/fa.po

@@ -8319,7 +8319,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/fi.po

@@ -8572,7 +8572,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/fr.po

@@ -8745,8 +8745,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Ressources ouvertes : %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Ressources ouvertes : %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/he.po

@@ -8755,8 +8755,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Open resources: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/hi.po

@@ -8228,7 +8228,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/hu.po

@@ -8767,7 +8767,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/it.po

@@ -9006,8 +9006,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Risorse aperte: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Risorse aperte: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/ja.po

@@ -8641,8 +8641,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S       %S      リソース数: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s       %s      リソース数: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/ko.po

@@ -8617,8 +8617,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      열린 리소스: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      열린 리소스: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/lt.po

@@ -8668,8 +8668,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Atverti ištekliai: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Atverti ištekliai: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/ml.po

@@ -8228,7 +8228,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/nb_NO.po

@@ -8922,8 +8922,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Åpne ressurser: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Åpne ressurser: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/nl.po

@@ -8808,8 +8808,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Open resources: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/or.po

@@ -8228,7 +8228,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/pa.po

@@ -8228,7 +8228,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/pl.po

@@ -8672,8 +8672,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Otwarte zasoby: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Otwarte zasoby: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/pt_BR.po

@@ -8950,8 +8950,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Recursos disponíveis: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Recursos disponíveis: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/pt_PT.po

@@ -9003,8 +9003,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Recursos disponíveis: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Recursos disponíveis: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/rm.po

@@ -8281,7 +8281,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/ro.po

@@ -9239,8 +9239,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Resurse deschise: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Resurse deschise: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/ru.po

@@ -8662,8 +8662,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S         %S      Открытых ресурсов: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s         %s      Открытых ресурсов: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/sk.po

@@ -8525,7 +8525,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/sl.po

@@ -8693,8 +8693,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Odprta sredstva: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Odprta sredstva: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/sr_RS@cyrillic.po

@@ -8635,7 +8635,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/sr_RS@latin.po

@@ -8689,7 +8689,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/sv.po

@@ -8672,8 +8672,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Öppna resurser: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Öppna resurser: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/te.po

@@ -8228,7 +8228,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/th.po

@@ -8375,7 +8375,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/tr.po

@@ -9027,7 +9027,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/uk.po

@@ -8650,8 +8650,8 @@ msgstr ""
 "---------------------------------------------------------------\n"
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
-msgstr "%s      %S      %S      Відкритих ресурсів: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
+msgstr "%s      %s      %s      Відкритих ресурсів: %lu\n"
 
 #: net.rc:45
 msgid "OK"

po/wa.po

@@ -8341,7 +8341,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/wine.pot

@@ -8204,7 +8204,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/zh_CN.po

@@ -8620,7 +8620,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

po/zh_TW.po

@@ -8678,7 +8678,7 @@ msgid ""
 msgstr ""
 
 #: net.rc:44
-msgid "%s      %S      %S      Open resources: %lu\n"
+msgid "%s      %s      %s      Open resources: %lu\n"
 msgstr ""
 
 #: net.rc:45

programs/net/Makefile.in

 MODULE    = net.exe
-APPMODE   = -mconsole
+APPMODE   = -mconsole -municode
 IMPORTS   = netapi32 user32 advapi32
 EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 

programs/net/net.c

@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <windows.h>
 #include <lm.h>
+#include <wine/unicode.h>
+
 #include "resources.h"
 
 #define NET_START 0001
@@ -27,35 +27,41 @@
 
 static int output_string(int msg, ...)
 {
-    char msg_buffer[8192];
+    WCHAR fmt[8192];
+    WCHAR str[8192];
+    int len;
+    DWORD count;
     va_list arguments;
 
-    LoadStringA(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer));
+    LoadStringW(GetModuleHandleW(NULL), msg, fmt, sizeof(fmt));
     va_start(arguments, msg);
-    vprintf(msg_buffer, arguments);
+    len = vsprintfW(str, fmt, arguments);
+    WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL);
     va_end(arguments);
     return 0;
 }
 
 static BOOL output_error_string(DWORD error)
 {
-    LPSTR pBuffer;
-    if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+    LPWSTR pBuffer;
+    if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
             FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-            NULL, error, 0, (LPSTR)&pBuffer, 0, NULL))
+            NULL, error, 0, (LPWSTR)&pBuffer, 0, NULL))
     {
-        fputs(pBuffer, stdout);
+        DWORD count;
+        int len = lstrlenW(pBuffer);
+        WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), pBuffer, len, &count, NULL);
         LocalFree(pBuffer);
         return TRUE;
     }
     return FALSE;
 }
 
-static BOOL net_use(int argc, char *argv[])
+static BOOL net_use(int argc, const WCHAR* argv[])
 {
     USE_INFO_2 *buffer, *connection;
     DWORD read, total, resume_handle, rc, i;
-    char *status[STRING_RECONN-STRING_OK+1];
+    WCHAR* status[STRING_RECONN-STRING_OK+1];
     resume_handle = 0;
     buffer = NULL;
 
@@ -66,8 +72,8 @@ static BOOL net_use(int argc, char *argv[])
         /* Load the status strings */
         for (i = 0; i < sizeof(status)/sizeof(*status); i++)
         {
-            status[i] = HeapAlloc(GetProcessHeap(), 0, 1024);
-            LoadStringA(hmod, STRING_OK+i, status[i], 1024);
+            status[i] = HeapAlloc(GetProcessHeap(), 0, 1024 * sizeof(**status));
+            LoadStringW(hmod, STRING_OK+i, status[i], 1024);
         }
 
         do {
@@ -133,12 +139,12 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle)
     return result;
 }
 
-static BOOL net_service(int operation, char *service_name)
+static BOOL net_service(int operation, const WCHAR* service_name)
 {
     SC_HANDLE SCManager, serviceHandle;
     BOOL result = 0;
-    char service_display_name[4096];
-    DWORD buffer_size = sizeof(service_display_name);
+    WCHAR service_display_name[4096];
+    DWORD buffer_size;
 
     SCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if(!SCManager)
@@ -146,7 +152,7 @@ static BOOL net_service(int operation, char *service_name)
         output_string(STRING_NO_SCM);
         return FALSE;
     }
-    serviceHandle = OpenServiceA(SCManager, service_name, SC_MANAGER_ALL_ACCESS);
+    serviceHandle = OpenServiceW(SCManager, service_name, SC_MANAGER_ALL_ACCESS);
     if(!serviceHandle)
     {
         output_string(STRING_NO_SVCHANDLE);
@@ -154,9 +160,9 @@ static BOOL net_service(int operation, char *service_name)
         return FALSE;
     }
 
-
-    GetServiceDisplayNameA(SCManager, service_name, service_display_name, &buffer_size);
-    if (!service_display_name[0]) strcpy(service_display_name, service_name);
+    buffer_size = sizeof(service_display_name)/sizeof(*service_display_name);
+    GetServiceDisplayNameW(SCManager, service_name, service_display_name, &buffer_size);
+    if (!service_display_name[0]) lstrcpyW(service_display_name, service_name);
 
     switch(operation)
     {
@@ -189,20 +195,29 @@ static BOOL net_service(int operation, char *service_name)
     return result;
 }
 
-int main(int argc, char *argv[])
+static int arg_is(const WCHAR* str1, const WCHAR* str2)
+{
+    return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, str1, -1, str2, -1) == CSTR_EQUAL;
+}
+
+int wmain(int argc, const WCHAR* argv[])
 {
+    static const WCHAR helpW[]={'h','e','l','p',0};
+    static const WCHAR startW[]={'s','t','a','r','t',0};
+    static const WCHAR stopW[]={'s','t','o','p',0};
+    static const WCHAR useW[]={'u','s','e',0};
     if (argc < 2)
     {
         output_string(STRING_USAGE);
         return 1;
     }
 
-    if(!strcasecmp(argv[1], "help"))
+    if(arg_is(argv[1], helpW))
     {
         output_string(STRING_HELP_USAGE);
     }
 
-    if(!strcasecmp(argv[1], "start"))
+    if(arg_is(argv[1], startW))
     {
         if(argc < 3)
         {
@@ -217,7 +232,7 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    if(!strcasecmp(argv[1], "stop"))
+    if(arg_is(argv[1], stopW))
     {
         if(argc < 3)
         {
@@ -232,7 +247,7 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    if(!strcasecmp(argv[1], "use"))
+    if(arg_is(argv[1], useW))
     {
         if(!net_use(argc, argv)) return 1;
     }

programs/net/net.rc

@@ -41,7 +41,7 @@ STRINGTABLE
                        "   Commands available are:\n   NET HELP    NET START    NET STOP    NET USE\n"
     STRING_NO_ENTRIES, "There are no entries in the list.\n"
     STRING_USE_HEADER, "\nStatus  Local   Remote\n---------------------------------------------------------------\n"
-    STRING_USE_ENTRY,  "%s      %S      %S      Open resources: %lu\n"
+    STRING_USE_ENTRY,  "%s      %s      %s      Open resources: %lu\n"
     STRING_OK, "OK"
     STRING_PAUSED, "Paused"
     STRING_SESSLOST, "Disconnected"