/ Check-in [27346fa5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Reverting check-in (3836) at the request of winCE users. We no ability to test this change. Presumably this is a fix for tickets #2698, #2533, and #2598. It is unclear if this causes #2294 to be reopened or not. (CVS 4478)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 27346fa55ed9b5c20016d07a37268fbd42dc097f
User & Date: drh 2007-10-08 12:29:17
Context
2007-10-08
15:06
More untested changes for wince contributed by users. Ticket #2702. (CVS 4479) check-in: ccd709e1 user: drh tags: trunk
12:29
Reverting check-in (3836) at the request of winCE users. We no ability to test this change. Presumably this is a fix for tickets #2698, #2533, and #2598. It is unclear if this causes #2294 to be reopened or not. (CVS 4478) check-in: 27346fa5 user: drh tags: trunk
12:22
Fix a bug in code for winCE. Ticket #2700. (CVS 4477) check-in: a36fca4c user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

   427    427         pFile->shared->bExclusive = FALSE;
   428    428       }
   429    429   
   430    430       /* De-reference and close our copy of the shared memory handle */
   431    431       UnmapViewOfFile(pFile->shared);
   432    432       CloseHandle(pFile->hShared);
   433    433   
   434         -    if( pFile->zDeleteOnClose ){
   435         -      DeleteFileW(pFile->zDeleteOnClose);
   436         -      free(pFile->zDeleteOnClose);
   437         -      pFile->zDeleteOnClose = 0;
   438         -    }
   439         -
   440    434       /* Done with the mutex */
   441    435       winceMutexRelease(pFile->hMutex);    
   442    436       CloseHandle(pFile->hMutex);
   443    437       pFile->hMutex = NULL;
   444    438     }
   445    439   }
   446    440   
................................................................................
   609    603     winFile *pFile = (winFile*)id;
   610    604     OSTRACE2("CLOSE %d\n", pFile->h);
   611    605     do{
   612    606       rc = CloseHandle(pFile->h);
   613    607     }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
   614    608   #if OS_WINCE
   615    609     winceDestroyLock(pFile);
          610  +  if( pFile->zDeleteOnClose ){
          611  +    DeleteFileW(pFile->zDeleteOnClose);
          612  +    free(pFile->zDeleteOnClose);
          613  +  }
   616    614   #endif
   617    615     OpenCounter(-1);
   618    616     return rc ? SQLITE_OK : SQLITE_IOERR;
   619    617   }
   620    618   
   621    619   /*
   622    620   ** Some microsoft compilers lack this definition.