Windows Port: Fix compiling on Windows. (Regression from commit 11cf901…

….)
TASEmulators · Aug 24, 2017 · 823e9ed · 823e9ed
1 parent 11cf901
commit 823e9ed
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/desmume/src/frontend/windows/memView.cpp b/desmume/src/frontend/windows/memView.cpp
@@ -591,7 +591,7 @@ INT_PTR CALLBACK MemView_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						{
 						case MEMVIEW_ARM9:
 						case MEMVIEW_ARM7:
-							DEBUG_dumpMemory(&f);
+							DEBUG_dumpMemory(f);
 							break;
 						default:
 							{

diff --git a/desmume/src/frontend/windows/mic-win.cpp b/desmume/src/frontend/windows/mic-win.cpp
@@ -205,10 +205,10 @@ bool LoadSample(const char *name)
 			return false;
 	}
 
-	 if (!formatChunk(&inf))
+	 if (!formatChunk(inf))
       return false;
 
-	 if (!dataChunk(&inf))
+	 if (!dataChunk(inf))
 	 {
 		 MessageBox(0,"not a valid WAVE file. some unknown problem.",0,0);
 		 return false;

diff --git a/desmume/src/frontend/windows/replay.cpp b/desmume/src/frontend/windows/replay.cpp
@@ -125,7 +125,7 @@ void Describe(HWND hwndDlg)
 	EMUFILE_FILE fp(playfilename,"rb");
 	if(fp.fail()) return;
 	MovieData md;
-	LoadFM2(md, &fp, INT_MAX, false);
+	LoadFM2(md, fp, INT_MAX, false);
 
 	u32 num_frames = md.records.size();
 

diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2009-2016 DeSmuME team
+	Copyright (C) 2009-2017 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -2080,7 +2080,7 @@ DEFINE_LUA_FUNCTION(state_save, "location[,option]")
 			if((*ppEmuFile)->fail())
 				luaL_error(L, "failed to save, savestate object was dead.");
 
-			savestate_save(*ppEmuFile, 0);
+			savestate_save(**ppEmuFile, 0);
 
 			if((*ppEmuFile)->fail())
 				luaL_error(L, "failed to save savestate!");
@@ -2135,7 +2135,7 @@ DEFINE_LUA_FUNCTION(state_load, "location[,option]")
 			if((*ppEmuFile)->size() == 0)
 				luaL_error(L, "failed to load, savestate wasn't saved first.");
 
-			savestate_load(*ppEmuFile);
+			savestate_load(**ppEmuFile);
 
 			if((*ppEmuFile)->fail())
 				luaL_error(L, "failed to load savestate!");
@@ -2276,7 +2276,7 @@ DEFINE_LUA_FUNCTION(state_verify, "location[,option]")
 				luaL_error(L, "failed to verify, savestate object was dead.");
 
 			EMUFILE_MEMORY_VERIFIER verifier (*ppEmuFile);
-			savestate_save(&verifier, 0);
+			savestate_save(verifier, 0);
 			if(verifier.differences.size())
 			{
 				fputs("\n", stdout);