--- mstools/samples/ddeml/clock/clock.c	2018/08/09 18:20:38	1.1
+++ mstools/samples/ddeml/clock/clock.c	2018/08/09 18:21:23	1.1.1.2
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "windows.h"
-#include "windowsx.h"
 #include <ddeml.h>
 #include "clock.h"
 // #include "shellapi.h"
@@ -119,7 +118,7 @@ TIME    oTime;
 RECT    clockRect;
 RECT    rCoordRect;
 
-HDDEDATA EXPENTRY DdeCallback(WORD usType, WORD usFmt, HCONV hConv, HSZ hsz1,
+HDDEDATA CALLBACK DdeCallback(WORD usType, WORD usFmt, HCONV hConv, HSZ hsz1,
         HSZ hsz2, HDDEDATA hData, DWORD lData1, DWORD lData2);
 HSZ hszTime, hszNow, hszClock;    /* Hszs for DDEML use */
 
@@ -127,7 +126,7 @@ HSZ hszTime, hszNow, hszClock;    /* Hsz
  *  Function Prototypes
  */
 
-LONG APIENTRY ClockWndProc(register HWND hWnd, UINT message, WPARAM wParam, LONG lParam);
+LONG APIENTRY ClockWndProc(register HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 void NEAR PASCAL ClockCreate(HWND hWnd);
 BOOL NEAR PASCAL ClockInit(HANDLE hInstance);
@@ -335,7 +334,7 @@ HPEN hPen;
     /* Draw an external black border on an icon without killing the client area. */
     if (bIconic)
         {
-	MoveToEx(hDC, Rect.left, Rect.top, NULL);
+        MoveToEx(hDC, Rect.left, Rect.top, NULL);
         LineTo(hDC, Rect.left,  Rect.bottom);
         LineTo(hDC, Rect.right, Rect.bottom);
         LineTo(hDC, Rect.right, Rect.top);
@@ -539,7 +538,7 @@ HBRUSH  hBr;
         Rect.top = ClockDisp.line1.y;
         Rect.bottom = ClockDisp.yline2;
         ExtTextOut(hDC, ClockDisp.line1.x, ClockDisp.line1.y, ETO_OPAQUE | ETO_CLIPPED,
-	  (LPRECT) &Rect, pszTime, (DWORD)ClockDisp.wDigTimeLen, NULL);
+          (LPRECT)&Rect, pszTime, (UINT)ClockDisp.wDigTimeLen, (LPINT)NULL);
         SelectObject(hDC, GetStockObject(SYSTEM_FONT));
     }
     else
@@ -741,18 +740,20 @@ CHAR szWinHeader[21], szKeyName[21], szR
 BOOL NEAR PASCAL ClockInit(HANDLE hInstance)
 {
 HDC       hDC;
-static WNDCLASS	ClockClass;
+WNDCLASS  ClockClass;
 
     FormatInit(hInstance, TRUE);
 
-    ClockClass.lpszClassName = (LPSTR)szBuffer;
-    ClockClass.lpszMenuName  = (LPSTR)szBuffer;
-    ClockClass.hbrBackground = (HBRUSH)NULL;
     ClockClass.style         = CS_VREDRAW | CS_HREDRAW;
-    ClockClass.hInstance     = hInstance;
     ClockClass.lpfnWndProc   = ClockWndProc;
-    ClockClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
+    ClockClass.cbClsExtra    = 0;
+    ClockClass.cbWndExtra    = 0;
+    ClockClass.hInstance     = hInstance;
     ClockClass.hIcon         = NULL;
+    ClockClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
+    ClockClass.hbrBackground = (HBRUSH)NULL;
+    ClockClass.lpszMenuName  = (LPSTR)"Clock";
+    ClockClass.lpszClassName = (LPSTR)"Clock";
 
     if (!RegisterClass((LPWNDCLASS)&ClockClass))
         return(FALSE);
@@ -770,11 +771,44 @@ static WNDCLASS	ClockClass;
 }
 
 
+
+BOOL APIENTRY AboutDlgProc ( hwnd, msg, wParam, lParam )
+HWND          hwnd;
+UINT msg;
+WPARAM wParam;
+LPARAM lParam;
+{
+    switch (msg){
+        case WM_INITDIALOG:
+            /* nothing to initialize */
+            break;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam)) {
+                case IDOK:
+                case IDCANCEL:
+                    EndDialog(hwnd, 0);
+                    break;
+
+                default:
+                    return FALSE;
+            }
+            break;
+
+        default:
+            return(FALSE);
+    }
+
+    return TRUE;
+}
+
+
+
 /*
  *  ClockWndProc()
  */
 
-LONG APIENTRY ClockWndProc(register HWND hWnd, UINT message, WPARAM wParam, LONG lParam)
+LONG APIENTRY ClockWndProc(register HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 HMENU   hMenu;
 CHAR      szInt[2];      /* space for int to str conversion */
@@ -810,8 +844,7 @@ PAINTSTRUCT ps;
 
             case IDM_ABOUT:
                 {
-                LoadString(hInst, IDS_USNAME, (LPSTR)szAppName, 8);
-                // Add this when 3.1 stuff comes in. ShellAbout(hWnd, szAppName, (LPSTR)"", LoadIcon(hInst, (LPSTR)"cckk"));
+                DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), hWnd, (DLGPROC)AboutDlgProc);
                 break;
                 }
 
@@ -957,19 +990,17 @@ defproc:
  *  WinMain()
  */
 
-int APIENTRY WinMain(
-    HANDLE hInstance,
-    HANDLE hPrev,
-    LPSTR lpCmdLine,
-    int cmdShow
-    )
-{
+INT PASCAL WinMain(HANDLE hInstance, HANDLE hPrev, LPSTR lpszCmdLine, INT cmdShow) { INT _argc; CHAR **_argv;
+// {
 register HWND hWnd;
 MSG        msg;
 TIME       nTime;
 PSTR       szTooMany;
 INT        iMinimized, iMaximized;
 
+    _argc;
+    _argv;
+
     LoadString(hInstance, IDS_USNAME, (LPSTR)szBuffer, BUFLEN);
     LoadString(hInstance, IDS_INIFILE, (LPSTR)szIniFile, 20);
     LoadString(hInstance, IDS_USNAME, (LPSTR)szSection, 30);
@@ -983,16 +1014,16 @@ INT        iMinimized, iMaximized;
 
     rCoordRect.top=GetPrivateProfileInt((LPSTR)szSection,
                                          (LPSTR)"Top",
-					 (DWORD)-1, (LPSTR)szIniFile);
+                                         (DWORD)-1, (LPSTR)szIniFile);
     rCoordRect.left=GetPrivateProfileInt((LPSTR)szSection,
                                          (LPSTR)"Left",
-					 (DWORD)-1, (LPSTR)szIniFile);
+                                         (DWORD)-1, (LPSTR)szIniFile);
     rCoordRect.right=GetPrivateProfileInt((LPSTR)szSection,
                                          (LPSTR)"Right",
-					 (DWORD)-1, (LPSTR)szIniFile);
+                                         (DWORD)-1, (LPSTR)szIniFile);
     rCoordRect.bottom=GetPrivateProfileInt((LPSTR)szSection,
                                          (LPSTR)"Bottom",
-					 (DWORD)-1, (LPSTR)szIniFile);
+                                         (DWORD)-1, (LPSTR)szIniFile);
 
     hWnd = CreateWindow((LPSTR)"Clock",        /* The class name.             */
             (LPSTR)szBuffer,        /* The window instance name.     */
@@ -1089,7 +1120,7 @@ TIME *ptime)
 }
 
 
-HDDEDATA EXPENTRY DdeCallback(
+HDDEDATA CALLBACK DdeCallback(
 WORD usType,
 WORD usFmt,
 HCONV hConv,
@@ -1157,4 +1188,3 @@ DWORD lData2)
 	UNREFERENCED_PARAMETER(lData2);
 	UNREFERENCED_PARAMETER(hConv);
 }
-