Skip to content

P
PUAE
Commit 7fb1ff3e authored by GnoStiC's avatar GnoStiC
Browse files
Options

puae 2.3.1

parent 93f80690
Expand all Show whitespace changes
Inline Side-by-side
Showing with 830 additions and 320 deletions
src/gui-cocoa/cocoaui.m
View file @ 7fb1ff3e
This diff is collapsed.
src/hardfile_unix.c
View file @ 7fb1ff3e
......@@ -169,7 +169,7 @@ static void trim (TCHAR *s)
s[_tcslen(s) - 1] = 0;
}
int isharddrive (const TCHAR *name)
static int isharddrive (const TCHAR *name)
{
int i;
......@@ -271,7 +271,8 @@ int hdf_open_target (struct hardfiledata *hfd, const char *pname)
i--;
}
if (h != INVALID_HANDLE_VALUE) {
size_t ret, low;
size_t ret;
int low;
ret = fseek (h, 0, SEEK_END);
if (ret)
goto end;
......@@ -478,7 +479,7 @@ int hdf_read_target (struct hardfiledata *hfd, void *buffer, uae_u64 offset, int
if (hfd->drive_empty)
return 0;
if (offset < hfd->virtual_size) {
uae_u64 len2 = offset + len <= hfd->virtual_size ? len : hfd->virtual_size - offset;
uae_u64 len2 = offset + (unsigned)len <= hfd->virtual_size ? (unsigned)len : hfd->virtual_size - offset;
if (!hfd->virtual_rdb)
return 0;
memcpy (buffer, hfd->virtual_rdb + offset, len2);
......@@ -486,7 +487,7 @@ int hdf_read_target (struct hardfiledata *hfd, void *buffer, uae_u64 offset, int
}
offset -= hfd->virtual_size;
while (len > 0) {
int maxlen;
unsigned int maxlen;
size_t ret;
if (hfd->physsize < CACHE_SIZE) {
hfd->cache_valid = 0;
......
src/include/writelog.h
View file @ 7fb1ff3e
......@@ -22,5 +22,8 @@ extern void write_log (const char *, ...) PRINTF_FORMAT;
extern void flush_log (void);
extern void set_logfile (const char *logfile_name);
extern void uae_reset (int);
extern void jit_abort (const char *fmt, ...);
extern void write_dlog (const char *format, ...);
extern char *setconsolemode (char *buffer, int maxlen);
#endif /* WRITELOG_H */
src/include/zfile.h
View file @ 7fb1ff3e
......@@ -66,7 +66,7 @@ extern struct zfile *zfile_gunzip (struct zfile *z);
extern int zfile_is_diskimage (const TCHAR *name);
extern int iszip (struct zfile *z);
extern int zfile_convertimage (const TCHAR *src, const TCHAR *dst);
//extern struct zfile *zuncompress (struct znode*, struct zfile *z, int dodefault, int mask, int *retcode, int index);
//extern struct zfile *zuncompress (struct znode *parent, struct zfile *z, int dodefault, int mask, int *retcode, int index);
extern void zfile_seterror (const TCHAR *format, ...);
extern TCHAR *zfile_geterror (void);
extern int zfile_truncate (struct zfile *z, uae_s64 size);
......@@ -106,6 +106,7 @@ extern const TCHAR *uae_diskimageextensions[];
extern struct zvolume *zfile_fopen_archive (const TCHAR *filename);
extern struct zvolume *zfile_fopen_archive2 (const TCHAR *filename, int flags);
extern struct zvolume *zfile_fopen_archive_root (const TCHAR *filename, int flags);
extern struct zvolume *zvolume_alloc_nofile (const TCHAR *name, unsigned int id, void *handle, const TCHAR *volumename);
extern void zfile_fclose_archive (struct zvolume *zv);
extern int zfile_fs_usage_archive (const TCHAR *path, const TCHAR *disk, struct fs_usage *fsp);
extern int zfile_stat_archive (const TCHAR *path, struct _stat64 *statbuf);
......
src/misc.c
View file @ 7fb1ff3e
/*
* PUAE - The Un*x Amiga Emulator
*
* A collection of ugly and random stuff brought in from Win32
* which desparately needs to be tidied up
*
*
* Copyright 2004 Richard Drummond
* Copyright 2010-2011 Mustafa TUFAN
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include "misc.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
......@@ -23,6 +27,9 @@
#include "keymap/keymap.h"
#include "keyboard.h"
#include <stdarg.h>
#include "clipboard.h"
#include "fsdb.h"
#include "debug.h"
#define TRUE 1
#define FALSE 0
......@@ -61,12 +68,17 @@ static struct winuae_currentmode *currentmode = &currentmodestruct;
static int serial_period_hsyncs, serial_period_hsync_counter;
static int data_in_serdatr; /* new data received */
// --- dinput.cpp START ---
// dinput
int rawkeyboard = -1;
static bool rawinput_enabled_mouse, rawinput_enabled_keyboard;
int no_rawinput;
int is_tablet (void)
{
return tablet ? 1 : 0;
}
//win32gfx
void getgfxoffset (int *dxp, int *dyp, int *mxp, int *myp)
{
*dxp = 0;
......@@ -75,11 +87,6 @@ void getgfxoffset (int *dxp, int *dyp, int *mxp, int *myp)
*myp = 0;
}
int is_tablet (void)
{
return tablet ? 1 : 0;
}
int vsync_switchmode (int hz, int oldhz)
{
static int tempvsync;
......@@ -99,6 +106,7 @@ int vsync_switchmode (int hz, int oldhz)
hz = hz * dbl;
found = NULL;
/* for (i = 0; md->DisplayModes[i].depth >= 0 && !found; i++) {
struct PicassoResolution *r = &md->DisplayModes[i];
if (r->res.width == w && r->res.height == h && r->depth == d) {
......@@ -147,6 +155,7 @@ int vsync_switchmode (int hz, int oldhz)
return 0;
}
// serial_win32
void serial_check_irq (void)
{
if (data_in_serdatr)
......@@ -179,6 +188,7 @@ void serial_hsynchandler (void)
*/
}
//win32
/*
static int drvsampleres[] = {
IDR_DRIVE_CLICK_A500_1, DS_CLICK,
......@@ -189,6 +199,8 @@ static int drvsampleres[] = {
-1
};
*/
// driveclick_win32
int driveclick_loadresource (struct drvsample *sp, int drivetype)
{
/*
......@@ -307,8 +319,10 @@ static int driveclick_fdrawcmd_init(int drive)
uae_start_thread ("DriveClick", driveclick_thread, NULL, NULL);
return 1;
*/
return 1;
}
// win32
uae_u32 emulib_target_getcpurate (uae_u32 v, uae_u32 *low)
{
#ifdef _WIN32
......@@ -344,8 +358,10 @@ uae_u32 emulib_target_getcpurate (uae_u32 v, uae_u32 *low)
return t2-t1;
*/
#endif
return 0;
}
void setmouseactivexy (int x, int y, int dir)
{
/* int diff = 8;
......@@ -378,6 +394,7 @@ void setmouseactive (int active)
{
}
// unicode
char *au_fs_copy (char *dst, int maxlen, const char *src)
{
unsigned int i;
......@@ -388,6 +405,7 @@ char *au_fs_copy (char *dst, int maxlen, const char *src)
return dst;
}
// fsdb_mywin32
int my_existsfile (const char *name)
{
struct stat sonuc;
......@@ -425,7 +443,7 @@ int my_getvolumeinfo (const char *root)
return ret;
}
// clipboard.c
// clipboard
static uaecptr clipboard_data;
static int vdelay, signaling, initialized;
......@@ -465,7 +483,7 @@ void amiga_clipboard_got_data (uaecptr data, uae_u32 size, uae_u32 actual)
}
}
// win32
int get_guid_target (uae_u8 *out)
{
unsigned Data1, Data2, Data3, Data4;
......@@ -488,10 +506,7 @@ int get_guid_target (uae_u8 *out)
return 1;
}
static int testwritewatch (void)
{
}
// win32gfx
void machdep_free (void)
{
}
......@@ -501,7 +516,7 @@ void target_run (void)
//shellexecute (currprefs.win32_commandpathstart);
}
// --- dinput.cpp ---
// dinput
int input_get_default_keyboard (int i)
{
if (rawinput_enabled_keyboard) {
......@@ -513,7 +528,7 @@ int input_get_default_keyboard (int i)
}
}
// --- unicode.cpp ---
// unicode
static unsigned int fscodepage;
char *ua_fs (const char *s, int defchar)
......@@ -528,7 +543,7 @@ char *ua_copy (char *dst, int maxlen, const char *src)
return dst;
}
// --- win32gui.cpp ---
// win32gui
static int qs_override;
int target_cfgfile_load (struct uae_prefs *p, char *filename, int type, int isdefault)
......@@ -586,7 +601,7 @@ int target_cfgfile_load (struct uae_prefs *p, char *filename, int type, int isde
return v;
}
// --- win32gfx.c
// win32gfx
int screen_is_picasso = 0;
struct uae_filter *usedfilter;
uae_u32 redc[3 * 256], grec[3 * 256], bluc[3 * 256];
......@@ -603,7 +618,7 @@ int isfullscreen (void)
return isfullscreen_2 (&currprefs);
}
// --- win32.c
// win32
uae_u8 *save_log (int bootlog, int *len)
{
FILE *f;
......@@ -672,7 +687,7 @@ void refreshtitle (void)
*/
}
// win32gui.c
// win32gui
#define MAX_ROM_PATHS 10
int scan_roms (int show)
{
......@@ -696,7 +711,7 @@ end:
return ret;
}
// dinput.c
// dinput
int input_get_default_lightpen (struct uae_input_device *uid, int i, int port, int af)
{
/* struct didata *did;
......@@ -782,7 +797,7 @@ void setid_af (struct uae_input_device *uid, int i, int slot, int sub, int port,
uid[i].flags[slot][sub] |= ID_FLAG_TOGGLE;
}
// win32.c
// win32
void target_quit (void)
{
//shellexecute (currprefs.win32_commandpathend);
......@@ -876,7 +891,8 @@ TCHAR *au_copy (TCHAR *dst, int maxlen, const char *src)
memcpy (dst, src, maxlen);
return dst;
}
//writelog.cpp
// writelog
int consoleopen = 0;
static int realconsole = 1;
......@@ -913,7 +929,7 @@ void debugger_change (int mode)
// regsetint (NULL, "DebuggerType", debugger_type);
openconsole ();
}
// unicode.c
// unicode
char *ua (const TCHAR *s)
{
return s;
......@@ -927,7 +943,7 @@ char *utf8u (const char *s)
return s;
}
// fsdb_mywin32.c
// fsdb_mywin32
FILE *my_opentext (const TCHAR *name)
{
FILE *f;
......@@ -964,7 +980,6 @@ int ispressed (int key)
return 0;
}
static int specialkeycode (void)
{
return 0; //currprefs.win32_specialkey;
......@@ -997,9 +1012,9 @@ int getcapslock (void)
int capstable[7];
// this returns bogus state if caps change when in exclusive mode..
/* host_capslockstate = GetKeyState (VK_CAPITAL) & 1;
host_numlockstate = GetKeyState (VK_NUMLOCK) & 1;
host_scrolllockstate = GetKeyState (VK_SCROLL) & 1;*/
host_capslockstate = 1; //GetKeyState (VK_CAPITAL) & 1;
host_numlockstate = 0; //GetKeyState (VK_NUMLOCK) & 1;
host_scrolllockstate = 0; //GetKeyState (VK_SCROLL) & 1;
capstable[0] = DIK_CAPITAL;
capstable[1] = host_capslockstate;
capstable[2] = DIK_NUMLOCK;
......@@ -1030,17 +1045,22 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
if (scancode == specialkeycode ())
return;
/* if (scancode == DIK_F11 && currprefs.win32_ctrl_F11_is_quit && ctrlpressed ())
code = AKS_QUIT;*/
#ifdef WIN32
if (scancode == DIK_F11 && currprefs.win32_ctrl_F11_is_quit && ctrlpressed ())
code = AKS_QUIT;
#endif
scancode_new = scancode;
if (!specialpressed () && inputdevice_iskeymapped (keyboard, scancode))
scancode = 0;
#ifdef WIN32
// GUI must be always available
/* if (scancode_new == DIK_F12 && currprefs.win32_guikey < 0)
if (scancode_new == DIK_F12 && currprefs.win32_guikey < 0)
scancode = scancode_new;
if (scancode_new == currprefs.win32_guikey && scancode_new != DIK_F12)
scancode = scancode_new;*/
scancode = scancode_new;
#endif
// write_log ("kbd1 = %d, scancode = %d (0x%02x), state = %d\n", keyboard, scancode, scancode, newstate);
......@@ -1053,7 +1073,6 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
}
}
if (newstate && code == 0) {
if (scancode == DIK_F12 /*|| scancode == currprefs.win32_guikey*/) {
if (ctrlpressed ()) {
......@@ -1198,7 +1217,7 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
}
scancode = scancode_new;
/* if (!specialpressed () && newstate) {
if (!specialpressed () && newstate) {
if (scancode == DIK_CAPITAL) {
host_capslockstate = host_capslockstate ? 0 : 1;
capslockstate = host_capslockstate;
......@@ -1211,7 +1230,7 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
host_scrolllockstate = host_scrolllockstate ? 0 : 1;
capslockstate = host_scrolllockstate;
}
}*/
}
if (specialpressed ())
return;
......@@ -1220,7 +1239,7 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
inputdevice_translatekeycode (keyboard, scancode, newstate);
}
//win32gfx
// win32gfx
#define MAX_DISPLAYS 10
struct MultiDisplay Displays[MAX_DISPLAYS];
......@@ -1309,7 +1328,7 @@ void addmode (struct MultiDisplay *md, int w, int h, int d, int rate, int nondx)
md->DisplayModes[i].res.width, md->DisplayModes[i].res.height, md->DisplayModes[i].depth * 8);
}
//dxwrap
// dxwrap
int DirectDraw_CurrentRefreshRate (void)
{
//DirectDraw_GetDisplayMode ();
......@@ -1331,7 +1350,7 @@ int D3D_goodenough (void)
return 0;
}
//debug_win32
// debug_win32
void update_debug_info(void)
{
}
src/od-generic/memory.c
View file @ 7fb1ff3e
/*
* UAE - The Un*x Amiga Emulator
/*
* PUAE - The Un*x Amiga Emulator
*
* OS-specific memory support functions
*
* Copyright 2004 Richard Drummond
* Copyright 2010 Mustafa Tufan
*/
#include "sysconfig.h"
......@@ -110,6 +111,13 @@ void preinit_shm (void)
uae_u64 totalphys64;
uae_u32 max_allowed_mman;
if (natmem_offset)
free (natmem_offset);
natmem_offset = NULL;
if (p96mem_offset)
free (p96mem_offset);
p96mem_offset = NULL;
#ifdef CPU_64_BIT
max_allowed_mman = 2048;
#else
......@@ -202,7 +210,7 @@ restart:
write_log ("NATMEM: retrying %d..\n", rounds);
rounds++;
if (natmem_offset)
free(natmem_offset);
free (natmem_offset);
natmem_offset = NULL;
natmem_offset_end = NULL;
canbang = 0;
......@@ -216,13 +224,15 @@ restart:
size = 0x10000000;
if (currprefs.z3fastmem_size || currprefs.z3fastmem2_size || currprefs.z3chipmem_size) {
z3size = currprefs.z3fastmem_size + currprefs.z3fastmem2_size + currprefs.z3chipmem_size + (currprefs.z3fastmem_start - 0x10000000);
if (currprefs.gfxmem_size)
rtgbarrier = 16 * 1024 * 1024;
if (currprefs.gfxmem_size) {
rtgbarrier = 16 * 1024 * 1024 - ((currprefs.z3fastmem_size + currprefs.z3fastmem2_size) & 0x00ffffff);
}
if (currprefs.z3chipmem_size && (currprefs.z3fastmem_size || currprefs.z3fastmem2_size))
z3chipbarrier = 16 * 1024 * 1024;
} else {
rtgbarrier = 0;
}
totalsize = size + z3size + currprefs.gfxmem_size;
while (totalsize > size64) {
int change = lowmem ();
......@@ -281,11 +291,11 @@ restart:
if (!natmem_offset) {
write_log ("NATMEM: No special area could be allocated! (1) err=%d\n", errno);
} else {
write_log ("NATMEM: Our special area: 0x%p-0x%p (%08x %dM)\n",
write_log ("NATMEM: Our special area: %p-%p (%08x %dM)\n",
natmem_offset, (uae_u8*)natmem_offset + natmemsize,
natmemsize, natmemsize >> 20);
if (currprefs.gfxmem_size)
write_log ("NATMEM: P96 special area: 0x%p-0x%p (%08x %dM)\n",
write_log ("NATMEM: P96 special area: %p-%p (%08x %dM)\n",
p96mem_offset, (uae_u8*)p96mem_offset + currprefs.gfxmem_size,
currprefs.gfxmem_size, currprefs.gfxmem_size >> 20);
canbang = 1;
......@@ -489,7 +499,7 @@ void *my_shmat (int shmid, void *shmaddr, int shmflg)
if (shmids[shmid].key == shmid && shmids[shmid].size) {
shmids[shmid].mode = 0;
shmids[shmid].natmembase = natmem_offset;
write_log ("SHMAddr %s %p = 0x%p - 0x%p\n", shmids[shmid].name, (uae_u8*)shmaddr-natmem_offset, shmaddr, natmem_offset);
write_log ("SHMAddr %s %p = %p - %p\n", shmids[shmid].name, (uae_u8*)shmaddr-natmem_offset, shmaddr, natmem_offset);
// if (shmaddr)
// free (shmaddr);
result = valloc (/*shmaddr,*/ size);
......
src/traps.c
View file @ 7fb1ff3e
......@@ -82,7 +82,7 @@ static void trap_HandleExtendedTrap (TrapHandler, int has_retval);
uaecptr find_trap (const TCHAR *name)
{
int i;
unsigned int i;
for (i = 0; i < trap_count; i++) {
struct Trap *trap = &traps[i];
......@@ -109,7 +109,7 @@ unsigned int define_trap (TrapHandler handler_func, int flags, const TCHAR *name
abort ();
return -1;
} else {
int i;
unsigned int i;
unsigned int trap_num;
struct Trap *trap;
uaecptr addr = here ();
......
src/uaeexe.c
View file @ 7fb1ff3e
......@@ -124,10 +124,10 @@ static uae_u32 REGPARAM2 uaeexe_server (TrapContext *context)
dst = (char*)get_real_address (ARG (0));
len = ARG (1);
s = ua (cmd);
strncpy (dst, s, len);
// s = ua (cmd);
strncpy (dst, cmd, len);
write_log ("Sending '%s' to remote cli\n", cmd);
xfree (s);
// xfree (s);
xfree (cmd);
return ARG (0);
}
src/uaelib.c
View file @ 7fb1ff3e
......@@ -27,6 +27,8 @@
#include "audio.h"
#include "picasso96.h"
#include "version.h"
#include "filesys.h"
#include "misc.h"
/*
* Returns UAE Version
......@@ -246,10 +248,10 @@ static uae_u32 emulib_GetUaeConfig (uaecptr place)
put_byte (place + 35, 1);
for (j = 0; j < 4; j++) {
char *s = ua (currprefs.floppyslots[j].df);
// char *s = ua (currprefs.floppyslots[j].df);
for (i = 0; i < 256; i++)
put_byte (place + 36 + i + j * 256, s[i]);
xfree (s);
put_byte (place + 36 + i + j * 256, currprefs.floppyslots[j].df[i]);
// xfree (s);
}
return 1;
}
......@@ -341,7 +343,8 @@ static int native_dos_op (uae_u32 mode, uae_u32 p1, uae_u32 p2, uae_u32 p3)
{
TCHAR tmp[MAX_DPATH];
char *s;
int v, i;
int v;
unsigned int i;
if (mode)
return -1;
......@@ -351,12 +354,12 @@ static int native_dos_op (uae_u32 mode, uae_u32 p1, uae_u32 p2, uae_u32 p3)
v = get_native_path (p1, tmp);
if (v)
return v;
s = ua (tmp);
for (i = 0; i <= strlen (s) && i < p3 - 1; i++) {
put_byte (p2 + i, s[i]);
//s = ua (tmp);
for (i = 0; i <= strlen (tmp) && i < p3 - 1; i++) {
put_byte (p2 + i, tmp[i]);
put_byte (p2 + i + 1, 0);
}
xfree (s);
//xfree (s);
return 0;
}
#ifndef UAEGFX_INTERNAL
......
src/writelog.c
View file @ 7fb1ff3e
......@@ -96,6 +96,7 @@ void flush_log (void)
fflush (logfile ? logfile : stderr);
}
// Write Debug Log
void write_dlog (const char *format, ...)
{
......
src/zfile.c
View file @ 7fb1ff3e
......@@ -32,6 +32,7 @@
#include "archivers/wrp/warp.h"
#include <zlib.h>
#include <stdarg.h>
#include "misc.h"
static struct zfile *zlist = 0;
......@@ -1465,7 +1466,7 @@ static struct zfile *openzip (const TCHAR *pname)
_tcscpy (name, pname);
i = _tcslen (name) - 2;
while (i > 0) {
if (name[i] == '/' || name[i] == '\\' && i > 4) {
if ((name[i] == '/' || name[i] == '\\') && i > 4) {
v = name[i];
name[i] = 0;
for (j = 0; plugins_7z[j]; j++) {
......@@ -1989,8 +1990,8 @@ size_t zfile_fread (void *b, size_t l1, size_t l2, struct zfile *z)
l2 = (z->size - z->seek) / l1;
else
l2 = 0;
if (l2 < 0)
l2 = 0;
// if (l2 < 0)
// l2 = 0;
}
memcpy (b, z->data + z->offset + z->seek, l1 * l2);
z->seek += l1 * l2;
......@@ -2006,8 +2007,8 @@ size_t zfile_fread (void *b, size_t l1, size_t l2, struct zfile *z)
l2 = (size - v) / l1;
else
l2 = 0;
if (l2 < 0)
l2 = 0;
// if (l2 < 0)
// l2 = 0;
}
zfile_fseek (z->parent, z->seek + z->offset, SEEK_SET);
v = z->seek;
......@@ -2102,7 +2103,7 @@ TCHAR *zfile_fgets (TCHAR *s, int size, struct zfile *z)
p++;
}
*p = 0;
if (size > strlen (s2) + 1)
if ((unsigned)size > strlen (s2) + 1)
size = strlen (s2) + 1;
au_copy (s, size, s2);
return s + size;
......@@ -2112,7 +2113,7 @@ TCHAR *zfile_fgets (TCHAR *s, int size, struct zfile *z)
s1 = fgets (s2, size, z->f);
if (!s1)
return NULL;
if (size > strlen (s2) + 1)
if ((unsigned)size > strlen (s2) + 1)
size = strlen (s2) + 1;
au_copy (s, size, s2);
return s + size;
......@@ -2178,7 +2179,7 @@ int zfile_zuncompress (void *dst, int dstsize, struct zfile *src, int srcsize)
int left = srcsize - incnt;
if (left == 0)
break;
if (left > sizeof (inbuf))
if ((unsigned)left > sizeof (inbuf))
left = sizeof (inbuf);
zs.next_in = inbuf;
zs.avail_in = zfile_fread (inbuf, 1, left, src);
......@@ -2659,7 +2660,7 @@ static struct znode *get_znode (struct zvolume *zv, const TCHAR *ppath, int recu
return zn;
} else {
int len = _tcslen (zpath);
if (_tcslen (path) >= len && (path[len] == 0 || path[len] == FSDB_DIR_SEPARATOR) && !_tcsnicmp (zpath, path, len)) {
if (_tcslen (path) >= (unsigned)len && (path[len] == 0 || path[len] == FSDB_DIR_SEPARATOR) && !_tcsnicmp (zpath, path, len)) {
if (path[len] == 0)
return zn;
if (zn->vchild) {
......
src/zfile_archive.c
View file @ 7fb1ff3e
......@@ -844,10 +844,10 @@ static void recurseadf (struct znode *zn, int root, TCHAR *name)
return;
if (gl (adf, 0) != 2)
break;
if (gl (adf, 1 * 4) != block)
if (gl (adf, 1 * 4) != (unsigned)block)
break;
secondary = gl (adf, bs - 1 * 4);
if (secondary != -3 && secondary != 2)
if (/*secondary != -3 &&*/ secondary != 2)
break;
memset (&zai, 0, sizeof zai);
fname = getBSTR (adf->block + bs - 20 * 4);
......@@ -860,7 +860,7 @@ static void recurseadf (struct znode *zn, int root, TCHAR *name)
}
_tcscat (name2, fname);
zai.name = name2;
if (size < 0 || size > 0x7fffffff)
if (/*size < 0 ||*/ size > 0x7fffffff)
size = 0;
zai.size = size;
zai.flags = gl (adf, bs - 48 * 4);
......@@ -1134,7 +1134,7 @@ static int sfsfindblock (struct adfhandle *adf, int btree, int theblock, struct
blocks = glx (p + 12);
else
blocks = gwx (p + 12);
if (key == theblock) {
if (key == (unsigned)theblock) {
struct sfsblock *sb;
if (*sfsblockcnt >= *sfsmaxblockcnt) {
*sfsmaxblockcnt += 100;
......
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