cvs commit: apache-2.0/src/lib/apr/misc/win32 misc.h

[wr...@locus.apache.org]

wrowe       00/05/11 20:59:50

  Modified:    src/lib/apr/misc/win32 misc.h
  Log:
  
    I'm sure Mr. Stoddard will recognize this, so I'm committing it.
    Unfortunately it doesn't do a whit of good since it is an APR
    private required by the windows mpm... argh
  
  
  Revision  Changes    Path
  1.12      +5 -0      apache-2.0/src/lib/apr/misc/win32/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- misc.h	2000/04/20 17:21:34	1.11
  +++ misc.h	2000/05/12 03:59:50	1.12
  @@ -133,6 +133,11 @@
   #undef GetFileAttributesEx
   #define GetFileAttributesEx LateGetFileAttributesExA
   
  +DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
  +    IN HANDLE hFile),
  +    (hFile));
  +#define CancelIo LateCancelIo
  +
   ap_status_t ap_get_oslevel(struct ap_pool_t *, ap_oslevel_e *);
   
   #endif  /* ! MISC_H */
  
  
  

RE: cvs commit: apache-2.0/src/lib/apr/misc/win32 misc.h

["William A. Rowe, Jr." <wr...@lnd.com>]

> wrowe       00/05/11 20:59:50
> 
>   Modified:    src/lib/apr/misc/win32 misc.h
>   Log:
>   
>     I'm sure Mr. Stoddard will recognize this, so I'm committing it.
>     Unfortunately it doesn't do a whit of good since it is an APR
>     private required by the windows mpm... argh
>    
>   +DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
>   +    IN HANDLE hFile),
>   +    (hFile));
>   +#define CancelIo LateCancelIo

We are back to chickens and eggs :-)

As long as the mpm/winnt/winnt.c code is playing games between 9x and NT
we have a problem.  (I grant, it may become an NT-only beast, and it may
move entirely into the APR.) 

We have invented all sorts of stuff in winnt.c to duplicate what is in
APR's misc.c (and vise versa).  The misc stuff has been mostly declared
private by the gods of APR.  However, as long as they need to play games,
I'm trying to figure out this tangled mess.

I'm thinking of one of the following:

  move ap_get_oslevel and LoadLateDllFunc (which could become 
  ap_load_dll_func if anyone cares) into a new version.c APR file...

  -either- include misc.h and the new version.c into the ApacheCore.dsp
  for the winnt mpm,

  -or- make those two functions public.

I know I'm not winning friends and impressing enemies with this idea :-)

But unless the winnt mpm is going to become monolithic to NT -now- (and
a private note to Bill recently expressed why I don't care for recent
comments on a completely unique port of Apache, for we begin to walk many
different paths with code and start missing bugs)...

or unless we are ready to drop all the Win32isms from the mpm,

then let's deal with it -one of those ways- for a few months.

I'm really trying to make progress on the Win95 compile and build, and
on the process handling.  (Inconvienent, since I live in NT.)  And I'm
trying to make JJK's fixes for 95 (fix 1.3 -> apply to 2.0), so I'd like
the frame of reference of where we stand on 95, please.

Bill

BTW: I think I've got the transmitfile issue on 95 licked on 2.0, as well
as process shutdown under WinNT (ctrl-C et al) for 1.3.x.  Services, 
al la Win95, will be working shortly (1.3 and 2.0, I expect).  Win95 is 
as much as advertised by JJK, I'm just looking for different workarounds 
to some horrible crud in the 95 flavor.  Subclassed 95 console windows are
misbehaving at this moment, and I will not start creating event windows,
with a corresponding thread, as JJK had suggested.  At least a working
subclassed console would be short, sweet, to the point, and fill in the
bugs in the Win95 notifications (Shutdown, logout etc...)