piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert 1513

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1514 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-12-12 17:36:12 +00:00
parent 8fa5b24472
commit 537cf69cce
10 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Src/Core.cpp
View File

@ -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) {

4
Source/Core/Core/Src/Plugins/Plugin_DSP.h
View File

@ -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);

10
Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
View File

@ -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

4
Source/Core/Core/Src/Plugins/Plugin_DVD.h
View File

@ -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

2
Source/Core/Core/Src/Plugins/Plugin_Video.h
View File

@ -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);