ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/snes9xgit/snes9x 

Conflicts:
	win32/_tfwopen.cpp
	win32/_tfwopen.h
This commit is contained in:
gocha 2011-05-07 12:13:53 +09:00
parent 258365537a 4571a0adfe
commit 480807389d
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
memmap.cpp
View File

@ -3547,7 +3547,9 @@ void CMemory::ApplyROMFixes (void)
match_na ("MSPACMAN") || // Ms Pacman match_na ("MSPACMAN") || // Ms Pacman
match_na ("THE MASK") || // The Mask match_na ("THE MASK") || // The Mask
match_na ("PRIMAL RAGE") || // Primal Rage match_na ("PRIMAL RAGE") || // Primal Rage
match_na ("PORKY PIGS HAUNTED") || match_na ("PORKY PIGS HAUNTED") || // Porky Pig's Haunted Holiday
match_na ("Big Sky Trooper") || // Big Sky Trooper
match_id ("A35") || // Mechwarrior 3050 / Battle Tech 3050
match_na ("DOOM TROOPERS")) // Doom Troopers match_na ("DOOM TROOPERS")) // Doom Troopers
Timings.APUAllowTimeOverflow = TRUE; Timings.APUAllowTimeOverflow = TRUE;
} }

4
win32/_tfwopen.h
View File

@ -270,11 +270,11 @@ public:
#define fopen _tfwopen #define fopen _tfwopen
#undef remove #undef remove
__inline int remove(const char *filename) { __forceinline int remove(const char *filename) {
return _twremove(filename); return _twremove(filename);
} }
#undef open #undef open
__inline int open(const char *filename, int oflag, int pmode) { __forceinline int open(const char *filename, int oflag, int pmode) {
return _twopen(filename, oflag, pmode); return _twopen(filename, oflag, pmode);
} }
#define _access _twaccess #define _access _twaccess

2
win32/win32_display.cpp
View File

@ -605,7 +605,7 @@ void ToggleFullScreen ()
if(GetMenu(GUI.hWnd)!=NULL) if(GetMenu(GUI.hWnd)!=NULL)
SetMenu(GUI.hWnd,NULL); SetMenu(GUI.hWnd,NULL);
SetWindowLong (GUI.hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE); SetWindowLong (GUI.hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE);
SetWindowPos (GUI.hWnd, HWND_TOP, 0, 0, GUI.FullscreenMode.width, GUI.FullscreenMode.height, SWP_DRAWFRAME|SWP_FRAMECHANGED); SetWindowPos (GUI.hWnd, HWND_TOPMOST, 0, 0, GUI.FullscreenMode.width, GUI.FullscreenMode.height, SWP_DRAWFRAME|SWP_FRAMECHANGED);
if(!S9xDisplayOutput->SetFullscreen(true)) if(!S9xDisplayOutput->SetFullscreen(true))
GUI.FullScreen = false; GUI.FullScreen = false;
} }

2
win32/wsnes9x.cpp
View File

@ -5520,7 +5520,7 @@ INT_PTR CALLBACK DlgMultiROMProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
SetCurrentDirectory(S9xGetDirectoryT(BIOS_DIR)); SetCurrentDirectory(S9xGetDirectoryT(BIOS_DIR));
_tfullpath(path, TEXT("stbios.bin"), MAX_PATH); _tfullpath(path, TEXT("stbios.bin"), MAX_PATH);
SetDlgItemText(hDlg, IDC_MULTICART_BIOSEDIT, path); SetDlgItemText(hDlg, IDC_MULTICART_BIOSEDIT, path);
FILE* ftemp = fopen(_tToChar(path), "rb"); FILE* ftemp = _tfopen(path, TEXT("rb"));
if(ftemp) if(ftemp)
{ {
fclose(ftemp); fclose(ftemp);