ITS#8324 Map NTAPI result codes to WIN32 codes

rawpart
Howard Chu 9 years ago
parent fcac8d0774
commit 5ef1908224
  1. 20
      libraries/liblmdb/mdb.c

@ -4159,6 +4159,19 @@ mdb_env_create(MDB_env **env)
return MDB_SUCCESS; return MDB_SUCCESS;
} }
#ifdef _WIN32
/** @brief Map a result from an NTAPI call to WIN32. */
static DWORD
mdb_nt2win32(NTSTATUS st)
{
OVERLAPPED o = {0};
DWORD br;
o.Internal = st;
GetOverlappedResult(NULL, &o, &br, FALSE);
return GetLastError();
}
#endif
static int ESECT static int ESECT
mdb_env_map(MDB_env *env, void *addr) mdb_env_map(MDB_env *env, void *addr)
{ {
@ -4188,7 +4201,7 @@ mdb_env_map(MDB_env *env, void *addr)
rc = NtCreateSection(&mh, access, NULL, NULL, secprot, SEC_RESERVE, env->me_fd); rc = NtCreateSection(&mh, access, NULL, NULL, secprot, SEC_RESERVE, env->me_fd);
if (rc) if (rc)
return rc; return mdb_nt2win32(rc);
map = addr; map = addr;
#ifdef MDB_VL32 #ifdef MDB_VL32
msize = NUM_METAS * env->me_psize; msize = NUM_METAS * env->me_psize;
@ -4200,7 +4213,7 @@ mdb_env_map(MDB_env *env, void *addr)
NtClose(mh); NtClose(mh);
#endif #endif
if (rc) if (rc)
return rc; return mdb_nt2win32(rc);
env->me_map = map; env->me_map = map;
#else #else
#ifdef MDB_VL32 #ifdef MDB_VL32
@ -5692,7 +5705,8 @@ mdb_rpage_get(MDB_txn *txn, pgno_t pg0, MDB_page **ret)
#define MAP(rc,env,addr,len,off) \ #define MAP(rc,env,addr,len,off) \
addr = NULL; \ addr = NULL; \
rc = NtMapViewOfSection(env->me_fmh, GetCurrentProcess(), &addr, 0, \ rc = NtMapViewOfSection(env->me_fmh, GetCurrentProcess(), &addr, 0, \
len, &off, &len, ViewUnmap, (env->me_flags & MDB_RDONLY) ? 0 : MEM_RESERVE, PAGE_READONLY) len, &off, &len, ViewUnmap, (env->me_flags & MDB_RDONLY) ? 0 : MEM_RESERVE, PAGE_READONLY); \
if (rc) rc = mdb_nt2win32(rc)
#else #else
off_t off; off_t off;
size_t len; size_t len;

Loading…
Cancel
Save