Changeset 366

Timestamp:

Sep 20, 2018, 7:03:37 PM (7 years ago)

Author:

Valery V. Sedletski

Message:

cachef32.exe: Allow to load successfully if UUNIFAT/UFAT32 is missing, avoid a trap.

File:

• trunk/src/util/cachef32.c (modified) (5 diffs)

trunk/src/util/cachef32.c ¶

@@ -56 +56 @@
 int remount_all(void);
 
-BOOL (*pLoadTranslateTable)(BOOL fSilent, UCHAR ucSource);
+BOOL (*pLoadTranslateTable)(BOOL fSilent, UCHAR ucSource) = 0;
    
-void (*pbdrv_init)(void);
-BlockDriverState *(*pbdrv_new)(const char *device_name);
-BlockDriver *(*pbdrv_find_format)(const char *format_name);
-void (*pbdrv_delete)(BlockDriverState *bs);
+void (*pbdrv_init)(void) = 0;
+BlockDriverState *(*pbdrv_new)(const char *device_name) = 0;
+BlockDriver *(*pbdrv_find_format)(const char *format_name) = 0;
+void (*pbdrv_delete)(BlockDriverState *bs) = 0;
 int (*pbdrv_open2)(BlockDriverState *bs, const char *filename, int flags,
-                   BlockDriver *drv);
+                   BlockDriver *drv) = 0;
 int (*pbdrv_pread)(BlockDriverState *bs, int64_t offset,
-                   void *buf, int count1);
+                   void *buf, int count1) = 0;
 int (*pbdrv_pwrite)(BlockDriverState *bs, int64_t offset,
-                    void *buf, int count1);
+                    void *buf, int count1) = 0;
 
 HMODULE   hMod = 0;
@@ -119 +119 @@
    //ProcessFsTab(FALSE);
    //return 0;
-   
+
    rc = DosFSCtl( rgFirstInfo, sizeof( rgFirstInfo ), &ulDataSize,
                   NULL, 0, &ulParmSize,
@@ -713 +713 @@
       printf("FAT32: Utility DLL not found (%s does not load).\n", rgData);
       printf("FAT32: No UNICODE translate table loaded!\n");
-      return;
+      hMod = 0;
       }
    rc = DosQueryProcAddr(hMod, 0L,
@@ -720 +720 @@
       {
       printf("FAT32: ERROR: Could not find address of LoadTranslateTable.\n");
-      return;
+      pLoadTranslateTable = NULL;
       }
 
@@ -974 +974 @@
           }
 
-   if ( fForeGround && (*pLoadTranslateTable)(fSilent, TRUE))
+   if ( fForeGround && pLoadTranslateTable && (*pLoadTranslateTable)(fSilent, TRUE))
           fSetParms = TRUE;