Merged revisions 1856 to 1858 (for some reason I thought
I already merged those), 1865 and 1866.
This commit is contained in:
yabause
parent
eaf5ebd0de
commit
e70bdb0737
2
AUTHORS
2
AUTHORS
|
|
@ -17,6 +17,8 @@ Max Tabachenko (CrazyMax)
|
|||
zeromus
|
||||
Luigi__
|
||||
adelikat
|
||||
matusz
|
||||
pa__
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
|
|
|||
12
src/MMU.cpp
12
src/MMU.cpp
|
|
@ -342,12 +342,12 @@ void MMU_Init(void) {
|
|||
|
||||
void MMU_DeInit(void) {
|
||||
LOG("MMU deinit\n");
|
||||
if (MMU.fw.fp)
|
||||
fclose(MMU.fw.fp);
|
||||
mc_free(&MMU.fw);
|
||||
if (MMU.bupmem.fp)
|
||||
fclose(MMU.bupmem.fp);
|
||||
mc_free(&MMU.bupmem);
|
||||
if (MMU.fw.fp)
|
||||
fclose(MMU.fw.fp);
|
||||
mc_free(&MMU.fw);
|
||||
if (MMU.bupmem.fp)
|
||||
fclose(MMU.bupmem.fp);
|
||||
mc_free(&MMU.bupmem);
|
||||
addonsClose();
|
||||
Mic_DeInit();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#define ABOUT_TIMER_ID 110222
|
||||
#define PER_PAGE_TEAM 23
|
||||
#define TEAM 25
|
||||
#define TEAM 27
|
||||
#define SIZE_SCROLL_BUFFER PER_PAGE_TEAM + TEAM
|
||||
const char *team[TEAM] = { "Guillaume Duhamel",
|
||||
"Normmatt",
|
||||
|
|
@ -41,6 +41,8 @@ const char *team[TEAM] = { "Guillaume Duhamel",
|
|||
"zeromus",
|
||||
"Luigi__",
|
||||
"adelikat",
|
||||
"matusz",
|
||||
"pa__",
|
||||
"",
|
||||
"Contributors",
|
||||
"------------",
|
||||
|
|
|
|||
|
|
@ -790,6 +790,14 @@
|
|||
<File
|
||||
RelativePath="..\matrix_sse2-x64.asm"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Interim|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ BOOL GInfo_Init()
|
|||
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
|
||||
wc.hIcon = 0;
|
||||
wc.lpszMenuName = 0;
|
||||
wc.hbrBackground = (HBRUSH)GetSysColorBrush(COLOR_BTNFACE);
|
||||
wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
|
||||
wc.style = 0;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
|
|
@ -307,8 +307,9 @@ LRESULT GInfo_IconBoxPaint(HWND hCtl, WPARAM wParam, LPARAM lParam)
|
|||
}
|
||||
else
|
||||
{
|
||||
GetTextExtentPoint32(mem_hdc, "No icon", strlen("No icon"), &fontsize);
|
||||
TextOut(mem_hdc, ((w/2) - (fontsize.cx/2)), ((h/2) - (fontsize.cy/2)), "No icon", strlen("No icon"));
|
||||
char *noicon = "No icon";
|
||||
GetTextExtentPoint32(mem_hdc, noicon, strlen(noicon), &fontsize);
|
||||
TextOut(mem_hdc, ((w/2) - (fontsize.cx/2)), ((h/2) - (fontsize.cy/2)), noicon, strlen(noicon));
|
||||
}
|
||||
|
||||
BitBlt(hdc, 0, 0, w, h, mem_hdc, 0, 0, SRCCOPY);
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ int WndY = 0;
|
|||
|
||||
int ScreenGap = 0;
|
||||
|
||||
static int FrameLimit = 0;
|
||||
static int FrameLimit = 1;
|
||||
|
||||
//=========================== view tools
|
||||
TOOLSCLASS *ViewDisasm_ARM7 = NULL;
|
||||
|
|
@ -209,7 +209,7 @@ GPU3DInterface *core3DList[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
int autoframeskipenab=1;
|
||||
int autoframeskipenab=0;
|
||||
int frameskiprate=0;
|
||||
int emu_paused = 0;
|
||||
static int backupmemorytype=MC_TYPE_AUTODETECT;
|
||||
|
|
@ -1228,10 +1228,10 @@ class WinDriver : public Driver
|
|||
printf("Failed initializing WSAStartup - softAP support disabled\n");
|
||||
return FALSE ;
|
||||
}
|
||||
//require winpcap.dll
|
||||
HMODULE temp = LoadLibrary("winpcap.dll");
|
||||
//require wpcap.dll
|
||||
HMODULE temp = LoadLibrary("wpcap.dll");
|
||||
if(temp == NULL) {
|
||||
printf("Failed initializing winpcap.dll - softAP support disabled\n");
|
||||
printf("Failed initializing wpcap.dll - softAP support disabled\n");
|
||||
return FALSE;
|
||||
}
|
||||
FreeLibrary(temp);
|
||||
|
|
@ -1469,7 +1469,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
|
|||
GetPrivateProfileString("General", "Language", "0", text, 80, IniName); //================================================== ???
|
||||
CheckLanguage(IDC_LANGENGLISH+atoi(text));
|
||||
|
||||
GetPrivateProfileString("Video", "FrameSkip", "AUTO", text, 80, IniName);
|
||||
GetPrivateProfileString("Video", "FrameSkip", "0", text, 80, IniName);
|
||||
|
||||
if (strcmp(text, "AUTO") == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -412,11 +412,10 @@
|
|||
#define IDC_FRAMELIMIT 40005
|
||||
#define IDC_WINDOW1_5X 40006
|
||||
#define IDM_WIFISETTINGS 40007
|
||||
#define IDM__1 40008
|
||||
#define ID_VIEW_FRAMECOUNTER 40009
|
||||
#define ID_VIEW_DISPLAYFPS 40010
|
||||
#define ID_VIEW_DISPLAYINPUT 40011
|
||||
#define ID_VIEW_DISPLAYLAG 40012
|
||||
#define ID_VIEW_DISPLAYLAG 40012
|
||||
#define IDM_FILE_RECORDAVI 40015
|
||||
#define IDM_FILE_STOPAVI 40016
|
||||
#define ACCEL_CTRL_O 40032
|
||||
|
|
|
|||
|
|
@ -2518,6 +2518,7 @@ BEGIN
|
|||
GROUPBOX "Network adapter settings", IDC_STATIC, 5, 5, 320, 60
|
||||
LTEXT "Bridge network adapter:", IDC_STATIC, 15, 20, 76, 8, SS_LEFT
|
||||
COMBOBOX IDC_BRIDGEADAPTER, 15, 30, 300, 45, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
||||
LTEXT "(wifi emulation is not yet complete. this doesn't work.)", IDC_STATIC, 15, 48, 166, 8, SS_LEFT
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue