src/win32/thread.c

@@ -443,7 +443,7 @@ int vlc_savecancel (void)
     if (th == NULL)
         return false; /* Main thread - cannot be cancelled anyway */
 
-    int state = th->killable;
+    bool state = th->killable;
     th->killable = false;
     return state;
 }
@@ -457,7 +457,7 @@ void vlc_restorecancel (int state)
         return; /* Main thread - cannot be cancelled anyway */
 
     assert (!th->killable);
-    th->killable = state != 0;
+    th->killable = !!state;
 }
 
 noreturn static void vlc_docancel(struct vlc_thread *th)
@@ -591,11 +591,10 @@ vlc_tick_t vlc_tick_now (void)
 void (vlc_tick_wait)(vlc_tick_t deadline)
 {
     vlc_tick_t delay;
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
     struct vlc_thread *th = current_thread_ctx;
-
-    if (th != NULL && th->killable)
+    if (likely(th != NULL) && th->killable)
     {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
         do
         {
             if (atomic_load_explicit(&th->killed, memory_order_acquire))
@@ -604,10 +603,11 @@ void (vlc_tick_wait)(vlc_tick_t deadline)
         while (vlc_atomic_timedwait(&th->killed, false, deadline) == 0);
 
         return;
-    }
 #else
-    vlc_testcancel();
+        if (atomic_load_explicit(&th->killed, memory_order_relaxed))
+            vlc_docancel(th);
 #endif
+    }
 
     while ((delay = (deadline - vlc_tick_now())) > 0)
     {
@@ -619,7 +619,12 @@ void (vlc_tick_wait)(vlc_tick_t deadline)
         Sleep(delay);
 #else
         SleepEx(delay, TRUE);
-        vlc_testcancel();
+
+        if (likely(th != NULL) && th->killable)
+        {
+            if (atomic_load_explicit(&th->killed, memory_order_relaxed))
+                vlc_docancel(th);
+        }
 #endif
     }
 }
@@ -716,7 +721,7 @@ BOOL WINAPI DllMain (HANDLE hinstDll, DWORD fdwReason, LPVOID lpvReserved)
         case DLL_PROCESS_ATTACH:
         {
             HMODULE h;
-            h = GetModuleHandle(TEXT("kernel32.dll"));
+            h = GetModuleHandle(TEXT("kernelbase.dll"));
             if (h == NULL)
                 h = GetModuleHandle(TEXT("api-ms-win-core-processthreads-l1-1-3.dll"));
             if (h != NULL)