From: mistachkin <mistachkin@noemail.net>
Date: Mon, 23 Jul 2012 02:00:38 +0000 (+0000)
Subject: Enhance implementation of the Win32 thread wait function.
X-Git-Tag: version-3.8.7~132^2~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=572df3b1e4a307e2657579658c041f567442f50c;p=thirdparty%2Fsqlite.git

Enhance implementation of the Win32 thread wait function.

FossilOrigin-Name: 049b04117353c3e163ffc87916cbe121403a2821
---

diff --git a/manifest b/manifest
index dcf166e469..da25a187c6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sWin32\ssupport\sto\sthe\sinternal\sthreads\sinterface.\s\sAlso,\sadd\sseveral\sasserts\sand\sfix\sa\sfew\stypos.
-D 2012-07-21T22:49:08.403
+C Enhance\simplementation\sof\sthe\sWin32\sthread\swait\sfunction.
+D 2012-07-23T02:00:38.699
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a89f9692d1369faa4071310164ffba0504c324d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h c2ebd26a68a4223fe170b003852b97d9e7211498
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
-F src/os_win.c 899783012ed47a756cd4358b43ecfa139cf14ace
+F src/os_win.c f9f2a4569f9a6d2415170261641e6e3ee6ed8121
 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@ -1006,7 +1006,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 0e4d977a4a07d6de50acbf022c7dd947998b8d96
-R a23a964d0745aaa13c7e5378646293f9
+P 793195d37109c75eba84f7190c8fe0b8722f76f7
+R 49885bc11b122527dda4cd8bcfe1cfa0
 U mistachkin
-Z d6738fe175fa5cec50ba76dfb911d019
+Z b0f357746aebd8329bde52b662a0497e
diff --git a/manifest.uuid b/manifest.uuid
index 25fa463af5..1d07b1a32a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-793195d37109c75eba84f7190c8fe0b8722f76f7
\ No newline at end of file
+049b04117353c3e163ffc87916cbe121403a2821
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index d3f9671809..75d0edcddb 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -946,7 +946,10 @@ void sqlite3_win32_sleep(DWORD milliseconds){
 }
 
 DWORD sqlite3Win32Wait(HANDLE hObject){
-  return osWaitForSingleObjectEx(hObject, INFINITE, TRUE);
+  DWORD rc;
+  while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
+                                       TRUE))==WAIT_IO_COMPLETION ){}
+  return rc;
 }
 
 /*