diff --git a/src/event/Window.hpp b/src/event/Window.hpp
index e8c09e7..d694951 100644
--- a/src/event/Window.hpp
+++ b/src/event/Window.hpp
@@ -3,6 +3,6 @@
 
 #include <cstdint>
 
-int32_t OsWindowProc(void* window, uint32_t message, uint32_t wparam, int32_t lparam);
+int32_t OsWindowProc(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam);
 
 #endif
diff --git a/src/event/linux/Window.cpp b/src/event/linux/Window.cpp
index 0fcd4ca..5f6899f 100644
--- a/src/event/linux/Window.cpp
+++ b/src/event/linux/Window.cpp
@@ -1,5 +1,5 @@
 #include "event/Window.hpp"
 
-int32_t OsWindowProc(void* window, uint32_t message, uint32_t wparam, int32_t lparam) {
+int32_t OsWindowProc(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam) {
     return 0;
 }
diff --git a/src/event/mac/Window.cpp b/src/event/mac/Window.cpp
index 0fcd4ca..5f6899f 100644
--- a/src/event/mac/Window.cpp
+++ b/src/event/mac/Window.cpp
@@ -1,5 +1,5 @@
 #include "event/Window.hpp"
 
-int32_t OsWindowProc(void* window, uint32_t message, uint32_t wparam, int32_t lparam) {
+int32_t OsWindowProc(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam) {
     return 0;
 }
diff --git a/src/event/win/Window.cpp b/src/event/win/Window.cpp
index 50c16e6..9979667 100644
--- a/src/event/win/Window.cpp
+++ b/src/event/win/Window.cpp
@@ -1,7 +1,8 @@
 #include "event/Window.hpp"
+#include "event/Input.hpp"
 #include <windows.h>
 
-int32_t OsWindowProc(void* window, uint32_t message, uint32_t wparam, int32_t lparam) {
+int32_t OsWindowProc(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam) {
     // TODO
     return 0;
 }
diff --git a/src/gx/CGxDevice.cpp b/src/gx/CGxDevice.cpp
index 3af9cd8..0850208 100644
--- a/src/gx/CGxDevice.cpp
+++ b/src/gx/CGxDevice.cpp
@@ -198,7 +198,7 @@ const CGxCaps& CGxDevice::Caps() const {
     return this->m_caps;
 }
 
-int32_t CGxDevice::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format) {
+int32_t CGxDevice::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format) {
     this->m_windowProc = windowProc;
 
     return this->DeviceSetFormat(format);
diff --git a/src/gx/CGxDevice.hpp b/src/gx/CGxDevice.hpp
index 11f8196..dbcc353 100644
--- a/src/gx/CGxDevice.hpp
+++ b/src/gx/CGxDevice.hpp
@@ -71,7 +71,7 @@ class CGxDevice {
         CGxCaps m_caps;
         int32_t m_shaderProfiles[GxShTargets_Last] = { 6, 0, 0, 0, 12, 0 }; // TODO placeholder
         TSHashTable<CGxShader, HASHKEY_STRI> m_shaderList[GxShTargets_Last];
-        int32_t (*m_windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam) = nullptr;
+        int32_t (*m_windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam) = nullptr;
         int32_t m_context = 0;
         int32_t intF5C = 0;
         int32_t m_windowVisible = 0;
@@ -105,7 +105,7 @@ class CGxDevice {
         virtual void ITexMarkAsUpdated(CGxTex*) = 0;
         virtual void IRsSendToHw(EGxRenderState) = 0;
         virtual void ICursorCreate(const CGxFormat& format);
-        virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat&);
+        virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat&);
         virtual int32_t DeviceSetFormat(const CGxFormat&);
         virtual void DeviceWM(EGxWM wm, uintptr_t param1, uintptr_t param2) = 0;
         virtual void CapsWindowSize(CRect&) = 0;
diff --git a/src/gx/Device.cpp b/src/gx/Device.cpp
index 173b3d5..1c584c8 100644
--- a/src/gx/Device.cpp
+++ b/src/gx/Device.cpp
@@ -4,7 +4,7 @@
 
 CGxDevice* g_theGxDevicePtr = nullptr;
 
-CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format) {
+CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format) {
     CGxDevice* device;
 
     #if defined(WHOA_SYSTEM_WIN)
diff --git a/src/gx/Device.hpp b/src/gx/Device.hpp
index 1a041e4..9c3f544 100644
--- a/src/gx/Device.hpp
+++ b/src/gx/Device.hpp
@@ -9,7 +9,7 @@ class CGxFormat;
 
 extern CGxDevice* g_theGxDevicePtr;
 
-CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format);
+CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format);
 
 EGxApi GxDevApi(void);
 
diff --git a/src/gx/d3d/CGxDeviceD3d.cpp b/src/gx/d3d/CGxDeviceD3d.cpp
index c264206..13ac5f5 100644
--- a/src/gx/d3d/CGxDeviceD3d.cpp
+++ b/src/gx/d3d/CGxDeviceD3d.cpp
@@ -430,7 +430,7 @@ int32_t CGxDeviceD3d::CreatePoolAPI(CGxPool* pool) {
     return 1;
 }
 
-int32_t CGxDeviceD3d::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format) {
+int32_t CGxDeviceD3d::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format) {
     this->m_ownhwnd = 1;
 
     // TODO gamma ramp
diff --git a/src/gx/d3d/CGxDeviceD3d.hpp b/src/gx/d3d/CGxDeviceD3d.hpp
index 43771f7..8eeb71f 100644
--- a/src/gx/d3d/CGxDeviceD3d.hpp
+++ b/src/gx/d3d/CGxDeviceD3d.hpp
@@ -241,7 +241,7 @@ class CGxDeviceD3d : public CGxDevice {
     // Virtual member functions
     virtual void ITexMarkAsUpdated(CGxTex* texId);
     virtual void IRsSendToHw(EGxRenderState which);
-    virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format);
+    virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format);
     virtual int32_t DeviceSetFormat(const CGxFormat& format);
     virtual void DeviceWM(EGxWM wm, uintptr_t param1, uintptr_t param2);
     virtual void CapsWindowSize(CRect& dst);
