From 537cf69ccebc6e68d3116973a36b40511ce031be Mon Sep 17 00:00:00 2001 From: hrydgard Date: Fri, 12 Dec 2008 17:36:12 +0000 Subject: [PATCH] Revert 1513 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1514 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Core.cpp | 10 +++++----- Source/Core/Core/Src/Plugins/Plugin_DSP.h | 4 ++-- Source/Core/Core/Src/Plugins/Plugin_DVD.cpp | 10 +++++----- Source/Core/Core/Src/Plugins/Plugin_DVD.h | 4 ++-- Source/Core/Core/Src/Plugins/Plugin_Video.h | 2 +- Source/PluginSpecs/CommonTypes.h | 4 ++++ Source/PluginSpecs/pluginspecs_video.h | 18 +++++++++--------- .../Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 4 ++-- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp | 10 +++++----- .../Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp | 10 +++++----- 10 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 271811ccbd..fa20f5e654 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -69,8 +69,8 @@ namespace Core { // forwarding -//void Callback_VideoRequestWindowSize(int _iWidth, int _iHeight, s8 _bFullscreen); -void Callback_VideoLog(const TCHAR* _szMessage, s8 _bDoBreak); +//void Callback_VideoRequestWindowSize(int _iWidth, int _iHeight, BOOL _bFullscreen); +void Callback_VideoLog(const TCHAR* _szMessage, BOOL _bDoBreak); void Callback_VideoCopiedToXFB(); void Callback_DSPLog(const TCHAR* _szMessage, int _v); char * Callback_ISOName(void); @@ -80,7 +80,7 @@ void Callback_WiimoteLog(const TCHAR* _szMessage, int _v); void Callback_WiimoteInput(u16 _channelID, const void* _pData, u32 _Size); // For keyboard shortcuts. -void Callback_KeyPress(int key, s8 shift, s8 control); +void Callback_KeyPress(int key, BOOL shift, BOOL control); TPeekMessages Callback_PeekMessages = NULL; TUpdateFPSDisplay g_pUpdateFPSDisplay = NULL; @@ -474,7 +474,7 @@ void* GetWindowHandle() // __________________________________________________________________________________________________ // Callback_VideoLog // WARNING - THIS IS EXECUTED FROM VIDEO THREAD -void Callback_VideoLog(const TCHAR *_szMessage, s8 _bDoBreak) +void Callback_VideoLog(const TCHAR *_szMessage, BOOL _bDoBreak) { LOG(VIDEO, _szMessage); } @@ -565,7 +565,7 @@ char * Callback_ISOName(void) // __________________________________________________________________________________________________ // Called from ANY thread! -void Callback_KeyPress(int key, s8 shift, s8 control) +void Callback_KeyPress(int key, BOOL shift, BOOL control) { // 0x70 == VK_F1 if (key >= 0x70 && key < 0x79) { diff --git a/Source/Core/Core/Src/Plugins/Plugin_DSP.h b/Source/Core/Core/Src/Plugins/Plugin_DSP.h index 1097cea65b..252b70d0cf 100644 --- a/Source/Core/Core/Src/Plugins/Plugin_DSP.h +++ b/Source/Core/Core/Src/Plugins/Plugin_DSP.h @@ -32,8 +32,8 @@ typedef void (__cdecl* TDllConfig)(HWND); typedef void (__cdecl* TDllDebugger)(HWND, bool); typedef void (__cdecl* TDSP_Initialize)(DSPInitialize); typedef void (__cdecl* TDSP_Shutdown)(); -typedef void (__cdecl* TDSP_WriteMailBox)(s8 _CPUMailbox, unsigned short); -typedef unsigned short (__cdecl* TDSP_ReadMailBox)(s8 _CPUMailbox); +typedef void (__cdecl* TDSP_WriteMailBox)(BOOL _CPUMailbox, unsigned short); +typedef unsigned short (__cdecl* TDSP_ReadMailBox)(BOOL _CPUMailbox); typedef unsigned short (__cdecl* TDSP_ReadControlRegister)(); typedef unsigned short (__cdecl* TDSP_WriteControlRegister)(unsigned short); typedef void (__cdecl* TDSP_Update)(int cycles); diff --git a/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp b/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp index 6667497651..e907d2ee6e 100644 --- a/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp +++ b/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp @@ -28,9 +28,9 @@ typedef void (__cdecl* TDllConfig) (HWND); typedef void (__cdecl* TDVD_Initialize) (SDVDInitialize); typedef void (__cdecl* TDVD_Shutdown) (); typedef void (__cdecl* TDVD_SetISOFile) (const char*); -typedef s8 (__cdecl* TDVD_GetISOName) (TCHAR*, int); -typedef s8 (__cdecl* TDVD_ReadToPtr) (LPBYTE, u64, u64); -typedef s8 (__cdecl* TDVD_IsValid) (); +typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int); +typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, u64, u64); +typedef BOOL (__cdecl* TDVD_IsValid) (); typedef u32 (__cdecl* TDVD_Read32) (u64); //! Function Pointer @@ -155,9 +155,9 @@ void DVD_SetISOFile(const char* _szFilename) g_DVD_SetISOFile(_szFilename); } -s8 DVD_GetISOName(TCHAR * _szFilename, int maxlen) +BOOL DVD_GetISOName(TCHAR * _szFilename, int maxlen) { return g_DVD_GetISOName(_szFilename, maxlen); } -} // end of namespace PluginDVD +} // end of namespace PluginDVD \ No newline at end of file diff --git a/Source/Core/Core/Src/Plugins/Plugin_DVD.h b/Source/Core/Core/Src/Plugins/Plugin_DVD.h index 1fd6794f07..4e9955f524 100644 --- a/Source/Core/Core/Src/Plugins/Plugin_DVD.h +++ b/Source/Core/Core/Src/Plugins/Plugin_DVD.h @@ -52,7 +52,7 @@ void DVD_Shutdown(); void DVD_SetISOFile(const char* _szFilename); //! GetISOName -s8 DVD_GetISOName(TCHAR * _szFilename, int maxlen); +BOOL DVD_GetISOName(TCHAR * _szFilename, int maxlen); //! DVDReadToPtr bool DVD_ReadToPtr(LPBYTE ptr, u64 _dwOffset, u64 _dwLength); @@ -64,7 +64,7 @@ bool DVD_IsValid(); u32 DVD_Read32(u64 _dwOffset); //! SaveLoadState -u32 SaveLoadState(char *ptr, s8 save); +u32 SaveLoadState(char *ptr, BOOL save); } // end of namespace PluginDVD diff --git a/Source/Core/Core/Src/Plugins/Plugin_Video.h b/Source/Core/Core/Src/Plugins/Plugin_Video.h index 6ee2745573..285b6cf65e 100644 --- a/Source/Core/Core/Src/Plugins/Plugin_Video.h +++ b/Source/Core/Core/Src/Plugins/Plugin_Video.h @@ -39,7 +39,7 @@ typedef void (__cdecl* TVideo_Prepare)(); typedef void (__cdecl* TVideo_Shutdown)(); typedef void (__cdecl* TVideo_SendFifoData)(u8*,u32); typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32); -typedef s8 (__cdecl* TVideo_Screenshot)(TCHAR*); +typedef BOOL (__cdecl* TVideo_Screenshot)(TCHAR*); typedef void (__cdecl* TVideo_EnterLoop)(); typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds); typedef void (__cdecl* TVideo_DoState)(unsigned char **ptr, int mode); diff --git a/Source/PluginSpecs/CommonTypes.h b/Source/PluginSpecs/CommonTypes.h index 992fd1d430..d5649e0725 100644 --- a/Source/PluginSpecs/CommonTypes.h +++ b/Source/PluginSpecs/CommonTypes.h @@ -39,10 +39,14 @@ typedef signed __int32 s32; typedef signed __int64 s64; #else +#ifdef BOOL +#undef BOOL +#endif typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; +typedef signed char BOOL; typedef unsigned long long u64; typedef char s8; diff --git a/Source/PluginSpecs/pluginspecs_video.h b/Source/PluginSpecs/pluginspecs_video.h index 563e7104a7..7cce0cb1b8 100644 --- a/Source/PluginSpecs/pluginspecs_video.h +++ b/Source/PluginSpecs/pluginspecs_video.h @@ -14,14 +14,14 @@ typedef void (*TSetPEToken)(const unsigned short _token, const int _bSetTokenAcknowledge); typedef void (*TSetPEFinish)(void); typedef unsigned char* (*TGetMemoryPointer)(const unsigned int _iAddress); -typedef void (*TVideoLog)(const char* _pMessage, s8 _bBreak); +typedef void (*TVideoLog)(const char* _pMessage, BOOL _bBreak); typedef void (*TSysMessage)(const char *fmt, ...); -typedef void (*TRequestWindowSize)(int _iWidth, int _iHeight, s8 _bFullscreen); +typedef void (*TRequestWindowSize)(int _iWidth, int _iHeight, BOOL _bFullscreen); typedef void (*TCopiedToXFB)(void); typedef unsigned int (*TPeekMessages)(void); typedef void (*TUpdateInterrupts)(void); typedef void (*TUpdateFPSDisplay)(const char* text); // sets the window title -typedef void (*TKeyPressed)(int keycode, s8 shift, s8 control); // sets the window title +typedef void (*TKeyPressed)(int keycode, BOOL shift, BOOL control); // sets the window title typedef struct { @@ -40,13 +40,13 @@ typedef struct // So no possiblity to ack the Token irq by the scheduler until some sort of PPC watchdog do its mess. volatile u16 PEToken; - volatile s8 bFF_GPReadEnable; - volatile s8 bFF_BPEnable; - volatile s8 bFF_GPLinkEnable; - volatile s8 bFF_Breakpoint; + volatile BOOL bFF_GPReadEnable; + volatile BOOL bFF_BPEnable; + volatile BOOL bFF_GPLinkEnable; + volatile BOOL bFF_Breakpoint; - volatile s8 CPCmdIdle; - volatile s8 CPReadIdle; + volatile BOOL CPCmdIdle; + volatile BOOL CPReadIdle; // for GP watchdog hack volatile u32 Fake_GPWDToken; // cicular incrementer diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index a1903432a1..fe6731a735 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -111,7 +111,7 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp) WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst); -s8 APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle +BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle DWORD dwReason, // reason called LPVOID lpvReserved) // reserved { @@ -568,7 +568,7 @@ unsigned int PAD_GetAttachedPads() } -unsigned int SaveLoadState(char* _ptr, s8 _bSave) +unsigned int SaveLoadState(char* _ptr, BOOL _bSave) { return(0); } diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp index 7c14210348..cd82b656a3 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp @@ -65,8 +65,8 @@ INT g_nYForce = 0; HRESULT InitDirectInput(HWND hDlg); VOID FreeDirectInput(); -s8 CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext); -s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext); +BOOL CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext); +BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext); HRESULT SetDeviceForcesXY(); #endif @@ -503,7 +503,7 @@ unsigned int PAD_GetAttachedPads() // Savestates // ŻŻŻŻŻŻŻŻŻŻ -unsigned int SaveLoadState(char *ptr, s8 save) +unsigned int SaveLoadState(char *ptr, BOOL save) { // not used return 0; @@ -855,7 +855,7 @@ VOID FreeDirectInput() SAFE_RELEASE(g_pDI); } -s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext ) +BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext ) { LPDIRECTINPUTDEVICE8 pDevice; HRESULT hr; @@ -874,7 +874,7 @@ s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext return DIENUM_STOP; } -s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext) +BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext) { DWORD* pdwNumForceFeedbackAxis = (DWORD*)pContext; if ((pdidoi->dwFlags & DIDOI_FFACTUATOR) != 0) diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp index 40f946a6a2..cb414908c3 100644 --- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp @@ -65,8 +65,8 @@ INT g_nYForce = 0; HRESULT InitDirectInput(HWND hDlg); VOID FreeDirectInput(); -s8 CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext); -s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext); +BOOL CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext); +BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext); HRESULT SetDeviceForcesXY(); #endif @@ -610,7 +610,7 @@ unsigned int PAD_GetAttachedPads() // Savestates // ŻŻŻŻŻŻŻŻŻŻ -unsigned int SaveLoadState(char *ptr, s8 save) +unsigned int SaveLoadState(char *ptr, BOOL save) { // not used return 0; @@ -973,7 +973,7 @@ VOID FreeDirectInput() SAFE_RELEASE(g_pDI); } -s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext ) +BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext ) { LPDIRECTINPUTDEVICE8 pDevice; HRESULT hr; @@ -992,7 +992,7 @@ s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext return DIENUM_STOP; } -s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext) +BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext) { DWORD* pdwNumForceFeedbackAxis = (DWORD*)pContext; if((pdidoi->dwFlags & DIDOI_FFACTUATOR) != 0)