genimport: fix 16 bit shift in namedproperty mappings

While the inner reverse map of static_namedprop_map uses 16-bit propids,
the inner forward map of static_namedprop_map is (still) on 32-bit proptags.
The PROP_TAG(PT_UNSPECIFIED, x) call was not carried over, causing MT
streams to carry no meaningful namedprop entries.

Fixes: gromox-2.32-67-gcc38c6d7a
References: DESK-2660

Author: jengelh

tools/genimport.cpp

@@ -87,17 +87,17 @@ void gi_dump_name_map(const gi_name_map &map)
 {
 	if (!g_show_props)
 		return;
-	fprintf(stderr, "Named properties (%zu entries):\n", map.size());
-	fprintf(stderr, "\t# PROPID (hex) <-> MAPINAMEID definition:\n");
-	for (const auto &[propid, propname] : map) {
+	fprintf(stderr, "Preamble's named property map (%zu entries):\n", map.size());
+	fprintf(stderr, "\t# proptag (hex) -> MAPINAMEID definition:\n");
+	for (const auto &[proptag, propname] : map) {
 		char g[40];
 		propname.guid.to_str(g, std::size(g), 38);
 		if (propname.kind == MNID_ID)
-			fprintf(stderr, "\t%04xh <-> {MNID_ID, %s, %xh}\n",
-				propid, g, static_cast<unsigned int>(propname.lid));
+			fprintf(stderr, "\t%08xh -> {MNID_ID, %s, %xh}\n",
+				proptag, g, static_cast<unsigned int>(propname.lid));
 		else if (propname.kind == MNID_STRING)
-			fprintf(stderr, "\t%04xh <-> {MNID_STRING, %s, %s}\n",
-				propid, g, propname.name.c_str());
+			fprintf(stderr, "\t%08xh -> {MNID_STRING, %s, %s}\n",
+				proptag, g, propname.name.c_str());
 	}
 }
 
@@ -172,10 +172,13 @@ void gi_name_map_write(const gi_name_map &map)
 		throw std::bad_alloc();
 	if (ep.p_uint64(map.size()) != EXT_ERR_SUCCESS)
 		throw YError("PG-1110");
-	for (const auto &[propid, xn] : map)
-		if (ep.p_uint32(propid) != EXT_ERR_SUCCESS ||
+	for (const auto &[proptag, xn] : map) {
+		static_assert(sizeof(gi_name_map::key_type) == sizeof(uint32_t),
+			"Something is fishy with the definition of gi_name_map");
+		if (ep.p_uint32(proptag) != pack_result::ok ||
 		    ep.p_propname(static_cast<PROPERTY_NAME>(xn)) != EXT_ERR_SUCCESS)
 			throw YError("PG-1111");
+	}
 	uint64_t xsize = cpu_to_le64(ep.m_offset);
 	if (HXio_fullwrite(STDOUT_FILENO, &xsize, sizeof(xsize)) < 0)
 		throw YError("PG-1112: %s", strerror(errno));

tools/mt2exm.cpp

@@ -413,7 +413,8 @@ static void gi_dump_thru_map(const propididmap_t &map)
 {
 	if (!g_show_props)
 		return;
-	fprintf(stderr, "Named properties, thru-map (%zu entries):\n", map.size());
+	fprintf(stderr, "propid-to-propid map (%zu entries):\n", map.size());
+	fprintf(stderr, "\t# src propid <-> dst propid:\n");
 	for (const auto &[from, to] : map)
 		fprintf(stderr, "\t%04xh <-> %04xh\n", from, to);
 }

tools/staticnpmap.cpp

@@ -12,7 +12,7 @@ struct namedprop_bimap {
 	public:
 	uint16_t emplace(uint16_t, PROPERTY_XNAME &&);
 
-	gi_name_map fwd;
+	gi_name_map fwd; /* note this is uint32_t -> */
 	std::unordered_map<std::string, uint16_t> rev;
 	uint16_t nextid = 0x8000;
 };
@@ -38,7 +38,7 @@ uint16_t namedprop_bimap::emplace(uint16_t desired_propid, PROPERTY_XNAME &&name
 	auto [iter, newly_added] = rev.emplace(txt, desired_propid);
 	if (!newly_added)
 		return iter->second;
-	fwd.emplace(desired_propid, std::move(name));
+	fwd.emplace(PROP_TAG(PT_UNSPECIFIED, desired_propid), std::move(name));
 	nextid = std::max(nextid, static_cast<uint16_t>(desired_propid + 1));
 	return desired_propid;
 }