--- mstools/samples/ddeml/server/ddemlsv.c	2018/08/09 18:20:38	1.1
+++ mstools/samples/ddeml/server/ddemlsv.c	2018/08/09 18:21:28	1.1.1.2
@@ -147,12 +147,11 @@ TOPICLIST topicList[CTOPICS] = {
 
 ****************************************************************************/
 
-int APIENTRY WinMain(
-    HANDLE hInstance,
-    HANDLE hPrevInstance,
-    LPSTR lpCmdLine,
-    int nCmdShow
-    )
+INT WINAPI WinMain(
+HANDLE hInstance,
+HANDLE hPrevInstance,
+LPSTR lpCmdLine,
+INT nCmdShow)
 {
     MSG msg;                                 /* message                      */
 
@@ -336,7 +335,7 @@ LONG  APIENTRY MainWndProc(hWnd, message
 HWND hWnd;                                /* window handle                   */
 UINT message;                         /* type of message                 */
 WPARAM wParam;                              /* additional information          */
-LONG lParam;                              /* additional information          */
+LPARAM lParam;                              /* additional information          */
 {
     switch (message) {
     case WM_INITMENU:
@@ -358,7 +357,7 @@ LONG lParam;
         break;
 
     case WM_COMMAND:           /* message: command from application menu */
-        switch (GET_WM_COMMAND_ID(wParam, lParam)) {
+        switch (LOWORD(wParam)) {
         case IDM_ENABLEONECB:
             DdeEnableCallback(idInst, 0, EC_ENABLEONE);
             fAllBlocked = FALSE;
@@ -431,24 +430,24 @@ LONG lParam;
             break;
 
         case IDM_RENDERDELAY:
-            DoDialog("VALUEENTRY", (FARPROC)RenderDelayDlgProc, 0, TRUE);
+            DoDialog("VALUEENTRY", (DLGPROC)RenderDelayDlgProc, 0, TRUE);
             InvalidateRect(hwndServer, &rcRndrDelay, TRUE);
             break;
 
         case IDM_SETSERVER:
-            DoDialog("VALUEENTRY", (FARPROC)SetServerDlgProc, 0, TRUE);
+            DoDialog("VALUEENTRY", (DLGPROC)SetServerDlgProc, 0, TRUE);
             break;
 
         case IDM_SETTOPIC:
-            DoDialog("VALUEENTRY", (FARPROC)SetTopicDlgProc, 0, TRUE);
+            DoDialog("VALUEENTRY", (DLGPROC)SetTopicDlgProc, 0, TRUE);
             break;
 
         case IDM_CONTEXT:
-            DoDialog("CONTEXT", (FARPROC)ContextDlgProc, 0, TRUE);
+            DoDialog("CONTEXT", (DLGPROC)ContextDlgProc, 0, TRUE);
             break;
 
         case IDM_ABOUT:
-            DoDialog("ABOUT", (FARPROC)About, 0, TRUE);
+            DoDialog("ABOUT", (DLGPROC)About, 0, TRUE);
             break;
 
         case IDM_HELP:
@@ -509,7 +508,7 @@ LONG lParam;
 
     case WM_DESTROY:                  /* message: window being destroyed */
         if (fAppowned)
-            SendMessage(hwndServer, WM_COMMAND, GET_WM_COMMAND_MPS(IDM_APPOWNED, 0, 0));
+            SendMessage(hwndServer, WM_COMMAND, (WPARAM)MAKELONG(IDM_APPOWNED, 0), (LONG)(0));
         DdeNameService(idInst, 0, 0, DNS_UNREGISTER); // unregister all services
         UnHszize();
         DdeUninitialize(idInst);
@@ -627,4 +626,3 @@ PSTR psz)
     }
     OffsetRect(prcText, 0, cyText);
 }
-