Changeset 145

Timestamp:

Jan 28, 2024, 10:46:01 PM (19 months ago)

Author:

gyoung

Message:

Fix compiler warnings and a freespace check

Location:

trunk/classes/mm-progs

Files:

• audioconverter/audconv.c (modified) (5 diffs)
• volume/classvol.c (modified) (3 diffs)

trunk/classes/mm-progs/audioconverter/audconv.c

@@ -78 +78 @@
 BOOL HlpBuildMMProgIniFileName(PSZ chrProgname, PSZ chrBuffer, ULONG ulBufferSize);
 HMODULE queryResModuleHandle(PSZ chrExePath);
-void freeResHandle();
+void freeResHandle(void);
 BOOL getMessage(PSZ text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
 ULONG messageBox( PSZ text, ULONG ulTextID , LONG lSizeText,
@@ -107 +107 @@
 int iBitsPerSample;
 SHORT sChannels;
-LONG lSec;
-LONG lAudioSize;
+ULONG lSec;
+ULONG lAudioSize;
 
 TID tidThread=0;
@@ -116 +116 @@
 BOOL bNoProcGiven=FALSE;
 
-void pmUsage();
+void pmUsage(void);
 
 BOOL createTargetName(PSZ sourceName, PSZ chrExt)
@@ -649 +649 @@
           {
             FSALLOCATE fsAlloc;
-            long long lFreeSpace;
+            ULONG lFreeSpace; 
             ULONG ulDiskNum;
             char cLetter;
+            ULONG cUnitAvail;
 
             WinQueryWindowText( WinWindowFromID(hwnd,IDEF_CONVERTTARGETNAME), sizeof(chrTargetName), chrTargetName );
@@ -661 +662 @@
               if(DosQueryFSInfo(ulDiskNum, FSIL_ALLOC,&fsAlloc,sizeof(fsAlloc)))
                 lFreeSpace=0;
-              else
-                lFreeSpace=fsAlloc.cUnitAvail*fsAlloc.cbSector*fsAlloc.cSectorUnit;
+              else{
+                cUnitAvail=0xFFFFFFFF/(fsAlloc.cbSector*fsAlloc.cSectorUnit);
+                if(fsAlloc.cUnitAvail > cUnitAvail)
+                  lFreeSpace=0xFFFFFFFF;
+                else
+                  lFreeSpace=fsAlloc.cUnitAvail*fsAlloc.cbSector*fsAlloc.cSectorUnit;
+              }
             }
             else

trunk/classes/mm-progs/volume/classvol.c

@@ -101 +101 @@
 BOOL IniSaveInt(char * iniFile, char* chrApp, char *chrKey, int theInt);
 BOOL HlpBuildMMProgIniFileName(char* chrProgname, char * chrBuffer, ULONG ulBufferSize);
-void freeResHandle();
+void freeResHandle(void);
 HMODULE queryResModuleHandle(char *chrExePath);
 BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
@@ -107 +107 @@
 SHORT menuInsertMenuItem( HWND hwndMenu, HWND hwndSubMenu, SHORT sPosition, int iID, char * chrText);
 
-void pmUsage();
+void pmUsage(void);
 ULONG messageBox( char* text, ULONG ulTextID , LONG lSizeText,
                   char* title, ULONG ulTitleID, LONG lSizeTitle,
@@ -137 +137 @@
 int numArgs;
 char* params[NUMPARAMS];
+static void _loadBmps(void);
 
 ULONG ulVolume=75;