diff --git a/rc2json/rc2json.cpp b/rc2json/rc2json.cpp index c54cc5a..c46691b 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 bf1fa3d..d7fef5c 100644 Binary files a/rc2json/version/build_version.txt and b/rc2json/version/build_version.txt differ diff --git a/rc2json/version/resource_version2.h b/rc2json/version/resource_version2.h index 59b270e..4a8b836 100644 Binary files a/rc2json/version/resource_version2.h and b/rc2json/version/resource_version2.h differ