SHELL32: MSI advertised shortcuts don't require a product ID

Mike McCormack mike at codeweavers.com
Fri Apr 22 06:15:35 CDT 2005


This fixes MSN Messenger 6.2 install.  (for Maarten)

ChangeLog:
* MSI advertised shortcuts don't require a product ID
-------------- next part --------------
Index: dlls/shell32/shelllink.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shelllink.c,v
retrieving revision 1.90
diff -u -p -r1.90 shelllink.c
--- dlls/shell32/shelllink.c	18 Apr 2005 10:30:55 -0000	1.90
+++ dlls/shell32/shelllink.c	22 Apr 2005 11:14:58 -0000
@@ -1996,6 +1996,9 @@ static LPWSTR ShellLink_GetAdvertisedArg
     LPCWSTR p;
     DWORD len;
 
+    if( !str )
+        return NULL;
+
     p = strchrW( str, ':' );
     if( !p )
         return NULL;
@@ -2057,8 +2060,8 @@ static HRESULT ShellLink_SetAdvertiseInf
             return E_FAIL;
     }
 
-    /* we have to have at least one of these two for an advertised shortcut */
-    if( !szComponent && !szProduct )
+    /* we have to have a component for an advertised shortcut */
+    if( !szComponent )
         return E_FAIL;
 
     This->sComponent = ShellLink_GetAdvertisedArg( szComponent );


More information about the wine-patches mailing list