--- mstools/samples/ddeml/server/server.h	2018/08/09 18:20:38	1.1
+++ mstools/samples/ddeml/server/server.h	2018/08/09 18:21:28	1.1.1.2
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <windowsx.h>
 #include <ddeml.h>
 
 #define IDM_ABOUT 100
@@ -46,8 +45,8 @@ typedef struct {
 extern FORMATINFO aFormats[];
 
 typedef struct _XFERINFO {
-    WORD wType;
-    WORD wFmt;
+    UINT wType;
+    UINT wFmt;
     HCONV hConv;
     HSZ hszTopic;
     HSZ hszItem;
@@ -66,13 +65,13 @@ typedef struct _ITEMLIST {
 typedef struct _TOPICLIST {
     HSZ hszTopic;
     ITEMLIST *pItemList;
-    WORD cItems;
+    UINT cItems;
     PSTR pszTopic;
 } TOPICLIST;
 
 typedef struct {    // used to passinfo to/from TextDataEntryDlgProc and
     HDDEDATA hDdeData;
-    WORD wFmt;
+    UINT wFmt;
     HSZ hszItem;
 } XACT;
 
@@ -132,7 +131,7 @@ extern TOPICLIST topicList[CTOPICS];
 
 BOOL InitApplication(HANDLE);
 BOOL InitInstance(HANDLE, INT);
-INT FAR DoDialog(LPSTR lpTemplateName, FARPROC lpDlgProc, DWORD param, BOOL fRememberFocus);
+INT FAR DoDialog(LPSTR lpTemplateName, DLGPROC lpDlgProc, LPARAM param, BOOL fRememberFocus);
 LONG  APIENTRY MainWndProc(HWND, UINT, WPARAM, LONG);
 BOOL  APIENTRY About(HWND, UINT, WPARAM, LONG);
 BOOL  APIENTRY RenderDelayDlgProc(HWND, UINT, WPARAM, LONG);
@@ -141,7 +140,7 @@ BOOL  APIENTRY SetServerDlgProc(HWND, UI
 BOOL  APIENTRY ContextDlgProc(HWND, UINT, WPARAM, LONG);
 VOID PaintServer(HWND hwnd);
 VOID DrawTextLine(HDC hdc, RECT *prcClip, RECT *prcText, PSTR psz);
-HDDEDATA CALLBACK DdeCallback(WORD wType, WORD wFmt, HCONV hConv, HSZ hszTopic,
+HDDEDATA CALLBACK DdeCallback(UINT wType, UINT wFmt, HCONV hConv, HSZ hszTopic,
         HSZ hszItem, HDDEDATA hData, DWORD lData1, DWORD lData2);
 HDDEDATA TopicListXfer(PXFERINFO pXferInfo, WORD iFmt);
 HDDEDATA ItemListXfer(PXFERINFO pXferInfo, WORD iFmt);
@@ -155,4 +154,3 @@ VOID UnHszize(VOID);
 VOID Delay(DWORD delay, BOOL fModal);
 
 
-