--- BDB/BDB.xs	2008/03/30 06:28:08	1.34
+++ BDB/BDB.xs	2008/05/21 19:13:43	1.38
@@ -66,15 +66,31 @@
 static char *
 get_bdb_filename (SV *sv)
 {
-  return !SvOK (sv)
-            ? 0
-            :
-#if WIN32
-              SvPVutf8_nolen (sv)
+  if (!SvOK (sv))
+    return 0;
+
+#if _WIN32
+  /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
+  {
+    STRLEN len;
+    char *src = SvPVbyte (sv, len);
+    SV *t1 = sv_newmortal ();
+    SV *t2 = sv_newmortal ();
+
+    sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
+    sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
+
+    len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
+    len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
+    SvPOK_only (t2);
+    SvPVX (t2)[len] = 0;
+    SvCUR_set (t2, len);
+
+    return SvPVX (t2);
+  }
 #else
-              SvPVbyte_nolen (sv)
+  return SvPVbyte_nolen (sv);
 #endif
-         ;
 }
 
 static void
@@ -167,6 +183,8 @@
 
 #define AIO_TICKS ((1000000 + 1023) >> 10)
 
+static SV *on_next_submit;
+
 static unsigned int max_poll_time = 0;
 static unsigned int max_poll_reqs = 0;
 
@@ -487,6 +505,18 @@
 {
   SV *wait_callback = 0;
 
+  if (on_next_submit)
+    {
+      dSP;
+      SV *cb = sv_2mortal (on_next_submit);
+
+      on_next_submit = 0;
+
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (cb, G_DISCARD | G_EVAL);
+    }
+
   // synthesize callback if none given
   if (!SvOK (req->callback))
     {
@@ -1207,13 +1237,6 @@
         create_respipe ();
 
         X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
-#ifdef _WIN32
-        X_MUTEX_CHECK (wrklock);
-        X_MUTEX_CHECK (reslock);
-        X_MUTEX_CHECK (reqlock);
-
-        X_COND_CHECK  (reqwait);
-#endif
         patch_errno ();
 }
 
@@ -1364,6 +1387,11 @@
 	OUTPUT:
         RETVAL
 
+void _on_next_submit (SV *cb)
+        CODE:
+        SvREFCNT_dec (on_next_submit);
+        on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
+
 DB_ENV *
 db_env_create (U32 env_flags = 0)
 	CODE: