Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 08:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the Windows version of SHIShellFolder_EnumObjects, but compile it out as per Wine's notes

Browse source 
Move the scope in the reg script

svn path=/trunk/; revision=51766
This commit is contained in:
Ged Murphy 2011-05-15 15:42:03 +00:00
parent da49a2ee6d
commit 1b67224a55
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/browseui/res/addressband.rgs
View file

@ -2,9 +2,9 @@ HKCR
{
NoRemove CLSID
{
val MenuTextPUI = s '@browseui.dll,-13137'
ForceRemove {01E04581-4EEE-11d0-BFE9-00AA005B4383} = s '&Address'
{
val MenuTextPUI = s '@browseui.dll,-13137'
InprocServer32 = s '%MODULE%'
{
val ThreadingModel = s 'Apartment'

26
reactos/dll/win32/shlwapi/ordinal.c
View file

@ -144,7 +144,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId,
* the view pointer returned by this size.
*
*/
HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId)
HANDLE WINAPI SHAllocShared(LPVOID lpvData, ULONG dwSize, DWORD dwProcId)
{
HANDLE hMap;
LPVOID pMapped;
@ -3735,6 +3735,7 @@ BOOL WINAPI GetOpenFileNameWrapW(LPOPENFILENAMEW ofn)
/*************************************************************************
* @ [SHLWAPI.404]
*/
#if 1
HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum)
{
/* Windows attempts to get an IPersist interface and, if that fails, an
@ -3751,6 +3752,29 @@ HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHC
return IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum);
}
#else
HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum)
{
IPersist *persist;
HRESULT hr;
hr = IShellFolder_QueryInterface(lpFolder, &IID_IPersist, (LPVOID)&persist);
if(SUCCEEDED(hr))
{
CLSID clsid;
hr = IPersist_GetClassID(persist, &clsid);
if(SUCCEEDED(hr))
{
if(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder))
hr = IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum);
else
hr = E_FAIL;
}
IPersist_Release(persist);
}
return hr;
}
#endif
/* INTERNAL: Map from HLS color space to RGB */
static WORD ConvertHue(int wHue, WORD wMid1, WORD wMid2)