Re: [Mingw-w64-public] [PATCH] headers: Add missing names in shlwapi.h

2021-05-03 Thread Liu Hao 

在 2021-05-03 01:53, Biswapriyo Nath 写道:

 From 3bde731614cf9ea87f75a98752b905785b984485 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath
Date: Sun, 2 May 2021 23:21:56 +0530
Subject: [PATCH] headers: Add missing names in shlwapi.h

Signed-off-by: Biswapriyo Nath
---
  mingw-w64-headers/include/shlwapi.h | 32 -
  1 file changed, 27 insertions(+), 5 deletions(-)



Thanks. This patch looks good to me. Pushed.


--
Best regards,
Liu Hao



OpenPGP_signature
Description: OpenPGP digital signature
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] [PATCH] headers: Add missing names in shlwapi.h

2021-05-02 Thread Biswapriyo Nath 

From 3bde731614cf9ea87f75a98752b905785b984485 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath 
Date: Sun, 2 May 2021 23:21:56 +0530
Subject: [PATCH] headers: Add missing names in shlwapi.h

Signed-off-by: Biswapriyo Nath 
---
 mingw-w64-headers/include/shlwapi.h | 32 -
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/mingw-w64-headers/include/shlwapi.h 
b/mingw-w64-headers/include/shlwapi.h
index 41ed0fe..dc10c23 100644
--- a/mingw-w64-headers/include/shlwapi.h
+++ b/mingw-w64-headers/include/shlwapi.h
@@ -601,7 +601,18 @@ LWSTDAPI PathMatchSpecExW(LPCWSTR pszFile, LPCWSTR 
pszSpec, DWORD dwFlags);
 #define URL_UNESCAPE_HIGH_ANSI_ONLY 0x0040
 #define URL_INTERNAL_PATH 0x0080
 #define URL_FILE_USE_PATHURL 0x0001
+#if _WIN32_IE >= _WIN32_IE_IE60SP2
 #define URL_DONT_UNESCAPE 0x0002
+#endif
+#if NTDDI_VERSION >= NTDDI_WIN7
+#define URL_ESCAPE_AS_UTF8 0x0004
+#endif
+#if NTDDI_VERSION >= NTDDI_WIN8
+#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8
+#define URL_ESCAPE_ASCII_URI_COMPONENT 0x0008
+#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | 
URL_ESCAPE_AS_UTF8)
+#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8
+#endif
 #define URL_ESCAPE_PERCENT 0x1000
 #define URL_ESCAPE_SEGMENT_ONLY 0x2000
 
@@ -754,6 +765,7 @@ LWSTDAPI PathMatchSpecExW(LPCWSTR pszFile, LPCWSTR pszSpec, 
DWORD dwFlags);
 
 #define SRRF_NOEXPAND 0x1000
 #define SRRF_ZEROONFAILURE 0x2000
+#define SRRF_NOVIRT 0x4000
 
   LWSTDAPI_(LONG) SHRegGetValueA(HKEY hkey,LPCSTR pszSubKey,LPCSTR 
pszValue,SRRF dwFlags,DWORD *pdwType,void *pvData,DWORD *pcbData);
   LWSTDAPI_(LONG) SHRegGetValueW(HKEY hkey,LPCWSTR pszSubKey,LPCWSTR 
pszValue,SRRF dwFlags,DWORD *pdwType,void *pvData,DWORD *pcbData);
@@ -863,10 +875,19 @@ LWSTDAPI PathMatchSpecExW(LPCWSTR pszFile, LPCWSTR 
pszSpec, DWORD dwFlags);
 ASSOCF_REMAPRUNDLL = 0x0080,
 ASSOCF_NOFIXUPS = 0x0100,
 ASSOCF_IGNOREBASECLASS = 0x0200,
-ASSOCF_INIT_IGNOREUNKNOWN = 0x0400,
-ASSOCF_INIT_FIXED_PROGID = 0x0800,
-ASSOCF_IS_PROTOCOL = 0x1000,
-ASSOCF_INIT_FOR_FILE = 0x2000
+ASSOCF_INIT_IGNOREUNKNOWN = 0x0400
+#if NTDDI_VERSION >= NTDDI_WIN8
+,ASSOCF_INIT_FIXED_PROGID = 0x0800
+,ASSOCF_IS_PROTOCOL = 0x1000
+,ASSOCF_INIT_FOR_FILE = 0x2000
+#endif
+#if NTDDI_VERSION >= NTDDI_WIN10_RS1
+,ASSOCF_IS_FULL_URI = 0x4000
+,ASSOCF_PER_MACHINE_ONLY = 0x8000
+#endif
+#if NTDDI_VERSION >= NTDDI_WIN10_RS4
+,ASSOCF_APP_TO_APP = 0x0001
+#endif
   };
 
   typedef DWORD ASSOCF;
@@ -1213,6 +1234,7 @@ typedef const QITAB *LPCQITAB;
 #define CTF_INSIST 0x0001
 #define CTF_THREAD_REF 0x0002
 #define CTF_PROCESS_REF 0x0004
+#define CTF_COINIT_STA 0x0008
 #define CTF_COINIT 0x0008
 #if (_WIN32_IE >= _WIN32_IE_IE60)
 #define CTF_FREELIBANDEXIT 0x0010
@@ -1370,7 +1392,7 @@ typedef const QITAB *LPCQITAB;
 #define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER)
 #define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | 
SHGVSPB_NOAUTODEFAULTS)
 #define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS)
-#define SHGVSPB_GLOBALDEAFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS)
+#define SHGVSPB_GLOBALDEFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS)
 
   LWSTDAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl,LPCWSTR 
pszBagName,DWORD dwFlags,REFIID riid,void **ppv);
 #endif
-- 
2.31.1

___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public