From b102a612d6da976dd68bfab5117b1d438847e38c Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 26 Nov 2024 11:52:14 +0300 Subject: [PATCH] [CKPE] rc2json: fixed id for resource hacker --- rc2json/rc2json.cpp | 10 +++++----- rc2json/version/build_version.txt | Bin 12 -> 12 bytes rc2json/version/resource_version2.h | Bin 2004 -> 2004 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rc2json/rc2json.cpp b/rc2json/rc2json.cpp index c54cc5a7..c46691b0 100644 --- a/rc2json/rc2json.cpp +++ b/rc2json/rc2json.cpp @@ -174,7 +174,7 @@ static bool rc2json(const char* a_filename) char type[100]; char classname[100]; char title[100]; - uint32_t id; + uint16_t id; uint32_t left, top, width, height; }; @@ -327,10 +327,10 @@ static bool rc2json(const char* a_filename) read_words(in_stream, szWord); - controlinfo.id = strtoul(szWord, nullptr, 10); + controlinfo.id = (uint16_t)strtoul(szWord, nullptr, 10); } else - controlinfo.id = strtoul(szWord, nullptr, 10); + controlinfo.id = (uint16_t)strtoul(szWord, nullptr, 10); read_words(in_stream, szWord); strcpy_s(controlinfo.classname, trim(szWord).c_str()); @@ -424,10 +424,10 @@ static bool rc2json(const char* a_filename) strcpy_s(controlinfo.title, trim(szWord).c_str()); read_words(in_stream, szWord); - controlinfo.id = strtoul(szWord, nullptr, 10); + controlinfo.id = (uint16_t)strtoul(szWord, nullptr, 10); } else - controlinfo.id = strtoul(szWord, nullptr, 10); + controlinfo.id = (uint16_t)strtoul(szWord, nullptr, 10); read_words(in_stream, szWord); controlinfo.left = strtoul(szWord, nullptr, 10); diff --git a/rc2json/version/build_version.txt b/rc2json/version/build_version.txt index bf1fa3d901014eeb98e85a0ed1cd1dd0e83ab3f6..d7fef5c26e56a926c3e6347d0f9b72a6fb26340c 100644 GIT binary patch literal 12 TcmezW&yc~0!IXiQfr|kE8|nhB literal 12 TcmezW&yc~0!I*)Ufr|kE8{Pt| diff --git a/rc2json/version/resource_version2.h b/rc2json/version/resource_version2.h index 59b270ef7d3ec6c89e8cf1f97b73eb818392d97e..4a8b8362400dc971fef5fa06dd9012c5759e27fd 100644 GIT binary patch delta 26 icmcb@e}#X;BW6|;23`iP$&Ad>lOtHAHp{T=UlOtHAHp{T=U