net.exe: Converted strings to resources
Tim Schwartz
tim at sanityinternet.com
Fri Jun 22 10:05:34 CDT 2007
-------------- next part --------------
diff --git a/programs/net/En.rc b/programs/net/En.rc
new file mode 100644
index 0000000..810ed69
--- /dev/null
+++ b/programs/net/En.rc
@@ -0,0 +1,19 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP ]\n"
+ STRING_START_USAGE, "Specify service name to start.\n"
+ STRING_STOP_USAGE, "Specify service name to stop.\n"
+ STRING_STOP_DEP, "Stopping dependent service: %s\n"
+ STRING_CANT_STOP, "Could not stop service %s\n"
+ STRING_NO_SCM, "Could not get handle to service control manager.\n"
+ STRING_NO_SVCHANDLE, "Could not get handle to service.\n"
+ STRING_START_SVC, "The %s service is starting.\n"
+ STRING_START_SVC_SUCCESS, "The %s service was started successfully.\n"
+ STRING_START_SVC_FAIL, "The %s service failed to start.\n"
+ STRING_STOP_SVC, "The %s service is stopping.\n"
+ STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n"
+ STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n"
+ STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n Commands available are:\n NET HELP NET START NET STOP\n"
+}
diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index d72a9ba..96c45f0 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -4,10 +4,12 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = net.exe
APPMODE = -mconsole
-IMPORTS = advapi32 kernel32
+IMPORTS = advapi32 kernel32 user32
C_SRCS = net.c
+RC_SRCS = rsrc.rc
+
@MAKE_PROG_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/programs/net/net.c b/programs/net/net.c
index 0fd85e9..4de257f 100644
--- a/programs/net/net.c
+++ b/programs/net/net.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
#include <windows.h>
+#include "resources.h"
#define NET_START 0001
#define NET_STOP 0002
@@ -31,6 +32,7 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle)
BOOL result;
SC_HANDLE dependent_serviceHandle;
SERVICE_STATUS_PROCESS ssp;
+ char msgbuffer[8192];
result = EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count);
@@ -41,11 +43,13 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle)
{
for(counter = 0; counter < count; counter++)
{
- printf("Stopping dependent service: %s\n", dependencies[counter].lpDisplayName);
+ LoadString(GetModuleHandle(NULL), STRING_STOP_DEP, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer, dependencies[counter].lpDisplayName);
dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS);
if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle);
CloseServiceHandle(dependent_serviceHandle);
- if(!result) printf("Could not stop service %s\n", dependencies[counter].lpDisplayName);
+ LoadString(GetModuleHandle(NULL), STRING_CANT_STOP, msgbuffer, sizeof(msgbuffer));
+ if(!result) printf(msgbuffer, dependencies[counter].lpDisplayName);
}
}
}
@@ -61,17 +65,20 @@ static BOOL net_service(int operation, char *service_name)
BOOL result = 0;
char service_display_name[4096];
DWORD buffer_size = sizeof(service_display_name);
+ char msgbuffer[8192];
SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!SCManager)
{
- printf("Couldn't get handle to SCManager.\n");
+ LoadString(GetModuleHandle(NULL), STRING_NO_SCM, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer);
return FALSE;
}
serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS);
if(!serviceHandle)
{
- printf("Couldn't get handle to service.\n");
+ LoadString(GetModuleHandle(NULL), STRING_NO_SVCHANDLE, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer);
CloseServiceHandle(SCManager);
return FALSE;
}
@@ -83,20 +90,22 @@ static BOOL net_service(int operation, char *service_name)
switch(operation)
{
case NET_START:
- printf("The %s service is starting.\n", service_display_name);
+ LoadString(GetModuleHandle(NULL), STRING_START_SVC, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer, service_display_name);
result = StartService(serviceHandle, 0, NULL);
- printf("The %s service ", service_display_name);
- if(!result) printf("failed to start.\n");
- else printf("was started successfully.\n");
+ if(result) LoadString(GetModuleHandle(NULL), STRING_START_SVC_SUCCESS, msgbuffer, sizeof(msgbuffer));
+ else LoadString(GetModuleHandle(NULL), STRING_START_SVC_FAIL, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer, service_display_name);
break;
case NET_STOP:
- printf("The %s service is stopping.\n", service_display_name);
+ LoadString(GetModuleHandle(NULL), STRING_STOP_SVC, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer, service_display_name);
result = StopService(SCManager, serviceHandle);
- printf("The %s service ", service_display_name);
- if(!result) printf("failed to stop.\n");
- else printf("was stopped successfully.\n");
+ if(result) LoadString(GetModuleHandle(NULL), STRING_STOP_SVC_SUCCESS, msgbuffer, sizeof(msgbuffer));
+ else LoadString(GetModuleHandle(NULL), STRING_STOP_SVC_FAIL, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer, service_display_name);
break;
}
@@ -107,27 +116,26 @@ static BOOL net_service(int operation, char *service_name)
int main(int argc, char *argv[])
{
+ char msgbuffer[8192];
if (argc < 2)
{
- printf("The syntax of this command is:\n\n");
- printf("NET [ HELP | START | STOP ]\n");
+ LoadString(GetModuleHandle(NULL), STRING_USAGE, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer);
return 1;
}
if(!strcasecmp(argv[1], "help"))
{
- printf("The syntax of this command is:\n\n");
- printf("NET HELP command\n -or-\nNET command /HELP\n\n");
- printf(" Commands available are:\n");
- printf(" NET HELP NET START NET STOP\n");
+ LoadString(GetModuleHandle(NULL), STRING_HELP_USAGE, msgbuffer, sizeof(msgbuffer));
+ printf(msgbuffer);
}
if(!strcasecmp(argv[1], "start"))
{
if(argc < 3)
{
- printf("Specify service name to start.\n");
+ LoadString(GetModuleHandle(NULL), STRING_START_USAGE, msgbuffer, sizeof(msgbuffer));
return 1;
}
@@ -142,7 +150,7 @@ int main(int argc, char *argv[])
{
if(argc < 3)
{
- printf("Specify service name to stop.\n");
+ LoadString(GetModuleHandle(NULL), STRING_STOP_USAGE, msgbuffer, sizeof(msgbuffer));
return 1;
}
diff --git a/programs/net/resources.h b/programs/net/resources.h
new file mode 100644
index 0000000..64afb3f
--- /dev/null
+++ b/programs/net/resources.h
@@ -0,0 +1,14 @@
+#define STRING_USAGE 101
+#define STRING_START_USAGE 102
+#define STRING_STOP_USAGE 103
+#define STRING_STOP_DEP 104
+#define STRING_CANT_STOP 105
+#define STRING_NO_SCM 106
+#define STRING_NO_SVCHANDLE 107
+#define STRING_START_SVC 108
+#define STRING_START_SVC_SUCCESS 109
+#define STRING_START_SVC_FAIL 110
+#define STRING_STOP_SVC 111
+#define STRING_STOP_SVC_SUCCESS 112
+#define STRING_STOP_SVC_FAIL 113
+#define STRING_HELP_USAGE 114
diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc
new file mode 100644
index 0000000..44a2cee
--- /dev/null
+++ b/programs/net/rsrc.rc
@@ -0,0 +1,6 @@
+#include <windows.h>
+#include "resources.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#include "En.rc"
More information about the wine-patches
mailing list