diff --git a/memmap.cpp b/memmap.cpp index 54e422c4..81edf082 100644 --- a/memmap.cpp +++ b/memmap.cpp @@ -3547,7 +3547,9 @@ void CMemory::ApplyROMFixes (void) match_na ("MSPACMAN") || // Ms Pacman match_na ("THE MASK") || // The Mask 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 Timings.APUAllowTimeOverflow = TRUE; } diff --git a/win32/_tfwopen.h b/win32/_tfwopen.h index 05ca1174..5cb88e1f 100644 --- a/win32/_tfwopen.h +++ b/win32/_tfwopen.h @@ -270,11 +270,11 @@ public: #define fopen _tfwopen #undef remove -__inline int remove(const char *filename) { +__forceinline int remove(const char *filename) { return _twremove(filename); } #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); } #define _access _twaccess diff --git a/win32/win32_display.cpp b/win32/win32_display.cpp index 5abecf61..8fb317cc 100644 --- a/win32/win32_display.cpp +++ b/win32/win32_display.cpp @@ -605,7 +605,7 @@ void ToggleFullScreen () if(GetMenu(GUI.hWnd)!=NULL) SetMenu(GUI.hWnd,NULL); 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)) GUI.FullScreen = false; } diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 331a1916..f5c8ee0a 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -5520,7 +5520,7 @@ INT_PTR CALLBACK DlgMultiROMProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar SetCurrentDirectory(S9xGetDirectoryT(BIOS_DIR)); _tfullpath(path, TEXT("stbios.bin"), MAX_PATH); SetDlgItemText(hDlg, IDC_MULTICART_BIOSEDIT, path); - FILE* ftemp = fopen(_tToChar(path), "rb"); + FILE* ftemp = _tfopen(path, TEXT("rb")); if(ftemp) { fclose(ftemp);