From 7e8be3f2804b8dfca1ede2a4e463f8a0b2b352d5 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 3 Jul 2023 16:06:59 -0700 Subject: [PATCH] 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) --- src/video/windows/SDL_windowsclipboard.c | 36 +++++++++++++++--------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/video/windows/SDL_windowsclipboard.c b/src/video/windows/SDL_windowsclipboard.c index bd43fc574..892af0d98 100644 --- a/src/video/windows/SDL_windowsclipboard.c +++ b/src/video/windows/SDL_windowsclipboard.c @@ -102,23 +102,31 @@ int WIN_SetClipboardText(_THIS, const char *text) char *WIN_GetClipboardText(_THIS) { - char *text; + char *text = NULL; - text = NULL; - if (IsClipboardFormatAvailable(TEXT_FORMAT) && - OpenClipboard(GetWindowHandle(_this))) { - HANDLE hMem; - LPTSTR tstr; + if (IsClipboardFormatAvailable(TEXT_FORMAT)) { + /* Retry to open the clipboard in case another application has it open */ + const int MAX_ATTEMPTS = 3; + int attempt; - hMem = GetClipboardData(TEXT_FORMAT); - if (hMem) { - tstr = (LPTSTR)GlobalLock(hMem); - text = WIN_StringToUTF8(tstr); - GlobalUnlock(hMem); - } else { - WIN_SetError("Couldn't get clipboard data"); + 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("");