windows SDL wrapper implemented

build/build-MinGW32-release.bat

@@ -1,5 +1,5 @@
 mkdir build-real
 cd build-real
 cmake ..\.. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE:string=Release
-mingw32-make
+mingw32-make 2> log.txt
 pause

shmserver/shms-linux.cpp

@@ -204,4 +204,8 @@ bool isValidSHM()
     shmid_ds descriptor;
     shmctl(shmid, IPC_STAT, &descriptor);
     return descriptor.shm_nattch == 1;
+}
+uint32_t getPID()
+{
+    return getpid();
 }

shmserver/shms-proto.cpp

@@ -86,11 +86,7 @@ void SHM_Act (void)
             goto check_again;
             */
         case DFPP_PID:
-            #ifdef LINUX_BUILD
-                ((shm_retval *)shm)->value = getpid();
-            #else
-                ((shm_retval *)shm)->value = GetCurrentProcessId(void);
-            #endif
+            ((shm_retval *)shm)->value = getPID();
             full_barrier
             ((shm_retval *)shm)->pingpong = DFPP_RET_PID;
             goto check_again;
@@ -167,4 +163,4 @@ void SHM_Act (void)
             ((shm_retval *)shm)->pingpong = DFPP_SV_ERROR;
             break;
     }
-}
+}

shmserver/shms-windows.cpp

@@ -23,51 +23,561 @@ distribution.
 */
 
 /**
- * This is the source for the DF <-> dfhack shm bridge
+ * This is the source for the DF <-> dfhack shm bridge,
+ * to be used with SDL 1.2 and DF 40d16. Windows sucks
+ * using hacks like this sucks even more
  */
+
+#define _WIN32_WINNT 0x0501 // needed for INPUT struct
+#define WINVER 0x0501                   // OpenThread(), PSAPI, Toolhelp32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdarg.h>
+
+#include "../library/integers.h"
 #include "shms.h"
