Commit c8eadf60 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Assumption that TRUE was -1 in the filetype lookup removed,this was causing...

Assumption that TRUE was -1 in the filetype lookup removed,this was causing filetype 0 to be overriden to FE4.

Module date string now got from VersionNum file so I don't have to keep
remembering to stamp the CMHG file.

Version 0.73. Tagged as 'DOSFS-0_73'
parent 823843cd
/* (0.72)
/* (0.73)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.72
#define Module_MajorVersion_CMHG 0.73
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Jan 2003
#define Module_Date_CMHG 06 Mar 2003
#define Module_MajorVersion "0.72"
#define Module_Version 72
#define Module_MajorVersion "0.73"
#define Module_Version 73
#define Module_MinorVersion ""
#define Module_Date "31 Jan 2003"
#define Module_Date "06 Mar 2003"
#define Module_ApplicationDate "31-Jan-03"
#define Module_ApplicationDate "06-Mar-03"
#define Module_ComponentName "DOSFS"
#define Module_ComponentPath "RiscOS/Sources/FileSys/ImageFS/DOSFS"
#define Module_FullVersion "0.72"
#define Module_HelpVersion "0.72 (31 Jan 2003)"
#define Module_LibraryVersionInfo "0:72"
#define Module_FullVersion "0.73"
#define Module_HelpVersion "0.73 (06 Mar 2003)"
#define Module_LibraryVersionInfo "0:73"
......@@ -311,7 +311,7 @@ static int DOS_image_RW(int op,word sec,int off,byte *ma,word nbytes,DOSdisc *ih
static void map_FILE_ROStype(DOS_direntry *dentry,word dosext,time5byte *le)
{
_kernel_swi_regs rset ;
int value = TRUE;
int value = -1;
/* Try to determine whether this really is a ROS filetype or a win95 'creation date' */
if (((dentry->FILE_reserved[1] & 0xF0) == 0) && (dentry->FILE_reserved[4] == 0))
......@@ -320,7 +320,7 @@ static void map_FILE_ROStype(DOS_direntry *dentry,word dosext,time5byte *le)
tracef1("filetype lookup,found in spare bytes 0x%X3\n", value);
}
/* No filetype in the spare bytes,so have a look through DOSmap */
if (value == TRUE)
if (value == -1)
{
mapentry *cmap ;
for (cmap = maplist; (cmap); cmap = cmap->next)
......@@ -332,7 +332,7 @@ static void map_FILE_ROStype(DOS_direntry *dentry,word dosext,time5byte *le)
}
}
/* Found neither a filetype nor an override mapping,try MimeMap */
if (value == TRUE)
if (value == -1)
{
rset.r[0] = MMM_TYPE_DOT_EXTN;
rset.r[1] = (int)&dosext;
......@@ -344,7 +344,7 @@ static void map_FILE_ROStype(DOS_direntry *dentry,word dosext,time5byte *le)
}
}
/* Give up,just set it as 'DOStype' */
if (value == TRUE) value = DOStype;
if (value == -1) value = DOStype;
le->hi = (le->hi & ~ADFStypemask) | (value << ADFStypeshift) ;
return;
......
......@@ -21,16 +21,17 @@
#include "VersionNum"
help-string: DOSFS Module_MajorVersion_CMHG Module_MinorVersion_CMHG
help-string: DOSFS Module_MajorVersion_CMHG Module_MinorVersion_CMHG
title-string: DOSFS
date-string: Module_Date_CMHG
#ifndef RAM
library-initialisation-code: _dosfs_initialisemodule
#endif
initialisation-code: init_fs
service-call-handler: fs_service 0x11 0x12 0x27 0x40 0x42 0x5C 0x68 0x69 0x6A 0x6B 0x6C
initialisation-code: init_fs
service-call-handler: fs_service 0x11 0x12 0x27 0x40 0x42 0x5C 0x68 0x69 0x6A 0x6B 0x6C
swi-chunk-base-number: 0x44B00
swi-handler-code: fs_swi
swi-decoding-table: DOSFS DiscFormat LayoutStructure
swi-handler-code: fs_swi
swi-decoding-table: DOSFS DiscFormat LayoutStructure
international-help-file: "Resources:$.Resources.DOSFS.Messages"
command-keyword-table: fs_commands
; DOSMap -- MSDOS extension to RISC OS filetype mapping
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment