plugins: try to untangle the CALLBACK mess

on ARM it doesn't matter so calling conventions were never maintained,
so just get rid of __stdcall

diff --git a/frontend/main.c b/frontend/main.c
index 2343645..671068d 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -712,7 +712,7 @@ void SysRunGui() {
         printf("SysRunGui\n");
 }
 
-static void dummy_lace()
+static void CALLBACK dummy_lace()
 {
 }
 

diff --git a/frontend/plugin.c b/frontend/plugin.c
index d9eb04a..196c980 100644 (file)
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -15,14 +15,11 @@
 #include "../libpcsxcore/system.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 
-#ifndef _WIN32
+// this can't be __stdcall like it was in PSEmu API as too many functions are mixed up
+#undef CALLBACK
 #define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
 
-static int dummy_func() {
+static long CALLBACK dummy_func() {
        return 0;
 }
 
@@ -49,7 +46,7 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad)
+static long CALLBACK PADreadPort1(PadDataS *pad)
 {
        pad->controllerType = in_type1;
        pad->buttonStatus = ~in_keystate;
@@ -62,7 +59,7 @@ static long PADreadPort1(PadDataS *pad)
        return 0;
 }
 
-static long PADreadPort2(PadDataS *pad)
+static long CALLBACK PADreadPort2(PadDataS *pad)
 {
        pad->controllerType = in_type2;
        pad->buttonStatus = ~in_keystate >> 16;

diff --git a/include/psemu_plugin_defs.h b/include/psemu_plugin_defs.h
index 9986654..fa62627 100644 (file)
--- a/include/psemu_plugin_defs.h
+++ b/include/psemu_plugin_defs.h
@@ -5,6 +5,10 @@
 extern "C" {
 #endif
 
+// this can't be __stdcall like it was in PSEmu API as too many functions are mixed up
+#undef CALLBACK
+#define CALLBACK
+
 // header version
 #define _PPDK_HEADER_VERSION           3
 

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index e3bffc7..34f062e 100644 (file)
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -25,21 +25,10 @@ extern "C" {
 #endif\r
 \r
 #include "psxcommon.h"\r
+#include "psemu_plugin_defs.h"\r
 \r
 //#define ENABLE_SIO1API 1\r
 \r
-#ifndef _WIN32\r
-\r
-typedef void* HWND;\r
-#define CALLBACK\r
-\r
-#else\r
-\r
-#define WIN32_LEAN_AND_MEAN\r
-#include <windows.h>\r
-\r
-#endif\r
-\r
 typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);\r
 typedef long (CALLBACK *SPUopen)(void);\r
 typedef long (CALLBACK *PADopen)(unsigned long *);\r
@@ -47,8 +36,6 @@ typedef long (CALLBACK *NETopen)(unsigned long *);
 typedef long (CALLBACK *SIO1open)(unsigned long *);\r
 \r
 #include "spu.h"\r
-\r
-#include "psemu_plugin_defs.h"\r
 #include "decode_xa.h"\r
 \r
 int LoadPlugins();\r

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 91cf1ca..2254516 100644 (file)
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -12,16 +12,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#ifndef _WIN32
-#define CALLBACK
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 #include <dlfcn.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #endif
 
 #include "cdrcimg.h"
 
+#undef CALLBACK
+#define CALLBACK
+
 #define PFX "cdrcimg: "
 #define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__)
 

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index 475ea07..937f788 100644 (file)
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -8,13 +8,6 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef _WIN32
-#define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
 #include "main.h"
 
 unsigned char CurPad, CurByte, CurCmd, CmdLen;

diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h
index 7e22029..82b0d7e 100644 (file)
--- a/plugins/dfsound/stdafx.h
+++ b/plugins/dfsound/stdafx.h
@@ -19,16 +19,11 @@
 #include <stdlib.h>
 #include <string.h> 
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
 #undef CALLBACK
 #define CALLBACK
 #define DWORD unsigned int
 #define LOWORD(l)           ((unsigned short)(l))
 #define HIWORD(l)           ((unsigned short)(((unsigned int)(l) >> 16) & 0xFFFF))
-#endif
 
 #ifndef INLINE
 #define INLINE static inline

diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h
index 1260167..0a8acf5 100644 (file)
--- a/plugins/gpu-gles/gpuExternals.h
+++ b/plugins/gpu-gles/gpuExternals.h
@@ -288,7 +288,7 @@ extern unsigned char  gl_vy[8];
 extern OGLVertex      vertex[4];\r
 extern short          sprtY,sprtX,sprtH,sprtW;\r
 #ifdef _WINDOWS\r
-extern HWND           hWWindow;\r
+//extern HWND           hWWindow;\r
 #endif\r
 extern BOOL           bIsFirstFrame;\r
 extern int            iWinSize;\r