[ros-diffs] [cwittich] 44081: partial shell32 sync to wine 1.1.32

[cwittich at svn.reactos.org]

Author: cwittich
Date: Tue Nov 10 22:29:56 2009
New Revision: 44081

URL: http://svn.reactos.org/svn/reactos?rev=44081&view=rev
Log:
partial shell32 sync to wine 1.1.32

Modified:
    trunk/reactos/dll/win32/shell32/shellitem.c
    trunk/reactos/dll/win32/shell32/shellole.c

Modified: trunk/reactos/dll/win32/shell32/shellitem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellitem.c?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellitem.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellitem.c [iso-8859-1] Tue Nov 10 22:29:56 2009
@@ -337,13 +337,13 @@
         {
             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");
                 return E_NOINTERFACE;
             }
 
-            if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent)))
+            if (FAILED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent)))
             {
                 FIXME("couldn't get parent PIDL\n");
                 IPersistFolder2_Release(ppf2Parent);

Modified: trunk/reactos/dll/win32/shell32/shellole.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole.c?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Tue Nov 10 22:29:56 2009
@@ -41,6 +41,7 @@
 } InterfaceTable[] = {
 	{&CLSID_ShellFSFolder,	&IFSFolder_Constructor},
 	{&CLSID_MyComputer,	&ISF_MyComputer_Constructor},
+	{&CLSID_NetworkPlaces,  &ISF_NetworkPlaces_Constructor},
 	{&CLSID_ShellDesktop,	&ISF_Desktop_Constructor},
 	{&CLSID_ShellItem,	&IShellItem_Constructor},
 	{&CLSID_ShellLink,	&IShellLink_Constructor},
@@ -53,7 +54,6 @@
 	{&CLSID_FolderShortcut, &FolderShortcut_Constructor},
 #endif
 	{&CLSID_MyDocuments,    &ISF_MyDocuments_Constructor},
-	{&CLSID_NetworkPlaces,  &ISF_NetworkPlaces_Constructor},
 	{&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor},
 	{&CLSID_Printers,       &ISF_Printers_Constructor},
 	{&CLSID_AdminFolderShortcut, &ISF_AdminTools_Constructor},
@@ -181,7 +181,7 @@
 	        FreeLibrary( hLibrary );
 		hres = E_ACCESSDENIED;
 	        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);
 		    goto end;
 	    }
@@ -538,7 +538,7 @@
 void WINAPI DragFinish(HDROP h)
 {
 	TRACE("\n");
-	GlobalFree((HGLOBAL)h);
+	GlobalFree(h);
 }
 
 /*************************************************************************
@@ -551,7 +551,7 @@
 
 	TRACE("\n");
 
-	lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
+	lpDropFileStruct = GlobalLock(hDrop);
 
         *p = lpDropFileStruct->pt;
 	bRet = lpDropFileStruct->fNC;
@@ -572,7 +572,7 @@
 {
 	LPSTR lpDrop;
 	UINT i = 0;
-	DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
+	DROPFILES *lpDropFileStruct = GlobalLock(hDrop);
 
 	TRACE("(%p, %x, %p, %u)\n",	hDrop,lFile,lpszFile,lLength);
 
@@ -627,7 +627,7 @@
 {
 	LPWSTR lpwDrop;
 	UINT i = 0;
-	DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
+	DROPFILES *lpDropFileStruct = GlobalLock(hDrop);
 
 	TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);