wine/tools/winedump lnk.c

[Alexandre Julliard]

ChangeSet ID:	21032
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/02 04:55:13

Modified files:
	tools/winedump : lnk.c 

Log message:
	Mike McCormack <mike at codeweavers.com>
	Handle msi component identifiers without a feature guid.

Patch: http://cvs.winehq.org/patch.py?id=21032

Old revision  New revision  Changes     Path
 1.12          1.13          +7 -3       wine/tools/winedump/lnk.c

Index: wine/tools/winedump/lnk.c
diff -u -p wine/tools/winedump/lnk.c:1.12 wine/tools/winedump/lnk.c:1.13
--- wine/tools/winedump/lnk.c:1.12	2 Nov 2005 10:55:13 -0000
+++ wine/tools/winedump/lnk.c	2 Nov 2005 10:55:13 -0000
@@ -363,18 +363,22 @@ static int dump_advertise_info(int fd, c
 
         comp = &avt->bufA[20];
         feat = strchr(comp,'>');
+        if (!feat)
+            feat = strchr(comp,'<');
         if (feat)
         {
             memcpy( comp_str, comp, feat - comp );
             comp_str[feat-comp] = 0;
         }
         else
-            strcpy( prod_str, "?" );
+        {
+            strcpy( comp_str, "?" );
+        }
 
-        if (feat && base85_to_guid( &feat[1], &guid ))
+        if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid ))
             guid_to_string( &guid, feat_str );
         else
-            strcpy( prod_str, "?" );
+            feat_str[0] = 0;
 
         printf("  product:   %s\n", prod_str);
         printf("  component: %s\n", comp_str );