[libromdata] (NE|PE)ResourceReader.hpp: Add MAKEINTRESOURCE wrappers.

They shouldn't be needed here, since they're defined in IResourceReader, but it doesn't seem to be working in cases where windows.h overrides our own definitions...
GerbilSoft · May 27, 2024 · ed2999e · ed2999e
1 parent 315d184
commit ed2999e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/libromdata/disc/NEResourceReader.hpp b/src/libromdata/disc/NEResourceReader.hpp
@@ -99,6 +99,13 @@ class NEResourceReader final : public IResourceReader
 	 */
 	LibRpFile::IRpFilePtr open(uint16_t type, int id, int lang) final;
 
+#ifdef _WIN32
+	open_MAKEINTRESOURCE_wrapper(LPSTR);
+	open_MAKEINTRESOURCE_wrapper(LPCSTR);
+	open_MAKEINTRESOURCE_wrapper(LPWSTR);
+	open_MAKEINTRESOURCE_wrapper(LPCWSTR);
+#endif /* _WIN32 */
+
 	/**
 	 * Load a VS_VERSION_INFO resource.
 	 * Data will be byteswapped to host-endian if necessary.

diff --git a/src/libromdata/disc/PEResourceReader.hpp b/src/libromdata/disc/PEResourceReader.hpp
@@ -100,6 +100,13 @@ class PEResourceReader final : public IResourceReader
 	 */
 	LibRpFile::IRpFilePtr open(uint16_t type, int id, int lang) final;
 
+#ifdef _WIN32
+	open_MAKEINTRESOURCE_wrapper(LPSTR);
+	open_MAKEINTRESOURCE_wrapper(LPCSTR);
+	open_MAKEINTRESOURCE_wrapper(LPWSTR);
+	open_MAKEINTRESOURCE_wrapper(LPCWSTR);
+#endif /* _WIN32 */
+
 	/**
 	 * Load a VS_VERSION_INFO resource.
 	 * Data will be byteswapped to host-endian if necessary.