Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

partial shell32 sync to wine 1.1.32

Browse source 
svn path=/trunk/; revision=44081
This commit is contained in:
Christoph von Wittich 2009-11-10 21:29:56 +00:00
parent 8f8f2a36c0
commit e8c61b4a52
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/shell32/shellitem.c
View file

@ -337,13 +337,13 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
{ {
IPersistFolder2* ppf2Parent; IPersistFolder2* ppf2Parent;
if (!SUCCEEDED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) if (FAILED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent)))
{ {
FIXME("couldn't get IPersistFolder2 interface of parent\n"); FIXME("couldn't get IPersistFolder2 interface of parent\n");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) if (FAILED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent)))
{ {
FIXME("couldn't get parent PIDL\n"); FIXME("couldn't get parent PIDL\n");
IPersistFolder2_Release(ppf2Parent); IPersistFolder2_Release(ppf2Parent);

12
reactos/dll/win32/shell32/shellole.c
View file

@ -41,6 +41,7 @@ static const struct {
} InterfaceTable[] = { } InterfaceTable[] = {
{&CLSID_ShellFSFolder, &IFSFolder_Constructor}, {&CLSID_ShellFSFolder, &IFSFolder_Constructor},
{&CLSID_MyComputer, &ISF_MyComputer_Constructor}, {&CLSID_MyComputer, &ISF_MyComputer_Constructor},
{&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor},
{&CLSID_ShellDesktop, &ISF_Desktop_Constructor}, {&CLSID_ShellDesktop, &ISF_Desktop_Constructor},
{&CLSID_ShellItem, &IShellItem_Constructor}, {&CLSID_ShellItem, &IShellItem_Constructor},
{&CLSID_ShellLink, &IShellLink_Constructor}, {&CLSID_ShellLink, &IShellLink_Constructor},
@ -53,7 +54,6 @@ static const struct {
{&CLSID_FolderShortcut, &FolderShortcut_Constructor}, {&CLSID_FolderShortcut, &FolderShortcut_Constructor},
#endif #endif
{&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor},
{&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor},
{&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, {&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor},
{&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor},
{&CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor}, {&CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor},
@ -181,7 +181,7 @@ HRESULT WINAPI SHCoCreateInstance(
FreeLibrary( hLibrary ); FreeLibrary( hLibrary );
hres = E_ACCESSDENIED; hres = E_ACCESSDENIED;
goto end; goto end;
} else if (! SUCCEEDED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { } else if (FAILED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) {
TRACE("GetClassObject failed 0x%08x\n", hres); TRACE("GetClassObject failed 0x%08x\n", hres);
goto end; goto end;
} }
@ -538,7 +538,7 @@ void WINAPI DragAcceptFiles(HWND hWnd, BOOL b)
void WINAPI DragFinish(HDROP h) void WINAPI DragFinish(HDROP h)
{ {
TRACE("\n"); TRACE("\n");
GlobalFree((HGLOBAL)h); GlobalFree(h);
} }
/************************************************************************* /*************************************************************************
@ -551,7 +551,7 @@ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p)
TRACE("\n"); TRACE("\n");
lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); lpDropFileStruct = GlobalLock(hDrop);
*p = lpDropFileStruct->pt; *p = lpDropFileStruct->pt;
bRet = lpDropFileStruct->fNC; bRet = lpDropFileStruct->fNC;
@ -572,7 +572,7 @@ UINT WINAPI DragQueryFileA(
{ {
LPSTR lpDrop; LPSTR lpDrop;
UINT i = 0; UINT i = 0;
DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); DROPFILES *lpDropFileStruct = GlobalLock(hDrop);
TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength); TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength);
@ -627,7 +627,7 @@ UINT WINAPI DragQueryFileW(
{ {
LPWSTR lpwDrop; LPWSTR lpwDrop;
UINT i = 0; UINT i = 0;
DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); DROPFILES *lpDropFileStruct = GlobalLock(hDrop);
TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength); TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);