소스 검색

Retry to open the clipboard in case another application has it open

This fixes 'testautomation --filter clipboard_testClipboardTextFunctions' on Windows

(cherry picked from commit c24496727cdd40d5c0ffdf7b6a61085ec3a2766d)
Sam Lantinga 1 년 전
부모
커밋
7e8be3f280
1개의 변경된 파일24개의 추가작업 그리고 16개의 파일을 삭제
  1. 24 16
      src/video/windows/SDL_windowsclipboard.c

+ 24 - 16
src/video/windows/SDL_windowsclipboard.c

@@ -102,23 +102,31 @@ int WIN_SetClipboardText(_THIS, const char *text)
 
 char *WIN_GetClipboardText(_THIS)
 {
-    char *text;
-
-    text = NULL;
-    if (IsClipboardFormatAvailable(TEXT_FORMAT) &&
-        OpenClipboard(GetWindowHandle(_this))) {
-        HANDLE hMem;
-        LPTSTR tstr;
-
-        hMem = GetClipboardData(TEXT_FORMAT);
-        if (hMem) {
-            tstr = (LPTSTR)GlobalLock(hMem);
-            text = WIN_StringToUTF8(tstr);
-            GlobalUnlock(hMem);
-        } else {
-            WIN_SetError("Couldn't get clipboard data");
+    char *text = NULL;
+
+    if (IsClipboardFormatAvailable(TEXT_FORMAT)) {
+        /* Retry to open the clipboard in case another application has it open */
+        const int MAX_ATTEMPTS = 3;
+        int attempt;
+
+        for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
+            if (OpenClipboard(GetWindowHandle(_this))) {
+                HANDLE hMem;
+                LPTSTR tstr;
+
+                hMem = GetClipboardData(TEXT_FORMAT);
+                if (hMem) {
+                    tstr = (LPTSTR)GlobalLock(hMem);
+                    text = WIN_StringToUTF8(tstr);
+                    GlobalUnlock(hMem);
+                } else {
+                    WIN_SetError("Couldn't get clipboard data");
+                }
+                CloseClipboard();
+                break;
+            }
+            SDL_Delay(10);
         }
-        CloseClipboard();
     }
     if (text == NULL) {
         text = SDL_strdup("");