Clean remaining pfile.cpp functions

full file is binary exact except for pfile_create_player_description (minor diff)
diasurgical · Oct 6, 2018 · 22dc793 · 22dc793
1 parent 3561450
commit 22dc793
Show file tree

Hide file tree

Showing 8 changed files with 257 additions and 363 deletions.
diff --git a/DiabloUI/_temp_data.cpp b/DiabloUI/_temp_data.cpp
@@ -315,7 +315,7 @@ char byte_1002A380[128]; // weak
 int dword_1002A400; // weak
 int dword_1002A404; // weak
 int dword_1002A408; // weak
-BOOL (__stdcall *selhero_fnstats)(int, _uidefaultstats *);
+BOOL (__stdcall *selhero_fnstats)(unsigned int, _uidefaultstats *);
 int SelHero_cpp_float; // weak
 DWORD selhero_sizedata[2]; // idb
 int selhero_difficulty; // weak

diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h
@@ -34,8 +34,8 @@ void __cdecl UiInitialize();
 BOOL __stdcall UiCopyProtError(int *pdwResult);
 void __stdcall UiAppActivate(BOOL bActive);
 BOOL __fastcall UiValidPlayerName(char *name); /* check __stdcall */
-BOOL __stdcall UiSelHeroMultDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(int, _uidefaultstats *), int *dlgresult, int *a6, char *name);
-BOOL __stdcall UiSelHeroSingDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty);
+BOOL __stdcall UiSelHeroMultDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, int *a6, char *name);
+BOOL __stdcall UiSelHeroSingDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty);
 BOOL __stdcall UiCreditsDialog(int a1);
 BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void (__stdcall *fnSound)(char *file), int a4);
 int __stdcall UiProgressDialog(HWND window, char *msg, int a3, void *fnfunc, int a5);

diff --git a/DiabloUI/selhero.cpp b/DiabloUI/selhero.cpp
@@ -219,7 +219,7 @@ BOOL __fastcall UiValidPlayerName(char *name)
 }
 
 // ref: 0x1000BBB4
-BOOL __stdcall UiSelHeroMultDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(int, _uidefaultstats *), int *dlgresult, int *a6, char *name)
+BOOL __stdcall UiSelHeroMultDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, int *a6, char *name)
 {
 	int v7; // eax
 	int v8; // eax
@@ -762,7 +762,7 @@ BOOL __stdcall SelHero_GetHeroInfo(_uiheroinfo *pInfo)
 // 1002A428: using guessed type int selhero_numheroesleft;
 
 // ref: 0x1000C57A
-BOOL __stdcall UiSelHeroSingDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty)
+BOOL __stdcall UiSelHeroSingDialog(BOOL (__stdcall *fninfo)(BOOL (__stdcall *fninfofunc)(_uiheroinfo *)), BOOL (__stdcall *fncreate)(_uiheroinfo *), BOOL (__stdcall *fnremove)(_uiheroinfo *), BOOL (__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty)
 {
 	int v7; // eax
 	int v8; // edi

diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
@@ -315,9 +315,9 @@ void __fastcall mpqapi_remove_hash_entries(BOOL (__stdcall *fnGetName)(DWORD, ch
 	}
 }
 
-BOOL __fastcall mpqapi_write_file(const char *pszName, const char *pbData, DWORD dwLen)
+BOOL __fastcall mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen)
 {
-	const char *v3; // edi
+	const BYTE *v3; // edi
 	const char *v4; // esi
 	_BLOCKENTRY *v5; // eax
 
@@ -379,7 +379,7 @@ _BLOCKENTRY *__fastcall mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk,
 	return v12;
 }
 
-bool __fastcall mpqapi_write_file_contents(const char *pszName, const char *pbData, int dwLen, _BLOCKENTRY *pBlk)
+bool __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk)
 {
 	const char *v4; // esi
 	const char *v5; // eax
@@ -393,7 +393,7 @@ bool __fastcall mpqapi_write_file_contents(const char *pszName, const char *pbDa
 	unsigned int v14; // eax
 	int v15; // ecx
 	int size; // [esp+Ch] [ebp-10h]
-	const char *v17; // [esp+10h] [ebp-Ch]
+	const BYTE *v17; // [esp+10h] [ebp-Ch]
 	int v18; // [esp+14h] [ebp-8h]
 	DWORD nNumberOfBytesToWrite; // [esp+18h] [ebp-4h]
 

diff --git a/Source/mpqapi.h b/Source/mpqapi.h
@@ -24,9 +24,9 @@ _BLOCKENTRY *__fastcall mpqapi_new_block(int *block_index);
 int __fastcall mpqapi_get_hash_index_of_path(const char *pszName);
 int __fastcall mpqapi_get_hash_index(short index, int hash_a, int hash_b, int locale);
 void __fastcall mpqapi_remove_hash_entries(BOOL (__stdcall *fnGetName)(DWORD, char *));
-BOOL __fastcall mpqapi_write_file(const char *pszName, const char *pbData, DWORD dwLen);
+BOOL __fastcall mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen);
 _BLOCKENTRY *__fastcall mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int block_index);
-bool __fastcall mpqapi_write_file_contents(const char *pszName, const char *pbData, int dwLen, _BLOCKENTRY *pBlk);
+bool __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk);
 int __fastcall mpqapi_find_free_block(int size, int *block_size);
 void __fastcall mpqapi_rename(char *pszOld, char *pszNew);
 BOOL __fastcall mpqapi_has_file(const char *pszName);