apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/shmem/win32 shm.c
Date Tue, 04 Jun 2002 04:41:54 GMT
wrowe       2002/06/03 21:41:54

  Modified:    shmem/win32 shm.c
  Log:
    More WinCE Porting
  
    Antique patches that need to get out of my tree, into CVS.
  
  Submitted by:	Mladen Turk <mturk@mappingsoft.com>
  
  Revision  Changes    Path
  1.11      +31 -4     apr/shmem/win32/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/win32/shm.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- shm.c	13 Mar 2002 20:39:26 -0000	1.10
  +++ shm.c	4 Jun 2002 04:41:53 -0000	1.11
  @@ -118,12 +118,16 @@
   
       if (!file) {
           /* Do Anonymous, which will be an inherited handle */
  +#ifndef _WIN32_WCE
           hFile = INVALID_HANDLE_VALUE;
           sec.nLength = sizeof(SECURITY_ATTRIBUTES);
           sec.lpSecurityDescriptor = NULL;
           sec.bInheritHandle = TRUE;
  -        mapkey = NULL;
           psec = &sec;
  +#else
  +        psec = NULL;
  +#endif
  +        mapkey = NULL;
       }
       else {
           /* Do file backed, which is not an inherited handle 
  @@ -218,7 +222,15 @@
   #if APR_HAS_UNICODE_FS
       IF_WIN_OS_IS_UNICODE
       {
  +#ifndef _WIN32_WCE
           hMap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey);
  +#else
  +        /* The WCE 3.0 lacks OpenFileMapping. So we emulate one with
  +         * opening the existing shmem and reading its size from the header 
  +         */
  +        hMap = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, 
  +                                  PAGE_READWRITE, 0, sizeof(apr_shm_t), mapkey);
  +#endif
       }
   #endif
   #if APR_HAS_ANSI_FS
  @@ -240,13 +252,28 @@
       
       *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
       (*m)->pool = pool;
  -    (*m)->hMap = hMap;
       (*m)->memblk = base;
  -    (*m)->usrmem = (char*)base + sizeof(memblock_t);
       /* Real (*m)->mem->size could be recovered with VirtualQuery */
       (*m)->size = (*m)->memblk->size;
  -    (*m)->length = (*m)->memblk->length;
  +#if _WIN32_WCE
  +    /* Reopen with real size  */
  +    UnmapViewOfFile(base);
  +    CloseHandle(hMap);
   
  +    hMap = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, 
  +                              PAGE_READWRITE, 0, (*m)->size, mapkey);
  +    if (!hMap) {
  +        return apr_get_os_error();
  +    }
  +    base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
  +    if (!base) {
  +        CloseHandle(hMap);
  +        return apr_get_os_error();
  +    }    
  +#endif
  +    (*m)->hMap = hMap;
  +    (*m)->length = (*m)->memblk->length;
  +    (*m)->usrmem = (char*)base + sizeof(memblock_t);
       apr_pool_cleanup_register((*m)->pool, *m, 
                                 shm_cleanup, apr_pool_cleanup_null);
       return APR_SUCCESS;
  
  
  

Mime
View raw message