Merge pull request #325 from Atari2/asar_19

Fix resolvedefines not being loaded in the DLL and fix getwrittenblocks not working correctly when building statically
RPGHacker · Jul 31, 2024 · 5e0cdba · 5e0cdba
2 parents 5edd93c + 3d48a4e
commit 5e0cdba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/asar-dll-bindings/c/asardll.c b/src/asar-dll-bindings/c/asardll.c
@@ -141,6 +141,7 @@ static bool asar_init_shared(void)
 	load(getlabelval);
 	load(getdefine);
 	load(getalldefines);
+	load(resolvedefines);
 	load(math);
 	load(getwrittenblocks);
 	load(getmapper);

diff --git a/src/asar/interface-lib.cpp b/src/asar/interface-lib.cpp
@@ -493,11 +493,14 @@ EXPORT const char * asar_getdefine(const char * name)
 EXPORT const char * asar_resolvedefines(const char * data)
 {
 	static string out;
+	out = "";
 	try
 	{
 		resolvedefines(out, data);
 	}
-	catch(errfatal&){}
+	catch(errfatal&){
+		out = "";
+	}
 	return out;
 }
 

diff --git a/src/asar/libsmw.cpp b/src/asar/libsmw.cpp
@@ -19,7 +19,7 @@ asar_error_id openromerror;
 autoarray<writtenblockdata> writtenblocks;
 
 // RPG Hacker: Uses binary search to find the insert position of our ROM write
-#ifdef ASAR_SHARED
+#if defined(ASAR_SHARED) || defined(ASAR_STATIC)
 static int findromwritepos(int snesoffset, int searchstartpos, int searchendpos)
 {
 	if (searchendpos == searchstartpos)
@@ -40,6 +40,7 @@ static int findromwritepos(int snesoffset, int searchstartpos, int searchendpos)
 
 static void addromwriteforbank(int snesoffset, int numbytes)
 {
+	if (numbytes == 0) return;
 	int currentbank = (snesoffset & 0xFF0000);
 
 	int insertpos = findromwritepos(snesoffset, 0, writtenblocks.count);
@@ -110,23 +111,23 @@ static void addromwrite(int pcoffset, int numbytes)
 void writeromdata(int pcoffset, const void * indata, int numbytes)
 {
 	memcpy(const_cast<unsigned char*>(romdata) + pcoffset, indata, (size_t)numbytes);
-	#ifdef ASAR_SHARED
+	#if defined(ASAR_SHARED) || defined(ASAR_STATIC)
 		addromwrite(pcoffset, numbytes);
 	#endif
 }
 
 void writeromdata_byte(int pcoffset, unsigned char indata)
 {
 	memcpy(const_cast<unsigned char*>(romdata) + pcoffset, &indata, 1);
-	#ifdef ASAR_SHARED
+	#if defined(ASAR_SHARED) || defined(ASAR_STATIC)
 		addromwrite(pcoffset, 1);
 	#endif
 }
 
 void writeromdata_bytes(int pcoffset, unsigned char indata, int numbytes, bool add_write)
 {
 	memset(const_cast<unsigned char*>(romdata) + pcoffset, indata, (size_t)numbytes);
-	#ifdef ASAR_SHARED
+	#if defined(ASAR_SHARED) || defined(ASAR_STATIC)
 		if(add_write)
 			addromwrite(pcoffset, numbytes);
 	#endif