claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes (stdarg.h in ide.c and name cleanups and %ws to %S in pc.c)

Browse Source
This commit is contained in:
waltje
2017-06-16 14:09:40 -04:00
parent 843236a28e
commit d2465dd5b3
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WIN/86Box.rc
View File

@@ -8,7 +8,7 @@
* *
* Windows resource script. * Windows resource script.
* *
* Version: @(#)86Box.rc 1.0.3 2017/06/16 * Version: @(#)86Box.rc 1.0.4 2017/06/17
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -186,7 +186,7 @@ FONT 9, "Segoe UI"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,129,94,71,12 DEFPUSHBUTTON "OK",IDOK,129,94,71,12
ICON 100,IDC_ABOUT_ICON,7,7,20,20 ICON 100,IDC_ABOUT_ICON,7,7,20,20
LTEXT "86Box v2.00 - A fork of PCem\n\nAuthors: Sarah Walker, Miran Grca, waltje, SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.", LTEXT "86Box v2.00 - A fork of PCem\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
IDC_ABOUT_ICON,54,7,146,73 IDC_ABOUT_ICON,54,7,146,73
CONTROL "",IDC_ABOUT_ICON,"Static",SS_BLACKFRAME | SS_SUNKEN,0, CONTROL "",IDC_ABOUT_ICON,"Static",SS_BLACKFRAME | SS_SUNKEN,0,
86,208,1 86,208,1

3
src/ide.c
View File

@@ -9,7 +9,7 @@
* Implementation of the IDE emulation for hard disks and ATAPI * Implementation of the IDE emulation for hard disks and ATAPI
* CD-ROM devices. * CD-ROM devices.
* *
* Version: @(#)ide.c 1.0.2 2017/06/16 * Version: @(#)ide.c 1.0.3 2017/06/17
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdarg.h>
#include <wchar.h> #include <wchar.h>
#include "86box.h" #include "86box.h"

12
src/pc.c
View File

@@ -8,7 +8,7 @@
* *
* Emulation core dispatcher. * Emulation core dispatcher.
* *
* Version: @(#)pc.c 1.0.4 2017/06/15 * Version: @(#)pc.c 1.0.5 2017/06/17
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -290,10 +290,10 @@ void initpc(int argc, wchar_t *argv[])
wchar_t *config_file = NULL; wchar_t *config_file = NULL;
int c; int c;
get_executable_name(pcempath, 511); get_executable_name(pcempath, 511);
pclog("executable_name = %ws\n", pcempath); pclog("executable_name = %S\n", pcempath);
p=get_filename_w(pcempath); p=get_filename_w(pcempath);
*p=L'\0'; *p=L'\0';
pclog("path = %ws\n", pcempath); pclog("path = %S\n", pcempath);
#ifdef WALTJE #ifdef WALTJE
DIR *dir; DIR *dir;
struct direct *dp; struct direct *dp;
@@ -330,15 +330,15 @@ void initpc(int argc, wchar_t *argv[])
#ifdef WALTJE #ifdef WALTJE
dir = opendirw(pcempath); dir = opendirw(pcempath);
if (dir != NULL) { if (dir != NULL) {
printf("Directory '%ws':\n", pcempath); printf("Directory '%S':\n", pcempath);
for (;;) { for (;;) {
dp = readdir(dir); dp = readdir(dir);
if (dp == NULL) break; if (dp == NULL) break;
printf(">> '%ws'\n", dp->d_name); printf(">> '%S'\n", dp->d_name);
} }
closedir(dir); closedir(dir);
} else { } else {
printf("Could not open '%ws'..\n", pcempath); printf("Could not open '%S'..\n", pcempath);
} }
#endif #endif