- Define rest of URL_ESCAPE... and other flags.

dlls/comctl32/commctrl.c

@@ -11,10 +11,11 @@
 #include "winbase.h"
 #include "heap.h"
 #include "commctrl.h"
-#include "debugtools.h"
 #include "winerror.h"
+#include "winreg.h"
 #include "shlwapi.h"
 #include "comctl32.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(commctrl);
 

dlls/commdlg/filedlgbrowser.c

@@ -12,13 +12,14 @@
 #include "winnls.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "winreg.h"
 
 #include "shlwapi.h"
 #include "filedlgbrowser.h"
 #include "cdlg.h"
 #include "shlguid.h"
 #include "wine/obj_serviceprovider.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
 

dlls/richedit/richedit.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
-#include "debugtools.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "riched32.h"
 #include "richedit.h"
@@ -21,6 +21,7 @@
 
 #include "rtf.h"
 #include "rtf2text.h"
+#include "debugtools.h"
 
 #define ID_EDIT      1
 

dlls/shdocvw/shdocvw_main.c

@@ -5,12 +5,13 @@
  */
 
 #include <string.h>
-#include "debugtools.h"
+#include "winreg.h"
 #include "initguid.h"
 #include "ole2.h"
 #include "shlwapi.h"
 
 #include "shdocvw.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shdocvw);
 

dlls/shell32/clipboard.c

@@ -21,13 +21,14 @@
 
 #include <string.h>
 
-#include "debugtools.h"
-
-#include "pidl.h"
+#include "winreg.h"
 #include "shlwapi.h"
+#include "pidl.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 
+#include "debugtools.h"
+
 DEFAULT_DEBUG_CHANNEL(shell);
 
 static int refClipCount = 0;

dlls/shell32/iconcache.c

@@ -9,6 +9,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winreg.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "heap.h"

dlls/shell32/pidl.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "winbase.h"
-#include "debugtools.h"
+#include "winreg.h"
 #include "shlguid.h"
 #include "winerror.h"
 #include "winnls.h"
@@ -22,6 +22,7 @@
 #include "shlwapi.h"
 
 #include "pidl.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(pidl);
 DECLARE_DEBUG_CHANNEL(shell);

dlls/shell32/shell.c

@@ -11,13 +11,13 @@
 #include <unistd.h>
 #include <ctype.h>
 
+#include "windef.h"
+#include "winerror.h"
+#include "winreg.h"
 #include "dlgs.h"
 #include "shellapi.h"
 #include "shlobj.h"
 #include "shlwapi.h"
-#include "windef.h"
-#include "winerror.h"
-#include "winreg.h"
 
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

dlls/shell32/shell32_main.c

@@ -11,14 +11,14 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "windef.h"
+#include "winerror.h"
+#include "winreg.h"
 #include "dlgs.h"
 #include "shellapi.h"
 #include "shlobj.h"
 #include "shlguid.h"
 #include "shlwapi.h"
-#include "windef.h"
-#include "winerror.h"
-#include "winreg.h"
 
 #include "undocshell.h"
 #include "wine/winuser16.h"

dlls/shell32/shellstring.c

@@ -5,14 +5,14 @@
 
 #include "winnls.h"
 #include "winerror.h"
-#include "debugtools.h"
+#include "winreg.h"
 
 #include "shlobj.h"
-#include "shlwapi.h"
 #include "shellapi.h"
 #include "shell32_main.h"
 #include "undocshell.h"
 #include "wine/unicode.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/shlfileop.c

@@ -2,15 +2,15 @@
  * SHFileOperation
  */
 #include <string.h>
-#include "debugtools.h"
-#include "shellapi.h"
-#include "shlwapi.h"
 
+#include "winreg.h"
+#include "shellapi.h"
 #include "shlobj.h"
 #include "shresdef.h"
 #include "shell32_main.h"
 #include "undocshell.h"
 #include "shlwapi.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/shlfolder.c

@@ -12,9 +12,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "debugtools.h"
 #include "winerror.h"
 #include "winbase.h"
