Fix Windows 32-bit builds

tsherif · Dec 12, 2021 · 95eb2e9 · 95eb2e9
1 parent 5ef1797
commit 95eb2e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/platform/windows/windows-audio.c b/src/platform/windows/windows-audio.c
@@ -51,17 +51,17 @@ typedef struct {
     bool inUse;
 } AudioStream;
 
-void OnBufferEnd(IXAudio2VoiceCallback* This, void* pBufferContext)    {
+void WINAPI OnBufferEnd(IXAudio2VoiceCallback* This, void* pBufferContext)    {
     AudioStream* channel = (AudioStream*) pBufferContext;
     channel->inUse = false;
 }
 
-void OnStreamEnd(IXAudio2VoiceCallback* This) { }
-void OnVoiceProcessingPassEnd(IXAudio2VoiceCallback* This) { }
-void OnVoiceProcessingPassStart(IXAudio2VoiceCallback* This, UINT32 SamplesRequired) { }
-void OnBufferStart(IXAudio2VoiceCallback* This, void* pBufferContext) { }
-void OnLoopEnd(IXAudio2VoiceCallback* This, void* pBufferContext) { }
-void OnVoiceError(IXAudio2VoiceCallback* This, void* pBufferContext, HRESULT Error) { }
+void WINAPI OnStreamEnd(IXAudio2VoiceCallback* This) { }
+void WINAPI OnVoiceProcessingPassEnd(IXAudio2VoiceCallback* This) { }
+void WINAPI OnVoiceProcessingPassStart(IXAudio2VoiceCallback* This, UINT32 SamplesRequired) { }
+void WINAPI OnBufferStart(IXAudio2VoiceCallback* This, void* pBufferContext) { }
+void WINAPI OnLoopEnd(IXAudio2VoiceCallback* This, void* pBufferContext) { }
+void WINAPI OnVoiceError(IXAudio2VoiceCallback* This, void* pBufferContext, HRESULT Error) { }
 
 static struct {
     IXAudio2* xaudio;

diff --git a/src/platform/windows/windows.c b/src/platform/windows/windows.c
@@ -156,7 +156,7 @@ static void processXInputState(XINPUT_STATE* xInputState) {
     }
 }
 
-static LRESULT CALLBACK winProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam) {
+static LRESULT CALLBACK messageHandler(HWND window, UINT message, WPARAM wParam, LPARAM lParam) {
     if (!running) {
         return DefWindowProc(window, message, wParam, lParam);
     }
@@ -245,12 +245,12 @@ static LRESULT CALLBACK winProc(HWND window, UINT message, WPARAM wParam, LPARAM
     return DefWindowProc(window, message, wParam, lParam);
 }
 
-int32_t CALLBACK WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdLine, int32_t showWindow) {
+int32_t WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdLine, int32_t showWindow) {
     HWND window = createOpenGLWindow( &(CreateOpenGLWindowArgs) {
         .title = "space-shooter.c (Windows)", 
         .majorVersion = SOGL_MAJOR_VERSION, 
         .minorVersion = SOGL_MINOR_VERSION,
-        .winCallback = winProc,
+        .winCallback = messageHandler,
         .vsync = true
     });