Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XML2SDB] Add support for TAG_LINK_DATE and TAG_LINKER_VERSION.

Browse source
This commit is contained in:
Mark Jansen 2018-02-24 18:42:42 +01:00
parent 2eaf526484
commit 3551953c84
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sdk/tools/xml2sdb/xml2sdb.cpp
View file

@ -503,12 +503,12 @@ bool MatchingFile::fromXml(XMLHandle dbNode)
ProductVersion = ReadStringNode(dbNode, "PRODUCT_VERSION"); ProductVersion = ReadStringNode(dbNode, "PRODUCT_VERSION");
FileVersion = ReadStringNode(dbNode, "FILE_VERSION"); FileVersion = ReadStringNode(dbNode, "FILE_VERSION");
BinFileVersion = ReadStringNode(dbNode, "BIN_FILE_VERSION"); BinFileVersion = ReadStringNode(dbNode, "BIN_FILE_VERSION");
LinkDate = ReadStringNode(dbNode, "LINK_DATE"); LinkDate = ReadDWordNode(dbNode, "LINK_DATE");
VerLanguage = ReadStringNode(dbNode, "VER_LANGUAGE"); VerLanguage = ReadStringNode(dbNode, "VER_LANGUAGE");
FileDescription = ReadStringNode(dbNode, "FILE_DESCRIPTION"); FileDescription = ReadStringNode(dbNode, "FILE_DESCRIPTION");
OriginalFilename = ReadStringNode(dbNode, "ORIGINAL_FILENAME"); OriginalFilename = ReadStringNode(dbNode, "ORIGINAL_FILENAME");
UptoBinFileVersion = ReadStringNode(dbNode, "UPTO_BIN_FILE_VERSION"); UptoBinFileVersion = ReadStringNode(dbNode, "UPTO_BIN_FILE_VERSION");
LinkerVersion = ReadStringNode(dbNode, "LINKER_VERSION"); LinkerVersion = ReadDWordNode(dbNode, "LINKER_VERSION");
return true; return true;
} }
@ -526,17 +526,14 @@ bool MatchingFile::toSdb(PDB pdb, Database& db)
db.WriteString(pdb, TAG_FILE_VERSION, FileVersion); db.WriteString(pdb, TAG_FILE_VERSION, FileVersion);
if (!BinFileVersion.empty()) if (!BinFileVersion.empty())
SHIM_ERR("TAG_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_BIN_FILE_VERSION, BinFileVersion); SHIM_ERR("TAG_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_BIN_FILE_VERSION, BinFileVersion);
if (!LinkDate.empty()) db.WriteDWord(pdb, TAG_LINK_DATE, LinkDate);
SHIM_ERR("TAG_LINK_DATE Unimplemented\n"); //db.WriteDWord(pdb, TAG_LINK_DATE, LinkDate);
if (!VerLanguage.empty()) if (!VerLanguage.empty())
SHIM_ERR("TAG_VER_LANGUAGE Unimplemented\n"); //db.WriteDWord(pdb, TAG_VER_LANGUAGE, VerLanguage); SHIM_ERR("TAG_VER_LANGUAGE Unimplemented\n"); //db.WriteDWord(pdb, TAG_VER_LANGUAGE, VerLanguage);
db.WriteString(pdb, TAG_FILE_DESCRIPTION, FileDescription); db.WriteString(pdb, TAG_FILE_DESCRIPTION, FileDescription);
db.WriteString(pdb, TAG_ORIGINAL_FILENAME, OriginalFilename); db.WriteString(pdb, TAG_ORIGINAL_FILENAME, OriginalFilename);
if (!UptoBinFileVersion.empty()) if (!UptoBinFileVersion.empty())
SHIM_ERR("TAG_UPTO_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_UPTO_BIN_FILE_VERSION, UptoBinFileVersion); SHIM_ERR("TAG_UPTO_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_UPTO_BIN_FILE_VERSION, UptoBinFileVersion);
if (!LinkerVersion.empty()) db.WriteDWord(pdb, TAG_LINKER_VERSION, LinkerVersion);
SHIM_ERR("TAG_LINKER_VERSION Unimplemented\n"); //db.WriteDWord(pdb, TAG_LINKER_VERSION, LinkerVersion);
return !!db.EndWriteListTag(pdb, tagid); return !!db.EndWriteListTag(pdb, tagid);
} }

6
sdk/tools/xml2sdb/xml2sdb.h
View file

@ -123,7 +123,7 @@ struct Layer
struct MatchingFile struct MatchingFile
{ {
MatchingFile() : Size(0), Checksum(0) {;} MatchingFile() : Size(0), Checksum(0), LinkDate(0), LinkerVersion(0) {;}
bool fromXml(XMLHandle dbNode); bool fromXml(XMLHandle dbNode);
bool toSdb(PDB pdb, Database& db); bool toSdb(PDB pdb, Database& db);
@ -137,12 +137,12 @@ struct MatchingFile
std::string ProductVersion; std::string ProductVersion;
std::string FileVersion; std::string FileVersion;
std::string BinFileVersion; std::string BinFileVersion;
std::string LinkDate; DWORD LinkDate;
std::string VerLanguage; std::string VerLanguage;
std::string FileDescription; std::string FileDescription;
std::string OriginalFilename; std::string OriginalFilename;
std::string UptoBinFileVersion; std::string UptoBinFileVersion;
std::string LinkerVersion; DWORD LinkerVersion;
}; };
struct Exe struct Exe