Changeset 14652

Timestamp:

Jan 2, 2016, 3:23:38 PM (6 years ago)

Author:

mikedld

Message:

#5663: Emulate GetOverlappedResultEx on Windows Vista/7

File:

• trunk/libtransmission/watchdir-win32.c (modified) (2 diffs)

trunk/libtransmission/watchdir-win32.c

@@ -62 +62 @@
 ***/
 
+static BOOL
+tr_get_overlapped_result_ex (HANDLE       handle,
+                             LPOVERLAPPED overlapped,
+                             LPDWORD      bytes_transferred,
+                             DWORD        timeout,
+                             BOOL         alertable)
+{
+  typedef BOOL (WINAPI * impl_t) (HANDLE, LPOVERLAPPED, LPDWORD, DWORD, BOOL);
+
+  static impl_t real_impl = NULL;
+  static bool is_real_impl_valid = false;
+
+  if (!is_real_impl_valid)
+    {
+      real_impl = (impl_t) GetProcAddress (GetModuleHandleW (L"kernel32.dll"),
+                                           "GetOverlappedResultEx");
+      is_real_impl_valid = true;
+    }
+
+  if (real_impl != NULL)
+    return real_impl (handle, overlapped, bytes_transferred, timeout, alertable);
+
+  const DWORD wait_result = WaitForSingleObjectEx (handle, timeout, alertable);
+  if (wait_result == WAIT_FAILED)
+    return FALSE;
+  if (wait_result == WAIT_IO_COMPLETION || wait_result == WAIT_TIMEOUT)
+    {
+      SetLastError (wait_result);
+      return FALSE;
+    }
+
+  assert (wait_result == WAIT_OBJECT_0);
+
+  return GetOverlappedResult (handle, overlapped, bytes_transferred, FALSE);
+}
+
 static unsigned int __stdcall
 tr_watchdir_win32_thread (void * context)
@@ -69 +105 @@
   DWORD bytes_transferred;
 
-  while (GetOverlappedResultEx (backend->fd, &backend->overlapped, &bytes_transferred,
-                                INFINITE, FALSE))
+  while (tr_get_overlapped_result_ex (backend->fd, &backend->overlapped, &bytes_transferred,
+                                      INFINITE, FALSE))
     {
       PFILE_NOTIFY_INFORMATION info = (PFILE_NOTIFY_INFORMATION) backend->buffer;