ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LilyPad: fea...@yahoo.it's suggested changes for ICC compatibility 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@656 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
mattmenke 2009-03-01 23:53:20 +00:00
parent 7d4a7d3c10
commit a4a7bf91dc
3 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/LilyPad/Global.h
View File

@ -13,6 +13,12 @@
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#endif #endif
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" type
#endif
// Actually works with 0x0400, but need 0x500 to get XBUTTON defines, // Actually works with 0x0400, but need 0x500 to get XBUTTON defines,
// 0x501 to get raw input structures, and 0x0600 to get WM_MOUSEHWHEEL. // 0x501 to get raw input structures, and 0x0600 to get WM_MOUSEHWHEEL.
#define WINVER 0x0600 #define WINVER 0x0600
@ -21,11 +27,42 @@
#include <windows.h> #include <windows.h>
#include "PS2Etypes.h"
#include "PS2Edefs.h"
extern HINSTANCE hInst; extern HINSTANCE hInst;
// Needed for config screen // Needed for config screen
void GetNameAndVersionString(wchar_t *out); void GetNameAndVersionString(wchar_t *out);
typedef struct {
unsigned char controllerType;
unsigned short buttonStatus;
unsigned char rightJoyX, rightJoyY, leftJoyX, leftJoyY;
unsigned char moveX, moveY;
unsigned char reserved[91];
} PadDataS;
EXPORT_C_(void) PADupdate(int pad);
EXPORT_C_(u32) PS2EgetLibType(void);
EXPORT_C_(u32) PS2EgetLibVersion2(u32 type);
EXPORT_C_(char*) PSEgetLibName();
EXPORT_C_(char*) PS2EgetLibName(void);
EXPORT_C_(void) PADshutdown();
EXPORT_C_(s32) PADinit(u32 flags);
EXPORT_C_(s32) PADopen(void *pDsp);
EXPORT_C_(void) PADclose();
EXPORT_C_(u8) PADstartPoll(int pad);
EXPORT_C_(u8) PADpoll(u8 value);
EXPORT_C_(u32) PADquery();
EXPORT_C_(void) PADabout();
EXPORT_C_(s32) PADtest();
EXPORT_C_(keyEvent*) PADkeyEvent();
EXPORT_C_(u32) PADreadPort1 (PadDataS* pads);
EXPORT_C_(u32) PADreadPort2 (PadDataS* pads);
EXPORT_C_(u32) PSEgetLibType();
EXPORT_C_(u32) PSEgetLibVersion();
EXPORT_C_(void) PADconfigure();
#ifdef NO_CRT #ifdef NO_CRT
inline void * malloc(size_t size) { inline void * malloc(size_t size) {
return HeapAlloc(GetProcessHeap(), 0, size); return HeapAlloc(GetProcessHeap(), 0, size);

8
plugins/LilyPad/LilyPad.cpp
View File

@ -1130,14 +1130,6 @@ keyEvent* CALLBACK PADkeyEvent() {
return &ev; return &ev;
} }
typedef struct {
unsigned char controllerType;
unsigned short buttonStatus;
unsigned char rightJoyX, rightJoyY, leftJoyX, leftJoyY;
unsigned char moveX, moveY;
unsigned char reserved[91];
} PadDataS;
u32 CALLBACK PADreadPort1 (PadDataS* pads) { u32 CALLBACK PADreadPort1 (PadDataS* pads) {
PADstartPoll(1); PADstartPoll(1);
PADpoll(0x42); PADpoll(0x42);

30
plugins/LilyPad/LilyPad.def
View File

@ -1,22 +1,22 @@
EXPORTS EXPORTS
PS2EgetLibType PS2EgetLibType
PS2EgetLibName PS2EgetLibName
PS2EgetLibVersion2 PS2EgetLibVersion2
PSEgetLibType PSEgetLibType
PSEgetLibName PSEgetLibName
PSEgetLibVersion PSEgetLibVersion
PADreadPort1 PADreadPort1
PADreadPort2 PADreadPort2
PADinit PADinit
PADshutdown PADshutdown
PADopen PADopen
PADclose PADclose
PADkeyEvent PADkeyEvent
PADstartPoll PADstartPoll
PADpoll PADpoll
PADquery PADquery
PADconfigure PADconfigure
PADtest PADtest
PADabout PADabout
PADupdate PADupdate