[PATCH 2/5] shlwapi: Forward SHOpenRegStream() to shcore.
Nikolay Sivov
nsivov at codeweavers.com
Mon Dec 3 01:40:57 CST 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/shlwapi/regstream.c | 107 --------------------------------------
dlls/shlwapi/shlwapi.spec | 4 +-
2 files changed, 2 insertions(+), 109 deletions(-)
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 47e9317208..102d6b7bb2 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -369,70 +369,6 @@ static const IStreamVtbl rstvt =
IStream_fnClone
};
-/* Methods overridden by the dummy stream */
-
-/**************************************************************************
- * IStream_fnAddRefDummy
- */
-static ULONG WINAPI IStream_fnAddRefDummy(IStream *iface)
-{
- ISHRegStream *This = impl_from_IStream(iface);
- TRACE("(%p)\n", This);
- return 2;
-}
-
-/**************************************************************************
- * IStream_fnReleaseDummy
- */
-static ULONG WINAPI IStream_fnReleaseDummy(IStream *iface)
-{
- ISHRegStream *This = impl_from_IStream(iface);
- TRACE("(%p)\n", This);
- return 1;
-}
-
-/**************************************************************************
- * IStream_fnReadDummy
- */
-static HRESULT WINAPI IStream_fnReadDummy(IStream *iface, LPVOID pv, ULONG cb, ULONG* pcbRead)
-{
- if (pcbRead)
- *pcbRead = 0;
- return E_NOTIMPL;
-}
-
-static const IStreamVtbl DummyRegStreamVTable =
-{
- IStream_fnQueryInterface,
- IStream_fnAddRefDummy, /* Overridden */
- IStream_fnReleaseDummy, /* Overridden */
- IStream_fnReadDummy, /* Overridden */
- IStream_fnWrite,
- IStream_fnSeek,
- IStream_fnSetSize,
- IStream_fnCopyTo,
- IStream_fnCommit,
- IStream_fnRevert,
- IStream_fnLockUnlockRegion,
- IStream_fnLockUnlockRegion,
- IStream_fnStat,
- IStream_fnClone
-};
-
-/* Dummy registry stream object */
-static ISHRegStream rsDummyRegStream =
-{
- { &DummyRegStreamVTable },
- 1,
- NULL,
- NULL,
- 0,
- 0,
- STGM_READWRITE,
- {NULL},
- FALSE
-};
-
/**************************************************************************
* IStream_Create
*
@@ -589,49 +525,6 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey,
return NULL;
}
-/*************************************************************************
- * SHOpenRegStreamA [SHLWAPI.@]
- *
- * Create a stream to read binary registry data.
- *
- * PARAMS
- * hKey [I] Registry handle
- * pszSubkey [I] The sub key name
- * pszValue [I] The value name under the sub key
- * dwMode [I] STGM mode for opening the file
- *
- * RETURNS
- * Success: An IStream interface referring to the registry data
- * Failure: If the registry key could not be opened or is not binary,
- * A dummy (empty) IStream object is returned.
- */
-IStream * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey,
- LPCSTR pszValue, DWORD dwMode)
-{
- IStream *iStream;
-
- TRACE("(%p,%s,%s,0x%08x)\n", hkey, pszSubkey, pszValue, dwMode);
-
- iStream = SHOpenRegStream2A(hkey, pszSubkey, pszValue, dwMode);
- return iStream ? iStream : &rsDummyRegStream.IStream_iface;
-}
-
-/*************************************************************************
- * SHOpenRegStreamW [SHLWAPI.@]
- *
- * See SHOpenRegStreamA.
- */
-IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey,
- LPCWSTR pszValue, DWORD dwMode)
-{
- IStream *iStream;
-
- TRACE("(%p,%s,%s,0x%08x)\n", hkey, debugstr_w(pszSubkey),
- debugstr_w(pszValue), dwMode);
- iStream = SHOpenRegStream2W(hkey, pszSubkey, pszValue, dwMode);
- return iStream ? iStream : &rsDummyRegStream.IStream_iface;
-}
-
/*************************************************************************
* SHCreateStreamWrapper [SHLWAPI.@]
*
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index ddc76ec0ac..f9e2570914 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -707,8 +707,8 @@
@ stdcall SHIsLowMemoryMachine(long)
@ stdcall SHOpenRegStream2A(long str str long)
@ stdcall SHOpenRegStream2W(long wstr wstr long)
-@ stdcall SHOpenRegStreamA(long str str long)
-@ stdcall SHOpenRegStreamW(long wstr wstr long)
+@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA
+@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW
@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr)
@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr)
@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr)
--
2.19.2
More information about the wine-devel
mailing list