You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mt...@apache.org on 2003/09/28 17:52:35 UTC
cvs commit: jakarta-commons/daemon/src/native/nt/procrun procgui.c procrun.c procrun.dsp procrun.dsw procrun.h
mturk 2003/09/28 08:52:35
Modified: daemon/src/native/nt/procrun procgui.c procrun.c procrun.dsp
procrun.dsw procrun.h
Log:
Revert the latest 'lame Tomcat' patches.
Revision Changes Path
1.4 +1 -1 jakarta-commons/daemon/src/native/nt/procrun/procgui.c
Index: procgui.c
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procgui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- procgui.c 28 Sep 2003 06:50:01 -0000 1.3
+++ procgui.c 28 Sep 2003 15:52:35 -0000 1.4
@@ -57,7 +57,7 @@
*/
/* ====================================================================
- * procrun (Tomcat Service Manager)
+ * procrun
*
* Contributed by Mladen Turk <mt...@apache.org>
*
1.4 +93 -13 jakarta-commons/daemon/src/native/nt/procrun/procrun.c
Index: procrun.c
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- procrun.c 28 Sep 2003 07:04:35 -0000 1.3
+++ procrun.c 28 Sep 2003 15:52:35 -0000 1.4
@@ -57,7 +57,7 @@
*/
/* ====================================================================
- * procrun (Tomcat Service Manager)
+ * procrun
*
* Contributed by Mladen Turk <mt...@apache.org>
*
@@ -2989,23 +2989,103 @@
#elif defined(PROCRUN_WINDLL)
#pragma message("Compiling Control Panel Application mode")
-/* XXX: Work in progress */
-/*
- * Allows that all the installed TC services
- * can be managed from Windows Control Panel
- */
-
-LONG APIENTRY CPlApplet(HWND hwndCPL,
- UINT uMsg,
- LONG lParam1,
- LONG lParam2)
-{
+BOOL WINAPI DllMain(HINSTANCE hInst,
+ ULONG ulReason,
+ LPVOID lpReserved)
+{
+
+ switch (ulReason) {
+ case DLL_PROCESS_ATTACH:
+ g_env = NULL;
+ break;
+ case DLL_PROCESS_DETACH:
+ free_environment(g_env);
+ break;
+ default:
+ break;
+ }
+ return TRUE;
+}
+__declspec(dllexport) void InstallService(const char *service_name,
+ const char *install,
+ const char *image_path,
+ const char *display_name,
+ const char *description)
+{
+ int argc = 0;
+ char *argv[12];
+ char b[MAX_PATH];
+ procrun_t *env = alloc_environment();
+ g_proc_mode = PROCRUN_MODE_WINDLL;
+ g_env = env;
+
+ argv[argc++] = "PROCRUN.DLL";
+ strcpy(b, PROC_ARG_INSTALL_SERVICE);
+ strcat(b, service_name);
+ argv[argc++] = b;
+ argv[argc++] = "--" PROCRUN_PARAMS_IMAGE;
+ argv[argc++] = (char *)image_path;
+ argv[argc++] = "--" PROCRUN_PARAMS_INSTALL;
+ argv[argc++] = (char *)install;
+ argv[argc++] = "--" PROCRUN_PARAMS_DISPLAY;
+ argv[argc++] = (char *)display_name;
+ argv[argc++] = "--" PROCRUN_PARAMS_DESCRIPTION;
+ argv[argc++] = (char *)description;
+
+ procrun_main(argc, argv, _environ, env);
+ free_environment(env);
+ g_env = NULL;
+}
+
+__declspec(dllexport) void UpdateService(const char *service_name,
+ const char *param,
+ const char *value)
+{
+ int argc = 0;
+ char *argv[4];
+ char b[MAX_PATH], p[MAX_PATH];
- return 1;
+ procrun_t *env = alloc_environment();
+ g_proc_mode = PROCRUN_MODE_WINDLL;
+ g_env = env;
+
+ argv[argc++] = "PROCRUN.DLL";
+ strcpy(b, PROC_ARG_UPDATE_SERVICE);
+ strcat(b, service_name);
+ strcpy(p, "--");
+ strcat(p, param);
+ argv[argc++] = b;
+ argv[argc++] = p;
+ argv[argc++] = (char *)value;
+
+ procrun_main(argc, argv, _environ, env);
+
+ free_environment(env);
+ g_env = NULL;
}
+
+__declspec(dllexport) void RemoveService(const char *service_name)
+{
+ int argc = 0;
+ char *argv[4];
+ char b[MAX_PATH];
+
+ procrun_t *env = alloc_environment();
+ g_proc_mode = PROCRUN_MODE_WINDLL;
+ g_env = env;
+
+ argv[argc++] = "PROCRUN.DLL";
+ strcpy(b, PROC_ARG_DELETE_SERVICE);
+ strcat(b, service_name);
+ argv[argc++] = b;
+ procrun_main(argc, argv, _environ, env);
+
+ free_environment(env);
+ g_env = NULL;
+}
#else
#error Unknown application mode
1.3 +6 -6 jakarta-commons/daemon/src/native/nt/procrun/procrun.dsp
Index: procrun.dsp
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- procrun.dsp 28 Sep 2003 06:55:13 -0000 1.2
+++ procrun.dsp 28 Sep 2003 15:52:35 -0000 1.3
@@ -58,7 +58,7 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"Debug\procrunw.exe" /pdbtype:sept
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"Debug\tomcatw.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\procrunwd.exe" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "procrun - Win32 Release"
@@ -85,7 +85,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\procrunw.exe" /pdbtype:sept /opt:ref /opt:icf
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\tomcatw.exe" /pdbtype:sept /opt:ref /opt:icf
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:IX86 /out:"bin\procrunw.exe" /pdbtype:sept /opt:ref /opt:icf
!ELSEIF "$(CFG)" == "procrun - Win32 Debug CONSOLE"
@@ -112,7 +112,7 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"DebugCONSOLE/tomcat.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\procrund.exe" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "procrun - Win32 Release CONSOLE"
@@ -139,7 +139,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\procrun.exe" /pdbtype:sept /opt:ref /opt:icf
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\tomcat.exe" /pdbtype:sept /opt:ref /opt:icf
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:console /debug /machine:IX86 /out:"bin\procrun.exe" /pdbtype:sept /opt:ref /opt:icf
!ELSEIF "$(CFG)" == "procrun - Win32 DebugDLL"
@@ -166,7 +166,7 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /pdbtype:sept
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"DebugDLL/tomcat.cpl" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\procrund.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "procrun - Win32 ReleaseDLL"
@@ -193,7 +193,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\procrun.dll" /pdbtype:sept /opt:ref /opt:icf
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\tomcat.cpl" /pdbtype:sept /opt:ref /opt:icf
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"bin\procrun.dll" /pdbtype:sept /opt:ref /opt:icf
!ENDIF
1.2 +12 -0 jakarta-commons/daemon/src/native/nt/procrun/procrun.dsw
Index: procrun.dsw
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procrun.dsw 4 Sep 2003 23:28:20 -0000 1.1
+++ procrun.dsw 28 Sep 2003 15:52:35 -0000 1.2
@@ -15,6 +15,18 @@
###############################################################################
+Project: "testchild"=.\testchild\testchild.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
1.3 +2 -2 jakarta-commons/daemon/src/native/nt/procrun/procrun.h
Index: procrun.h
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- procrun.h 28 Sep 2003 06:51:04 -0000 1.2
+++ procrun.h 28 Sep 2003 15:52:35 -0000 1.3
@@ -57,7 +57,7 @@
*/
/* ====================================================================
- * procrun (Tomcat Service Manager)
+ * procrun
*
* Contributed by Mladen Turk <mt...@apache.org>
*
@@ -173,7 +173,7 @@
#define PROC_ARG_EDIT_SERVICE "//ES//"
#define PROCRUN_VERSION_STR "1.1"
-#define PROCRUN_REGKEY_ROOT "SOFTWARE\\Apache Software Foundation\\Tomcat Service Manager"
+#define PROCRUN_REGKEY_ROOT "SOFTWARE\\Apache Software Foundation\\Process Runner " PROCRUN_VERSION_STR
#define PROCRUN_REGKEY_SERVICES "System\\CurrentControlSet\\Services\\%s"
#define PROCRUN_REGKEY_PARAMS "System\\CurrentControlSet\\Services\\%s\\Parameters"
#define PROCRUN_REGKEY_RSERVICES PROCRUN_REGKEY_ROOT "\\%s"