Commit c7054df2 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

vlc-winrt-*: Update mingw patchset

parent cf234903
From 1b6fc0ae2e13045479d9e3bc0cae3f27f3a43200 Mon Sep 17 00:00:00 2001
From 7383e7450a28419c467e5f91a8875e827435a498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:09:37 +0200
Subject: [PATCH 5/5] winreg.h: Add missing WINAPI_PARTITION_DESKTOP guard
  • The latest git master version of mingw-w64 should now have patches 2-4 of this patchset applied, and a better fix for patch 1 in libwinstorecompat. Please have a look and try rebuilding the base docker image (and check that vlc-winrt actually still works and passes WACK)...

  • Sorry, patches 2-5 of course. AFAIK everything of value from here should have been merged.

Please register or sign in to reply
Also update shlwapi.h since it uses some of the functions/types declared
by winreg.h
---
mingw-w64-headers/include/winreg.h | 5 +++++
1 file changed, 5 insertions(+)
mingw-w64-headers/include/shlwapi.h | 4 ++++
mingw-w64-headers/include/winreg.h | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/mingw-w64-headers/include/shlwapi.h b/mingw-w64-headers/include/shlwapi.h
index 19ff1f7c..7475250a 100644
--- a/mingw-w64-headers/include/shlwapi.h
+++ b/mingw-w64-headers/include/shlwapi.h
@@ -7,9 +7,12 @@
#define _INC_SHLWAPI
#include <_mingw_unicode.h>
+#include <winapifamily.h>
#ifndef NOSHLWAPI
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#include <objbase.h>
#include <shtypes.h>
@@ -941,3 +944,4 @@ LWSTDAPI_(IStream *) SHCreateMemStream(const BYTE *pInit, _In_ UINT cbInit);
#include <poppack.h>
#endif
#endif
+#endif
diff --git a/mingw-w64-headers/include/winreg.h b/mingw-w64-headers/include/winreg.h
index c7caec8b..d49ab454 100644
index c7caec8b..84c51afd 100644
--- a/mingw-w64-headers/include/winreg.h
+++ b/mingw-w64-headers/include/winreg.h
@@ -7,11 +7,14 @@
@@ -7,6 +7,7 @@
#define _WINREG_
#include <_mingw_unicode.h>
......@@ -19,13 +44,15 @@ index c7caec8b..d49ab454 100644
#ifdef __cplusplus
extern "C" {
#endif
@@ -110,6 +111,8 @@ extern "C" {
#define WIN31_CLASS NULL
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#ifndef WINVER
#define WINVER 0x0502
#endif
#define RegConnectRegistry __MINGW_NAME_AW(RegConnectRegistry)
#define RegConnectRegistryEx __MINGW_NAME_AW(RegConnectRegistryEx)
#define RegCreateKey __MINGW_NAME_AW(RegCreateKey)
@@ -408,6 +411,8 @@ WINADVAPI DWORD WINAPI InitiateShutdownW(
#endif /* (_WIN32_WINNT >= 0x0600) */
......
From 1b6fc0ae2e13045479d9e3bc0cae3f27f3a43200 Mon Sep 17 00:00:00 2001
From 7383e7450a28419c467e5f91a8875e827435a498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:09:37 +0200
Subject: [PATCH 5/5] winreg.h: Add missing WINAPI_PARTITION_DESKTOP guard
Also update shlwapi.h since it uses some of the functions/types declared
by winreg.h
---
mingw-w64-headers/include/winreg.h | 5 +++++
1 file changed, 5 insertions(+)
mingw-w64-headers/include/shlwapi.h | 4 ++++
mingw-w64-headers/include/winreg.h | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/mingw-w64-headers/include/shlwapi.h b/mingw-w64-headers/include/shlwapi.h
index 19ff1f7c..7475250a 100644
--- a/mingw-w64-headers/include/shlwapi.h
+++ b/mingw-w64-headers/include/shlwapi.h
@@ -7,9 +7,12 @@
#define _INC_SHLWAPI
#include <_mingw_unicode.h>
+#include <winapifamily.h>
#ifndef NOSHLWAPI
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#include <objbase.h>
#include <shtypes.h>
@@ -941,3 +944,4 @@ LWSTDAPI_(IStream *) SHCreateMemStream(const BYTE *pInit, _In_ UINT cbInit);
#include <poppack.h>
#endif
#endif
+#endif
diff --git a/mingw-w64-headers/include/winreg.h b/mingw-w64-headers/include/winreg.h
index c7caec8b..d49ab454 100644
index c7caec8b..84c51afd 100644
--- a/mingw-w64-headers/include/winreg.h
+++ b/mingw-w64-headers/include/winreg.h
@@ -7,11 +7,14 @@
@@ -7,6 +7,7 @@
#define _WINREG_
#include <_mingw_unicode.h>
......@@ -19,13 +44,15 @@ index c7caec8b..d49ab454 100644
#ifdef __cplusplus
extern "C" {
#endif
@@ -110,6 +111,8 @@ extern "C" {
#define WIN31_CLASS NULL
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#ifndef WINVER
#define WINVER 0x0502
#endif
#define RegConnectRegistry __MINGW_NAME_AW(RegConnectRegistry)
#define RegConnectRegistryEx __MINGW_NAME_AW(RegConnectRegistryEx)
#define RegCreateKey __MINGW_NAME_AW(RegCreateKey)
@@ -408,6 +411,8 @@ WINADVAPI DWORD WINAPI InitiateShutdownW(
#endif /* (_WIN32_WINNT >= 0x0600) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment