From 6db325014e95c924644d629e8975cf2932fd324d Mon Sep 17 00:00:00 2001
From: Gael de Chalendar <Gael.de.Chalendar@limsi.fr>
Date: Wed, 25 Apr 2001 19:51:56 +0000
Subject: [PATCH] Corrected a typo in spec file and added some stubs.

---
 dlls/shlwapi/reg.c        | 49 +++++++++++++++++++++++++++++++++++++++
 dlls/shlwapi/shlwapi.spec | 18 +++++++-------
 dlls/shlwapi/string.c     | 38 ++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index f44bffcbc19..e6e9e387f70 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -56,6 +56,38 @@ LONG WINAPI SHRegGetUSValueW(
 	return ERROR_SUCCESS;  /* return success */
 }
 
+/*************************************************************************
+ * SHRegOpenUSKeyA	[SHLWAPI.@]
+ *
+ * Openss a user-specific registry key
+ */
+LONG WINAPI SHRegOpenUSKeyA(
+        LPCSTR Path,
+        REGSAM AccessType,
+        HKEY hRelativeUSKey,
+        HKEY hNewUSKey,
+        BOOL fIgnoreHKCU)
+{
+	FIXME("stub!\n");
+	return ERROR_SUCCESS;  /* return success */
+}
+
+/*************************************************************************
+ * SHRegOpenUSKeyW	[SHLWAPI.@]
+ *
+ * Openss a user-specific registry key
+ */
+LONG WINAPI SHRegOpenUSKeyW(
+        LPCSTR Path,
+        REGSAM AccessType,
+        HKEY hRelativeUSKey,
+        HKEY hNewUSKey,
+        BOOL fIgnoreHKCU)
+{
+	FIXME("stub!\n");
+	return ERROR_SUCCESS;  /* return success */
+}
+
 /*************************************************************************
  * SHRegGetBoolUSValueA   [SHLWAPI.@]
  */
@@ -99,6 +131,23 @@ LONG WINAPI SHRegQueryUSValueA(
 	return 1;
 }
 
+/*************************************************************************
+ *      SHRegQueryUSValueA	[SHLWAPI]
+ */
+LONG WINAPI SHRegQueryUSValueW(
+	HKEY hUSKey,             /* [in] FIXME: HUSKEY */
+	LPCSTR pszValue,
+	LPDWORD pdwType,
+	void *pvData,
+	LPDWORD pcbData,
+	BOOL fIgnoreHKCU,
+	void *pvDefaultData,
+	DWORD dwDefaultDataSize)
+{
+	FIXME("%s stub\n",pszValue);
+	return 1;
+}
+
 /*************************************************************************
  * SHRegGetPathA   [SHLWAPI.@]
  */
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 9dc75310de6..ca90a48f28f 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -133,7 +133,7 @@ debug_channels (shell)
 121 forward @ advapi32.RegDeleteKeyW
 122 forward @ advapi32.RegEnumKeyW
 123 forward @ advapi32.RegEnumKeyExW
-124 forward @ dvapi32.RegOpenKeyW
+124 forward @ advapi32.RegOpenKeyW
 125 forward @ advapi32.RegOpenKeyExW
 126 forward @ advapi32.RegQueryInfoKeyW
 127 forward @ advapi32.RegQueryValueW
@@ -600,12 +600,12 @@ debug_channels (shell)
 @ stdcall SHRegGetBoolUSValueW(wstr wstr long long)SHRegGetBoolUSValueW
 @ stdcall SHRegGetUSValueA ( ptr str ptr ptr ptr long ptr long ) SHRegGetUSValueA
 @ stdcall SHRegGetUSValueW ( ptr wstr ptr ptr ptr long ptr long ) SHRegGetUSValueW
-@ stub    SHRegOpenUSKeyA
-@ stub    SHRegOpenUSKeyW
+@ stdcall SHRegOpenUSKeyA ( str long long long long ) SHRegOpenUSKeyA
+@ stdcall SHRegOpenUSKeyW ( wstr long long long long ) SHRegOpenUSKeyW
 @ stub    SHRegQueryInfoUSKeyA
 @ stub    SHRegQueryInfoUSKeyW
-@ stdcall SHRegQueryUSValueA(long str ptr ptr ptr long ptr long)SHRegQueryUSValueA
-@ stub    SHRegQueryUSValueW
+@ stdcall SHRegQueryUSValueA ( long str ptr ptr ptr long ptr long ) SHRegQueryUSValueA
+@ stdcall SHRegQueryUSValueW ( long wstr ptr ptr ptr long ptr long ) SHRegQueryUSValueW
 @ stub    SHRegSetUSValueA
 @ stub    SHRegSetUSValueW
 @ stub    SHRegWriteUSValueA
@@ -639,8 +639,8 @@ debug_channels (shell)
 @ stub    StrFromTimeIntervalW
 @ stub    StrIsIntlEqualA
 @ stub    StrIsIntlEqualW
-@ stub    StrNCatA
-@ stub    StrNCatW
+@ stdcall StrNCatA(str str long) StrNCatA
+@ stdcall StrNCatW(wstr wstr long) StrNCatW
 @ stub    StrPBrkA
 @ stub    StrPBrkW
 @ stdcall StrRChrA (str str long) StrRChrA
@@ -656,8 +656,8 @@ debug_channels (shell)
 @ stdcall StrStrIW(wstr wstr)StrStrIW
 @ stdcall StrStrW(wstr wstr)StrStrW
 @ stdcall StrToIntA(str)StrToIntA
-@ stub    StrToIntExA
-@ stub    StrToIntExW
+@ stdcall StrToIntExA(str long ptr) StrToIntExA
+@ stdcall StrToIntExW(wstr long ptr) StrToIntExW
 @ stdcall StrToIntW(wstr)StrToIntW
 @ stub    StrTrimA
 @ stub    StrTrimW
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index e383e053b45..3cc575f7eaf 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -197,6 +197,26 @@ int WINAPI StrToIntW(LPCWSTR lpSrc)
     return atol(buffer);
 }
 
+/*************************************************************************
+ *	StrToIntExA			[SHLWAPI]
+ */
+BOOL WINAPI StrToIntExA( LPCSTR pszString, DWORD dwFlags, LPINT piRet)
+{
+	TRACE("%s %ld stub !\n", debugstr_a(pszString), dwFlags);
+	piRet = (LPINT) StrToIntA(pszString);
+	return TRUE;
+}
+
+/*************************************************************************
+ *	StrToIntExW			[SHLWAPI]
+ */
+BOOL WINAPI StrToIntExW( LPCWSTR pszString, DWORD dwFlags, LPINT piRet)
+{
+	TRACE("%s %ld stub !\n", debugstr_w(pszString), dwFlags);
+	piRet = (LPINT) StrToIntW(pszString);
+	return TRUE;
+}
+
 /*************************************************************************
  *	StrDupA			[SHLWAPI]
  */
@@ -465,6 +485,24 @@ LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf )
         return pszBuf;
 }
 
+/*************************************************************************
+ *      StrNCatA	[SHLWAPI]
+ */
+LPSTR WINAPI StrNCatA(LPSTR front, LPCSTR back, INT cchMax)
+{
+	TRACE("%s %s %i stub\n", debugstr_a(front),debugstr_a(back),cchMax);
+	return (front);
+}
+
+/*************************************************************************
+ *      StrNCatW	[SHLWAPI]
+ */
+LPWSTR WINAPI StrNCatW(LPWSTR front, LPCWSTR back, INT cchMax)
+{
+	TRACE("%s %s %i stub\n", debugstr_w(front),debugstr_w(back),cchMax);
+	return (front);
+}
+
 /*************************************************************************
  *      wnsprintfA	[SHLWAPI]
  */