joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

VS2017 compiler warning fixup

Browse Source
This commit is contained in:
Jonathan Campbell
2018-05-22 17:18:17 -07:00
parent 7243faed6c
commit 1dfb954273
10 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/core_full.cpp
View File

@@ -110,7 +110,8 @@ restartopcode:
#include "core_full/save.h"
}
catch (GuestPageFaultException &pf) {
reg_flags = old_flags; /* core_full/op.h may have modified flags */
(void)pf;
reg_flags = old_flags; /* core_full/op.h may have modified flags */
reg_esp = old_esp;
throw;
}

6
src/cpu/core_full/load.h
View File

@@ -351,6 +351,7 @@ l_M_Ed:
Push_16(old_sp);Push_16(reg_bp);Push_16(reg_si);Push_16(reg_di);
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("PUSHA interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -365,6 +366,7 @@ l_M_Ed:
Push_32(tmpesp);Push_32(reg_ebp);Push_32(reg_esi);Push_32(reg_edi);
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("PUSHAD interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -379,6 +381,7 @@ l_M_Ed:
reg_bx=Pop_16();reg_dx=Pop_16();reg_cx=Pop_16();reg_ax=Pop_16();
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("POPA interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -392,6 +395,7 @@ l_M_Ed:
reg_ebx=Pop_32();reg_edx=Pop_32();reg_ecx=Pop_32();reg_eax=Pop_32();
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("POPAD interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -508,6 +512,7 @@ l_M_Ed:
reg_bp = Pop_16();
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}
@@ -522,6 +527,7 @@ l_M_Ed:
reg_ebp = Pop_32();
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}

1
src/cpu/core_full/string.h
View File

@@ -330,6 +330,7 @@
}
}
catch (GuestPageFaultException &pf) {
(void)pf;
/* Clean up after certain amount of instructions */
reg_esi&=(~add_mask);
reg_esi|=(si_index & add_mask);

5
src/cpu/core_normal/prefix_66.h
View File

@@ -155,6 +155,7 @@
Push_32(tmpesp);Push_32(reg_ebp);Push_32(reg_esi);Push_32(reg_edi);
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("PUSHAD interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -168,6 +169,7 @@
reg_ebx=Pop_32();reg_edx=Pop_32();reg_ecx=Pop_32();reg_eax=Pop_32();
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("POPAD interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -377,6 +379,7 @@
else {GetEAa;SaveMd(eaa,val);}
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}
@@ -489,6 +492,7 @@
reg_eip = new_eip;
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp; /* restore stack pointer */
throw;
}
@@ -538,6 +542,7 @@
reg_ebp = Pop_32();
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}

5
src/cpu/core_normal/prefix_none.h
View File

@@ -237,6 +237,7 @@
Push_16(old_sp);Push_16(reg_bp);Push_16(reg_si);Push_16(reg_di);
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("PUSHA interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -251,6 +252,7 @@
reg_bx=Pop_16();reg_dx=Pop_16();reg_cx=Pop_16();reg_ax=Pop_16();
}
catch (GuestPageFaultException &pf) {
(void)pf;
LOG_MSG("POPA interrupted by page fault");
reg_esp = old_esp;
throw;
@@ -582,6 +584,7 @@
else {GetEAa;SaveMw(eaa,val);}
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}
@@ -754,6 +757,7 @@
reg_eip = new_eip;
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp; /* restore stack pointer */
throw;
}
@@ -812,6 +816,7 @@
reg_bp = Pop_16();
}
catch (GuestPageFaultException &pf) {
(void)pf;
reg_esp = old_esp;
throw;
}

1
src/cpu/core_normal/string.h
View File

@@ -336,6 +336,7 @@ void DoString(STRING_OP type) {
}
}
catch (GuestPageFaultException &pf) {
(void)pf;
/* Clean up after certain amount of instructions */
reg_esi&=(~add_mask);
reg_esi|=(si_index & add_mask);

2
vs2015/libpdcurses/pdcurses/initscr.c
View File

@@ -241,7 +241,7 @@ int endwin(void)
PDC_LOG(("endwin() - called\n"));
/* Allow temporary exit from curses using endwin() */
if (SP == NULL) return;
if (SP == NULL) return ERR;
def_prog_mode();
PDC_scr_close();

4
vs2015/sdl/src/audio/windx5/SDL_dx5audio.c
View File

@@ -21,6 +21,10 @@
*/
#include "SDL_config.h"
#if defined(_MSC_VER)
# pragma warning(disable:4996) /* Nobody cares that GetVersionExA() is deprecated */
#endif
/* Allow access to a raw mixing buffer */
#include "SDL_timer.h"

4
vs2015/sdl/src/file/SDL_rwops.c
View File

@@ -21,6 +21,10 @@
*/
#include "SDL_config.h"
#if defined(_MSC_VER)
# pragma warning(disable:4996) /* Nobody cares that GetVersionExA() is deprecated */
#endif
/* This file provides a general interface for SDL to read and write
data sources. It can easily be extended to files, memory, etc.
*/

6
vs2015/sdl/src/video/wincommon/SDL_sysevents.c
View File

@@ -24,6 +24,10 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if defined(_MSC_VER)
# pragma warning(disable:4996) /* Nobody cares that GetVersionExA() is deprecated */
#endif
/* Make sure XBUTTON stuff is defined that isn't in older Platform SDKs... */
#ifndef WM_XBUTTONDOWN
#define WM_XBUTTONDOWN 0x020B
@@ -714,7 +718,7 @@ this->hidden->hiresFix, &x, &y);
if (hLayout != hLayoutNew) {
hLayoutChanged = 1;
hLayout = hLayoutNew;
DIB_InitOSKeymap();
DIB_InitOSKeymapPriv();
}
#ifndef _WIN64
codepage = GetCodePage();