From 305fcef612a20ca6fa74fb6cb5f3aa625ff0c8c8 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 9 Dec 2009 18:52:46 +0100
Subject: [PATCH] net: Use the explicit name for all A/W function.

---
 programs/net/Makefile.in |  1 +
 programs/net/net.c       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index 4f6f6fc7350..cf30dced26b 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = net.exe
 APPMODE   = -mconsole
 IMPORTS   = netapi32 user32 advapi32 kernel32
+EXTRADEFS = -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = net.c
 
diff --git a/programs/net/net.c b/programs/net/net.c
index 89279fd5f34..e5e47c88320 100644
--- a/programs/net/net.c
+++ b/programs/net/net.c
@@ -30,7 +30,7 @@ static int output_string(int msg, ...)
     char msg_buffer[8192];
     va_list arguments;
 
-    LoadString(GetModuleHandle(NULL), msg, msg_buffer, sizeof(msg_buffer));
+    LoadStringA(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer));
     va_start(arguments, msg);
     vprintf(msg_buffer, arguments);
     va_end(arguments);
@@ -92,24 +92,24 @@ static BOOL net_use(int argc, char *argv[])
 
 static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle)
 {
-    LPENUM_SERVICE_STATUS dependencies = NULL;
+    LPENUM_SERVICE_STATUSW dependencies = NULL;
     DWORD buffer_size = 0;
     DWORD count = 0, counter;
     BOOL result;
     SC_HANDLE dependent_serviceHandle;
     SERVICE_STATUS_PROCESS ssp;
 
-    result = EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count);
+    result = EnumDependentServicesW(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count);
 
     if(!result && (GetLastError() == ERROR_MORE_DATA))
     {
         dependencies = HeapAlloc(GetProcessHeap(), 0, buffer_size);
-        if(EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count))
+        if(EnumDependentServicesW(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count))
         {
             for(counter = 0; counter < count; counter++)
             {
                 output_string(STRING_STOP_DEP, dependencies[counter].lpDisplayName);
-                dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS);
+                dependent_serviceHandle = OpenServiceW(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS);
                 if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle);
                 CloseServiceHandle(dependent_serviceHandle);
                 if(!result) output_string(STRING_CANT_STOP, dependencies[counter].lpDisplayName);
@@ -129,13 +129,13 @@ static BOOL net_service(int operation, char *service_name)
     char service_display_name[4096];
     DWORD buffer_size = sizeof(service_display_name);
 
-    SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+    SCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if(!SCManager)
     {
         output_string(STRING_NO_SCM);
         return FALSE;
     }
-    serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS);
+    serviceHandle = OpenServiceA(SCManager, service_name, SC_MANAGER_ALL_ACCESS);
     if(!serviceHandle)
     {
         output_string(STRING_NO_SVCHANDLE);
@@ -144,14 +144,14 @@ static BOOL net_service(int operation, char *service_name)
     }
 
 
-    GetServiceDisplayName(SCManager, service_name, service_display_name, &buffer_size);
+    GetServiceDisplayNameA(SCManager, service_name, service_display_name, &buffer_size);
     if (!service_display_name[0]) strcpy(service_display_name, service_name);
 
     switch(operation)
     {
     case NET_START:
         output_string(STRING_START_SVC, service_display_name);
-        result = StartService(serviceHandle, 0, NULL);
+        result = StartServiceW(serviceHandle, 0, NULL);
 
         if(result) output_string(STRING_START_SVC_SUCCESS, service_display_name);
         else