[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: win32touch: don't force WINVER

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
0aa6dbad by Steve Lhomme at 2024-10-17T10:06:50+00:00
win32touch: don't force WINVER

We should only force it if it's wrong. But even then we must reset the value so it matches the
_WIN32_WINNT_WIN7 we force.

- - - - -
941a927d by Steve Lhomme at 2024-10-17T10:06:50+00:00
mft: don't force WINVER

We should only force it if it's wrong. But even then we must reset the value so it matches the
_WIN32_WINNT_WIN7 we force.

Forcing _WIN32_WINNT is better than just WINVER.

- - - - -


2 changed files:

- modules/codec/mft.c
- modules/video_output/win32/win32touch.h


Changes:

=====================================
modules/codec/mft.c
=====================================
@@ -24,8 +24,12 @@
 # include "config.h"
 #endif
 
-#undef WINVER
-#define WINVER 0x0601
+#if _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7
+# define MFT_USES_LOAD_LIBRARY
+# undef _WIN32_WINNT
+# define _WIN32_WINNT _WIN32_WINNT_WIN7
+# undef WINVER
+#endif
 
 /* Needed for many mingw macros. */
 #define COBJMACROS
@@ -1090,7 +1094,7 @@ static int FindMFT(decoder_t *p_dec)
 
 static int LoadMFTLibrary(MFHandle *mf)
 {
-#if _WIN32_WINNT < _WIN32_WINNT_WIN7 || VLC_WINSTORE_APP
+#if defined(MFT_USES_LOAD_LIBRARY) || VLC_WINSTORE_APP
     mf->mfplat_dll = LoadLibrary(TEXT("mfplat.dll"));
     if (!mf->mfplat_dll)
         return VLC_EGENERIC;


=====================================
modules/video_output/win32/win32touch.h
=====================================
@@ -31,8 +31,8 @@
 #if _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7
 # undef _WIN32_WINNT
 # define _WIN32_WINNT _WIN32_WINNT_WIN7
+# undef WINVER
 #endif
-#define WINVER _WIN32_WINNT_WIN7
 
 #include <vlc_common.h>
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9cf50d17c666ffe39cf5fcbf7d682a796f1f9dd2...941a927de9fc8a24452430dff9f2b7aea849f4c2

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9cf50d17c666ffe39cf5fcbf7d682a796f1f9dd2...941a927de9fc8a24452430dff9f2b7aea849f4c2
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance