--- mstools/samples/gdidemo/gdidemo.h	2018/08/09 18:20:01	1.1.1.1
+++ mstools/samples/gdidemo/gdidemo.h	2018/08/09 18:23:48	1.1.1.3
@@ -1,12 +1,13 @@
-/*---------------------------------------------------------------------------*\
-| GDIDEMO HEADER FILE
-|   This is the main header module for the application.
-|
-|
-| created: 31-Oct-90
-| history: 31-Oct-90 <chriswil> created.
-|
-\*---------------------------------------------------------------------------*/
+
+/******************************************************************************\
+*       This is a part of the Microsoft Source Code Samples. 
+*       Copyright (C) 1993 Microsoft Corporation.
+*       All rights reserved. 
+*       This source code is only intended as a supplement to 
+*       Microsoft Development Tools and/or WinHelp documentation.
+*       See these sources for detailed information regarding the 
+*       Microsoft samples programs.
+\******************************************************************************/
 
 #ifdef WIN16
 #define APIENTRY FAR PASCAL
@@ -14,11 +15,8 @@ typedef int (APIENTRY *WNDPROC)();
 typedef WORD WPARAM;
 typedef VOID *PVOID;
 typedef WORD UINT;
-#else
-typedef DWORD WPARAM;
 #endif
 
-
 #define APPCLASS   "GDIDEMO"
 #define APPTITLE   "Windows GDI Demonstration"
 
@@ -98,7 +96,7 @@ BOOL  FAR FreeWindowInfo(HWND);
 /*
 ** Porting macros...
 */
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
 #define GETINSTANCE(hWnd)   (HANDLE)GetWindowLong(hWnd,GWL_HINSTANCE)
 #define GETCLASSBRUSH(hWnd) (HBRUSH)GetClassLong(hWnd,GCL_HBRBACKGROUND)
 #else