claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups, some fixes, moved zip.ch into the disk/ folder.

Browse Source
This commit is contained in:
waltje
2018-02-25 02:32:19 -05:00
parent 2da54a4ca0
commit 9f4c8423d6
15 changed files with 608 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/Makefile.mingw
View File

@@ -221,7 +221,7 @@ ifneq ($(CROSS), n)
endif
WINDRES := /usr/bin/$(MINGW)-windres
SYSINC := -I/usr/$(MINGW)/include -I../mingw/include
SYSINC := -I/usr/$(MINGW)/include -I../support/mingw/include
SYSLIB := -L/usr/$(MINGW)/lib
else
# Native compilation using MinGW for Windows.

6
src/win/win_cdrom.c
View File

@@ -8,7 +8,7 @@
*
* Handle the platform-side of CDROM drives.
*
* Version: @(#)win_cdrom.c 1.0.2 2018/02/21
* Version: @(#)win_cdrom.c 1.0.3 2018/02/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -43,11 +43,11 @@
#include <stdlib.h>
#include <wchar.h>
#include "../config.h"
#include "../disk/hdd.h"
#include "../disk/zip.h"
#include "../cdrom/cdrom.h"
#include "../cdrom/cdrom_image.h"
#include "../cdrom/cdrom_null.h"
#include "../zip.h"
#include "../disk/hdd.h"
#include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h"
#include "../plat.h"

25
src/win/win_crashdump.c
View File

@@ -8,7 +8,7 @@
*
* Handle generation of crash-dump reports.
*
* Version: @(#)win_crashdump.c 1.0.2 2018/02/21
* Version: @(#)win_crashdump.c 1.0.3 2018/02/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Riley (Rain-chan),
@@ -60,6 +60,7 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
SYSTEMTIME SystemTime;
HANDLE hDumpFile;
char *BufPtr;
int i;
/*
* Win32-specific functions will be used wherever possible,
@@ -104,7 +105,7 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
BufPtr = &ExceptionHandlerBuffer[strlen(ExceptionHandlerBuffer)];
}
/*
* What would a good filename be?
*
@@ -135,13 +136,13 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
// creates a new file if it doesn't.
FILE_ATTRIBUTE_NORMAL, // File attributes / etc don't matter.
NULL); // A template file is not being used.
/* Check to make sure the file was actually created. */
if (hDumpFile == INVALID_HANDLE_VALUE) {
/* CreateFile() failed, so just do nothing more. */
return(EXCEPTION_CONTINUE_SEARCH);
}
/*
* Write the data we were passed out in a human-readable format.
*
@@ -150,26 +151,26 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
HMODULE hMods[1024];
MODULEINFO modInfo;
HMODULE ipModule = 0;
DWORD cbNeeded;
DWORD cbNeeded, w;
/* Try to get a list of all loaded modules. */
if (EnumProcessModules(GetCurrentProcess(),
hMods, sizeof(hMods), &cbNeeded)) {
/* Got it, now walk through all modules.. */
for (DWORD i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
for (w=0; w<(cbNeeded / sizeof(HMODULE)); w++) {
/* For each module, get the module information. */
GetModuleInformation(GetCurrentProcess(),
hMods[i], &modInfo, sizeof(MODULEINFO));
hMods[w], &modInfo, sizeof(MODULEINFO));
/* If the exception address is in the range of this module.. */
if ( ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress >= (char *)modInfo.lpBaseOfDll) &&
((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress < ((char *)modInfo.lpBaseOfDll + modInfo.SizeOfImage))) {
/* ...this is the module we're looking for! */
ipModule = hMods[i];
ipModule = hMods[w];
break;
}
}
}
/* Start to put the crash-dump string into the buffer. */
sprintf(ExceptionHandlerBuffer,
"#\r\n# %s\r\n#\r\n"
@@ -199,12 +200,12 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
BufPtr += 1;
}
}
sprintf(BufPtr,
"\r\nNumber of parameters: %lu\r\nException parameters: ",
ExceptionInfo->ExceptionRecord->NumberParameters);
for (int i = 0; i < ExceptionInfo->ExceptionRecord->NumberParameters; i++) {
for (i=0; i<ExceptionInfo->ExceptionRecord->NumberParameters; i++) {
BufPtr = &ExceptionHandlerBuffer[strlen(ExceptionHandlerBuffer)];
sprintf(BufPtr,"0x%p ",
(void *)ExceptionInfo->ExceptionRecord->ExceptionInformation[i]);

1093
src/win/win_devconf.c
View File

File diff suppressed because it is too large Load Diff

4
src/win/win_new_floppy.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the New Floppy Image dialog.
*
* Version: @(#)win_new_floppy.c 1.0.2 2018/02/21
* Version: @(#)win_new_floppy.c 1.0.3 2018/02/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -47,7 +47,7 @@
#include "../plat.h"
#include "../random.h"
#include "../ui.h"
#include "../zip.h"
#include "../disk/zip.h"
#include "win.h"

6
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings.c 1.0.3 2018/02/22
* Version: @(#)win_settings.c 1.0.4 2018/02/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -54,11 +54,11 @@
#include "../game/gameport.h"
#include "../lpt.h"
#include "../mouse.h"
#include "../cdrom/cdrom.h"
#include "../zip.h"
#include "../disk/hdd.h"
#include "../disk/hdc.h"
#include "../disk/hdc_ide.h"
#include "../disk/zip.h"
#include "../cdrom/cdrom.h"
#include "../floppy/fdd.h"
#include "../scsi/scsi.h"
#include "../network/network.h"

8
src/win/win_stbar.c
View File

@@ -49,13 +49,13 @@
#include "../cpu/cpu.h"
#include "../device.h"
#include "../machine/machine.h"
#include "../floppy/fdd.h"
#include "../disk/hdd.h"
#include "../disk/hdc.h"
#include "../disk/zip.h"
#include "../cdrom/cdrom.h"
#include "../cdrom/cdrom_image.h"
#include "../cdrom/cdrom_null.h"
#include "../zip.h"
#include "../disk/hdd.h"
#include "../disk/hdc.h"
#include "../floppy/fdd.h"
#include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h"
#include "../network/network.h"