--- a/src/video/win32/SDL_win32video.c	Tue Jun 27 04:59:10 2006 +0000
+++ b/src/video/win32/SDL_win32video.c	Tue Jun 27 07:46:36 2006 +0000
@@ -31,30 +31,33 @@
 #include "SDL_win32window.h"
 
 /* Initialization/Query functions */
-static int WIN32_VideoInit(_THIS);
-static int WIN32_SetDisplayMode(_THIS, const SDL_DisplayMode * mode);
-static void WIN32_VideoQuit(_THIS);
+static int WIN_VideoInit(_THIS);
+static int WIN_SetDisplayMode(_THIS, const SDL_DisplayMode * mode);
+static void WIN_VideoQuit(_THIS);
 
 /* WIN32 driver bootstrap functions */
 
 static int
-WIN32_Available(void)
+WIN_Available(void)
 {
     return (1);
 }
 
 static void
-WIN32_DeleteDevice(SDL_VideoDevice * device)
+WIN_DeleteDevice(SDL_VideoDevice * device)
 {
+    SDL_UnregisterApp();
     SDL_free(device->hidden);
     SDL_free(device);
 }
 
 static SDL_VideoDevice *
-WIN32_CreateDevice(int devindex)
+WIN_CreateDevice(int devindex)
 {
     SDL_VideoDevice *device;
 
+    SDL_RegisterApp(NULL, 0, NULL);
+
     /* Initialize all variables that we clean on shutdown */
     device = (SDL_VideoDevice *) SDL_malloc(sizeof(SDL_VideoDevice));
     if (device) {
@@ -67,50 +70,50 @@
         if (device) {
             SDL_free(device);
         }
-        return (0);
+        return NULL;
     }
     SDL_memset(device->hidden, 0, (sizeof *device->hidden));
 
     /* Set the function pointers */
-    device->VideoInit = WIN32_VideoInit;
-    device->SetDisplayMode = WIN32_SetDisplayMode;
-    device->VideoQuit = WIN32_VideoQuit;
-    device->PumpEvents = WIN32_PumpEvents;
+    device->VideoInit = WIN_VideoInit;
+    device->SetDisplayMode = WIN_SetDisplayMode;
+    device->VideoQuit = WIN_VideoQuit;
+    device->PumpEvents = WIN_PumpEvents;
 
 #undef CreateWindow
-    device->CreateWindow = WIN32_CreateWindow;
-    device->CreateWindowFrom = WIN32_CreateWindowFrom;
-    device->SetWindowTitle = WIN32_SetWindowTitle;
-    device->SetWindowPosition = WIN32_SetWindowPosition;
-    device->SetWindowSize = WIN32_SetWindowSize;
-    device->ShowWindow = WIN32_ShowWindow;
-    device->HideWindow = WIN32_HideWindow;
-    device->RaiseWindow = WIN32_RaiseWindow;
-    device->MaximizeWindow = WIN32_MaximizeWindow;
-    device->MinimizeWindow = WIN32_MinimizeWindow;
-    device->RestoreWindow = WIN32_RestoreWindow;
-    device->SetWindowGrab = WIN32_SetWindowGrab;
-    device->DestroyWindow = WIN32_DestroyWindow;
-    device->GetWindowWMInfo = WIN32_GetWindowWMInfo;
+    device->CreateWindow = WIN_CreateWindow;
+    device->CreateWindowFrom = WIN_CreateWindowFrom;
+    device->SetWindowTitle = WIN_SetWindowTitle;
+    device->SetWindowPosition = WIN_SetWindowPosition;
+    device->SetWindowSize = WIN_SetWindowSize;
+    device->ShowWindow = WIN_ShowWindow;
+    device->HideWindow = WIN_HideWindow;
+    device->RaiseWindow = WIN_RaiseWindow;
+    device->MaximizeWindow = WIN_MaximizeWindow;
+    device->MinimizeWindow = WIN_MinimizeWindow;
+    device->RestoreWindow = WIN_RestoreWindow;
+    device->SetWindowGrab = WIN_SetWindowGrab;
+    device->DestroyWindow = WIN_DestroyWindow;
+    device->GetWindowWMInfo = WIN_GetWindowWMInfo;
 
-    device->free = WIN32_DeleteDevice;
+    device->free = WIN_DeleteDevice;
 
     return device;
 }
 
 VideoBootStrap WIN32_bootstrap = {
     "win32", "SDL Win32/64 video driver",
-    WIN32_Available, WIN32_CreateDevice
+    WIN_Available, WIN_CreateDevice
 };
 
 
 int
-WIN32_VideoInit(_THIS)
+WIN_VideoInit(_THIS)
 {
     SDL_DisplayMode mode;
 
     SDL_AddBasicVideoDisplay(NULL);
-    //SDL_AddRenderDriver(0, &SDL_WIN32_RenderDriver);
+    //SDL_AddRenderDriver(0, &SDL_WIN_RenderDriver);
 
     SDL_zero(mode);
     SDL_AddDisplayMode(0, &mode);
@@ -120,14 +123,14 @@
 }
 
 static int
-WIN32_SetDisplayMode(_THIS, const SDL_DisplayMode * mode)
+WIN_SetDisplayMode(_THIS, const SDL_DisplayMode * mode)
 {
     SDL_CurrentDisplay.current_mode = *mode;
     return 0;
 }
 
 void
-WIN32_VideoQuit(_THIS)
+WIN_VideoQuit(_THIS)
 {
 }