SQLite

Check-in [27346fa55e]
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
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 27346fa55ed9b5c20016d07a37268fbd42dc097f
User & Date: drh 2007-10-08 12:29:17.000
Context
2007-10-08
15:06
More untested changes for wince contributed by users. Ticket #2702. (CVS 4479) (check-in: ccd709e179 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: 27346fa55e user: drh tags: trunk)
12:22
Fix a bug in code for winCE. Ticket #2700. (CVS 4477) (check-in: a36fca4cde user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/os_win.c.
︙︙
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446

      pFile->shared->bExclusive = FALSE;
    }

    /* De-reference and close our copy of the shared memory handle */
    UnmapViewOfFile(pFile->shared);
    CloseHandle(pFile->hShared);

    if( pFile->zDeleteOnClose ){
      DeleteFileW(pFile->zDeleteOnClose);
      free(pFile->zDeleteOnClose);
      pFile->zDeleteOnClose = 0;
    }

    /* Done with the mutex */
    winceMutexRelease(pFile->hMutex);    
    CloseHandle(pFile->hMutex);
    pFile->hMutex = NULL;
  }
}









<
<
<
<
<
<








427
428
429
430
431
432
433






434
435
436
437
438
439
440

      pFile->shared->bExclusive = FALSE;
    }

    /* De-reference and close our copy of the shared memory handle */
    UnmapViewOfFile(pFile->shared);
    CloseHandle(pFile->hShared);







    /* Done with the mutex */
    winceMutexRelease(pFile->hMutex);    
    CloseHandle(pFile->hMutex);
    pFile->hMutex = NULL;
  }
}
︙︙
609
610
611
612
613
614
615




616
617
618
619
620
621
622

  winFile *pFile = (winFile*)id;
  OSTRACE2("CLOSE %d\n", pFile->h);
  do{
    rc = CloseHandle(pFile->h);
  }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
#if OS_WINCE
  winceDestroyLock(pFile);




#endif
  OpenCounter(-1);
  return rc ? SQLITE_OK : SQLITE_IOERR;
}

/*
** Some microsoft compilers lack this definition.








>
>
>
>








603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620

  winFile *pFile = (winFile*)id;
  OSTRACE2("CLOSE %d\n", pFile->h);
  do{
    rc = CloseHandle(pFile->h);
  }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
#if OS_WINCE
  winceDestroyLock(pFile);
  if( pFile->zDeleteOnClose ){
    DeleteFileW(pFile->zDeleteOnClose);
    free(pFile->zDeleteOnClose);
  }
#endif
  OpenCounter(-1);
  return rc ? SQLITE_OK : SQLITE_IOERR;
}

/*
** Some microsoft compilers lack this definition.
︙︙