[FFmpeg-cvslog] libavdevice/gdigrab: fix capture of windows with non-ASCII titles

He Yang git at videolan.org
Tue Apr 13 19:41:35 EEST 2021


ffmpeg | branch: master | He Yang <1160386205 at qq.com> | Sat Mar 20 23:32:15 2021 +0800| [707f9c9f475f612e196876708cdb5ead31f63525] | committer: Jan Ekström

libavdevice/gdigrab: fix capture of windows with non-ASCII titles

Properly convert the UTF-8 input string to Windows wchar, and
utilize the wchar version of FindWindow.

Signed-off-by: He Yang <1160386205 at qq.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=707f9c9f475f612e196876708cdb5ead31f63525
---

 libavdevice/gdigrab.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c
index 9b2c55fe90..7688370643 100644
--- a/libavdevice/gdigrab.c
+++ b/libavdevice/gdigrab.c
@@ -32,6 +32,7 @@
 #include "libavformat/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
+#include "libavutil/wchar_filename.h"
 #include <windows.h>
 
 /**
@@ -245,8 +246,20 @@ gdigrab_read_header(AVFormatContext *s1)
     int ret;
 
     if (!strncmp(filename, "title=", 6)) {
+        wchar_t *name_w = NULL;
         name = filename + 6;
-        hwnd = FindWindow(NULL, name);
+
+        if(utf8towchar(name, &name_w)) {
+            ret = AVERROR(errno);
+            goto error;
+        }
+        if(!name_w) {
+            ret = AVERROR(EINVAL);
+            goto error;
+        }
+
+        hwnd = FindWindowW(NULL, name_w);
+        av_freep(&name_w);
         if (!hwnd) {
             av_log(s1, AV_LOG_ERROR,
                    "Can't find window '%s', aborting.\n", name);



More information about the ffmpeg-cvslog mailing list