diff --git a/VBA.vcproj b/VBA.vcproj
index 1385d82a..9eca689c 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -87,7 +87,7 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -830,7 +820,17 @@
/>
+
+
+
@@ -924,16 +924,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -944,16 +934,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -964,6 +944,26 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
+
+
+
+
+
+
@@ -988,16 +988,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -1008,16 +998,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -1028,6 +1008,26 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
+
+
+
+
+
+
@@ -1052,16 +1052,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -1073,7 +1063,17 @@
/>
+
+
+
@@ -1116,16 +1116,6 @@
Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj""
/>
-
-
-
@@ -1137,7 +1127,17 @@
/>
+
+
+
@@ -1416,10 +1416,6 @@
RelativePath=".\src\win32\BitmapControl.cpp"
>
-
-
@@ -1699,14 +1695,6 @@
CompileAs="1"
/>
-
-
-
@@ -1716,7 +1704,7 @@
/>
+
+
+
-
-
diff --git a/src/win32/MainWndHelp.cpp b/src/win32/MainWndHelp.cpp
index 1aea9e66..911934a8 100644
--- a/src/win32/MainWndHelp.cpp
+++ b/src/win32/MainWndHelp.cpp
@@ -20,7 +20,6 @@
#include "MainWnd.h"
#include "AboutDialog.h"
-#include "BugReport.h"
extern int emulating;
@@ -34,19 +33,18 @@ void MainWnd::OnHelpAbout()
void MainWnd::OnHelpFaq()
{
- ::ShellExecute(0, _T("open"), "http://vba.ngemu.com/faq.shtml",
+ ::ShellExecute(0, _T("open"), "vba-m_help.chm",
0, 0, SW_SHOWNORMAL);
}
void MainWnd::OnHelpBugreport()
{
- BugReport dlg(theApp.m_pMainWnd);
-
- dlg.DoModal();
+ ::ShellExecute(0, _T("open"), "http://forums.ngemu.com/vba-m/",
+ 0, 0, SW_SHOWNORMAL);
}
void MainWnd::OnHelpGnupubliclicense()
{
- ::ShellExecute(0, _T("open"), "http://www.gnu.org/licenses/gpl.html",
+ ::ShellExecute(0, _T("open"), "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
0, 0, SW_SHOWNORMAL);
}
diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc
index a961c14c..2299f109 100644
--- a/src/win32/VBA.rc
+++ b/src/win32/VBA.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""resource2.h""\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"#include ""vba.rc2""\0"
END
@@ -354,7 +354,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ROM Information"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",ID_OK,84,200,50,14
+ DEFPUSHBUTTON "OK",ID_OK,40,204,50,14
LTEXT "Game title:",IDC_STATIC,7,10,60,8
LTEXT "Maker code:",IDC_STATIC,7,38,60,8
LTEXT "Unit code:",IDC_STATIC,7,68,60,8
@@ -1084,17 +1084,6 @@ BEGIN
LTEXT "Enter 0 to use maximum scale.",IDC_STATIC,7,17,172,8
END
-IDD_BUG_REPORT DIALOG 0, 0, 296, 186
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Bug Report"
-FONT 8, "MS Sans Serif"
-BEGIN
- PUSHBUTTON "&OK",ID_OK,157,165,50,14
- EDITTEXT IDC_BUG_REPORT,11,22,278,131,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
- LTEXT "Bug report data:",IDC_STATIC,7,7,282,8
- DEFPUSHBUTTON "&Copy",IDC_COPY,87,164,50,14
-END
-
IDD_GAME_OVERRIDES DIALOGEX 0, 0, 268, 132
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Game overrides"
@@ -1124,7 +1113,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_OPENDLG, DIALOG
BEGIN
@@ -1451,14 +1440,6 @@ BEGIN
BOTTOMMARGIN, 61
END
- IDD_BUG_REPORT, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 289
- TOPMARGIN, 7
- BOTTOMMARGIN, 179
- END
-
IDD_GAME_OVERRIDES, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -1475,7 +1456,7 @@ END
// Menu
//
-IDR_MENU MENU
+IDR_MENU MENU
BEGIN
POPUP "&File"
BEGIN
@@ -1871,11 +1852,11 @@ BEGIN
END
POPUP "&Help"
BEGIN
- MENUITEM "Bug Report", ID_HELP_BUGREPORT
- MENUITEM "FAQ (website)", ID_HELP_FAQ
+ MENUITEM "VBA-M Help", ID_HELP_FAQ
+ MENUITEM "VBA-M Support Forum", ID_HELP_BUGREPORT
MENUITEM "License...", ID_HELP_GNUPUBLICLICENSE
MENUITEM SEPARATOR
- MENUITEM "&About...", ID_HELP_ABOUT
+ MENUITEM "&About VBA-M...", ID_HELP_ABOUT
END
END
@@ -1885,7 +1866,7 @@ END
// Accelerator
//
-IDR_ACCELERATOR ACCELERATORS
+IDR_ACCELERATOR ACCELERATORS
BEGIN
"C", ID_CHEATS_SEARCHFORCHEATS, VIRTKEY, CONTROL, NOINVERT
"N", ID_DEBUG_NEXTFRAME, VIRTKEY, CONTROL, NOINVERT
@@ -1948,7 +1929,7 @@ END
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_UNSUPPORTED_VBA_SGM "Unsupported VisualBoyAdvance save game version %d"
IDS_CANNOT_LOAD_SGM "Cannot load save game for %s"
@@ -1960,7 +1941,7 @@ BEGIN
IDS_NO_IMAGE_ON_ZIP "No image found on ZIP file %s"
IDS_ERROR_OPENING_IMAGE "Error opening image %s"
IDS_ERROR_READING_IMAGE "Error reading image %s"
- IDS_UNSUPPORTED_BIOS_FUNCTION
+ IDS_UNSUPPORTED_BIOS_FUNCTION
"Unsupported BIOS function %02x called from %08x. A BIOS file is needed in order to get correct behaviour."
IDS_INVALID_BIOS_FILE_SIZE "Invalid BIOS file size"
IDS_INVALID_CHEAT_CODE "Invalid cheat code '%s'. Supported formats are:\nXXXXXXXX:YY, XXXXXXXX:YYYY, XXXXXXXX:YYYYYYYY."
@@ -1968,7 +1949,7 @@ BEGIN
IDS_UNKNOWN_THUMB_OPCODE "Unknown opcode %04x from %08x"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_ERROR_CREATING_FILE "Error creating file %s"
IDS_FAILED_TO_READ_SGM "Battery file's size incompatible with the ROM settings %s (%d).\nWarning : save of the battery file is now disabled !"
@@ -1988,11 +1969,11 @@ BEGIN
IDS_UNSUPPORTED_CHEAT_LIST_VERSION "Unsupported cheat list version %d"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DIRECTX_7_REQUIRED "DirectX 7.0 or greater is required to run.\nDownload at http://www.microsoft.com/directx.\n\nError found at: %s"
IDS_DISABLING_VIDEO_MEMORY "Disabling Use Video Memory setting"
- IDS_SETTING_WILL_BE_EFFECTIVE
+ IDS_SETTING_WILL_BE_EFFECTIVE
"Setting will be effective the next time you start the emulator"
IDS_DISABLING_EMULATION_ONLY "Disabling Emulation Only setting"
IDS_FAILED_TO_OPEN_FILE "Failed to open file %s"
@@ -2004,13 +1985,13 @@ BEGIN
IDS_CANNOT_SETFORMAT_PRIMARY "Cannot SetFormat for primary %08x"
IDS_CANNOT_CREATESOUNDBUFFER_SEC "Cannot CreateSoundBuffer secondary %08x"
IDS_CANNOT_PLAY_PRIMARY "Cannot Play primary %08x"
- IDS_SEARCH_PRODUCED_TOO_MANY
+ IDS_SEARCH_PRODUCED_TOO_MANY
"Search produced %d results. Please refine better"
IDS_NUMBER_CANNOT_BE_EMPTY "Number cannot be empty"
IDS_INVALID_ADDRESS "Invalid address: %08x"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_MISALIGNED_HALFWORD "Misaligned half-word address: %08x"
IDS_MISALIGNED_WORD "Misaligned word address: %08x"
@@ -2030,7 +2011,7 @@ BEGIN
IDS_SELECT_BATTERY_DIR "Select Battery directory:"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_SELECT_SAVE_DIR "Select Save Directory:"
IDS_SELECT_CAPTURE_DIR "Select Capture directory:"
@@ -2050,7 +2031,7 @@ BEGIN
IDS_LOADED_STATE_N "Loaded state %d"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_WROTE_STATE "Wrote state"
IDS_WROTE_STATE_N "Wrote state %d"
@@ -2070,7 +2051,7 @@ BEGIN
IDS_UNKNOWN "Unknown"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_NONE "None"
IDS_FAILED_TO_LOAD_LIBRARY "Failed to load library %s"
@@ -2090,11 +2071,11 @@ BEGIN
IDS_SELECT_BATTERY_FILE "Select battery file"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_UNSUPPORTED_CHEAT_LIST_TYPE "Unsupported cheat list type %d"
IDS_INVALID_GSA_CODE "Invalid GSA code. Format is XXXXXXXXYYYYYYYY."
- IDS_CANNOT_IMPORT_SNAPSHOT_FOR
+ IDS_CANNOT_IMPORT_SNAPSHOT_FOR
"Cannot import snapshot for %s. Current game is %s"
IDS_UNSUPPORTED_SNAPSHOT_FILE "Unsupported snapshot file %s"
IDS_UNSUPPORTED_ARM_MODE "Unsupported ARM mode %02x"
@@ -2105,7 +2086,7 @@ BEGIN
IDS_OUT_OF_MEMORY "Failed to allocate memory for %s"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_FILTER_GBS "Gameboy Snapshot_*.GBS__"
IDS_FILTER_GCF "Gameshark Code File_*.GCF__"
@@ -2125,7 +2106,7 @@ BEGIN
IDS_ERROR_LISTENING "Error listening on socket."
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_ERROR_CREATING_SOCKET "Error creating socket."
IDS_ACK_NOT_RECEIVED "ACK not received from GDB."
@@ -2135,7 +2116,7 @@ BEGIN
IDS_SELECT_DUMP_FILE "Select dump file name"
IDS_FILTER_AVI "AVI File_*.AVI__"
IDS_SELECT_AVI_NAME "Select AVI file name"
- IDS_INVALID_THROTTLE_VALUE
+ IDS_INVALID_THROTTLE_VALUE
"Invalid throttle value. Please enter a number between 5 and 1000."
IDS_FILTER_INI "Skin INI File_*.INI__"
IDS_SELECT_SKIN_FILE "Select the skin file name"
@@ -2146,9 +2127,9 @@ BEGIN
IDS_END_OF_MOVIE "end of movie"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
- IDS_INVALID_INTERVAL_VALUE
+ IDS_INVALID_INTERVAL_VALUE
"Invalid rewind interval value. Please enter a number between 0 and 600 seconds."
IDS_REGISTRY "VisualBoyAdvance no longer uses the registry to store its settings. Your previous settings have been exported into the file: %s"
IDS_MOVIE_PLAY "Playing a movie will load a save state which may erase your previous battery saves. Please be sure to have a saved state if you don't want to loose any previous data."
diff --git a/src/win32/resource.h b/src/win32/resource.h
index 5dd51347..e075363d 100644
--- a/src/win32/resource.h
+++ b/src/win32/resource.h
@@ -94,7 +94,6 @@
#define IDD_REWIND_INTERVAL 150
#define IDD_IO_VIEWER 151
#define IDD_MAX_SCALE 154
-#define IDD_BUG_REPORT 155
#define IDD_GAME_OVERRIDES 156
#define IDD_SELECT 159
#define IDD_SELECT_PLUGIN 159
@@ -488,9 +487,7 @@
#define IDC_BIT_1 1251
#define IDC_PREDEFINED 1251
#define IDC_BIT_2 1252
-#define IDC_BUG_REPORT 1252
#define IDC_BIT_3 1253
-#define IDC_COPY 1253
#define IDC_BIT_4 1254
#define IDC_NAME 1254
#define IDC_BIT_5 1255
@@ -801,13 +798,12 @@
#define ID_OPTIONS_LINK_ENABLE 40335
#define ID_RENDERAPI_VERTEX 40336
#define ID_OPTIONS_VIDEO_RENDEROPTIONS_GLPOLYGONS 40337
-
#define ID_OPTIONS_FILTER_PLUGIN 40343
#define ID_OPTIONS_SELECT_PLUGIN 40344
#define IDC_COMBO_PLUGIN 40345
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 159