Module: wine Branch: master Commit: 55583f93866db0f0046ce6371f9387b0a1f2347e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55583f93866db0f0046ce6371f...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Nov 30 00:05:03 2010 +0100
shlwapi: Use an iface instead of an vtbl pointer in ISHRegStream.
---
dlls/shlwapi/regstream.c | 67 ++++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 4dc15ad..1b0ca4e 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct { - const IStreamVtbl *lpVtbl; + IStream IStream_iface; LONG ref; HKEY hKey; LPBYTE pbBuffer; @@ -51,12 +51,17 @@ typedef struct BOOL bUnicode; } ISHRegStream;
+static inline ISHRegStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, ISHRegStream, IStream_iface); +} + /************************************************************************** * IStream_fnQueryInterface */ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj);
@@ -82,7 +87,7 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO */ static ULONG WINAPI IStream_fnAddRef(IStream *iface) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -95,7 +100,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface) */ static ULONG WINAPI IStream_fnRelease(IStream *iface) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -144,7 +149,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) */ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); DWORD dwBytesToRead;
TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead); @@ -172,7 +177,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG */ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); DWORD newLen = This->dwPos + cb;
TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten); @@ -203,7 +208,7 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb */ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); LARGE_INTEGER tmp; TRACE("(%p, %s, %d %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); @@ -233,7 +238,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D */ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); DWORD newLen; LPBYTE newBuf;
@@ -256,7 +261,7 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewS */ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)\n",This); if (pcbRead) @@ -273,7 +278,7 @@ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_I */ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)\n",This);
@@ -286,7 +291,7 @@ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) */ static HRESULT WINAPI IStream_fnRevert (IStream * iface) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)\n",This);
@@ -299,7 +304,7 @@ static HRESULT WINAPI IStream_fnRevert (IStream * iface) */ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)\n",This);
@@ -312,7 +317,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGE */ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag);
@@ -339,7 +344,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD */ static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface);
TRACE("(%p)\n",This); *ppstm = NULL; @@ -373,7 +378,7 @@ static const IStreamVtbl rstvt = */ static ULONG WINAPI IStream_fnAddRefDummy(IStream *iface) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); TRACE("(%p)\n", This); return 2; } @@ -383,7 +388,7 @@ static ULONG WINAPI IStream_fnAddRefDummy(IStream *iface) */ static ULONG WINAPI IStream_fnReleaseDummy(IStream *iface) { - ISHRegStream *This = (ISHRegStream *)iface; + ISHRegStream *This = impl_from_IStream(iface); TRACE("(%p)\n", This); return 1; } @@ -419,7 +424,7 @@ static const IStreamVtbl DummyRegStreamVTable = /* Dummy registry stream object */ static ISHRegStream rsDummyRegStream = { - &DummyRegStreamVTable, + { &DummyRegStreamVTable }, 1, NULL, NULL, @@ -443,7 +448,7 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength)
if (regStream) { - regStream->lpVtbl = &rstvt; + regStream->IStream_iface.lpVtbl = &rstvt; regStream->ref = 1; regStream->hKey = hKey; regStream->pbBuffer = pbBuffer; @@ -516,7 +521,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey,
tmp->dwMode = dwMode; tmp->bUnicode = FALSE; - return (IStream *)tmp; + return &tmp->IStream_iface; } }
@@ -576,7 +581,7 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey,
tmp->dwMode = dwMode; tmp->bUnicode = TRUE; - return (IStream *)tmp; + return &tmp->IStream_iface; } }
@@ -610,7 +615,7 @@ IStream * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey, TRACE("(%p,%s,%s,0x%08x)\n", hkey, pszSubkey, pszValue, dwMode);
iStream = SHOpenRegStream2A(hkey, pszSubkey, pszValue, dwMode); - return iStream ? iStream : (IStream *)&rsDummyRegStream; + return iStream ? iStream : &rsDummyRegStream.IStream_iface; }
/************************************************************************* @@ -626,7 +631,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, TRACE("(%p,%s,%s,0x%08x)\n", hkey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); iStream = SHOpenRegStream2W(hkey, pszSubkey, pszValue, dwMode); - return iStream ? iStream : (IStream *)&rsDummyRegStream; + return iStream ? iStream : &rsDummyRegStream.IStream_iface; }
/************************************************************************* @@ -648,7 +653,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, */ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) { - IStream *iStrmRet = NULL; + ISHRegStream *strm = NULL; LPBYTE lpbDup;
TRACE("(%p,%d)\n", lpbData, dwDataLen); @@ -661,12 +666,12 @@ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) if (lpbDup) { memcpy(lpbDup, lpbData, dwDataLen); - iStrmRet = (IStream *)IStream_Create(NULL, lpbDup, dwDataLen); + strm = IStream_Create(NULL, lpbDup, dwDataLen);
- if (!iStrmRet) + if (!strm) HeapFree(GetProcessHeap(), 0, lpbDup); } - return iStrmRet; + return &strm->IStream_iface; }
/************************************************************************* @@ -691,7 +696,7 @@ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) HRESULT WINAPI SHCreateStreamWrapper(LPBYTE lpbData, DWORD dwDataLen, DWORD dwReserved, IStream **lppStream) { - IStream* lpStream; + ISHRegStream *strm;
if (lppStream) *lppStream = NULL; @@ -699,12 +704,12 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE lpbData, DWORD dwDataLen, if(dwReserved || !lppStream) return E_INVALIDARG;
- lpStream = (IStream *)IStream_Create(NULL, lpbData, dwDataLen); + strm = IStream_Create(NULL, lpbData, dwDataLen);
- if(!lpStream) + if(!strm) return E_OUTOFMEMORY;
- IStream_QueryInterface(lpStream, &IID_IStream, (void**)lppStream); - IStream_Release(lpStream); + IStream_QueryInterface(&strm->IStream_iface, &IID_IStream, (void**)lppStream); + IStream_Release(&strm->IStream_iface); return S_OK; }
-
Alexandre Julliard