--- mstools/samples/ole/clidemo/clidemo.c	2018/08/09 18:20:49	1.1.1.1
+++ mstools/samples/ole/clidemo/clidemo.c	2018/08/09 18:24:00	1.1.1.3
@@ -77,6 +77,9 @@ CHAR              szAppName[CBMESSAGEMAX
 INT               iObjects = 0;        //* object count
 INT               iObjectNumber = 0;   //* object number for object name
 CHAR              szFileName[CBPATHMAX];
+
+extern INT giXppli ;
+extern INT giYppli ;
                                        //* ClipBoard formats:
 OLECLIPFORMAT     vcfLink;             //* "ObjectLink" 
 OLECLIPFORMAT     vcfNative;           //* "Native"
@@ -86,10 +89,9 @@ OLECLIPFORMAT     vcfOwnerLink;        /
 /***************************************************************************
  * WinMain() - Main Windows routine
  ***************************************************************************/
-
-int WinMain(
-   HANDLE hInstance,
-   HANDLE hPrevInst,
+int APIENTRY WinMain(
+   HINSTANCE hInstance,
+   HINSTANCE hPrevInst,
    LPSTR  lpCmdLine,
    INT    nCmdLine
 ){
@@ -132,7 +134,7 @@ static BOOL InitApplication(           /
 ){                                     //* LOCAL:
    WNDCLASS       wc;                  //* temp wind-class structure
 
-   wc.style          = NULL;
+   wc.style          = 0;
    wc.lpfnWndProc    = (WNDPROC)FrameWndProc;
    wc.cbClsExtra     = 0;
    wc.cbWndExtra     = 0;
@@ -171,6 +173,7 @@ static BOOL InitApplication(           /
 static BOOL InitInstance(              //* ENTRY:
    HANDLE         hInst                //* instance handel
 ){
+	HDC hDC ;
    
    hAccTable = LoadAccelerators(hInst, MAKEINTRESOURCE(ID_APPLICATION));
 
@@ -190,6 +193,12 @@ static BOOL InitInstance(              /
    LoadString(hInst, IDS_APPNAME, szAppName, CBMESSAGEMAX);
    DragAcceptFiles(hwndFrame, TRUE);   //* allow dragged and dropped files
 
+   hDC    = GetDC (NULL);       // Get the hDC of the desktop window
+   giXppli = GetDeviceCaps (hDC, LOGPIXELSX);
+   giYppli = GetDeviceCaps (hDC, LOGPIXELSY);
+   ReleaseDC (NULL, hDC);
+	
+
        
    return TRUE;                        //* SUCCESS return
 
@@ -224,9 +233,9 @@ VOID ProcessCmdLine(LPSTR lpCmdLine)
       lstrcpy(szFileName, ofs.szPathName);
    }
    else 
-      *szFileName = NULL;
+      *szFileName = 0;
                                        //* pass filename to main winproc
-   SendMessage(hwndFrame,WM_INIT,NULL,(LONG)NULL);
+   SendMessage(hwndFrame,WM_INIT,(WPARAM)0,(LPARAM)0);
 
 }
 
@@ -261,10 +270,10 @@ LONG  APIENTRY FrameWndProc(           /
                                        //* used to avoid problems with OLE
                                        //* see the comment in object.h
       case WM_DELETE:                  //* user defined message
-         pItem = (APPITEMPTR) wParam;  //* delete object
+         pItem = (APPITEMPTR) lParam;  //* delete object
          WaitForObject(pItem);
          ObjDelete(pItem,OLE_OBJ_DELETE);
-         if (lParam)
+         if (wParam)
             cOleWait--;
          break;
 
@@ -273,7 +282,7 @@ LONG  APIENTRY FrameWndProc(           /
          break;
 
       case WM_RETRY:                   //* user defined message
-         RetryMessage((APPITEMPTR)wParam, RD_RETRY | RD_CANCEL);
+         RetryMessage((APPITEMPTR)lParam, RD_RETRY | RD_CANCEL);
          break;
 
       case WM_INITMENU:
@@ -633,7 +642,7 @@ static VOID MyOpenFile(                /
 
    if (SaveAsNeeded(pFileName, *lhcptrDoc, lpStream))
    {
-      *szNewFile = NULL;
+      *szNewFile = 0;
 
       if (!OfnGetName(hwndFrame, szNewFile, IDM_OPEN)) 
          return;                       //* ERROR return
@@ -675,7 +684,7 @@ static VOID SaveasFile(                /
 ){
    CHAR           szNewFile[CBPATHMAX];//* new file name
 
-   *szNewFile = NULL;                  //* prompt user for new file name
+   *szNewFile = 0;                  //* prompt user for new file name
    if (!OfnGetName(hwndFrame, szNewFile, IDM_SAVEAS)) 
       return;                          //* ERROR return
                                        //* rename document
@@ -710,7 +719,7 @@ static BOOL SaveFile(                  /
    static CHAR    szUntitled[CBMESSAGEMAX] = "";
    int            fh;                  //* file handle
    
-   *szNewFile = NULL;
+   *szNewFile = 0;
    if (!(*szUntitled))
       LoadString(hInst, IDS_UNTITLED, (LPSTR)szUntitled, CBMESSAGEMAX);
                     
@@ -786,6 +795,7 @@ static BOOL LoadFile(                  /
       iObjectNumber = iObjectNumberHold;
       return FALSE;                    //* ERROR return
    }
+   _lclose(fh);
    return TRUE;                        //* SUCCESS return
 
 }