--- mstools/samples/ole/srvrdemo/srvrdemo.h	2018/08/09 18:20:49	1.1.1.1
+++ mstools/samples/ole/srvrdemo/srvrdemo.h	2018/08/09 18:23:58	1.1.1.3
@@ -9,6 +9,7 @@
 */
 
 
+
 /*
    Explanation of Function Comments.
 
@@ -256,14 +257,14 @@ LPOBJ CreateNewObj (BOOL fDoc_Changed);
 VOID  CutOrCopyObj (BOOL fOpIsCopy);
 VOID  DestroyDoc (VOID);
 VOID  DestroyObj (HWND hwnd);
-VOID  DeviceToHiMetric (HWND hwnd, LPPOINT lppt);
+VOID  DeviceToHiMetric ( LPPOINT lppt);
 VOID  EmbeddingModeOff (VOID) ;
 VOID  EmbeddingModeOn (VOID);
 VOID  UpdateFileMenu (INT);
 VOID  ErrorBox (CHAR *jwf);
 BOOL  GetFileOpenFilename (LPSTR lpszFilename);
 BOOL  GetFileSaveFilename (LPSTR lpszFilename);
-VOID  HiMetricToDevice (HWND hwnd, LPPOINT lppt);
+VOID  HiMetricToDevice ( LPPOINT lppt);
 LPOBJ HwndToLpobj (HWND hwndObj);
 BOOL  InitServer (HWND hwnd, HANDLE hInst);
 VOID  InitVTbls (VOID);
@@ -286,45 +287,45 @@ VOID  SizeObj (HWND hwnd, RECT rect, BOO
 OLESTATUS StartRevokingServer (VOID);
 VOID  Wait (BOOL *pf);
 LPSTR Abbrev (LPSTR lpsz);
-BOOL  APIENTRY fnFailedUpdate (HWND, UINT, DWORD, LONG);
+BOOL  APIENTRY fnFailedUpdate (HWND, UINT, WPARAM, LONG);
 int   Main(USHORT argc, CHAR **argv) ;
 
 // Window handlers
 
-BOOL  APIENTRY About       (HWND, UINT, DWORD, LONG);
-LONG  APIENTRY MainWndProc (HWND, UINT, DWORD, LONG);
-LONG  APIENTRY ObjWndProc  (HWND, UINT, DWORD, LONG);
+BOOL  APIENTRY About       (HWND, UINT, WPARAM, LPARAM);
+LONG  APIENTRY MainWndProc (HWND, UINT, WPARAM, LPARAM);
+LONG  APIENTRY ObjWndProc  (HWND, UINT, WPARAM, LPARAM);
 
                    
 // Server methods
 
-OLESTATUS  APIENTRY SrvrCreate (LPOLESERVER, LHSERVERDOC, LPSTR, LPSTR, LPOLESERVERDOC FAR *);
-OLESTATUS  APIENTRY SrvrCreateFromTemplate (LPOLESERVER, LHSERVERDOC, LPSTR, LPSTR, LPSTR, LPOLESERVERDOC FAR *);
-OLESTATUS  APIENTRY SrvrEdit (LPOLESERVER, LHSERVERDOC, LPSTR, LPSTR, LPOLESERVERDOC FAR * );
+OLESTATUS  APIENTRY SrvrCreate (LPOLESERVER, LHSERVERDOC, OLE_LPCSTR, OLE_LPCSTR, LPOLESERVERDOC FAR *);
+OLESTATUS  APIENTRY SrvrCreateFromTemplate (LPOLESERVER, LHSERVERDOC, OLE_LPCSTR, OLE_LPCSTR, OLE_LPCSTR, LPOLESERVERDOC FAR *);
+OLESTATUS  APIENTRY SrvrEdit (LPOLESERVER, LHSERVERDOC, OLE_LPCSTR, OLE_LPCSTR, LPOLESERVERDOC FAR * );
 OLESTATUS  APIENTRY SrvrExecute (LPOLESERVER, HANDLE);
 OLESTATUS  APIENTRY SrvrExit (LPOLESERVER);
-OLESTATUS  APIENTRY SrvrOpen (LPOLESERVER, LHSERVERDOC, LPSTR, LPOLESERVERDOC FAR *);
+OLESTATUS  APIENTRY SrvrOpen (LPOLESERVER, LHSERVERDOC, OLE_LPCSTR, LPOLESERVERDOC FAR *);
 OLESTATUS  APIENTRY SrvrRelease (LPOLESERVER);
 
 // Document methods
 
 OLESTATUS  APIENTRY DocClose (LPOLESERVERDOC);
 OLESTATUS  APIENTRY DocExecute (LPOLESERVERDOC, HANDLE);
-OLESTATUS  APIENTRY DocGetObject (LPOLESERVERDOC, LPSTR, LPOLEOBJECT FAR *, LPOLECLIENT);
+OLESTATUS  APIENTRY DocGetObject (LPOLESERVERDOC, OLE_LPCSTR, LPOLEOBJECT FAR *, LPOLECLIENT);
 OLESTATUS  APIENTRY DocRelease (LPOLESERVERDOC);
 OLESTATUS  APIENTRY DocSave (LPOLESERVERDOC);
-OLESTATUS  APIENTRY DocSetColorScheme (LPOLESERVERDOC, LPLOGPALETTE);
-OLESTATUS  APIENTRY DocSetDocDimensions (LPOLESERVERDOC, LPRECT);
-OLESTATUS  APIENTRY DocSetHostNames (LPOLESERVERDOC, LPSTR, LPSTR);
+OLESTATUS  APIENTRY DocSetColorScheme (LPOLESERVERDOC, OLE_CONST LOGPALETTE FAR*);
+OLESTATUS  APIENTRY DocSetDocDimensions (LPOLESERVERDOC, OLE_CONST RECT FAR *);
+OLESTATUS  APIENTRY DocSetHostNames (LPOLESERVERDOC, OLE_LPCSTR, OLE_LPCSTR);
 
 // Object methods
 
 OLESTATUS  APIENTRY ObjDoVerb (LPOLEOBJECT, UINT, BOOL, BOOL);
 OLESTATUS  APIENTRY ObjGetData (LPOLEOBJECT, OLECLIPFORMAT, LPHANDLE);
-LPVOID     APIENTRY ObjQueryProtocol (LPOLEOBJECT, LPSTR);
+LPVOID     APIENTRY ObjQueryProtocol (LPOLEOBJECT, OLE_LPCSTR);
 OLESTATUS  APIENTRY ObjRelease (LPOLEOBJECT);
-OLESTATUS  APIENTRY ObjSetBounds (LPOLEOBJECT, LPRECT);
-OLESTATUS  APIENTRY ObjSetColorScheme (LPOLEOBJECT, LPLOGPALETTE);
+OLESTATUS  APIENTRY ObjSetBounds (LPOLEOBJECT, OLE_CONST RECT FAR*);
+OLESTATUS  APIENTRY ObjSetColorScheme (LPOLEOBJECT, OLE_CONST LOGPALETTE FAR*);
 OLESTATUS  APIENTRY ObjSetData (LPOLEOBJECT, OLECLIPFORMAT, HANDLE);
 OLESTATUS  APIENTRY ObjSetTargetDevice (LPOLEOBJECT, HANDLE);
 OLESTATUS  APIENTRY ObjShow (LPOLEOBJECT, BOOL);