]> git.sesse.net Git - ffmpeg/commitdiff
libavdevice/gdigrab: fix capture of windows with non-ASCII titles
authorHe Yang <1160386205@qq.com>
Sat, 20 Mar 2021 15:32:15 +0000 (23:32 +0800)
committerJan Ekström <jeebjp@gmail.com>
Tue, 13 Apr 2021 16:34:33 +0000 (19:34 +0300)
Properly convert the UTF-8 input string to Windows wchar, and
utilize the wchar version of FindWindow.

Signed-off-by: He Yang <1160386205@qq.com>
libavdevice/gdigrab.c

index 9b2c55fe902a28a7090e902a236d75c86e1a95ac..7688370643cccb9c5727a188d04adf2b7079d556 100644 (file)
@@ -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);