+#include "winreg.h"
 
 #include "oleidl.h"
 #include "shlguid.h"
@@ -28,6 +28,7 @@
 #include "shresdef.h"
 #include "shlwapi.h"
 #include "shellfolder.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/shlmenu.c

@@ -3,6 +3,7 @@
  */
 #include <string.h>
 
+#include "winreg.h"
 #include "shlobj.h"
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"
@@ -10,11 +11,11 @@
 #include "undocshell.h"
 #include "shlwapi.h"
 #include "heap.h"
-#include "debugtools.h"
 #include "shell32_main.h"
 #include "shlguid.h"
 
 #include "pidl.h"
+#include "debugtools.h"
 
 static BOOL FileMenu_AppendItemA(HMENU hMenu, LPCSTR lpText, UINT uID, int icon,
                                  HMENU hMenuPopup, int nItemHeight);

dlls/shlwapi/path.c

@@ -10,6 +10,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winreg.h"
 #include "shlwapi.h"
 #include "debugtools.h"
 

dlls/shlwapi/shlwapi_main.c

@@ -7,6 +7,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
+#include "winreg.h"
 #include "debugtools.h"
 #include "shlwapi.h"
 

dlls/shlwapi/string.c

@@ -9,6 +9,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winreg.h"
 #include "shlwapi.h"
 #include "shlobj.h"
 #include "wine/unicode.h"

dlls/wininet/http.c

@@ -9,13 +9,6 @@
 
 #include "config.h"
 
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-#include "debugtools.h"
-#include "winerror.h"
-#include "shlwapi.h"
-
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
@@ -27,7 +20,15 @@
 #include <string.h>
 #include <time.h>
 
+#include "windef.h"
+#include "winbase.h"
+#include "wininet.h"
+#include "winreg.h"
+#include "winerror.h"
+#include "shlwapi.h"
+
 #include "internet.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(wininet);
 

dlls/wininet/internet.c

@@ -21,6 +21,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winreg.h"
 #include "wininet.h"
 #include "debugtools.h"
 #include "winerror.h"

include/shlwapi.h

@@ -15,24 +15,27 @@ extern "C" {
 #define GCT_WILD	0x0004
 #define GCT_SEPARATOR	0x0008
 
-/*
- * The URL_ defines were determined by trial and error.  If they become
- * documented please check them and add the missing ones including:
- *
- * URL_ESCAPE_PERCENT
- * URL_PLUGGABLE_PROTOCOL
- * URL_DONT_ESCAPE_EXTRA_INFO
- * URL_ESCAPE_SEGMENT_ONLY
- */
+#define URL_WININET_COMPATIBILITY    0x80000000
+#define URL_PLUGGABLE_PROTOCOL       0x40000000
+#define URL_ESCAPE_UNSAFE            0x20000000
+#define URL_UNESCAPE                 0x10000000
 
-#define URL_UNESCAPE_INPLACE         0x00100000
-#define URL_DONT_UNESCAPE_EXTRA_INFO 0x02000000
- 
+#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_UNESCAPE                 0x10000000
-#define URL_ESCAPE_UNSAFE            0x20000000
-#define URL_DONT_SIMPLIFY            0x40000000
+#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_FILE_USE_PATHURL         0x00010000
+
+#define URL_ESCAPE_SEGMENT_ONLY      0x00002000
+#define URL_ESCAPE_PERCENT           0x00001000
 
 LPSTR  WINAPI PathAddBackslashA(LPSTR path);	
 LPWSTR WINAPI PathAddBackslashW(LPWSTR path);	
@@ -225,10 +228,33 @@ HRESULT WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey);
 HRESULT WINAPI SHDeleteKeyW(HKEY hkey, LPCWSTR pszSubKey);
 #define  SHDeleteKey WINELIB_NAME_AW(SHDeleteKey)
 
+HRESULT WINAPI SHDeleteValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR pszValue);
+HRESULT WINAPI SHDeleteValueW(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue);
+#define  SHDeleteValue WINELIB_NAME_AW(SHDeleteValue)
+
 DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey);
 DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey);
 #define  SHDeleteEmptyKey WINELIB_NAME_AW(SHDeleteEmptyKey)
 
+DWORD WINAPI SHRegGetPathA(HKEY hKey, LPCSTR pcszSubKey,
+			   LPCSTR pcszValue, LPSTR pszPath, DWORD dwFlags);
+DWORD WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR pcszSubKey,
+			   LPCWSTR pcszValue, LPWSTR pszPath, DWORD dwFlags);
+#define  SHRegGetPath WINELIB_NAME_AW(SHRegGetPath)
+
+DWORD WINAPI SHGetValueA(HKEY hKey, LPCSTR pSubKey, LPCSTR pValue,
+			 LPDWORD pwType, LPVOID pvData, LPDWORD pbData);
+DWORD WINAPI SHGetValueW(HKEY hKey, LPCWSTR pSubKey, LPCWSTR pValue,
+			 LPDWORD pwType, LPVOID pvData, LPDWORD pbData);
+#define  SHGetValue WINELIB_NAME_AW(SHGetValue)
+
+HRESULT WINAPI SHSetValueA(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue,
+			 DWORD dwType, LPCVOID pvData, DWORD cbData);
+HRESULT WINAPI SHSetValueW(HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue,
+			 DWORD dwType, LPCVOID pvData, DWORD cbData);
+#define  SHSetValue WINELIB_NAME_AW(SHSetValue)
+
+
 
 typedef HANDLE HUSKEY;
 typedef HUSKEY *PHUSKEY;
@@ -248,6 +274,66 @@ typedef enum {
 } SHREGENUM_FLAGS; 
 
 
+/* Shell User Key Registry interfaces */
+
+LONG  WINAPI SHRegOpenUSKeyA(LPCSTR Path, REGSAM AccessType, 
+			     HUSKEY hRelativeUSKey, PHUSKEY phNewUSKey,
+			     BOOL fIgnoreHKCU);
+LONG  WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, 
+			     HUSKEY hRelativeUSKey, PHUSKEY phNewUSKey,
+			     BOOL fIgnoreHKCU);
+#define SHRegOpenUSKey WINELIB_NAME_AW(SHRegOpenUSKey)
+
+LONG  WINAPI SHRegCloseUSKey(HUSKEY hUSKey);
+
+LONG  WINAPI SHRegGetUSValueA(LPCSTR pszSubKey, LPCSTR pszValue, 
+			      LPDWORD pdwType, LPVOID pvData,
+			      LPDWORD pcbData, BOOL fIgnoreHKCU,
+			      LPVOID pvDefaultData, DWORD dwDefaultDataSize);
+LONG  WINAPI SHRegGetUSValueW(LPCWSTR pszSubKey, LPCWSTR pszValue, 
+			      LPDWORD pdwType, LPVOID pvData,
+			      LPDWORD pcbData, BOOL fIgnoreHKCU, 
+			      LPVOID pvDefaultData, DWORD dwDefaultDataSize);
+#define SHRegGetUSValue WINELIB_NAME_AW(SHRegGetUSValue)
+
+BOOL  WINAPI SHRegGetBoolUSValueA(LPCSTR pszSubKey, LPCSTR pszValue, 
+				  BOOL fIgnoreHKCU, BOOL fDefault);
+BOOL  WINAPI SHRegGetBoolUSValueW(LPCWSTR pszSubKey, LPCWSTR pszValue, 
+				  BOOL fIgnoreHKCU, BOOL fDefault);
+#define SHRegGetBoolUSValue WINELIB_NAME_AW(SHRegGetBoolUSValue)
+
+LONG  WINAPI SHRegQueryUSValueA(HUSKEY hUSKey, LPCSTR pszValue, 
+				LPDWORD pdwType, LPVOID pvData,
+				LPDWORD pcbData, BOOL fIgnoreHKCU, 
+				LPVOID pvDefaultData, DWORD dwDefaultDataSize);
+LONG  WINAPI SHRegQueryUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, 
+				LPDWORD pdwType, LPVOID pvData,
+				LPDWORD pcbData, BOOL fIgnoreHKCU, 
+				LPVOID pvDefaultData, DWORD dwDefaultDataSize);
+#define SHRegQueryUSValue WINELIB_NAME_AW(SHRegQueryUSValue)
+
+DWORD  WINAPI SHRegQueryInfoUSKeyA(HUSKEY hUSKey, LPDWORD pcSubKeys,
+				  LPDWORD pcchMaxSubKeyLen,
+				  LPDWORD pcValues,
+				  LPDWORD pcchMaxValueNameLen,
+				  SHREGENUM_FLAGS enumRegFlags);
+DWORD  WINAPI SHRegQueryInfoUSKeyW(HUSKEY hUSKey, LPDWORD pcSubKeys,
+				  LPDWORD pcchMaxSubKeyLen,
+				  LPDWORD pcValues,
+				  LPDWORD pcchMaxValueNameLen,
+				  SHREGENUM_FLAGS enumRegFlags);
+#define SHRegQueryInfoUSKey WINELIB_NAME_AW(SHRegQueryInfoUSKey)
+
+LONG  WINAPI SHRegEnumUSKeyA(HUSKEY hUSKey, DWORD dwIndex, LPSTR pszName,
+			     LPDWORD pcchValueNameLen,
+			     SHREGENUM_FLAGS enumRegFlags);
+LONG  WINAPI SHRegEnumUSKeyW(HUSKEY hUSKey, DWORD dwIndex, LPWSTR pszName,
+			     LPDWORD pcchValueNameLen,
+			     SHREGENUM_FLAGS enumRegFlags);
+#define SHRegEnumUSKey WINELIB_NAME_AW(SHRegEnumUSKey)
+
+
+/* Shell URL interfaces */
 
 HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized, 
 				LPDWORD pcchCanonicalized, DWORD dwFlags);
@@ -255,12 +341,30 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
 				LPDWORD pcchCanonicalized, DWORD dwFlags);
 #define UrlCanonicalize WINELIB_NAME_AW(UrlCanoncalize)
 
+HRESULT WINAPI UrlCombineA(LPCSTR pszBase, LPCSTR pszRelative,
+			   LPSTR pszCombined, LPDWORD pcchCombined,
+			   DWORD dwFlags);
+HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
+			   LPWSTR pszCombined, LPDWORD pcchCombined,
+			   DWORD dwFlags);
+#define UrlCombine WINELIB_NAME_AW(UrlCombine)
+
 HRESULT WINAPI UrlEscapeA(LPCSTR pszUrl, LPSTR pszEscaped, LPDWORD pcchEscaped,
 			  DWORD dwFlags);
 HRESULT WINAPI UrlEscapeW(LPCWSTR pszUrl, LPWSTR pszEscaped,
 			  LPDWORD pcchEscaped, DWORD dwFlags);
 #define UrlEscape WINELIB_NAME_AW(UrlEscape)
 
+LPCSTR  WINAPI UrlGetLocationA(LPCSTR pszUrl);
+LPCWSTR WINAPI UrlGetLocationW(LPCWSTR pszUrl);
+#define UrlGetLocation WINELIB_NAME_AW(UrlGetLocation)
+
+BOOL    WINAPI HashData(const unsigned char *lpSrc, INT nSrcLen,
+			unsigned char *lpDest, INT nDestLen);
+HRESULT WINAPI UrlHashA(LPCSTR pszUrl, unsigned char *lpDest, INT nDestlen);
+HRESULT WINAPI UrlHashW(LPCWSTR pszUrl, unsigned char *lpDest, INT nDestlen);
+#define UrlHash WINELIB_NAME_AW(UrlHash)
+
 HRESULT WINAPI UrlUnescapeA(LPCSTR pszUrl, LPSTR pszUnescaped,
 			    LPDWORD pcchUnescaped, DWORD dwFlags);
 HRESULT WINAPI UrlUnescapeW(LPCWSTR pszUrl, LPWSTR pszUnescaped,