[PATCH] include: Add more URL_* flags.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 include/shlwapi.h | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/include/shlwapi.h b/include/shlwapi.h
index a282ae6d993..6149c7081a3 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -648,28 +648,34 @@ typedef enum {
 /* The following are used by UrlEscape..., UrlUnEscape...,
  * UrlCanonicalize..., and UrlCombine... routines
  */
-#define URL_WININET_COMPATIBILITY    0x80000000
-#define URL_PLUGGABLE_PROTOCOL       0x40000000
-#define URL_ESCAPE_UNSAFE            0x20000000
-#define URL_UNESCAPE                 0x10000000
+#define URL_WININET_COMPATIBILITY       0x80000000
+#define URL_PLUGGABLE_PROTOCOL          0x40000000
+#define URL_ESCAPE_UNSAFE               0x20000000
+#define URL_UNESCAPE                    0x10000000

-#define URL_DONT_SIMPLIFY            0x08000000
-#define URL_NO_META                  URL_DONT_SIMPLIFY
-#define URL_ESCAPE_SPACES_ONLY       0x04000000
-#define URL_DONT_ESCAPE_EXTRA_INFO   0x02000000
-#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO
-#define URL_BROWSER_MODE             URL_DONT_ESCAPE_EXTRA_INFO
+#define URL_DONT_SIMPLIFY               0x08000000
+#define URL_ESCAPE_SPACES_ONLY          0x04000000
+#define URL_DONT_ESCAPE_EXTRA_INFO      0x02000000

-#define URL_INTERNAL_PATH            0x00800000  /* Will escape #'s in paths */
-#define URL_UNESCAPE_HIGH_ANSI_ONLY  0x00400000
-#define URL_CONVERT_IF_DOSPATH       0x00200000
-#define URL_UNESCAPE_INPLACE         0x00100000
+#define URL_INTERNAL_PATH               0x00800000
+#define URL_UNESCAPE_HIGH_ANSI_ONLY     0x00400000
+#define URL_CONVERT_IF_DOSPATH          0x00200000
+#define URL_UNESCAPE_INPLACE            0x00100000

-#define URL_FILE_USE_PATHURL         0x00010000
-#define URL_ESCAPE_AS_UTF8           0x00040000
+#define URL_ESCAPE_ASCII_URI_COMPONENT  0x00080000
+#define URL_ESCAPE_AS_UTF8              0x00040000
+#define URL_DONT_UNESCAPE               0x00020000
+#define URL_FILE_USE_PATHURL            0x00010000

-#define URL_ESCAPE_SEGMENT_ONLY      0x00002000
-#define URL_ESCAPE_PERCENT           0x00001000
+#define URL_ESCAPE_SEGMENT_ONLY         0x00002000
+#define URL_ESCAPE_PERCENT              0x00001000
+
+#define URL_BROWSER_MODE                URL_DONT_ESCAPE_EXTRA_INFO
+#define URL_DONT_UNESCAPE_EXTRA_INFO    URL_DONT_ESCAPE_EXTRA_INFO
+#define URL_ESCAPE_URI_COMPONENT        (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8)
+#define URL_NO_META                     URL_DONT_SIMPLIFY
+#define URL_UNESCAPE_AS_UTF8            URL_ESCAPE_AS_UTF8
+#define URL_UNESCAPE_URI_COMPONENT      URL_UNESCAPE_AS_UTF8

HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD);
 HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);