You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/12/11 03:21:08 UTC
cvs commit: apache-1.3/src/os/win32/win9xconhook Win9xConHook.h
wrowe 00/12/10 18:21:07
Modified: src ApacheCore.dsp
src/os/win32 service.c
src/os/win32/win9xconhook Win9xConHook.h
Log:
Clear out the old cruft, moving function declarations to win9xconhook's
own header. Update the build to reflect the changes
Revision Changes Path
1.36 +2 -2 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ApacheCore.dsp 2000/09/21 13:28:48 1.35
+++ ApacheCore.dsp 2000/12/11 02:21:03 1.36
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
1.32 +1 -8 apache-1.3/src/os/win32/service.c
Index: service.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/service.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- service.c 2000/12/11 01:55:27 1.31
+++ service.c 2000/12/11 02:21:04 1.32
@@ -70,6 +70,7 @@
#include "multithread.h"
#include "service.h"
#include "registry.h"
+#include "Win9xConHook.h"
#define SERVICE_APACHE_RESTART 128
@@ -87,10 +88,6 @@
/* statics for atexit processing or shared between threads */
static BOOL die_on_logoff = FALSE;
-static DWORD monitor_thread_id = 0;
-static HINSTANCE monitor_hkernel = NULL;
-static DWORD dos_child_procid = 0;
-static HHOOK catch_term_hook = NULL;
static HWND console_wnd = NULL;
static int is_service = -1;
@@ -234,10 +231,6 @@
}
return TRUE;
}
-
-LRESULT WINAPI RegisterWindows9xService(BOOL is_service);
-BOOL WINAPI FixConsoleCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add);
-BOOL WINAPI Windows9xServiceCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add);
void stop_child_monitor(void)
{
1.2 +72 -7 apache-1.3/src/os/win32/win9xconhook/Win9xConHook.h
Index: Win9xConHook.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/win9xconhook/Win9xConHook.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Win9xConHook.h 2000/11/30 01:39:32 1.1
+++ Win9xConHook.h 2000/12/11 02:21:06 1.2
@@ -1,24 +1,89 @@
+/* ====================================================================
+ * Copyright (c) 1995-2000 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://httpd.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://httpd.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+/* You should (generally) not need this function, as the full
+ * Windows9xServiceCtrlHandler will register the application as a
+ * service, allowing it to survive user logoff.
+ */
+LRESULT WINAPI RegisterWindows9xService(BOOL is_service);
+/* Windows9xServiceCtrlHandler registers a handler routine, freeing
+ * the console window, creating a hidden window and passing the
+ * WM_SHUTDOWN message through the CTRL_SHUTDOWN event.
+ */
+BOOL WINAPI Windows9xServiceCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add);
-/*
- * FixConsoleControlHandler will register a handler routine with the
+/* FixConsoleControlHandler registers a handler routine with the
* Win9xConHook.dll, creating a hidden window and forwarding the
* WM_ENDSESSION and WM_CLOSE messages to the registered handler
* as CTRL_SHUTDOWN_EVENT, CTRL_LOGOFF_EVENT and CTRL_CLOSE_EVENT.
+ * The application should still use SetConsoleCtrlHandler to grab
+ * the CTRL_BREAK_EVENT and CTRL_C_EVENT.
*/
-BOOL WINAPI FixConsoleCtrlHandler(
- PHANDLER_ROUTINE phandler,
- BOOL add);
+BOOL WINAPI FixConsoleCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add);
/*
- * PostMessage Hook:
+ * PostMessage Hook, don't use this directly:
*/
LRESULT CALLBACK GetMsgProc(INT hc, WPARAM wParam, LPARAM lParam);
/*
- * SendMessage Hook:
+ * SendMessage Hook, don't use this directly:
*/
LRESULT CALLBACK CallWndProc(INT hc, WPARAM wParam, LPARAM lParam);