Commit b191c3da authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

Handle msi component identifiers without a feature guid.

parent a182e093
...@@ -363,18 +363,22 @@ static int dump_advertise_info(int fd, const char *type) ...@@ -363,18 +363,22 @@ static int dump_advertise_info(int fd, const char *type)
comp = &avt->bufA[20]; comp = &avt->bufA[20];
feat = strchr(comp,'>'); feat = strchr(comp,'>');
if (!feat)
feat = strchr(comp,'<');
if (feat) if (feat)
{ {
memcpy( comp_str, comp, feat - comp ); memcpy( comp_str, comp, feat - comp );
comp_str[feat-comp] = 0; comp_str[feat-comp] = 0;
} }
else 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 ); guid_to_string( &guid, feat_str );
else else
strcpy( prod_str, "?" ); feat_str[0] = 0;
printf(" product: %s\n", prod_str); printf(" product: %s\n", prod_str);
printf(" component: %s\n", comp_str ); printf(" component: %s\n", comp_str );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment