1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

gdigrab: Fix hwnd parameter issues

Converting from an integer to HWND (which is a pointer) requires
an explicit cast, otherwise Clang errors out like this:

    src/libavdevice/gdigrab.c:280:14: error: incompatible integer to pointer conversion assigning to 'HWND' (aka 'struct HWND__ *') from 'long' [-Wint-conversion]
      280 |         hwnd = strtol(name, &p, 0);
          |              ^ ~~~~~~~~~~~~~~~~~~~

(With GCC and MSVC, this was a mere warning, but with recent Clang,
this is an error.)

After adding a cast, all compilers also warn something like this:

    src/libavdevice/gdigrab.c:280:16: warning: cast to 'HWND' (aka 'struct HWND__ *') from smaller integer type 'long' [-Wint-to-pointer-cast]
      280 |         hwnd = (HWND) strtol(name, &p, 0);
          |                ^~~~~~~~~~~~~~~~~~~~~~~~~~

On Windows, long types are 32 bit, so to get a usable pointer, we
need to use long long. And interpret it as unsigned long long
while at it - i.e. using strtoull.

Finally, right above it, the code triggered the following warning:

    src/libavdevice/gdigrab.c:278:15: warning: mixing declarations and code is incompatible with standards before C99 [-Wdeclaration-after-statement]
      278 |         char *p;
          |               ^

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2023-12-18 10:48:28 +02:00
parent b391fdbf1a
commit f80b2ce9fa

View File

@ -274,10 +274,10 @@ gdigrab_read_header(AVFormatContext *s1)
} else if (!strcmp(filename, "desktop")) { } else if (!strcmp(filename, "desktop")) {
hwnd = NULL; hwnd = NULL;
} else if (!strncmp(filename, "hwnd=", 5)) { } else if (!strncmp(filename, "hwnd=", 5)) {
name = filename + 5;
char *p; char *p;
name = filename + 5;
hwnd = strtol(name, &p, 0); hwnd = (HWND) strtoull(name, &p, 0);
if (p == NULL || p == name || p[0] == '\0') if (p == NULL || p == name || p[0] == '\0')
{ {