[PATCH 1/5] shlwapi: Forward SHCreateMemStream() to shcore.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 40 --------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3d9c..47e9317208 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -632,46 +632,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, return iStream ? iStream : &rsDummyRegStream.IStream_iface; } -/************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - /************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85f46..ddc76ec0ac 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) -- 2.19.2
Signed-off-by: Nikolay Sivov <nsivov(a)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
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 129 -------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 131 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 102d6b7bb2..31df82aa8d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -396,135 +396,6 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) return regStream; } -/************************************************************************* - * SHOpenRegStream2A [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] Unused - * - * RETURNS - * Success: An IStream interface referring to the registry data - * Failure: NULL, if the registry key could not be opened or is not binary. - */ -IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, - LPCSTR pszValue,DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenA(pszValue) + 1; - tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); - memcpy(tmp->u.keyNameA, pszValue, len); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = FALSE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - -/************************************************************************* - * SHOpenRegStream2W [SHLWAPI.@] - * - * See SHOpenRegStream2A. - */ -IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, - LPCWSTR pszValue, DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), - debugstr_w(pszValue), dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenW(pszValue) + 1; - tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = TRUE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - /************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f9e2570914..9c01c3f6d4 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -705,8 +705,8 @@ @ stdcall SHGetValueA ( long str str ptr ptr ptr ) @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) -@ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr wstr long) +@ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) -- 2.19.2
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/istream.c | 112 +------------------------------------- dlls/shlwapi/shlwapi.spec | 8 +-- 2 files changed, 6 insertions(+), 114 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index ba9874b75e..37fa4c6ddc 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -34,35 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -/************************************************************************* - * @ [SHLWAPI.184] - * - * Call IStream_Read() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvDest [O] Destination for data read - * ulSize [I] Size of data to read - * - * RETURNS - * Success: S_OK. ulSize bytes have been read from the stream into lpvDest. - * Failure: An HRESULT error code, or E_FAIL if the read succeeded but the - * number of bytes read does not match. - */ -HRESULT WINAPI SHIStream_Read(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) -{ - ULONG ulRead; - HRESULT hRet; - - TRACE("(%p,%p,%u)\n", lpStream, lpvDest, ulSize); - - hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead); - - if (SUCCEEDED(hRet) && ulRead != ulSize) - hRet = E_FAIL; - return hRet; -} - /************************************************************************* * @ [SHLWAPI.166] * @@ -91,10 +62,10 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } else { - DWORD dwDummy; + DWORD dummy, read_len; /* Try to read from the stream */ - if(SUCCEEDED(SHIStream_Read(lpStream, &dwDummy, sizeof(dwDummy)))) + if (SUCCEEDED(IStream_Read(lpStream, &dummy, sizeof(dummy), &read_len)) && read_len == sizeof(dummy)) { LARGE_INTEGER zero; zero.QuadPart = 0; @@ -105,82 +76,3 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } return bRet; } - -/************************************************************************* - * @ [SHLWAPI.212] - * - * Call IStream_Write() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvSrc [I] Source for data to write - * ulSize [I] Size of data - * - * RETURNS - * Success: S_OK. ulSize bytes have been written to the stream from lpvSrc. - * Failure: An HRESULT error code, or E_FAIL if the write succeeded but the - * number of bytes written does not match. - */ -HRESULT WINAPI SHIStream_Write(IStream *lpStream, LPCVOID lpvSrc, ULONG ulSize) -{ - ULONG ulWritten; - HRESULT hRet; - - TRACE("(%p,%p,%d)\n", lpStream, lpvSrc, ulSize); - - hRet = IStream_Write(lpStream, lpvSrc, ulSize, &ulWritten); - - if (SUCCEEDED(hRet) && ulWritten != ulSize) - hRet = E_FAIL; - - return hRet; -} - -/************************************************************************* - * @ [SHLWAPI.213] - * - * Seek to the start of a stream. - * - * PARAMS - * lpStream [I] IStream object - * - * RETURNS - * Success: S_OK. The current position within the stream is updated - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Reset(IStream *lpStream) -{ - LARGE_INTEGER zero; - TRACE("(%p)\n", lpStream); - zero.QuadPart = 0; - return IStream_Seek(lpStream, zero, 0, NULL); -} - -/************************************************************************* - * @ [SHLWAPI.214] - * - * Get the size of a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpulSize [O] Destination for size - * - * RETURNS - * Success: S_OK. lpulSize contains the size of the stream. - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize) -{ - STATSTG statstg; - HRESULT hRet; - - TRACE("(%p,%p)\n", lpStream, lpulSize); - - memset(&statstg, 0, sizeof(statstg)); - - hRet = IStream_Stat(lpStream, &statstg, 1); - - if (SUCCEEDED(hRet) && lpulSize) - *lpulSize = statstg.cbSize; - return hRet; -} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9c01c3f6d4..6e64a9c12e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -181,7 +181,7 @@ 181 stdcall -noname SHEnableMenuItem(long long long) 182 stdcall -noname SHCheckMenuItem(long long long) 183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall -ordinal IStream_Read(ptr ptr long) SHIStream_Read +184 stdcall -ordinal IStream_Read(ptr ptr long) shcore.IStream_Read 185 stdcall -ordinal SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) @@ -209,9 +209,9 @@ 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) 211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall -ordinal IStream_Write(ptr ptr long) SHIStream_Write -213 stdcall -ordinal IStream_Reset(ptr) -214 stdcall -ordinal IStream_Size(ptr ptr) +212 stdcall -ordinal IStream_Write(ptr ptr long) shcore.IStream_Write +213 stdcall -ordinal IStream_Reset(ptr) shcore.IStream_Reset +214 stdcall -ordinal IStream_Size(ptr ptr) shcore.IStream_Size 215 stdcall -ordinal SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) -- 2.19.2
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/ordinal.c | 1 - dlls/shlwapi/shlwapi.spec | 10 +- dlls/shlwapi/shlwapi_main.c | 3 - dlls/shlwapi/thread.c | 310 ------------------------------------ 4 files changed, 5 insertions(+), 319 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 60e5761944..810b5746b4 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -55,7 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /* DLL handles for late bound calls */ extern HINSTANCE shlwapi_hInstance; -extern DWORD SHLWAPI_ThreadRef_index; static HRESULT iunknown_query_service(IUnknown*,REFGUID,REFIID,LPVOID*); HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,DWORD); diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 6e64a9c12e..30c34cb988 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -13,7 +13,7 @@ 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) -16 stdcall -ordinal SHCreateThread(ptr ptr long ptr) +16 stdcall -ordinal SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread 17 stdcall -noname SHWriteDataBlockList(ptr ptr) 18 stdcall -noname SHReadDataBlockList(ptr ptr) 19 stdcall -noname SHFreeDataBlockList(ptr) @@ -687,7 +687,7 @@ @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shcore.SHCreateStreamOnFileEx @ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW @ stdcall SHCreateStreamWrapper(ptr ptr long ptr) -@ stdcall SHCreateThreadRef(ptr ptr) +@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef @ stdcall SHDeleteEmptyKeyA(long ptr) @ stdcall SHDeleteEmptyKeyW(long ptr) @ stdcall SHDeleteKeyA(long str) @@ -701,7 +701,7 @@ @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) @ stdcall SHGetInverseCMAP ( ptr long ) -@ stdcall SHGetThreadRef (ptr) +@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef @ stdcall SHGetValueA ( long str str ptr ptr ptr ) @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) @@ -746,8 +746,8 @@ @ stdcall SHRegWriteUSValueA (long str long ptr long long) @ stdcall SHRegWriteUSValueW (long wstr long ptr long long) @ stdcall SHRegisterValidateTemplate(wstr long) -@ stdcall SHReleaseThreadRef() -@ stdcall SHSetThreadRef (ptr) +@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef @ stdcall SHSetValueA (long str str long ptr long) @ stdcall SHSetValueW (long wstr wstr long ptr long) @ stdcall SHSkipJunction(ptr ptr) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index f466bb485a..795bf5570e 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; -DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; /************************************************************************* * SHLWAPI {SHLWAPI} @@ -61,11 +60,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); shlwapi_hInstance = hinstDLL; - SHLWAPI_ThreadRef_index = TlsAlloc(); break; case DLL_PROCESS_DETACH: if (fImpLoad) break; - if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index); break; } return TRUE; diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 5726b855dc..f58488aac0 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -108,316 +108,6 @@ HRESULT WINAPI _SHGetInstanceExplorer(IUnknown **lppUnknown) return SHGetInstanceExplorer(lppUnknown); } -/* Internal thread information structure */ -typedef struct tagSHLWAPI_THREAD_INFO -{ - LPTHREAD_START_ROUTINE pfnThreadProc; /* Thread start */ - LPTHREAD_START_ROUTINE pfnCallback; /* Thread initialisation */ - PVOID pData; /* Application specific data */ - BOOL bInitCom; /* Initialise COM for the thread? */ - HANDLE hEvent; /* Signal for creator to continue */ - IUnknown *refThread; /* Reference to thread creator */ - IUnknown *refIE; /* Reference to the IE process */ -} SHLWAPI_THREAD_INFO, *LPSHLWAPI_THREAD_INFO; - -typedef struct -{ - IUnknown IUnknown_iface; - LONG *ref; -} threadref; - -static inline threadref *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, threadref, IUnknown_iface); -} - -static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) -{ - threadref * This = impl_from_IUnknown(iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObj); - - if (ppvObj == NULL) - return E_POINTER; - - if (IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppvObj); - *ppvObj = This; - IUnknown_AddRef((IUnknown*)*ppvObj); - return S_OK; - } - - *ppvObj = NULL; - FIXME("(%p, %s, %p) interface not supported\n", This, debugstr_guid(riid), ppvObj); - return E_NOINTERFACE; -} - -static ULONG WINAPI threadref_AddRef(IUnknown *iface) -{ - threadref * This = impl_from_IUnknown(iface); - - TRACE("(%p)\n", This); - return InterlockedIncrement(This->ref); -} - -static ULONG WINAPI threadref_Release(IUnknown *iface) -{ - LONG refcount; - threadref * This = impl_from_IUnknown(iface); - - TRACE("(%p)\n", This); - - refcount = InterlockedDecrement(This->ref); - if (!refcount) - HeapFree(GetProcessHeap(), 0, This); - - return refcount; -} - -/* VTable */ -static const IUnknownVtbl threadref_vt = -{ - threadref_QueryInterface, - threadref_AddRef, - threadref_Release, -}; - -/************************************************************************* - * SHCreateThreadRef [SHLWAPI.@] - * - * Create a per-thread IUnknown object - * - * PARAMS - * lprefcount [I] Pointer to a LONG to be used as refcount - * lppUnknown [O] Destination to receive the created object reference - * - * RETURNS - * Success: S_OK. lppUnknown is set to the object reference. - * Failure: E_INVALIDARG, if a parameter is NULL - */ -HRESULT WINAPI SHCreateThreadRef(LONG *lprefcount, IUnknown **lppUnknown) -{ - threadref * This; - TRACE("(%p, %p)\n", lprefcount, lppUnknown); - - if (!lprefcount || !lppUnknown) - return E_INVALIDARG; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(threadref)); - This->IUnknown_iface.lpVtbl = &threadref_vt; - This->ref = lprefcount; - - *lprefcount = 1; - *lppUnknown = &This->IUnknown_iface; - TRACE("=> returning S_OK with %p\n", This); - return S_OK; -} - -/************************************************************************* - * SHGetThreadRef [SHLWAPI.@] - * - * Get a per-thread object reference set by SHSetThreadRef(). - * - * PARAMS - * lppUnknown [O] Destination to receive object reference - * - * RETURNS - * Success: S_OK. lppUnknown is set to the object reference. - * Failure: E_NOINTERFACE, if an error occurs or no object is set - */ -HRESULT WINAPI SHGetThreadRef(IUnknown **lppUnknown) -{ - TRACE("(%p)\n", lppUnknown); - - if (SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) - return E_NOINTERFACE; - - *lppUnknown = TlsGetValue(SHLWAPI_ThreadRef_index); - if (!*lppUnknown) - return E_NOINTERFACE; - - /* Add a reference. Caller will Release() us when finished */ - IUnknown_AddRef(*lppUnknown); - return S_OK; -} - -/************************************************************************* - * SHSetThreadRef [SHLWAPI.@] - * - * Store a per-thread object reference. - * - * PARAMS - * lpUnknown [I] Object reference to store - * - * RETURNS - * Success: S_OK. lpUnknown is stored and can be retrieved by SHGetThreadRef() - * Failure: E_NOINTERFACE, if an error occurs - */ -HRESULT WINAPI SHSetThreadRef(IUnknown *lpUnknown) -{ - TRACE("(%p)\n", lpUnknown); - - if (SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) - return E_NOINTERFACE; - - TlsSetValue(SHLWAPI_ThreadRef_index, lpUnknown); - return S_OK; -} - -/************************************************************************* - * SHReleaseThreadRef [SHLWAPI.@] - * - * Release a per-thread object reference. - * - * PARAMS - * None. - * - * RETURNS - * Success: S_OK. The threads object reference is released. - * Failure: An HRESULT error code. - */ -HRESULT WINAPI SHReleaseThreadRef(void) -{ - FIXME("() - stub!\n"); - return S_OK; -} - -/************************************************************************* - * SHLWAPI_ThreadWrapper - * - * Internal wrapper for executing user thread functions from SHCreateThread. - */ -static DWORD WINAPI SHLWAPI_ThreadWrapper(PVOID pTi) -{ - SHLWAPI_THREAD_INFO ti; - HRESULT hCom = E_FAIL; - DWORD dwRet; - - TRACE("(%p)\n", pTi); - - /* We are now executing in the context of the newly created thread. - * So we copy the data passed to us (it is on the stack of the function - * that called us, which is waiting for us to signal an event before - * returning). */ - memcpy(&ti, pTi, sizeof(SHLWAPI_THREAD_INFO)); - - /* Initialise COM for the thread, if desired */ - if (ti.bInitCom) - { - hCom = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED|COINIT_DISABLE_OLE1DDE); - - if (FAILED(hCom)) - hCom = CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE); - } - - /* Execute the callback function before returning */ - if (ti.pfnCallback) - ti.pfnCallback(ti.pData); - - /* Signal the thread that created us; it can return now */ - SetEvent(ti.hEvent); - - /* Execute the callers start code */ - dwRet = ti.pfnThreadProc(ti.pData); - - /* Release references to the caller and IE process, if held */ - if (ti.refThread) - IUnknown_Release(ti.refThread); - - if (ti.refIE) - IUnknown_Release(ti.refIE); - - if (SUCCEEDED(hCom)) - CoUninitialize(); - - /* Return the users thread return value */ - return dwRet; -} - -/************************************************************************* - * SHCreateThread [SHLWAPI.16] - * - * Create a new thread. - * - * PARAMS - * pfnThreadProc [I] Function to execute in new thread - * pData [I] Application specific data passed to pfnThreadProc - * dwFlags [I] CTF_ flags from "shlwapi.h" - * pfnCallback [I] Function to execute before pfnThreadProc - * - * RETURNS - * Success: TRUE. pfnThreadProc was executed. - * Failure: FALSE. pfnThreadProc was not executed. - * - * NOTES - * If the thread cannot be created, pfnCallback is NULL, and dwFlags - * has bit CTF_INSIST set, pfnThreadProc will be executed synchronously. - */ -BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData, - DWORD dwFlags, LPTHREAD_START_ROUTINE pfnCallback) -{ - SHLWAPI_THREAD_INFO ti; - BOOL bCalled = FALSE; - - TRACE("(%p,%p,0x%X,%p)\n", pfnThreadProc, pData, dwFlags, pfnCallback); - - /* Set up data to pass to the new thread (On our stack) */ - ti.pfnThreadProc = pfnThreadProc; - ti.pfnCallback = pfnCallback; - ti.pData = pData; - ti.bInitCom = (dwFlags & CTF_COINIT) != 0; - ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); - - /* Hold references to the current thread and IE process, if desired */ - if(dwFlags & CTF_THREAD_REF) - SHGetThreadRef(&ti.refThread); - else - ti.refThread = NULL; - - if(dwFlags & CTF_PROCESS_REF) - _SHGetInstanceExplorer(&ti.refIE); - else - ti.refIE = NULL; - - /* Create the thread */ - if(ti.hEvent) - { - DWORD dwRetVal; - HANDLE hThread; - - hThread = CreateThread(NULL, 0, SHLWAPI_ThreadWrapper, &ti, 0, &dwRetVal); - - if(hThread) - { - /* Wait for the thread to signal us to continue */ - WaitForSingleObject(ti.hEvent, INFINITE); - CloseHandle(hThread); - bCalled = TRUE; - } - CloseHandle(ti.hEvent); - } - - if (!bCalled) - { - if (!ti.pfnCallback && dwFlags & CTF_INSIST) - { - /* Couldn't call, call synchronously */ - pfnThreadProc(pData); - bCalled = TRUE; - } - else - { - /* Free references, since thread hasn't run to do so */ - if(ti.refThread) - IUnknown_Release(ti.refThread); - - if(ti.refIE) - IUnknown_Release(ti.refIE); - } - } - return bCalled; -} - /************************************************************************* * SHGlobalCounterGetValue [SHLWAPI.223] * -- 2.19.2
participants (1)
-
Nikolay Sivov