--- uae/src/od-win32/win32.h	2018/04/24 16:42:57	1.1.1.2
+++ uae/src/od-win32/win32.h	2018/04/24 17:03:06	1.1.1.3
@@ -3,35 +3,44 @@
   * 
   * Win32-specific header file
   * 
-  * (c) 1997 Mathias Ortmann
+  * (c) 1997-1999 Mathias Ortmann
+  * (c) 1998-2001 Brian King
   */
 
-extern int atime, acount;
+#ifndef __WIN32_H__
+#define __WIN32_H__
 
-#define UAEWINVERSION_BASE "0.8.5"
-#define UAEWINRELEASE "1"
-#define UAEWINVERSION UAEWINVERSION_BASE
-#define PROGNAME "WinUAE " UAEWINVERSION ", Release " UAEWINRELEASE
+#define IHF_WINDOWHIDDEN 6
+#define NORMAL_WINDOW_STYLE (WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU )
+
+extern HMODULE hUIDLL;
+extern HWND hAmigaWnd, hMainWnd;
+extern RECT amigawin_rect;
+extern int in_sizemove;
+extern int manual_painting_needed;
+extern int mouseactive;
+#define WINUAERELEASE 3
+#define WINUAEBETA 0
+#define WINUAEBETASTR " Beta 4"
 
-// win32glue.c functions
 extern int my_kbd_handler (int, int, int);
 
-// win32.c functions
-extern void toggle_fullscreen (void);
+void releasecapture (void);
+int WIN32_RegisterClasses( void );
+int WIN32_InitHtmlHelp( void );
+int WIN32_InitLibraries( void );
+int WIN32_CleanupLibraries( void );
+void WIN32_MouseDefaults( void );
+void WIN32_HandleRegistryStuff( void );
 extern int currtime (void);
 extern void setup_brkhandler (void);
 extern void remove_brkhandler (void);
 
 extern int checkkey (int vkey, long lParam);
 extern void setmouseactive (int active);
-
+extern uae_u32 OSDEP_minimize_uae(void);
 extern int gunzip_hack (const char *src, const char *dst);
 
-extern int requestfname (char *title, char *name);
-
-extern void startsound (void);
-extern void stopsound (void);
-
 // globals
 extern int bActive;
 //extern int draw_all;
@@ -46,8 +55,8 @@ extern int toggle_sound, bytesinbuf;
 
 #define USE_ZFILE
 
-void fname_wtoa(unsigned char *);
-void fname_atow(const char *, char *, int);
+void finishjob (void);
+void DoSomeWeirdPrintingStuff (WPARAM wParam);
 
 extern int sound_available;
 extern int framecnt;
@@ -56,11 +65,30 @@ extern char VersionStr[256];
 
 struct win32_displaymode {
     struct win32_displaymode *next;
-    int width;
-    int height;
-    int refreshrate;
+    uae_u32 width;
+    uae_u32 height;
+    uae_u32 refreshrate;
     /* Bit mask of RGBFF_xxx values.  */
     uae_u32 colormodes;
 };
 
 extern struct win32_displaymode *win32_displaymode_list;
+
+/* For StatusBar when running in a Window */
+#define NUM_PARTS 7
+#define LED_WIDTH 50
+#define DRIVE_WIDTH 24
+#define FPS_WIDTH 60
+
+extern HKEY hWinUAEKey;
+
+extern int screen_is_picasso;
+
+extern HINSTANCE hInst;
+
+#ifndef _WIN32_WCE
+#include "osdep/win32gui.h"
+#include "osdep/resource.h"
+#endif
+
+#endif
\ No newline at end of file