[vlc-commits] [Git][videolan/vlc][master] 2 commits: uwp: include process.h before forcing the WINAPI_FAMILY

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
186f53a1 by Steve Lhomme at 2024-11-16T09:08:12+00:00
uwp: include process.h before forcing the WINAPI_FAMILY

Because of the hack on getpid() in fixups we don't want to get the unhidden desktop version

- - - - -
8a76075f by Steve Lhomme at 2024-11-16T09:08:12+00:00
vlc_fixup: only fix the bogus getpid detection if it was detected

In meson it's properly not detected in UWP.
It uses the compat version which will do just the same.

- - - - -


7 changed files:

- include/vlc_fixups.h
- modules/codec/avcodec/d3d11va.c
- modules/codec/avcodec/directx_va.c
- modules/codec/mft.cpp
- modules/codec/mft_d3d.cpp
- modules/codec/mft_d3d11.cpp
- modules/video_chroma/d3d11_fmt.cpp


Changes:

=====================================
include/vlc_fixups.h
=====================================
@@ -346,7 +346,7 @@ struct timezone;
 int gettimeofday(struct timeval *, struct timezone *);
 #endif
 
-#if defined(WIN32) && !defined(WINSTORECOMPAT)
+#if defined(WIN32) && !defined(WINSTORECOMPAT) && defined(HAVE_GETPID)
 #include <winapifamily.h>
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 // getpid is incorrectly detected in UWP so we won't use the compat version


=====================================
modules/codec/avcodec/d3d11va.c
=====================================
@@ -29,6 +29,7 @@
   * See https://msdn.microsoft.com/en-us/library/windows/desktop/hh162912%28v=vs.85%29.aspx
   **/
 
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP


=====================================
modules/codec/avcodec/directx_va.c
=====================================
@@ -23,6 +23,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP


=====================================
modules/codec/mft.cpp
=====================================
@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 #ifndef _MSC_VER // including mfapi with mingw-w64 is not clean for UWP yet
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP


=====================================
modules/codec/mft_d3d.cpp
=====================================
@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 #ifndef _MSC_VER // including mfapi with mingw-w64 is not clean for UWP yet
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP


=====================================
modules/codec/mft_d3d11.cpp
=====================================
@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 #ifndef _MSC_VER // including mfapi with mingw-w64 is not clean for UWP yet
+#include <process.h>
 #include <winapifamily.h>
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP


=====================================
modules/video_chroma/d3d11_fmt.cpp
=====================================
@@ -20,6 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <process.h>
 #include <winapifamily.h>
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 #define BUILD_FOR_UAP 0



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/676b9ca1847a5836ffc81a39b90b6b5841205248...8a76075f9664d94ff9391e1b2f5246dd16787a17

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/676b9ca1847a5836ffc81a39b90b6b5841205248...8a76075f9664d94ff9391e1b2f5246dd16787a17
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance