From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 89FB43858C50; Tue, 12 Jul 2022 11:00:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89FB43858C50 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: clipboard: Add workaround for setting clipboard failure. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: 1db7cf5ce68e938d5f66ef5d70474f725b85d0e2 X-Git-Newrev: 9193f6efdeb090a677fe94b2279ede0d011246b9 Message-Id: <20220712110005.89FB43858C50@sourceware.org> Date: Tue, 12 Jul 2022 11:00:05 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2022 11:00:05 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D9193f6efdeb= 090a677fe94b2279ede0d011246b9 commit 9193f6efdeb090a677fe94b2279ede0d011246b9 Author: Takashi Yano Date: Sat Jul 2 12:08:51 2022 +0900 Cygwin: clipboard: Add workaround for setting clipboard failure. =20 - OpenClipboard() just after CloseClipboard() sometimes fails. Due to this, /dev/clipboard sometimes fails to set CF_UNICODETEXT data. This patch add a workaround for this issue. Diff: --- winsup/cygwin/fhandler_clipboard.cc | 47 +++++++++++++++++++++++++++------= ---- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_c= lipboard.cc index 4886968b2..fe3545bf5 100644 --- a/winsup/cygwin/fhandler_clipboard.cc +++ b/winsup/cygwin/fhandler_clipboard.cc @@ -20,6 +20,27 @@ details. */ #include #include =20 +/* Opening clipboard immediately after CloseClipboard() + sometimes fails. Therefore use retry-loop. */ +static inline bool +open_clipboard () +{ + const int max_retry =3D 10; + for (int i =3D 0; i < max_retry; i++) + { + if (OpenClipboard (NULL)) + return true; + Sleep (1); + } + return false; +} + +static inline bool +close_clipboard () +{ + return CloseClipboard (); +} + /* * Robert Collins: * FIXME: should we use GetClipboardSequenceNumber to tell if the clipboar= d has @@ -30,9 +51,9 @@ fhandler_dev_clipboard::fhandler_dev_clipboard () : fhandler_base (), pos (0), membuffer (NULL), msize (0) { /* FIXME: check for errors and loop until we can open the clipboard */ - OpenClipboard (NULL); + open_clipboard (); cygnativeformat =3D RegisterClipboardFormatW (CYGWIN_NATIVE); - CloseClipboard (); + close_clipboard (); } =20 /* @@ -54,7 +75,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, s= ize_t len) { HGLOBAL hmem; /* Native CYGWIN format */ - if (OpenClipboard (NULL)) + if (open_clipboard ()) { cygcb_t *clipbuf; =20 @@ -62,7 +83,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, s= ize_t len) if (!hmem) { __seterrno (); - CloseClipboard (); + close_clipboard (); return -1; } clipbuf =3D (cygcb_t *) GlobalLock (hmem); @@ -74,7 +95,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, s= ize_t len) GlobalUnlock (hmem); EmptyClipboard (); HANDLE ret =3D SetClipboardData (cygnativeformat, hmem); - CloseClipboard (); + close_clipboard (); /* According to MSDN, hmem must not be free'd after transferring the data to the clipboard via SetClipboardData. */ /* GlobalFree (hmem); */ @@ -92,7 +113,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, = size_t len) set_errno (EILSEQ); return -1; } - if (OpenClipboard (NULL)) + if (open_clipboard ()) { PWCHAR clipbuf; =20 @@ -100,14 +121,14 @@ fhandler_dev_clipboard::set_clipboard (const void *bu= f, size_t len) if (!hmem) { __seterrno (); - CloseClipboard (); + close_clipboard (); return -1; } clipbuf =3D (PWCHAR) GlobalLock (hmem); sys_mbstowcs (clipbuf, len + 1, (const char *) buf); GlobalUnlock (hmem); HANDLE ret =3D SetClipboardData (CF_UNICODETEXT, hmem); - CloseClipboard (); + close_clipboard (); /* According to MSDN, hmem must not be free'd after transferring the data to the clipboard via SetClipboardData. */ /* GlobalFree (hmem); */ @@ -161,7 +182,7 @@ fhandler_dev_clipboard::fstat (struct stat *buf) buf->st_ctim.tv_nsec =3D 0L; buf->st_birthtim =3D buf->st_atim =3D buf->st_mtim =3D buf->st_ctim; =20 - if (OpenClipboard (NULL)) + if (open_clipboard ()) { UINT formatlist[1] =3D { cygnativeformat }; int format; @@ -176,7 +197,7 @@ fhandler_dev_clipboard::fstat (struct stat *buf) buf->st_size =3D clipbuf->cb_size; GlobalUnlock (hglb); } - CloseClipboard (); + close_clipboard (); } =20 return 0; @@ -192,7 +213,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len) LPVOID cb_data; int rach; =20 - if (!OpenClipboard (NULL)) + if (!open_clipboard ()) { len =3D 0; return; @@ -203,7 +224,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len) || !(hglb =3D GetClipboardData (format)) || !(cb_data =3D GlobalLock (hglb))) { - CloseClipboard (); + close_clipboard (); len =3D 0; return; } @@ -290,7 +311,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len) } } GlobalUnlock (hglb); - CloseClipboard (); + close_clipboard (); len =3D ret; }