diff --git a/src/gx/gll/CGxDeviceGLL.cpp b/src/gx/gll/CGxDeviceGLL.cpp
index 19f97f1..7ee6c09 100644
--- a/src/gx/gll/CGxDeviceGLL.cpp
+++ b/src/gx/gll/CGxDeviceGLL.cpp
@@ -140,7 +140,7 @@ void CGxDeviceGLL::CapsWindowSizeInScreenCoords(CRect& dst) {
     }
 }
 
-int32_t CGxDeviceGLL::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat& format) {
+int32_t CGxDeviceGLL::DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat& format) {
     CGRect rect;
     Rect* bounds;
     Rect* zoomedBounds = GetSavedZoomedWindowBounds();
diff --git a/src/gx/gll/CGxDeviceGLL.hpp b/src/gx/gll/CGxDeviceGLL.hpp
index d9de398..5427801 100644
--- a/src/gx/gll/CGxDeviceGLL.hpp
+++ b/src/gx/gll/CGxDeviceGLL.hpp
@@ -29,7 +29,7 @@ class CGxDeviceGLL : public CGxDevice {
         // Virtual member functions
         virtual void ITexMarkAsUpdated(CGxTex*);
         virtual void IRsSendToHw(EGxRenderState);
-        virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uint32_t wparam, int32_t lparam), const CGxFormat&);
+        virtual int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat&);
         virtual int32_t DeviceSetFormat(const CGxFormat&);
         virtual void DeviceWM(EGxWM wm, uintptr_t param1, uintptr_t param2) {};
         virtual void CapsWindowSize(CRect&);