/ Check-in [6676475c]
Login

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

Overview
Comment:Better loadable extension handling in the Win32 VFS when compiled for Cygwin.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | cygDlOpen
Files: files | file ages | folders
SHA1: 6676475c47558a52cb2632e92a541e13d143b2dc
User & Date: mistachkin 2014-02-21 05:44:18
Context
2014-02-24
21:23
Merge updates from trunk. Closed-Leaf check-in: 854d410a user: mistachkin tags: cygDlOpen
2014-02-21
05:44
Better loadable extension handling in the Win32 VFS when compiled for Cygwin. check-in: 6676475c user: mistachkin tags: cygDlOpen
2014-02-20
19:42
Fix the text of a comment used to generate VDBE opcode documentation so that it omits symbols that can be mistaken for a hyperlink by the parser. check-in: b46d4e89 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  5137   5137   */
  5138   5138   /*
  5139   5139   ** Interfaces for opening a shared library, finding entry points
  5140   5140   ** within the shared library, and closing the shared library.
  5141   5141   */
  5142   5142   static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
  5143   5143     HANDLE h;
         5144  +#if defined(__CYGWIN__)
         5145  +  int nFull = pVfs->mxPathname+1;
         5146  +  char *zFull = sqlite3MallocZero( nFull );
         5147  +  void *zConverted = 0;
         5148  +  if( zFull==0 ){
         5149  +    return 0;
         5150  +  }
         5151  +  if( winFullPathname(pVfs, zFilename, nFull, zFull)!=SQLITE_OK ){
         5152  +    sqlite3_free(zFull);
         5153  +    return 0;
         5154  +  }
         5155  +  zConverted = winConvertFromUtf8Filename(zFull);
         5156  +  sqlite3_free(zFull);
         5157  +#else
  5144   5158     void *zConverted = winConvertFromUtf8Filename(zFilename);
  5145   5159     UNUSED_PARAMETER(pVfs);
         5160  +#endif
  5146   5161     if( zConverted==0 ){
  5147   5162       return 0;
  5148   5163     }
  5149   5164     if( osIsNT() ){
  5150   5165   #if SQLITE_OS_WINRT
  5151   5166       h = osLoadPackagedLibrary((LPCWSTR)zConverted, 0);
  5152   5167   #else