Changeset 1533

Timestamp:

May 30, 2010, 7:34:46 PM (15 years ago)

Author:

Gregg Young

Message:

Fixed possible loss of precision compiler warnings by casting the variables in question.

Location:

trunk/dll

Files:

• dirsize.c (modified) (3 diffs)
• draglist.c (modified) (4 diffs)
• excputil.c (modified) (1 diff)
• info.c (modified) (1 diff)
• mainwnd.c (modified) (4 diffs)
• misc.c (modified) (1 diff)
• newview.c (modified) (1 diff)
• seeall.c (modified) (1 diff)
• systemf.c (modified) (1 diff)
• treecnr.c (modified) (3 diffs)

trunk/dll/dirsize.c

@@ -331 +331 @@
   if (pci) {
 
-    float fltPct = 0.0;
+    float fltPct = (float) 0.0;
     CHAR szCurDir[80];
     CHAR szSubDir[80];
@@ -356 +356 @@
                             sizeof(FSALLOCATE));
         if (!rc) {
-          fltPct = (ullTotalBytes * 100.0) /
-            ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
+          fltPct = (float) (ullTotalBytes * 100.0) /
+            ((float)fsa.cUnit *  (fsa.cSectorUnit * fsa.cbSector));
         }
         // Need unique buffer 23 Jul 07 SHL
@@ -363 +363 @@
       }
       else
-        fltPct = (((float)pci->cbFile + pci->easize) * 100.0) / ullTotalBytes;
+        fltPct = (float) (((float)pci->cbFile + pci->easize) * 100.0) / ullTotalBytes;
 
       //Second line for graph reworked 03 AUG 08 GKY

trunk/dll/draglist.c

@@ -330 +330 @@
           pDImg->sizlStretch.cx = 32;
           pDImg->sizlStretch.cy = 32;
-          pDImg->cxOffset = -16 + (ulNumfiles * 4);
-          pDImg->cyOffset = 0 + (ulNumfiles * 7);
+          pDImg->cxOffset = -16 + ((SHORT) ulNumfiles * 4);
+          pDImg->cyOffset = 0 + ((SHORT) ulNumfiles * 7);
           ulNumIcon = ulNumfiles + 1;
         }
@@ -357 +357 @@
         pDImg->sizlStretch.cx = 32;
         pDImg->sizlStretch.cy = 32;
-        pDImg->cxOffset = -16 + (ulNumfiles * 3);
-        pDImg->cyOffset = 0 + (ulNumfiles * 6);
+        pDImg->cxOffset = -16 + ((SHORT) ulNumfiles * 3);
+        pDImg->cyOffset = 0 + ((SHORT) ulNumfiles * 6);
       }
       pDItem->hwndItem = (hwndObj) ? hwndObj : hwndCnr;
@@ -660 +660 @@
           pDImg->sizlStretch.cx = 32;
           pDImg->sizlStretch.cy = 32;
-          pDImg->cxOffset = -16 + (ulNumfiles * 4);
-          pDImg->cyOffset = 0 + (ulNumfiles * 7);
+          pDImg->cxOffset = -16 + ((SHORT) ulNumfiles * 4);
+          pDImg->cyOffset = 0 + ((SHORT) ulNumfiles * 7);
           ulNumIcon = ulNumfiles + 1;
         }
@@ -685 +685 @@
         pDImg->sizlStretch.cx = 32;
         pDImg->sizlStretch.cy = 32;
-        pDImg->cxOffset = -16 + (ulNumfiles * 3);
-        pDImg->cyOffset = 0 + (ulNumfiles * 6);
+        pDImg->cxOffset = -16 + ((SHORT) ulNumfiles * 3);
+        pDImg->cyOffset = 0 + ((SHORT) ulNumfiles * 6);
       }
       pDItem->hwndItem = (hwndObj) ? hwndObj : hwnd;

trunk/dll/excputil.c

@@ -247 +247 @@
     else {
       is32Bit = FALSE;
-      u.stk16.usIP = pContext->ctx_RegEip;
-      u.stk16.usBP = pContext->ctx_RegEbp;
+      u.stk16.usIP = (SHORT) pContext->ctx_RegEip;
+      u.stk16.usBP = (SHORT) pContext->ctx_RegEbp;
     }
 

trunk/dll/info.c

@@ -252 +252 @@
 
               percentfree = (fsa.cUnitAvail && fsa.cUnit) ?
-                (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
+                ((USHORT) fsa.cUnitAvail * 100) / (USHORT) fsa.cUnit : 0;
               if (!percentfree && fsa.cUnitAvail)
                 percentfree = 1;

trunk/dll/mainwnd.c

@@ -1967 +1967 @@
       *szDrv = 0;
       x = id - IDM_DRIVEA;
-      *szDrv = x + 'A';
+      *szDrv = (CHAR) x + 'A';
       strcpy(szDrv + 1, ":");
       if (x > 1) {
@@ -3665 +3665 @@
               WinSetWindowUShort(hwndChild,
                                  QWS_XRESTORE,
-                                 (USHORT) (ulWidth * ulCurCol) + Rectl.xLeft);
+                                 (USHORT) ((USHORT) ulWidth * (USHORT) ulCurCol)
+                                 + (USHORT) Rectl.xLeft);
               WinSetWindowUShort(hwndChild,
                                  QWS_YRESTORE,
@@ -3754 +3755 @@
           WinSetWindowPos(hwndChild, HWND_TOP, 0, 0, 0, 0,
                           SWP_SIZE | SWP_MOVE | SWP_FOCUSDEACTIVATE);
-          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
-          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
-          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
-          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
+          WinSetWindowUShort(hwndChild, QWS_XRESTORE, (USHORT) ux);
+          WinSetWindowUShort(hwndChild, QWS_YRESTORE, (USHORT) uy);
+          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, (USHORT) ucx);
+          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, (USHORT) ucy);
         }
         else {
@@ -3763 +3764 @@
           WinSetWindowPos(hwndChild, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
                           SWP_MOVE | SWP_SIZE | SWP_SHOW);
-          WinSetWindowUShort(hwndChild, QWS_XRESTORE, ux);
-          WinSetWindowUShort(hwndChild, QWS_YRESTORE, uy);
-          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, ucx);
-          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, ucy);
+          WinSetWindowUShort(hwndChild, QWS_XRESTORE, (USHORT) ux);
+          WinSetWindowUShort(hwndChild, QWS_YRESTORE, (USHORT) uy);
+          WinSetWindowUShort(hwndChild, QWS_CXRESTORE, (USHORT) ucx);
+          WinSetWindowUShort(hwndChild, QWS_CYRESTORE, (USHORT) ucy);
         }
       }

trunk/dll/misc.c

@@ -1355 +1355 @@
                   (((info->HotKeyID - IDM_COMMANDNUM0) % 10) + 1) == 10 ? 0 :
                    ((info->HotKeyID - IDM_COMMANDNUM0) % 10) + 1);
-        mi.id = info->ID; 
+        mi.id = (USHORT) info->ID; 
         mi.afAttribute = (info->flags & ONCE ? MIA_CHECKED : 0) |
                          (info->flags & PROMPT ? MIA_FRAMED : 0);

trunk/dll/newview.c

@@ -2293 +2293 @@
           WinSendMsg(hwnd, WM_VSCROLL, MPFROM2SHORT(FID_VERTSCROLL, 0),
                      MPFROM2SHORT(0, SB_LINEUP));
-          pts.y = (Rectl.yTop - Rectl.yBottom) - 1;
+          pts.y = (SHORT) (Rectl.yTop - Rectl.yBottom) - 1;
           outofwindow = TRUE;
         }

trunk/dll/seeall.c

@@ -3180 +3180 @@
           WinSendMsg(hwnd, WM_VSCROLL, MPFROM2SHORT(FID_VERTSCROLL, 0),
                      MPFROM2SHORT(0, SB_LINEUP));
-          pts.y = (Rectl.yTop - Rectl.yBottom) - 1;
+          pts.y = (SHORT) (Rectl.yTop - Rectl.yBottom) - 1;
           outofwindow = TRUE;
         }

trunk/dll/systemf.c

@@ -1197 +1197 @@
       sdata.Environment = (PBYTE)pszEnvironment;
       sdata.InheritOpt = SSF_INHERTOPT_PARENT;
-      sdata.SessionType = ulAppType;
+      sdata.SessionType = (USHORT) ulAppType;
       sdata.ObjectBuffer = szObject;
       sdata.ObjectBuffLen = sizeof(szObject);

trunk/dll/treecnr.c

@@ -657 +657 @@
         ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
-        dcd->suspendview = tempsusp;
+        dcd->suspendview = (USHORT) tempsusp;
         fFollowTree = tempfollow;
         if (mp2)
@@ -701 +701 @@
       ExpandAll(dcd->hwndCnr,
                 (SHORT1FROMMP(mp1) == IDM_EXPAND), (PCNRITEM) mp2);
-      dcd->suspendview = tempsusp;
+      dcd->suspendview = (USHORT) tempsusp;
       PostMsg(dcd->hwndCnr, UM_FILTER, MPVOID, MPVOID);
     }
@@ -2329 +2329 @@
       dcd->mask.attrFile |= FILE_DIRECTORY;
       WinSendMsg(hwnd, CM_FILTER, MPFROMP(Filter), MPFROMP(&dcd->mask));
-      dcd->suspendview = tempsusp;
+      dcd->suspendview = (USHORT) tempsusp;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
       //DbgMsg(pszSrcFile, __LINE__, "UM_RESCAN %p pci %s", hwnd, (CHAR *) mp1);