[ros-diffs] [cwittich] 44079: sync shell32/shelllink to wine 1.1.32

[cwittich at svn.reactos.org]

Author: cwittich
Date: Tue Nov 10 21:09:00 2009
New Revision: 44079

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

Modified:
    trunk/reactos/dll/win32/shell32/shelllink.c

Modified: trunk/reactos/dll/win32/shell32/shelllink.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllink.c?rev=44079&r1=44078&r2=44079&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Tue Nov 10 21:09:00 2009
@@ -219,35 +219,35 @@
     }
     else if(IsEqualIID(riid, &IID_IShellLinkW))
     {
-        *ppvObj = (void *)&(This->lpvtblw);
+        *ppvObj = &(This->lpvtblw);
     }
     else if(IsEqualIID(riid, &IID_IPersistFile))
     {
-        *ppvObj = (void *)&(This->lpvtblPersistFile);
+        *ppvObj = &(This->lpvtblPersistFile);
     }
     else if(IsEqualIID(riid, &IID_IPersistStream))
     {
-        *ppvObj = (void *)&(This->lpvtblPersistStream);
+        *ppvObj = &(This->lpvtblPersistStream);
     }
     else if(IsEqualIID(riid, &IID_IShellLinkDataList))
     {
-        *ppvObj = (void *)&(This->lpvtblShellLinkDataList);
+        *ppvObj = &(This->lpvtblShellLinkDataList);
     }
     else if(IsEqualIID(riid, &IID_IShellExtInit))
     {
-        *ppvObj = (void *)&(This->lpvtblShellExtInit);
+        *ppvObj = &(This->lpvtblShellExtInit);
     }
     else if(IsEqualIID(riid, &IID_IContextMenu))
     {
-        *ppvObj = (void *)&(This->lpvtblContextMenu);
+        *ppvObj = &(This->lpvtblContextMenu);
     }
     else if(IsEqualIID(riid, &IID_IObjectWithSite))
     {
-        *ppvObj = (void *)&(This->lpvtblObjectWithSite);
+        *ppvObj = &(This->lpvtblObjectWithSite);
     }
     else if(IsEqualIID(riid, &IID_IShellPropSheetExt))
     {
-        *ppvObj = (void *)&(This->lpvtblPropSheetExt);
+        *ppvObj = &(This->lpvtblPropSheetExt);
     }
 
     if(*ppvObj)
@@ -299,7 +299,7 @@
     if (This->pPidl)
         ILFree(This->pPidl);
 
-    LocalFree((HANDLE)This);
+    LocalFree(This);
 
     return 0;
 }
@@ -308,7 +308,7 @@
 {
     TRACE("%p %p\n", This, pclsid);
 
-    memcpy( pclsid, &CLSID_ShellLink, sizeof (CLSID) );
+    *pclsid = CLSID_ShellLink;
     return S_OK;
 }
 
@@ -1650,6 +1650,8 @@
     IShellLinkImpl *This = (IShellLinkImpl *)iface;
 
     TRACE("(%p)->(path=%s)\n",This, pszFile);
+
+    if (!pszFile) return E_INVALIDARG;
 
     str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile);
     if( !str )