-extern char *shm;
-// SDL functions used in 40d16
-/*
-SDL_AddTimer
+#include <stdio.h>
+int errorstate;
+char *shm;
+int shmid;
+
+// function and variable pointer... we don't try to understand what SDL does here
+typedef void * fPtr;
+typedef void * vPtr;
+
+/// wrappers for SDL 1.2 functions used in 40d16
+/***** Condition variables
+
+SDL_CreateCond
+    SDL_cond * SDLCALL SDL_CreateCond(void);
 SDL_CondSignal
+    int SDLCALL SDL_CondSignal(SDL_cond *cond);
 SDL_CondWait
-SDL_ConvertSurface
-SDL_CreateCond
+    int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
+SDL_DestroyCond
+    void SDLCALL SDL_DestroyCond(SDL_cond *cond);
+*/
+static vPtr (*_SDL_CreateCond)() = 0;
+extern "C" vPtr SDL_CreateCond()
+{
+    return _SDL_CreateCond();
+}
+
+static int (*_SDL_CondSignal)(vPtr cond) = 0;
+extern "C" int SDL_CondSignal(vPtr cond)
+{
+    return _SDL_CondSignal(cond);
+}
+
+static int (*_SDL_CondWait)(vPtr cond, vPtr mutex) = 0;
+extern "C" int SDL_CondWait(vPtr cond, vPtr mutex)
+{
+    return _SDL_CondWait(cond, mutex);
+}
+
+static void (*_SDL_DestroyCond)(vPtr cond) = 0;
+extern "C" void SDL_DestroyCond(vPtr cond)
+{
+    _SDL_DestroyCond(cond);
+}
+
+/***** mutexes
+
 SDL_CreateMutex
+    SDL_mutex * SDLCALL SDL_CreateMutex(void);
+SDL_mutexP
+    int SDLCALL SDL_mutexP(SDL_mutex *mutex);
+SDL_DestroyMutex
+    void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
+*/
+static vPtr (*_SDL_CreateMutex)(void) = 0;
+extern "C" vPtr SDL_CreateMutex(void)
+{
+    return _SDL_CreateMutex();
+}
+
+static int (*_SDL_mutexP)(vPtr mutex) = 0;
+extern "C" int SDL_mutexP(vPtr mutex)
+{
+    return _SDL_mutexP(mutex);
+}
+
+static void (*_SDL_DestroyMutex)(vPtr mutex) = 0;
+extern "C" void SDL_DestroyMutex(vPtr mutex)
+{
+    _SDL_DestroyMutex(mutex);
+}
+
+
+/***** timers
+
+SDL_AddTimer
+    SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);
+SDL_RemoveTimer
+    SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
+SDL_GetTicks
+    Uint32 SDLCALL SDL_GetTicks(void);
+*/
+static vPtr (*_SDL_AddTimer)(uint32_t interval, fPtr callback, vPtr param) = 0;
+extern "C" vPtr SDL_AddTimer(uint32_t interval, fPtr callback, vPtr param)
+{
+    return _SDL_AddTimer(interval, callback, param);
+}
+
+static bool (*_SDL_RemoveTimer)(vPtr timer) = 0;
+extern "C" bool SDL_RemoveTimer(vPtr timer)
+{
+    return _SDL_RemoveTimer(timer);
+}
+
+static uint32_t (*_SDL_GetTicks)(void) = 0;
+extern "C" uint32_t SDL_GetTicks(void)
+{
+    return _SDL_GetTicks();
+}
+
+/***** Surfaces
 SDL_CreateRGBSurface
+    SDL_Surface * SDLCALL SDL_CreateRGBSurface
+        (Uint32 flags, int width, int height, int depth, 
+        Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
+
 SDL_CreateRGBSurfaceFrom
-SDL_DestroyCond
-SDL_DestroyMutex
-SDL_EnableKeyRepeat
-SDL_EnableUNICODE
+    SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom
+        (void *pixels, int width, int height, int depth, int pitch,
+        Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
+
 SDL_FreeSurface
-SDL_GL_GetAttribute
-SDL_GL_SetAttribute
-SDL_GL_SwapBuffers
-SDL_GetError
-SDL_GetKeyState
-SDL_GetTicks
-SDL_GetVideoInfo
-SDL_Init
+    void SDLCALL SDL_FreeSurface(SDL_Surface *surface);
+
+SDL_ConvertSurface
+    SDL_Surface * SDLCALL SDL_ConvertSurface
+        (SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);
+
 SDL_LockSurface
+    int SDLCALL SDL_LockSurface(SDL_Surface *surface);
+
+SDL_UnlockSurface
+    void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);
+*/
+
+static vPtr (*_SDL_CreateRGBSurface)(uint32_t flags, int width, int height, int depth,
+                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
+extern "C" vPtr SDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth,
+                                     uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
+{
+    return _SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
+}
+
+static vPtr (*_SDL_CreateRGBSurfaceFrom)(vPtr pixels, int width, int height, int depth, int pitch,
+                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = 0;
+extern "C" vPtr SDL_CreateRGBSurfaceFrom(vPtr pixels, int width, int height, int depth, int pitch,
+                                         uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask)
+{
+    return _SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
+}
+
+static void (*_SDL_FreeSurface)(vPtr surface) = 0;
+extern "C" void SDL_FreeSurface(vPtr surface)
+{
+    _SDL_FreeSurface(surface);
+}
+
+static vPtr (*_SDL_ConvertSurface)(vPtr surface, vPtr format, uint32_t flags) = 0;
+extern "C" vPtr SDL_ConvertSurface(vPtr surface, vPtr format, uint32_t flags)
+{
+    return _SDL_ConvertSurface(surface, format, flags);
+}
+
+static int (*_SDL_LockSurface)(vPtr surface) = 0;
+extern "C" int SDL_LockSurface(vPtr surface)
+{
+    return _SDL_LockSurface(surface);
+}
+
+static void (*_SDL_UnlockSurface)(vPtr surface) = 0;
+extern "C" void SDL_UnlockSurface(vPtr surface)
+{
+    _SDL_UnlockSurface(surface);
+}
+
+/***** More surface stuff
 SDL_MapRGB
-SDL_PollEvent
-SDL_Quit
-SDL_RWFromFile
-SDL_RemoveTimer
+     Uint32 SDLCALL SDL_MapRGB
+        (const SDL_PixelFormat * const format, const Uint8 r, const Uint8 g, const Uint8 b);
+
 SDL_SaveBMP_RW
+    int SDLCALL SDL_SaveBMP_RW
+        (SDL_Surface *surface, SDL_RWops *dst, int freedst);
+
 SDL_SetAlpha
+    int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
+    
 SDL_SetColorKey
-SDL_SetModuleHandle
+    int SDLCALL SDL_SetColorKey(SDL_Surface *surface, Uint32 flag, Uint32 key);
+
+SDL_GetVideoInfo
+    const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);
+
 SDL_SetVideoMode
-SDL_ShowCursor
-SDL_UnlockSurface
+    SDL_Surface * SDLCALL SDL_SetVideoMode
+        (int width, int height, int bpp, Uint32 flags);
+
 SDL_UpperBlit
+    int SDLCALL SDL_UpperBlit
+        (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
+*/
+
+static uint32_t (*_SDL_MapRGB)(vPtr pixelformat, uint8_t r, uint8_t g, uint8_t b) = 0;
+extern "C" uint32_t SDL_MapRGB(vPtr pixelformat, uint8_t r, uint8_t g, uint8_t b)
+{
+    return _SDL_MapRGB(pixelformat,r,g,b);
+}
+
+static int (*_SDL_SaveBMP_RW)(vPtr surface, vPtr dst, int freedst) = 0;
+extern "C" int SDL_SaveBMP_RW(vPtr surface, vPtr dst, int freedst)
+{
+    return _SDL_SaveBMP_RW(surface,dst,freedst);
+}
+
+static int (*_SDL_SetAlpha)(vPtr surface, uint32_t flag, uint8_t alpha) = 0;
+extern "C" int SDL_SetAlpha(vPtr surface, uint32_t flag, uint8_t alpha)
+{
+    return _SDL_SetAlpha(surface,flag,alpha);
+}
+
+static int (*_SDL_SetColorKey)(vPtr surface, uint32_t flag, uint32_t key) = 0;
+extern "C" int SDL_SetColorKey(vPtr surface, uint32_t flag, uint32_t key)
+{
+    return _SDL_SetColorKey(surface,flag,key);
+}
+
+static vPtr (*_SDL_GetVideoInfo)(void) = 0;
+extern "C" vPtr SDL_GetVideoInfo(void)
+{
+    return _SDL_GetVideoInfo();
+}
+
+static vPtr (*_SDL_SetVideoMode)(int width, int height, int bpp, uint32_t flags) = 0;
+extern "C" vPtr SDL_SetVideoMode(int width, int height, int bpp, uint32_t flags)
+{
+    return _SDL_SetVideoMode(width, height, bpp, flags);
+}
+static int (*_SDL_UpperBlit)(vPtr src, vPtr srcrect, vPtr dst, vPtr dstrect) = 0;
+extern "C" int SDL_UpperBlit(vPtr src, vPtr srcrect, vPtr dst, vPtr dstrect)
+{
+    return _SDL_UpperBlit(src, srcrect, dst, dstrect);
+}
+
+/***** Even more surface
+SDL_GL_GetAttribute
+    int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);
+    
+SDL_GL_SetAttribute
+    int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
+    
 SDL_WM_SetCaption
+    void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
+    
 SDL_WM_SetIcon
-SDL_mutexP
+    void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
+    
+SDL_FillRect
+    int SDLCALL SDL_FillRect(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);
+*/
+
+static int (*_SDL_GL_GetAttribute)(int attr, int * value) = 0;
+extern "C" int SDL_GL_GetAttribute(int attr, int * value)
+{
+    return _SDL_GL_GetAttribute(attr,value);
+}
+
+static int (*_SDL_GL_SetAttribute)(int attr, int value) = 0;
+extern "C" int SDL_GL_SetAttribute(int attr, int value)
+{
+    return _SDL_GL_SetAttribute(attr,value);
+}
+
+static void (*_SDL_WM_SetCaption)(const char *title, const char *icon) = 0;
+extern "C" void SDL_WM_SetCaption(const char *title, const char *icon)
+{
+    _SDL_WM_SetCaption("DwarfHacked the Fortress of Hacks",icon);
+}
+
+static void (*_SDL_WM_SetIcon)(vPtr icon, uint8_t *mask) = 0;
+extern "C" void SDL_WM_SetIcon(vPtr icon, uint8_t *mask)
+{
+    _SDL_WM_SetIcon(icon, mask);
+}
+
+static int (*_SDL_FillRect)(vPtr dst, vPtr dstrect, uint32_t color) = 0;
+extern "C" int SDL_FillRect(vPtr dst, vPtr dstrect, uint32_t color)
+{
+    _SDL_FillRect(dst,dstrect,color);
+}
+
+/***** Events and input
+SDL_EnableKeyRepeat
+    int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
+SDL_EnableUNICODE
+    int SDLCALL SDL_EnableUNICODE(int enable);
+SDL_GetKeyState
+    Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
+SDL_PollEvent
+    int SDLCALL SDL_PollEvent(SDL_Event *event);
+*/
+
+static int (*_SDL_EnableKeyRepeat)(int delay, int interval) = 0;
+extern "C" int SDL_EnableKeyRepeat(int delay, int interval)
+{
+    return _SDL_EnableKeyRepeat(delay, interval);
+}
+
+static int (*_SDL_EnableUNICODE)(int enable) = 0;
+extern "C" int SDL_EnableUNICODE(int enable)
+{
+    return _SDL_EnableUNICODE(enable);
+}
+
+static uint8_t * (*_SDL_GetKeyState)(int* numkeys) = 0;
+extern "C" uint8_t * SDL_GetKeyState(int* numkeys)
+{
+    return _SDL_GetKeyState(numkeys);
+}
+
+static int (*_SDL_PollEvent)(vPtr event) = 0;
+extern "C" int SDL_PollEvent(vPtr event)
+{
+    return _SDL_PollEvent(event);
+}
+
+/***** error handling
+SDL_GetError
+    char * SDLCALL SDL_GetError(void);
+SDL_SetError
+    extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
+SDL_ClearError
+    extern DECLSPEC void SDLCALL SDL_ClearError(void);
+SDL_Error
+    extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
+*/
+
+static char * (*_SDL_GetError)(void) = 0;
+extern "C" char * SDL_GetError(void)
+{
+    return _SDL_GetError();
+}
+
+static void (*_SDL_SetError)(const char *fmt, ...) = 0;
+extern "C" void SDL_SetError(const char *fmt, ...)
+{
+    char buf[1024];
+    va_list args;
+    va_start(args,fmt);
+    vsnprintf(buf, sizeof(buf) - 1 ,fmt,args);
+    va_end(args);
+    _SDL_SetError(buf);
+}
+
+static void (*_SDL_ClearError)(void) = 0;
+extern "C" void SDL_ClearError(void)
+{
+    _SDL_ClearError();
+}
+
+static void (*_SDL_Error)(int code) = 0;
+extern "C" void SDL_Error(int code)
+{
+    _SDL_Error(code);
+}
+
+/***** symbol resolution
+SDL_LoadFunction
+    extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
+SDL_LoadObject
+    extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
+SDL_UnloadObject
+    extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
+*/
+
+static vPtr (*_SDL_LoadFunction)(void *handle, const char *name) = 0;
+extern "C" vPtr SDL_LoadFunction(void *handle, const char *name)
+{
+    return _SDL_LoadFunction(handle, name);
+}
+
+static vPtr (*_SDL_LoadObject)(const char *sofile) = 0;
+extern "C" vPtr SDL_LoadObject(const char *sofile)
+{
+    return _SDL_LoadObject(sofile);
+}
+
+static void (*_SDL_UnloadObject)(vPtr handle) = 0;
+extern "C" void SDL_UnloadObject(vPtr handle)
+{
+    _SDL_UnloadObject(handle);
+}
+
+/***** r/w
+SDL_ReadBE32
+    extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
+SDL_ReadLE16
+    extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
+SDL_ReadLE32
+    extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
+*/
+
+static uint32_t (*_SDL_ReadBE32)(vPtr src) = 0;
+extern "C" uint32_t SDL_ReadBE32(vPtr src)
+{
+    return _SDL_ReadBE32(src);
+}
+
+static uint16_t (*_SDL_ReadLE16)(vPtr src) = 0;
+extern "C" uint16_t SDL_ReadLE16(vPtr src)
+{
+    return _SDL_ReadLE16(src);
+}
+
+static uint32_t (*_SDL_ReadLE32)(vPtr src) = 0;
+extern "C" uint32_t SDL_ReadLE32(vPtr src)
+{
+    return _SDL_ReadLE32(src);
+}
+
+/***** Misc
+SDL_RWFromFile
+    SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);
+SDL_SetModuleHandle
+    void SDLCALL SDL_SetModuleHandle(void *hInst);
+SDL_ShowCursor
+    int SDLCALL SDL_ShowCursor(int toggle);
 SDL_strlcpy
+    size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
+*/
+
+static vPtr (*_SDL_RWFromFile)(const char* file, const char *mode) = 0;
+extern "C" vPtr SDL_RWFromFile(const char* file, const char *mode)
+{
+    return _SDL_RWFromFile(file, mode);
+}
+
+static void (*_SDL_SetModuleHandle)(vPtr hInst) = 0;
+extern "C" void SDL_SetModuleHandle(vPtr hInst)
+{
+    _SDL_SetModuleHandle(hInst);
+}
+
+static int (*_SDL_ShowCursor)(int toggle) = 0;
+extern "C" int SDL_ShowCursor(int toggle)
+{
+    return _SDL_ShowCursor(toggle);
+}
+
+static size_t (*_SDL_strlcpy)(char *dst, const char *src, size_t maxlen) = 0;
+extern "C" size_t SDL_strlcpy(char *dst, const char *src, size_t maxlen)
+{
+    if(!_SDL_strlcpy)
+    {
+        HMODULE realSDLlib =  LoadLibrary("SDLreal.dll");
+        _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
+    }
+    return _SDL_strlcpy(dst,src,maxlen);
+}
+
+/***** The real meat of this
+SDL_Init
+SDL_Quit
+SDL_GL_SwapBuffers
+    void SDLCALL SDL_GL_SwapBuffers(void);
 */
 
-// TO BE DONE
+static void (*_SDL_Quit)(void) = 0;
+extern "C" void SDL_Quit(void)
+{
+    fprintf(stderr,"Quitting!\n");
+    _SDL_Quit();
+}
+
+static void (*_SDL_GL_SwapBuffers)(void) = 0;
+extern "C" void SDL_GL_SwapBuffers(void)
+{
+    _SDL_GL_SwapBuffers();
+}
+
+
+static int (*_SDL_Init)(uint32_t flags) = 0;
+extern "C" int SDL_Init(uint32_t flags)
+{
+    HMODULE realSDLlib =  LoadLibrary("SDLreal.dll");
+    if(!realSDLlib)
+    {
+        fprintf(stderr, "Can't load SDLreal.dll\n");
+        return -1;
+    }
+    // stuff for DF
+    _SDL_AddTimer = (void*(*)(uint32_t, void*, void*)) GetProcAddress(realSDLlib,"SDL_AddTimer");
+    _SDL_CondSignal = (int (*)(void*))GetProcAddress(realSDLlib,"SDL_CondSignal");
+    _SDL_CondWait = (int (*)(void*, void*))GetProcAddress(realSDLlib,"SDL_CondWait");
+    _SDL_ConvertSurface = (void*(*)(void*, void*, uint32_t))GetProcAddress(realSDLlib,"SDL_ConvertSurface");
+    _SDL_CreateCond = (void*(*)())GetProcAddress(realSDLlib,"SDL_CreateCond");
+    _SDL_CreateMutex = (void*(*)())GetProcAddress(realSDLlib,"SDL_CreateMutex");
+    _SDL_CreateRGBSurface = (void*(*)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurface");
+    _SDL_CreateRGBSurfaceFrom = (void*(*)(void*, int, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurfaceFrom");
+    _SDL_DestroyCond = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_DestroyCond");
+    _SDL_DestroyMutex = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_DestroyMutex");
+    _SDL_EnableKeyRepeat = (int (*)(int, int))GetProcAddress(realSDLlib,"SDL_EnableKeyRepeat");
+    _SDL_EnableUNICODE = (int (*)(int))GetProcAddress(realSDLlib,"SDL_EnableUNICODE");
+    _SDL_FreeSurface = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_FreeSurface");
+    _SDL_GL_GetAttribute = (int (*)(int, int*))GetProcAddress(realSDLlib,"SDL_GL_GetAttribute");
+    _SDL_GL_SetAttribute = (int (*)(int, int))GetProcAddress(realSDLlib,"SDL_GL_SetAttribute");
+    _SDL_GL_SwapBuffers = (void (*)())GetProcAddress(realSDLlib,"SDL_GL_SwapBuffers");
+    _SDL_GetError = (char*(*)())GetProcAddress(realSDLlib,"SDL_GetError");
+    _SDL_GetKeyState = (uint8_t*(*)(int*))GetProcAddress(realSDLlib,"SDL_GetKeyState");
+    _SDL_GetTicks = (uint32_t (*)())GetProcAddress(realSDLlib,"SDL_GetTicks");
+    _SDL_GetVideoInfo = (void*(*)())GetProcAddress(realSDLlib,"SDL_GetVideoInfo");
+    _SDL_Init = (int (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_Init");
+    _SDL_LockSurface = (int (*)(void*))GetProcAddress(realSDLlib,"SDL_LockSurface");
+    _SDL_MapRGB = (uint32_t (*)(void*, uint8_t, uint8_t, uint8_t))GetProcAddress(realSDLlib,"SDL_MapRGB");
+    _SDL_PollEvent = (int (*)(void*))GetProcAddress(realSDLlib,"SDL_PollEvent");
+    _SDL_Quit = (void (*)())GetProcAddress(realSDLlib,"SDL_Quit");
+    _SDL_RWFromFile = (void*(*)(const char*, const char*))GetProcAddress(realSDLlib,"SDL_RWFromFile");
+    _SDL_RemoveTimer = (bool (*)(void*))GetProcAddress(realSDLlib,"SDL_RemoveTimer");
+    _SDL_SaveBMP_RW = (int (*)(void*, void*, int))GetProcAddress(realSDLlib,"SDL_SaveBMP_RW");
+    _SDL_SetAlpha = (int (*)(void*, uint32_t, uint8_t))GetProcAddress(realSDLlib,"SDL_SetAlpha");
+    _SDL_SetColorKey = (int (*)(void*, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_SetColorKey");
+    _SDL_SetModuleHandle = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_SetModuleHandle");
+    _SDL_SetVideoMode = (void*(*)(int, int, int, uint32_t))GetProcAddress(realSDLlib,"SDL_SetVideoMode");
+    _SDL_ShowCursor = (int (*)(int))GetProcAddress(realSDLlib,"SDL_ShowCursor");
+    _SDL_UnlockSurface = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_UnlockSurface");
+    _SDL_UpperBlit = (int (*)(void*, void*, void*, void*))GetProcAddress(realSDLlib,"SDL_UpperBlit");
+    _SDL_WM_SetCaption = (void (*)(const char*, const char*))GetProcAddress(realSDLlib,"SDL_WM_SetCaption");
+    _SDL_WM_SetIcon = (void (*)(void*, uint8_t*))GetProcAddress(realSDLlib,"SDL_WM_SetIcon");
+    _SDL_mutexP = (int (*)(void*))GetProcAddress(realSDLlib,"SDL_mutexP");
+    _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
+    
+    // stuff for SDL_Image
+    _SDL_ClearError = (void (*)())GetProcAddress(realSDLlib,"SDL_ClearError");
+    _SDL_Error = (void (*)(int))GetProcAddress(realSDLlib,"SDL_Error");
+    _SDL_LoadFunction = (void*(*)(void*, const char*))GetProcAddress(realSDLlib,"SDL_LoadFunction");
+    _SDL_LoadObject = (void*(*)(const char*))GetProcAddress(realSDLlib,"SDL_LoadObject");
+    _SDL_ReadBE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadBE32");
+    _SDL_ReadLE16 = (uint16_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE16");
+    _SDL_ReadLE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE32");
+    _SDL_SetError = (void (*)(const char*, ...))GetProcAddress(realSDLlib,"SDL_SetError");
+    _SDL_UnloadObject = (void (*)(void*))GetProcAddress(realSDLlib,"SDL_UnloadObject");
+    _SDL_FillRect = (int (*)(void*,void*,uint32_t))GetProcAddress(realSDLlib,"SDL_FillRect");
+    
+    fprintf(stderr,"Initized HOOKS!\n");
+    return _SDL_Init(flags);
+}
+
+uint32_t getPID()
+{
+    return GetCurrentProcessId();
+}
+
+bool isValidSHM()
+{
+    return false;
+}

shmserver/shms.h

@@ -7,16 +7,13 @@
 #define SHM_BODY 1024*1024
 #define SHM_SIZE SHM_HEADER+SHM_BODY
 
-// a full memory barrier! better be safe than sorry.
+
 #ifdef LINUX_BUILD
+    // a full memory barrier! better be safe than sorry.
     #define full_barrier asm volatile("" ::: "memory"); __sync_synchronize();
 #else
     // FIXME: detect MSVC here and use the right barrier magic
-    #define full_barrier ;
-/*
-    #pragma intrinsic(_ReadWriteBarrier)
-    #define full_barrier MFENCE; _ReadWriteBarrier();
-    */
+    #define full_barrier
 #endif
 
 
@@ -124,5 +121,6 @@ typedef struct
 
 void SHM_Act (void);
 bool isValidSHM();
+uint32_t getPID();
 
-#endif
+#endif