From 40cea40aa4cfee71e5efce72a4031409b76364c6 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 26 Dec 2019 04:44:16 +0100 Subject: [PATCH] Remove windows call types collisions --- 3rdParty/Storm/Source/storm.h | 61 +++++++++++------------- DiabloUI/diabloui.h | 60 ++++++++++++------------ Source/appfat.cpp | 4 +- Source/appfat.h | 8 +--- Source/diablo.cpp | 11 ++--- Source/diablo.h | 9 ++-- Source/dthread.cpp | 2 +- Source/dthread.h | 2 +- Source/effects.cpp | 2 +- Source/effects.h | 2 +- Source/encrypt.cpp | 4 +- Source/encrypt.h | 4 +- Source/init.cpp | 2 +- Source/init.h | 2 +- Source/mainmenu.cpp | 4 +- Source/mainmenu.h | 4 +- Source/movie.h | 2 +- Source/mpqapi.cpp | 2 +- Source/mpqapi.h | 2 +- Source/msg.cpp | 2 +- Source/msg.h | 2 +- Source/multi.cpp | 4 +- Source/multi.h | 4 +- Source/nthread.cpp | 2 +- Source/nthread.h | 2 +- Source/pfile.cpp | 14 +++--- Source/pfile.h | 14 +++--- Source/plrmsg.cpp | 2 +- Source/plrmsg.h | 2 +- SourceS/miniwin/misc.h | 88 +++++++++++++---------------------- SourceS/miniwin/popdecl.inc | 7 --- SourceS/miniwin/pushdecl.inc | 24 ---------- SourceS/miniwin/thread.h | 8 ++-- SourceX/main.cpp | 2 +- structs.h | 2 +- types.h | 1 - 36 files changed, 150 insertions(+), 217 deletions(-) delete mode 100644 SourceS/miniwin/popdecl.inc delete mode 100644 SourceS/miniwin/pushdecl.inc diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h index 1edfb0366..4b9068987 100644 --- a/3rdParty/Storm/Source/storm.h +++ b/3rdParty/Storm/Source/storm.h @@ -3,7 +3,6 @@ #ifndef __BLIZZARD_STORM_HEADER #define __BLIZZARD_STORM_HEADER -#include "miniwin/pushdecl.inc" #include namespace dvl { @@ -11,7 +10,7 @@ namespace dvl { // Storm API definition #ifndef STORMAPI -#define STORMAPI __stdcall +#define STORMAPI #endif #ifndef __STORM_SMAX @@ -455,8 +454,6 @@ SNetSetGameMode( #define SNMakeGamePublic() SNetSetGameMode( (DWORD mode, SNetGetGameInfo(GAMEINFO_MODEFLAGS, &mode, 4), mode), true) -BOOL STORMAPI SNetEnumGamesEx(int a1, int a2, int (__fastcall *callback)(DWORD, DWORD, DWORD), int *hintnextcall); - BOOL STORMAPI SNetDisconnectAll(DWORD flags); BOOL STORMAPI SNetCreateLadderGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString, DWORD dwGameType, DWORD dwGameLadderType, DWORD dwGameModeFlags, char *GameTemplateData, int GameTemplateSize, int playerCount, char *creatorName, char *a11, int *playerID); @@ -1180,8 +1177,7 @@ void STORMAPI SRgn529i(int handle, int a2, int a3); * * Returns TRUE if the user chose to continue execution, FALSE otherwise. */ -BOOL __cdecl -SErrDisplayErrorFmt( +BOOL SErrDisplayErrorFmt( DWORD dwErrMsg, const char *logfilename, int logline, @@ -1234,7 +1230,7 @@ char *STORMAPI SStrChrR(const char *string, char c); * * Returns the number of characters written. */ -unsigned int __cdecl +unsigned int SStrVPrintf( char *dest, unsigned int size, @@ -1251,37 +1247,36 @@ int STORMAPI SBigPowMod(void *buffer1, void *buffer2, int a3, int a4); int STORMAPI SBigToBinaryBuffer(void *buffer, int length, int a3, int a4); -void __stdcall SDrawMessageBox(char *,char *,int); -void __cdecl SDrawDestroy(void); -BOOLEAN __cdecl StormDestroy(void); -BOOL __stdcall SFileSetBasePath(char *); -void __cdecl SDrawRealizePalette(void); -BOOL __cdecl SVidPlayContinue(void); -BOOL __stdcall SNetGetOwnerTurnsWaiting(DWORD *); -BOOL __stdcall SNetUnregisterEventHandler(int,SEVTHANDLER); -BOOL __stdcall SNetRegisterEventHandler(int,SEVTHANDLER); -BOOLEAN __stdcall SNetSetBasePlayer(int); -int __stdcall SNetInitializeProvider(unsigned long,struct _SNETPROGRAMDATA *,struct _SNETPLAYERDATA *,struct _SNETUIDATA *,struct _SNETVERSIONDATA *); -int __stdcall SNetGetProviderCaps(struct _SNETCAPS *); -int __stdcall SFileSetFilePointer(HANDLE,int,HANDLE,int); -void __stdcall SDrawClearSurface(int a1); -BOOL __stdcall SDlgSetBitmapI(HWND hWnd, int a2, char *src, int mask1, int flags, void *pBuff, int a7, int width, int height, int mask2); -void __stdcall SDlgBeginPaint(HWND hWnd, char *a2); -void __stdcall SDlgEndPaint(HWND hWnd, char *a2); -void __stdcall SDlgSetSystemCursor(BYTE *a1, BYTE *a2, int *a3, int a4); -void __stdcall SDlgSetCursor(HWND hWnd, HCURSOR a2, int a3, int *a4); -BOOL __stdcall SDlgSetTimer(int a1, int a2, int a3, void (__stdcall *a4)(int, int, int, int)); -BOOL __stdcall SDlgKillTimer(int a1, int a2); -BOOL __stdcall SDlgDrawBitmap(HWND hWnd, int a2, int a3, int a4, int a5, int a6, int a7); -BOOL __stdcall SDlgDialogBoxParam(HINSTANCE hInst, char *szDialog, int hWnd, WNDPROC func, int selhero_is_good); -BOOL __stdcall SGdiTextOut(void *pBuffer, int x, int y, int mask, char *str, int len); -BOOL __stdcall SFileEnableDirectAccess(BOOL enable); +void SDrawMessageBox(char *, char *, int); +void SDrawDestroy(void); +BOOLEAN StormDestroy(void); +BOOL SFileSetBasePath(char *); +void SDrawRealizePalette(void); +BOOL SVidPlayContinue(void); +BOOL SNetGetOwnerTurnsWaiting(DWORD *); +BOOL SNetUnregisterEventHandler(int, SEVTHANDLER); +BOOL SNetRegisterEventHandler(int, SEVTHANDLER); +BOOLEAN SNetSetBasePlayer(int); +int SNetInitializeProvider(unsigned long, struct _SNETPROGRAMDATA *, struct _SNETPLAYERDATA *, struct _SNETUIDATA *, struct _SNETVERSIONDATA *); +int SNetGetProviderCaps(struct _SNETCAPS *); +int SFileSetFilePointer(HANDLE, int, HANDLE, int); +void SDrawClearSurface(int a1); +BOOL SDlgSetBitmapI(HWND hWnd, int a2, char *src, int mask1, int flags, void *pBuff, int a7, int width, int height, int mask2); +void SDlgBeginPaint(HWND hWnd, char *a2); +void SDlgEndPaint(HWND hWnd, char *a2); +void SDlgSetSystemCursor(BYTE *a1, BYTE *a2, int *a3, int a4); +void SDlgSetCursor(HWND hWnd, HCURSOR a2, int a3, int *a4); +BOOL SDlgSetTimer(int a1, int a2, int a3, void (*a4)(int, int, int, int)); +BOOL SDlgKillTimer(int a1, int a2); +BOOL SDlgDrawBitmap(HWND hWnd, int a2, int a3, int a4, int a5, int a6, int a7); +BOOL SDlgDialogBoxParam(HINSTANCE hInst, char *szDialog, int hWnd, WNDPROC func, int selhero_is_good); +BOOL SGdiTextOut(void *pBuffer, int x, int y, int mask, char *str, int len); +BOOL SFileEnableDirectAccess(BOOL enable); #if defined(__GNUC__) || defined(__cplusplus) } #endif } -#include "miniwin/popdecl.inc" #endif diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h index d2a385e9d..efae492f5 100644 --- a/DiabloUI/diabloui.h +++ b/DiabloUI/diabloui.h @@ -2,7 +2,6 @@ #ifndef __DIABLOUI_H__ #define __DIABLOUI_H__ -#include "miniwin/pushdecl.inc" namespace dvl { //#if defined(__GNUC__) || defined(__cplusplus) @@ -28,42 +27,41 @@ struct ProfFntStruct { int field_8; }; -void __stdcall UiDestroy(); +void UiDestroy(); void UiTitleDialog(); -void __stdcall UiSetSpawned(BOOL bSpawned); -void __stdcall 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)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, 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 attractTimeOut); -BOOL __stdcall UiProgressDialog(HWND window, char *msg, int enable, int(*fnfunc)(), int rate); -int __stdcall UiProfileGetString(); -void __cdecl UiProfileCallback(); -void __cdecl UiProfileDraw(); -BOOL __stdcall UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7); -BOOL __stdcall UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5); -BOOL __stdcall UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPSTR lpBuffer, int cchBufferMax); -BOOL __stdcall UiSoundCallback(int a1, int type, int a3); -void __stdcall UiMessageBoxCallback(HWND hWnd, char *lpText, LPCSTR lpCaption, UINT uType); -BOOL __stdcall UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8); -BOOL __stdcall UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6); -BOOL __stdcall UiArtCallback(int game_type, unsigned int art_code, PALETTEENTRY *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp); -int __stdcall UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6); -int __stdcall UiSelectProvider(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *type); -BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc); -void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, DWORD type); -void __stdcall UiCreateGameCriteria(_uiheroinfo *pInfo, char *str); -BOOL __stdcall UiGetDefaultStats(int pclass, _uidefaultstats *pStats); -BOOL __stdcall UiBetaDisclaimer(int a1); +void UiSetSpawned(BOOL bSpawned); +void UiInitialize(); +BOOL UiCopyProtError(int *pdwResult); +void UiAppActivate(BOOL bActive); +BOOL UiValidPlayerName(char *name); /* check */ +BOOL UiSelHeroMultDialog(BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), BOOL (*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, char *name); +BOOL UiSelHeroSingDialog(BOOL (*fninfo)(BOOL (*fninfofunc)(_uiheroinfo *)), BOOL (*fncreate)(_uiheroinfo *), BOOL (*fnremove)(_uiheroinfo *), BOOL (*fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty); +BOOL UiCreditsDialog(int a1); +BOOL UiMainMenuDialog(char *name, int *pdwResult, void (*fnSound)(char *file), int attractTimeOut); +BOOL UiProgressDialog(HWND window, char *msg, int enable, int (*fnfunc)(), int rate); +int UiProfileGetString(); +void UiProfileCallback(); +void UiProfileDraw(); +BOOL UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7); +BOOL UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5); +BOOL UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPSTR lpBuffer, int cchBufferMax); +BOOL UiSoundCallback(int a1, int type, int a3); +void UiMessageBoxCallback(HWND hWnd, char *lpText, LPCSTR lpCaption, UINT uType); +BOOL UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8); +BOOL UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6); +BOOL UiArtCallback(int game_type, unsigned int art_code, PALETTEENTRY *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp); +int UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6); +int UiSelectProvider(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *type); +BOOL UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc); +void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, DWORD type); +void UiCreateGameCriteria(_uiheroinfo *pInfo, char *str); +BOOL UiGetDefaultStats(int pclass, _uidefaultstats *pStats); +BOOL UiBetaDisclaimer(int a1); //#if defined(__GNUC__) || defined(__cplusplus) //} //#endif } -#include "miniwin/popdecl.inc" #endif /* __DIABLOUI_H__ */ diff --git a/Source/appfat.cpp b/Source/appfat.cpp index 6bd9a99f4..da2c364a1 100644 --- a/Source/appfat.cpp +++ b/Source/appfat.cpp @@ -8,7 +8,7 @@ char sz_error_buf[256]; BOOL terminating; int cleanup_thread_id; -void __cdecl app_fatal(const char *pszFmt, ...) +void app_fatal(const char *pszFmt, ...) { va_list va; @@ -48,7 +48,7 @@ void FreeDlg() SNetDestroy(); } -void __cdecl DrawDlg(char *pszFmt, ...) +void DrawDlg(char *pszFmt, ...) { char text[256]; va_list arglist; diff --git a/Source/appfat.h b/Source/appfat.h index fe41a1a15..08ee83373 100644 --- a/Source/appfat.h +++ b/Source/appfat.h @@ -7,15 +7,12 @@ extern BOOL terminating; extern int cleanup_thread_id; void TriggerBreak(); -#ifdef _DEBUG -LONG __stdcall BreakFilter(PEXCEPTION_POINTERS pExc); -#endif char *GetErrorStr(DWORD error_code); #define TraceLastError SDL_GetError -void __cdecl app_fatal(const char *pszFmt, ...); +void app_fatal(const char *pszFmt, ...); void MsgBox(const char *pszFmt, va_list va); void FreeDlg(); -void __cdecl DrawDlg(char *pszFmt, ...); +void DrawDlg(char *pszFmt, ...); #ifdef _DEBUG void assert_fail(int nLineNo, const char *pszFile, const char *pszFail); #endif @@ -23,7 +20,6 @@ void DDErrMsg(DWORD error_code, int log_line_nr, char *log_file_path); void DSErrMsg(DWORD error_code, int log_line_nr, char *log_file_path); void center_window(HWND hDlg); void ErrDlg(const char *title, const char *error, char *log_file_path, int log_line_nr); -BOOL __stdcall FuncDlg(HWND hDlg, UINT uMsg, WPARAM wParam, char *text); void TextDlg(HWND hDlg, char *text); void FileErrDlg(const char *error); void DiskFreeDlg(char *error); diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 28616bffc..d8e2c9c89 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -249,7 +249,7 @@ void free_game() FreeGameMem(); } -void diablo_init(LPSTR lpCmdLine) +void diablo_init(const char *lpCmdLine) { init_create_window(); @@ -294,7 +294,7 @@ void diablo_splash() UiTitleDialog(); } -int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +int DiabloMain(const char *lpCmdLine) { diablo_init(lpCmdLine); diablo_splash(); @@ -303,7 +303,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi return 0; } -void diablo_parse_flags(char *args) +void diablo_parse_flags(const char *args) { char c; #ifdef _DEBUG @@ -503,7 +503,7 @@ BOOL PressEscKey() return rv; } -LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_KEYDOWN: @@ -542,7 +542,7 @@ LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return MainWndProc(hWnd, uMsg, wParam, lParam); } -LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_KEYDOWN: @@ -1683,7 +1683,6 @@ void game_loop(BOOL bStartup) } } - // Controller support: extern void plrctrls_after_game_logic(); diff --git a/Source/diablo.h b/Source/diablo.h index b5b05a718..f5d0cc549 100644 --- a/Source/diablo.h +++ b/Source/diablo.h @@ -125,13 +125,13 @@ BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer); void run_game_loop(unsigned int uMsg); void start_game(unsigned int uMsg); void free_game(); -int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow); -void diablo_parse_flags(char *args); +int DiabloMain(const char *lpCmdLine); +void diablo_parse_flags(const char *args); void diablo_init_screen(); void diablo_reload_process(HINSTANCE hInstance); BOOL PressEscKey(); -LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); BOOL LeftMouseDown(int wParam); BOOL LeftMouseCmd(BOOL bShift); BOOL TryIconCurs(); @@ -180,7 +180,6 @@ extern BOOL FriendlyMode; extern char *spszMsgTbl[4]; extern char *spszMsgHotKeyTbl[4]; -#include "miniwin/popdecl.inc" DEVILUTION_END_NAMESPACE #endif /* __DIABLO_H__ */ diff --git a/Source/dthread.cpp b/Source/dthread.cpp index 06cae9b1a..21a81bee6 100644 --- a/Source/dthread.cpp +++ b/Source/dthread.cpp @@ -73,7 +73,7 @@ void dthread_start() } } -unsigned int __stdcall dthread_handler(void *) +unsigned int dthread_handler(void *) { const char *error_buf; TMegaPkt *pkt; diff --git a/Source/dthread.h b/Source/dthread.h index 4ad5d3fb6..74c2f416b 100644 --- a/Source/dthread.h +++ b/Source/dthread.h @@ -8,7 +8,7 @@ extern BOOLEAN dthread_running; void dthread_remove_player(int pnum); void dthread_send_delta(int pnum, char cmd, void *pbSrc, int dwLen); void dthread_start(); -unsigned int __stdcall dthread_handler(void *); +unsigned int dthread_handler(void *); void dthread_cleanup(); /* data */ diff --git a/Source/effects.cpp b/Source/effects.cpp index 34d4333eb..c6346cfb1 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -1233,7 +1233,7 @@ void sound_init() priv_sound_init(SFX_UI); } -void __stdcall effects_play_sound(char *snd_file) +void effects_play_sound(char *snd_file) { DWORD i; diff --git a/Source/effects.h b/Source/effects.h index 8ed845e69..988f80e83 100644 --- a/Source/effects.h +++ b/Source/effects.h @@ -26,7 +26,7 @@ void effects_cleanup_sfx(); void stream_update(); void priv_sound_init(BYTE bLoadMask); void sound_init(); -void __stdcall effects_play_sound(char *snd_file); +void effects_play_sound(char *snd_file); /* rdata */ diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp index bc4d0b76d..6b02c68a2 100644 --- a/Source/encrypt.cpp +++ b/Source/encrypt.cpp @@ -108,7 +108,7 @@ int PkwareCompress(void *buf, int size) return size; } -unsigned int __cdecl PkwareBufferRead(char *buf, unsigned int *size, void *param) +unsigned int PkwareBufferRead(char *buf, unsigned int *size, void *param) { TDataInfo *pInfo; DWORD sSize; @@ -127,7 +127,7 @@ unsigned int __cdecl PkwareBufferRead(char *buf, unsigned int *size, void *param return sSize; } -void __cdecl PkwareBufferWrite(char *buf, unsigned int *size, void *param) +void PkwareBufferWrite(char *buf, unsigned int *size, void *param) { TDataInfo *pInfo; diff --git a/Source/encrypt.h b/Source/encrypt.h index 0d76b0f85..80c0c9d21 100644 --- a/Source/encrypt.h +++ b/Source/encrypt.h @@ -9,8 +9,8 @@ void Encrypt(void *block, DWORD size, DWORD key); DWORD Hash(const char *s, int type); void InitHash(); int PkwareCompress(void *buf, int size); -unsigned int __cdecl PkwareBufferRead(char *buf, unsigned int *size, void *param); -void __cdecl PkwareBufferWrite(char *buf, unsigned int *size, void *param); +unsigned int PkwareBufferRead(char *buf, unsigned int *size, void *param); +void PkwareBufferWrite(char *buf, unsigned int *size, void *param); void PkwareDecompress(void *param, int recv_size, int dwMaxBytes); #endif /* __ENCRYPT_H__ */ diff --git a/Source/init.cpp b/Source/init.cpp index e626658d6..8b015e26a 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -114,7 +114,7 @@ void init_get_file_info() snprintf(gszVersionNumber, MAX_PATH, "version %s", PROJECT_VERSION); } -LRESULT __stdcall MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +LRESULT MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { switch (Msg) { case WM_ERASEBKGND: diff --git a/Source/init.h b/Source/init.h index 7f900d51e..5f3a4e114 100644 --- a/Source/init.h +++ b/Source/init.h @@ -19,7 +19,7 @@ void init_create_window(); void init_archives(); HANDLE init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, int fs); void init_get_file_info(); -LRESULT __stdcall MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +LRESULT MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); void init_activate_window(HWND hWnd, BOOL bActive); WNDPROC SetWindowProc(WNDPROC NewProc); diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp index 71b11b828..29f779df5 100644 --- a/Source/mainmenu.cpp +++ b/Source/mainmenu.cpp @@ -22,13 +22,13 @@ void mainmenu_refresh_music() #endif } -void __stdcall mainmenu_change_name(int arg1, int arg2, int arg3, int arg4, char *name_1, char *name_2) +void mainmenu_change_name(int arg1, int arg2, int arg3, int arg4, char *name_1, char *name_2) { if (UiValidPlayerName(name_2)) pfile_rename_hero(name_1, name_2); } -int __stdcall mainmenu_select_hero_dialog( +int mainmenu_select_hero_dialog( const _SNETPROGRAMDATA *client_info, const _SNETPLAYERDATA *user_info, const _SNETUIDATA *ui_info, diff --git a/Source/mainmenu.h b/Source/mainmenu.h index c2bc0dd63..f7259d3b6 100644 --- a/Source/mainmenu.h +++ b/Source/mainmenu.h @@ -5,8 +5,8 @@ extern char gszHero[16]; void mainmenu_refresh_music(); -void __stdcall mainmenu_change_name(int arg1, int arg2, int arg3, int arg4, char *name_1, char *name_2); -int __stdcall mainmenu_select_hero_dialog( +void mainmenu_change_name(int arg1, int arg2, int arg3, int arg4, char *name_1, char *name_2); +int mainmenu_select_hero_dialog( const _SNETPROGRAMDATA *client_info, const _SNETPLAYERDATA *user_info, const _SNETUIDATA *ui_info, diff --git a/Source/movie.h b/Source/movie.h index 03fcab32b..2df65c6aa 100644 --- a/Source/movie.h +++ b/Source/movie.h @@ -6,7 +6,7 @@ extern BYTE movie_playing; extern BOOL loop_movie; void play_movie(char *pszMovie, BOOL user_can_close); -LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +LRESULT MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); /* rdata */ diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp index 51d542de1..246534e97 100644 --- a/Source/mpqapi.cpp +++ b/Source/mpqapi.cpp @@ -130,7 +130,7 @@ int mpqapi_get_hash_index(short index, int hash_a, int hash_b, int locale) return -1; } -void mpqapi_remove_hash_entries(BOOL(__stdcall *fnGetName)(DWORD, char *)) +void mpqapi_remove_hash_entries(BOOL(*fnGetName)(DWORD, char *)) { DWORD dwIndex, i; char pszFileName[MAX_PATH]; diff --git a/Source/mpqapi.h b/Source/mpqapi.h index 9afe8fe96..aac00a8cc 100644 --- a/Source/mpqapi.h +++ b/Source/mpqapi.h @@ -17,7 +17,7 @@ void mpqapi_alloc_block(int block_offset, int block_size); _BLOCKENTRY *mpqapi_new_block(int *block_index); int FetchHandle(const char *pszName); int mpqapi_get_hash_index(short index, int hash_a, int hash_b, int locale); -void mpqapi_remove_hash_entries(BOOL(__stdcall *fnGetName)(DWORD, char *)); +void mpqapi_remove_hash_entries(BOOL(*fnGetName)(DWORD, char *)); BOOL mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen); _BLOCKENTRY *mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int block_index); BOOL mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, DWORD dwLen, _BLOCKENTRY *pBlk); diff --git a/Source/msg.cpp b/Source/msg.cpp index 8ec5d0624..8b41e7e3f 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -1369,7 +1369,7 @@ DWORD On_SBSPELL(TCmd *pCmd, int pnum) return sizeof(*p); } -void __cdecl msg_errorf(const char *pszFmt, ...) +void msg_errorf(const char *pszFmt, ...) { static DWORD msg_err_timer; DWORD ticks; diff --git a/Source/msg.h b/Source/msg.h index 3b2123f43..580e06b37 100644 --- a/Source/msg.h +++ b/Source/msg.h @@ -66,7 +66,7 @@ DWORD On_ADDMAG(TCmd *pCmd, int pnum); DWORD On_ADDDEX(TCmd *pCmd, int pnum); DWORD On_ADDVIT(TCmd *pCmd, int pnum); DWORD On_SBSPELL(TCmd *pCmd, int pnum); -void __cdecl msg_errorf(const char *pszFmt, ...); +void msg_errorf(const char *pszFmt, ...); DWORD On_GOTOGETITEM(TCmd *pCmd, int pnum); DWORD On_REQUESTGITEM(TCmd *pCmd, int pnum); BOOL i_own_level(int nReqLevel); diff --git a/Source/multi.cpp b/Source/multi.cpp index 818af2829..69c65dc3c 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -39,7 +39,7 @@ const int event_types[3] = { }; #ifdef _DEBUG -void __cdecl dumphist(const char *pszFmt, ...) +void dumphist(const char *pszFmt, ...) { static FILE *sgpHistFile = NULL; DWORD dwTicks; @@ -636,7 +636,7 @@ void multi_event_handler(BOOL add) } } -void __stdcall multi_handle_events(_SNETEVENT *pEvt) +void multi_handle_events(_SNETEVENT *pEvt) { DWORD LeftReason; DWORD *data; diff --git a/Source/multi.h b/Source/multi.h index f02eea783..4b62c778f 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -16,7 +16,7 @@ extern BYTE gbDeltaSender; extern int player_state[MAX_PLRS]; #ifdef _DEBUG -void __cdecl dumphist(const char *pszFmt, ...); +void dumphist(const char *pszFmt, ...); #endif void multi_msg_add(BYTE *pbMsg, BYTE bLen); void NetSendLoPri(BYTE *pbMsg, BYTE bLen); @@ -44,7 +44,7 @@ void multi_process_tmsgs(); void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen); void NetClose(); void multi_event_handler(BOOL add); -void __stdcall multi_handle_events(_SNETEVENT *pEvt); +void multi_handle_events(_SNETEVENT *pEvt); BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram); void buffer_init(TBuffer *pBuf); void multi_send_pinfo(int pnum, char cmd); diff --git a/Source/nthread.cpp b/Source/nthread.cpp index 76e328341..8d7bd5f7e 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -166,7 +166,7 @@ void nthread_start(BOOL set_turn_upper_bit) } } -unsigned int __stdcall nthread_handler(void *) +unsigned int nthread_handler(void *) { int delta; BOOL received; diff --git a/Source/nthread.h b/Source/nthread.h index 2a27b78fc..331ae0f89 100644 --- a/Source/nthread.h +++ b/Source/nthread.h @@ -20,7 +20,7 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta); BOOL nthread_recv_turns(BOOL *pfSendAsync); void nthread_set_turn_upper_bit(); void nthread_start(BOOL set_turn_upper_bit); -unsigned int __stdcall nthread_handler(void *); +unsigned int nthread_handler(void *); void nthread_cleanup(); void nthread_ignore_mutex(BOOL bStart); BOOL nthread_has_500ms_passed(BOOL unused); diff --git a/Source/pfile.cpp b/Source/pfile.cpp index d49f3bcc5..10ada635b 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -185,7 +185,7 @@ BYTE game_2_ui_class(const PlayerStruct *p) return uiclass; } -BOOL __stdcall pfile_ui_set_hero_infos(BOOL(__stdcall *ui_add_hero_info)(_uiheroinfo *)) +BOOL pfile_ui_set_hero_infos(BOOL(*ui_add_hero_info)(_uiheroinfo *)) { DWORD i, save_num; char FileName[MAX_PATH]; @@ -290,7 +290,7 @@ BOOL pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num) return TRUE; } -BOOL __stdcall pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *class_stats) +BOOL pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *class_stats) { int c; @@ -315,7 +315,7 @@ char pfile_get_player_class(unsigned int player_class_nr) return pc_class; } -BOOL __stdcall pfile_ui_save_create(_uiheroinfo *heroinfo) +BOOL pfile_ui_save_create(_uiheroinfo *heroinfo) { DWORD save_num; char cl; @@ -346,7 +346,7 @@ BOOL __stdcall pfile_ui_save_create(_uiheroinfo *heroinfo) return TRUE; } -BOOL __stdcall pfile_get_file_name(DWORD lvl, char *dst) +BOOL pfile_get_file_name(DWORD lvl, char *dst) { const char *fmt; @@ -371,7 +371,7 @@ BOOL __stdcall pfile_get_file_name(DWORD lvl, char *dst) return TRUE; } -BOOL __stdcall pfile_delete_save(_uiheroinfo *hero_info) +BOOL pfile_delete_save(_uiheroinfo *hero_info) { DWORD save_num; char FileName[MAX_PATH]; @@ -451,7 +451,7 @@ void pfile_remove_temp_files() } } -BOOL __stdcall GetTempSaveNames(DWORD dwIndex, char *szTemp) +BOOL GetTempSaveNames(DWORD dwIndex, char *szTemp) { const char *fmt; @@ -495,7 +495,7 @@ void pfile_rename_temp_to_perm() pfile_flush(TRUE, dwChar); } -BOOL __stdcall GetPermSaveNames(DWORD dwIndex, char *szPerm) +BOOL GetPermSaveNames(DWORD dwIndex, char *szPerm) { const char *fmt; diff --git a/Source/pfile.h b/Source/pfile.h index f619748ec..d47dc518b 100644 --- a/Source/pfile.h +++ b/Source/pfile.h @@ -17,25 +17,25 @@ BOOL pfile_rename_hero(const char *name_1, const char *name_2); void pfile_flush_W(); void game_2_ui_player(const PlayerStruct *p, _uiheroinfo *heroinfo, BOOL bHasSaveFile); BYTE game_2_ui_class(const PlayerStruct *p); -BOOL __stdcall pfile_ui_set_hero_infos(BOOL(__stdcall *ui_add_hero_info)(_uiheroinfo *)); +BOOL pfile_ui_set_hero_infos(BOOL(*ui_add_hero_info)(_uiheroinfo *)); char *GetSaveDirectory(char *dst, int dst_size, DWORD save_num); BOOL pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack); HANDLE pfile_open_save_archive(BOOL *showFixedMsg, DWORD save_num); void pfile_SFileCloseArchive(HANDLE hsArchive); BOOL pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num); -BOOL __stdcall pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *class_stats); +BOOL pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *class_stats); char pfile_get_player_class(unsigned int player_class_nr); -BOOL __stdcall pfile_ui_save_create(_uiheroinfo *heroinfo); -BOOL __stdcall pfile_get_file_name(DWORD lvl, char *dst); -BOOL __stdcall pfile_delete_save(_uiheroinfo *hero_info); +BOOL pfile_ui_save_create(_uiheroinfo *heroinfo); +BOOL pfile_get_file_name(DWORD lvl, char *dst); +BOOL pfile_delete_save(_uiheroinfo *hero_info); void pfile_read_player_from_save(); void GetTempLevelNames(char *szTemp); void GetPermLevelNames(char *szPerm); void pfile_get_game_name(char *dst); void pfile_remove_temp_files(); -BOOL __stdcall GetTempSaveNames(DWORD dwIndex, char *szTemp); +BOOL GetTempSaveNames(DWORD dwIndex, char *szTemp); void pfile_rename_temp_to_perm(); -BOOL __stdcall GetPermSaveNames(DWORD dwIndex, char *szPerm); +BOOL GetPermSaveNames(DWORD dwIndex, char *szPerm); void pfile_write_save_file(const char *pszName, BYTE *pbData, DWORD dwLen, DWORD qwLen); void pfile_strcpy(char *dst, const char *src); BYTE *pfile_read(const char *pszName, DWORD *pdwLen); diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp index 8539fe35f..e8d215406 100644 --- a/Source/plrmsg.cpp +++ b/Source/plrmsg.cpp @@ -36,7 +36,7 @@ char *ErrorPlrMsg(const char *pszMsg) return result; } -size_t __cdecl EventPlrMsg(const char *pszFmt, ...) +size_t EventPlrMsg(const char *pszFmt, ...) { _plrmsg *pMsg; va_list va; diff --git a/Source/plrmsg.h b/Source/plrmsg.h index 10b78b48c..0cccbf51f 100644 --- a/Source/plrmsg.h +++ b/Source/plrmsg.h @@ -6,7 +6,7 @@ extern _plrmsg plr_msgs[PMSG_COUNT]; void plrmsg_delay(BOOL delay); char *ErrorPlrMsg(const char *pszMsg); -size_t __cdecl EventPlrMsg(const char *pszFmt, ...); +size_t EventPlrMsg(const char *pszFmt, ...); void SendPlrMsg(int pnum, const char *pszStr); void ClearPlrMsg(); void InitPlrMsg(); diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h index 050506d15..7db9de3c8 100644 --- a/SourceS/miniwin/misc.h +++ b/SourceS/miniwin/misc.h @@ -71,7 +71,7 @@ typedef LONG LCID; typedef DWORD COLORREF; -typedef LRESULT(CALLBACK *WNDPROC)(HWND, UINT, WPARAM, LPARAM); +typedef LRESULT(*WNDPROC)(HWND, UINT, WPARAM, LPARAM); #pragma pack(push, 1) typedef struct waveformat_tag { @@ -175,48 +175,45 @@ typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Blink; } LIST_ENTRY, *PLIST_ENTRY; -DWORD WINAPI GetTickCount(); +DWORD GetTickCount(); -DWORD WINAPI GetLastError(); -void WINAPI SetLastError(DWORD dwErrCode); +DWORD GetLastError(); +void SetLastError(DWORD dwErrCode); -WINBOOL WINAPI CloseHandle(HANDLE hObject); +WINBOOL CloseHandle(HANDLE hObject); -HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, WINBOOL bManualReset, WINBOOL bInitialState, +HANDLE CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, WINBOOL bManualReset, WINBOOL bInitialState, LPCSTR lpName); BOOL CloseEvent(HANDLE event); void SetEvent(HANDLE hEvent); void ResetEvent(HANDLE hEvent); -int WINAPI WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds); +int WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds); void SetCursorPos(int X, int Y); void FocusOnCharInfo(); -SHORT WINAPI GetAsyncKeyState(int vKey); +SHORT GetAsyncKeyState(int vKey); -WINBOOL WINAPI PeekMessageA(LPMSG lpMsg); +WINBOOL PeekMessageA(LPMSG lpMsg); -WINBOOL WINAPI TranslateMessage(const MSG *lpMsg); -LRESULT WINAPI DispatchMessageA(const MSG *lpMsg); -WINBOOL WINAPI PostMessageA(UINT Msg, WPARAM wParam, LPARAM lParam); +WINBOOL TranslateMessage(const MSG *lpMsg); +LRESULT DispatchMessageA(const MSG *lpMsg); +WINBOOL PostMessageA(UINT Msg, WPARAM wParam, LPARAM lParam); bool SpawnWindow(LPCSTR lpWindowName, int nWidth, int nHeight); -typedef LONG(WINAPI *PTOP_LEVEL_EXCEPTION_FILTER)( - struct _EXCEPTION_POINTERS *ExceptionInfo); - -uintptr_t __cdecl DVL_beginthreadex(void *_Security, unsigned _StackSize, unsigned(__stdcall *_StartAddress)(void *), +uintptr_t DVL_beginthreadex(void *_Security, unsigned _StackSize, unsigned(*_StartAddress)(void *), void *_ArgList, unsigned _InitFlag, unsigned *_ThrdAddr); -HANDLE WINAPI GetCurrentThread(); -DWORD WINAPI GetCurrentThreadId(); -WINBOOL WINAPI SetThreadPriority(HANDLE hThread, int nPriority); -void WINAPI Sleep(DWORD dwMilliseconds); +HANDLE GetCurrentThread(); +DWORD GetCurrentThreadId(); +WINBOOL SetThreadPriority(HANDLE hThread, int nPriority); +void Sleep(DWORD dwMilliseconds); -int WINAPIV wsprintfA(LPSTR, LPCSTR, ...); -int WINAPIV wvsprintfA(LPSTR dest, LPCSTR format, va_list arglist); -int __cdecl _strcmpi(const char *_Str1, const char *_Str2); -int __cdecl _strnicmp(const char *_Str1, const char *_Str2, size_t n); -char *__cdecl _itoa(int _Value, char *_Dest, int _Radix); +int wsprintfA(LPSTR, LPCSTR, ...); +int wvsprintfA(LPSTR dest, LPCSTR format, va_list arglist); +int _strcmpi(const char *_Str1, const char *_Str2); +int _strnicmp(const char *_Str1, const char *_Str2, size_t n); +char *_itoa(int _Value, char *_Dest, int _Radix); // // File I/O @@ -321,20 +318,20 @@ typedef struct _IMAGE_SECTION_HEADER { typedef LONG LSTATUS, HKEY, REGSAM, PHKEY; -WINBOOL WINAPI WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, +WINBOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped); -DWORD WINAPI SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); -WINBOOL WINAPI SetEndOfFile(HANDLE hFile); -DWORD WINAPI GetFileAttributesA(LPCSTR lpFileName); -WINBOOL WINAPI SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes); -HANDLE WINAPI CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, +DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); +WINBOOL SetEndOfFile(HANDLE hFile); +DWORD GetFileAttributesA(LPCSTR lpFileName); +WINBOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes); +HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); -WINBOOL WINAPI ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, +WINBOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped); -DWORD WINAPI GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh); -WINBOOL WINAPI GetComputerNameA(LPSTR lpBuffer, LPDWORD nSize); -WINBOOL WINAPI DeleteFileA(LPCSTR lpFileName); +DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh); +WINBOOL GetComputerNameA(LPSTR lpBuffer, LPDWORD nSize); +WINBOOL DeleteFileA(LPCSTR lpFileName); typedef struct _CONTEXT { @@ -408,25 +405,6 @@ typedef struct _CONTEXT { typedef CONTEXT *PCONTEXT; -// -// Exception record definition. -// - -typedef struct _EXCEPTION_RECORD { - DWORD ExceptionCode; - DWORD ExceptionFlags; - struct _EXCEPTION_RECORD *ExceptionRecord; - PVOID ExceptionAddress; - DWORD NumberParameters; -} EXCEPTION_RECORD; - -typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; - -typedef struct _EXCEPTION_POINTERS { - PEXCEPTION_RECORD ExceptionRecord; - PCONTEXT ContextRecord; -} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS; - typedef struct _MEMORY_BASIC_INFORMATION { PVOID BaseAddress; PVOID AllocationBase; @@ -450,7 +428,7 @@ typedef struct { extern void LoadCharNames(); extern void LoadAndPlaySound(char *FilePath, int lVolume, int lPan); extern void DrawArtWithMask(int SX, int SY, int SW, int SH, int nFrame, BYTE bMask, void *pBuffer); -extern BOOL __cdecl LoadArtWithPal(char *pszFile, void **pBuffer, int frames, DWORD *data); +extern BOOL LoadArtWithPal(char *pszFile, void **pBuffer, int frames, DWORD *data); constexpr auto DVL_WM_SYSKEYUP = 0x0105; constexpr auto DVL_VER_PLATFORM_WIN32_NT = 2; diff --git a/SourceS/miniwin/popdecl.inc b/SourceS/miniwin/popdecl.inc deleted file mode 100644 index 12f244442..000000000 --- a/SourceS/miniwin/popdecl.inc +++ /dev/null @@ -1,7 +0,0 @@ -#pragma pop_macro("__cdecl") -#pragma pop_macro("__fastcall") -#pragma pop_macro("__stdcall") -#pragma pop_macro("CALLBACK") -#pragma pop_macro("APIENTRY") -#pragma pop_macro("WINAPI") -#pragma pop_macro("WINAPIV") diff --git a/SourceS/miniwin/pushdecl.inc b/SourceS/miniwin/pushdecl.inc deleted file mode 100644 index 39c0a364f..000000000 --- a/SourceS/miniwin/pushdecl.inc +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef DEVILUTION_ENGINE -#pragma push_macro("__cdecl") -#pragma push_macro("__fastcall") -#pragma push_macro("__stdcall") -#pragma push_macro("CALLBACK") -#pragma push_macro("APIENTRY") -#pragma push_macro("WINAPI") -#pragma push_macro("WINAPIV") -#endif - -#undef __cdecl -#undef __fastcall -#undef __stdcall -#undef CALLBACK -#undef APIENTRY -#undef WINAPI -#undef WINAPIV -#define __cdecl -#define __fastcall -#define __stdcall -#define CALLBACK -#define APIENTRY -#define WINAPI -#define WINAPIV diff --git a/SourceS/miniwin/thread.h b/SourceS/miniwin/thread.h index 501db368e..fa8e5bbbc 100644 --- a/SourceS/miniwin/thread.h +++ b/SourceS/miniwin/thread.h @@ -3,9 +3,9 @@ namespace dvl { typedef void *CRITICAL_SECTION, **LPCRITICAL_SECTION; -void WINAPI InitializeCriticalSection(LPCRITICAL_SECTION lpCriticalSection); -void WINAPI EnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection); -void WINAPI LeaveCriticalSection(LPCRITICAL_SECTION lpCriticalSection); -void WINAPI DeleteCriticalSection(LPCRITICAL_SECTION lpCriticalSection); +void InitializeCriticalSection(LPCRITICAL_SECTION lpCriticalSection); +void EnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection); +void LeaveCriticalSection(LPCRITICAL_SECTION lpCriticalSection); +void DeleteCriticalSection(LPCRITICAL_SECTION lpCriticalSection); } // namespace dvl diff --git a/SourceX/main.cpp b/SourceX/main.cpp index bed3cdbb3..a4f798d89 100644 --- a/SourceX/main.cpp +++ b/SourceX/main.cpp @@ -33,5 +33,5 @@ int main(int argc, char **argv) switch_enable_network(); #endif - return dvl::WinMain(NULL, NULL, (char *)cmdline.c_str(), 0); + return dvl::DiabloMain(cmdline.c_str()); } diff --git a/structs.h b/structs.h index a624d24a9..7c0d1dd7a 100644 --- a/structs.h +++ b/structs.h @@ -1332,7 +1332,7 @@ typedef struct _SNETUIDATA { void(* profilecallback)(); int profilefields; void(* profilebitmapcallback)(); - int(__stdcall *selectnamecallback)( + int(*selectnamecallback)( const struct _SNETPROGRAMDATA *, const struct _SNETPLAYERDATA *, const struct _SNETUIDATA *, diff --git a/types.h b/types.h index ebd2ad7b1..877ebeb0c 100644 --- a/types.h +++ b/types.h @@ -8,7 +8,6 @@ #define DEVILUTION_BEGIN_NAMESPACE namespace dvl { #define DEVILUTION_END_NAMESPACE } -#include "miniwin/pushdecl.inc" #include "miniwin.h" DEVILUTION_BEGIN_NAMESPACE